diff -Naur ns-3.18.1/AUTHORS ns-3.19/AUTHORS
--- ns-3.18.1/AUTHORS	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/AUTHORS	2013-12-20 09:44:50.000000000 -0800
@@ -54,10 +54,13 @@
 Blake Hurd (naimorai@gmail.com)
 ishan (ishan.chhabra@gmail.com)
 Mohamed Amine Ismail (amine.ismail@inria.fr, iamine@udcast.com)
+Jared Ivey (j.ivey@gatech.edu)
 Atishay Jain (atishayjain25@gmail.com)
 Sascha Alexander Jopen (jopen@informatik.uni-bonn.de)
 Sam Jansen (sam.jansen@gmail.com)
 Liu Jian (liujatp@gmail.com)
+Piotr Jurkiewicz (piotr.jerzy.jurkiewicz@gmail.com)
+Evgeny Kalishenko (ydginster@gmail.com)
 Konstantinos Katsaros <dinos.katsaros@gmail.com>
 Joe Kopena (tjkopena@cs.drexel.edu)
 Flavio Kobuta (flaviokubota@gmail.com)
@@ -81,6 +84,7 @@
 Faker Moatamri (faker.moatamri@inria.fr)
 Edvin Močibob <edvin.mocibob@gmail.com>
 Mike Moreton (mjvm_ns@hotmail.com)
+Michele Muccio <michelemuccio@virgilio.it>
 Sidharth Nabar (snabar@uw.edu)
 Hemanth Narra (hemanth@ittc.ku.edu)
 Andreas Nilsson <andrnils@gmail.com>
diff -Naur ns-3.18.1/bindings/python/ns3modulegen_core_customizations.py ns-3.19/bindings/python/ns3modulegen_core_customizations.py
--- ns-3.18.1/bindings/python/ns3modulegen_core_customizations.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/bindings/python/ns3modulegen_core_customizations.py	2013-12-20 09:44:50.000000000 -0800
@@ -5,6 +5,7 @@
 from pybindgen.cppmethod import CustomCppMethodWrapper, CustomCppConstructorWrapper
 from pybindgen.typehandlers.codesink import MemoryCodeSink
 from pybindgen.typehandlers import ctypeparser
+from pybindgen.typehandlers.base import ForwardWrapperBase
 from pybindgen import cppclass
 import warnings
 
@@ -425,11 +426,24 @@
     add_std_ios_openmode(module)
 
 
-def add_std_ios_openmode(module):
-    import pybindgen.typehandlers.base
-    for alias in "std::_Ios_Openmode", "std::ios::openmode":
-        pybindgen.typehandlers.base.param_type_matcher.add_type_alias(alias, "int")
+class IosOpenmodeParam(Parameter):
+
+    DIRECTIONS = [Parameter.DIRECTION_IN]
+    CTYPES = ['std::ios::openmode', 'std::_Ios_Openmode']
 
+    def convert_c_to_python(self, wrapper):
+        assert isinstance(wrapper, ReverseWrapperBase)
+        wrapper.build_params.add_parameter('i', [self.value])
+
+    def convert_python_to_c(self, wrapper):
+        assert isinstance(wrapper, ForwardWrapperBase)
+        name = wrapper.declarations.declare_variable("std::ios::openmode", self.name, self.default_value)
+        wrapper.parse_params.add_parameter('i', ['&'+name], self.name, optional=bool(self.default_value))
+        wrapper.call_params.append(name)
+
+
+
+def add_std_ios_openmode(module):
     for flag in 'in', 'out', 'ate', 'app', 'trunc', 'binary':
         module.after_init.write_code('PyModule_AddIntConstant(m, (char *) "STD_IOS_%s", std::ios::%s);'
                                      % (flag.upper(), flag))
diff -Naur ns-3.18.1/bindings/python/wscript ns-3.19/bindings/python/wscript
--- ns-3.18.1/bindings/python/wscript	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/bindings/python/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -16,7 +16,7 @@
 REQUIRED_PYBINDGEN_VERSION = (0, 16, 0, 834)
 REQUIRED_PYGCCXML_VERSION = (0, 9, 5)
 
-
+RUN_ME=-3
 
 def add_to_python_path(path):
     if os.environ.get('PYTHONPATH', ''):
@@ -370,7 +370,7 @@
         # the build has not changed.  We want this task to always run if
         # invoked by the user, particularly since --apiscan=all will require
         # invoking this task many times, once per module.
-        return Task.RUN_ME
+        return RUN_ME
 
 def get_modules_and_headers(bld):
     """
diff -Naur ns-3.18.1/CHANGES.html ns-3.19/CHANGES.html
--- ns-3.18.1/CHANGES.html	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/CHANGES.html	2013-12-20 09:44:50.000000000 -0800
@@ -51,6 +51,118 @@
 us a note on ns-developers mailing list.</p>
 
 <hr>
+<h1>Changes from ns-3.18.1 to ns-3.19</h1>
+
+<h2>New API:</h2>
+<ul>
+  <li> A new wifi extension for vehicular simulation support is available in the
+    src/wave directory.  The current code represents an interim capability to 
+    realize an IEEE 802.11p-compliant device, but without the WAVE extensions 
+    (which are planned for a later patch).  The WaveNetDevice modelled herein 
+    enforces that a WAVE-compliant physical layer (at 5.9 GHz) is selected, and 
+    does not require any association between devices (similar to an adhoc WiFi 
+    MAC), but is otherwise similar (at this time) to a WifiNetDevice.  WAVE 
+    capabililties of switching between control and service channels, or using 
+    multiple radios, are not yet modelled.
+  </li>
+  <li>New SixLowPanNetDevice class providing a shim between 
+    IPv6 and real NetDevices. The new module implements 6LoWPAN:
+    "Transmission of IPv6 Packets over IEEE 802.15.4 Networks" (see
+    <a href="http://www.ietf.org/rfc/rfc4944.txt">RFC 4944</a> and
+    <a href="http://www.ietf.org/rfc/rfc6262.txt">RFC 6262</a>), 
+    resulting in a heavy header compression for IPv6 packets.
+    The module is intended to be used on 802.15.4 NetDevices, but
+    it can be used over other NetDevices. See the manual for
+    further discussion.
+  </li>
+  <li> LteHelper has been updated with some new APIs:
+    <ul>
+      <li>new overloaded Attach methods to enable UE to automatically determine
+          the eNodeB to attach to (using initial cell selection);</li>
+      <li>new methods related to handover algorithm: SetHandoverAlgorithmType
+          and SetHandoverAlgorithmAttribute;</li>
+      <li>a new attribute AnrEnabled to activate/deactivate Automatic Neighbour
+          Relation (ANR) function; and</li>
+      <li>a new method SetUeDeviceAttribute for configuring LteUeNetDevice.</li>
+    </ul>
+  </li>
+  <li> The GSoC 2013 project in the LTE module has brought some additional APIs:
+    <ul>
+      <li>a new abstract class LteHandoverAlgorithm, which every future
+          implementation of automatic handover trigger should inherit from;</li>
+      <li>new classes LteHandoverAlgorithm and LteAnr as sub-modules of
+          LteEnbNetDevice class; both interfacing with the LteEnbRrc sub-module
+          through Handover Management SAP and ANR SAP;</li>
+      <li>new attributes in LteEnbNetDevice and LteUeNetDevice classes related
+          to Closed Subscriber Group (CSG) functionality in initial cell
+          selection;</li>
+      <li>new attributes in LteEnbRrc for configuring UE measurements' filtering
+          coefficient (i.e., quantity configuration);</li>
+      <li>a new public method AddUeMeasReportConfig in LteEnbRrc for setting up
+          custom UE measurements' reporting configuration; measurement reports
+          can then be captured from the RecvMeasurementReport trace source;
+          and</li>
+      <li>new trace sources in LteUeRrc to capture more events, such as System
+          Information messages (MIB, SIB1, SIB2), initial cell selection, random
+          access, and handover.</li>
+    </ul>
+  </li>
+  <li>A new parallel scheduling algorithm based on null messages, a common 
+  parallel DES scheduling algorithm, has been added.  The null message 
+  scheduler has better scaling properties when running on some scenarios
+  with large numbers of nodes since it does not require a global 
+  communication.
+  </li>
+</ul>
+
+<h2>Changes to existing API:</h2>
+<ul>
+    <li> It is now possible to use Ipv6PacketInfoTag from UDP applications in the
+      same way as with Ipv4PacketInfoTag. See Doxygen for current limitations in
+  	  using Ipv[4,6]PacketInfoTag to set IP properties.</li>
+    <li>A change is introduced for the usage of the EpcHelper
+      class. Previously, the EpcHelper class included both the API
+      definition and its (only) implementation; as such, users would
+      instantiate and use the EpcHelper class directly in their
+      simulation programs. From now on,
+      EpcHelper is just the base class defining the API, and the
+      implementation has been moved to derived classes; as such,
+      users are now expected to use one of the derived classes in
+      their simulation program. The implementation previously
+      provided by the EpcHelper class has been moved to the new
+      derived class PointToPointEpcHelper.</li>
+  <li> The automatic handover trigger and ANR functions in LTE module have been
+    moved from LteEnbRrc class to separate classes. As a result, the related
+    attributes, e.g., ServingCellHandoverThreshold, NeighbourCellHandoverOffset,
+    EventA2Threshold, and EventA4Threshold have been removed from LteEnbRrc
+    class. The equivalent attributes are now in A2A4RsrqHandoverAlgorithm and
+    LteAnr classes.</li>
+  <li> Master Information Block (MIB) and System Information Block Type 1 (SIB1)
+    are now transmitted as LTE control messages, so they are no longer part of
+    RRC protocol.</li>
+  <li> UE RRC state model in LTE module has been considerably modified and is
+    not backward compatible with the previous state model.</li>
+  <li> Additional time units (Year, Day, Hour, Minute) were added to the time
+  value class that represents simulation time; the largest unit prior to 
+  this addition was Second.
+  </li>
+</ul>
+
+<h2>Changes to build system:</h2>
+
+<h2>Changed behavior:</h2>
+<ul>
+  <li> For the TapBridge device, in UseLocal mode there is a MAC learning function. TapBridge has been waiting for the first packet received from tap interface to set the address of the bridged device to the source address of the first packet. This has caused problems with WiFi.  The new behavior is that after connection to the tap interface, ns-3 learns the MAC address of that interface with a system call and immediately sets the address of the bridged device to the learned one.  See <a href="https://www.nsnam.org/bugzilla/show_bug.cgi?id=1777">bug 1777</a> for more details.</li>
+  <li> TapBridge device now correctly implements IsLinkUp() method.</li>
+  <li> IPv6 addresses and routing tables are printed like in Linux "route -A inet6" command.</li>
+  <li> A change in Ipv[4,6]Interface enforces the correct behaviour of IP 
+    when a device do not support the minimum MTU requirements.
+    This is set to 68 and 1280 octects respectively.  IP simulations that
+    may have run over devices with smaller MTUs than 68 or 1280, respectively,
+    will no longer be able to use such devices.</li>
+</ul>
+
+<hr>
 <h1>Changes from ns-3.18 to ns-3.18.1</h1>
 <h2>New API:</h2>
 <ul>
diff -Naur ns-3.18.1/doc/doxygen.conf ns-3.19/doc/doxygen.conf
--- ns-3.18.1/doc/doxygen.conf	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/doxygen.conf	2013-12-20 09:44:50.000000000 -0800
@@ -151,7 +151,7 @@
 # comments will behave just like regular Qt-style comments
 # (thus requiring an explicit @brief command for a brief description.)
 
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
 
 # If the QT_AUTOBRIEF tag is set to YES then Doxygen will
 # interpret the first line (until the first dot) of a Qt-style
@@ -159,7 +159,7 @@
 # will behave just like regular Qt-style comments (thus requiring
 # an explicit \brief command for a brief description.)
 
-QT_AUTOBRIEF           = NO
+QT_AUTOBRIEF           = YES
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
diff -Naur ns-3.18.1/doc/doxygen.warnings.report.sh ns-3.19/doc/doxygen.warnings.report.sh
--- ns-3.18.1/doc/doxygen.warnings.report.sh	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/doxygen.warnings.report.sh	2013-12-20 09:44:50.000000000 -0800
@@ -1,62 +1,221 @@
 #!/bin/bash
 
-# Process doxygen.warnings.log to generate sorted list of top offenders
-
-# Flag to skip the build and running doxygen, and just analyze the log
-skipdoxy=${1:-""}
-
-DIR=`dirname $0`
-ROOT=`hg root`
-# Final resting place for the log file
-log=$DIR/doxygen.warnings.log
+# Process doxygen log to generate sorted list of top offenders.
+#
 
+me=$(basename $0)
+DIR="$(dirname $0)"
+ROOT="$(hg root)"
+
+# Known log files
+STANDARDLOGFILE=doxygen.log
+WARNINGSLOGFILE=doxygen.warnings.log
+# Default choice:  generate it
+LOG="$DIR/$WARNINGSLOGFILE"
+
+
+# Options ------------------------------
+#
+
+function usage
+{
+    cat <<-EOF
+	
+	Usage: $me [-eth] [-f <log-file> | -l | -s] [-m <module> | -F <regex>]
+	
+	Run doxygen to generate all errors; report error counts
+	by module and file.
+	
+	The default behavior is to modify doxygen.conf temporarily to
+	report all undocumented elements, and to reduce the run time.
+	The output of this special run is kept in doc/$WARNINGSLOGFILE.
+
+	The -e and -t options exclude examples and test directories
+	from the counts.  The -m option only includes a specific module.
+	The -F option only includes files (or warnings) matching the <regex>.
+	The -m and -F options append the relevant warnings after the
+	numerical report.  These can be used in any combination.
+	
+	-e  Filter out warnings from */examples/*
+	-t  Filter out warnings from */test/*
+	-m  Only include files matching src/<module>
+	-F  Only include files matching the <regex> 
+
+	The -f, -l, and -s options skip the doxygen run altogether.
+	The first two use a specified or the standard log file;
+	the -s option uses the warnings log from a prior run.
+	Only the first of -f <log-file>, -s, or -l will have effect.
+		
+	-f  Skip doxygen run; use existing <log-file>.
+	-s  Skip doxygen run; use existing warnings log doc/$WARNINGSLOGFILE
+	-l  Skip doxygen run; use the normal doxygen log doc/$STANDARDLOGFILE
+		
+	-h  Print this usage message
+	    
+EOF
+    exit 1
+}
+
+# Argument processing ------------------
+#
+
+# -f argument
+usefilearg=0
+logfilearg=
+# -l
+usestandard=0
+# skip doxygen run; using existing log file
+SKIPDOXY=0
+
+# Filtering flags
+filter_examples=0
+filter_test=0
+filter_module=""
+filter_regex=""
+
+while getopts :etm:F:lF:sh option ; do
+
+    case $option in
+	
+	(e)  filter_examples=1        ;;
+	
+	(t)  filter_test=1            ;;
+
+	(m)  filter_module="$OPTARG"  ;;
+
+	(F)  filter_regex="$OPTARG"   ;;
+
+	(l)  usestandard=1            ;;
+
+	(f)  usefilearg=1
+	     logfilearg="$OPTARG"
+	     ;;
+
+	(s)  usefilearg=1
+	     logfilearg="$DIR/$WARNINGSLOGFILE"
+	     ;;
+
+	(h)  usage ;;
+	(:)  echo "$me: Missing argument to -$OPTARG" ; usage ;;
+	(\?) echo "$me: Invalid option: -$OPTARG"     ; usage ;;
+    esac
+done
+
+function checklogfile
+{
+    if [ -e "$1" ] ; then
+	SKIPDOXY=1
+	LOG="$1"
+    else
+	echo "$me: log file $1 does not exist."
+	exit 1
+    fi
+}
+    
+# Which log file
+if [[ $usefilearg -eq 1 && "${logfilearg:-}" != "" ]] ; then
+    checklogfile "$logfilearg"
+elif [ $usestandard -eq 1 ]; then
+    checklogfile "$DIR/$STANDARDLOGFILE"
+fi
 
-# First, we have to modify doxygen.conf to generate all the warnings
-# (We also suppress dot graphs, so shorten the run time.)
+#  Run doxygen -------------------------
+#
 
-if [ "$skipdoxy" == "" ]; then
+if [ $SKIPDOXY -eq 1 ]; then
+    echo
+    echo "Skipping doxygen run, using existing log file $LOG"
+else
 
     # Run introspection, which may require a build
-    cd $(hg root) && ./waf --run print-introspected-doxygen >doc/introspected-doxygen.h
+    (cd "$ROOT" && ./waf --run print-introspected-doxygen >doc/introspected-doxygen.h)
+
+    # Modify doxygen.conf to generate all the warnings
+    # (We also suppress dot graphs, so shorten the run time.)
 
     conf=$DIR/doxygen.conf
 
     sed -i.bak -E '/^EXTRACT_ALL |^HAVE_DOT |^WARNINGS /s/YES/no/' $conf
     rm -f $conf.bak
 
+    echo
     echo -n "Rebuilding doxygen docs with full errors..."
-    (cd $ROOT && ./waf --doxygen >/dev/null 2>&1)
+    (cd "$ROOT" && ./waf --doxygen >/dev/null 2>&1)
     status=$?
 
     hg revert $conf
 
-    if [ "$status" = "0" ]; then
+    if [ $status -eq 0 ]; then
 	echo "Done."
     else
 	echo "FAILED."
 	exit 1
     fi
 
-    mv $DIR/doxygen.log $log
+    cp -f "$DIR/$STANDARDLOGFILE" "$DIR/$WARNINGSLOGFILE"
 
-else
-    echo "Skipping doxygen run, using existing log file $log"
 fi
 
+# Log filters --------------------------
+#
+
+# Filter regular expression for -m and -F
+filter_inRE=""
+if [ "$filter_module" != "" ] ; then
+    filter_inRE="src/$filter_module"
+fi
+if [ "$filter_regex" != "" ] ; then
+    filter_inRE="${filter_inRE:-}${filter_inRE:+\\|}$filter_regex"
+fi
+
+# Filter regular expression for -e and -t
+filter_outRE=""
+if [ $filter_examples -eq 1 ]; then
+    filter_outRE="/examples/"
+fi
+if [ $filter_test -eq 1 ]; then
+    filter_outRE="${filter_outRE:-}${filter_outRE:+\\|}/test/"
+fi
+
+if [ "${filter_inRE:-}" != "" ] ; then
+    echo "Filtering in \"$filter_inRE\""
+fi
+if [ "${filter_outRE:-}" != "" ] ; then
+    echo "Filtering out \"$filter_outRE\""
+fi
+echo
+
+# Filter log file
+function filter_log
+{
+    local flog;
+    flog=$( cat "$LOG" | grep "^$ROOT" )
+
+    if [ "${filter_inRE:-}" != "" ] ; then
+	flog=$( echo "$flog" | grep "$filter_inRE" )
+    fi
+
+    if [ "${filter_outRE:-}" != "" ] ; then
+	flog=$( echo "$flog" | grep -v "$filter_outRE" )
+    fi
+
+    echo "$flog"
+}
+    
 
-# Analyze the log
+# Analyze the log ----------------------
+#
 
 # List of module directories (e.g, "src/core/model")
 undocmods=$(                \
-    grep "^$ROOT" "$log"  | \
+    filter_log            | \
     cut -d ':' -f 1       | \
-    sed "s|$ROOT||g"      | \
-    cut -d '/' -f 2-4     | \
+    sed "s|$ROOT/||g"     | \
+    cut -d '/' -f 1-3     | \
     sort                  | \
     uniq -c               | \
     sort -nr                \
     )
-    
 
 # Number of directories
 modcount=$(                         \
@@ -68,24 +227,24 @@
 # For a function with multiple undocumented parameters,
 # Doxygen prints the additional parameters on separate lines,
 # so they don't show up in the totals above.
-# Rather than work too hard to get the exact number,
+# Rather than work too hard to get the exact number for each file,
 # we just list the total here. 
 addlparam=$(                                  \
-    grep -v "^$ROOT" $log                   | \
-    grep -v "not generated, too many nodes" | \
-    grep "^  parameter '" $log              | \
+    grep "^  parameter '" "$LOG"            | \
     wc -l                                   | \
     sed 's/^[ \t]*//;s/[ \t]*$//'             \
     )
 
 # Total number of warnings
-warncount=$(echo "$undocmods" | \
-    awk '{total += $1}; END {print total}' )
+warncount=$(                                  \
+    echo "$undocmods"                       | \
+    awk '{total += $1}; END {print total}'    \
+    )
 warncount=$((warncount + addlparam))
 
 # List of files appearing in the log
-undocfiles=$( \
-    grep "^$ROOT" "$log"  | \
+undocfiles=$(               \
+    filter_log            | \
     cut -d ':' -f 1       | \
     sed "s|$ROOT||g"      | \
     cut -d '/' -f 2-      | \
@@ -95,7 +254,7 @@
     )
 
 # Sorted by number, decreasing
-undocsort=$(echo "$undocfiles" | sort -r )
+undocsort=$(echo "$undocfiles" | sort -k1nr,2 )
 
 # Total number of files
 filecount=$(                        \
@@ -104,7 +263,19 @@
     sed 's/^[ \t]*//;s/[ \t]*$//'   \
     )
 
-# Now we're ready to summarize the log
+# Filtered in warnings
+filterin=
+if [ "${filter_inRE:-}" != "" ] ; then
+    filterin=$(                 \
+	filter_log            | \
+	sed "s|$ROOT/||g"       \
+	)
+fi
+
+
+
+# Summarize the log --------------------
+#
 
 echo
 echo "Report of Doxygen warnings"
@@ -147,4 +318,10 @@
 printf "%6d files\n" $filecount
 printf "%6d warnings\n" $warncount
 
-
+if [ "$filterin" != "" ] ; then
+    echo
+    echo
+    echo "Filtered Warnings"
+    echo "========================================"
+    echo "$filterin"
+fi
diff -Naur ns-3.18.1/doc/manual/Makefile ns-3.19/doc/manual/Makefile
--- ns-3.18.1/doc/manual/Makefile	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/manual/Makefile	2013-12-20 09:44:50.000000000 -0800
@@ -16,6 +16,7 @@
 	source/replace.txt \
 	source/attributes.rst \
 	source/callbacks.rst \
+	source/documentation.rst \
 	source/enable-modules.rst \
 	source/enable-tests.rst \
 	source/events.rst \
diff -Naur ns-3.18.1/doc/manual/source/attributes.rst ns-3.19/doc/manual/source/attributes.rst
--- ns-3.18.1/doc/manual/source/attributes.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/manual/source/attributes.rst	2013-12-20 09:44:50.000000000 -0800
@@ -53,7 +53,7 @@
 
 Smart pointers are used extensively in the |ns3| APIs, to avoid passing
 references to heap-allocated objects that may cause memory leaks.  
-For most basic usage (syntax), treat a smart pointer like a regular pointer:::
+For most basic usage (syntax), treat a smart pointer like a regular pointer::
 
   Ptr<WifiNetDevice> nd = ...;
   nd->CallSomeFunction ();
@@ -67,11 +67,11 @@
 using ``operator new`` as usual but instead by a templated function called
 :cpp:func:`CreateObject()`.
 
-A typical way to create such an object is as follows:::
+A typical way to create such an object is as follows::
 
   Ptr<WifiNetDevice> nd = CreateObject<WifiNetDevice> ();
 
-You can think of this as being functionally equivalent to:::
+You can think of this as being functionally equivalent to::
 
   WifiNetDevice* nd = new WifiNetDevice ();
 
@@ -102,7 +102,7 @@
 example: class :cpp:class:`ns3::Node`.
 
 The public header file node.h has a declaration that includes a static GetTypeId
-function call:::
+function call::
 
     class Node : public Object
     {
@@ -110,7 +110,7 @@
       static TypeId GetTypeId (void);
       ...
 
-This is defined in the ``node.cc`` file as follows:::
+This is defined in the ``node.cc`` file as follows::
 
     TypeId 
     Node::GetTypeId (void)
@@ -210,7 +210,7 @@
 unsigned integer ``m_maxPackets``; this member variable controls the depth of
 the queue.  
 
-If we look at the declaration of DropTailQueue, we see the following:::
+If we look at the declaration of DropTailQueue, we see the following::
 
     class DropTailQueue : public Queue {
     public:
@@ -233,7 +233,7 @@
 type of global default value.
 
 In the |ns3| attribute system, these value definitions and accessor functions
-are moved into the TypeId class; e.g.:::
+are moved into the TypeId class; e.g.::
 
     NS_OBJECT_ENSURE_REGISTERED (DropTailQueue);
 
@@ -424,11 +424,11 @@
 +++++++++++++++++++++++++++++++++++++++++++
 
 Arbitrary combinations of attributes can be set and fetched from
-the helper and low-level APIs; either from the constructors themselves:::
+the helper and low-level APIs; either from the constructors themselves::
 
     Ptr<Object> p = CreateObject<MyNewObject> ("n1", v1, "n2", v2, ...);
 
-or from the higher-level helper APIs, such as:::
+or from the higher-level helper APIs, such as::
 
     mobility.SetPositionAllocator ("ns3::GridPositionAllocator",
                                    "MinX", DoubleValue (-100.0),
@@ -451,7 +451,7 @@
 with a single generic type. Conversions to this type can either be done using an
 intermediate class (IntegerValue, DoubleValue for "floating point") or via
 strings. Direct implicit conversion of types to Value is not really practical.
-So in the above, users have a choice of using strings or values:::
+So in the above, users have a choice of using strings or values::
 
     p->Set ("cwnd", StringValue ("100")); // string-based setter
     p->Set ("cwnd", IntegerValue (100)); // integer-based setter
@@ -488,7 +488,7 @@
 values assigned before the constructor body executes, because you need them in
 the logic of the constructor? There is a way to do this, used for example in the
 class :cpp:class:`ns3::ConfigStore`: call ``ObjectBase::ConstructSelf ()`` as
-follows:::
+follows::
 
     ConfigStore::ConfigStore ()
     {
@@ -510,14 +510,14 @@
 Adding an existing internal variable to the metadata system 
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-Consider this variable in class TcpSocket:::
+Consider this variable in class TcpSocket::
 
     uint32_t m_cWnd;   // Congestion window
 
 Suppose that someone working with TCP wanted to get or set the value of that
 variable using the metadata system. If it were not already provided by |ns3|,
 the user could declare the following addition in the runtime metadata system (to
-the TypeId declaration for TcpSocket):::
+the TypeId declaration for TcpSocket)::
 
     .AddAttribute ("Congestion window", 
                    "Tcp congestion window (bytes)",
@@ -537,7 +537,7 @@
 Here, we discuss the impact on a user who wants to add a new class to |ns3|;
 what additional things must be done to hook it into this system.
 
-We've already introduced what a TypeId definition looks like:::
+We've already introduced what a TypeId definition looks like::
 
     TypeId
     RandomWalk2dMobilityModel::GetTypeId (void)
@@ -562,7 +562,7 @@
     }
 
 The declaration for this in the class declaration is one-line public member
-method:::
+method::
 
     public:
       static TypeId GetTypeId (void);
@@ -606,7 +606,7 @@
     };
  
 One macro call and two operators, must be added below the class declaration in
-order to turn a Rectangle into a value usable by the ``Attribute`` system:::
+order to turn a Rectangle into a value usable by the ``Attribute`` system::
 
     std::ostream &operator << (std::ostream &os, const Rectangle &rectangle);
     std::istream &operator >> (std::istream &is, Rectangle &rectangle);
@@ -616,7 +616,7 @@
 Implementation file
 +++++++++++++++++++
 
-In the class definition (``.cc`` file), the code looks like this:::
+In the class definition (``.cc`` file), the code looks like this::
 
     ATTRIBUTE_HELPER_CPP (Rectangle);
 
@@ -660,12 +660,12 @@
 |ns3| ConfigStore.  We can explore this system by using an example from
 ``src/config-store/examples/config-store-save.cc``.
 
-First, all users must include the following statement:::
+First, all users must include the following statement::
 
     #include "ns3/config-store-module.h"
 
 Next, this program adds a sample object A to show how the system
-is extended:::
+is extended::
 
     class A : public Object
     {
@@ -686,7 +686,7 @@
     NS_OBJECT_ENSURE_REGISTERED (A);
 
 Next, we use the Config subsystem to override the defaults in a couple of
-ways:::
+ways::
      
       Config::SetDefault ("ns3::A::TestInt16", IntegerValue (-5));
     
@@ -703,7 +703,7 @@
 created is rooted in the configuration namespace as an object instance.
 This normally happens when you aggregate objects to ns3::Node or ns3::Channel
 but here, since we are working at the core level, we need to create a
-new root namespace object:::
+new root namespace object::
 
       Config::RegisterRootNamespaceObject (a2_obj);
 
@@ -720,7 +720,7 @@
 (default "RawText") governs whether the ConfigStore format is Xml or RawText
 format.
 
-The example shows:::
+The example shows::
 
       Config::SetDefault ("ns3::ConfigStore::Filename", StringValue ("output-attributes.xml"));
       Config::SetDefault ("ns3::ConfigStore::FileFormat", StringValue ("Xml"));
@@ -895,7 +895,7 @@
 is rerun.
 
 Usage is almost the same as the non-GTK-based version, but there
-are no ConfigStore attributes involved:::
+are no ConfigStore attributes involved::
 
   // Invoke just before entering Simulator::Run ()
   GtkConfigStore config;
diff -Naur ns-3.18.1/doc/manual/source/conf.py ns-3.19/doc/manual/source/conf.py
--- ns-3.18.1/doc/manual/source/conf.py	2013-11-15 15:33:07.000000000 -0800
+++ ns-3.19/doc/manual/source/conf.py	2013-12-20 09:44:50.000000000 -0800
@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'ns-3'
-copyright = u'2010, ns-3 project'
+copyright = u'2008-13, ns-3 project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.18.1'
+version = 'ns-3.19'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.18.1'
+release = 'ns-3.19'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Naur ns-3.18.1/doc/manual/source/documentation.rst ns-3.19/doc/manual/source/documentation.rst
--- ns-3.18.1/doc/manual/source/documentation.rst	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/doc/manual/source/documentation.rst	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,569 @@
+.. include:: replace.txt
+.. highlight:: cpp
+
+Creating Documentation
+----------------------
+
+|ns3| supplies two kinds of documentation:  expository "user-guide"-style
+chapters, and source code API documentation.
+
+The "user-guide" chapters are written by hand in reStructuredText_
+format (``.rst``), which is processed by the Python documentation
+system Sphinx_ to generate web pages and pdf files.
+The API documentation is generated from the source code itself,
+using Doxygen_, to generate cross-linked web pages.
+Both of these are important:  the Sphinx chapters explain the *why*
+and overview of using a model; the API documentation explains the
+*how* details.  
+
+This chapter gives a quick overview of these
+tools, emphasizing preferred usage and customizations for |ns3|.
+
+To build all the standard documentation:
+
+.. sourcecode:: bash
+
+   $ ./waf docs
+
+For more specialized options, read on.
+
+.. _reStructuredText:  http://sphinx-doc.org/rest.html
+.. _sphinx:            http://sphinx-doc.org/
+.. _doxygen:           http://www.doxygen.org/
+
+
+Documenting with Sphinx
+***********************
+
+We use Sphinx_ to generate expository chapters describing
+the design and usage of each module.  Right now you are reading the
+:doc:`Documentation <documentation>` Chapter.
+The `Show Source <_sources/documentation.txt>`_ link in the sidebar
+will show you the reStructuredText source for this chapter.
+
+Adding New Chapters
+===================
+
+Adding a new chapter takes three steps (described in more detail below):
+
+#. Choose `Where?`_ the documentation file(s) will live.
+#. `Link`_ from an existing page to the new documentation.
+#. Add the new file to the `Makefile`_.
+
+Where?
+######
+
+Documentation for a specific module, ``foo``, should normally go in
+``src/foo/doc/``.  For example ``src/foo/doc/foo.rst`` would be the
+top-level document for the module.  The ``src/create-module.py`` script
+will create this file for you.
+
+Some models require several ``.rst`` files, and figures; these should
+all go in the ``src/foo/doc/`` directory.  The docs are actually build
+by a Sphinx Makefile.  For especially involved
+documentation, it may be helpful to have a local ``Makefile``
+in the ``src/foo/doc/`` directory to
+simplify building the documentation for this module 
+(`Antenna`_ is an example).  Setting this up
+is not particularly hard, but is beyond the scope of this chapter.
+
+In some cases, documentation spans multiple models; the
+`Network`_ chapter is an example.  In these cases
+adding the ``.rst`` files directly to ``doc/models/source/`` might
+be appropriate.
+
+.. _antenna:  http://www.nsnam.org/docs/models/html/antenna.html
+.. _network:  http://www.nsnam.org/docs/models/html/network.html
+
+Link
+####
+
+Sphinx has to know *where* your new chapter should appear.  In most
+cases, a new model chapter should appear the in `Models` book.
+To add your chapter there, edit ``doc/models/source/index.rst``
+
+.. sourcecode:: rest
+
+   .. toctree::
+      :maxdepth: 1
+ 
+     organization
+     animation
+     antenna
+     aodv
+     applications
+     ...
+
+Add the name of your document (without the ``.rst`` extension) to
+this list.  Please keep the Model chapters in alphabetical order,
+to ease visual scanning for specific chapters.
+
+Makefile
+########
+
+You also have to add your document to the appropriate ``Makefile``,
+so ``make`` knows to check it for updates.  The Models book Makefile
+is ``doc/models/Makefile``, the Manual book Makefile is
+``doc/manual/Makefile``.
+
+.. sourcecode:: make
+
+   # list all model library .rst files that need to be copied to $SOURCETEMP
+   SOURCES = \
+           source/conf.py \
+           source/_static \
+           source/index.rst \
+           source/replace.txt \
+           source/organization.rst \
+           ...
+           $(SRC)/antenna/doc/source/antenna.rst \
+           ...
+
+You add your ``.rst`` files to the ``SOURCES`` variable.  To add figures,
+read the comments in the ``Makefile`` to see which variable should contain
+your image files.  Again, please keep these in alphabetical order.
+
+Building Sphinx Docs
+====================
+
+Building the Sphinx documentation is pretty simple.  
+To build all the Sphinx documentation:
+
+.. sourcecode:: bash
+
+   $ ./waf sphinx
+
+To build just the Models documentation:
+
+.. sourcecode:: bash
+
+   $ make -C doc/models
+
+To see the generated documentation point your browser at
+``doc/models/build/html``.
+
+As you can see, Sphinx uses Make to guide the process.
+The default target builds all enabled output forms, which in
+|ns3| are the multi-page ``html``, single-page ``singlehtml``, and pdf
+(``latex``).  To build just the multi-page html, you add the ``html`` target:
+
+.. sourcecode:: bash
+
+   $ make -C doc/models html
+
+This can be helpful to reduce the build time (and the size of the
+build chatter) as you are writing your chapter.
+
+Before committing your documentation to the repo, please check
+that it builds without errors or warnings.  The build process
+generates lots of output (mostly normal chatter from LaTeX),
+which can make it difficult to see if there are any Sphinx
+warnings or errors.  To find important warnings and errors
+build just the ``html`` version, then search the build log
+for ``warning`` or ``error``.
+
+
+|ns3| Specifics
+===============
+
+The Sphinx documentation_ and tutorial_ are pretty good.  We won't duplicate
+the basics here, instead focusing on preferred usage for |ns3|.
+
+.. _documentation:  http://sphinx-doc.org/contents.html
+.. _tutorial:       http://sphinx-doc.org/tutorial.html
+
+
+* Start documents with these two lines:
+   
+  .. sourcecode:: rest
+     
+     .. include:: replace.txt
+     .. highlight:: cpp
+   
+  The first line enables some simple replacements.  For example,
+  typing ``|ns3|`` renders as |ns3|.
+  The second sets the default source code highlighting language explicitly
+  for the file, since the parser guess isn't always accurate.
+  (It's also possible to set the language explicitly for a single code block,
+  see below.)
+
+* Sections:
+  
+  Sphinx is pretty liberal about marking section headings.  By convention,
+  we prefer this hierarchy:
+  
+  .. sourcecode:: rest
+      
+     .. heading hierarchy:
+        ------------- Chapter
+        ************* Section (#.#)
+        ============= Subsection (#.#.#)
+        ############# Sub-subsection
+
+* Syntax Highlighting:
+  
+  To use the default syntax highlighter, simply start a sourcecode block:
+
+  +--------------------------------------+------------------------------------+
+  | Sphinx Source                        | Rendered Output                    |
+  +======================================+====================================+
+  | .. sourcecode:: rest                 |                                    |
+  |                                      |                                    |
+  |   The ``Frobnitz`` is accessed by::  | The ``Frobnitz`` is accessed by::  |
+  |                                      |                                    |
+  |     Foo::Frobnitz frob;              |   Foo::Frobnitz frob;              |
+  |     frob.Set (...);                  |   frob.Set (...);                  |
+  +--------------------------------------+------------------------------------+
+
+  To use a specific syntax highlighter, for example, ``bash`` shell commands:
+
+  +--------------------------------------+------------------------------------+
+  | Sphinx Source                        | Rendered Output                    |
+  +======================================+====================================+
+  | .. sourcecode:: rest                 |                                    |
+  |                                      |                                    |
+  |   .. sourcecode:: bash               | .. sourcecode:: bash               |
+  |                                      |                                    |
+  |      $ ls                            |    $ ls		              |
+  +--------------------------------------+------------------------------------+
+  
+* Shorthand Notations:
+
+  These shorthands are defined:
+
+  +--------------------------------------+------------------------------------+
+  | Sphinx Source                        | Rendered Output                    |
+  +======================================+====================================+
+  | .. sourcecode:: rest                 |                                    |
+  |                                      |                                    |
+  |    |ns3|                             |  |ns3|                             |
+  +--------------------------------------+------------------------------------+
+  | .. sourcecode:: rest                 |                                    |
+  |                                      |                                    |
+  |    |ns2|                             |  |ns2|                             |
+  +--------------------------------------+------------------------------------+
+  | .. sourcecode:: rest                 |                                    |
+  |                                      |                                    |
+  |    |check|                           |  |check|                           |
+  +--------------------------------------+------------------------------------+
+  | .. sourcecode:: rest                 |                                    |
+  |                                      |                                    |
+  |    :rfc:`6282`                       |  :rfc:`6282`                       |
+  +--------------------------------------+------------------------------------+
+
+
+Documenting with Doxygen
+************************
+
+We use Doxygen_ to generate browsable_ API documentation.  Doxygen
+provides a number of useful features:
+
+  * Summary table of all class members.
+  * Graphs of inheritance and collaboration for all classes.
+  * Links to the source code imlementing each function.
+  * Links to every place a member is used.
+  * Links to every object used in implementing a function.
+  * Grouping of related classes, such as all the classes related to
+    a specific protocol.
+
+In addition, we use the ``TypeId`` system to add to the documentation
+for every class
+
+  * The ``Config`` paths by which such objects can be reached.
+  * Documentation for any ``Attributes``, including ``Attributes``
+    defined in parent classes.
+  * Documentation for any ``Trace`` sources defined by the class.
+
+Doxygen operates by scaning the source code, looking for
+specially marked comments.  It also creates a cross reference,
+indicating *where* each file, class, method, and variable is used.
+
+.. _browsable: https://www.nsnam.org/docs/doxygen
+
+
+Preferred Style
+===============
+
+The preferred style for Doxygen comments is the JavaDoc style::
+
+  /**
+   *  Brief description of this class or method.
+   *  Adjacent lines become a single paragraph.
+   *
+   *  Longer description, with lots of details.
+   *
+   *  Blank lines separate paragraphs.
+   *
+   *  Explain what the class or method does, using what algorithm.
+   *  Explain the units of arguments and return values.
+   *
+   *  \note Note any limitations or gotchas.
+   *
+   *  (For functions with arguments or return valued:)
+   *  \param foo Brief noun phrase describing this argument.
+   *  \param bar Note Sentence case, and terminating period.
+   *  \return Brief noun phrase describing the value.
+   *
+   *  \internal
+   *
+   *  You can also discuss internal implementation details.
+   *  Understanding this material shouldn't be necessary to using
+   *  the class or method.
+   */
+   class Example
+
+In this style the Doxygen comment block begins with two \`*' characters:
+``/**``, and precedes the item being documented.
+
+For items needing only a brief description, either of these short forms
+is appropriate::
+
+  /** Destructor implementation. */
+  void DoDispose ();
+
+  int m_count;  //!< Count of ...
+
+Note the special form of the end of line comment, ``//!<``, indicating
+that it refers to the *preceding* item.
+
+Some items to note:
+
+  * Use sentence case, including the initial capital.
+  * Use punctuation, especially \`.'s at the end of sentences or phrases.
+  * The ``\brief`` tag is not needed; the first sentence will be
+    used as the brief description.
+
+Every class, method, typedef, member variable, function argument
+and return value should be documented in all source code files
+which form the formal API and implementation for |ns3|, such as
+``src/<module>/model/*``, ``src/<module>/helper/*`` and
+``src/<module>/utils/*``.  Documentation for items in ``src/<module>/test/*``
+and ``src/<module>/examples/*`` is preferred, but not required.
+
+Useful Features
+===============
+
+* Inherited members will automatically inherit docs from the parent,
+  (but can be replaced by local documentation).
+
+  #. Document the base class.
+  #. In the sub class mark inherited functions with an ordinary comment::
+
+       // Inherited methods
+       virtual void FooBar (void);
+       virtual int BarFoo (double baz);
+
+     Note that the signatures have to match exactly, so include the formal
+     argument ``(void)``
+
+     This doesn't work for static functions; see ``GetTypeId``, below, for an
+     example.
+
+Building Doxygen Docs
+=====================
+
+Building the Doxygen documentation is pretty simple:
+
+.. sourcecode:: bash
+
+   $ ./waf doxygen
+
+This builds using the default configuration, which generates documentation
+sections for *all* items, even if they do not have explicit comment
+documentation blocks.  This has the effect of suppressing warnings for
+undocumented items, but makes sure everything appears in the generated
+output.
+
+When writing documentation, it's often more useful to see which items
+are generating warnings, typically about missing documentation.
+To see the full warnings list, use the ``doc/doxygen.warnings.report.sh``
+script:
+
+.. sourcecode:: bash
+
+   $ doc/doxygen.warnings.report.sh
+   Waf: Entering directory `build'
+   ...
+   Waf: Leaving directory `build'
+   'build' finished successfully (3m24.094s)
+
+   Rebuilding doxygen docs with full errors...Done.
+
+
+   Report of Doxygen warnings
+   ----------------------------------------
+
+   (All counts are lower bounds.)
+
+   Warnings by module/directory:
+
+   Count Directory
+   ----- ----------------------------------
+   3844 src/lte/model
+   1718 src/wimax/model
+   1423 src/core/model
+   ....
+    138 additional undocumented parameters.
+   ----------------------------------------
+    15765 total warnings
+      126 directories with warnings
+
+
+   Warnings by file (alphabetical)
+
+   Count File
+   ----- ----------------------------------
+     17 doc/introspected-doxygen.h
+     15 examples/routing/manet-routing-compare.cc
+     26 examples/stats/wifi-example-apps.h
+   ....
+   ----------------------------------------
+      967 files with warnings
+
+
+   Warnings by file (numerical)
+
+   Count File
+   ----- ----------------------------------
+    374 src/lte/model/lte-asn1-header.h
+    280 src/lte/model/lte-rrc-sap.h
+    262 src/lte/model/lte-rrc-header.h
+   ....
+   ----------------------------------------
+      967 files with warnings
+
+
+   Doxygen Warnings Summary
+   ----------------------------------------
+      126 directories
+      967 files
+    15765 warnings
+
+The script modifies the configuration to show all warnings, and
+to shorten the run time.  As you can see, at this writing we have
+*a lot* of undocumented items.  The report summarizes warnings
+by module ``src/*/*``, and by file, in alphabetically and numerical
+order.
+
+The script has a few options to pare things down and make this more
+manageable.  For help, use the ``-h`` option.  Having run it once
+to do the Doxygen build and generate the full warnings log,
+you can reprocess the log file with various "filters,"
+without having to do the full Doxygen build by,
+again using the ``-s`` option.  You can exclude warnings
+from ``*/examples/*`` files (``-e`` option), and/or ``*/test/*`` files
+(``-t``).
+
+Perhaps the most useful option when writing documentation comments
+is ``-m <module>``, which will limit the report to just files matching
+``src/<module>/*``, and follow the report with the actual warning lines.
+Combine with ``-et`` and you can focus on the warnings that are most
+urgent in a single module:
+
+.. sourcecode:: bash
+
+   $ doc/doxygen.warnings.report.sh -m mesh/helper
+   ...
+   Doxygen Warnings Summary
+   ----------------------------------------
+     1 directories
+     3 files
+   149 warnings
+
+
+   Filtered Warnings
+   ========================================
+   src/mesh/helper/dot11s/dot11s-installer.h:72: warning: Member m_root (variable) of class ns3::Dot11sStack is not documented.
+   src/mesh/helper/dot11s/dot11s-installer.h:35: warning: return type of member ns3::Dot11sStack::GetTypeId is not documented
+   src/mesh/helper/dot11s/dot11s-installer.h:56: warning: return type of member ns3::Dot11sStack::InstallStack is not documented
+   src/mesh/helper/flame/flame-installer.h:40: warning: Member GetTypeId() (function) of class ns3::FlameStack is not documented.
+   src/mesh/helper/flame/flame-installer.h:60: warning: return type of member ns3::FlameStack::InstallStack is not documented
+   src/mesh/helper/mesh-helper.h:213: warning: Member m_nInterfaces (variable) of class ns3::MeshHelper is not documented.
+   src/mesh/helper/mesh-helper.h:214: warning: Member m_spreadChannelPolicy (variable) of class ns3::MeshHelper is not documented.
+   src/mesh/helper/mesh-helper.h:215: warning: Member m_stack (variable) of class ns3::MeshHelper is not documented.
+   src/mesh/helper/mesh-helper.h:216: warning: Member m_stackFactory (variable) of class ns3::MeshHelper is not documented.
+   src/mesh/helper/mesh-helper.h:209: warning: parameters of member ns3::MeshHelper::CreateInterface are not (all) documented
+   src/mesh/helper/mesh-helper.h:119: warning: parameters of member ns3::MeshHelper::SetStandard are not (all) documented
+
+
+Now it's just a matter of understanding the code, and writing some
+docs!
+
+
+
+|ns3| Specifics
+===============
+
+As for Sphinx, the Doxygen docs_ and reference_ are pretty good.
+We won't duplicate the basics here, instead focusing on preferred
+usage for |ns3|.
+
+.. _docs:       http://www.stack.nl/~dimitri/doxygen/index.html
+.. _reference:  http://www.stack.nl/~dimitri/doxygen/manual/commands.html
+
+
+* Use Doxygen ``Modules`` to group related items.
+
+  In the main header for a module, create a Doxgyen group::
+
+    /**
+     *  \defgroup foo Foo protocol.
+     */
+
+  Mark each associated class as belonging to the group::
+
+    /**
+     *  \ingroup foo
+     *
+     *  Foo packet type.
+    */
+    class Foo
+
+* Copy the ``Attribute`` help strings from the ``GetTypeId`` method to use
+  as the brief descriptions of associated members.
+
+* ``\bugid{298}`` will create a link to bug 298 in our Bugzilla.
+
+* ``\pname{foo}`` in a description will format ``foo``
+  as a ``\param foo`` parameter, making it clear that you
+  are referring to an actual argument.
+
+* ``\RFC{301}`` will create a link to RFC 301.
+
+* ``\internal`` should be used only to set off a discussion of implementation
+  details, not to mark ``private`` functions (they are already marked,
+  as ``private``!)
+
+* Don't create classes with trivial names, such as ``class A``,
+  even in test suites.  These cause all instances of the class name
+  literal \`A' to be rendered as links.
+
+
+As noted above, static functions don't inherit the documentation
+of the same functions in the parent class.  |ns3| uses a few static
+functions ubiquitously; the suggested documentation block for these
+cases is:
+
+  * Default constructor/destructor::
+
+      MyClass ();   //!< Default constructor
+      ~MyClass ();  //!< Destructor
+
+  * Dummy destructor and DoDispose::
+
+      /** Dummy destructor, see DoDispose. */
+      ~MyClass ();
+
+      /** Destructor implementation */
+      virtual void DoDispose ();
+
+  * GetTypeId::
+
+      /**
+       *  Register this type.
+       *  \return The object TypeId.
+       */
+      static TypeId GetTypeId (void);
+
+
+
diff -Naur ns-3.18.1/doc/manual/source/logging.rst ns-3.19/doc/manual/source/logging.rst
--- ns-3.18.1/doc/manual/source/logging.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/manual/source/logging.rst	2013-12-20 09:44:50.000000000 -0800
@@ -22,16 +22,14 @@
 frameworks on top of logging code, as the output and the way the output
 is enabled may change over time. 
 
-Logging overview
-****************
+Overview
+********
 
 |ns3| logging statements are typically used to log various program
 execution events, such as the occurrence of simulation events or the
 use of a particular function.
 
-For example, this code snippet is from ``Ipv4L3Protocol::IsDestinationAddress()``:
-
-::
+For example, this code snippet is from ``Ipv4L3Protocol::IsDestinationAddress()``::
 
   if (address == iaddr.GetBroadcast ())
     {
@@ -39,121 +37,393 @@
       return true;
      }
 
-If logging has been enabled for the ``Ipv4L3Protocol`` component at a level
-of ``LOGIC`` or above (see below about logging levels), the statement
+If logging has been enabled for the ``Ipv4L3Protocol`` component at a severity
+of ``LOGIC`` or above (see below about log severity), the statement
 will be printed out; otherwise, it will be suppressed.
 
-Logging levels
-==============
+Enabling Output
+===============
 
-The following levels are defined; each level will enable the levels above
-it, with the ``ALL`` level being most verbose:
+There are two ways that users typically control log output.  The
+first is by setting the ``NS_LOG`` environment variable; e.g.:
 
-#. ``LOG_NONE``:  the default, no logging
-#. ``LOG_ERROR``:  serious error messages only
-#. ``LOG_WARN``:  warning messages
-#. ``LOG_DEBUG``:  for use in debugging
-#. ``LOG_FUNCTION``: function tracing
-#. ``LOG_LOGIC``:  control flow tracing within functions
-#. ``LOG_ALL``:  print everything
+.. sourcecode:: bash
 
-A special logging level will cause logging output to unconditionally
-appear on ``std::clog``, regardless of whether the user has explicitly enabled 
-logging.
-This macro, ``NS_LOG_UNCOND()``, can be used like a kind of ``printf()`` in
-your code.  An example can be found in ``scratch/scratch-simulator.cc``:
+   $ NS_LOG="*" ./waf --run first
 
-::
+will run the ``first`` tutorial program with all logging output.  (The
+specifics of the ``NS_LOG`` format will be discussed below.)
 
-   NS_LOG_UNCOND ("Scratch Simulator");
+This can be made more granular by selecting individual components:
 
-Logging prefixes
-================
+.. sourcecode:: bash
 
-This section still needs documentation; bug 1496 is open on this:
+   $ NS_LOG="Ipv4L3Protocol" ./waf --run first
 
-.. sourcecode:: bash
+The output can be further tailored with prefix options.
+  
+The second way to enable logging is to use explicit statements in your
+program, such as in the ``first`` tutorial program::
+   
+   int
+   main (int argc, char *argv[])
+   {
+     LogComponentEnable ("UdpEchoClientApplication", LOG_LEVEL_INFO);
+     LogComponentEnable ("UdpEchoServerApplication", LOG_LEVEL_INFO);
+     ...
 
-   $ NS_LOG="*=all|prefix_all" ./waf --run scratch-simulator
-   Scratch Simulator
-   ScratchSimulator:main(): [ERROR] error message
-   ScratchSimulator:main(): [WARN] warn message
-   ScratchSimulator:main(): [DEBUG] debug message
-   ScratchSimulator:main(): [INFO] info message
-   ScratchSimulator:main(function)
-   ScratchSimulator:main(): [LOGIC] logic message
+(The meaning of ``LOG_LEVEL_INFO``, and other possible values,
+will be discussed below.)
 
-Enabling logging output
-=======================
+``NS_LOG`` Syntax
+=================
 
-There are two ways that users typically control logging output.  The
-first is by setting an ``NS_LOG`` environment variable; e.g.:
+The ``NS_LOG`` environment variable contains a list of log components
+and options.  Log components are separated by \`:' characters:
 
 .. sourcecode:: bash
 
-   $ NS_LOG="*" ./waf --run first
+   $ NS_LOG="<log-component>:<log-component>..."
 
-will run the first tutorial program with all logging output.  This can
-be made more granular by selecting individual components:
+Options for each log component are given as flags after
+each log component:
 
 .. sourcecode:: bash
 
-   $ NS_LOG="Ipv4L3Protocol" ./waf --run first
-  
-The second way to enable this is to use explicit statements in your
-program, such as in the first tutorial program:
+   $ NS_LOG="<log-component>=<option>|<option>...:<log-component>..."
 
-::
-   
-   int
-   main (int argc, char *argv[])
-   {
-     LogComponentEnable ("UdpEchoClientApplication", LOG_LEVEL_INFO);
-     LogComponentEnable ("UdpEchoServerApplication", LOG_LEVEL_INFO);
-     ...
+Options control the severity and level for that component,
+and whether optional information should be included, such as the
+simulation time, simulation node, function name, and the symbolic severity.
 
-Some helpers have special methods to enable the logging of all components
-in a module (across different compilation units, but logically grouped
-together such as the |ns3| wifi code:
+Log Components
+==============
 
-::
+Generally a log component refers to a single source code ``.cc`` file,
+and encompasses the entire file.
+
+Some helpers have special methods to enable the logging of all components
+in a module, spanning different compilation units, but logically grouped
+together, such as the |ns3| wifi code::
 
    WifiHelper wifiHelper;
    wifiHelper.EnableLogComponents (); 
 
+The ``NS_LOG`` log component wildcard \`*' will enable all components.
+
+To see what log components are defined, any of these will work:
+
+.. sourcecode:: bash
+
+   $ NS_LOG="print-list" ./waf --run ...
+
+   $ NS_LOG="foo"  # a token not matching any log-component
+
+The first form will print the name and enabled flags for all log components
+which are linked in; try it with ``scratch-simulator``.
+The second form prints all registered log components,
+then exit with an error.
+
+
+Severity and Level Options
+==========================
+
+Individual messages belong to a single "severity class," set by the macro
+creating the message.  In the example above,
+``NS_LOG_LOGIC(..)`` creates the message in the ``LOG_LOGIC`` severity class.
+
+The following severity classes are defined as ``enum`` constants:
+
+================  =====================================
+Severity Class    Meaning
+================  =====================================
+``LOG_NONE``      The default, no logging
+``LOG_ERROR``     Serious error messages only
+``LOG_WARN``      Warning messages
+``LOG_DEBUG``     For use in debugging
+``LOG_INFO``      Informational
+``LOG_FUNCTION``  Function tracing
+``LOG_LOGIC``     Control flow tracing within functions
+================  =====================================
+
+Typically one wants to see messages at a given severity class *and higher*.
+This is done by defining inclusive logging "levels":
+
+======================  ===========================================
+Level                   Meaning
+======================  ===========================================
+``LOG_LEVEL_ERROR``     Only ``LOG_ERROR`` severity class messages.
+``LOG_LEVEL_WARN``      ``LOG_WARN`` and above.
+``LOG_LEVEL_DEBUG``     ``LOG_DEBUG`` and above.
+``LOG_LEVEL_INFO``      ``LOG_INFO`` and above.
+``LOG_LEVEL_FUNCTION``  ``LOG_FUNCTION`` and above.
+``LOG_LEVEL_LOGIC``     ``LOG_LOGIC`` and above.
+``LOG_LEVEL_ALL``       All severity classes.
+``LOG_ALL``             Synonym for ``LOG_LEVEL_ALL``
+======================  ===========================================
+
+The severity class and level options can be given in the ``NS_LOG``
+environment variable by these tokens:
+
+============  =================
+Class         Level
+============  =================
+``error``     ``level_error``
+``warn``      ``level_warn``
+``debug``     ``level_debug``
+``info``      ``level_info``
+``function``  ``level_function``
+``logic``     ``level_logic``
+..            | ``level_all``
+              | ``all``
+              | ``*``
+============  =================
+
+Using a severity class token enables log messages at that severity only.
+For example, ``NS_LOG="*=warn"`` won't output messages with severity ``error``.
+``NS_LOG="*=level_debug"`` will output messages at severity levels
+``debug`` and above.
+
+Severity classes and levels can be combined with the \`|' operator:
+``NS_LOG="*=level_warn|logic"`` will output messages at severity levels
+``error``, ``warn`` and ``logic``.
+
+The ``NS_LOG`` severity level wildcard \`*' and ``all``
+are synonyms for ``level_all``.
+
+For log components merely mentioned in ``NS_LOG``
+
+.. sourcecode:: bash
+
+   $ NS_LOG="<log-component>:..."
+
+the default severity is ``LOG_LEVEL_ALL``.
+
+
+Prefix Options
+==============
+
+A number of prefixes can help identify
+where and when a message originated, and at what severity.
+
+The available prefix options (as ``enum`` constants) are
+
+======================  ===========================================
+Prefix Symbol           Meaning
+======================  ===========================================
+``LOG_PREFIX_FUNC``     Prefix the name of the calling function.
+``LOG_PREFIX_TIME``     Prefix the simulation time.
+``LOG_PREFIX_NODE``     Prefix the node id.
+``LOG_PREFIX_LEVEL``    Prefix the severity level.
+``LOG_PREFIX_ALL``      Enable all prefixes.
+======================  ===========================================
+
+The prefix options are described briefly below.
+
+The options can be given in the ``NS_LOG``
+environment variable by these tokens:
+
+================  =========
+Token             Alternate
+================  =========
+``prefix_func``   ``func``
+``prefix_time``   ``time``
+``prefix_node``   ``node``
+``prefix_level``  ``level``
+``prefix_all``    | ``all``
+                  | ``*``
+================  =========
+
+For log components merely mentioned in ``NS_LOG``
+
+.. sourcecode:: bash
+
+   $ NS_LOG="<log-component>:..."
+
+the default prefix options are ``LOG_PREFIX_ALL``.
+
+Severity Prefix
+###############
+
+The severity class of a message can be included with the options
+``prefix_level`` or ``level``.  For example, this value of ``NS_LOG``
+enables logging for all log components (\`*') and all severity
+classes (``=all``), and prefixes the message with the severity
+class (``|prefix_level``).
+
+.. sourcecode:: bash
+
+   $ NS_LOG="*=all|prefix_level" ./waf --run scratch-simulator
+   Scratch Simulator
+   [ERROR] error message
+   [WARN] warn message
+   [DEBUG] debug message
+   [INFO] info message
+   [FUNCT] function message
+   [LOGIC] logic message
+
+Time Prefix
+###########
+
+The simulation time can be included with the options
+``prefix_time`` or ``time``.  This prints the simulation time in seconds.
+
+Node Prefix
+###########
+
+The simulation node id can be included with the options
+``prefix_node`` or ``node``.
+
+Function Prefix
+###############
+
+The name of the calling function can be included with the options
+``prefix_func`` or ``func``.
+
+
+``NS_LOG`` Wildcards
+####################
+
+The log component wildcard \`*' will enable all components.  To
+enable all components at a specific severity level
+use ``*=<severity>``.
+
+The severity level option wildcard \`*' is a synonym for ``all``.
+This must occur before any \`|' characters separating options.
+To enable all severity classes, use ``<log-component>=*``,
+or ``<log-component>=*|<options>``.
+
+The option wildcard \`*' or token ``all`` enables all prefix options,
+but must occur *after* a \`|' character.  To enable a specific
+severity class or level, and all prefixes, use
+``<log-component>=<severity>|*``.
+
+The combined option wildcard ``**`` enables all severities and all prefixes;
+for example, ``<log-component>=**``.
+
+The uber-wildcard ``***`` enables all severities and all prefixes
+for all log components.  These are all equivalent:
+
+.. sourcecode:: bash
+
+   $ NS_LOG="***" ...      $ NS_LOG="*=all|*" ...        $ NS_LOG="*=*|all" ...	      
+   $ NS_LOG="*=**" ...     $ NS_LOG="*=level_all|*" ...  $ NS_LOG="*=*|prefix_all" ...
+   $ NS_LOG="*=*|*" ...
+                       
+Be advised:  even the trivial ``scratch-simulator`` produces over
+46K lines of output with ``NS_LOG="***"``!
+
 
 How to add logging to your code
 *******************************
 
-To add logging to your code, please follow the below steps:
+Adding logging to your code is very simple:
+
+1. Invoke the ``NS_LOG_COMPONENT_DEFINE (...);`` macro
+   outside of ``namespace ns3``.
+
+  Create a unique string identifier (usually based on the name of the file
+  and/or class defined within the file) and register it with a macro call
+  such as follows:
+
+  ::
+
+    NS_LOG_COMPONENT_DEFINE ("Ipv4L3Protocol");
+
+    namespace ns3 {
+    ...
+
+  This registers ``Ipv4L3Protocol`` as a log component.
+
+  (The macro was carefully written to permit inclusion either within or
+  outside of namespace ``ns3``, and usage will vary across the codebase, but
+  the original intent was to register this *outside* of namespace ``ns3``
+  at file global scope.)
+
+2. Add logging statements (macro calls) to your functions and function bodies.
+
+Logging Macros
+==============
+
+  The logging macros and associated severity levels are
+
+  ================  ==========================
+  Severity Class    Macro
+  ================  ==========================
+  ``LOG_NONE``      (none needed)
+  ``LOG_ERROR``     ``NS_LOG_ERROR (...);``
+  ``LOG_WARN``      ``NS_LOG_WARN (...);``
+  ``LOG_DEBUG``     ``NS_LOG_DEBUG (...);``
+  ``LOG_INFO``      ``NS_LOG_INFO (...);``
+  ``LOG_FUNCTION``  ``NS_LOG_FUNCTION (...);``
+  ``LOG_LOGIC``     ``NS_LOG_LOGIC (...);``
+  ================  ==========================
+
+  The macros function as output streamers, so anything you can send to
+  ``std::cout``, joined by ``<<`` operators, is allowed::
+
+    void MyClass::Check (int value, char * item)
+    {
+      NS_LOG_FUNCTION (this << arg << item);
+      if (arg > 10)
+        {
+          NS_LOG_ERROR ("encountered bad value " << value <<
+                        " while checking " << name << "!");
+        }
+      ...
+    }
+
+  Note that ``NS_LOG_FUNCTION`` automatically inserts a \`\ :literal:`,\ `'
+  (comma-space) separator between each of its arguments.
+  This simplifies logging of function arguments;
+  just concatenate them with ``<<`` as in the example above.
+
+Unconditional Logging
+=====================
+
+As a convenience, the ``NS_LOG_UNCOND (...);`` macro will always log its
+arguments, even if the associated log-component is not enabled at any
+severity.  This macro does not use any of the prefix options.  Note that
+logging is only enabled in debug builds; this macro won't produce
+output in optimized builds.
+
+
+Guidelines
+==========
+
+* Start every class method with ``NS_LOG_FUNCTION (this << args...);``
+  This enables easy function call tracing.
+
+  * Except:  don't log operators or explicit copy constructors, 
+    since these will cause infinite recursion and stack overflow.
+
+  * For methods without arguments use the same form:
+    ``NS_LOG_FUNCTION (this);``
+
+  * For static functions:
+
+    * With arguments use ``NS_LOG_FUNCTION (...);`` as normal.
+    * Without arguments use ``NS_LOG_FUNCTION_NOARGS ();``
 
-1) Put ``NS_LOG_COMPONENT_DEFINE`` macro outside of namespace ns3
+* Use ``NS_LOG_ERROR`` for serious error conditions that probably
+  invalidate the simulation execution.
 
-Create a unique string identifier (usually based on the name of the file
-and/or class defined within the file) and register it with a macro call
-such as follows:
+* Use ``NS_LOG_WARN`` for unusual conditions that may be correctable.
+  Please give some hints as to the nature of the problem and how
+  it might be corrected.
 
-::
+* ``NS_LOG_DEBUG`` is usually used in an *ad hoc* way to understand
+  the execution of a model.
 
-   NS_LOG_COMPONENT_DEFINE ("Ipv4L3Protocol");
+* Use ``NS_LOG_INFO`` for additional information about the execution,
+  such as the size of a data structure when adding/removing from it.
 
-   namespace ns3 {
-   ...
+* Use ``NS_LOG_LOGIC`` to trace important logic branches within a function.
 
-The macro was carefully written to permit inclusion either within or
-outside of namespace ``ns3``, and usage will vary across the codebase, but
-the original intent was to register this *outside* of namespace ``ns3``.
+* Test that your logging changes do not break the code.  
+  Run some example programs with all log components turned on (e.g. 
+  ``NS_LOG="***"``).
 
-2) Add logging statements to your functions and function bodies.
 
-There are a couple of guidelines on this:
 
-* Do *not* add function logging in operators or explicit copy constructors, 
-  since these will cause infinite recursion and stack overflow.
-* Use the ``NS_LOG_FUNCTION_NOARGS()`` variant for static methods *only*. When 
-  a non-static member function has no arguments, it should be logged by 
-  ``NS_LOG_FUNCTION (this)`` macro.
-* Make sure that you test that your logging changes do not break the code; 
-  running some example programs with all log components turned on (e.g. 
-  ``NS_LOG="*"``) is one way to test this.
 
diff -Naur ns-3.18.1/doc/manual/source/new-models.rst ns-3.19/doc/manual/source/new-models.rst
--- ns-3.18.1/doc/manual/source/new-models.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/manual/source/new-models.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,8 +1,8 @@
 .. include:: replace.txt
 .. highlight:: cpp
 
-Creating a new ns-3 model
--------------------------
+Creating a new |ns3| model
+--------------------------
 
 This chapter walks through the design process of an |ns3| model.  In many
 research cases, users will not be satisfied to merely adapt existing models, but
@@ -11,7 +11,16 @@
 of how one might approach this problem and proceed through a design and
 implementation.
 
-Design-approach
+.. note:: Documentation
+
+   Here we focus on the process of creating new models
+   and new modules, and some of the design choices involved.
+   For the sake of clarity, we defer discussion of the
+   *mechanics* of documenting models and source code to the
+   :doc:`Documentation <documentation>` chapter.
+
+
+Design Approach
 ***************
 
 Consider how you want it to work; what should it do. Think about these things:
@@ -26,13 +35,13 @@
   should I avoid any dependence on IPv4 if I want it to also be used by IPv6?
   Should I avoid any dependency on IP at all?
 
-Do not be hesitant to contact the ns-3-users or ns-developers list if you have
+Do not be hesitant to contact the `ns-3-users` or `ns-developers` list if you have
 questions. In particular, it is important to think about the public API of your
 new model and ask for feedback. It also helps to let others know of your work in
 case you are interested in collaborators.
 
-Example: ErrorModel
-+++++++++++++++++++
+Example: `ErrorModel`
++++++++++++++++++++++
 
 An error model exists in |ns2|. It allows packets to be passed to a stateful
 object that determines, based on a random variable, whether the packet is
@@ -44,7 +53,7 @@
 corruption occurred.  Note that depending on the error model, the packet data
 buffer may or may not be corrupted.  Let's call this function "IsCorrupt()".
 
-So far, in our design, we have:::
+So far, in our design, we have::
 
     class ErrorModel
     {
@@ -95,7 +104,7 @@
 NetDevice level.
 
 After some thinking and looking at existing |ns2| code, here is a sample API of
-a base class and first subclass that could be posted for initial review:::
+a base class and first subclass that could be posted for initial review::
 
     class ErrorModel 
     {
@@ -158,16 +167,16 @@
 will collide with the existing error model. The below is just an outline of how
 ErrorModel was built that you can adapt to other models.
 
-Review the ns-3 coding style document
-+++++++++++++++++++++++++++++++++++++
+Review the |ns3| Coding Style Document
+++++++++++++++++++++++++++++++++++++++
 
 At this point, you may want to pause and read the |ns3| coding style document,
 especially if you are considering to contribute your code back to the project.
 The coding style document is linked off the main project page: `ns-3 coding
 style <http://www.nsnam.org/developers/contributing-code/coding-style/>`_.
 
-Decide where in the source tree the model will reside in
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Decide Where in the Source Tree the Model Should Reside
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 All of the |ns3| model source code is in the directory ``src/``.  You will need
 to choose which subdirectory it resides in. If it is new model code of some
@@ -178,8 +187,8 @@
 makes sense to implement this in the ``src/network/`` module where |ns3|
 packets are implemented.  
 
-waf and wscript
-+++++++++++++++
+`waf` and `wscript`
++++++++++++++++++++
 
 |ns3| uses the `Waf <http://www.freehackers.org/~tnagy/waf.html>`_ build system.
 You will want to integrate your new |ns3| uses the Waf build system. You will
@@ -193,7 +202,7 @@
 Now, pop up to the top level directory and type "./test.py".  You
 shouldn't have broken anything by this operation.
 
-include guards
+Include Guards
 ++++++++++++++
 
 Next, let's add some `include guards
@@ -204,8 +213,8 @@
     ...
     #endif
 
-namespace ns3
-+++++++++++++
+`namespace ns3`
++++++++++++++++
 
 |ns3| uses the |ns3| `namespace
 <http://en.wikipedia.org/wiki/Namespace_(computer_science)#Use_in_common_languages>`_
@@ -217,7 +226,7 @@
     }
 
 At this point, we have some skeletal files in which we can start defining
-our new classes. The header file looks like this:::
+our new classes. The header file looks like this::
 
     #ifndef ERROR_MODEL_H
     #define ERROR_MODEL_H
@@ -227,7 +236,7 @@
     } // namespace ns3
     #endif
 
-while the ``error-model.cc`` file simply looks like this:::
+while the ``error-model.cc`` file simply looks like this::
 
     #include "error-model.h"
 
@@ -244,8 +253,8 @@
 At this point, we're still working on some scaffolding, but we can begin to
 define our classes, with the functionality to be added later.
 
-use of class Object?
-++++++++++++++++++++
+Inherit from the `Object` Class?
+++++++++++++++++++++++++++++++++
 
 This is an important design step; whether to use class :cpp:class:`Object` as a
 base class for your new classes.
@@ -268,7 +277,7 @@
 instances of this object across the |ns3| public API, so class
 :cpp:class:`Object` is appropriate for us.
 
-initial classes
+Initial Classes
 +++++++++++++++
 
 One way to proceed is to start by defining the bare minimum functions and see if
@@ -374,28 +383,28 @@
 registration of the class into the system.  The :ref:`Object-model` chapter
 discusses this in more detail.
 
-how to include files from elsewhere
-+++++++++++++++++++++++++++++++++++
+Including External Files
+++++++++++++++++++++++++
 
-log component 
-+++++++++++++
+Logging Support
++++++++++++++++
 
 *Here, write a bit about adding |ns3| logging macros. Note that
 LOG_COMPONENT_DEFINE is done outside the namespace ns3*
 
-constructor, empty function prototypes
+Constructor, Empty Function Prototypes
 ++++++++++++++++++++++++++++++++++++++
 
-key variables (default values, attributes)
+Key Variables (Default Values, Attributes)
 ++++++++++++++++++++++++++++++++++++++++++
 
-test program 1
+Test Program 1
 ++++++++++++++
 
 Object Framework
 ++++++++++++++++
 
-Adding-a-sample-script
+Adding a Sample Script
 **********************
 
 At this point, one may want to try to take the basic scaffolding defined above
@@ -404,7 +413,7 @@
 API modifications need to be made. Once this is done, we will return to building
 out the functionality of the ErrorModels themselves.
 
-Add basic support in the class
+Add Basic Support in the Class
 ++++++++++++++++++++++++++++++
 
 ::
@@ -435,7 +444,7 @@
                        MakePointerAccessor (&PointToPointNetDevice::m_receiveErrorModel),
                        MakePointerChecker<ErrorModel> ())
 
-Plumb into the system
+Plumb Into the System
 +++++++++++++++++++++
 
 ::
@@ -469,7 +478,7 @@
         }
     }
 
-Create null functional script
+Create Null Functional Script
 +++++++++++++++++++++++++++++
 
 ::
@@ -499,8 +508,8 @@
 "Corrupt!" for each packet received at node n3. Next, we return to the error
 model to add in a subclass that performs more interesting error modeling.
 
-Add subclass
-************
+Add a Subclass
+**************
 
 The trivial base class ErrorModel does not do anything interesting, but it
 provides a useful base class interface (Corrupt () and Reset ()), forwarded to
@@ -523,7 +532,7 @@
   of granularity.
 * Ability to enable/disable (default is enabled)
 
-How to subclass
+How to Subclass
 +++++++++++++++
 
 We declare BasicErrorModel to be a subclass of ErrorModel as follows,::
@@ -541,7 +550,7 @@
     }
 
 and configure the subclass GetTypeId function by setting a unique TypeId string
-and setting the Parent to ErrorModel:::
+and setting the Parent to ErrorModel::
 
     TypeId RateErrorModel::GetTypeId (void)
     {
@@ -550,12 +559,12 @@
         .AddConstructor<RateErrorModel> ()
       ...
 
-Build-core-functions-and-unit-tests
+Build Core Functions and Unit Tests
 ***********************************
 
-assert macros
+Assert Macros
 +++++++++++++
 
-Writing unit tests
+Writing Unit Tests
 ++++++++++++++++++
 
diff -Naur ns-3.18.1/doc/manual/source/object-model.rst ns-3.19/doc/manual/source/object-model.rst
--- ns-3.18.1/doc/manual/source/object-model.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/manual/source/object-model.rst	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,7 @@
 C++ objects, in general, provide common object-oriented capabilities 
 (abstraction, encapsulation, inheritance, and polymorphism) that are part 
 of classic object-oriented design. |ns3| objects make use of these 
-properties; for instance:::
+properties; for instance::
 
     class Address
     {
@@ -130,7 +130,7 @@
 frameworks available. Specifically, reference counted objects are usually
 allocated using a templated Create or CreateObject method, as follows.
 
-For objects deriving from class :cpp:class:`Object`:::
+For objects deriving from class :cpp:class:`Object`::
 
     Ptr<WifiNetDevice> device = CreateObject<WifiNetDevice> ();
 
@@ -139,7 +139,7 @@
 
 For objects deriving from class :cpp:class:`SimpleRefCount`, or other objects
 that support usage of the smart pointer class, a templated helper function is
-available and recommended to be used:::
+available and recommended to be used::
 
     Ptr<B> b = Create<B> ();
 
@@ -218,7 +218,7 @@
 implementation of IPv4 previously aggregated to it. The client code wishes to
 configure a default route. To do so, it must access an object within the node
 that has an interface to the IP forwarding configuration. It performs the
-following:::
+following::
 
     Ptr<Ipv4> ipv4 = m_node->GetObject<Ipv4> ();
 
@@ -281,7 +281,7 @@
 
 The answer to this is that in many situations, both techniques will work.
 |ns3| provides a templated function for making the syntax of Object
-dynamic casting much more user friendly:::
+dynamic casting much more user friendly::
 
     template <typename T1, typename T2>
     Ptr<T1>
diff -Naur ns-3.18.1/doc/manual/source/support.rst ns-3.19/doc/manual/source/support.rst
--- ns-3.18.1/doc/manual/source/support.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/manual/source/support.rst	2013-12-20 09:44:50.000000000 -0800
@@ -5,6 +5,7 @@
 
    new-models
    new-modules
+   documentation
    enable-modules
    enable-tests
    troubleshoot
diff -Naur ns-3.18.1/doc/manual/source/tracing.rst ns-3.19/doc/manual/source/tracing.rst
--- ns-3.18.1/doc/manual/source/tracing.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/manual/source/tracing.rst	2013-12-20 09:44:50.000000000 -0800
@@ -244,7 +244,7 @@
 The first thing to do is to read the path backward. The last segment of the path
 must be an ``Attribute`` of an ``Object``. In fact, if you had a pointer to the
 ``Object`` that has the "CongestionWindow" ``Attribute`` handy (call it
-``theObject``), you could write this just like the previous example:::
+``theObject``), you could write this just like the previous example::
 
   void CwndTracer (uint32_t oldval, uint32_t newval) {}
 
@@ -314,7 +314,7 @@
 primarily "Building Topologies," we have seen several varieties of the trace
 helper methods designed for use inside other (device) helpers.
 
-Perhaps you will recall seeing some of these variations:::
+Perhaps you will recall seeing some of these variations::
 
   pointToPoint.EnablePcapAll ("second");
   pointToPoint.EnablePcap ("second", p2pNodes.Get (0)->GetId (), 0);
@@ -509,7 +509,7 @@
 
 For example, in order to arrange for a device helper to create a single
 promiscuous pcap capture file of a specific name (``my-pcap-file.pcap``) on a
-given device, one could:::
+given device, one could::
 
   Ptr<NetDevice> nd;
   ...
@@ -600,7 +600,7 @@
 
 If you want to enable ascii tracing on more than one net device and have all
 traces sent to a single file, you can do that as well by using an object to
-refer to a single file:::
+refer to a single file::
 
   Ptr<NetDevice> nd1;
   Ptr<NetDevice> nd2;
@@ -632,7 +632,7 @@
 This would result in two files named ``prefix-client-eth0.tr`` and
 ``prefix-server-eth0.tr`` with traces for each device in the respective trace
 file. Since all of the EnableAscii functions are overloaded to take a stream
-wrapper, you can use that form as well:::
+wrapper, you can use that form as well::
 
   Names::Add ("client" ...);
   Names::Add ("client/eth0" ...);
@@ -660,7 +660,7 @@
 
 This would result in a number of ascii trace files being created, each of which
 follows the <prefix>-<node id>-<device id>.tr convention. Combining all of the
-traces into a single file is accomplished similarly to the examples above:::
+traces into a single file is accomplished similarly to the examples above::
 
   NetDeviceContainer d = ...;
   ...
@@ -768,7 +768,7 @@
 ``Node`` and ``NetDevice`` pair constraints, we use protocol and interface
 constraints.
 
-Note that just like in the device version, there are six methods:::
+Note that just like in the device version, there are six methods::
 
   void EnablePcapIpv4 (std::string prefix, Ptr<Ipv4> ipv4, uint32_t interface);
   void EnablePcapIpv4 (std::string prefix, std::string ipv4Name, uint32_t interface);
@@ -948,7 +948,7 @@
 If you want to enable ascii tracing on more than one interface and have all
 traces sent to a single file, you can do that as well by using an object to
 refer to a single file. We have already something similar to this in the "cwnd"
-example above:::
+example above::
 
   Ptr<Ipv4> protocol1 = node1->GetObject<Ipv4> ();
   Ptr<Ipv4> protocol2 = node2->GetObject<Ipv4> ();
@@ -978,7 +978,7 @@
 This would result in two files named "prefix-nnode1Ipv4-i1.tr" and 
 "prefix-nnode2Ipv4-i1.tr" with traces for each interface in the respective 
 trace file. Since all of the EnableAscii functions are overloaded to take a 
-stream wrapper, you can use that form as well:::
+stream wrapper, you can use that form as well::
 
   Names::Add ("node1Ipv4" ...);
   Names::Add ("node2Ipv4" ...);
@@ -1011,7 +1011,7 @@
 
 This would result in a number of ascii trace files being created, each of which
 follows the <prefix>-n<node id>-i<interface>.tr convention. Combining all of the
-traces into a single file is accomplished similarly to the examples above:::
+traces into a single file is accomplished similarly to the examples above::
 
   NodeContainer nodes;
   ...
diff -Naur ns-3.18.1/doc/manual/source/troubleshoot.rst ns-3.19/doc/manual/source/troubleshoot.rst
--- ns-3.18.1/doc/manual/source/troubleshoot.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/manual/source/troubleshoot.rst	2013-12-20 09:44:50.000000000 -0800
@@ -21,7 +21,7 @@
 run-time errors, and can commonly occur when memory is corrupted or pointer
 values are unexpectedly null.
 
-Here is an example of what might occur:::
+Here is an example of what might occur::
 
     $ ./waf --run tcp-point-to-point
     Entering directory '/home/tomh/ns-3-nsc/build'
diff -Naur ns-3.18.1/doc/models/Makefile ns-3.19/doc/models/Makefile
--- ns-3.18.1/doc/models/Makefile	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/models/Makefile	2013-12-20 09:44:50.000000000 -0800
@@ -34,6 +34,7 @@
 	$(SRC)/csma/doc/csma.rst \
 	$(SRC)/dsdv/doc/dsdv.rst \
 	$(SRC)/dsr/doc/dsr.rst \
+	$(SRC)/emu/doc/emu.rst \
 	$(SRC)/mpi/doc/distributed.rst \
 	$(SRC)/energy/doc/energy.rst \
 	$(SRC)/fd-net-device/doc/fd-net-device.rst \
@@ -66,9 +67,19 @@
 	$(SRC)/uan/doc/uan.rst \
 	$(SRC)/topology-read/doc/topology.rst \
 	$(SRC)/spectrum/doc/spectrum.rst \
+	$(SRC)/stats/doc/adaptor.rst \
+	$(SRC)/stats/doc/aggregator.rst \
+	$(SRC)/stats/doc/collector.rst \
+	$(SRC)/stats/doc/data-collection-helpers.rst \
+	$(SRC)/stats/doc/data-collection-overview.rst \
+	$(SRC)/stats/doc/data-collection.rst \
+	$(SRC)/stats/doc/probe.rst \
+	$(SRC)/stats/doc/scope-and-limitations.rst \
 	$(SRC)/stats/doc/statistics.rst \
 	$(SRC)/netanim/doc/animation.rst \
 	$(SRC)/flow-monitor/doc/flow-monitor.rst \
+	$(SRC)/wave/doc/wave.rst \
+	$(SRC)/sixlowpan/doc/sixlowpan.rst \
 
 # list all model library figure files that need to be copied to 
 # $SOURCETEMP/figures.  For each figure to be included in all
@@ -106,12 +117,20 @@
 	$(SRC)/lte/doc/source/figures/lte-arch-ue-ctrl.dia \
 	$(SRC)/lte/doc/source/figures/lte-enb-phy.dia \
 	$(SRC)/lte/doc/source/figures/lte-ue-phy.dia \
+	$(SRC)/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.dia \
 	$(SRC)/lte/doc/source/figures/lte-epc-e2e-data-protocol-stack.dia \
 	$(SRC)/lte/doc/source/figures/lte-interference-test-scenario.dia \
 	$(SRC)/lte/doc/source/figures/lte-subframe-structure.dia \
 	$(SRC)/lte/doc/source/figures/lte-epc-x2-interface.dia \
 	$(SRC)/lte/doc/source/figures/lte-harq-architecture.dia \
 	$(SRC)/lte/doc/source/figures/lte-harq-processes-scheme.dia \
+	$(SRC)/lte/doc/source/figures/ue-meas-consumer.dia \
+	$(SRC)/lte/doc/source/figures/ue-meas-piecewise-motion.dia \
+	$(SRC)/lte/doc/source/figures/ue-meas-piecewise-a1.dia \
+	$(SRC)/lte/doc/source/figures/ue-meas-piecewise-a1-hys.dia \
+	$(SRC)/lte/doc/source/figures/lte-cell-selection-timeline.dia \
+	$(SRC)/lte/doc/source/figures/lte-cell-selection-scenario.dia \
+	$(SRC)/lte/doc/source/figures/lte-handover-target-scenario.dia \
 	$(SRC)/lte/doc/source/figures/lena-dual-stripe.eps \
 	$(SRC)/lte/doc/source/figures/lte-mcs-index.eps \
 	$(SRC)/lte/doc/source/figures/lenaThrTestCase1.eps \
@@ -128,8 +147,8 @@
 	$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-dl.eps \
 	$(SRC)/lte/doc/source/figures/lte-rlc-data-txon-ul.eps \
 	$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-ul.eps \
-	$(SRC)/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.eps \
 	$(SRC)/lte/doc/source/figures/lte-epc-x2-entity-saps.eps \
+	$(SRC)/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps \
 	$(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \
 	$(SRC)/lte/doc/source/figures/lte-phy-interference.png \
 	$(SRC)/lte/doc/source/figures/helpers.pdf \
@@ -150,8 +169,6 @@
 	$(SRC)/lte/doc/source/figures/lte-enb-rrc-states.png \
 	$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.pdf \
 	$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.png \
-	$(SRC)/lte/doc/source/figures/lte-handover-algorithm.pdf \
-	$(SRC)/lte/doc/source/figures/lte-handover-algorithm.png \
 	$(SRC)/lte/doc/source/figures/fading_pedestrian.pdf \
 	$(SRC)/lte/doc/source/figures/fading_pedestrian.png \
 	$(SRC)/lte/doc/source/figures/fading_vehicular.pdf \
@@ -182,9 +199,20 @@
 	$(SRC)/lte/doc/source/figures/MCS_16_test.pdf \
 	$(SRC)/lte/doc/source/figures/miesm_scheme.pdf \
 	$(SRC)/lte/doc/source/figures/miesm_scheme.png \
+	$(SRC)/lte/doc/source/figures/lte-handover-campaign-rem.pdf \
+	$(SRC)/lte/doc/source/figures/lte-handover-campaign-rem.png \
+	$(SRC)/lte/doc/source/figures/lte-legacy-handover-algorithm.pdf \
+	$(SRC)/lte/doc/source/figures/lte-legacy-handover-algorithm.png \
 	$(SRC)/uan/doc/auvmobility-classes.dia \
 	$(SRC)/stats/doc/Stat-framework-arch.png \
 	$(SRC)/stats/doc/Wifi-default.png \
+	$(SRC)/stats/doc/dcf-overview.dia \
+	$(SRC)/stats/doc/dcf-overview-with-aggregation.dia \
+	$(SRC)/stats/doc/file-example.png \
+	$(SRC)/stats/doc/gnuplot-aggregator.png \
+	$(SRC)/stats/doc/gnuplot-example.png \
+	$(SRC)/stats/doc/gnuplot-helper-example.png \
+	$(SRC)/stats/doc/seventh-packet-byte-count.png \
 	$(SRC)/netanim/doc/figures/Dumbbell.png \
 	$(SRC)/netanim/doc/figures/Dumbbell.pdf \
 	$(SRC)/netanim/doc/figures/PacketStatistics.png \
@@ -225,6 +253,8 @@
 	$(FIGURES)/WifiArchitecture.eps \
 	$(FIGURES)/snir.eps \
 	$(FIGURES)/WimaxArchitecture.eps \
+	$(FIGURES)/dcf-overview.eps \
+	$(FIGURES)/dcf-overview-with-aggregation.eps \
 	$(FIGURES)/epc-ctrl-arch.eps \
 	$(FIGURES)/epc-data-flow-dl.eps \
 	$(FIGURES)/epc-data-flow-ul.eps \
@@ -246,6 +276,13 @@
 	$(FIGURES)/lte-epc-x2-interface.eps \
 	$(FIGURES)/lte-harq-architecture.eps \
 	$(FIGURES)/lte-harq-processes-scheme.eps \
+	$(FIGURES)/ue-meas-consumer.eps \
+	$(FIGURES)/ue-meas-piecewise-motion.eps \
+	$(FIGURES)/ue-meas-piecewise-a1.eps \
+	$(FIGURES)/ue-meas-piecewise-a1-hys.eps \
+	$(FIGURES)/lte-cell-selection-timeline.eps \
+	$(FIGURES)/lte-cell-selection-scenario.eps \
+	$(FIGURES)/lte-handover-target-scenario.eps \
 	$(FIGURES)/lena-dual-stripe.eps \
 	$(FIGURES)/lte-mcs-index.eps \
 	$(FIGURES)/lenaThrTestCase1.eps \
@@ -264,6 +301,7 @@
 	$(FIGURES)/lte-rlc-data-retx-ul.eps \
 	$(FIGURES)/lte-epc-x2-handover-seq-diagram.eps \
 	$(FIGURES)/lte-epc-x2-entity-saps.eps \
+	$(FIGURES)/lte-strongest-cell-handover-algorithm.eps \
 	$(FIGURES)/auvmobility-classes.eps \
 
 # rescale pdf figures as necessary
@@ -299,8 +337,6 @@
 $(FIGURES)/lte-subframe-structure.pdf_width = 2in
 $(FIGURES)/mac-random-access-contention.pdf_width = 10cm
 $(FIGURES)/mac-random-access-noncontention.pdf_width = 15cm
-$(FIGURES)/lte-ue-rrc-states.pdf_width = 7cm
-$(FIGURES)/lte-handover-algorithm.pdf_width = 10cm
 $(FIGURES)/helpers.pdf_width = 8cm
 $(FIGURES)/auvmobility-classes.pdf_width = 10cm
 
diff -Naur ns-3.18.1/doc/models/source/conf.py ns-3.19/doc/models/source/conf.py
--- ns-3.18.1/doc/models/source/conf.py	2013-11-15 15:33:25.000000000 -0800
+++ ns-3.19/doc/models/source/conf.py	2013-12-20 09:44:50.000000000 -0800
@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'ns-3'
-copyright = u'2011, ns-3 project'
+copyright = u'2008-13, ns-3 project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.18.1'
+version = 'ns-3.19'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.18.1'
+release = 'ns-3.19'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Naur ns-3.18.1/doc/models/source/emulation-overview.rst ns-3.19/doc/models/source/emulation-overview.rst
--- ns-3.18.1/doc/models/source/emulation-overview.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/models/source/emulation-overview.rst	2013-12-20 09:44:50.000000000 -0800
@@ -83,5 +83,6 @@
 
 .. toctree::
 
+  emu
   fd-net-device
   tap
diff -Naur ns-3.18.1/doc/models/source/index.rst ns-3.19/doc/models/source/index.rst
--- ns-3.18.1/doc/models/source/index.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/models/source/index.rst	2013-12-20 09:44:50.000000000 -0800
@@ -14,7 +14,7 @@
 ``doc/models`` directory of ns-3's source code.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    organization
    animation
@@ -26,6 +26,7 @@
    buildings
    click
    csma
+   data-collection
    dsdv
    dsr
    emulation-overview
@@ -41,8 +42,10 @@
    openflow-switch
    point-to-point
    propagation
-   statistics
+   spectrum
+   sixlowpan
    topology
    uan
+   wave
    wifi
    wimax
diff -Naur ns-3.18.1/doc/models/source/organization.rst ns-3.19/doc/models/source/organization.rst
--- ns-3.18.1/doc/models/source/organization.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/models/source/organization.rst	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,13 @@
 exist on the `project wiki <http://www.nsnam.org/wiki>`_.
 
 A sample outline of how to write model library documentation can be
-found in :mod:`src/template/doc`.
+found by executing the ``create-module.py`` program and looking at the
+template created in the file ``new-module/doc/new-module.rst``. 
+
+.. sourcecode:: bash
+
+  $ cd src
+  $ ./create-module.py new-module
 
 The remainder of this document is organized alphabetically by module name.
 
diff -Naur ns-3.18.1/doc/ns3_html_theme/get_version.sh ns-3.19/doc/ns3_html_theme/get_version.sh
--- ns-3.18.1/doc/ns3_html_theme/get_version.sh	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/doc/ns3_html_theme/get_version.sh	2013-12-20 09:44:50.000000000 -0800
@@ -21,7 +21,7 @@
 # to force us into the public case.)
 #
 # The approach to identify cases 1 & 2 is to test:
-# a.  We're on nsnam.org (actually, nsnam.ece.gatech.edu), and
+# a.  We're on nsnam.org (actually, nsnam-www.coe-hosted.gatech.edu), and
 # b.  We're in the tmp build directory, /tmp/daily-nsnam/
 #     (This is the directory used by the update-* scripts
 #     run by cron jobs.)
@@ -91,9 +91,9 @@
     esac
 done
 
-# Hostname, fully qualified, e.g. nsnam.ece.gatech.edu
+# Hostname, fully qualified, e.g. nsnam-www.coe-hosted.gatech.edu
 HOST=`hostname`
-NSNAM="nsnam.ece.gatech.edu"
+NSNAM="nsnam-www.coe-hosted.gatech.edu"
 
 # Build directory
 DAILY="^/tmp/daily-nsnam/"
@@ -212,4 +212,4 @@
 say
 say "outf = $outf:"
 cat -n $outf
-say Done.
\ No newline at end of file
+say Done.
diff -Naur ns-3.18.1/doc/tutorial/source/conf.py ns-3.19/doc/tutorial/source/conf.py
--- ns-3.18.1/doc/tutorial/source/conf.py	2013-11-15 15:33:45.000000000 -0800
+++ ns-3.19/doc/tutorial/source/conf.py	2013-12-20 09:44:50.000000000 -0800
@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'ns-3'
-copyright = u'2010, ns-3 project'
+copyright = u'2008-13, ns-3 project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.18.1'
+version = 'ns-3.19'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.18.1'
+release = 'ns-3.19'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Naur ns-3.18.1/doc/tutorial-pt-br/source/conf.py ns-3.19/doc/tutorial-pt-br/source/conf.py
--- ns-3.18.1/doc/tutorial-pt-br/source/conf.py	2013-11-15 15:34:04.000000000 -0800
+++ ns-3.19/doc/tutorial-pt-br/source/conf.py	2013-12-20 09:44:50.000000000 -0800
@@ -42,7 +42,7 @@
 
 # General information about the project.
 project = u'ns-3'
-copyright = u'2008-11, ns-3 project'
+copyright = u'2008-13, ns-3 project'
 
 
 # The version info for the project you're documenting, acts as replacement for
@@ -50,9 +50,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.18.1'
+version = 'ns-3.19'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.18.1'
+release = 'ns-3.19'
 
 # The language for content autogenerated by . Refer to babel documentation
 # for a list of supported languages.
diff -Naur ns-3.18.1/examples/stats/wifi-example-db.sh ns-3.19/examples/stats/wifi-example-db.sh
--- ns-3.18.1/examples/stats/wifi-example-db.sh	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/examples/stats/wifi-example-db.sh	2013-12-20 09:44:50.000000000 -0800
@@ -70,7 +70,8 @@
     order by abs(exp.input) ASC;"
 
 sqlite3 -noheader data.db "$CMD" > wifi-default.data
-sed -i "s/|/   /" wifi-default.data
+sed -i.bak "s/|/   /" wifi-default.data
+rm wifi-default.data.bak
 gnuplot wifi-example.gnuplot
 
 echo "Done; data in wifi-default.data, plot in wifi-default.eps"
diff -Naur ns-3.18.1/examples/tcp/tcp-nsc-comparison.cc ns-3.19/examples/tcp/tcp-nsc-comparison.cc
--- ns-3.18.1/examples/tcp/tcp-nsc-comparison.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/examples/tcp/tcp-nsc-comparison.cc	2013-12-20 09:44:50.000000000 -0800
@@ -1,180 +1,180 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2012 NICT
- *
- * 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: Hajime Tazaki <tazaki@nict.go.jp>
- *
- * This code is a modified version of the code used for the the experiments in the paper
- * "DCE Cradle: Simulate Network Protocols with Real Stacks for Better Realism"
- * by Hajime Tazaki, Frederic Urbani and Thierry Turlett presented at WNS3 2013
- *
- */
-
-#include "ns3/log.h"
-#include "ns3/core-module.h"
-#include "ns3/network-module.h"
-#include "ns3/internet-module.h"
-#include "ns3/point-to-point-module.h"
-#include "ns3/applications-module.h"
-#include "ns3/flow-monitor-module.h"
-
-using namespace ns3;
-
-NS_LOG_COMPONENT_DEFINE ("TcpNscComparison");
-
-std::string m_stack = "nsc-linux";
-std::string sock_factory;
-int m_seed = 1;
-double startTime = 4.0;
-double stopTime = 20.0;
-uint32_t m_nNodes = 2;
-bool enablePcap = false;
-
-int
-main (int argc, char *argv[])
-{
-
-  //ensure the ns3 TCP default values match what nsc is using
-  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1448));
-  Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
-
-  CommandLine cmd;
-  cmd.AddValue ("stack", "choose network stack", m_stack);
-  cmd.AddValue ("seed", "randomize seed", m_seed);
-  cmd.AddValue ("nNodes", "the number of nodes in left side", m_nNodes);
-  cmd.AddValue ("stopTime", "duration", stopTime);
-  cmd.AddValue ("enablePcap", "pcap", enablePcap);
-  cmd.Parse (argc, argv);
-
-  SeedManager::SetSeed (m_seed);
-
-  NodeContainer lefts, routers, rights, nodes;
-  lefts.Create (m_nNodes);
-  routers.Create (2);
-  rights.Create (m_nNodes);
-  nodes = NodeContainer (lefts, routers, rights);
-
-  InternetStackHelper internetStack;
-
-  GlobalValue::Bind ("ChecksumEnabled", BooleanValue (true));
-  if (m_stack == "ns3")
-    {
-      sock_factory = "ns3::TcpSocketFactory";
-      internetStack.Install (nodes);
-    }
-  else if (m_stack == "nsc-linux")
-    {
-      internetStack.Install (routers);
-      sock_factory = "ns3::TcpSocketFactory";
-      internetStack.SetTcp ("ns3::NscTcpL4Protocol",
-                            "Library", StringValue ("liblinux2.6.26.so"));
-      internetStack.Install (lefts);
-      internetStack.Install (rights);
-
-      //these are not implemented in ns3 tcp so disable for comparison
-      Config::Set ("/NodeList/*/$ns3::Ns3NscStack<linux2.6.26>/net.ipv4.tcp_sack", StringValue ("0"));
-      Config::Set ("/NodeList/*/$ns3::Ns3NscStack<linux2.6.26>/net.ipv4.tcp_timestamps", StringValue ("0"));
-      Config::Set ("/NodeList/*/$ns3::Ns3NscStack<linux2.6.26>/net.ipv4.tcp_window_scaling", StringValue ("0"));
-    }
-
-  PointToPointHelper pointToPoint;
-  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
-  pointToPoint.SetChannelAttribute ("Delay", StringValue ("1ns"));
-
-  Ipv4AddressHelper address;
-  Ipv4InterfaceContainer interfaces;
-
-  NetDeviceContainer dev0, dev1, dev2;
-  for (uint32_t i = 0; i < m_nNodes; i++)
-    {
-      std::ostringstream oss;
-      oss << "10.0." << i << ".0";
-      address.SetBase (oss.str ().c_str (), "255.255.255.0");
-      dev0 = pointToPoint.Install (NodeContainer (lefts.Get (i), routers.Get (0)));
-      address.Assign (dev0);
-    }
-
-  // bottle neck link
-  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("2Mbps"));
-  pointToPoint.SetChannelAttribute ("Delay", StringValue ("100ms"));
-  dev1 = pointToPoint.Install (NodeContainer (routers.Get (0), routers.Get (1)));
-
-  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
-  pointToPoint.SetChannelAttribute ("Delay", StringValue ("1ns"));
-  // for right links
-  for (uint32_t i = 0; i < m_nNodes; i++)
-    {
-      std::ostringstream oss;
-      oss << "10.2." << i << ".0";
-      address.SetBase (oss.str ().c_str (), "255.255.255.0");
-      dev2 = pointToPoint.Install (NodeContainer (routers.Get (1), rights.Get (i)));
-      address.Assign (dev2);
-    }
-
-  // bottle neck link
-  Ptr<RateErrorModel> em1 =
-    CreateObjectWithAttributes<RateErrorModel> (
-      "ErrorRate", DoubleValue (0.05),
-      "ErrorUnit", EnumValue (RateErrorModel::ERROR_UNIT_PACKET)
-      );
-  dev1.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (em1));
-
-  address.SetBase ("10.1.0.0", "255.255.255.0");
-  address.Assign (dev1);
-  Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
-
-  ApplicationContainer apps;
-
-  OnOffHelper onoff = OnOffHelper (sock_factory,
-                                   InetSocketAddress (Ipv4Address ("10.2.0.2"), 2000));
-  onoff.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
-  onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
-
-  // Flow 1 - n
-  for (uint32_t i = 0; i < m_nNodes; i++)
-    {
-      std::ostringstream oss;
-      oss << "10.2." << i << ".2";
-      onoff.SetAttribute ("Remote", AddressValue (InetSocketAddress (Ipv4Address (oss.str ().c_str ()), 2000)));
-      onoff.SetAttribute ("PacketSize", StringValue ("1024"));
-      onoff.SetAttribute ("DataRate", StringValue ("1Mbps"));
-      onoff.SetAttribute ("StartTime", TimeValue (Seconds (startTime)));
-      apps = onoff.Install (lefts.Get (i));
-    }
-
-  PacketSinkHelper sink = PacketSinkHelper (sock_factory,
-                                            InetSocketAddress (Ipv4Address::GetAny (), 2000));
-  apps = sink.Install (rights);
-  apps.Start (Seconds (3.9999));
-
-  pointToPoint.EnablePcapAll ("nsc.pcap");
-
-  Simulator::Stop (Seconds (stopTime));
-  Simulator::Run ();
-
-  Ptr<PacketSink> pktsink;
-  std::cout << "Total ";
-  for (uint32_t i = 0; i < m_nNodes; i++)
-    {
-      pktsink = apps.Get (i)->GetObject<PacketSink> ();
-      std::cout << "Rx(" << i << ") = " << pktsink->GetTotalRx () <<
-      " bytes (" << pktsink->GetTotalRx () * 8 / (stopTime - startTime) << " bps), ";
-    }
-  std::cout << std::endl;
-
-  Simulator::Destroy ();
-  return 0;
-}
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 NICT
+ *
+ * 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: Hajime Tazaki <tazaki@nict.go.jp>
+ *
+ * This code is a modified version of the code used for the the experiments in the paper
+ * "DCE Cradle: Simulate Network Protocols with Real Stacks for Better Realism"
+ * by Hajime Tazaki, Frederic Urbani and Thierry Turlett presented at WNS3 2013
+ *
+ */
+
+#include "ns3/log.h"
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/flow-monitor-module.h"
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("TcpNscComparison");
+
+std::string m_stack = "nsc-linux";
+std::string sock_factory;
+int m_seed = 1;
+double startTime = 4.0;
+double stopTime = 20.0;
+uint32_t m_nNodes = 2;
+bool enablePcap = false;
+
+int
+main (int argc, char *argv[])
+{
+
+  //ensure the ns3 TCP default values match what nsc is using
+  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1448));
+  Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
+
+  CommandLine cmd;
+  cmd.AddValue ("stack", "choose network stack", m_stack);
+  cmd.AddValue ("seed", "randomize seed", m_seed);
+  cmd.AddValue ("nNodes", "the number of nodes in left side", m_nNodes);
+  cmd.AddValue ("stopTime", "duration", stopTime);
+  cmd.AddValue ("enablePcap", "pcap", enablePcap);
+  cmd.Parse (argc, argv);
+
+  SeedManager::SetSeed (m_seed);
+
+  NodeContainer lefts, routers, rights, nodes;
+  lefts.Create (m_nNodes);
+  routers.Create (2);
+  rights.Create (m_nNodes);
+  nodes = NodeContainer (lefts, routers, rights);
+
+  InternetStackHelper internetStack;
+
+  GlobalValue::Bind ("ChecksumEnabled", BooleanValue (true));
+  if (m_stack == "ns3")
+    {
+      sock_factory = "ns3::TcpSocketFactory";
+      internetStack.Install (nodes);
+    }
+  else if (m_stack == "nsc-linux")
+    {
+      internetStack.Install (routers);
+      sock_factory = "ns3::TcpSocketFactory";
+      internetStack.SetTcp ("ns3::NscTcpL4Protocol",
+                            "Library", StringValue ("liblinux2.6.26.so"));
+      internetStack.Install (lefts);
+      internetStack.Install (rights);
+
+      //these are not implemented in ns3 tcp so disable for comparison
+      Config::Set ("/NodeList/*/$ns3::Ns3NscStack<linux2.6.26>/net.ipv4.tcp_sack", StringValue ("0"));
+      Config::Set ("/NodeList/*/$ns3::Ns3NscStack<linux2.6.26>/net.ipv4.tcp_timestamps", StringValue ("0"));
+      Config::Set ("/NodeList/*/$ns3::Ns3NscStack<linux2.6.26>/net.ipv4.tcp_window_scaling", StringValue ("0"));
+    }
+
+  PointToPointHelper pointToPoint;
+  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
+  pointToPoint.SetChannelAttribute ("Delay", StringValue ("1ns"));
+
+  Ipv4AddressHelper address;
+  Ipv4InterfaceContainer interfaces;
+
+  NetDeviceContainer dev0, dev1, dev2;
+  for (uint32_t i = 0; i < m_nNodes; i++)
+    {
+      std::ostringstream oss;
+      oss << "10.0." << i << ".0";
+      address.SetBase (oss.str ().c_str (), "255.255.255.0");
+      dev0 = pointToPoint.Install (NodeContainer (lefts.Get (i), routers.Get (0)));
+      address.Assign (dev0);
+    }
+
+  // bottle neck link
+  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("2Mbps"));
+  pointToPoint.SetChannelAttribute ("Delay", StringValue ("100ms"));
+  dev1 = pointToPoint.Install (NodeContainer (routers.Get (0), routers.Get (1)));
+
+  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
+  pointToPoint.SetChannelAttribute ("Delay", StringValue ("1ns"));
+  // for right links
+  for (uint32_t i = 0; i < m_nNodes; i++)
+    {
+      std::ostringstream oss;
+      oss << "10.2." << i << ".0";
+      address.SetBase (oss.str ().c_str (), "255.255.255.0");
+      dev2 = pointToPoint.Install (NodeContainer (routers.Get (1), rights.Get (i)));
+      address.Assign (dev2);
+    }
+
+  // bottle neck link
+  Ptr<RateErrorModel> em1 =
+    CreateObjectWithAttributes<RateErrorModel> (
+      "ErrorRate", DoubleValue (0.05),
+      "ErrorUnit", EnumValue (RateErrorModel::ERROR_UNIT_PACKET)
+      );
+  dev1.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (em1));
+
+  address.SetBase ("10.1.0.0", "255.255.255.0");
+  address.Assign (dev1);
+  Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+
+  ApplicationContainer apps;
+
+  OnOffHelper onoff = OnOffHelper (sock_factory,
+                                   InetSocketAddress (Ipv4Address ("10.2.0.2"), 2000));
+  onoff.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
+  onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
+
+  // Flow 1 - n
+  for (uint32_t i = 0; i < m_nNodes; i++)
+    {
+      std::ostringstream oss;
+      oss << "10.2." << i << ".2";
+      onoff.SetAttribute ("Remote", AddressValue (InetSocketAddress (Ipv4Address (oss.str ().c_str ()), 2000)));
+      onoff.SetAttribute ("PacketSize", StringValue ("1024"));
+      onoff.SetAttribute ("DataRate", StringValue ("1Mbps"));
+      onoff.SetAttribute ("StartTime", TimeValue (Seconds (startTime)));
+      apps = onoff.Install (lefts.Get (i));
+    }
+
+  PacketSinkHelper sink = PacketSinkHelper (sock_factory,
+                                            InetSocketAddress (Ipv4Address::GetAny (), 2000));
+  apps = sink.Install (rights);
+  apps.Start (Seconds (3.9999));
+
+  pointToPoint.EnablePcapAll ("nsc.pcap");
+
+  Simulator::Stop (Seconds (stopTime));
+  Simulator::Run ();
+
+  Ptr<PacketSink> pktsink;
+  std::cout << "Total ";
+  for (uint32_t i = 0; i < m_nNodes; i++)
+    {
+      pktsink = apps.Get (i)->GetObject<PacketSink> ();
+      std::cout << "Rx(" << i << ") = " << pktsink->GetTotalRx () <<
+      " bytes (" << pktsink->GetTotalRx () * 8 / (stopTime - startTime) << " bps), ";
+    }
+  std::cout << std::endl;
+
+  Simulator::Destroy ();
+  return 0;
+}
diff -Naur ns-3.18.1/RELEASE_NOTES ns-3.19/RELEASE_NOTES
--- ns-3.18.1/RELEASE_NOTES	2013-11-15 16:03:50.000000000 -0800
+++ ns-3.19/RELEASE_NOTES	2013-12-20 09:44:50.000000000 -0800
@@ -9,6 +9,120 @@
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
+Release 3.19
+=============
+
+Availability
+------------
+This release is available from:
+http://www.nsnam.org/release/ns-allinone-3.19.tar.bz2
+
+Supported platforms
+-------------------
+These platforms have been tested; others may work also:
+- Fedora Core 20 (32 bit) with g++-4.8.2
+- Fedora Core 19 (32/64 bit) with g++-4.8.1
+- Ubuntu 13.10 (64 bit) with g++-4.8.1
+- Ubuntu 12.04.3 (32/64 bit) with g++-4.6.3
+- Ubuntu 10.04.4 LTS (64 bit) with g++-4.4.3
+- OS X Mavericks 10.9 with Xcode 5.0.1 and clang-500.2.79
+- OS X Mountain Lion 10.8.5 with Xcode 5 and g++-4.2.1
+- FreeBSD 9.2-RELEASE (64 bit) with clang-3.3
+
+New user-visible features
+-------------------------
+- Extension to UE measurements and improved handover algorithm models in LTE
+  module, as the outcome of GSoC 2013 project. The project also includes several
+  sub-features, such as:
+   - implementation of System Information Block Type 1 (SIB1);
+   - a new option for automatic UE attachment using Idle mode cell selection
+     procedure;
+   - improved configurability of UE measurements; and
+   - two options of handover algorithms for enabling automatic handover trigger
+     in LTE simulation: A2-A4-RSRQ and strongest cell (A3-RSRP).
+
+- A new FixedRoomPositionAllocator has been added to the buildings
+  module. It allows one to generate a random position uniformly
+  distributed in the volume of a chosen room inside a chosen building.  
+
+- A new attribute ns3::LteRlcAm::TxOpportunityForRetxAlwaysBigEnough
+  allows to overcome the lack for re-segmentation in the RLC AM
+  implementation by assuming that the size of a TxOpportunity is
+  always big enough for the RLC AM PDU to be retransmitted.
+
+- After some profiling, the code of LteMiErrorModel has been optimized
+  for speed, resulting in a significantly lower execution time of the
+  LTE model when used with the error model enabled.
+
+- A new WiFi extension for vehicular simulation support is available in 
+  the src/wave directory.  The current code represents an interim capability 
+  to realize an IEEE 802.11p-compliant device, but without the WAVE 
+  extensions (which are planned for a later patch).  The WaveNetDevice 
+  modelled herein enforces that a WAVE-compliant physical layer (at 5.9 GHz)
+  is selected, and does not require any association between devices (similar 
+  to an adhoc WiFi MAC), but is otherwise similar (at this time) to a 
+  WifiNetDevice.  WAVE capabililties of switching between control and 
+  service channels, or using multiple radios, are not yet modelled.
+
+- A new IPv6 over Low power Wireless Personal Area Networks (6LoWPAN) model
+  is available.  Using ns-3's naming convention, the acronym is expanded
+  to SixLowPanNetDevice.   The SixLowPanNetDevice is able to act as a 
+  shim between IPv6 and a NetDevice, compressing IPv6 headers according 
+  to RFCs 4944 and 6262.  The SixLowPanNetDevice is meant to be used over 
+  IEEE 802.15.4 NetDevices, but it can be used on other NetDevices as 
+  well (see the manual for full details).  This model precedes the
+  general availability of an 802.15.4 model, so must be run in conjunction
+  with a wired NetDevice model for now, or with experimental versions of
+  802.15.4 models.
+
+- It is now possible to use Ipv6PacketInfoTag from UDP applications in the
+  same way as with Ipv4PacketInfoTag. See Doxygen for current limitations in
+  using Ipv[4,6]PacketInfoTag to set IP properties.
+  
+- Ipv[4,6]Interfaces not respecting the minimum MTU requirements (68 octects
+  for IPv4 and 1280 octects for IPv6) will be automatically set as Down.
+  
+- IPv6 addresses and routing tables are printed in a more conventional way,
+  closely matching the Linux "route -A inet6" command.
+
+- Additional time units (Year, Day, Hour, Minute) were added to the time
+  value class that represents simulation time; the largest unit prior to 
+  this addition was Second.
+
+- A new parallel scheduling algorithm based on null messages, a common 
+  parallel DES scheduling algorithm, has been added.  The null message 
+  scheduler has better scaling properties when running on some scenarios
+  with large numbers of nodes since it does not require a global 
+  communication.
+  
+Bugs fixed
+----------
+- Bug 1496 - Option to print log level in NS_LOG messages, and documentation.
+- Bug 1592 - Parsing bug in FlowMonitor example script
+- Bug 1756 - RLC AM Mode State Variable Bug
+- Bug 1763 - Message 3 should be sent using the UL GRANT in the RAR
+- Bug 1778 - Implement TapBridge::IsLinkUp() function
+- Bug 1777 - Implement the more direct way of "using" configuration of existing tap interface
+- Bug 1776 - Improve CRC performance for CsmaNetDevice in emulation modes
+- Bug 1788 - unused private field warning
+- Bug 1789 - missing test condition for sigma in buildings-shadowing-test
+- Bug 1796 - Ipv6PacketInfoTag is not filled by UdpSocketImpl::ForwardUp6
+- Bug 1798 - Changing the rate of onOffApplication might stop transmission
+- Bug 1802 - FlowMon header deserialization problem with IPv4 fragments
+- Bug 1803 - Lookup /NodeList/4/DeviceList/0/LteEnbRrc/UeMap/0 got no matches
+- Bug 1807 - Multiple bugs in Ipv4L3Protocol::LocalDeliver
+- Bug 1810 - IP packets can be sent on NetDevices not respecting the minimum MTU requirements
+- Bug 1814 - IPv6 Packet with length not multiple of 8 bytes are fragmented incorrectly.
+- Bug 1815 - Python bindings compilation with clang compiler toolchain
+- Bug 1816 - IPv4 fragmentation loses Packet tags
+
+Release 3.18.2
+==============
+
+ns-allinone-3.18.2 was released to include a bake configuration file update
+for Direct Code Execution.  The ns-3 code in this release was unchanged
+from that of ns-3.18.1.
+
 Release 3.18.1
 ==============
 
diff -Naur ns-3.18.1/scratch/scratch-simulator.cc ns-3.19/scratch/scratch-simulator.cc
--- ns-3.18.1/scratch/scratch-simulator.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/scratch/scratch-simulator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,4 +24,7 @@
 main (int argc, char *argv[])
 {
   NS_LOG_UNCOND ("Scratch Simulator");
+
+  Simulator::Run ();
+  Simulator::Destroy ();
 }
diff -Naur ns-3.18.1/src/antenna/model/antenna-model.cc ns-3.19/src/antenna/model/antenna-model.cc
--- ns-3.18.1/src/antenna/model/antenna-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/antenna/model/antenna-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (AntennaModel);
+NS_OBJECT_ENSURE_REGISTERED (AntennaModel)
+  ;
 
 
 AntennaModel::AntennaModel ()
@@ -39,7 +40,7 @@
 {
 }
 
-TypeId 
+TypeId
 AntennaModel::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::AntennaModel")
diff -Naur ns-3.18.1/src/antenna/model/cosine-antenna-model.cc ns-3.19/src/antenna/model/cosine-antenna-model.cc
--- ns-3.18.1/src/antenna/model/cosine-antenna-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/antenna/model/cosine-antenna-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel);
+NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel)
+  ;
 
 
 TypeId 
diff -Naur ns-3.18.1/src/antenna/model/isotropic-antenna-model.cc ns-3.19/src/antenna/model/isotropic-antenna-model.cc
--- ns-3.18.1/src/antenna/model/isotropic-antenna-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/antenna/model/isotropic-antenna-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel);
+NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel)
+  ;
 
 
 TypeId 
diff -Naur ns-3.18.1/src/antenna/model/parabolic-antenna-model.cc ns-3.19/src/antenna/model/parabolic-antenna-model.cc
--- ns-3.18.1/src/antenna/model/parabolic-antenna-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/antenna/model/parabolic-antenna-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel);
+NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel)
+  ;
 
 
 TypeId 
diff -Naur ns-3.18.1/src/aodv/bindings/modulegen__gcc_ILP32.py ns-3.19/src/aodv/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/aodv/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/aodv/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -237,7 +237,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1686,10 +1686,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4218,6 +4219,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4228,6 +4234,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4243,6 +4254,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4268,6 +4284,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -4879,10 +4900,10 @@
     cls.add_method('SetProbeResp', 
                    'void', 
                    [])
-    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function]
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
     cls.add_method('SetQosAckPolicy', 
                    'void', 
-                   [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')])
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
     cls.add_method('SetQosAmsdu', 
                    'void', 
@@ -5968,10 +5989,10 @@
     cls.add_method('Send', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
-    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arg0) [member function]
+    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arpCache) [member function]
     cls.add_method('SetArpCache', 
                    'void', 
-                   [param('ns3::Ptr< ns3::ArpCache >', 'arg0')])
+                   [param('ns3::Ptr< ns3::ArpCache >', 'arpCache')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
     cls.add_method('SetDevice', 
                    'void', 
diff -Naur ns-3.18.1/src/aodv/bindings/modulegen__gcc_LP64.py ns-3.19/src/aodv/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/aodv/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/aodv/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -237,7 +237,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1686,10 +1686,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4218,6 +4219,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4228,6 +4234,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4243,6 +4254,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4268,6 +4284,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -4879,10 +4900,10 @@
     cls.add_method('SetProbeResp', 
                    'void', 
                    [])
-    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function]
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
     cls.add_method('SetQosAckPolicy', 
                    'void', 
-                   [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')])
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
     cls.add_method('SetQosAmsdu', 
                    'void', 
@@ -5968,10 +5989,10 @@
     cls.add_method('Send', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
-    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arg0) [member function]
+    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arpCache) [member function]
     cls.add_method('SetArpCache', 
                    'void', 
-                   [param('ns3::Ptr< ns3::ArpCache >', 'arg0')])
+                   [param('ns3::Ptr< ns3::ArpCache >', 'arpCache')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
     cls.add_method('SetDevice', 
                    'void', 
diff -Naur ns-3.18.1/src/aodv/doc/aodv.rst ns-3.19/src/aodv/doc/aodv.rst
--- ns-3.18.1/src/aodv/doc/aodv.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/aodv/doc/aodv.rst	2013-12-20 09:44:50.000000000 -0800
@@ -5,7 +5,7 @@
 
 This model implements the base specification of the Ad Hoc On-Demand 
 Distance Vector (AODV) protocol. The implementation is based on 
-[rfc3561]_.
+:rfc:`3561`.
 
 The model was written by Elena Buchatskaia and Pavel Boyko of ITTP RAS,
 and is based on the ns-2 AODV model developed by the CMU/MONARCH group
@@ -97,7 +97,6 @@
 References
 ++++++++++
 
-.. [rfc3561] RFC 3561 *Ad hoc On-Demand Distance Vector (AODV) Routing*
 
 Usage
 *****
diff -Naur ns-3.18.1/src/aodv/model/aodv-packet.cc ns-3.19/src/aodv/model/aodv-packet.cc
--- ns-3.18.1/src/aodv/model/aodv-packet.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/aodv/model/aodv-packet.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 namespace aodv
 {
 
-NS_OBJECT_ENSURE_REGISTERED (TypeHeader);
+NS_OBJECT_ENSURE_REGISTERED (TypeHeader)
+  ;
 
 TypeHeader::TypeHeader (MessageType t) :
   m_type (t), m_valid (true)
@@ -146,7 +147,8 @@
 {
 }
 
-NS_OBJECT_ENSURE_REGISTERED (RreqHeader);
+NS_OBJECT_ENSURE_REGISTERED (RreqHeader)
+  ;
 
 TypeId
 RreqHeader::GetTypeId ()
@@ -285,7 +287,8 @@
   m_lifeTime = uint32_t (lifeTime.GetMilliSeconds ());
 }
 
-NS_OBJECT_ENSURE_REGISTERED (RrepHeader);
+NS_OBJECT_ENSURE_REGISTERED (RrepHeader)
+  ;
 
 TypeId
 RrepHeader::GetTypeId ()
@@ -427,7 +430,9 @@
 {
 }
 
-NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader);
+NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader)
+  ;
+  
 TypeId
 RrepAckHeader::GetTypeId ()
 {
@@ -492,7 +497,8 @@
 {
 }
 
-NS_OBJECT_ENSURE_REGISTERED (RerrHeader);
+NS_OBJECT_ENSURE_REGISTERED (RerrHeader)
+  ;
 
 TypeId
 RerrHeader::GetTypeId ()
diff -Naur ns-3.18.1/src/aodv/model/aodv-routing-protocol.cc ns-3.19/src/aodv/model/aodv-routing-protocol.cc
--- ns-3.18.1/src/aodv/model/aodv-routing-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/aodv/model/aodv-routing-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -48,7 +48,8 @@
 {
 namespace aodv
 {
-NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol);
+NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol)
+  ;
 
 /// UDP Port for AODV control traffic
 const uint32_t RoutingProtocol::AODV_PORT = 654;
@@ -111,7 +112,8 @@
   int32_t m_oif;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (DeferredRouteOutputTag);
+NS_OBJECT_ENSURE_REGISTERED (DeferredRouteOutputTag)
+  ;
 
 
 //-----------------------------------------------------------------------------
diff -Naur ns-3.18.1/src/applications/bindings/modulegen__gcc_ILP32.py ns-3.19/src/applications/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/applications/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -295,7 +295,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -2166,10 +2166,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4951,11 +4952,26 @@
     cls.add_constructor([param('ns3::SeqTsHeader const &', 'arg0')])
     ## seq-ts-header.h (module 'applications'): ns3::SeqTsHeader::SeqTsHeader() [constructor]
     cls.add_constructor([])
+    ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## seq-ts-header.h (module 'applications'): ns3::TypeId ns3::SeqTsHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
     ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::GetSeq() const [member function]
     cls.add_method('GetSeq', 
                    'uint32_t', 
                    [], 
                    is_const=True)
+    ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
     ## seq-ts-header.h (module 'applications'): ns3::Time ns3::SeqTsHeader::GetTs() const [member function]
     cls.add_method('GetTs', 
                    'ns3::Time', 
@@ -4966,35 +4982,20 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## seq-ts-header.h (module 'applications'): void ns3::SeqTsHeader::SetSeq(uint32_t seq) [member function]
-    cls.add_method('SetSeq', 
-                   'void', 
-                   [param('uint32_t', 'seq')])
-    ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
-    cls.add_method('Deserialize', 
-                   'uint32_t', 
-                   [param('ns3::Buffer::Iterator', 'start')], 
-                   visibility='private', is_virtual=True)
-    ## seq-ts-header.h (module 'applications'): ns3::TypeId ns3::SeqTsHeader::GetInstanceTypeId() const [member function]
-    cls.add_method('GetInstanceTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_const=True, visibility='private', is_virtual=True)
-    ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::GetSerializedSize() const [member function]
-    cls.add_method('GetSerializedSize', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, visibility='private', is_virtual=True)
     ## seq-ts-header.h (module 'applications'): void ns3::SeqTsHeader::Print(std::ostream & os) const [member function]
     cls.add_method('Print', 
                    'void', 
                    [param('std::ostream &', 'os')], 
-                   is_const=True, visibility='private', is_virtual=True)
+                   is_const=True, is_virtual=True)
     ## seq-ts-header.h (module 'applications'): void ns3::SeqTsHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
     cls.add_method('Serialize', 
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
-                   is_const=True, visibility='private', is_virtual=True)
+                   is_const=True, is_virtual=True)
+    ## seq-ts-header.h (module 'applications'): void ns3::SeqTsHeader::SetSeq(uint32_t seq) [member function]
+    cls.add_method('SetSeq', 
+                   'void', 
+                   [param('uint32_t', 'seq')])
     return
 
 def register_Ns3SequentialRandomVariable_methods(root_module, cls):
@@ -5916,6 +5917,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5926,6 +5932,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5941,6 +5952,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5966,6 +5982,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -10115,7 +10136,8 @@
     ## simple-channel.h (module 'network'): void ns3::SimpleChannel::Add(ns3::Ptr<ns3::SimpleNetDevice> device) [member function]
     cls.add_method('Add', 
                    'void', 
-                   [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')])
+                   [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')], 
+                   is_virtual=True)
     ## simple-channel.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::SimpleChannel::GetDevice(uint32_t i) const [member function]
     cls.add_method('GetDevice', 
                    'ns3::Ptr< ns3::NetDevice >', 
@@ -10134,7 +10156,8 @@
     ## simple-channel.h (module 'network'): void ns3::SimpleChannel::Send(ns3::Ptr<ns3::Packet> p, uint16_t protocol, ns3::Mac48Address to, ns3::Mac48Address from, ns3::Ptr<ns3::SimpleNetDevice> sender) [member function]
     cls.add_method('Send', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')])
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')], 
+                   is_virtual=True)
     return
 
 def register_Ns3SimpleNetDevice_methods(root_module, cls):
@@ -10429,10 +10452,6 @@
     cls.add_method('SetFill', 
                    'void', 
                    [param('uint8_t *', 'fill'), param('uint32_t', 'fillSize'), param('uint32_t', 'dataSize')])
-    ## udp-echo-client.h (module 'applications'): void ns3::UdpEchoClient::SetRemote(ns3::Address ip, uint16_t port) [member function]
-    cls.add_method('SetRemote', 
-                   'void', 
-                   [param('ns3::Address', 'ip'), param('uint16_t', 'port')])
     ## udp-echo-client.h (module 'applications'): void ns3::UdpEchoClient::SetRemote(ns3::Ipv4Address ip, uint16_t port) [member function]
     cls.add_method('SetRemote', 
                    'void', 
@@ -10441,6 +10460,10 @@
     cls.add_method('SetRemote', 
                    'void', 
                    [param('ns3::Ipv6Address', 'ip'), param('uint16_t', 'port')])
+    ## udp-echo-client.h (module 'applications'): void ns3::UdpEchoClient::SetRemote(ns3::Address ip, uint16_t port) [member function]
+    cls.add_method('SetRemote', 
+                   'void', 
+                   [param('ns3::Address', 'ip'), param('uint16_t', 'port')])
     ## udp-echo-client.h (module 'applications'): void ns3::UdpEchoClient::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -10551,10 +10574,6 @@
     cls.add_method('SetMaxPacketSize', 
                    'void', 
                    [param('uint16_t', 'maxPacketSize')])
-    ## udp-trace-client.h (module 'applications'): void ns3::UdpTraceClient::SetRemote(ns3::Address ip, uint16_t port) [member function]
-    cls.add_method('SetRemote', 
-                   'void', 
-                   [param('ns3::Address', 'ip'), param('uint16_t', 'port')])
     ## udp-trace-client.h (module 'applications'): void ns3::UdpTraceClient::SetRemote(ns3::Ipv4Address ip, uint16_t port) [member function]
     cls.add_method('SetRemote', 
                    'void', 
@@ -10563,6 +10582,10 @@
     cls.add_method('SetRemote', 
                    'void', 
                    [param('ns3::Ipv6Address', 'ip'), param('uint16_t', 'port')])
+    ## udp-trace-client.h (module 'applications'): void ns3::UdpTraceClient::SetRemote(ns3::Address ip, uint16_t port) [member function]
+    cls.add_method('SetRemote', 
+                   'void', 
+                   [param('ns3::Address', 'ip'), param('uint16_t', 'port')])
     ## udp-trace-client.h (module 'applications'): void ns3::UdpTraceClient::SetTraceFile(std::string filename) [member function]
     cls.add_method('SetTraceFile', 
                    'void', 
@@ -10738,14 +10761,14 @@
     cls.add_method('SetBurstRate', 
                    'void', 
                    [param('double', 'rate')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> burstSz) [member function]
     cls.add_method('SetRandomBurstSize', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'burstSz')])
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> ranVar) [member function]
     cls.add_method('SetRandomVariable', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'ranVar')])
     ## error-model.h (module 'network'): bool ns3::BurstErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('DoCorrupt', 
                    'bool', 
diff -Naur ns-3.18.1/src/applications/bindings/modulegen__gcc_LP64.py ns-3.19/src/applications/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/applications/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -295,7 +295,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -2166,10 +2166,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4951,11 +4952,26 @@
     cls.add_constructor([param('ns3::SeqTsHeader const &', 'arg0')])
     ## seq-ts-header.h (module 'applications'): ns3::SeqTsHeader::SeqTsHeader() [constructor]
     cls.add_constructor([])
+    ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## seq-ts-header.h (module 'applications'): ns3::TypeId ns3::SeqTsHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
     ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::GetSeq() const [member function]
     cls.add_method('GetSeq', 
                    'uint32_t', 
                    [], 
                    is_const=True)
+    ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
     ## seq-ts-header.h (module 'applications'): ns3::Time ns3::SeqTsHeader::GetTs() const [member function]
     cls.add_method('GetTs', 
                    'ns3::Time', 
@@ -4966,35 +4982,20 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## seq-ts-header.h (module 'applications'): void ns3::SeqTsHeader::SetSeq(uint32_t seq) [member function]
-    cls.add_method('SetSeq', 
-                   'void', 
-                   [param('uint32_t', 'seq')])
-    ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
-    cls.add_method('Deserialize', 
-                   'uint32_t', 
-                   [param('ns3::Buffer::Iterator', 'start')], 
-                   visibility='private', is_virtual=True)
-    ## seq-ts-header.h (module 'applications'): ns3::TypeId ns3::SeqTsHeader::GetInstanceTypeId() const [member function]
-    cls.add_method('GetInstanceTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_const=True, visibility='private', is_virtual=True)
-    ## seq-ts-header.h (module 'applications'): uint32_t ns3::SeqTsHeader::GetSerializedSize() const [member function]
-    cls.add_method('GetSerializedSize', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, visibility='private', is_virtual=True)
     ## seq-ts-header.h (module 'applications'): void ns3::SeqTsHeader::Print(std::ostream & os) const [member function]
     cls.add_method('Print', 
                    'void', 
                    [param('std::ostream &', 'os')], 
-                   is_const=True, visibility='private', is_virtual=True)
+                   is_const=True, is_virtual=True)
     ## seq-ts-header.h (module 'applications'): void ns3::SeqTsHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
     cls.add_method('Serialize', 
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
-                   is_const=True, visibility='private', is_virtual=True)
+                   is_const=True, is_virtual=True)
+    ## seq-ts-header.h (module 'applications'): void ns3::SeqTsHeader::SetSeq(uint32_t seq) [member function]
+    cls.add_method('SetSeq', 
+                   'void', 
+                   [param('uint32_t', 'seq')])
     return
 
 def register_Ns3SequentialRandomVariable_methods(root_module, cls):
@@ -5916,6 +5917,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5926,6 +5932,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5941,6 +5952,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5966,6 +5982,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -10115,7 +10136,8 @@
     ## simple-channel.h (module 'network'): void ns3::SimpleChannel::Add(ns3::Ptr<ns3::SimpleNetDevice> device) [member function]
     cls.add_method('Add', 
                    'void', 
-                   [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')])
+                   [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')], 
+                   is_virtual=True)
     ## simple-channel.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::SimpleChannel::GetDevice(uint32_t i) const [member function]
     cls.add_method('GetDevice', 
                    'ns3::Ptr< ns3::NetDevice >', 
@@ -10134,7 +10156,8 @@
     ## simple-channel.h (module 'network'): void ns3::SimpleChannel::Send(ns3::Ptr<ns3::Packet> p, uint16_t protocol, ns3::Mac48Address to, ns3::Mac48Address from, ns3::Ptr<ns3::SimpleNetDevice> sender) [member function]
     cls.add_method('Send', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')])
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')], 
+                   is_virtual=True)
     return
 
 def register_Ns3SimpleNetDevice_methods(root_module, cls):
@@ -10429,10 +10452,6 @@
     cls.add_method('SetFill', 
                    'void', 
                    [param('uint8_t *', 'fill'), param('uint32_t', 'fillSize'), param('uint32_t', 'dataSize')])
-    ## udp-echo-client.h (module 'applications'): void ns3::UdpEchoClient::SetRemote(ns3::Address ip, uint16_t port) [member function]
-    cls.add_method('SetRemote', 
-                   'void', 
-                   [param('ns3::Address', 'ip'), param('uint16_t', 'port')])
     ## udp-echo-client.h (module 'applications'): void ns3::UdpEchoClient::SetRemote(ns3::Ipv4Address ip, uint16_t port) [member function]
     cls.add_method('SetRemote', 
                    'void', 
@@ -10441,6 +10460,10 @@
     cls.add_method('SetRemote', 
                    'void', 
                    [param('ns3::Ipv6Address', 'ip'), param('uint16_t', 'port')])
+    ## udp-echo-client.h (module 'applications'): void ns3::UdpEchoClient::SetRemote(ns3::Address ip, uint16_t port) [member function]
+    cls.add_method('SetRemote', 
+                   'void', 
+                   [param('ns3::Address', 'ip'), param('uint16_t', 'port')])
     ## udp-echo-client.h (module 'applications'): void ns3::UdpEchoClient::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -10551,10 +10574,6 @@
     cls.add_method('SetMaxPacketSize', 
                    'void', 
                    [param('uint16_t', 'maxPacketSize')])
-    ## udp-trace-client.h (module 'applications'): void ns3::UdpTraceClient::SetRemote(ns3::Address ip, uint16_t port) [member function]
-    cls.add_method('SetRemote', 
-                   'void', 
-                   [param('ns3::Address', 'ip'), param('uint16_t', 'port')])
     ## udp-trace-client.h (module 'applications'): void ns3::UdpTraceClient::SetRemote(ns3::Ipv4Address ip, uint16_t port) [member function]
     cls.add_method('SetRemote', 
                    'void', 
@@ -10563,6 +10582,10 @@
     cls.add_method('SetRemote', 
                    'void', 
                    [param('ns3::Ipv6Address', 'ip'), param('uint16_t', 'port')])
+    ## udp-trace-client.h (module 'applications'): void ns3::UdpTraceClient::SetRemote(ns3::Address ip, uint16_t port) [member function]
+    cls.add_method('SetRemote', 
+                   'void', 
+                   [param('ns3::Address', 'ip'), param('uint16_t', 'port')])
     ## udp-trace-client.h (module 'applications'): void ns3::UdpTraceClient::SetTraceFile(std::string filename) [member function]
     cls.add_method('SetTraceFile', 
                    'void', 
@@ -10738,14 +10761,14 @@
     cls.add_method('SetBurstRate', 
                    'void', 
                    [param('double', 'rate')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> burstSz) [member function]
     cls.add_method('SetRandomBurstSize', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'burstSz')])
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> ranVar) [member function]
     cls.add_method('SetRandomVariable', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'ranVar')])
     ## error-model.h (module 'network'): bool ns3::BurstErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('DoCorrupt', 
                    'bool', 
diff -Naur ns-3.18.1/src/applications/helper/bulk-send-helper.h ns-3.19/src/applications/helper/bulk-send-helper.h
--- ns-3.18.1/src/applications/helper/bulk-send-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/helper/bulk-send-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -35,6 +35,7 @@
 namespace ns3 {
 
 /**
+ * \ingroup bulksend
  * \brief A helper to make it easier to instantiate an ns3::BulkSendApplication
  * on a set of nodes.
  */
@@ -92,7 +93,6 @@
 
 private:
   /**
-   * \internal
    * Install an ns3::BulkSendApplication on the node configured with all the
    * attributes set with SetAttribute.
    *
@@ -100,9 +100,8 @@
    * \returns Ptr to the application installed.
    */
   Ptr<Application> InstallPriv (Ptr<Node> node) const;
-  std::string m_protocol;
-  Address m_remote;
-  ObjectFactory m_factory;
+
+  ObjectFactory m_factory; //!< Object factory.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/helper/on-off-helper.h ns-3.19/src/applications/helper/on-off-helper.h
--- ns-3.18.1/src/applications/helper/on-off-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/helper/on-off-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -35,6 +35,7 @@
 class DataRate;
 
 /**
+ * \ingroup onoff
  * \brief A helper to make it easier to instantiate an ns3::OnOffApplication 
  * on a set of nodes.
  */
@@ -114,7 +115,6 @@
 
 private:
   /**
-   * \internal
    * Install an ns3::OnOffApplication on the node configured with all the 
    * attributes set with SetAttribute.
    *
@@ -122,9 +122,8 @@
    * \returns Ptr to the application installed.
    */
   Ptr<Application> InstallPriv (Ptr<Node> node) const;
-  std::string m_protocol;
-  Address m_remote;
-  ObjectFactory m_factory;
+
+  ObjectFactory m_factory; //!< Object factory.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/helper/packet-sink-helper.h ns-3.19/src/applications/helper/packet-sink-helper.h
--- ns-3.18.1/src/applications/helper/packet-sink-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/helper/packet-sink-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,6 +28,7 @@
 namespace ns3 {
 
 /**
+ * \ingroup packetsink
  * \brief A helper to make it easier to instantiate an ns3::PacketSinkApplication
  * on a set of nodes.
  */
@@ -60,6 +61,7 @@
    *
    * \param c NodeContainer of the set of nodes on which a PacketSinkApplication 
    * will be installed.
+   * \returns Container of Ptr to the applications installed.
    */
   ApplicationContainer Install (NodeContainer c) const;
 
@@ -68,6 +70,7 @@
    * configured with all the attributes set with SetAttribute.
    *
    * \param node The node on which a PacketSinkApplication will be installed.
+   * \returns Container of Ptr to the applications installed.
    */
   ApplicationContainer Install (Ptr<Node> node) const;
 
@@ -76,15 +79,20 @@
    * configured with all the attributes set with SetAttribute.
    *
    * \param nodeName The name of the node on which a PacketSinkApplication will be installed.
+   * \returns Container of Ptr to the applications installed.
    */
   ApplicationContainer Install (std::string nodeName) const;
 
 private:
   /**
-   * \internal
+   * Install an ns3::PacketSink on the node configured with all the
+   * attributes set with SetAttribute.
+   *
+   * \param node The node on which an PacketSink will be installed.
+   * \returns Ptr to the application installed.
    */
   Ptr<Application> InstallPriv (Ptr<Node> node) const;
-  ObjectFactory m_factory;
+  ObjectFactory m_factory; //!< Object factory.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/helper/ping6-helper.h ns-3.19/src/applications/helper/ping6-helper.h
--- ns-3.18.1/src/applications/helper/ping6-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/helper/ping6-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,7 @@
 namespace ns3 {
 
 /**
+ * \ingroup ping6
  * \class Ping6Helper
  * \brief Ping6 application helper.
  */
diff -Naur ns-3.18.1/src/applications/helper/radvd-helper.h ns-3.19/src/applications/helper/radvd-helper.h
--- ns-3.18.1/src/applications/helper/radvd-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/helper/radvd-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -35,6 +35,7 @@
 namespace ns3 {
 
 /**
+ * \ingroup radvd
  * \class RadvdHelper
  * \brief Radvd application helper.
  */
@@ -69,9 +70,10 @@
   void DisableDefaultRouterForInterface (uint32_t interface);
 
   /**
-   * \brief Get the low-level radvdInterface specification for an interface.
+   * \brief Get the low-level RadvdInterface specification for an interface.
    * This method is provided to enable fine-grain parameter setup.
    * \param interface outgoing interface
+   * \returns the RadvdInterface
    */
   Ptr<RadvdInterface> GetRadvdInterface (uint32_t interface);
 
@@ -100,10 +102,12 @@
    */
   ObjectFactory m_factory;
 
+  /// Container: interface index, RadvdInterface
   typedef std::map<uint32_t, Ptr<RadvdInterface> > RadvdInterfaceMap;
+  /// Container Iterator: interface index, RadvdInterface
   typedef std::map<uint32_t, Ptr<RadvdInterface> >::iterator RadvdInterfaceMapI;
 
-  RadvdInterfaceMap m_radvdInterfaces;
+  RadvdInterfaceMap m_radvdInterfaces; //!< RadvdInterface(s)
 };
 
 } /* namespace ns3 */
diff -Naur ns-3.18.1/src/applications/helper/udp-client-server-helper.h ns-3.19/src/applications/helper/udp-client-server-helper.h
--- ns-3.18.1/src/applications/helper/udp-client-server-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/helper/udp-client-server-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 #include "ns3/udp-client.h"
 namespace ns3 {
 /**
- * \brief Create a server application which waits for input udp packets
+ * \ingroup udpclientserver
+ * \brief Create a server application which waits for input UDP packets
  *        and uses the information carried into their payload to compute
  *        delay and to determine if some packets are lost.
  */
@@ -60,7 +61,7 @@
   void SetAttribute (std::string name, const AttributeValue &value);
 
   /**
-   * Create one udp server application on each of the Nodes in the
+   * Create one UDP server application on each of the Nodes in the
    * NodeContainer.
    *
    * \param c The nodes on which to create the Applications.  The nodes
@@ -69,14 +70,23 @@
    *          NodeContainer.
    */
   ApplicationContainer Install (NodeContainer c);
+
+  /**
+   * \brief Return the last created server.
+   *
+   * This function is mainly used for testing.
+   *
+   * \returns a Ptr to the last created server application
+   */
   Ptr<UdpServer> GetServer (void);
 private:
-  ObjectFactory m_factory;
-  Ptr<UdpServer> m_server;
+  ObjectFactory m_factory; //!< Object factory.
+  Ptr<UdpServer> m_server; //!< The last created server application
 };
 
 /**
- * \brief Create a client application which sends udp packets carrying
+ * \ingroup udpclientserver
+ * \brief Create a client application which sends UDP packets carrying
  *  a 32bit sequence number and a 64 bit time stamp.
  *
  */
@@ -95,12 +105,28 @@
    *  Create UdpClientHelper which will make life easier for people trying
    * to set up simulations with udp-client-server.
    *
-   * \param ip The IP address of the remote udp server
-   * \param port The port number of the remote udp server
+   * \param ip The IPv4 address of the remote UDP server
+   * \param port The port number of the remote UDP server
    */
 
   UdpClientHelper (Ipv4Address ip, uint16_t port);
+  /**
+   *  Create UdpClientHelper which will make life easier for people trying
+   * to set up simulations with udp-client-server.
+   *
+   * \param ip The IPv6 address of the remote UDP server
+   * \param port The port number of the remote UDP server
+   */
+
   UdpClientHelper (Ipv6Address ip, uint16_t port);
+  /**
+   *  Create UdpClientHelper which will make life easier for people trying
+   * to set up simulations with udp-client-server.
+   *
+   * \param ip The IP address of the remote UDP server
+   * \param port The port number of the remote UDP server
+   */
+
   UdpClientHelper (Address ip, uint16_t port);
 
   /**
@@ -114,25 +140,26 @@
   /**
      * \param c the nodes
      *
-     * Create one udp client application on each of the input nodes
+     * Create one UDP client application on each of the input nodes
      *
      * \returns the applications created, one application per input node.
      */
   ApplicationContainer Install (NodeContainer c);
 
 private:
-  ObjectFactory m_factory;
+  ObjectFactory m_factory; //!< Object factory.
 };
 /**
- * Create udpTraceClient application which sends udp packets based on a trace
+ * \ingroup udpclientserver
+ * Create UdpTraceClient application which sends UDP packets based on a trace
  * file of an MPEG4 stream. Trace files could be downloaded form :
- * http://www.tkn.tu-berlin.de/research/trace/ltvt.html (the 2 first lines of
+ * http://www2.tkn.tu-berlin.de/research/trace/ltvt.html (the 2 first lines of
  * the file should be removed)
  * A valid trace file is a file with 4 columns:
- * -1- the first one represents the frame index
- * -2- the second one indicates the type of the frame: I, P or B
- * -3- the third one indicates the time on which the frame was generated by the encoder
- * -4- the fourth one indicates the frame size in byte
+ * \li -1- the first one represents the frame index
+ * \li -2- the second one indicates the type of the frame: I, P or B
+ * \li -3- the third one indicates the time on which the frame was generated by the encoder
+ * \li -4- the fourth one indicates the frame size in byte
 */
 class UdpTraceClientHelper
 {
@@ -148,12 +175,28 @@
    * Create UdpTraceClientHelper which will make life easier for people trying
    * to set up simulations with udp-client-server.
    *
-   * \param ip The IP address of the remote udp server
-   * \param port The port number of the remote udp server
+   * \param ip The IP address of the remote UDP server
+   * \param port The port number of the remote UDP server
    * \param filename the file from which packet traces will be loaded
    */
   UdpTraceClientHelper (Address ip, uint16_t port, std::string filename);
+  /**
+   * Create UdpTraceClientHelper which will make life easier for people trying
+   * to set up simulations with udp-client-server.
+   *
+   * \param ip The IPv4 address of the remote UDP server
+   * \param port The port number of the remote UDP server
+   * \param filename the file from which packet traces will be loaded
+   */
   UdpTraceClientHelper (Ipv4Address ip, uint16_t port, std::string filename);
+  /**
+   * Create UdpTraceClientHelper which will make life easier for people trying
+   * to set up simulations with udp-client-server.
+   *
+   * \param ip The IPv6 address of the remote UDP server
+   * \param port The port number of the remote UDP server
+   * \param filename the file from which packet traces will be loaded
+   */
   UdpTraceClientHelper (Ipv6Address ip, uint16_t port, std::string filename);
 
   /**
@@ -167,14 +210,14 @@
   /**
     * \param c the nodes
     *
-    * Create one udp trace client application on each of the input nodes
+    * Create one UDP trace client application on each of the input nodes
     *
     * \returns the applications created, one application per input node.
     */
   ApplicationContainer Install (NodeContainer c);
 
 private:
-  ObjectFactory m_factory;
+  ObjectFactory m_factory; //!< Object factory.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/helper/udp-echo-helper.h ns-3.19/src/applications/helper/udp-echo-helper.h
--- ns-3.18.1/src/applications/helper/udp-echo-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/helper/udp-echo-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 namespace ns3 {
 
 /**
- * \brief Create a server application which waits for input udp packets
+ * \ingroup udpecho
+ * \brief Create a server application which waits for input UDP packets
  *        and sends them back to the original sender.
  */
 class UdpEchoServerHelper
@@ -87,15 +88,20 @@
 
 private:
   /**
-   * \internal
+   * Install an ns3::UdpEchoServer on the node configured with all the
+   * attributes set with SetAttribute.
+   *
+   * \param node The node on which an UdpEchoServer will be installed.
+   * \returns Ptr to the application installed.
    */
   Ptr<Application> InstallPriv (Ptr<Node> node) const;
 
-  ObjectFactory m_factory;
+  ObjectFactory m_factory; //!< Object factory.
 };
 
 /**
- * \brief create an application which sends a udp packet and waits for an echo of this packet
+ * \ingroup udpecho
+ * \brief Create an application which sends a UDP packet and waits for an echo of this packet
  */
 class UdpEchoClientHelper
 {
@@ -108,7 +114,21 @@
    * \param port The port number of the remote udp echo server
    */
   UdpEchoClientHelper (Address ip, uint16_t port);
+  /**
+   * Create UdpEchoClientHelper which will make life easier for people trying
+   * to set up simulations with echos.
+   *
+   * \param ip The IPv4 address of the remote udp echo server
+   * \param port The port number of the remote udp echo server
+   */
   UdpEchoClientHelper (Ipv4Address ip, uint16_t port);
+  /**
+   * Create UdpEchoClientHelper which will make life easier for people trying
+   * to set up simulations with echos.
+   *
+   * \param ip The IPv6 address of the remote udp echo server
+   * \param port The port number of the remote udp echo server
+   */
   UdpEchoClientHelper (Ipv6Address ip, uint16_t port);
 
   /**
@@ -203,8 +223,15 @@
   ApplicationContainer Install (NodeContainer c) const;
 
 private:
+  /**
+   * Install an ns3::UdpEchoClient on the node configured with all the
+   * attributes set with SetAttribute.
+   *
+   * \param node The node on which an UdpEchoClient will be installed.
+   * \returns Ptr to the application installed.
+   */
   Ptr<Application> InstallPriv (Ptr<Node> node) const;
-  ObjectFactory m_factory;
+  ObjectFactory m_factory; //!< Object factory.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/helper/v4ping-helper.h ns-3.19/src/applications/helper/v4ping-helper.h
--- ns-3.18.1/src/applications/helper/v4ping-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/helper/v4ping-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -1,3 +1,23 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+
 #ifndef V4PING_HELPER_H
 #define V4PING_HELPER_H
 
@@ -8,7 +28,8 @@
 namespace ns3 {
 
 /**
- * \brief create a pinger application and associate it to a node
+ * \ingroup v4ping
+ * \brief Create a IPv5 ping application and associate it to a node
  *
  * This class creates one or multiple instances of ns3::V4Ping and associates
  * it/them to one/multiple node(s).
@@ -25,33 +46,33 @@
   V4PingHelper (Ipv4Address remote);
 
   /**
-   * Install a pinger application on each Node in the provided NodeContainer.
+   * Install a Ping application on each Node in the provided NodeContainer.
    *
    * \param nodes The NodeContainer containing all of the nodes to get a V4Ping
    *              application.
    *
-   * \returns A list of pinger applications, one for each input node
+   * \returns A list of Ping applications, one for each input node
    */
   ApplicationContainer Install (NodeContainer nodes) const;
 
   /**
-   * Install a pinger application on the provided Node.  The Node is specified
+   * Install a Ping application on the provided Node.  The Node is specified
    * directly by a Ptr<Node>
    *
    * \param node The node to install the V4PingApplication on.
    *
-   * \returns An ApplicationContainer holding the pinger application created.
+   * \returns An ApplicationContainer holding the Ping application created.
    */
   ApplicationContainer Install (Ptr<Node> node) const;
 
   /**
-   * Install a pinger application on the provided Node.  The Node is specified
+   * Install a Ping application on the provided Node.  The Node is specified
    * by a string that must have previously been associated with a Node using the
    * Object Name Service.
    *
    * \param nodeName The node to install the V4PingApplication on.
    *
-   * \returns An ApplicationContainer holding the pinger application created.
+   * \returns An ApplicationContainer holding the Ping application created.
    */
   ApplicationContainer Install (std::string nodeName) const;
 
@@ -63,9 +84,12 @@
   void SetAttribute (std::string name, const AttributeValue &value);
 private:
   /**
-   * \internal
+   * \brief Do the actual application installation in the node
+   * \param node the node
+   * \returns a Smart pointer to the installed application
    */
   Ptr<Application> InstallPriv (Ptr<Node> node) const;
+  /// Object factory
   ObjectFactory m_factory;
 };
 
diff -Naur ns-3.18.1/src/applications/model/application-packet-probe.cc ns-3.19/src/applications/model/application-packet-probe.cc
--- ns-3.18.1/src/applications/model/application-packet-probe.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/application-packet-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe);
+NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe)
+  ;
 
 TypeId
 ApplicationPacketProbe::GetTypeId ()
diff -Naur ns-3.18.1/src/applications/model/application-packet-probe.h ns-3.19/src/applications/model/application-packet-probe.h
--- ns-3.18.1/src/applications/model/application-packet-probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/application-packet-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -37,6 +37,8 @@
 namespace ns3 {
 
 /**
+ * \brief Probe to translate from a TraceSource to two more easily parsed TraceSources.
+ *
  * This class is designed to probe an underlying ns3 TraceSource
  * exporting a packet and a socket address.  This probe exports a
  * trace source "Output" with arguments of type Ptr<const Packet> and
@@ -49,6 +51,10 @@
 class ApplicationPacketProbe : public Probe
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   ApplicationPacketProbe ();
   virtual ~ApplicationPacketProbe ();
@@ -97,11 +103,12 @@
    * \param packet the traced packet
    * \param address the socket address for the traced packet
    *
-   * \internal
    */
   void TraceSink (Ptr<const Packet> packet, const Address& address);
 
+  /// Output trace, packet and source address
   TracedCallback<Ptr<const Packet>, const Address&> m_output;
+  /// Output trace, previous packet size and current packet size
   TracedCallback<uint32_t, uint32_t> m_outputBytes;
 
   /// The traced packet.
diff -Naur ns-3.18.1/src/applications/model/bulk-send-application.cc ns-3.19/src/applications/model/bulk-send-application.cc
--- ns-3.18.1/src/applications/model/bulk-send-application.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/bulk-send-application.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication);
+NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication)
+  ;
 
 TypeId
 BulkSendApplication::GetTypeId (void)
diff -Naur ns-3.18.1/src/applications/model/bulk-send-application.h ns-3.19/src/applications/model/bulk-send-application.h
--- ns-3.18.1/src/applications/model/bulk-send-application.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/bulk-send-application.h	2013-12-20 09:44:50.000000000 -0800
@@ -38,8 +38,8 @@
  *
  * This traffic generator simply sends data
  * as fast as possible up to MaxBytes or until
- * the appplication is stopped if MaxBytes is
- * zero. Once the lower layer send buffer is
+ * the application is stopped (if MaxBytes is
+ * zero). Once the lower layer send buffer is
  * filled, it waits until space is free to
  * send more data, essentially keeping a
  * constant flow of data. Only SOCK_STREAM 
@@ -47,9 +47,31 @@
  * For example, TCP sockets can be used, but 
  * UDP sockets can not be used.
  */
+
+/**
+ * \ingroup bulksend
+ *
+ * \brief Send as much traffic as possible, trying to fill the bandwidth.
+ *
+ * This traffic generator simply sends data
+ * as fast as possible up to MaxBytes or until
+ * the application is stopped (if MaxBytes is
+ * zero). Once the lower layer send buffer is
+ * filled, it waits until space is free to
+ * send more data, essentially keeping a
+ * constant flow of data. Only SOCK_STREAM
+ * and SOCK_SEQPACKET sockets are supported.
+ * For example, TCP sockets can be used, but
+ * UDP sockets can not be used.
+ *
+ */
 class BulkSendApplication : public Application
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   BulkSendApplication ();
@@ -57,20 +79,22 @@
   virtual ~BulkSendApplication ();
 
   /**
-   * \param maxBytes the upper bound of bytes to send
+   * \brief Set the upper bound for the total number of bytes to send.
    *
-   * Set the upper bound for the total number of bytes to send. Once 
-   * this bound is reached, no more application bytes are sent. If the 
+   * Once this bound is reached, no more application bytes are sent. If the
    * application is stopped during the simulation and restarted, the 
    * total number of bytes sent is not reset; however, the maxBytes 
    * bound is still effective and the application will continue sending 
    * up to maxBytes. The value zero for maxBytes means that 
    * there is no upper bound; i.e. data is sent until the application 
    * or simulation is stopped.
+   *
+   * \param maxBytes the upper bound of bytes to send
    */
   void SetMaxBytes (uint32_t maxBytes);
 
   /**
+   * \brief Get the socket this application is attached to.
    * \return pointer to associated socket
    */
   Ptr<Socket> GetSocket (void) const;
@@ -82,22 +106,37 @@
   virtual void StartApplication (void);    // Called at time specified by Start
   virtual void StopApplication (void);     // Called at time specified by Stop
 
+  /**
+   * \brief Send data until the L4 transmission buffer is full.
+   */
   void SendData ();
 
-  Ptr<Socket>     m_socket;       // Associated socket
-  Address         m_peer;         // Peer address
-  bool            m_connected;    // True if connected
-  uint32_t        m_sendSize;     // Size of data to send each time
-  uint32_t        m_maxBytes;     // Limit total number of bytes sent
-  uint32_t        m_totBytes;     // Total bytes sent so far
-  TypeId          m_tid;
+  Ptr<Socket>     m_socket;       //!< Associated socket
+  Address         m_peer;         //!< Peer address
+  bool            m_connected;    //!< True if connected
+  uint32_t        m_sendSize;     //!< Size of data to send each time
+  uint32_t        m_maxBytes;     //!< Limit total number of bytes sent
+  uint32_t        m_totBytes;     //!< Total bytes sent so far
+  TypeId          m_tid;          //!< The type of protocol to use.
+
+  /// Traced Callback: sent packets
   TracedCallback<Ptr<const Packet> > m_txTrace;
 
 private:
+  /**
+   * \brief Connection Succeeded (called by Socket through a callback)
+   * \param socket the connected socket
+   */
   void ConnectionSucceeded (Ptr<Socket> socket);
+  /**
+   * \brief Connection Failed (called by Socket through a callback)
+   * \param socket the connected socket
+   */
   void ConnectionFailed (Ptr<Socket> socket);
+  /**
+   * \brief Send more data as soon as some has been transmitted.
+   */
   void DataSend (Ptr<Socket>, uint32_t); // for socket's SetSendCallback
-  void Ignore (Ptr<Socket> socket);
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/model/onoff-application.cc ns-3.19/src/applications/model/onoff-application.cc
--- ns-3.18.1/src/applications/model/onoff-application.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/onoff-application.cc	2013-12-20 09:44:50.000000000 -0800
@@ -46,7 +46,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (OnOffApplication);
+NS_OBJECT_ENSURE_REGISTERED (OnOffApplication)
+  ;
 
 TypeId
 OnOffApplication::GetTypeId (void)
@@ -166,6 +167,8 @@
         MakeCallback (&OnOffApplication::ConnectionSucceeded, this),
         MakeCallback (&OnOffApplication::ConnectionFailed, this));
     }
+  m_cbrRateFailSafe = m_cbrRate;
+
   // Insure no pending event
   CancelEvents ();
   // If we are not yet connected, there is nothing to do here
@@ -193,13 +196,14 @@
 {
   NS_LOG_FUNCTION (this);
 
-  if (m_sendEvent.IsRunning ())
+  if (m_sendEvent.IsRunning () && m_cbrRateFailSafe == m_cbrRate )
     { // Cancel the pending send packet event
       // Calculate residual bits since last packet sent
       Time delta (Simulator::Now () - m_lastStartTime);
       int64x64_t bits = delta.To (Time::S) * m_cbrRate.GetBitRate ();
       m_residualBits += bits.GetHigh ();
     }
+  m_cbrRateFailSafe = m_cbrRate;
   Simulator::Cancel (m_sendEvent);
   Simulator::Cancel (m_startStopEvent);
 }
diff -Naur ns-3.18.1/src/applications/model/onoff-application.h ns-3.19/src/applications/model/onoff-application.h
--- ns-3.18.1/src/applications/model/onoff-application.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/onoff-application.h	2013-12-20 09:44:50.000000000 -0800
@@ -86,6 +86,10 @@
 class OnOffApplication : public Application 
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   OnOffApplication ();
@@ -93,23 +97,24 @@
   virtual ~OnOffApplication();
 
   /**
-   * \param maxBytes the total number of bytes to send
+   * \brief Set the total number of bytes to send.
+   *
+   * Once these bytes are sent, no packet is sent again, even in on state.
+   * The value zero means that there is no limit.
    *
-   * Set the total number of bytes to send. Once these bytes are sent, no packet 
-   * is sent again, even in on state. The value zero means that there is no 
-   * limit.
+   * \param maxBytes the total number of bytes to send
    */
   void SetMaxBytes (uint32_t maxBytes);
 
   /**
+   * \brief Return a pointer to associated socket.
    * \return pointer to associated socket
    */
   Ptr<Socket> GetSocket (void) const;
 
  /**
-  * Assign a fixed random variable stream number to the random variables
-  * used by this model.  Return the number of streams (possibly zero) that
-  * have been assigned.
+  * \brief Assign a fixed random variable stream number to the random variables
+  * used by this model.
   *
   * \param stream first stream index to use
   * \return the number of stream indices assigned by this model
@@ -124,43 +129,66 @@
   virtual void StopApplication (void);     // Called at time specified by Stop
 
   //helpers
+  /**
+   * \brief Cancel all pending events.
+   */
   void CancelEvents ();
 
-  void Construct (Ptr<Node> n,
-                  const Address &remote,
-                  std::string tid,
-                  const RandomVariable& ontime,
-                  const RandomVariable& offtime,
-                  uint32_t size);
-
-
   // Event handlers
+  /**
+   * \brief Start an On period
+   */
   void StartSending ();
+  /**
+   * \brief Start an Off period
+   */
   void StopSending ();
+  /**
+   * \brief Send a packet
+   */
   void SendPacket ();
 
-  Ptr<Socket>     m_socket;       // Associated socket
-  Address         m_peer;         // Peer address
-  bool            m_connected;    // True if connected
-  Ptr<RandomVariableStream>  m_onTime;       // rng for On Time
-  Ptr<RandomVariableStream>  m_offTime;      // rng for Off Time
-  DataRate        m_cbrRate;      // Rate that data is generated
-  uint32_t        m_pktSize;      // Size of packets
-  uint32_t        m_residualBits; // Number of generated, but not sent, bits
-  Time            m_lastStartTime; // Time last packet sent
-  uint32_t        m_maxBytes;     // Limit total number of bytes sent
-  uint32_t        m_totBytes;     // Total bytes sent so far
-  EventId         m_startStopEvent;     // Event id for next start or stop event
-  EventId         m_sendEvent;    // Eventid of pending "send packet" event
-  bool            m_sending;      // True if currently in sending state
-  TypeId          m_tid;
+  Ptr<Socket>     m_socket;       //!< Associated socket
+  Address         m_peer;         //!< Peer address
+  bool            m_connected;    //!< True if connected
+  Ptr<RandomVariableStream>  m_onTime;       //!< rng for On Time
+  Ptr<RandomVariableStream>  m_offTime;      //!< rng for Off Time
+  DataRate        m_cbrRate;      //!< Rate that data is generated
+  DataRate        m_cbrRateFailSafe;      //!< Rate that data is generated (check copy)
+  uint32_t        m_pktSize;      //!< Size of packets
+  uint32_t        m_residualBits; //!< Number of generated, but not sent, bits
+  Time            m_lastStartTime; //!< Time last packet sent
+  uint32_t        m_maxBytes;     //!< Limit total number of bytes sent
+  uint32_t        m_totBytes;     //!< Total bytes sent so far
+  EventId         m_startStopEvent;     //!< Event id for next start or stop event
+  EventId         m_sendEvent;    //!< Event id of pending "send packet" event
+  TypeId          m_tid;          //!< Type of the socket used
+
+  /// Traced Callback: transmitted packets.
   TracedCallback<Ptr<const Packet> > m_txTrace;
 
 private:
+  /**
+   * \brief Schedule the next packet transmission
+   */
   void ScheduleNextTx ();
+  /**
+   * \brief Schedule the next On period start
+   */
   void ScheduleStartEvent ();
+  /**
+   * \brief Schedule the next Off period start
+   */
   void ScheduleStopEvent ();
+  /**
+   * \brief Handle a Connection Succeed event
+   * \param socket the connected socket
+   */
   void ConnectionSucceeded (Ptr<Socket> socket);
+  /**
+   * \brief Handle a Connection Failed event
+   * \param socket the not connected socket
+   */
   void ConnectionFailed (Ptr<Socket> socket);
 };
 
diff -Naur ns-3.18.1/src/applications/model/packet-loss-counter.cc ns-3.19/src/applications/model/packet-loss-counter.cc
--- ns-3.18.1/src/applications/model/packet-loss-counter.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/packet-loss-counter.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
+NS_LOG_COMPONENT_DEFINE ("PacketLossCounter")
+  ;
 
 
 PacketLossCounter::PacketLossCounter (uint8_t bitmapSize)
diff -Naur ns-3.18.1/src/applications/model/packet-loss-counter.h ns-3.19/src/applications/model/packet-loss-counter.h
--- ns-3.18.1/src/applications/model/packet-loss-counter.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/packet-loss-counter.h	2013-12-20 09:44:50.000000000 -0800
@@ -33,23 +33,63 @@
 class Socket;
 class Packet;
 
+/**
+ * \ingroup udpclientserver
+ * \class PacketLossCounter
+ * \brief A class to count the number of lost packets.
+ *
+ * This class records the packet lost in a client/server transmission
+ * leveraging a sequence number. All the packets outside a given window
+ * (i.e., too old wit respect to the last sequence number seen) are considered lost,
+ */
 class PacketLossCounter
 {
 public:
+  /**
+   * \brief Constructor
+   * \param bitmapSize The window size. Must be a multiple of 8.
+   */
   PacketLossCounter (uint8_t bitmapSize);
   ~PacketLossCounter ();
+  /**
+   * \brief Record a successfully received packet
+   * \param seq the packet sequence number
+   */
   void NotifyReceived (uint32_t seq);
+  /**
+   * \brief Get the number of lost packets.
+   * \returns the number of lost packets.
+   */
   uint32_t GetLost (void) const;
+  /**
+   * \brief Return the size of the window used to compute the packet loss.
+   * \return the window size.
+   */
   uint16_t GetBitMapSize (void) const;
+  /**
+   * \brief Set the size of the window used to compute the packet loss.
+   *
+   * \param size The window size. Must be a multiple of 8.
+   */
   void SetBitMapSize (uint16_t size);
 private:
+  /**
+   * \brief Check if a sequence number in the window has been received.
+   * \param seqNum the sequence number.
+   * \returns false if the packet has not been received.
+   */
   bool GetBit (uint32_t seqNum);
+  /**
+   * \brief Set a sequence number to a given state.
+   * \param seqNum the sequence number.
+   * \param val false if the packet has not been received.
+   */
   void SetBit (uint32_t seqNum, bool val);
 
-  uint32_t m_lost;
-  uint16_t m_bitMapSize;
-  uint32_t m_lastMaxSeqNum;
-  uint8_t * m_receiveBitMap;
+  uint32_t m_lost; //!< Lost packets counter.
+  uint16_t m_bitMapSize; //!< Window size.
+  uint32_t m_lastMaxSeqNum; //!< Last sequence number seen.
+  uint8_t * m_receiveBitMap; //!< Received packets in the window size.
 };
 }
 
diff -Naur ns-3.18.1/src/applications/model/packet-sink.cc ns-3.19/src/applications/model/packet-sink.cc
--- ns-3.18.1/src/applications/model/packet-sink.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/packet-sink.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,8 +34,10 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PacketSink");
-NS_OBJECT_ENSURE_REGISTERED (PacketSink);
+NS_LOG_COMPONENT_DEFINE ("PacketSink")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (PacketSink)
+  ;
 
 TypeId 
 PacketSink::GetTypeId (void)
diff -Naur ns-3.18.1/src/applications/model/packet-sink.h ns-3.19/src/applications/model/packet-sink.h
--- ns-3.18.1/src/applications/model/packet-sink.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/packet-sink.h	2013-12-20 09:44:50.000000000 -0800
@@ -62,12 +62,16 @@
  * The constructor specifies the Address (IP address and port) and the 
  * transport protocol to use.   A virtual Receive () method is installed 
  * as a callback on the receiving socket.  By default, when logging is
- * enabled, it prints out the size of packets and their address, but
- * we intend to also add a tracing source to Receive() at a later date.
+ * enabled, it prints out the size of packets and their address.
+ * A tracing source to Receive() is also available.
  */
 class PacketSink : public Application 
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   PacketSink ();
 
@@ -95,19 +99,38 @@
   virtual void StartApplication (void);    // Called at time specified by Start
   virtual void StopApplication (void);     // Called at time specified by Stop
 
-  void HandleRead (Ptr<Socket>);
-  void HandleAccept (Ptr<Socket>, const Address& from);
-  void HandlePeerClose (Ptr<Socket>);
-  void HandlePeerError (Ptr<Socket>);
+  /**
+   * \brief Handle a packet received by the application
+   * \param socket the receiving socket
+   */
+  void HandleRead (Ptr<Socket> socket);
+  /**
+   * \brief Handle an incoming connection
+   * \param socket the incoming connection socket
+   * \param from the address the connection is from
+   */
+  void HandleAccept (Ptr<Socket> socket, const Address& from);
+  /**
+   * \brief Handle an connection close
+   * \param socket the connected socket
+   */
+  void HandlePeerClose (Ptr<Socket> socket);
+  /**
+   * \brief Handle an connection error
+   * \param socket the connected socket
+   */
+  void HandlePeerError (Ptr<Socket> socket);
 
   // In the case of TCP, each socket accept returns a new socket, so the 
-  // listening socket is stored seperately from the accepted sockets
-  Ptr<Socket>     m_socket;       // Listening socket
-  std::list<Ptr<Socket> > m_socketList; //the accepted sockets
-
-  Address         m_local;        // Local address to bind to
-  uint32_t        m_totalRx;      // Total bytes received
-  TypeId          m_tid;          // Protocol TypeId
+  // listening socket is stored separately from the accepted sockets
+  Ptr<Socket>     m_socket;       //!< Listening socket
+  std::list<Ptr<Socket> > m_socketList; //!< the accepted sockets
+
+  Address         m_local;        //!< Local address to bind to
+  uint32_t        m_totalRx;      //!< Total bytes received
+  TypeId          m_tid;          //!< Protocol TypeId
+
+  /// Traced Callback: received packets, source address.
   TracedCallback<Ptr<const Packet>, const Address &> m_rxTrace;
 
 };
diff -Naur ns-3.18.1/src/applications/model/ping6.cc ns-3.19/src/applications/model/ping6.cc
--- ns-3.18.1/src/applications/model/ping6.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/ping6.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,9 +38,11 @@
 namespace ns3 
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ping6Application");
+NS_LOG_COMPONENT_DEFINE ("Ping6Application")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (Ping6);
+NS_OBJECT_ENSURE_REGISTERED (Ping6)
+  ;
 
 TypeId Ping6::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/applications/model/radvd.cc ns-3.19/src/applications/model/radvd.cc
--- ns-3.18.1/src/applications/model/radvd.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/radvd.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,9 +40,11 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("RadvdApplication");
+NS_LOG_COMPONENT_DEFINE ("RadvdApplication")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (Radvd);
+NS_OBJECT_ENSURE_REGISTERED (Radvd)
+  ;
 
 TypeId Radvd::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/applications/model/radvd.h ns-3.19/src/applications/model/radvd.h
--- ns-3.18.1/src/applications/model/radvd.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/radvd.h	2013-12-20 09:44:50.000000000 -0800
@@ -91,12 +91,18 @@
   virtual void DoDispose ();
 
 private:
+  /// Container: Ptr to RadvdInterface
   typedef std::list<Ptr<RadvdInterface> > RadvdInterfaceList;
+  /// Container Iterator: Ptr to RadvdInterface
   typedef std::list<Ptr<RadvdInterface> >::iterator RadvdInterfaceListI;
+  /// Container Const Iterator: Ptr to RadvdInterface
   typedef std::list<Ptr<RadvdInterface> >::const_iterator RadvdInterfaceListCI;
 
+  /// Container: interface number, EventId
   typedef std::map<uint32_t, EventId> EventIdMap;
+  /// Container Iterator: interface number, EventId
   typedef std::map<uint32_t, EventId>::iterator EventIdMapI;
+  /// Container Const Iterator: interface number, EventId
   typedef std::map<uint32_t, EventId>::const_iterator EventIdMapCI;
 
   /**
diff -Naur ns-3.18.1/src/applications/model/radvd-interface.cc ns-3.19/src/applications/model/radvd-interface.cc
--- ns-3.18.1/src/applications/model/radvd-interface.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/radvd-interface.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 namespace ns3 
 {
 
-NS_LOG_COMPONENT_DEFINE ("RadvdInterface");
+NS_LOG_COMPONENT_DEFINE ("RadvdInterface")
+  ;
 
 RadvdInterface::RadvdInterface (uint32_t interface)
   : m_interface (interface)
diff -Naur ns-3.18.1/src/applications/model/radvd-interface.h ns-3.19/src/applications/model/radvd-interface.h
--- ns-3.18.1/src/applications/model/radvd-interface.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/radvd-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -36,8 +36,11 @@
 class RadvdInterface : public SimpleRefCount<RadvdInterface>
 {
 public:
+  /// Container: Ptr to RadvdPrefix
   typedef std::list<Ptr<RadvdPrefix> > RadvdPrefixList;
+  /// Container Iterator: Ptr to RadvdPrefix
   typedef std::list<Ptr<RadvdPrefix> >::iterator RadvdPrefixListI;
+  /// Container Const Iterator: Ptr to RadvdPrefix
   typedef std::list<Ptr<RadvdPrefix> >::const_iterator RadvdPrefixListCI;
 
   /**
diff -Naur ns-3.18.1/src/applications/model/radvd-prefix.cc ns-3.19/src/applications/model/radvd-prefix.cc
--- ns-3.18.1/src/applications/model/radvd-prefix.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/radvd-prefix.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("RadvdPrefix");
+NS_LOG_COMPONENT_DEFINE ("RadvdPrefix")
+  ;
 
 RadvdPrefix::RadvdPrefix (Ipv6Address network, uint8_t prefixLength, uint32_t preferredLifeTime, uint32_t validLifeTime, bool onLinkFlag, bool autonomousFlag, bool routerAddrFlag)
   : m_network (network),
diff -Naur ns-3.18.1/src/applications/model/seq-ts-header.cc ns-3.19/src/applications/model/seq-ts-header.cc
--- ns-3.18.1/src/applications/model/seq-ts-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/seq-ts-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader);
+NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader)
+  ;
 
 SeqTsHeader::SeqTsHeader ()
   : m_seq (0),
diff -Naur ns-3.18.1/src/applications/model/seq-ts-header.h ns-3.19/src/applications/model/seq-ts-header.h
--- ns-3.18.1/src/applications/model/seq-ts-header.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/seq-ts-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 /**
  * \ingroup udpclientserver
  * \class SeqTsHeader
- * \brief Packet header for Udp client/server application
+ * \brief Packet header for UDP client/server application.
+ *
  * The header is made of a 32bits sequence number followed by
  * a 64bits time stamp.
  */
@@ -50,16 +51,21 @@
    */
   Time GetTs (void) const;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
-private:
+
   virtual TypeId GetInstanceTypeId (void) const;
   virtual void Print (std::ostream &os) const;
   virtual uint32_t GetSerializedSize (void) const;
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
-  uint32_t m_seq;
-  uint64_t m_ts;
+private:
+  uint32_t m_seq; //!< Sequence number
+  uint64_t m_ts; //!< Timestamp
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/model/udp-client.cc ns-3.19/src/applications/model/udp-client.cc
--- ns-3.18.1/src/applications/model/udp-client.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-client.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,8 +35,10 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpClient");
-NS_OBJECT_ENSURE_REGISTERED (UdpClient);
+NS_LOG_COMPONENT_DEFINE ("UdpClient")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UdpClient)
+  ;
 
 TypeId
 UdpClient::GetTypeId (void)
@@ -53,12 +55,11 @@
                    "The time to wait between packets", TimeValue (Seconds (1.0)),
                    MakeTimeAccessor (&UdpClient::m_interval),
                    MakeTimeChecker ())
-    .AddAttribute (
-      "RemoteAddress",
-      "The destination Address of the outbound packets",
-      AddressValue (),
-      MakeAddressAccessor (&UdpClient::m_peerAddress),
-      MakeAddressChecker ())
+    .AddAttribute ("RemoteAddress",
+                   "The destination Address of the outbound packets",
+                   AddressValue (),
+                   MakeAddressAccessor (&UdpClient::m_peerAddress),
+                   MakeAddressChecker ())
     .AddAttribute ("RemotePort", "The destination port of the outbound packets",
                    UintegerValue (100),
                    MakeUintegerAccessor (&UdpClient::m_peerPort),
diff -Naur ns-3.18.1/src/applications/model/udp-client.h ns-3.19/src/applications/model/udp-client.h
--- ns-3.18.1/src/applications/model/udp-client.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-client.h	2013-12-20 09:44:50.000000000 -0800
@@ -43,8 +43,11 @@
 class UdpClient : public Application
 {
 public:
-  static TypeId
-  GetTypeId (void);
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
+  static TypeId GetTypeId (void);
 
   UdpClient ();
 
@@ -52,11 +55,21 @@
 
   /**
    * \brief set the remote address and port
-   * \param ip remote IP address
+   * \param ip remote IPv4 address
    * \param port remote port
    */
   void SetRemote (Ipv4Address ip, uint16_t port);
+  /**
+   * \brief set the remote address and port
+   * \param ip remote IPv6 address
+   * \param port remote port
+   */
   void SetRemote (Ipv6Address ip, uint16_t port);
+  /**
+   * \brief set the remote address and port
+   * \param ip remote IP address
+   * \param port remote port
+   */
   void SetRemote (Address ip, uint16_t port);
 
 protected:
@@ -67,18 +80,20 @@
   virtual void StartApplication (void);
   virtual void StopApplication (void);
 
-  void ScheduleTransmit (Time dt);
+  /**
+   * \brief Send a packet
+   */
   void Send (void);
 
-  uint32_t m_count;
-  Time m_interval;
-  uint32_t m_size;
-
-  uint32_t m_sent;
-  Ptr<Socket> m_socket;
-  Address m_peerAddress;
-  uint16_t m_peerPort;
-  EventId m_sendEvent;
+  uint32_t m_count; //!< Maximum number of packets the application will send
+  Time m_interval; //!< Packet inter-send time
+  uint32_t m_size; //!< Size of the sent packet (including the SeqTsHeader)
+
+  uint32_t m_sent; //!< Counter for sent packets
+  Ptr<Socket> m_socket; //!< Socket
+  Address m_peerAddress; //!< Remote peer address
+  uint16_t m_peerPort; //!< Remote peer port
+  EventId m_sendEvent; //!< Event to send the next packet
 
 };
 
diff -Naur ns-3.18.1/src/applications/model/udp-echo-client.cc ns-3.19/src/applications/model/udp-echo-client.cc
--- ns-3.18.1/src/applications/model/udp-echo-client.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-echo-client.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,8 +31,10 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication");
-NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient);
+NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient)
+  ;
 
 TypeId
 UdpEchoClient::GetTypeId (void)
@@ -296,9 +298,9 @@
   else
     {
       //
-      // If m_dataSize is zero, the client has indicated that she doesn't care 
+      // If m_dataSize is zero, the client has indicated that it doesn't care
       // about the data itself either by specifying the data size by setting
-      // the corresponding atribute or by not calling a SetFill function.  In 
+      // the corresponding attribute or by not calling a SetFill function.  In
       // this case, we don't worry about it either.  But we do allow m_size
       // to have a value different from the (zero) m_dataSize.
       //
diff -Naur ns-3.18.1/src/applications/model/udp-echo-client.h ns-3.19/src/applications/model/udp-echo-client.h
--- ns-3.18.1/src/applications/model/udp-echo-client.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-echo-client.h	2013-12-20 09:44:50.000000000 -0800
@@ -39,6 +39,10 @@
 class UdpEchoClient : public Application 
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   UdpEchoClient ();
@@ -46,12 +50,23 @@
   virtual ~UdpEchoClient ();
 
   /**
-   * \param ip destination ipv4 address
-   * \param port destination port
+   * \brief set the remote address and port
+   * \param ip remote IPv4 address
+   * \param port remote port
    */
-  void SetRemote (Address ip, uint16_t port);
   void SetRemote (Ipv4Address ip, uint16_t port);
+  /**
+   * \brief set the remote address and port
+   * \param ip remote IPv6 address
+   * \param port remote port
+   */
   void SetRemote (Ipv6Address ip, uint16_t port);
+  /**
+   * \brief set the remote address and port
+   * \param ip remote IP address
+   * \param port remote port
+   */
+  void SetRemote (Address ip, uint16_t port);
 
   /**
    * Set the data size of the packet (the number of bytes that are sent as data
@@ -130,23 +145,38 @@
   virtual void StartApplication (void);
   virtual void StopApplication (void);
 
+  /**
+   * \brief Schedule the next packet transmission
+   * \param dt time interval between packets.
+   */
   void ScheduleTransmit (Time dt);
+  /**
+   * \brief Send a packet
+   */
   void Send (void);
 
+  /**
+   * \brief Handle a packet reception.
+   *
+   * This function is called by lower layers.
+   *
+   * \param socket the socket the packet was received to.
+   */
   void HandleRead (Ptr<Socket> socket);
 
-  uint32_t m_count;
-  Time m_interval;
-  uint32_t m_size;
-
-  uint32_t m_dataSize;
-  uint8_t *m_data;
-
-  uint32_t m_sent;
-  Ptr<Socket> m_socket;
-  Address m_peerAddress;
-  uint16_t m_peerPort;
-  EventId m_sendEvent;
+  uint32_t m_count; //!< Maximum number of packets the application will send
+  Time m_interval; //!< Packet inter-send time
+  uint32_t m_size; //!< Size of the sent packet
+
+  uint32_t m_dataSize; //!< packet payload size (must be equal to m_size)
+  uint8_t *m_data; //!< packet payload data
+
+  uint32_t m_sent; //!< Counter for sent packets
+  Ptr<Socket> m_socket; //!< Socket
+  Address m_peerAddress; //!< Remote peer address
+  uint16_t m_peerPort; //!< Remote peer port
+  EventId m_sendEvent; //!< Event to send the next packet
+
   /// Callbacks for tracing the packet Tx events
   TracedCallback<Ptr<const Packet> > m_txTrace;
 };
diff -Naur ns-3.18.1/src/applications/model/udp-echo-server.cc ns-3.19/src/applications/model/udp-echo-server.cc
--- ns-3.18.1/src/applications/model/udp-echo-server.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-echo-server.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,8 +34,10 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication");
-NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer);
+NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer)
+  ;
 
 TypeId
 UdpEchoServer::GetTypeId (void)
diff -Naur ns-3.18.1/src/applications/model/udp-echo-server.h ns-3.19/src/applications/model/udp-echo-server.h
--- ns-3.18.1/src/applications/model/udp-echo-server.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-echo-server.h	2013-12-20 09:44:50.000000000 -0800
@@ -43,6 +43,10 @@
 class UdpEchoServer : public Application 
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   UdpEchoServer ();
   virtual ~UdpEchoServer ();
@@ -55,12 +59,19 @@
   virtual void StartApplication (void);
   virtual void StopApplication (void);
 
+  /**
+   * \brief Handle a packet reception.
+   *
+   * This function is called by lower layers.
+   *
+   * \param socket the socket the packet was received to.
+   */
   void HandleRead (Ptr<Socket> socket);
 
-  uint16_t m_port;
-  Ptr<Socket> m_socket;
-  Ptr<Socket> m_socket6;
-  Address m_local;
+  uint16_t m_port; //!< Port on which we listen for incoming packets.
+  Ptr<Socket> m_socket; //!< IPv4 Socket
+  Ptr<Socket> m_socket6; //!< IPv6 Socket
+  Address m_local; //!< local multicast address
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/model/udp-server.cc ns-3.19/src/applications/model/udp-server.cc
--- ns-3.18.1/src/applications/model/udp-server.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-server.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,8 +36,10 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpServer");
-NS_OBJECT_ENSURE_REGISTERED (UdpServer);
+NS_LOG_COMPONENT_DEFINE ("UdpServer")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UdpServer)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/applications/model/udp-server.h ns-3.19/src/applications/model/udp-server.h
--- ns-3.18.1/src/applications/model/udp-server.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-server.h	2013-12-20 09:44:50.000000000 -0800
@@ -37,30 +37,36 @@
 /**
  * \ingroup udpclientserver
  * \class UdpServer
- * \brief A Udp server. Receives UDP packets from a remote host. UDP packets
- * carry a 32bits sequence number followed by a 64bits time stamp in their
- * payloads. The application uses, the sequence number to determine if a packet
- * is lost, and the time stamp to compute the delay
+ * \brief A UDP server, receives UDP packets from a remote host.
+ *
+ * UDP packets carry a 32bits sequence number followed by a 64bits time
+ * stamp in their payloads. The application uses the sequence number
+ * to determine if a packet is lost, and the time stamp to compute the delay.
  */
 class UdpServer : public Application
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   UdpServer ();
   virtual ~UdpServer ();
   /**
-   * returns the number of lost packets
+   * \brief Returns the number of lost packets
    * \return the number of lost packets
    */
   uint32_t GetLost (void) const;
 
   /**
-   * \brief returns the number of received packets
+   * \brief Returns the number of received packets
    * \return the number of received packets
    */
   uint32_t GetReceived (void) const;
 
   /**
+   * \brief Returns the size of the window used for checking loss.
    * \return the size of the window used for checking loss.
    */
   uint16_t GetPacketWindowSize () const;
@@ -80,14 +86,20 @@
   virtual void StartApplication (void);
   virtual void StopApplication (void);
 
+  /**
+   * \brief Handle a packet reception.
+   *
+   * This function is called by lower layers.
+   *
+   * \param socket the socket the packet was received to.
+   */
   void HandleRead (Ptr<Socket> socket);
 
-  uint16_t m_port;
-  Ptr<Socket> m_socket;
-  Ptr<Socket> m_socket6;
-  Address m_local;
-  uint32_t m_received;
-  PacketLossCounter m_lossCounter;
+  uint16_t m_port; //!< Port on which we listen for incoming packets.
+  Ptr<Socket> m_socket; //!< IPv4 Socket
+  Ptr<Socket> m_socket6; //!< IPv6 Socket
+  uint32_t m_received; //!< Number of received packets
+  PacketLossCounter m_lossCounter; //!< Lost packet counter
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/model/udp-trace-client.cc ns-3.19/src/applications/model/udp-trace-client.cc
--- ns-3.18.1/src/applications/model/udp-trace-client.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-trace-client.cc	2013-12-20 09:44:50.000000000 -0800
@@ -37,9 +37,14 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpTraceClient");
-NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient);
+NS_LOG_COMPONENT_DEFINE ("UdpTraceClient")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient)
+  ;
 
+/**
+ * \brief Default trace to send
+ */
 struct UdpTraceClient::TraceEntry UdpTraceClient::g_defaultEntries[] = {
   { 0, 534, 'I'},
   { 40, 1542, 'P'},
@@ -70,7 +75,7 @@
                    MakeUintegerAccessor (&UdpTraceClient::m_peerPort),
                    MakeUintegerChecker<uint16_t> ())
     .AddAttribute ("MaxPacketSize",
-                   "The maximum size of a packet.",
+                   "The maximum size of a packet (including the SeqTsHeader, 12 bytes).",
                    UintegerValue (1024),
                    MakeUintegerAccessor (&UdpTraceClient::m_maxPacketSize),
                    MakeUintegerChecker<uint32_t> ())
diff -Naur ns-3.18.1/src/applications/model/udp-trace-client.h ns-3.19/src/applications/model/udp-trace-client.h
--- ns-3.18.1/src/applications/model/udp-trace-client.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/udp-trace-client.h	2013-12-20 09:44:50.000000000 -0800
@@ -38,30 +38,32 @@
  * \class UdpTraceClient
  * \brief A trace based streamer
  *
- * sends udp packets based on a trace file of an MPEG4 stream
- * trace files could be downloaded form :
- * http://www.tkn.tu-berlin.de/research/trace/ltvt.html (the 2 first lines of
+ * Sends UDP packets based on a trace file of an MPEG4 stream
+ * trace files could be downloaded form:
+ * http://www2.tkn.tu-berlin.de/research/trace/ltvt.html (the 2 first lines of
  * the file should be removed)
  * A valid trace file is a file with 4 columns:
- * -1- the first one represents the frame index
- * -2- the second one indicates the type of the frame: I, P or B
- * -3- the third one indicates the time on which the frame was generated by the encoder
- * -4- the fourth one indicates the frame size in byte
- * if no valid MPEG4 trace file is provided to the application the trace from
+ * \li -1- the first one represents the frame index
+ * \li -2- the second one indicates the type of the frame: I, P or B
+ * \li -3- the third one indicates the time on which the frame was generated by the encoder
+ * \li -4- the fourth one indicates the frame size in byte
+ *
+ * If no valid MPEG4 trace file is provided to the application the trace from
  * g_defaultEntries array will be loaded.
  */
 class UdpTraceClient : public Application
 {
 public:
-  static TypeId
-  GetTypeId (void);
   /**
-   * \brief creates a traceBasedStreamer application
+   * \brief Get the type ID.
+   * \return the object TypeId
    */
+  static TypeId GetTypeId (void);
+
   UdpTraceClient ();
 
   /**
-   * \brief creates a traceBasedStreamer application
+   * \brief Creates a traceBasedStreamer application
    * \param ip the destination ip address to which the stream will be sent
    * \param port the destination udp port to which the stream will be sent
    * \param traceFile a path to an MPEG4 trace file formatted as follows:
@@ -71,21 +73,30 @@
    *
    *
    */
-
   UdpTraceClient (Ipv4Address ip, uint16_t port, char *traceFile);
   ~UdpTraceClient ();
 
   /**
-   * \brief set the destination IP address and port
-   * \param ip the destination ip address to which the stream will be sent
-   * \param port the destination udp port to which the stream will be sent
+   * \brief set the remote address and port
+   * \param ip remote IPv4 address
+   * \param port remote port
    */
-  void SetRemote (Address ip, uint16_t port);
   void SetRemote (Ipv4Address ip, uint16_t port);
+  /**
+   * \brief set the remote address and port
+   * \param ip remote IPv6 address
+   * \param port remote port
+   */
   void SetRemote (Ipv6Address ip, uint16_t port);
+  /**
+   * \brief set the remote address and port
+   * \param ip remote IP address
+   * \param port remote port
+   */
+  void SetRemote (Address ip, uint16_t port);
 
   /**
-   * \brief set the trace file to be used by the application
+   * \brief Set the trace file to be used by the application
    * \param filename a path to an MPEG4 trace file formatted as follows:
    *  Frame No Frametype   Time[ms]    Length [byte]
    *  Frame No Frametype   Time[ms]    Length [byte]
@@ -94,11 +105,13 @@
   void SetTraceFile (std::string filename);
 
   /**
+   * \brief Return the maximum packet size
    * \return the maximum packet size
    */
   uint16_t GetMaxPacketSize (void);
 
   /**
+   * \brief Set the maximum packet size
    * \param maxPacketSize The maximum packet size
    */
   void SetMaxPacketSize (uint16_t maxPacketSize);
@@ -107,30 +120,50 @@
   virtual void DoDispose (void);
 
 private:
+  /**
+   * \brief Load a trace file
+   * \param filename the trace file path
+   */
   void LoadTrace (std::string filename);
+  /**
+   * \brief Load the default trace
+   */
   void LoadDefaultTrace (void);
   virtual void StartApplication (void);
   virtual void StopApplication (void);
-  void ScheduleTransmit (Time dt);
+
+  /**
+   * \brief Send a packet
+   */
   void Send (void);
+  /**
+   * \brief Send a packet of a given size
+   * \param size the packet size
+   */
   void SendPacket (uint32_t size);
 
-
+  /**
+   * \brief Entry to send.
+   *
+   * Each entry represents an MPEG frame
+   */
   struct TraceEntry
   {
-    uint32_t timeToSend;
-    uint16_t packetSize;
-    char frameType;
+    uint32_t timeToSend; //!< Time to send the frame
+    uint16_t packetSize; //!< Size of the frame
+    char frameType; //!< Frame type (I, P or B)
   };
-  uint32_t m_sent;
-  Ptr<Socket> m_socket;
-  Address m_peerAddress;
-  uint16_t m_peerPort;
-  EventId m_sendEvent;
-  std::vector<struct TraceEntry> m_entries;
-  uint32_t m_currentEntry;
-  static struct TraceEntry g_defaultEntries[];
-  uint16_t m_maxPacketSize;
+
+  uint32_t m_sent; //!< Counter for sent packets
+  Ptr<Socket> m_socket; //!< Socket
+  Address m_peerAddress; //!< Remote peer address
+  uint16_t m_peerPort; //!< Remote peer port
+  EventId m_sendEvent; //!< Event to send the next packet
+
+  std::vector<struct TraceEntry> m_entries; //!< Entries in the trace to send
+  uint32_t m_currentEntry; //!< Current entry index
+  static struct TraceEntry g_defaultEntries[]; //!< Default trace to send
+  uint16_t m_maxPacketSize; //!< Maximum packet size to send (including the SeqTsHeader)
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/applications/model/v4ping.cc ns-3.19/src/applications/model/v4ping.cc
--- ns-3.18.1/src/applications/model/v4ping.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/v4ping.cc	2013-12-20 09:44:50.000000000 -0800
@@ -13,6 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include "v4ping.h"
 #include "ns3/icmpv4.h"
 #include "ns3/assert.h"
@@ -27,8 +28,10 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("V4Ping");
-NS_OBJECT_ENSURE_REGISTERED (V4Ping);
+NS_LOG_COMPONENT_DEFINE ("V4Ping")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (V4Ping)
+  ;
 
 TypeId 
 V4Ping::GetTypeId (void)
diff -Naur ns-3.18.1/src/applications/model/v4ping.h ns-3.19/src/applications/model/v4ping.h
--- ns-3.18.1/src/applications/model/v4ping.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/applications/model/v4ping.h	2013-12-20 09:44:50.000000000 -0800
@@ -13,6 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #ifndef V4PING_H
 #define V4PING_H
 
@@ -28,6 +29,12 @@
 class Socket;
 
 /**
+ * \ingroup applications
+ * \defgroup v4ping V4Ping
+ */
+
+/**
+ * \ingroup v4ping
  * \brief an application which sends one ICMP ECHO request, waits for a REPLYs
  *        and reports the calculated RTT.
  *
@@ -36,6 +43,10 @@
 class V4Ping : public Application
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   /**
@@ -45,15 +56,42 @@
   virtual ~V4Ping ();
 
 private:
+  /**
+   * \brief Writes data to buffer in little-endian format.
+   *
+   * Least significant byte of data is at lowest buffer address
+   *
+   * \param buffer the buffer to write to
+   * \param data the data to write
+   */
   void Write32 (uint8_t *buffer, const uint32_t data);
+  /**
+   * \brief Writes data from a little-endian formatted buffer to data.
+   *
+   * \param buffer the buffer to read from
+   * \param data the read data
+   */
   void Read32 (const uint8_t *buffer, uint32_t &data);
 
   // inherited from Application base class.
   virtual void StartApplication (void);
   virtual void StopApplication (void);
   virtual void DoDispose (void);
+  /**
+   * \brief Return the application ID in the node.
+   * \returns the application id
+   */
   uint32_t GetApplicationId (void) const;
+  /**
+   * \brief Receive an ICMP Echo
+   * \param socket the receiving socket
+   *
+   * This function is called by lower layers through a callback.
+   */
   void Receive (Ptr<Socket> socket);
+  /**
+   * \brief Send one Ping (ICMP ECHO) to the destination
+   */
   void Send ();
 
   /// Remote address
@@ -65,8 +103,11 @@
    * The default is 56, which translates into 64 ICMP data bytes when combined with the 8 bytes of ICMP header data.
    */
   uint32_t m_size;
+  /// The socket we send packets from
   Ptr<Socket> m_socket;
+  /// ICMP ECHO sequence number
   uint16_t m_seq;
+  /// TracedCallback for RTT measured by ICMP ECHOs
   TracedCallback<Time> m_traceRtt;
   /// produce ping-style output if true
   bool m_verbose;
diff -Naur ns-3.18.1/src/bridge/bindings/modulegen__gcc_ILP32.py ns-3.19/src/bridge/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/bridge/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/bridge/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -93,7 +93,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -723,10 +723,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -1676,6 +1677,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -1686,6 +1692,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -1701,6 +1712,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -1726,6 +1742,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/bridge/bindings/modulegen__gcc_LP64.py ns-3.19/src/bridge/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/bridge/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/bridge/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -93,7 +93,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -723,10 +723,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -1676,6 +1677,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -1686,6 +1692,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -1701,6 +1712,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -1726,6 +1742,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/bridge/model/bridge-channel.cc ns-3.19/src/bridge/model/bridge-channel.cc
--- ns-3.18.1/src/bridge/model/bridge-channel.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/bridge/model/bridge-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BridgeChannel);
+NS_OBJECT_ENSURE_REGISTERED (BridgeChannel)
+  ;
 
 TypeId 
 BridgeChannel::GetTypeId (void)
diff -Naur ns-3.18.1/src/bridge/model/bridge-net-device.cc ns-3.19/src/bridge/model/bridge-net-device.cc
--- ns-3.18.1/src/bridge/model/bridge-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/bridge/model/bridge-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/bridge/model/bridge-net-device.h ns-3.19/src/bridge/model/bridge-net-device.h
--- ns-3.18.1/src/bridge/model/bridge-net-device.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/bridge/model/bridge-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,7 @@
 class Node;
 
 /**
- * \defgroup bridge Bridge Device
+ * \defgroup bridge Bridge Network Device
  * 
  * \brief a virtual net device that bridges multiple LAN segments
  *
diff -Naur ns-3.18.1/src/brite/doc/brite.rst ns-3.19/src/brite/doc/brite.rst
--- ns-3.18.1/src/brite/doc/brite.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/brite/doc/brite.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: bash
 
 BRITE Integration
 ------------------
@@ -30,9 +31,7 @@
 router topologies as specified by the AS level topology.  Once the hierarchical 
 topology is constructed, it is flattened into a large router level topology.
 
-Further information can be found in the BRITE user manual:::
-
-	http://www.cs.bu.edu/brite/publications/usermanual.pdf
+Further information can be found in the BRITE user manual: http://www.cs.bu.edu/brite/publications/usermanual.pdf
 
 Model Description
 *****************
@@ -86,7 +85,7 @@
 Building BRITE Integration
 ==========================
 
-The first step is to download and build the ns-3 specific BRITE repository:::
+The first step is to download and build the ns-3 specific BRITE repository::
 
   $ hg clone http://code.nsnam.org/BRITE
   $ cd BRITE
@@ -96,7 +95,7 @@
 directory.
 
 Once BRITE has been built successfully, we proceed to configure ns-3 with 
-BRITE support. Change to your ns-3 directory:::
+BRITE support. Change to your ns-3 directory::
 
   $ ./waf configure --with-brite=/your/path/to/brite/source --enable-examples
 
@@ -104,14 +103,14 @@
 something has gone wrong. Either you have forgotten to build BRITE first 
 following the steps above, or ns-3 could not find your BRITE directory.
 
-Next, build ns-3:::
+Next, build ns-3::
 
   $ ./waf
 
 Examples
 ========
 For an example demonstrating BRITE integration
-run:::
+run::
 
   $ ./waf --run 'brite-generic-example'
 
@@ -119,25 +118,28 @@
 edge information in a similar format to standard BRITE output. There are 
 many other command-line parameters including confFile, tracing, and nix, described below:
    
-   confFile:    A BRITE configuration file. Many different BRITE configuration 
-                file examples exist in the src/brite/examples/conf_files directory, for 
-                example, RTBarabasi20.conf and RTWaxman.conf. Please refer to 
-                the conf_files directory for more examples.
+  confFile
+    A BRITE configuration file. Many different BRITE configuration 
+    file examples exist in the src/brite/examples/conf_files directory, for 
+    example, RTBarabasi20.conf and RTWaxman.conf. Please refer to 
+    the conf_files directory for more examples.
 
-   tracing:     Enables ascii tracing.
+  tracing
+    Enables ascii tracing.
 
-   nix:         Enables nix-vector routing. Global routing is used by default.
+  nix
+    Enables nix-vector routing. Global routing is used by default.
 
 The generic BRITE example also support visualization using pyviz, assuming
-python bindings in ns-3 are enabled:::
+python bindings in ns-3 are enabled::
 
   $ ./waf --run brite-generic-example --vis
   
 Simulations involving BRITE can also be used with MPI.  The total number of MPI instances is 
 passed to the BRITE topology helper where a modulo divide is used to assign the nodes for each 
-AS to a MPI instance.  An example can be found in src/brite/examples:::
+AS to a MPI instance.  An example can be found in src/brite/examples::
 
-	$ mpirun -np 2 ./waf --run brite-MPI-example
+  $ mpirun -np 2 ./waf --run brite-MPI-example
 	
 Please see the ns-3 MPI documentation for information on setting up MPI with ns-3.
 
diff -Naur ns-3.18.1/src/brite/helper/brite-topology-helper.cc ns-3.19/src/brite/helper/brite-topology-helper.cc
--- ns-3.18.1/src/brite/helper/brite-topology-helper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/brite/helper/brite-topology-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,13 +36,14 @@
 
 BriteTopologyHelper::BriteTopologyHelper (std::string confFile,
                                           std::string seedFile,
-                                          std::string newseedFile) : m_confFile (confFile),
-                                                                     m_seedFile (seedFile),
-                                                                     m_newSeedFile (newseedFile),
-                                                                     m_numAs (0),
-                                                                     m_topology (NULL),
-                                                                     m_numNodes (0),
-                                                                     m_numEdges (0)
+                                          std::string newseedFile)
+  : m_confFile (confFile),
+    m_seedFile (seedFile),
+    m_newSeedFile (newseedFile),
+    m_numAs (0),
+    m_topology (NULL),
+    m_numNodes (0),
+    m_numEdges (0)
 {
   NS_LOG_FUNCTION (this);
 
@@ -50,11 +51,12 @@
 
 }
 
-BriteTopologyHelper::BriteTopologyHelper (std::string confFile) : m_confFile (confFile),
-                                                                  m_numAs (0),
-                                                                  m_topology (NULL),
-                                                                  m_numNodes (0),
-                                                                  m_numEdges (0)
+BriteTopologyHelper::BriteTopologyHelper (std::string confFile)
+  : m_confFile (confFile),
+    m_numAs (0),
+    m_topology (NULL),
+    m_numNodes (0),
+    m_numEdges (0)
 {
   NS_LOG_FUNCTION (this);
 
diff -Naur ns-3.18.1/src/brite/helper/brite-topology-helper.h ns-3.19/src/brite/helper/brite-topology-helper.h
--- ns-3.18.1/src/brite/helper/brite-topology-helper.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/brite/helper/brite-topology-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,16 @@
 
 namespace ns3 {
 
+class PointToPointHelper;
+
 /**
+ * \defgroup brite BRITE Topology Generator
+ *
+ * Create topologies with BRITE.
+ */
+
+/**
+ * \ingroup brite
  * \brief Interface with BRITE, the Boston university Representative Internet
  *        Topology gEnerator
  *
@@ -47,12 +56,10 @@
  *
  */
 
-class PointToPointHelper;
-
 class BriteTopologyHelper
 {
 public:
-  /*
+  /**
    * Construct a BriteTopologyHelper
    *
    * \param confFile a BRITE configuration file
@@ -63,7 +70,7 @@
                        std::string seedFile,
                        std::string newseedFile);
 
-  /*
+  /**
    * Construct a BriteTopologyHelper using NS3 to generate seed values
    * need by BRITE
    *
@@ -72,7 +79,7 @@
 
   ~BriteTopologyHelper ();
 
-  /*
+  /**
    * Assigns stream number to UniformRandomVariable used to
    * generate brite seed file
    *
@@ -81,14 +88,14 @@
    */
   void AssignStreams (int64_t streamNumber);
 
-  /*
+  /**
    *  Create NS3 topology using information generated from BRITE.
    *
    *  \param stack Internet stack to assign to nodes in topology
    */
   void BuildBriteTopology (InternetStackHelper& stack);
 
-  /*
+  /**
    * Create NS3 topology using information generated from BRITE and configure topology for MPI use.
    *
    * \param stack Internet stack to assign to nodes in topology.
@@ -97,7 +104,7 @@
    */
   void BuildBriteTopology (InternetStackHelper& stack, const uint32_t systemCount);
 
-  /*
+  /**
    * Returns the number of router leaf nodes for a given AS
    *
    * \param asNum the AS number
@@ -106,7 +113,7 @@
    */
   uint32_t GetNLeafNodesForAs (uint32_t asNum);
 
-  /*
+  /**
    * Returns a given router leaf node from a given AS
    *
    * \param asNum the AS number
@@ -115,7 +122,7 @@
    */
   Ptr<Node> GetLeafNodeForAs (uint32_t asNum, uint32_t leafNum);
 
-  /*
+  /**
    * Returns the total number of nodes for a given AS
    *
    * \param asNum the AS number
@@ -123,7 +130,7 @@
    */
   uint32_t GetNNodesForAs (uint32_t asNum);
 
-  /*
+  /**
    * Returns a given router node for a given AS
    *
    * \param asNum the AS number
@@ -244,52 +251,56 @@
     */
   void GenerateBriteTopology (void);
 
-  //brite configuration file to use
+  /// brite configuration file to use
   std::string m_confFile;
 
-  //brite seed file to use
+  /// brite seed file to use
   std::string m_seedFile;
 
-  //brite seed file to generate for next run
+  /// brite seed file to generate for next run
   std::string m_newSeedFile;
 
-  //stores the number of AS in the BRITE generated topology
+  /// stores the number of AS in the BRITE generated topology
   uint32_t m_numAs;
 
-  //stores the netdevices created for each AS
+  /// stores the netdevices created for each AS
   std::vector<NetDeviceContainer*> m_netDevices;
 
-  //stores the leaf router nodes for each AS
+  /// stores the leaf router nodes for each AS
   std::vector<NodeContainer*> m_asLeafNodes;
 
-  //stores all of the nodes in the brite topology by AS number
+  /// stores all of the nodes in the brite topology by AS number
   std::vector<NodeContainer*> m_nodesByAs;
 
-  //stores the MPI system number each AS assigned to.  All assigned to 0 if MPI not used.
+  /// stores the MPI system number each AS assigned to.  All assigned to 0 if MPI not used.
   std::vector<int> m_systemForAs;
 
+  /// the Brite topology
   brite::Topology* m_topology;
 
-  //stores the number of nodes created in the BRITE topology
+  /// stores the number of nodes created in the BRITE topology
   uint32_t m_numNodes;
 
-  //stores the number of edges created in the BRITE topology
+  /// stores the number of edges created in the BRITE topology
   uint32_t m_numEdges;
 
   /**
    * The BRITE code generates multiple nodes and edges. Each
    * node and edge is stored in a BriteNodeInfo or BriteEdgeInfo
    * struct, and each instance is stored in a vector.
+   * @{
    */
   typedef std::vector<BriteNodeInfo> BriteNodeInfoList;
   typedef std::vector<BriteEdgeInfo> BriteEdgeInfoList;
 
   BriteNodeInfoList m_briteNodeInfoList;
   BriteEdgeInfoList m_briteEdgeInfoList;
+  /**@}*/
 
-  //used to create the links within the topology
+  /// used to create the links within the topology
   PointToPointHelper m_britePointToPointHelper;
 
+  /// random variable stream for brite seed file
   Ptr<UniformRandomVariable> m_uv;
 };
 
diff -Naur ns-3.18.1/src/buildings/bindings/modulegen__gcc_ILP32.py ns-3.19/src/buildings/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/buildings/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -133,7 +133,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1079,10 +1079,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -2381,6 +2382,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2391,6 +2397,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2406,6 +2417,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2431,6 +2447,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/buildings/bindings/modulegen__gcc_LP64.py ns-3.19/src/buildings/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/buildings/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -133,7 +133,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1079,10 +1079,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -2381,6 +2382,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2391,6 +2397,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2406,6 +2417,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2431,6 +2447,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/buildings/doc/source/buildings-design.rst ns-3.19/src/buildings/doc/source/buildings-design.rst
--- ns-3.18.1/src/buildings/doc/source/buildings-design.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/doc/source/buildings-design.rst	2013-12-20 09:44:50.000000000 -0800
@@ -145,7 +145,9 @@
 Shadowing Model
 ---------------
 
-The shadowing is modeled according to a log-normal distribution with variable standard deviation as function of the connection characteristics. In the implementation we considered three main possible scenarios which correspond to three standard deviations (i.e., the mean is always 0), in detail:
+The shadowing is modeled according to a log-normal distribution with variable standard deviation as function of the relative position (indoor or outdoor) of the MobilityModel instances involved. One random value is drawn for each pair of MobilityModels, and stays constant for that pair during the whole simulation. Thus, the model is appropriate for static nodes only. 
+
+The model considers that the mean of the shadowing loss in dB is always 0. For the variance, the model considers three possible values of standard deviation, in detail:
 
  * outdoor (``m_shadowingSigmaOutdoor``, defaul value of 7 dB) :math:`\rightarrow X_\mathrm{O} \sim N(\mu_\mathrm{O}, \sigma_\mathrm{O}^2)`.
  * indoor (``m_shadowingSigmaIndoor``, defaul value of 10 dB) :math:`\rightarrow X_\mathrm{I} \sim N(\mu_\mathrm{I}, \sigma_\mathrm{I}^2)`.
diff -Naur ns-3.18.1/src/buildings/doc/source/buildings-testing.rst ns-3.19/src/buildings/doc/source/buildings-testing.rst
--- ns-3.18.1/src/buildings/doc/source/buildings-testing.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/doc/source/buildings-testing.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,3 +1,5 @@
+.. highlight:: bash
+
 +++++++++++++++++++++++++++++++++++++
  Testing Documentation
 +++++++++++++++++++++++++++++++++++++
@@ -8,20 +10,20 @@
 
 To test and validate the ns-3 Building Pathloss module, some test suites is provided which are integrated with the ns-3 test framework. To run them, you need to have configured the build of the simulator in this way::
 
-    ./waf configure --enable-tests --enable-modules=buildings
-    ./test.py
+    $ ./waf configure --enable-tests --enable-modules=buildings
+    $ ./test.py
 
 The above will run not only the test suites belonging to the buildings module, but also those belonging to all the other ns-3 modules on which the buildings module depends. See the ns-3 manual for generic information on the testing framework.
 
 You can get a more detailed report in HTML format in this way::
 
-    ./test.py -w results.html
+    $ ./test.py -w results.html
 
 After the above command has run, you can view the detailed result for each test by opening the file ``results.html`` with a web browser. 
 
 You can run each test suite separately using this command::
 
-    ./test.py -s test-suite-name
+    $ ./test.py -s test-suite-name
 
 For more details about ``test.py`` and the ns-3 testing framework, please refer to the ns-3 manual.
 
@@ -105,6 +107,6 @@
 Buildings Shadowing Test
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-The test suite ``buildings-shadowing-test`` is a unit test intended to verify the statistics distribution characteristics of the shadowing are the one expected. The shadowing is modeled according to a normal distribution with mean :math:`\mu = 0` and variable standard deviation :math:`\sigma`, according to models commonly used in literature.
-The test generates 10,000 samples of shadowing by subtracting the deterministic component from the total loss returned by the ``BuildingPathlossModel``. The mean and variance of the shadowing samples are then used to verify whether the 99% confidence interval is respected by the sequence generated by the simulator.
+The test suite ``buildings-shadowing-test`` is a unit test intended to verify the statistical distribution of the shadowing model implemented by ``BuildingsPathlossModel``. The shadowing is modeled according to a normal distribution with mean :math:`\mu = 0` and variable standard deviation :math:`\sigma`, according to models commonly used in literature. Three test cases are provided, which cover the cases of indoor, outdoor and indoor-to-outdoor communications. 
+Each test case generates 1000 different samples of shadowing for different pairs of MobilityModel instances in a given scenario. Shadowing values are obtained by subtracting from the total loss value returned by ``HybridBuildingsPathlossModel`` the path loss component which is constant and pre-determined for each test case. The test verifies that the sample mean and sample variance of the shadowing values fall within the 99% confidence interval of the sample mean and sample variance. The test also verifies that the shadowing values returned at successive times for the same pair of MobilityModel instances is constant.
 
diff -Naur ns-3.18.1/src/buildings/examples/buildings-pathloss-profiler.cc ns-3.19/src/buildings/examples/buildings-pathloss-profiler.cc
--- ns-3.18.1/src/buildings/examples/buildings-pathloss-profiler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/examples/buildings-pathloss-profiler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -21,7 +21,6 @@
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/lte-module.h"
 #include "ns3/config-store.h"
 #include <ns3/buildings-helper.h>
 #include <ns3/hybrid-buildings-propagation-loss-model.h>
diff -Naur ns-3.18.1/src/buildings/helper/building-allocator.cc ns-3.19/src/buildings/helper/building-allocator.cc
--- ns-3.18.1/src/buildings/helper/building-allocator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/helper/building-allocator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator);
+NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator)
+  ;
 
 GridBuildingAllocator::GridBuildingAllocator ()
   : m_current (0)
diff -Naur ns-3.18.1/src/buildings/helper/building-position-allocator.cc ns-3.19/src/buildings/helper/building-position-allocator.cc
--- ns-3.18.1/src/buildings/helper/building-position-allocator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/helper/building-position-allocator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -37,7 +37,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RandomBuildingPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (RandomBuildingPositionAllocator)
+  ;
 
 
 RandomBuildingPositionAllocator::RandomBuildingPositionAllocator ()
@@ -104,7 +105,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (RandomRoomPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (RandomRoomPositionAllocator)
+  ;
 
 
 RandomRoomPositionAllocator::RandomRoomPositionAllocator ()
@@ -192,7 +194,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (SameRoomPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (SameRoomPositionAllocator)
+  ;
 
 SameRoomPositionAllocator::SameRoomPositionAllocator ()
 {
@@ -282,7 +285,8 @@
   return 1;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator)
+  ;
 
 
 FixedRoomPositionAllocator::FixedRoomPositionAllocator (
diff -Naur ns-3.18.1/src/buildings/model/building.cc ns-3.19/src/buildings/model/building.cc
--- ns-3.18.1/src/buildings/model/building.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/model/building.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (Building);
+NS_OBJECT_ENSURE_REGISTERED (Building)
+  ;
 
 TypeId
 Building::GetTypeId (void)
diff -Naur ns-3.18.1/src/buildings/model/building-list.cc ns-3.19/src/buildings/model/building-list.cc
--- ns-3.18.1/src/buildings/model/building-list.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/model/building-list.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("BuildingList");
+NS_LOG_COMPONENT_DEFINE ("BuildingList")
+  ;
 
 /**
  * \brief private implementation detail of the BuildingList API.
@@ -57,7 +58,8 @@
   std::vector<Ptr<Building> > m_buildings;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv);
+NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv)
+  ;
 
 TypeId
 BuildingListPriv::GetTypeId (void)
diff -Naur ns-3.18.1/src/buildings/model/buildings-propagation-loss-model.cc ns-3.19/src/buildings/model/buildings-propagation-loss-model.cc
--- ns-3.18.1/src/buildings/model/buildings-propagation-loss-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/model/buildings-propagation-loss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel)
+  ;
 
 BuildingsPropagationLossModel::ShadowingLoss::ShadowingLoss ()
 {
diff -Naur ns-3.18.1/src/buildings/model/hybrid-buildings-propagation-loss-model.cc ns-3.19/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
--- ns-3.18.1/src/buildings/model/hybrid-buildings-propagation-loss-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/model/hybrid-buildings-propagation-loss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -41,7 +41,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel)
+  ;
 
 
 
diff -Naur ns-3.18.1/src/buildings/model/itu-r-1238-propagation-loss-model.cc ns-3.19/src/buildings/model/itu-r-1238-propagation-loss-model.cc
--- ns-3.18.1/src/buildings/model/itu-r-1238-propagation-loss-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/model/itu-r-1238-propagation-loss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/buildings/model/mobility-building-info.cc ns-3.19/src/buildings/model/mobility-building-info.cc
--- ns-3.18.1/src/buildings/model/mobility-building-info.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/model/mobility-building-info.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo);
+NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo)
+  ;
 
 TypeId
 MobilityBuildingInfo::GetTypeId (void)
diff -Naur ns-3.18.1/src/buildings/model/oh-buildings-propagation-loss-model.cc ns-3.19/src/buildings/model/oh-buildings-propagation-loss-model.cc
--- ns-3.18.1/src/buildings/model/oh-buildings-propagation-loss-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/model/oh-buildings-propagation-loss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel)
+  ;
 
 
 
diff -Naur ns-3.18.1/src/buildings/test/buildings-shadowing-test.cc ns-3.19/src/buildings/test/buildings-shadowing-test.cc
--- ns-3.18.1/src/buildings/test/buildings-shadowing-test.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/buildings/test/buildings-shadowing-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -81,7 +81,6 @@
     m_lossRef (refValue),
     m_sigmaRef (sigmaRef)
 {
-  NS_UNUSED (m_sigmaRef); // suppress private field unused warning
 }
 
 BuildingsShadowingTestCase::~BuildingsShadowingTestCase ()
@@ -101,28 +100,43 @@
   building1->SetExtWallsType (Building::ConcreteWithWindows);
   building1->SetNFloors (3);
   
-  Ptr<MobilityModel> mma = CreateMobilityModel (m_mobilityModelIndex1);
-  Ptr<MobilityModel> mmb = CreateMobilityModel (m_mobilityModelIndex2);
-
+  Ptr<HybridBuildingsPropagationLossModel> propagationLossModel = CreateObject<HybridBuildingsPropagationLossModel> ();
+  
   std::vector<double> loss;
   double sum = 0.0;
   double sumSquared = 0.0;
-  int samples = 10000;
+  int samples = 1000;
   for (int i = 0; i < samples; i++)
     {
-      Ptr<HybridBuildingsPropagationLossModel> propagationLossModel = CreateObject<HybridBuildingsPropagationLossModel> ();
-      loss.push_back (propagationLossModel->DoCalcRxPower (0.0, mma, mmb) + m_lossRef);
-      sum += loss.at (loss.size () - 1);
-      sumSquared += (loss.at (loss.size () - 1) * loss.at (loss.size () - 1));
+      Ptr<MobilityModel> mma = CreateMobilityModel (m_mobilityModelIndex1);
+      Ptr<MobilityModel> mmb = CreateMobilityModel (m_mobilityModelIndex2);
+      double shadowingLoss = propagationLossModel->DoCalcRxPower (0.0, mma, mmb) + m_lossRef;
+      double shadowingLoss2 = propagationLossModel->DoCalcRxPower (0.0, mma, mmb) + m_lossRef;
+      NS_TEST_ASSERT_MSG_EQ_TOL (shadowingLoss, shadowingLoss2, 0.001, 
+                                 "Shadowing is not constant for the same mobility model pair!");
+      loss.push_back (shadowingLoss);
+      sum += shadowingLoss;
+      sumSquared += (shadowingLoss * shadowingLoss);
     }
-  double mean = sum / samples;
-  double sigma = std::sqrt (sumSquared / samples - (mean * mean));
-  // test whether the distribution falls in the 99% confidence interval, as expected with a nornal distribution
-  double ci = (2.575829303549 * sigma) / std::sqrt (samples);
-
-  NS_LOG_INFO ("Mean from simulation " << mean << ", sigma " << sigma << ", reference value " << m_sigmaRef << ", CI(99%) " << ci);
+  double sampleMean = sum / samples;
+  double sampleVariance = (sumSquared - (sum * sum / samples)) / (samples - 1);
+  double sampleStd = std::sqrt (sampleVariance);
+
+  // test whether the sample mean falls in the 99% confidence interval
+  const double zn995 = 2.575829303549; // 99.5 quantile of the normal distribution
+  double ci = (zn995 * sampleStd) / std::sqrt (samples);
+  NS_LOG_INFO ("SampleMean from simulation " << sampleMean << ", sampleStd " << sampleStd << ", reference value " << m_sigmaRef << ", CI(99%) " << ci);
+  NS_TEST_ASSERT_MSG_EQ_TOL (std::fabs (sampleMean), 0.0, ci, "Wrong shadowing distribution !");
+
+  // test whether the sample variance falls in the 99% confidence interval
+  // since the shadowing is gaussian, its sample variance follows the 
+  // chi2 distribution with samples-1 degrees of freedom
+  double chi2 = (samples - 1) *  sampleVariance / (m_sigmaRef*m_sigmaRef);
+  const double zchi2_005 = 887.621135217515;  //  0.5% quantile of the chi2 distribution 
+  const double zchi2_995 = 1117.89045267865;  // 99.5% quantile of the chi2 distribution
+  NS_TEST_ASSERT_MSG_GT (chi2, zchi2_005, "sample variance lesser than expected");
+  NS_TEST_ASSERT_MSG_LT (chi2, zchi2_995, "sample variance greater than expected");
 
-  NS_TEST_ASSERT_MSG_EQ_TOL (std::fabs (mean), 0.0, ci, "Wrong shadowing distribution !");
   Simulator::Destroy ();
 }
 
diff -Naur ns-3.18.1/src/click/doc/click.rst ns-3.19/src/click/doc/click.rst
--- ns-3.18.1/src/click/doc/click.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/click/doc/click.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,3 +1,5 @@
+.. highlight:: bash
+
 Click Modular Router Integration
 --------------------------------
 
@@ -78,10 +80,10 @@
 
 The first step is to clone Click from the github repository and build it::
 
-  $: git clone https://github.com/kohler/click
-  $: cd click/
-  $: ./configure --disable-linuxmodule --enable-nsclick --enable-wifi
-  $: make
+  $ git clone https://github.com/kohler/click
+  $ cd click/
+  $ ./configure --disable-linuxmodule --enable-nsclick --enable-wifi
+  $ make
 
 The --enable-wifi flag may be skipped if you don't intend on using Click with Wifi.
 * Note: You don't need to do a 'make install'. 
@@ -89,7 +91,7 @@
 Once Click has been built successfully, change into the ns-3 directory and 
 configure ns-3 with Click Integration support::
 
-  $: ./waf configure --enable-examples --enable-tests --with-nsclick=/path/to/click/source
+  $ ./waf configure --enable-examples --enable-tests --with-nsclick=/path/to/click/source
 
 Hint:  If you have click installed one directory above ns-3 (such as in the
 ns-3-allinone directory), and the name of the directory is 'click' (or
@@ -101,7 +103,7 @@
 
 Next, try running one of the examples::
 
-  $: ./waf --run nsclick-simple-lan
+  $ ./waf --run nsclick-simple-lan
 
 You may then view the resulting .pcap traces, which are named nsclick-simple-lan-0-0.pcap and nsclick-simple-lan-0-1.pcap.
 
@@ -120,7 +122,9 @@
 Debugging Packet Flows from Click
 =================================
 
-From any point within a Click graph, you may use the Print (http://read.cs.ucla.edu/click/elements/print) element and its variants for pretty printing of packet contents. Furthermore, you may generate pcap traces of packets flowing through a Click graph by using the ToDump (http://read.cs.ucla.edu/click/elements/todump) element as well. For instance::
+From any point within a Click graph, you may use the Print (http://read.cs.ucla.edu/click/elements/print) element and its variants for pretty printing of packet contents. Furthermore, you may generate pcap traces of packets flowing through a Click graph by using the ToDump (http://read.cs.ucla.edu/click/elements/todump) element as well. For instance:
+
+.. sourcecode:: cpp
 
   myarpquerier
    -> Print(fromarpquery,64)
@@ -133,7 +137,9 @@
 ======
 
 To have a node run Click, the easiest way would be to use the ClickInternetStackHelper
-class in your simulation script. For instance::
+class in your simulation script. For instance:
+
+.. sourcecode:: cpp
 
   ClickInternetStackHelper click;
   click.SetClickFile (myNodeContainer, "nsclick-simple-lan.click");
diff -Naur ns-3.18.1/src/click/model/ipv4-click-routing.cc ns-3.19/src/click/model/ipv4-click-routing.cc
--- ns-3.18.1/src/click/model/ipv4-click-routing.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/click/model/ipv4-click-routing.cc	2013-12-20 09:44:50.000000000 -0800
@@ -45,7 +45,8 @@
 #define INTERFACE_ID_FIRST 1
 #define INTERFACE_ID_FIRST_DROP 33
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4ClickRouting);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4ClickRouting)
+  ;
 
 std::map < simclick_node_t *, Ptr<Ipv4ClickRouting> > Ipv4ClickRouting::m_clickInstanceFromSimNode;
 
diff -Naur ns-3.18.1/src/click/model/ipv4-l3-click-protocol.cc ns-3.19/src/click/model/ipv4-l3-click-protocol.cc
--- ns-3.18.1/src/click/model/ipv4-l3-click-protocol.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/click/model/ipv4-l3-click-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -44,7 +44,8 @@
 const uint16_t Ipv4L3ClickProtocol::PROT_NUMBER = 0x0800;
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4L3ClickProtocol);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4L3ClickProtocol)
+  ;
 
 TypeId
 Ipv4L3ClickProtocol::GetTypeId (void)
diff -Naur ns-3.18.1/src/config-store/examples/config-store-save.cc ns-3.19/src/config-store/examples/config-store-save.cc
--- ns-3.18.1/src/config-store/examples/config-store-save.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/config-store/examples/config-store-save.cc	2013-12-20 09:44:50.000000000 -0800
@@ -6,15 +6,15 @@
 
 using namespace ns3;
 
-class A : public Object
+class ConfigExample : public Object
 {
 public:
   static TypeId GetTypeId (void) {
-    static TypeId tid = TypeId ("ns3::A")
+    static TypeId tid = TypeId ("ns3::ConfigExample")
       .SetParent<Object> ()
       .AddAttribute ("TestInt16", "help text",
                      IntegerValue (-2),
-                     MakeIntegerAccessor (&A::m_int16),
+                     MakeIntegerAccessor (&ConfigExample::m_int16),
                      MakeIntegerChecker<int16_t> ())
       ;
       return tid;
@@ -22,7 +22,8 @@
   int16_t m_int16;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (A);
+NS_OBJECT_ENSURE_REGISTERED (ConfigExample)
+  ;
 
 // Assign a new default value to A::TestInt16 (-5)
 // Configure a TestInt16 value for a special instance of A (to -3)
@@ -30,16 +31,16 @@
 // 
 int main (int argc, char *argv[])
 {
-  Config::SetDefault ("ns3::A::TestInt16", IntegerValue (-5));
+  Config::SetDefault ("ns3::ConfigExample::TestInt16", IntegerValue (-5));
 
-  Ptr<A> a_obj = CreateObject<A> ();
-  NS_ABORT_MSG_UNLESS (a_obj->m_int16 == -5, "Cannot set A's integer attribute via Config::SetDefault");
+  Ptr<ConfigExample> a_obj = CreateObject<ConfigExample> ();
+  NS_ABORT_MSG_UNLESS (a_obj->m_int16 == -5, "Cannot set ConfigExample's integer attribute via Config::SetDefault");
 
-  Ptr<A> a2_obj = CreateObject<A> ();
-  a2_obj->SetAttribute ("TestInt16", IntegerValue (-3));
+  Ptr<ConfigExample> b_obj = CreateObject<ConfigExample> ();
+  b_obj->SetAttribute ("TestInt16", IntegerValue (-3));
   IntegerValue iv;
-  a2_obj->GetAttribute ("TestInt16", iv);
-  NS_ABORT_MSG_UNLESS (iv.Get () == -3, "Cannot set A's integer attribute via SetAttribute");
+  b_obj->GetAttribute ("TestInt16", iv);
+  NS_ABORT_MSG_UNLESS (iv.Get () == -3, "Cannot set ConfigExample's integer attribute via SetAttribute");
 
   // These test objects are not rooted in any ns-3 configuration namespace.
   // This is usually done automatically for ns3 nodes and channels, but
@@ -47,7 +48,7 @@
   // can't use two objects of the same type as roots).  Rooting one of these
   // is necessary for it to show up in the config namespace so that
   // ConfigureAttributes() will work below.
-  Config::RegisterRootNamespaceObject (a2_obj);
+  Config::RegisterRootNamespaceObject (b_obj);
   
 #ifdef HAVE_LIBXML2
   // Output config store to XML format
diff -Naur ns-3.18.1/src/config-store/model/config-store.cc ns-3.19/src/config-store/model/config-store.cc
--- ns-3.18.1/src/config-store/model/config-store.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/config-store/model/config-store.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (ConfigStore);
+NS_OBJECT_ENSURE_REGISTERED (ConfigStore)
+  ;
 
 TypeId 
 ConfigStore::GetTypeId (void)
diff -Naur ns-3.18.1/src/config-store/model/config-store.h ns-3.19/src/config-store/model/config-store.h
--- ns-3.18.1/src/config-store/model/config-store.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/config-store/model/config-store.h	2013-12-20 09:44:50.000000000 -0800
@@ -7,7 +7,7 @@
 namespace ns3 {
 
 /**
- * \defgroup configstore Config-Store
+ * \defgroup configstore Configuration Store/Load
  *
  * \brief Store and load simulation attribute configuration
  *
diff -Naur ns-3.18.1/src/config-store/model/gtk-config-store.cc ns-3.19/src/config-store/model/gtk-config-store.cc
--- ns-3.18.1/src/config-store/model/gtk-config-store.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/config-store/model/gtk-config-store.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("GtkconfigStore");
+NS_LOG_COMPONENT_DEFINE ("GtkconfigStore")
+  ;
 
 
 GtkConfigStore::GtkConfigStore ()
diff -Naur ns-3.18.1/src/core/bindings/modulegen__gcc_ILP32.py ns-3.19/src/core/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/core/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -197,7 +197,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'])
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'])
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -2559,6 +2559,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2569,6 +2574,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2584,6 +2594,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2609,6 +2624,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -4757,6 +4777,14 @@
                         'ns3::Ptr< ns3::PointerValue >', 
                         [], 
                         template_parameters=['ns3::PointerValue'])
+    ## nstime.h (module 'core'): ns3::Time ns3::Days(ns3::int64x64_t days) [free function]
+    module.add_function('Days', 
+                        'ns3::Time', 
+                        [param('ns3::int64x64_t', 'days')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Days(double days) [free function]
+    module.add_function('Days', 
+                        'ns3::Time', 
+                        [param('double', 'days')])
     ## nstime.h (module 'core'): ns3::Time ns3::FemtoSeconds(ns3::int64x64_t fs) [free function]
     module.add_function('FemtoSeconds', 
                         'ns3::Time', 
@@ -4781,6 +4809,14 @@
     module.add_function('Hash64', 
                         'uint64_t', 
                         [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Hours(ns3::int64x64_t hours) [free function]
+    module.add_function('Hours', 
+                        'ns3::Time', 
+                        [param('ns3::int64x64_t', 'hours')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Hours(double hours) [free function]
+    module.add_function('Hours', 
+                        'ns3::Time', 
+                        [param('double', 'hours')])
     ## log.h (module 'core'): extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function]
     module.add_function('LogComponentDisable', 
                         'void', 
@@ -4905,6 +4941,14 @@
     module.add_function('Min', 
                         'ns3::int64x64_t', 
                         [param('ns3::int64x64_t const &', 'a'), param('ns3::int64x64_t const &', 'b')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Minutes(ns3::int64x64_t minutes) [free function]
+    module.add_function('Minutes', 
+                        'ns3::Time', 
+                        [param('ns3::int64x64_t', 'minutes')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Minutes(double minutes) [free function]
+    module.add_function('Minutes', 
+                        'ns3::Time', 
+                        [param('double', 'minutes')])
     ## nstime.h (module 'core'): ns3::Time ns3::NanoSeconds(ns3::int64x64_t ns) [free function]
     module.add_function('NanoSeconds', 
                         'ns3::Time', 
@@ -4991,6 +5035,14 @@
                         'std::string', 
                         [], 
                         template_parameters=['unsigned char'])
+    ## nstime.h (module 'core'): ns3::Time ns3::Years(ns3::int64x64_t years) [free function]
+    module.add_function('Years', 
+                        'ns3::Time', 
+                        [param('ns3::int64x64_t', 'years')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Years(double years) [free function]
+    module.add_function('Years', 
+                        'ns3::Time', 
+                        [param('double', 'years')])
     register_functions_ns3_CommandLineHelper(module.get_submodule('CommandLineHelper'), root_module)
     register_functions_ns3_Config(module.get_submodule('Config'), root_module)
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
diff -Naur ns-3.18.1/src/core/bindings/modulegen__gcc_LP64.py ns-3.19/src/core/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/core/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -197,7 +197,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'])
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'])
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -2559,6 +2559,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2569,6 +2574,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2584,6 +2594,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2609,6 +2624,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -4757,6 +4777,14 @@
                         'ns3::Ptr< ns3::PointerValue >', 
                         [], 
                         template_parameters=['ns3::PointerValue'])
+    ## nstime.h (module 'core'): ns3::Time ns3::Days(ns3::int64x64_t days) [free function]
+    module.add_function('Days', 
+                        'ns3::Time', 
+                        [param('ns3::int64x64_t', 'days')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Days(double days) [free function]
+    module.add_function('Days', 
+                        'ns3::Time', 
+                        [param('double', 'days')])
     ## nstime.h (module 'core'): ns3::Time ns3::FemtoSeconds(ns3::int64x64_t fs) [free function]
     module.add_function('FemtoSeconds', 
                         'ns3::Time', 
@@ -4781,6 +4809,14 @@
     module.add_function('Hash64', 
                         'uint64_t', 
                         [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Hours(ns3::int64x64_t hours) [free function]
+    module.add_function('Hours', 
+                        'ns3::Time', 
+                        [param('ns3::int64x64_t', 'hours')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Hours(double hours) [free function]
+    module.add_function('Hours', 
+                        'ns3::Time', 
+                        [param('double', 'hours')])
     ## log.h (module 'core'): extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function]
     module.add_function('LogComponentDisable', 
                         'void', 
@@ -4905,6 +4941,14 @@
     module.add_function('Min', 
                         'ns3::int64x64_t', 
                         [param('ns3::int64x64_t const &', 'a'), param('ns3::int64x64_t const &', 'b')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Minutes(ns3::int64x64_t minutes) [free function]
+    module.add_function('Minutes', 
+                        'ns3::Time', 
+                        [param('ns3::int64x64_t', 'minutes')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Minutes(double minutes) [free function]
+    module.add_function('Minutes', 
+                        'ns3::Time', 
+                        [param('double', 'minutes')])
     ## nstime.h (module 'core'): ns3::Time ns3::NanoSeconds(ns3::int64x64_t ns) [free function]
     module.add_function('NanoSeconds', 
                         'ns3::Time', 
@@ -4991,6 +5035,14 @@
                         'std::string', 
                         [], 
                         template_parameters=['unsigned char'])
+    ## nstime.h (module 'core'): ns3::Time ns3::Years(ns3::int64x64_t years) [free function]
+    module.add_function('Years', 
+                        'ns3::Time', 
+                        [param('ns3::int64x64_t', 'years')])
+    ## nstime.h (module 'core'): ns3::Time ns3::Years(double years) [free function]
+    module.add_function('Years', 
+                        'ns3::Time', 
+                        [param('double', 'years')])
     register_functions_ns3_CommandLineHelper(module.get_submodule('CommandLineHelper'), root_module)
     register_functions_ns3_Config(module.get_submodule('Config'), root_module)
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
diff -Naur ns-3.18.1/src/core/examples/hash-example.cc ns-3.19/src/core/examples/hash-example.cc
--- ns-3.18.1/src/core/examples/hash-example.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/examples/hash-example.cc	2013-12-20 09:44:50.000000000 -0800
@@ -276,7 +276,7 @@
     //
     // Number of buckets = k = 2^bits
     long double k32 = 0xFFFFFFFF;
-    long double k64 = 0xFFFFFFFFFFFFFFFF;
+    long double k64 = 0xFFFFFFFFFFFFFFFFULL;
 
     long double n = m_nphrases;
     long double Ec32 = n * (n - 1) / ( 2 * k32) * (1 - (n - 2)/(3 * k32));
diff -Naur ns-3.18.1/src/core/examples/main-ptr.cc ns-3.19/src/core/examples/main-ptr.cc
--- ns-3.18.1/src/core/examples/main-ptr.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/examples/main-ptr.cc	2013-12-20 09:44:50.000000000 -0800
@@ -5,41 +5,41 @@
 
 using namespace ns3;
 
-class A : public Object
+class PtrExample : public Object
 {
 public:
-  A ();
-  ~A ();
+  PtrExample ();
+  ~PtrExample ();
   void Method (void);
 };
-A::A ()
+PtrExample::PtrExample ()
 {
-  std::cout << "A constructor" << std::endl;
+  std::cout << "PtrExample constructor" << std::endl;
 }
-A::~A()
+PtrExample::~PtrExample()
 {
-  std::cout << "A destructor" << std::endl;
+  std::cout << "PtrExample destructor" << std::endl;
 }
 void
-A::Method (void)
+PtrExample::Method (void)
 {
-  std::cout << "A method" << std::endl;
+  std::cout << "PtrExample method" << std::endl;
 }
 
-static Ptr<A> g_a = 0;
+static Ptr<PtrExample> g_ptr = 0;
 
-static Ptr<A>
-StoreA (Ptr<A> a)
+static Ptr<PtrExample>
+StorePtr (Ptr<PtrExample> p)
 {
-  Ptr<A> prev = g_a;
-  g_a = a;
+  Ptr<PtrExample> prev = g_ptr;
+  g_ptr = p;
   return prev;
 }
 
 static void
-ClearA (void)
+ClearPtr (void)
 {
-  g_a = 0;
+  g_ptr = 0;
 }
 
 
@@ -47,25 +47,25 @@
 int main (int argc, char *argv[])
 {
   {
-    // Create a new object of type A, store it in global 
-    // variable g_a
-    Ptr<A> a = CreateObject<A> ();
-    a->Method ();
-    Ptr<A> prev = StoreA (a);
+    // Create a new object of type PtrExample, store it in global 
+    // variable g_ptr
+    Ptr<PtrExample> p = CreateObject<PtrExample> ();
+    p->Method ();
+    Ptr<PtrExample> prev = StorePtr (p);
     NS_ASSERT (prev == 0);
   }
 
   {
-    // Create a new object of type A, store it in global 
-    // variable g_a, get a hold on the previous A object.
-    Ptr<A> a = CreateObject<A> ();
-    Ptr<A> prev = StoreA (a);
+    // Create a new object of type PtrExample, store it in global 
+    // variable g_ptr, get a hold on the previous PtrExample object.
+    Ptr<PtrExample> p = CreateObject<PtrExample> ();
+    Ptr<PtrExample> prev = StorePtr (p);
     // call method on object
     prev->Method ();
     // Clear the currently-stored object
-    ClearA ();
+    ClearPtr ();
     // get the raw pointer and release it.
-    A *raw = GetPointer (prev);
+    PtrExample *raw = GetPointer (prev);
     prev = 0;
     raw->Method ();
     raw->Unref ();
diff -Naur ns-3.18.1/src/core/helper/event-garbage-collector.h ns-3.19/src/core/helper/event-garbage-collector.h
--- ns-3.18.1/src/core/helper/event-garbage-collector.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/helper/event-garbage-collector.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,7 @@
 namespace ns3 {
 
 /**
- * \ingroup tools
+ * \ingroup events
  *
  * \brief An object that tracks scheduled events and automatically
  * cancels them when it is destroyed.  It is useful in situations
diff -Naur ns-3.18.1/src/core/model/attribute-construction-list.cc ns-3.19/src/core/model/attribute-construction-list.cc
--- ns-3.18.1/src/core/model/attribute-construction-list.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/attribute-construction-list.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE("AttributeConstructionList");
+NS_LOG_COMPONENT_DEFINE("AttributeConstructionList")
+  ;
 
 AttributeConstructionList::AttributeConstructionList ()
 {
diff -Naur ns-3.18.1/src/core/model/calendar-scheduler.cc ns-3.19/src/core/model/calendar-scheduler.cc
--- ns-3.18.1/src/core/model/calendar-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/calendar-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,9 +28,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("CalendarScheduler");
+NS_LOG_COMPONENT_DEFINE ("CalendarScheduler")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler);
+NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler)
+  ;
 
 TypeId
 CalendarScheduler::GetTypeId (void)
diff -Naur ns-3.18.1/src/core/model/callback.h ns-3.19/src/core/model/callback.h
--- ns-3.18.1/src/core/model/callback.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/callback.h	2013-12-20 09:44:50.000000000 -0800
@@ -67,7 +67,7 @@
 
 /**
  * \ingroup callback
- * \defgroup callbackimpl CallbackImpl
+ * \defgroup callbackimpl Callback Implementation
  * CallbackImpl classes
  */
 /**
@@ -1378,7 +1378,7 @@
 
 /**
  * \ingroup callback
- * \defgroup makenullcallback MakeCallbacks with no arguments
+ * \defgroup makenullcallback MakeCallback with no arguments
  */
 /**
  * \ingroup makenullcallback
diff -Naur ns-3.18.1/src/core/model/default-simulator-impl.cc ns-3.19/src/core/model/default-simulator-impl.cc
--- ns-3.18.1/src/core/model/default-simulator-impl.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/default-simulator-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl);
+NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl)
+  ;
 
 TypeId
 DefaultSimulatorImpl::GetTypeId (void)
diff -Naur ns-3.18.1/src/core/model/double.h ns-3.19/src/core/model/double.h
--- ns-3.18.1/src/core/model/double.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/double.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,7 @@
  * \ingroup attribute 
  *
  * \class ns3::DoubleValue
- * \brief Hold an floating point type
+ * \brief Hold a floating point type
  *
  * \anchor double
  * This class can be used to hold variables of floating point type
diff -Naur ns-3.18.1/src/core/model/global-value.cc ns-3.19/src/core/model/global-value.cc
--- ns-3.18.1/src/core/model/global-value.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/global-value.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("GlobalValue");
+NS_LOG_COMPONENT_DEFINE ("GlobalValue")
+  ;
 
 GlobalValue::GlobalValue (std::string name, std::string help,
                           const AttributeValue &initialValue,
diff -Naur ns-3.18.1/src/core/model/hash.cc ns-3.19/src/core/model/hash.cc
--- ns-3.18.1/src/core/model/hash.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/hash.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Hash");
+NS_LOG_COMPONENT_DEFINE ("Hash")
+  ;
 
 Hasher::Hasher ()
 {
diff -Naur ns-3.18.1/src/core/model/hash-fnv.cc ns-3.19/src/core/model/hash-fnv.cc
--- ns-3.18.1/src/core/model/hash-fnv.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/hash-fnv.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Hash-Fnv");
+NS_LOG_COMPONENT_DEFINE ("Hash-Fnv")
+  ;
 
 namespace Hash {
 
diff -Naur ns-3.18.1/src/core/model/hash-function.cc ns-3.19/src/core/model/hash-function.cc
--- ns-3.18.1/src/core/model/hash-function.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/hash-function.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("HashFunction");
+NS_LOG_COMPONENT_DEFINE ("HashFunction")
+  ;
 
 namespace Hash {
 
diff -Naur ns-3.18.1/src/core/model/hash-murmur3.cc ns-3.19/src/core/model/hash-murmur3.cc
--- ns-3.18.1/src/core/model/hash-murmur3.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/hash-murmur3.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");
+NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3")
+  ;
 
 namespace Hash {
 
diff -Naur ns-3.18.1/src/core/model/heap-scheduler.cc ns-3.19/src/core/model/heap-scheduler.cc
--- ns-3.18.1/src/core/model/heap-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/heap-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (HeapScheduler);
+NS_OBJECT_ENSURE_REGISTERED (HeapScheduler)
+  ;
 
 TypeId
 HeapScheduler::GetTypeId (void)
diff -Naur ns-3.18.1/src/core/model/list-scheduler.cc ns-3.19/src/core/model/list-scheduler.cc
--- ns-3.18.1/src/core/model/list-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/list-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (ListScheduler);
+NS_OBJECT_ENSURE_REGISTERED (ListScheduler)
+  ;
 
 TypeId
 ListScheduler::GetTypeId (void)
diff -Naur ns-3.18.1/src/core/model/log.h ns-3.19/src/core/model/log.h
--- ns-3.18.1/src/core/model/log.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/log.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,6 +28,43 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup debugging
+ * \defgroup logging Logging
+ * \brief Logging functions and macros
+ *
+ * LOG functionality: macros which allow developers to
+ * send information to the std::clog output stream. All logging messages 
+ * are disabled by default. To enable selected logging 
+ * messages, use the ns3::LogComponentEnable
+ * function or use the NS_LOG environment variable 
+ *
+ * Use the environment variable NS_LOG to define a ':'-separated list of
+ * logging components to enable. For example (using bash syntax), 
+ * NS_LOG="OlsrAgent" would enable one component at all log levels. 
+ * NS_LOG="OlsrAgent:Ipv4L3Protocol" would enable two components, 
+ * at all log levels, etc.
+ * NS_LOG="*" will enable all available log components at all levels.
+ *
+ * To control more selectively the log levels for each component, use
+ * this syntax: NS_LOG='Component1=func|warn:Component2=error|debug'
+ * This example would enable the 'func', and 'warn' log
+ * levels for 'Component1' and the 'error' and 'debug' log levels
+ * for 'Component2'.  The wildcard can be used here as well.  For example
+ * NS_LOG='*=level_all|prefix' would enable all log levels and prefix all
+ * prints with the component and function names.
+ *
+ * A note on NS_LOG_FUNCTION() and NS_LOG_FUNCTION_NOARGS():
+ * generally, use of (at least) NS_LOG_FUNCTION(this) is preferred.
+ * Use NS_LOG_FUNCTION_NOARGS() only in static functions.
+ */
+
+
+/**
+ *  \ingroup logging
+ *
+ *  Logging severity classes and levels.
+ */
 enum LogLevel {
   LOG_NONE           = 0x00000000, // no logging
 
@@ -111,46 +148,74 @@
  * \ingroup logging
  * \param name a string
  *
- * Define a Log component with a specific name. This macro
- * should be used at the top of every file in which you want 
+ * Define a Log component with a specific name.
+ *
+ * This macro should be used at the top of every file in which you want 
  * to use the NS_LOG macro. This macro defines a new
  * "log component" which can be later selectively enabled
  * or disabled with the ns3::LogComponentEnable and 
  * ns3::LogComponentDisable functions or with the NS_LOG
  * environment variable.
+ *
+ * To create a log component Foo, at the top of foo.cc:
+ *
+ * \code
+ *   NS_LOG_COMPONENT_DEFINE ("Foo")
+ *     ;
+ * \endcode
+ *
+ * Note the closing ';' is not on the same line;  this prevents 
+ * Doxygen from spuriously warning that the macro invocation is undocumented.
+ 
  */
 #define NS_LOG_COMPONENT_DEFINE(name)                           \
   static ns3::LogComponent g_log = ns3::LogComponent (name)
 
+/**
+ * \ingroup logging
+ * Append the simulation time to a log message.
+ */
 #define NS_LOG_APPEND_TIME_PREFIX                               \
   if (g_log.IsEnabled (ns3::LOG_PREFIX_TIME))                   \
     {                                                           \
       ns3::LogTimePrinter printer = ns3::LogGetTimePrinter ();  \
       if (printer != 0)                                         \
         {                                                       \
-          (*printer)(std::clog);                               \
+          (*printer)(std::clog);                                \
           std::clog << " ";                                     \
         }                                                       \
     }
 
+/**
+ * \ingroup logging
+ * Append the simulation node id to a log message.
+ */
 #define NS_LOG_APPEND_NODE_PREFIX                               \
   if (g_log.IsEnabled (ns3::LOG_PREFIX_NODE))                   \
     {                                                           \
       ns3::LogNodePrinter printer = ns3::LogGetNodePrinter ();  \
       if (printer != 0)                                         \
         {                                                       \
-          (*printer)(std::clog);                               \
+          (*printer)(std::clog);                                \
           std::clog << " ";                                     \
         }                                                       \
     }
 
+/**
+ * \ingroup logging
+ * Append the function name to a log message.
+ */
 #define NS_LOG_APPEND_FUNC_PREFIX                               \
   if (g_log.IsEnabled (ns3::LOG_PREFIX_FUNC))                   \
     {                                                           \
       std::clog << g_log.Name () << ":" <<                      \
-      __FUNCTION__ << "(): ";                                 \
+      __FUNCTION__ << "(): ";                                   \
     }                                                           \
 
+/**
+ * \ingroup logging
+ * Append the log severity level to a log message.
+ */
 #define NS_LOG_APPEND_LEVEL_PREFIX(level)                       \
   if (g_log.IsEnabled (ns3::LOG_PREFIX_LEVEL))                  \
     {                                                           \
@@ -167,37 +232,6 @@
 #ifdef NS3_LOG_ENABLE
 
 
-/**
- * \ingroup debugging
- * \defgroup logging Logging
- * \brief Logging functions and macros
- *
- * LOG functionality: macros which allow developers to
- * send information out on screen. All logging messages 
- * are disabled by default. To enable selected logging 
- * messages, use the ns3::LogComponentEnable
- * function or use the NS_LOG environment variable 
- *
- * Use the environment variable NS_LOG to define a ':'-separated list of
- * logging components to enable. For example (using bash syntax), 
- * NS_LOG="OlsrAgent" would enable one component at all log levels. 
- * NS_LOG="OlsrAgent:Ipv4L3Protocol" would enable two components, 
- * at all log levels, etc.
- * NS_LOG="*" will enable all available log components at all levels.
- *
- * To control more selectively the log levels for each component, use
- * this syntax: NS_LOG='Component1=func|warn:Component2=error|debug'
- * This example would enable the 'func', and 'warn' log
- * levels for 'Component1' and the 'error' and 'debug' log levels
- * for 'Component2'.  The wildcard can be used here as well.  For example
- * NS_LOG='*=level_all|prefix' would enable all log levels and prefix all
- * prints with the component and function names.
- *
- * A note on NS_LOG_FUNCTION() and NS_LOG_FUNCTION_NOARGS():
- * generally, use of (at least) NS_LOG_FUNCTION(this) is preferred.
- * Use NS_LOG_FUNCTION_NOARGS() only in static functions.
- */
-
 
 /**
  * \ingroup logging
@@ -318,7 +352,7 @@
           NS_LOG_APPEND_CONTEXT;                                \
           std::clog << g_log.Name () << ":"                     \
                     << __FUNCTION__ << "(";                     \
-          ns3::ParameterLogger (std::clog) << parameters;      \
+          ns3::ParameterLogger (std::clog) << parameters;       \
           std::clog << ")" << std::endl;                        \
         }                                                       \
     }                                                           \
diff -Naur ns-3.18.1/src/core/model/map-scheduler.cc ns-3.19/src/core/model/map-scheduler.cc
--- ns-3.18.1/src/core/model/map-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/map-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MapScheduler);
+NS_OBJECT_ENSURE_REGISTERED (MapScheduler)
+  ;
 
 TypeId
 MapScheduler::GetTypeId (void)
diff -Naur ns-3.18.1/src/core/model/names.cc ns-3.19/src/core/model/names.cc
--- ns-3.18.1/src/core/model/names.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/names.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Names");
+NS_LOG_COMPONENT_DEFINE ("Names")
+  ;
 
 class NameNode
 {
diff -Naur ns-3.18.1/src/core/model/nstime.h ns-3.19/src/core/model/nstime.h
--- ns-3.18.1/src/core/model/nstime.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/nstime.h	2013-12-20 09:44:50.000000000 -0800
@@ -86,13 +86,17 @@
    */
   enum Unit
   {
-    S  = 0,   //!< second
-    MS = 1,   //!< millisecond
-    US = 2,   //!< microsecond
-    NS = 3,   //!< nanosecond
-    PS = 4,   //!< picosecond
-    FS = 5,   //!< femtosecond
-    LAST = 6
+    Y   = 0,   //!< year, 365 days
+    D   = 1,   //!< day, 24 hours
+    H   = 2,   //!< hour, 60 minutes
+    MIN = 3,   //!< minute, 60 seconds
+    S   = 4,   //!< second
+    MS  = 5,   //!< millisecond
+    US  = 6,   //!< microsecond
+    NS  = 7,   //!< nanosecond
+    PS  = 8,   //!< picosecond
+    FS  = 9,   //!< femtosecond
+    LAST = 10
   };
 
   inline Time &operator = (const Time &o)
@@ -182,6 +186,10 @@
    * - `ns` (nanoseconds)
    * - `ps` (picoseconds)
    * - `fs` (femtoseconds)
+   * - `min`  (minutes)
+   * - `h`  (hours)
+   * - `d`  (days)
+   * - `y`  (years)
    *
    * There can be no white space between the numerical portion
    * and the units.  Any otherwise malformed string causes a fatal error to
@@ -308,6 +316,40 @@
   {
     return ToInteger (Time::FS);
   }
+
+  /**
+   * \returns an approximation in minutes of the time stored in this
+   *          instance.
+   */
+  inline double GetMinutes (void) const
+  {
+    return ToDouble (Time::MIN);
+  }
+  /**
+   * \returns an approximation in hours of the time stored in this
+   *          instance.
+   */
+  inline double GetHours (void) const
+  {
+    return ToDouble (Time::H);
+  }
+  /**
+   * \returns an approximation in days of the time stored in this
+   *          instance.
+   */
+  inline double GetDays (void) const
+  {
+    return ToDouble (Time::D);
+  }
+  /**
+   * \returns an approximation in years of the time stored in this
+   *          instance.
+   */
+  inline double GetYears (void) const
+  {
+    return ToDouble (Time::Y);
+  }
+
   /**
    * \returns the raw time value, in the current units
    */
@@ -762,7 +804,66 @@
 {
   return Time::FromInteger (fs, Time::FS);
 }
-
+/**
+ * \brief create ns3::Time instances in units of minutes (equal to 60 seconds).
+ *
+ * For example:
+ * \code
+ * Time t = Minutes (2.0);
+ * Simulator::Schedule (Minutes (5.0), ...);
+ * \endcode
+ * \param minutes mintues value
+ * \relates ns3::Time
+ */
+inline Time Minutes (double minutes)
+{
+  return Time::FromDouble (minutes, Time::MIN);
+}
+/**
+ * \brief create ns3::Time instances in units of hours (equal to 60 minutes).
+ *
+ * For example:
+ * \code
+ * Time t = Hours (2.0);
+ * Simulator::Schedule (Hours (5.0), ...);
+ * \endcode
+ * \param hours hours value
+ * \relates ns3::Time
+ */
+inline Time Hours (double hours)
+{
+  return Time::FromDouble (hours, Time::H);
+}
+/**
+ * \brief create ns3::Time instances in units of days (equal to 24 hours).
+ *
+ * For example:
+ * \code
+ * Time t = Days (2.0);
+ * Simulator::Schedule (Days (5.0), ...);
+ * \endcode
+ * \param days days value
+ * \relates ns3::Time
+ */
+inline Time Days (double days)
+{
+  return Time::FromDouble (days, Time::D);
+}
+/**
+ * \brief create ns3::Time instances in units of years (equal to 365 days).
+ *
+ * For example:
+ * \code
+ * Time t = Years (2.0);
+ * Simulator::Schedule (Years (5.0), ...);
+ * \endcode
+ * \param years years value
+ * \relates ns3::Time
+ */
+inline Time Years (double years)
+{
+  return Time::FromDouble (years, Time::Y);
+}
 
 /**
  * \see Seconds(double)
@@ -812,6 +913,38 @@
 {
   return Time::From (fs, Time::FS);
 }
+/**
+ * \see Minutes(uint64_t)
+ * \relates ns3::Time
+ */
+inline Time Minutes (int64x64_t minutes)
+{
+  return Time::From (minutes, Time::MIN);
+}
+/**
+ * \see Minutes(uint64_t)
+ * \relates ns3::Time
+ */
+inline Time Hours (int64x64_t hours)
+{
+  return Time::From (hours, Time::H);
+}
+/**
+ * \see Minutes(uint64_t)
+ * \relates ns3::Time
+ */
+inline Time Days (int64x64_t days)
+{
+  return Time::From (days, Time::D);
+}
+/**
+ * \see Minutes(uint64_t)
+ * \relates ns3::Time
+ */
+inline Time Years (int64x64_t years)
+{
+  return Time::From (years, Time::Y);
+}
 
 // internal function not publicly documented
 inline Time TimeStep (uint64_t ts)
diff -Naur ns-3.18.1/src/core/model/object-base.cc ns-3.19/src/core/model/object-base.cc
--- ns-3.18.1/src/core/model/object-base.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/object-base.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ObjectBase);
+NS_OBJECT_ENSURE_REGISTERED (ObjectBase)
+  ;
 
 static TypeId
 GetObjectIid (void)
diff -Naur ns-3.18.1/src/core/model/object-base.h ns-3.19/src/core/model/object-base.h
--- ns-3.18.1/src/core/model/object-base.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/object-base.h	2013-12-20 09:44:50.000000000 -0800
@@ -26,8 +26,23 @@
 #include <list>
 
 /**
+ * \brief Register the class in the ns-3 factory.
+ *
  * This macro should be invoked once for every class which
  * defines a new GetTypeId method.
+ *
+ * Given a class Foo, the .cc implementation should begin
+ *
+ * \code
+ *   NS_OBJECT_ENSURE_REGISTERED (Foo)
+ *     ;
+ * \endcode
+ *
+ * If the class is in a namespace, then the macro call should also be
+ * in the namespace.
+ *
+ * Note the closing ';' is not on the same line;  this prevents 
+ * Doxygen from spuriously warning that the macro invocation is undocumented.
  */
 #define NS_OBJECT_ENSURE_REGISTERED(type)       \
   static struct X ## type ## RegistrationClass      \
diff -Naur ns-3.18.1/src/core/model/object.cc ns-3.19/src/core/model/object.cc
--- ns-3.18.1/src/core/model/object.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/object.cc	2013-12-20 09:44:50.000000000 -0800
@@ -41,7 +41,8 @@
  *         The Object implementation
  *********************************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (Object);
+NS_OBJECT_ENSURE_REGISTERED (Object)
+  ;
 
 Object::AggregateIterator::AggregateIterator ()
   : m_object (0),
diff -Naur ns-3.18.1/src/core/model/object-factory.cc ns-3.19/src/core/model/object-factory.cc
--- ns-3.18.1/src/core/model/object-factory.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/object-factory.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE("ObjectFactory");
+NS_LOG_COMPONENT_DEFINE("ObjectFactory")
+  ;
 
 ObjectFactory::ObjectFactory ()
 {
diff -Naur ns-3.18.1/src/core/model/object.h ns-3.19/src/core/model/object.h
--- ns-3.18.1/src/core/model/object.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/object.h	2013-12-20 09:44:50.000000000 -0800
@@ -64,7 +64,8 @@
 {
 public:
   /**
-   * Get the type ID.
+   * \brief Register this type.
+   * \return The object TypeId.
    */
   static TypeId GetTypeId (void);
 
diff -Naur ns-3.18.1/src/core/model/random-variable.cc ns-3.19/src/core/model/random-variable.cc
--- ns-3.18.1/src/core/model/random-variable.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/random-variable.cc	2013-12-20 09:44:50.000000000 -0800
@@ -44,7 +44,8 @@
 // -----------------------------------------------------------------------------
 // RandomVariableBase methods
 
-NS_LOG_COMPONENT_DEFINE ("RandomVariable");
+NS_LOG_COMPONENT_DEFINE ("RandomVariable")
+  ;
 
 /** \ingroup legacyrandom */
 class RandomVariableBase
diff -Naur ns-3.18.1/src/core/model/random-variable-stream.cc ns-3.19/src/core/model/random-variable-stream.cc
--- ns-3.18.1/src/core/model/random-variable-stream.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/random-variable-stream.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RandomVariableStream);
+NS_OBJECT_ENSURE_REGISTERED (RandomVariableStream)
+  ;
 
 TypeId 
 RandomVariableStream::GetTypeId (void)
@@ -130,7 +131,8 @@
   return m_rng;
 }
 
-NS_OBJECT_ENSURE_REGISTERED(UniformRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(UniformRandomVariable)
+  ;
 
 TypeId 
 UniformRandomVariable::GetTypeId (void)
@@ -200,7 +202,8 @@
   return (uint32_t)GetValue (m_min, m_max + 1);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(ConstantRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(ConstantRandomVariable)
+  ;
 
 TypeId 
 ConstantRandomVariable::GetTypeId (void)
@@ -254,7 +257,8 @@
   return (uint32_t)GetValue (m_constant);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(SequentialRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(SequentialRandomVariable)
+  ;
 
 TypeId 
 SequentialRandomVariable::GetTypeId (void)
@@ -353,7 +357,8 @@
   return (uint32_t)GetValue ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED(ExponentialRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(ExponentialRandomVariable)
+  ;
 
 TypeId 
 ExponentialRandomVariable::GetTypeId (void)
@@ -434,7 +439,8 @@
   return (uint32_t)GetValue (m_mean, m_bound);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(ParetoRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(ParetoRandomVariable)
+  ;
 
 TypeId 
 ParetoRandomVariable::GetTypeId (void)
@@ -529,7 +535,8 @@
   return (uint32_t)GetValue (m_mean, m_shape, m_bound);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(WeibullRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(WeibullRandomVariable)
+  ;
 
 TypeId 
 WeibullRandomVariable::GetTypeId (void)
@@ -622,7 +629,8 @@
   return (uint32_t)GetValue (m_scale, m_shape, m_bound);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(NormalRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(NormalRandomVariable)
+  ;
 
 const double NormalRandomVariable::INFINITE_VALUE = 1e307;
 
@@ -741,7 +749,8 @@
   return (uint32_t)GetValue (m_mean, m_variance, m_bound);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(LogNormalRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(LogNormalRandomVariable)
+  ;
 
 TypeId 
 LogNormalRandomVariable::GetTypeId (void)
@@ -860,7 +869,8 @@
   return (uint32_t)GetValue (m_mu, m_sigma);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(GammaRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(GammaRandomVariable)
+  ;
 
 TypeId 
 GammaRandomVariable::GetTypeId (void)
@@ -1035,7 +1045,8 @@
     }
 }
 
-NS_OBJECT_ENSURE_REGISTERED(ErlangRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(ErlangRandomVariable)
+  ;
 
 TypeId 
 ErlangRandomVariable::GetTypeId (void)
@@ -1146,7 +1157,8 @@
     }
 }
 
-NS_OBJECT_ENSURE_REGISTERED(TriangularRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(TriangularRandomVariable)
+  ;
 
 TypeId 
 TriangularRandomVariable::GetTypeId (void)
@@ -1240,7 +1252,8 @@
   return (uint32_t)GetValue (m_mean, m_min, m_max);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(ZipfRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(ZipfRandomVariable)
+  ;
 
 TypeId 
 ZipfRandomVariable::GetTypeId (void)
@@ -1330,7 +1343,8 @@
   return (uint32_t)GetValue (m_n, m_alpha);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(ZetaRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(ZetaRandomVariable)
+  ;
 
 TypeId 
 ZetaRandomVariable::GetTypeId (void)
@@ -1413,7 +1427,8 @@
   return (uint32_t)GetValue (m_alpha);
 }
 
-NS_OBJECT_ENSURE_REGISTERED(DeterministicRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(DeterministicRandomVariable)
+  ;
 
 TypeId 
 DeterministicRandomVariable::GetTypeId (void)
@@ -1485,7 +1500,8 @@
   return (uint32_t)GetValue ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED(EmpiricalRandomVariable);
+NS_OBJECT_ENSURE_REGISTERED(EmpiricalRandomVariable)
+  ;
 
 // ValueCDF methods
 EmpiricalRandomVariable::ValueCDF::ValueCDF ()
diff -Naur ns-3.18.1/src/core/model/realtime-simulator-impl.cc ns-3.19/src/core/model/realtime-simulator-impl.cc
--- ns-3.18.1/src/core/model/realtime-simulator-impl.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/realtime-simulator-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,7 +43,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RealtimeSimulatorImpl);
+NS_OBJECT_ENSURE_REGISTERED (RealtimeSimulatorImpl)
+  ;
 
 TypeId
 RealtimeSimulatorImpl::GetTypeId (void)
diff -Naur ns-3.18.1/src/core/model/rng-stream.cc ns-3.19/src/core/model/rng-stream.cc
--- ns-3.18.1/src/core/model/rng-stream.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/rng-stream.cc	2013-12-20 09:44:50.000000000 -0800
@@ -45,19 +45,6 @@
 const double a23n =       1370589.0;
 const double two17 =      131072.0;
 const double two53 =      9007199254740992.0;
-const double fact =       5.9604644775390625e-8;     /* 1 / 2^24  */
-
-const Matrix InvA1 = {          // Inverse of A1p0
-  { 184888585.0,   0.0,  1945170933.0 },
-  {         1.0,   0.0,           0.0 },
-  {         0.0,   1.0,           0.0 }
-};
-
-const Matrix InvA2 = {          // Inverse of A2p0
-  {      0.0,  360363334.0,  4225571728.0 },
-  {      1.0,          0.0,           0.0 },
-  {      0.0,          1.0,           0.0 }
-};
 
 const Matrix A1p0 = {
   {       0.0,        1.0,       0.0 },
diff -Naur ns-3.18.1/src/core/model/scheduler.cc ns-3.19/src/core/model/scheduler.cc
--- ns-3.18.1/src/core/model/scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Scheduler);
+NS_OBJECT_ENSURE_REGISTERED (Scheduler)
+  ;
 
 Scheduler::~Scheduler ()
 {
diff -Naur ns-3.18.1/src/core/model/simulator.h ns-3.19/src/core/model/simulator.h
--- ns-3.18.1/src/core/model/simulator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/simulator.h	2013-12-20 09:44:50.000000000 -0800
@@ -109,8 +109,8 @@
   /**
    * Run the simulation until one of:
    *   - no events are present anymore
-   *   - the user called Simulator::stop
-   *   - the user called Simulator::stopAtUs and the
+   *   - the user called Simulator::Stop()
+   *   - the user called Simulator::Stop(Time const &time) and the
    *     expiration time of the next event to be processed
    *     is greater than or equal to the stop time.
    */
diff -Naur ns-3.18.1/src/core/model/synchronizer.cc ns-3.19/src/core/model/synchronizer.cc
--- ns-3.18.1/src/core/model/synchronizer.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/synchronizer.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Synchronizer);
+NS_OBJECT_ENSURE_REGISTERED (Synchronizer)
+  ;
 
 TypeId 
 Synchronizer::GetTypeId (void)
diff -Naur ns-3.18.1/src/core/model/test.cc ns-3.19/src/core/model/test.cc
--- ns-3.18.1/src/core/model/test.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Test");
+NS_LOG_COMPONENT_DEFINE ("Test")
+  ;
 
 bool
 TestDoubleIsEqual (const double x1, const double x2, const double epsilon)
diff -Naur ns-3.18.1/src/core/model/time.cc ns-3.19/src/core/model/time.cc
--- ns-3.18.1/src/core/model/time.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/time.cc	2013-12-20 09:44:50.000000000 -0800
@@ -123,6 +123,22 @@
         {
           *this = Time::FromDouble (r, Time::FS);
         }
+      else if (trailer == std::string ("min"))
+        {
+          *this = Time::FromDouble (r, Time::MIN);
+        }
+      else if (trailer == std::string ("h"))
+        {
+          *this = Time::FromDouble (r, Time::H);
+        }
+      else if (trailer == std::string ("d"))
+        {
+          *this = Time::FromDouble (r, Time::D);
+        }
+      else if (trailer == std::string ("y"))
+        {
+          *this = Time::FromDouble (r, Time::Y);
+        }
       else
         {
           NS_ABORT_MSG ("Can't Parse Time " << s);
@@ -176,21 +192,41 @@
       ConvertTimes (unit);
     }
 
-  int8_t power [LAST] = { 15, 12, 9, 6, 3, 0};
+  // Y, D, H, MIN, S, MS, US, NS, PS, FS
+  const int8_t power [LAST] = { 17, 17, 17, 16, 15, 12, 9, 6, 3, 0 };
+  const int32_t coefficient [LAST] = { 315360, 864, 36, 6, 1, 1, 1, 1, 1, 1 };
   for (int i = 0; i < Time::LAST; i++)
     {
       int shift = power[i] - power[(int)unit];
-      int64_t factor = (int64_t) std::pow (10, std::fabs (shift));
+      int quotient = 1;
+      if (coefficient[i] > coefficient[(int) unit])
+        {
+          quotient = coefficient[i] / coefficient[(int) unit];
+          NS_ASSERT (quotient * coefficient[(int) unit] == coefficient[i]);
+        }
+      else if (coefficient[i] < coefficient[(int) unit])
+        {
+          quotient = coefficient[(int) unit] / coefficient[i];
+          NS_ASSERT (quotient * coefficient[i] == coefficient[(int) unit]);
+        }
+      NS_LOG_DEBUG ("SetResolution for unit " << (int) unit << " loop iteration " << i
+    		    << " has shift " << shift << " has quotient " << quotient);
+      int64_t factor = static_cast<int64_t> (std::pow (10, std::fabs (shift)) * quotient);
+      double realFactor = std::pow (10, (double) shift)
+                        * static_cast<double> (coefficient[i]) / coefficient[(int) unit];
+      NS_LOG_DEBUG ("SetResolution factor " << factor << " real factor " << realFactor);
       struct Information *info = &resolution->info[i];
       info->factor = factor;
-      if (shift == 0)
+      // here we could equivalently check for realFactor == 1.0 but it's better
+      // to avoid checking equality of doubles
+      if (shift == 0 && quotient == 1)
         {
           info->timeFrom = int64x64_t (1);
           info->timeTo = int64x64_t (1);
           info->toMul = true;
           info->fromMul = true;
         }
-      else if (shift > 0)
+      else if (realFactor > 1)
         {
           info->timeFrom = int64x64_t (factor);
           info->timeTo = int64x64_t::Invert (factor);
@@ -199,7 +235,7 @@
         }
       else
         {
-          NS_ASSERT (shift < 0);
+          NS_ASSERT (realFactor < 1);
           info->timeFrom = int64x64_t::Invert (factor);
           info->timeTo = int64x64_t (factor);
           info->toMul = true;
@@ -368,6 +404,18 @@
     case Time::FS:
       unit = "fs";
       break;
+    case Time::MIN:
+      unit = "min";
+      break;
+    case Time::H:
+      unit = "h";
+      break;
+    case Time::D:
+      unit = "d";
+      break;
+    case Time::Y:
+      unit = "y";
+      break;
     case Time::LAST:
       NS_ABORT_MSG ("can't be reached");
       unit = "unreachable";
diff -Naur ns-3.18.1/src/core/model/type-id.cc ns-3.19/src/core/model/type-id.cc
--- ns-3.18.1/src/core/model/type-id.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/core/model/type-id.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("TypeId");
+NS_LOG_COMPONENT_DEFINE ("TypeId")
+  ;
 
 // IidManager needs to be in ns3 namespace for NS_ASSERT and NS_LOG
 // to find g_log
diff -Naur ns-3.18.1/src/core/test/attribute-test-suite.cc ns-3.19/src/core/test/attribute-test-suite.cc
--- ns-3.18.1/src/core/test/attribute-test-suite.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/core/test/attribute-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -72,7 +72,8 @@
   Derived () {}
 };
 
-NS_OBJECT_ENSURE_REGISTERED (Derived);
+NS_OBJECT_ENSURE_REGISTERED (Derived)
+  ;
 
 class AttributeObjectTest : public Object
 {
@@ -263,7 +264,8 @@
   Time m_timeWithBounds;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (AttributeObjectTest);
+NS_OBJECT_ENSURE_REGISTERED (AttributeObjectTest)
+  ;
 
 // ===========================================================================
 // Test case template used for generic Attribute Value types -- used to make 
diff -Naur ns-3.18.1/src/core/test/hash-test-suite.cc ns-3.19/src/core/test/hash-test-suite.cc
--- ns-3.18.1/src/core/test/hash-test-suite.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/core/test/hash-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -137,7 +137,7 @@
   hash32Reference = 0x463d70e2;  // murmur3(key)
   Check ( "default", Hash32 (key));
 
-  hash64Reference = 0xa750412079d53e04;
+  hash64Reference = 0xa750412079d53e04ULL;
   Check ( "default", Hash64 (key));
 }
 
@@ -170,7 +170,7 @@
   hash32Reference = 0xa3fc0d6d;  // Fnv1a(key)
   Check ("FNV1a", hasher.clear ().GetHash32 (key));
 
-  hash64Reference = 0x88f6cdbe0a31098d;
+  hash64Reference = 0x88f6cdbe0a31098dULL;
   Check ( "FNV1a", hasher.clear ().GetHash64 (key));
 }
 
@@ -204,7 +204,7 @@
   hash32Reference = 0x463d70e2;  // Murmur3(key)
   Check ( "murmur3", hasher.clear ().GetHash32 (key));
 
-  hash64Reference = 0xa750412079d53e04;
+  hash64Reference = 0xa750412079d53e04ULL;
   Check ( "murmur3", hasher.clear ().GetHash64 (key));
 }
 
@@ -303,7 +303,7 @@
 Hash64FunctionPtrTestCase::DoRun (void)
 {
   Hasher hasher = Hasher ( Create<Hash::Function::Hash64> (&gnu_sum64) );
-  hash64Reference = 0x4126412641264126;  // Hash64FunctionPtr(key)
+  hash64Reference = 0x4126412641264126ULL;  // Hash64FunctionPtr(key)
   Check ( "gnu_sum64", hasher.clear ().GetHash64 (key));
 }
 
diff -Naur ns-3.18.1/src/core/test/object-test-suite.cc ns-3.19/src/core/test/object-test-suite.cc
--- ns-3.18.1/src/core/test/object-test-suite.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/core/test/object-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -89,10 +89,14 @@
   }
 };
 
-NS_OBJECT_ENSURE_REGISTERED (BaseA);
-NS_OBJECT_ENSURE_REGISTERED (DerivedA);
-NS_OBJECT_ENSURE_REGISTERED (BaseB);
-NS_OBJECT_ENSURE_REGISTERED (DerivedB);
+NS_OBJECT_ENSURE_REGISTERED (BaseA)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (DerivedA)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (BaseB)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (DerivedB)
+  ;
 
 } // namespace anonymous
 
diff -Naur ns-3.18.1/src/core/test/time-test-suite.cc ns-3.19/src/core/test/time-test-suite.cc
--- ns-3.18.1/src/core/test/time-test-suite.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/core/test/time-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -47,6 +47,22 @@
 void
 TimeSimpleTestCase::DoRun (void)
 {
+  NS_TEST_ASSERT_MSG_EQ_TOL (Years (1.0).GetYears (), 1.0, Years (1).GetYears (),
+                             "is 1 really 1 ?");
+  NS_TEST_ASSERT_MSG_EQ_TOL (Years (10.0).GetYears (), 10.0, Years (1).GetYears (),
+                             "is 10 really 10 ?");
+  NS_TEST_ASSERT_MSG_EQ_TOL (Days (1.0).GetDays (), 1.0, Days (1).GetDays (),
+                             "is 1 really 1 ?");
+  NS_TEST_ASSERT_MSG_EQ_TOL (Days (10.0).GetDays (), 10.0, Days (1).GetDays (),
+                             "is 10 really 10 ?");
+  NS_TEST_ASSERT_MSG_EQ_TOL (Hours (1.0).GetHours (), 1.0, Hours (1).GetHours (),
+                             "is 1 really 1 ?");
+  NS_TEST_ASSERT_MSG_EQ_TOL (Hours (10.0).GetHours (), 10.0, Hours (1).GetHours (),
+                             "is 10 really 10 ?");
+  NS_TEST_ASSERT_MSG_EQ_TOL (Minutes (1.0).GetMinutes (), 1.0, Minutes (1).GetMinutes (),
+                             "is 1 really 1 ?");
+  NS_TEST_ASSERT_MSG_EQ_TOL (Minutes (10.0).GetMinutes (), 10.0, Minutes (1).GetMinutes (),
+                             "is 10 really 10 ?");
   NS_TEST_ASSERT_MSG_EQ_TOL (Seconds (1.0).GetSeconds (), 1.0, TimeStep (1).GetSeconds (), 
                              "is 1 really 1 ?");
   NS_TEST_ASSERT_MSG_EQ_TOL (Seconds (10.0).GetSeconds (), 10.0, TimeStep (1).GetSeconds (), 
diff -Naur ns-3.18.1/src/create-module.py ns-3.19/src/create-module.py
--- ns-3.18.1/src/create-module.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/create-module.py	2013-12-20 09:44:50.000000000 -0800
@@ -215,6 +215,7 @@
 ----------------------------
 
 .. include:: replace.txt
+.. highlight:: cpp
 
 .. heading hierarchy:
    ------------- Chapter
diff -Naur ns-3.18.1/src/csma/bindings/modulegen__gcc_ILP32.py ns-3.19/src/csma/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/csma/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/csma/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -175,7 +175,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1505,10 +1505,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3396,6 +3397,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3406,6 +3412,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3421,6 +3432,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3446,6 +3462,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5431,14 +5452,14 @@
     cls.add_method('SetBurstRate', 
                    'void', 
                    [param('double', 'rate')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> burstSz) [member function]
     cls.add_method('SetRandomBurstSize', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'burstSz')])
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> ranVar) [member function]
     cls.add_method('SetRandomVariable', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'ranVar')])
     ## error-model.h (module 'network'): bool ns3::BurstErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('DoCorrupt', 
                    'bool', 
diff -Naur ns-3.18.1/src/csma/bindings/modulegen__gcc_LP64.py ns-3.19/src/csma/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/csma/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/csma/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -175,7 +175,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1505,10 +1505,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3396,6 +3397,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3406,6 +3412,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3421,6 +3432,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3446,6 +3462,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5431,14 +5452,14 @@
     cls.add_method('SetBurstRate', 
                    'void', 
                    [param('double', 'rate')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> burstSz) [member function]
     cls.add_method('SetRandomBurstSize', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'burstSz')])
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> ranVar) [member function]
     cls.add_method('SetRandomVariable', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'ranVar')])
     ## error-model.h (module 'network'): bool ns3::BurstErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('DoCorrupt', 
                    'bool', 
diff -Naur ns-3.18.1/src/csma/doc/csma.rst ns-3.19/src/csma/doc/csma.rst
--- ns-3.18.1/src/csma/doc/csma.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/csma/doc/csma.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 CSMA NetDevice
 --------------
@@ -108,7 +109,7 @@
 serialized by the simulator. This provides a deterministic mechanism for
 contending for the channel. The channel is allocated (transitioned from state
 ``IDLE`` to state ``TRANSMITTING``) on a first-come first-served basis.
-The channel always goes through a three state process:::
+The channel always goes through a three state process::
 
   IDLE -> TRANSMITTING -> PROPAGATING -> IDLE
 
@@ -206,7 +207,7 @@
 The conceptual model of interest is that of a bare computer "husk" into which
 you plug net devices. The bare computers are created using a ``NodeContainer``
 helper. You just ask this helper to create as many computers (we call them
-``Nodes``) as you need on your network:::
+``Nodes``) as you need on your network::
 
   NodeContainer csmaNodes;
   csmaNodes.Create (nCsmaNodes);
diff -Naur ns-3.18.1/src/csma/model/csma-channel.cc ns-3.19/src/csma/model/csma-channel.cc
--- ns-3.18.1/src/csma/model/csma-channel.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/csma/model/csma-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (CsmaChannel);
+NS_OBJECT_ENSURE_REGISTERED (CsmaChannel)
+  ;
 
 TypeId
 CsmaChannel::GetTypeId (void)
diff -Naur ns-3.18.1/src/csma/model/csma-net-device.cc ns-3.19/src/csma/model/csma-net-device.cc
--- ns-3.18.1/src/csma/model/csma-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/csma/model/csma-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -37,7 +37,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice)
+  ;
 
 TypeId
 CsmaNetDevice::GetTypeId (void)
@@ -699,7 +700,6 @@
       trailer.EnableFcs (true);
     }
 
-  trailer.CheckFcs (packet);
   bool crcGood = trailer.CheckFcs (packet);
   if (!crcGood)
     {
diff -Naur ns-3.18.1/src/csma/model/csma-net-device.h ns-3.19/src/csma/model/csma-net-device.h
--- ns-3.18.1/src/csma/model/csma-net-device.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/csma/model/csma-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -41,7 +41,7 @@
 class ErrorModel;
 
 /** 
- * \defgroup csma CsmaNetDevice
+ * \defgroup csma CSMA Network Device
  *
  * This section documents the API of the ns-3 csma module. For a generic functional description, please refer to the ns-3 manual.
  */
diff -Naur ns-3.18.1/src/csma-layout/bindings/modulegen__gcc_ILP32.py ns-3.19/src/csma-layout/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/csma-layout/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/csma-layout/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -269,7 +269,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -2014,10 +2014,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -5038,6 +5039,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5048,6 +5054,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5063,6 +5074,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5088,6 +5104,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -6668,10 +6689,10 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
-    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interfaceIndex, ns3::Ipv6Address address) [member function]
     cls.add_method('RemoveAddress', 
                    'bool', 
-                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   [param('uint32_t', 'interfaceIndex'), param('ns3::Ipv6Address', 'address')], 
                    is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
diff -Naur ns-3.18.1/src/csma-layout/bindings/modulegen__gcc_LP64.py ns-3.19/src/csma-layout/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/csma-layout/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/csma-layout/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -269,7 +269,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -2014,10 +2014,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -5038,6 +5039,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5048,6 +5054,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5063,6 +5074,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5088,6 +5104,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -6668,10 +6689,10 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
-    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interfaceIndex, ns3::Ipv6Address address) [member function]
     cls.add_method('RemoveAddress', 
                    'bool', 
-                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   [param('uint32_t', 'interfaceIndex'), param('ns3::Ipv6Address', 'address')], 
                    is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
diff -Naur ns-3.18.1/src/dsdv/bindings/modulegen__gcc_ILP32.py ns-3.19/src/dsdv/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/dsdv/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsdv/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -231,7 +231,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1626,10 +1626,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4082,6 +4083,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4092,6 +4098,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4107,6 +4118,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4132,6 +4148,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5180,10 +5201,10 @@
     cls.add_method('Send', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
-    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arg0) [member function]
+    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arpCache) [member function]
     cls.add_method('SetArpCache', 
                    'void', 
-                   [param('ns3::Ptr< ns3::ArpCache >', 'arg0')])
+                   [param('ns3::Ptr< ns3::ArpCache >', 'arpCache')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
     cls.add_method('SetDevice', 
                    'void', 
diff -Naur ns-3.18.1/src/dsdv/bindings/modulegen__gcc_LP64.py ns-3.19/src/dsdv/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/dsdv/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsdv/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -231,7 +231,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1626,10 +1626,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4082,6 +4083,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4092,6 +4098,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4107,6 +4118,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4132,6 +4148,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5180,10 +5201,10 @@
     cls.add_method('Send', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
-    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arg0) [member function]
+    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arpCache) [member function]
     cls.add_method('SetArpCache', 
                    'void', 
-                   [param('ns3::Ptr< ns3::ArpCache >', 'arg0')])
+                   [param('ns3::Ptr< ns3::ArpCache >', 'arpCache')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
     cls.add_method('SetDevice', 
                    'void', 
diff -Naur ns-3.18.1/src/dsdv/model/dsdv-packet.cc ns-3.19/src/dsdv/model/dsdv-packet.cc
--- ns-3.18.1/src/dsdv/model/dsdv-packet.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsdv/model/dsdv-packet.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 namespace dsdv {
-NS_OBJECT_ENSURE_REGISTERED (DsdvHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsdvHeader)
+  ;
 DsdvHeader::DsdvHeader (Ipv4Address dst, uint32_t hopCount, uint32_t dstSeqNo)
   : m_dst (dst),
     m_hopCount (hopCount),
diff -Naur ns-3.18.1/src/dsdv/model/dsdv-routing-protocol.cc ns-3.19/src/dsdv/model/dsdv-routing-protocol.cc
--- ns-3.18.1/src/dsdv/model/dsdv-routing-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsdv/model/dsdv-routing-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -44,7 +44,8 @@
 
 namespace ns3 {
 namespace dsdv {
-NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol);
+NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol)
+  ;
 
 /// UDP Port for DSDV control traffic
 const uint32_t RoutingProtocol::DSDV_PORT = 269;
diff -Naur ns-3.18.1/src/dsr/bindings/modulegen__gcc_ILP32.py ns-3.19/src/dsr/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/dsr/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -283,7 +283,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1948,10 +1948,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3250,8 +3251,8 @@
     cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
     cls.add_constructor([])
-    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
-    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
@@ -3307,10 +3308,10 @@
     cls.add_method('SetShortGuardInterval', 
                    'void', 
                    [param('bool', 'guardinterval')])
-    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
-                   [param('bool', 'stbcsatuts')])
+                   [param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
     cls.add_method('SetTxPowerLevel', 
                    'void', 
@@ -4980,6 +4981,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4990,6 +4996,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5005,6 +5016,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5030,6 +5046,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5913,10 +5934,10 @@
     cls.add_method('SetProbeResp', 
                    'void', 
                    [])
-    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function]
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
     cls.add_method('SetQosAckPolicy', 
                    'void', 
-                   [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')])
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
     cls.add_method('SetQosAmsdu', 
                    'void', 
@@ -6592,15 +6613,15 @@
                    'void', 
                    [param('bool', 'greenfield')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
     cls.add_method('SetGuardInterval', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('bool', 'guardInterval')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
     cls.add_method('SetLdpc', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [param('bool', 'ldpc')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
@@ -8303,10 +8324,10 @@
     cls.add_method('Send', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
-    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arg0) [member function]
+    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arpCache) [member function]
     cls.add_method('SetArpCache', 
                    'void', 
-                   [param('ns3::Ptr< ns3::ArpCache >', 'arg0')])
+                   [param('ns3::Ptr< ns3::ArpCache >', 'arpCache')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
     cls.add_method('SetDevice', 
                    'void', 
@@ -9797,10 +9818,10 @@
                    'ns3::IpL4Protocol::RxStatus', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')], 
                    is_virtual=True)
-    ## tcp-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::TcpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> interface) [member function]
+    ## tcp-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::TcpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
     cls.add_method('Receive', 
                    'ns3::IpL4Protocol::RxStatus', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'interface')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    is_virtual=True)
     ## tcp-l4-protocol.h (module 'internet'): void ns3::TcpL4Protocol::ReceiveIcmp(ns3::Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo, ns3::Ipv4Address payloadSource, ns3::Ipv4Address payloadDestination, uint8_t const * payload) [member function]
     cls.add_method('ReceiveIcmp', 
@@ -10486,8 +10507,8 @@
     cls.add_method('GetSize', 
                    'uint32_t', 
                    [])
-    ## dsr-network-queue.h (module 'dsr'): static ns3::TypeId ns3::dsr::DsrNetworkQueue::GetTypeID() [member function]
-    cls.add_method('GetTypeID', 
+    ## dsr-network-queue.h (module 'dsr'): static ns3::TypeId ns3::dsr::DsrNetworkQueue::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
diff -Naur ns-3.18.1/src/dsr/bindings/modulegen__gcc_LP64.py ns-3.19/src/dsr/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/dsr/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -283,7 +283,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1948,10 +1948,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3250,8 +3251,8 @@
     cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
     cls.add_constructor([])
-    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
-    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
@@ -3307,10 +3308,10 @@
     cls.add_method('SetShortGuardInterval', 
                    'void', 
                    [param('bool', 'guardinterval')])
-    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
-                   [param('bool', 'stbcsatuts')])
+                   [param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
     cls.add_method('SetTxPowerLevel', 
                    'void', 
@@ -4980,6 +4981,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4990,6 +4996,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5005,6 +5016,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5030,6 +5046,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5913,10 +5934,10 @@
     cls.add_method('SetProbeResp', 
                    'void', 
                    [])
-    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function]
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
     cls.add_method('SetQosAckPolicy', 
                    'void', 
-                   [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')])
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
     cls.add_method('SetQosAmsdu', 
                    'void', 
@@ -6592,15 +6613,15 @@
                    'void', 
                    [param('bool', 'greenfield')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
     cls.add_method('SetGuardInterval', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('bool', 'guardInterval')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
     cls.add_method('SetLdpc', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [param('bool', 'ldpc')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
@@ -8303,10 +8324,10 @@
     cls.add_method('Send', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
-    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arg0) [member function]
+    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arpCache) [member function]
     cls.add_method('SetArpCache', 
                    'void', 
-                   [param('ns3::Ptr< ns3::ArpCache >', 'arg0')])
+                   [param('ns3::Ptr< ns3::ArpCache >', 'arpCache')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
     cls.add_method('SetDevice', 
                    'void', 
@@ -9797,10 +9818,10 @@
                    'ns3::IpL4Protocol::RxStatus', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')], 
                    is_virtual=True)
-    ## tcp-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::TcpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> interface) [member function]
+    ## tcp-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::TcpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
     cls.add_method('Receive', 
                    'ns3::IpL4Protocol::RxStatus', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'interface')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    is_virtual=True)
     ## tcp-l4-protocol.h (module 'internet'): void ns3::TcpL4Protocol::ReceiveIcmp(ns3::Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo, ns3::Ipv4Address payloadSource, ns3::Ipv4Address payloadDestination, uint8_t const * payload) [member function]
     cls.add_method('ReceiveIcmp', 
@@ -10486,8 +10507,8 @@
     cls.add_method('GetSize', 
                    'uint32_t', 
                    [])
-    ## dsr-network-queue.h (module 'dsr'): static ns3::TypeId ns3::dsr::DsrNetworkQueue::GetTypeID() [member function]
-    cls.add_method('GetTypeID', 
+    ## dsr-network-queue.h (module 'dsr'): static ns3::TypeId ns3::dsr::DsrNetworkQueue::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
diff -Naur ns-3.18.1/src/dsr/doc/dsr.rst ns-3.19/src/dsr/doc/dsr.rst
--- ns-3.18.1/src/dsr/doc/dsr.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/doc/dsr.rst	2013-12-20 09:44:50.000000000 -0800
@@ -14,7 +14,7 @@
 ********************
  
 This model implements the base specification of the Dynamic Source Routing 
-(DSR) protocol. Implementation is based on RFC4728.
+(DSR) protocol. Implementation is based on :rfc:`4728`.
 
 DSR operates on a on-demand behavior. Therefore, our DSR model buffers all 
 packets while a route request packet (RREQ) is disseminated. We implement 
@@ -127,7 +127,7 @@
 	1. Message type is used to identify the data packet from control packet
 	2. source id is used to identify the real source of the data packet since we have to deliver the packet hop-by-hop and the ipv4header is not carrying the real source and destination ip address as needed
 	3. destination id is for same reason of above
-* Route Reply header is not word-aligned in DSR rfc, change it to word-aligned in implementation
+* Route Reply header is not word-aligned in DSR RFC, change it to word-aligned in implementation
 * DSR works as a shim header between transport and network protocol, it needs its own forwarding mechanism, we are changing the packet transmission to hop-by-hop delivery, so we added two fields in dsr fixed header to notify packet delivery
 
 
@@ -155,7 +155,9 @@
 ******
 
 To have a node run DSR, the easiest way would be to use the DsrHelper
-and DsrMainHelpers in your simulation script. For instance::
+and DsrMainHelpers in your simulation script. For instance:
+
+.. sourcecode:: cpp
 
   DsrHelper dsr;
   DsrMainHelper dsrMain;
@@ -190,8 +192,8 @@
 References
 **********
 
-[1] Link for the `original paper: <http://www.monarch.cs.rice.edu/monarch-papers/dsr-chapter00.pdf>`_
+[1] Original paper: http://www.monarch.cs.rice.edu/monarch-papers/dsr-chapter00.pdf
 
-[2] Link for `RFC 4728: <http://www6.ietf.org/rfc/rfc4728.txt>`_
+[2] RFC 4728 http://www6.ietf.org/rfc/rfc4728.txt
 
-[3] Link for the `Broch's comparison paper: <http://www.monarch.cs.rice.edu/monarch-papers/mobicom98.ps>`_
+[3] Broch's comparison paper: http://www.monarch.cs.rice.edu/monarch-papers/mobicom98.ps
diff -Naur ns-3.18.1/src/dsr/model/dsr-errorbuff.h ns-3.19/src/dsr/model/dsr-errorbuff.h
--- ns-3.18.1/src/dsr/model/dsr-errorbuff.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-errorbuff.h	2013-12-20 09:44:50.000000000 -0800
@@ -45,7 +45,16 @@
 class ErrorBuffEntry
 {
 public:
-  // / c-tor
+  /**
+   * Create an ErrorBuffEntry with the given parameters.
+   *
+   * \param pa packet
+   * \param d IPv4 address of the destination
+   * \param s IPv4 address of the source
+   * \param n IPv4 address of the next hop
+   * \param exp expiration time
+   * \param p protocol number
+   */
   ErrorBuffEntry (Ptr<const Packet> pa = 0, Ipv4Address d = Ipv4Address (), Ipv4Address s = Ipv4Address (),
                   Ipv4Address n = Ipv4Address (), Time exp = Simulator::Now (), uint8_t p = 0)
     : m_packet (pa),
@@ -58,13 +67,14 @@
   }
   /**
    * Compare send buffer entries
+   * \param o another ErrorBuffEntry
    * \return true if equal
    */
   bool operator== (ErrorBuffEntry const & o) const
   {
     return ((m_packet == o.m_packet) && (m_source == o.m_source) && (m_nextHop == o.m_nextHop) && (m_dst == o.m_dst) && (m_expire == o.m_expire));
   }
-  // /\name Fields
+  ///\name Fields
   // \{
   Ptr<const Packet> GetPacket () const
   {
@@ -116,17 +126,17 @@
   }
   // \}
 private:
-  // / Data packet
+  /// Data packet
   Ptr<const Packet> m_packet;
-  // / Destination address
+  /// Destination address
   Ipv4Address m_dst;
-  // / Source address
+  /// Source address
   Ipv4Address m_source;
-  // / Nexthop address
+  /// Nexthop address
   Ipv4Address m_nextHop;
-  // / Expire time for queue entry
+  /// Expire time for queue entry
   Time m_expire;
-  // / The protocol number
+  /// The protocol number
   uint8_t m_protocol;
 };
 
@@ -138,21 +148,23 @@
 class ErrorBuffer
 {
 public:
-  // / Default c-tor
+  /**
+   * Default constructor
+   */
   ErrorBuffer ()
   {
   }
-  // / Push entry in queue, if there is no entry with the same packet and destination address in queue.
+  /// Push entry in queue, if there is no entry with the same packet and destination address in queue.
   bool Enqueue (ErrorBuffEntry & entry);
-  // / Return first found (the earliest) entry for given destination
+  /// Return first found (the earliest) entry for given destination
   bool Dequeue (Ipv4Address dst, ErrorBuffEntry & entry);
-  // / Remove all packets with the error link
+  /// Remove all packets with the error link
   void DropPacketForErrLink (Ipv4Address source, Ipv4Address nextHop);
-  // / Finds whether a packet with destination dst exists in the queue
+  /// Finds whether a packet with destination dst exists in the queue
   bool Find (Ipv4Address dst);
-  // / Number of entries
+  /// Number of entries
   uint32_t GetSize ();
-  // /\name Fields
+  ///\name Fields
   // \{
   uint32_t GetMaxQueueLen () const
   {
@@ -178,19 +190,19 @@
   }
 
 private:
-  // / The send buffer to cache unsent packet
+  /// The send buffer to cache unsent packet
   std::vector<ErrorBuffEntry> m_errorBuffer;
-  // / Remove all expired entries
+  /// Remove all expired entries
   void Purge ();
-  // / Notify that packet is dropped from queue by timeout
+  /// Notify that packet is dropped from queue by timeout
   void Drop (ErrorBuffEntry en, std::string reason);
-  // / Notify that packet is dropped from queue by timeout
+  /// Notify that packet is dropped from queue by timeout
   void DropLink (ErrorBuffEntry en, std::string reason);
-  // / The maximum number of packets that we allow a routing protocol to buffer.
+  /// The maximum number of packets that we allow a routing protocol to buffer.
   uint32_t m_maxLen;
-  // / The maximum period of time that a routing protocol is allowed to buffer a packet for, seconds.
+  /// The maximum period of time that a routing protocol is allowed to buffer a packet for, seconds.
   Time m_errorBufferTimeout;
-  // / Check if the send buffer entry is the same or not
+  /// Check if the send buffer entry is the same or not
   static bool LinkEqual (ErrorBuffEntry en, const std::vector<Ipv4Address> link)
   {
     return ((en.GetSource () == link[0]) && (en.GetNextHop () == link[1]));
diff -Naur ns-3.18.1/src/dsr/model/dsr-fs-header.cc ns-3.19/src/dsr/model/dsr-fs-header.cc
--- ns-3.18.1/src/dsr/model/dsr-fs-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-fs-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -39,7 +39,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("DsrFsHeader");
 
-NS_OBJECT_ENSURE_REGISTERED (DsrFsHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrFsHeader)
+  ;
 
 TypeId DsrFsHeader::GetTypeId ()
 {
@@ -258,7 +259,8 @@
   return m_optionData;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrRoutingHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrRoutingHeader)
+  ;
 
 TypeId DsrRoutingHeader::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/dsr/model/dsr-fs-header.h ns-3.19/src/dsr/model/dsr-fs-header.h
--- ns-3.18.1/src/dsr/model/dsr-fs-header.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-fs-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -99,7 +99,7 @@
   virtual ~DsrFsHeader ();
   /**
    * \brief Set the "Next header" field.
-   * \param nextHeader the next header number
+   * \param protocol the next header number
    */
   void SetNextHeader (uint8_t protocol);
   /**
@@ -109,7 +109,7 @@
   uint8_t GetNextHeader () const;
   /**
    * brief Set the message type of the header.
-   * \param message type the message type of the header
+   * \param messageType the message type of the header
    */
   void SetMessageType (uint8_t messageType);
   /**
@@ -118,23 +118,23 @@
    */
   uint8_t GetMessageType () const;
   /**
-   * brief Set the source id of the header.
-   * \param source id the source id of the header
+   * brief Set the source ID of the header.
+   * \param sourceId the source ID of the header
    */
   void SetSourceId (uint16_t sourceId);
   /**
-   * brief Get the source id of the header.
-   * \return source id the source id of the header
+   * brief Get the source ID of the header.
+   * \return source ID the source ID of the header
    */
   uint16_t GetSourceId () const;
   /**
-   * brief Set the dest id of the header.
-   * \param dest id the dest id of the header
+   * brief Set the dest ID of the header.
+   * \param destId the destination ID of the header
    */
   void SetDestId (uint16_t destId);
   /**
-   * brief Get the dest id of the header.
-   * \return dest id the dest id of the header
+   * brief Get the dest ID of the header.
+   * \return dest ID the dest ID of the header
    */
   uint16_t GetDestId () const;
   /**
@@ -257,6 +257,7 @@
   /**
    * \brief Calculate padding.
    * \param alignment alignment
+   * \return the number of bytes required to pad
    */
   uint32_t CalculatePad (DsrOptionHeader::Alignment alignment) const;
   /**
diff -Naur ns-3.18.1/src/dsr/model/dsr-gratuitous-reply-table.cc ns-3.19/src/dsr/model/dsr-gratuitous-reply-table.cc
--- ns-3.18.1/src/dsr/model/dsr-gratuitous-reply-table.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-gratuitous-reply-table.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 namespace ns3 {
 namespace dsr {
 
-NS_OBJECT_ENSURE_REGISTERED (GraReply);
+NS_OBJECT_ENSURE_REGISTERED (GraReply)
+  ;
 
 TypeId GraReply::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/dsr/model/dsr-gratuitous-reply-table.h ns-3.19/src/dsr/model/dsr-gratuitous-reply-table.h
--- ns-3.18.1/src/dsr/model/dsr-gratuitous-reply-table.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-gratuitous-reply-table.h	2013-12-20 09:44:50.000000000 -0800
@@ -65,49 +65,41 @@
 class GraReply  : public Object
 {
 public:
-  // / c-tor
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
-  /**
-   * \brief Constructor.
-   */
+
   GraReply ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~GraReply ();
-  // / Set the gratuitous reply table size
+
+  /// Set the gratuitous reply table size
   void SetGraTableSize (uint32_t g)
   {
     GraReplyTableSize = g;
   }
-  // / Get the gratuitous reply table size
+  /// Get the gratuitous reply table size
   uint32_t GetGraTableSize () const
   {
     return GraReplyTableSize;
   }
-  // / Add a new gratuitous reply entry
+  /// Add a new gratuitous reply entry
   bool AddEntry (GraReplyEntry & graTableEntry);
-  // / Update the route entry if found, create a new one if not
+  /// Update the route entry if found, create a new one if not
   bool FindAndUpdate (Ipv4Address replyTo, Ipv4Address replyFrom, Time gratReplyHoldoff);
-  // / Remove all expired entries
+  /// Remove all expired entries
   void Purge ();
-  // / Remove all entries
+  /// Remove all entries
   void Clear ()
   {
     m_graReply.clear ();
   }
 
 private:
-  // / Vector of entries
+  /// Vector of entries
   std::vector<GraReplyEntry> m_graReply;
-  // / The max # of gratuitous reply entries to hold
+  /// The max # of gratuitous reply entries to hold
   uint32_t GraReplyTableSize;
 
-  // / Check if the entry is expired or not
+  /// Check if the entry is expired or not
   struct IsExpired
   {
     bool operator() (const struct GraReplyEntry & b) const
diff -Naur ns-3.18.1/src/dsr/model/dsr-maintain-buff.h ns-3.19/src/dsr/model/dsr-maintain-buff.h
--- ns-3.18.1/src/dsr/model/dsr-maintain-buff.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-maintain-buff.h	2013-12-20 09:44:50.000000000 -0800
@@ -53,6 +53,7 @@
 
   /**
    * Compare maintain Buffer entries
+   * \param o
    * \return true if equal
    */
   bool operator < (LinkKey const & o) const
@@ -73,6 +74,7 @@
 
   /**
    * Compare maintain Buffer entries
+   * \param o
    * \return true if equal
    */
   bool operator < (NetworkKey const & o) const
@@ -92,6 +94,7 @@
 
   /**
    * Compare maintain Buffer entries
+   * \param o
    * \return true if equal
    */
   bool operator < (PassiveKey const & o) const
@@ -109,7 +112,18 @@
 class MaintainBuffEntry
 {
 public:
-  // / c-tor
+  /**
+   * Construct a MaintainBuffEntry with the given parameters
+   *
+   * \param pa packet
+   * \param us our IPv4 address
+   * \param n next hop IPv4 address
+   * \param s IPv4 address of the source
+   * \param dst IPv4 address of the destination
+   * \param ackId ACK ID
+   * \param segs number of segments left
+   * \param exp expiration time
+   */
   MaintainBuffEntry (Ptr<const Packet> pa = 0, Ipv4Address us = Ipv4Address (),
                      Ipv4Address n = Ipv4Address (), Ipv4Address s = Ipv4Address (), Ipv4Address dst = Ipv4Address (),
                      uint16_t ackId = 0, uint8_t segs = 0, Time exp = Simulator::Now ())
@@ -124,7 +138,7 @@
   {
   }
 
-  // /\name Fields
+  ///\name Fields
   // \{
   Ptr<const Packet> GetPacket () const
   {
@@ -192,21 +206,21 @@
   }
   // \}
 private:
-  // / Data packet
+  /// Data packet
   Ptr<const Packet> m_packet;
-  // / Our own ip address
+  /// Our own ip address
   Ipv4Address m_ourAdd;
-  // / Next hop Ip address
+  /// Next hop Ip address
   Ipv4Address m_nextHop;
-  // / The source address
+  /// The source address
   Ipv4Address m_src;
-  // / The destination address
+  /// The destination address
   Ipv4Address m_dst;
-  // / The data ack id
+  /// The data ack id
   uint16_t m_ackId;
-  // / The segments left field
+  /// The segments left field
   uint8_t m_segsLeft;
-  // / Expire time for queue entry
+  /// Expire time for queue entry
   Time m_expire;
 };
 /**
@@ -217,21 +231,23 @@
 class MaintainBuffer
 {
 public:
-  // / Default c-tor
+  /**
+   * Default constructor
+   */
   MaintainBuffer ()
   {
   }
-  // / Push entry in queue, if there is no entry with the same packet and destination address in queue.
+  /// Push entry in queue, if there is no entry with the same packet and destination address in queue.
   bool Enqueue (MaintainBuffEntry & entry);
-  // / Return first found (the earliest) entry for given destination
+  /// Return first found (the earliest) entry for given destination
   bool Dequeue (Ipv4Address dst, MaintainBuffEntry & entry);
-  // / Remove all packets with destination IP address dst
+  /// Remove all packets with destination IP address dst
   void DropPacketWithNextHop (Ipv4Address nextHop);
-  // / Finds whether a packet with destination dst exists in the queue
+  /// Finds whether a packet with destination dst exists in the queue
   bool Find (Ipv4Address nextHop);
-  // / Number of entries
+  /// Number of entries
   uint32_t GetSize ();
-  // /\name Fields
+  ///\name Fields
   // \{
   uint32_t GetMaxQueueLen () const
   {
@@ -249,27 +265,27 @@
   {
     m_maintainBufferTimeout = t;
   }
-  // / Verify if all the elements in the maintainence buffer entry is the same
+  /// Verify if all the elements in the maintainence buffer entry is the same
   bool AllEqual (MaintainBuffEntry & entry);
-  // / Verify if the maintain buffer entry is the same in every field for link ack
+  /// Verify if the maintain buffer entry is the same in every field for link ack
   bool LinkEqual (MaintainBuffEntry & entry);
-  // / Verify if the maintain buffer entry is the same in every field for network ack
+  /// Verify if the maintain buffer entry is the same in every field for network ack
   bool NetworkEqual (MaintainBuffEntry & entry);
-  // / Verify if the maintain buffer entry is the same in every field for promiscuous ack
+  /// Verify if the maintain buffer entry is the same in every field for promiscuous ack
   bool PromiscEqual (MaintainBuffEntry & entry);
   // \}
 
 private:
-  // / The vector of maintain buffer entries
+  /// The vector of maintain buffer entries
   std::vector<MaintainBuffEntry> m_maintainBuffer;
   std::vector<NetworkKey> m_allNetworkKey;
-  // / Remove all expired entries
+  /// Remove all expired entries
   void Purge ();
-  // / The maximum number of packets that we allow a routing protocol to buffer.
+  /// The maximum number of packets that we allow a routing protocol to buffer.
   uint32_t m_maxLen;
-  // / The maximum period of time that a routing protocol is allowed to buffer a packet for, seconds.
+  /// The maximum period of time that a routing protocol is allowed to buffer a packet for, seconds.
   Time m_maintainBufferTimeout;
-  // / Verify if the maintain buffer is equal or not
+  /// Verify if the maintain buffer is equal or not
   static bool IsEqual (MaintainBuffEntry en, const Ipv4Address nextHop)
   {
     return (en.GetNextHop () == nextHop);
diff -Naur ns-3.18.1/src/dsr/model/dsr-network-queue.cc ns-3.19/src/dsr/model/dsr-network-queue.cc
--- ns-3.18.1/src/dsr/model/dsr-network-queue.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-network-queue.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,10 +43,11 @@
 namespace ns3 {
 namespace dsr {
 
-NS_OBJECT_ENSURE_REGISTERED (DsrNetworkQueue);
+NS_OBJECT_ENSURE_REGISTERED (DsrNetworkQueue)
+  ;
 
 TypeId
-DsrNetworkQueue::GetTypeID (void)
+DsrNetworkQueue::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrNetworkQueue")
     .SetParent<Object> ()
diff -Naur ns-3.18.1/src/dsr/model/dsr-network-queue.h ns-3.19/src/dsr/model/dsr-network-queue.h
--- ns-3.18.1/src/dsr/model/dsr-network-queue.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-network-queue.h	2013-12-20 09:44:50.000000000 -0800
@@ -53,7 +53,15 @@
 class DsrNetworkQueueEntry
 {
 public:
-  /// c-tor
+  /**
+   * Construct a DsrNetworkQueueEntry with the given parameters
+   *
+   * \param pa packet
+   * \param s IPv4 address of the source
+   * \param n IPv4 address of the next hop node
+   * \param exp expiration time
+   * \param r Route
+   */
   DsrNetworkQueueEntry (Ptr<const Packet> pa = 0, Ipv4Address s = Ipv4Address (), Ipv4Address n = Ipv4Address (),
                         Time exp = Simulator::Now (), Ptr<Ipv4Route> r = 0)
     : m_packet (pa),
@@ -65,6 +73,7 @@
   }
   /**
    * Compare send buffer entries
+   * \param o
    * \return true if equal
    */
   bool operator== (DsrNetworkQueueEntry const & o) const
@@ -129,22 +138,70 @@
 class DsrNetworkQueue : public Object
 {
 public:
-  static TypeId GetTypeID (void);
-  /// Default c-tor
+  static TypeId GetTypeId (void);
+  
   DsrNetworkQueue ();
+  /**
+   * Construct a DsrNetworkQueue with the given
+   * maximum length and maximum delay.
+   *
+   * \param maxLen Maximum queue size
+   * \param maxDelay Maximum entry lifetime in the queue
+   */
   DsrNetworkQueue (uint32_t maxLen, Time maxDelay);
   ~DsrNetworkQueue ();
-  /// Push entry in queue, if there is no entry with the same packet and destination address in queue.
+
+  /**
+   * Push entry in queue, if there is no entry with the same
+   * packet and destination address in queue.
+   *
+   * \param entry packet entry
+   * \return true if the given entry was put in the queue,
+   *         false otherwise
+   */
   bool Enqueue (DsrNetworkQueueEntry & entry);
-  /// Return first found (the earliest) entry for given destination
+  /**
+   * Return first found (the earliest) entry for given destination
+   *
+   * \param entry pointer to the return entry
+   * \return true if an entry is returned,
+   *         false otherwise
+   */
   bool Dequeue (DsrNetworkQueueEntry & entry);
-  /// Number of entries
+  /**
+   * Number of entries
+   *
+   * \return the current queue size/length
+   */
   uint32_t GetSize ();
 
+  /**
+   * Set the maximum queue size
+   *
+   * \param maxSize the maximum queue size
+   */
   void SetMaxNetworkSize (uint32_t maxSize);
+  /**
+   * Set the maximum entry lifetime in the queue
+   *
+   * \param delay the maximum entry lifetime
+   */
   void SetMaxNetworkDelay (Time delay);
+  /**
+   * Return the maximum queue size
+   *
+   * \return the maximum queue size
+   */
   uint32_t GetMaxNetworkSize (void) const;
+  /**
+   * Return the maximum entry lifetime for this queue
+   *
+   * \return the maximum entry lifetime for this queue
+   */
   Time GetMaxNetworkDelay (void) const;
+  /**
+   * Clear the queue
+   */
   void Flush (void);
 
   std::vector<DsrNetworkQueueEntry> & GetQueue ()
@@ -153,11 +210,14 @@
   }
 
 private:
+  /**
+   * Clean the queue by removing entries that exceeded lifetime.
+   */
   void Cleanup (void);
-  std::vector<DsrNetworkQueueEntry> m_dsrNetworkQueue;
-  uint32_t m_size;
-  uint32_t m_maxSize;
-  Time m_maxDelay;
+  std::vector<DsrNetworkQueueEntry> m_dsrNetworkQueue; //!< Queue (vector) of entries
+  uint32_t m_size; //!< Current queue size
+  uint32_t m_maxSize; //!< Maximum queue size
+  Time m_maxDelay; //!< Maximum entry lifetime
 };
 
 } // namespace dsr
diff -Naur ns-3.18.1/src/dsr/model/dsr-option-header.cc ns-3.19/src/dsr/model/dsr-option-header.cc
--- ns-3.18.1/src/dsr/model/dsr-option-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-option-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -42,7 +42,8 @@
 namespace dsr {
 NS_LOG_COMPONENT_DEFINE ("DsrOptionHeader");
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionHeader)
+  ;
 
 TypeId DsrOptionHeader::GetTypeId ()
 {
@@ -130,7 +131,8 @@
   return retVal;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1Header);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1Header)
+  ;
 
 TypeId DsrOptionPad1Header::GetTypeId ()
 {
@@ -181,7 +183,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadnHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadnHeader)
+  ;
 
 TypeId DsrOptionPadnHeader::GetTypeId ()
 {
@@ -241,7 +244,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreqHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreqHeader)
+  ;
 
 TypeId DsrOptionRreqHeader::GetTypeId ()
 {
@@ -388,7 +392,8 @@
   return retVal;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrepHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrepHeader)
+  ;
 
 TypeId DsrOptionRrepHeader::GetTypeId ()
 {
@@ -509,7 +514,8 @@
   return retVal;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionSRHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionSRHeader)
+  ;
 
 TypeId DsrOptionSRHeader::GetTypeId ()
 {
@@ -651,7 +657,8 @@
   return retVal;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrHeader)
+  ;
 
 TypeId DsrOptionRerrHeader::GetTypeId ()
 {
@@ -779,7 +786,8 @@
   return retVal;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnreachHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnreachHeader)
+  ;
 
 TypeId DsrOptionRerrUnreachHeader::GetTypeId ()
 {
@@ -907,7 +915,8 @@
   return retVal;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnsupportHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnsupportHeader)
+  ;
 
 TypeId DsrOptionRerrUnsupportHeader::GetTypeId ()
 {
@@ -1025,7 +1034,8 @@
   return retVal;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReqHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReqHeader)
+  ;
 
 TypeId DsrOptionAckReqHeader::GetTypeId ()
 {
@@ -1100,7 +1110,8 @@
   return retVal;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckHeader);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckHeader)
+  ;
 
 TypeId DsrOptionAckHeader::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/dsr/model/dsr-option-header.h ns-3.19/src/dsr/model/dsr-option-header.h
--- ns-3.18.1/src/dsr/model/dsr-option-header.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-option-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -339,7 +339,7 @@
   Ipv4Address GetNodeAddress (uint8_t index) const;
   /**
    * \brief Set the request id number.
-   * \param the identification number
+   * \param identification the identification number
    */
   void SetId (uint16_t identification);
   /**
@@ -589,7 +589,7 @@
   virtual ~DsrOptionSRHeader ();
   /*
    * \brief Set the number of segments left to send
-   * \param The segments left
+   * \param segmentsLeft The segments left
    */
   void SetSegmentsLeft (uint8_t segmentsLeft);
   /*
@@ -631,7 +631,7 @@
   Ipv4Address GetNodeAddress (uint8_t index) const;
   /*
    * \brief Set the salvage value for a packet
-   * \param The salvage value of the packet
+   * \param salvage The salvage value of the packet
    */
   void SetSalvage (uint8_t salvage);
   /*
@@ -715,7 +715,7 @@
   \endverbatim
 */
 
-// / Error type
+/// Error type
 enum ErrorType
 {
   NODE_UNREACHABLE  = 1,   // !< NODE_UNREACHABLE
@@ -746,7 +746,7 @@
   virtual ~DsrOptionRerrHeader ();
   /**
    * \brief Set the route error type
-   * \param The error type
+   * \param errorType The error type
    */
   void SetErrorType (uint8_t errorType);
   /**
@@ -756,7 +756,7 @@
   uint8_t GetErrorType () const;
   /**
    * \brief Set the route error source address
-   * \param The error source address
+   * \param errorSrcAddress The error source address
    */
   virtual void SetErrorSrc (Ipv4Address errorSrcAddress);
   /**
@@ -770,12 +770,12 @@
   virtual void SetSalvage (uint8_t salvage);
   /**
    * \brief Get the salvage value of the packet
-   * \param The salvage value of the packet
+   * \return The salvage value of the packet
    */
   virtual uint8_t GetSalvage () const;
   /**
    * \brief Set the error destination ip address
-   * \param The error destination address
+   * \param errorDstAddress The error destination address
    */
   virtual void SetErrorDst (Ipv4Address errorDstAddress);
   /**
@@ -891,7 +891,7 @@
   virtual ~DsrOptionRerrUnreachHeader ();
   /**
    * \brief Set the route error source address
-   * \param The error source address
+   * \param errorSrcAddress The error source address
    */
   virtual void SetErrorSrc (Ipv4Address errorSrcAddress);
   /**
@@ -905,12 +905,12 @@
   virtual void SetSalvage (uint8_t salvage);
   /**
    * \brief Get the salvage value of the packet
-   * \param The salvage value of the packet
+   * \return The salvage value of the packet
    */
   virtual uint8_t GetSalvage () const;
   /**
    * \brief Set the error destination ip address
-   * \param The error destination address
+   * \param errorDstAddress The error destination address
    */
   virtual void SetErrorDst (Ipv4Address errorDstAddress);
   /**
@@ -920,7 +920,7 @@
   virtual Ipv4Address GetErrorDst () const;
   /**
    * \brief Set the unreachable node ip address
-   * \param The unreachable ip address
+   * \param unreachNode The unreachable ip address
    */
   void SetUnreachNode (Ipv4Address unreachNode);
   /**
@@ -930,7 +930,7 @@
   Ipv4Address GetUnreachNode () const;
   /**
    * \brief Set the unreachable node ip address
-   * \param The unreachable ip address
+   * \param originalDst The unreachable ip address
    */
   void SetOriginalDst (Ipv4Address originalDst);
   /**
@@ -1047,7 +1047,7 @@
   virtual ~DsrOptionRerrUnsupportHeader ();
   /**
    * \brief Set the route error source address
-   * \param The error source address
+   * \param errorSrcAddress The error source address
    */
   virtual void SetErrorSrc (Ipv4Address errorSrcAddress);
   /**
@@ -1057,16 +1057,17 @@
   virtual Ipv4Address GetErrorSrc () const;
   /**
    * \brief Set the salvage value of the packet
+   * \param salvage the salvage value
    */
   virtual void SetSalvage (uint8_t salvage);
   /**
    * \brief Get the salvage value of the packet
-   * \param The salvage value of the packet
+   * \return The salvage value of the packet
    */
   virtual uint8_t GetSalvage () const;
   /**
    * \brief Set the error destination ip address
-   * \param The error destination address
+   * \param errorDstAddress The error destination address
    */
   virtual void SetErrorDst (Ipv4Address errorDstAddress);
   /**
@@ -1076,7 +1077,7 @@
   virtual Ipv4Address GetErrorDst () const;
   /**
    * \brief Set the unsupported option type value
-   * \param The unsupported option type value
+   * \param optionType The unsupported option type value
    */
   void SetUnsupported (uint16_t optionType);
   /**
@@ -1175,7 +1176,7 @@
   virtual ~DsrOptionAckReqHeader ();
   /**
    * \brief Set the Ack request id number.
-   * \param the identification number
+   * \param identification the identification number
    */
   void SetAckId (uint16_t identification);
   /**
@@ -1212,7 +1213,7 @@
   virtual Alignment GetAlignment () const;
 
 private:
-  /*
+  /**
    * The identification field
    */
   uint16_t m_identification;
@@ -1262,7 +1263,7 @@
   virtual ~DsrOptionAckHeader ();
   /**
    * \brief Set the Ack id number.
-   * \param the identification number
+   * \param identification the identification number
    */
   void SetAckId (uint16_t identification);
   /**
@@ -1272,7 +1273,7 @@
   uint16_t GetAckId () const;
   /**
    * \brief Set Error source ip address.
-   * \param The real source address
+   * \param realSrcAddress The real source address
    */
   void SetRealSrc (Ipv4Address realSrcAddress);
   /**
@@ -1282,7 +1283,7 @@
   Ipv4Address GetRealSrc () const;
   /**
    * \brief Set Error source ip address.
-   * \param The real dst address
+   * \param realDstAddress The real dst address
    */
   void SetRealDst (Ipv4Address realDstAddress);
   /**
diff -Naur ns-3.18.1/src/dsr/model/dsr-options.cc ns-3.19/src/dsr/model/dsr-options.cc
--- ns-3.18.1/src/dsr/model/dsr-options.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-options.cc	2013-12-20 09:44:50.000000000 -0800
@@ -65,7 +65,8 @@
 namespace ns3 {
 namespace dsr {
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptions);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptions)
+  ;
 
 TypeId DsrOptions::GetTypeId ()
 {
@@ -371,7 +372,8 @@
   return 0;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1)
+  ;
 
 TypeId DsrOptionPad1::GetTypeId ()
 {
@@ -411,7 +413,8 @@
   return pad1Header.GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadn);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadn)
+  ;
 
 TypeId DsrOptionPadn::GetTypeId ()
 {
@@ -451,7 +454,8 @@
   return padnHeader.GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreq);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreq)
+  ;
 
 TypeId DsrOptionRreq::GetTypeId ()
 {
@@ -949,7 +953,8 @@
   //unreachable:  return rreq.GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep)
+  ;
 
 TypeId DsrOptionRrep::GetTypeId ()
 {
@@ -1149,7 +1154,8 @@
   return rrep.GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionSR);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionSR)
+  ;
 
 TypeId DsrOptionSR::GetTypeId ()
 {
@@ -1389,7 +1395,8 @@
   return sourceRoute.GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerr);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerr)
+  ;
 
 TypeId DsrOptionRerr::GetTypeId ()
 {
@@ -1555,7 +1562,7 @@
   newSourceRoute.SetNodesAddress (nodeList);
   nextAddress = newSourceRoute.GetNodeAddress (nextAddressIndex);
 
-  // / to test if the next address is multicast or not
+  /// to test if the next address is multicast or not
   if (nextAddress.IsMulticast () || targetAddress.IsMulticast ())
     {
       m_dropTrace (p);
@@ -1568,7 +1575,8 @@
   return serializedSize;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReq);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReq)
+  ;
 
 TypeId DsrOptionAckReq::GetTypeId ()
 {
@@ -1623,7 +1631,8 @@
   return ackReq.GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionAck);
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionAck)
+  ;
 
 TypeId DsrOptionAck::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/dsr/model/dsr-options.h ns-3.19/src/dsr/model/dsr-options.h
--- ns-3.18.1/src/dsr/model/dsr-options.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-options.h	2013-12-20 09:44:50.000000000 -0800
@@ -104,37 +104,58 @@
   Ptr<Node> GetNode () const;
   /**
    * \brief Search for the ipv4 address in the node list.
+   *
+   * \param ipv4Address IPv4 address to search for
+   * \param destAddress IPv4 address in the list that we begin the search
+   * \param nodeList List of IPv4 addresses
    * \return true if contain ip address
    */
   bool ContainAddressAfter (Ipv4Address ipv4Address, Ipv4Address destAddress, std::vector<Ipv4Address> &nodeList);
   /**
    * \brief Cut the route from ipv4Address to the end of the route vector
+   *
+   * \param ipv4Address the address to begin cutting
+   * \param nodeList List of IPv4 addresses
    * \return the vector after the route cut
    */
   std::vector<Ipv4Address> CutRoute (Ipv4Address ipv4Address, std::vector<Ipv4Address> &nodeList);
   /**
-   * \brief Set the route to use for data packets
+   * \brief Set the route to use for data packets,
+   *        used by the option headers when sending data/control packets
+   *
+   * \param nextHop IPv4 address of the next hop
+   * \param srcAddress IPv4 address of the source
    * \return the route
-   * \used by the option headers when sending data/control packets
    */
   virtual Ptr<Ipv4Route> SetRoute (Ipv4Address nextHop, Ipv4Address srcAddress);
   /**
    * \brief Reverse the routes.
+   *
+   * \param vec List of IPv4 addresses
    * \return true if successfully reversed
    */
   bool ReverseRoutes  (std::vector<Ipv4Address>& vec);
   /**
    * \brief Search for the next hop in the route
+   *
+   * \param ipv4Address the IPv4 address of the node we are looking for its next hop address
+   * \param vec List of IPv4 addresses
    * \return the next hop address if found
    */
   Ipv4Address SearchNextHop (Ipv4Address ipv4Address, std::vector<Ipv4Address>& vec);
   /**
    * \brief Reverse search for the next hop in the route
+   *
+   * \param ipv4Address the IPv4 address of the node we are looking for its next hop address
+   * \param vec List of IPv4 addresses
    * \return the previous next hop address if found
    */
   Ipv4Address ReverseSearchNextHop (Ipv4Address ipv4Address, std::vector<Ipv4Address>& vec);
   /**
    * \brief Reverse search for the next two hop in the route
+   *
+   * \param ipv4Address the IPv4 address of the node we are looking for its next two hop address
+   * \param vec List of IPv4 addresses
    * \return the previous next two hop address if found
    */
   Ipv4Address ReverseSearchNextTwoHop  (Ipv4Address ipv4Address, std::vector<Ipv4Address>& vec);
@@ -144,34 +165,46 @@
   void PrintVector (std::vector<Ipv4Address>& vec);
   /**
    * \brief Check if the two vectors contain duplicate or not
+   *
+   * \param vec the first list of IPv4 addresses
+   * \param vec2 the second list of IPv4 addresses
    * \return true if contains duplicate
    */
   bool IfDuplicates (std::vector<Ipv4Address>& vec, std::vector<Ipv4Address>& vec2);
   /**
    * \brief Check if the route already contains the node ip address
+   *
+   * \param ipv4Address the IPv4 address that we are looking for
+   * \param vec List of IPv4 addresses
    * \return true if it already exists
    */
   bool CheckDuplicates (Ipv4Address ipv4Address, std::vector<Ipv4Address>& vec);
-  /*
+  /**
    * \brief Remove the duplicates from the route
+   *
+   * \param vec List of IPv4 addresses to be clean
    * \return the route after route shorten
    */
   void RemoveDuplicates (std::vector<Ipv4Address>& vec);
   /**
    * \brief Schedule the intermediate node route request broadcast
-   * \param the original packet
-   * \param rrepHeader The rrep header
+   * \param packet the original packet
+   * \param nodeList The list of IPv4 addresses
    * \param source address
    * \param destination address
    */
   void ScheduleReply (Ptr<Packet> &packet, std::vector<Ipv4Address> &nodeList, Ipv4Address &source, Ipv4Address &destination);
   /**
    * \brief Get the node id with Ipv4Address
+   *
+   * \param address IPv4 address to look for ID
    * \return the id of the node
    */
   uint32_t GetIDfromIP (Ipv4Address address);
   /**
    * \brief Get the node object with Ipv4Address
+   *
+   * \param ipv4Address IPv4 address of the node
    * \return the object of the node
    */
   Ptr<Node> GetNodeWithAddress (Ipv4Address ipv4Address);
@@ -181,9 +214,12 @@
    * Called from DsrRouting::Receive.
    * \param packet the packet
    * \param dsrP  the clean packet with payload
+   * \param ipv4Address the IPv4 address
+   * \param source IPv4 address of the source
    * \param ipv4Header the IPv4 header of packet received
    * \param protocol the protocol number of the up layer
    * \param isPromisc if the packet must be dropped
+   * \param promiscSource IPv4 address
    * \return the processed size
    */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource) = 0;
@@ -245,35 +281,13 @@
    * \brief Pad1 option number.
    */
   static const uint8_t OPT_NUMBER = 224;
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
-  /**
-   * \brief Constructor.
-   */
+
   DsrOptionPad1 ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~DsrOptionPad1 ();
-  /**
-   * \brief Get the option number.
-   * \return option number
-   */
+
   virtual uint8_t GetOptionNumber () const;
-  /**
-   * \brief Process method
-   *
-   * Called from DsrRouting::Receive.
-   * \param packet the packet
-   * \param dsrP  the clean packet with payload
-   * \param ipv4Header the IPv4 header of packet received
-   * \param protocol the protocol number of the up layer
-   * \param isPromisc if the packet must be dropped
-   * \return the processed size
-   */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource);
 };
 
@@ -288,35 +302,13 @@
    * \brief PadN option number.
    */
   static const uint8_t OPT_NUMBER = 0;
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
-  /**
-   * \brief Constructor.
-   */
+
   DsrOptionPadn ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~DsrOptionPadn ();
-  /**
-   * \brief Get the option number.
-   * \return option number
-   */
+
   virtual uint8_t GetOptionNumber () const;
-  /**
-   * \brief Process method
-   *
-   * Called from DsrRouting::Receive.
-   * \param packet the packet
-   * \param dsrP  the clean packet with payload
-   * \param ipv4Header the IPv4 header of packet received
-   * \param protocol the protocol number of the up layer
-   * \param isPromisc if the packet must be dropped
-   * \return the processed size
-   */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource);
 };
 
@@ -331,10 +323,7 @@
    * \brief Rreq option number.
    */
   static const uint8_t OPT_NUMBER = 1;
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
   /**
    * \brief Get the instance type ID.
@@ -349,22 +338,8 @@
    * \brief Destructor.
    */
   virtual ~DsrOptionRreq ();
-  /**
-   * \brief Get the option number.
-   * \return option number
-   */
+
   virtual uint8_t GetOptionNumber () const;
-  /**
-   * \brief Process method
-   *
-   * Called from DsrRouting::Receive.
-   * \param packet the packet
-   * \param dsrP  the clean packet with payload
-   * \param ipv4Header the IPv4 header of packet received
-   * \param protocol the protocol number of the up layer
-   * \param isPromisc if the packet must be dropped
-   * \return the processed size
-   */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource);
 
 private:
@@ -389,40 +364,18 @@
    * \brief Router alert option number.
    */
   static const uint8_t OPT_NUMBER = 2;
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
   /**
    * \brief Get the instance type ID.
    * \return instance type ID
    */
   virtual TypeId GetInstanceTypeId () const;
-  /**
-   * \brief Constructor.
-   */
+
   DsrOptionRrep ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~DsrOptionRrep ();
-  /**
-   * \brief Get the option number.
-   * \return option number
-   */
+
   virtual uint8_t GetOptionNumber () const;
-  /**
-   * \brief Process method
-   *
-   * Called from DsrRouting::Receive.
-   * \param packet the packet
-   * \param dsrP  the clean packet with payload
-   * \param ipv4Header the IPv4 header of packet received
-   * \param protocol the protocol number of the up layer
-   * \param isPromisc if the packet must be dropped
-   * \return the processed size
-   */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource);
 
 private:
@@ -447,40 +400,18 @@
    * \brief Source Route option number.
    */
   static const uint8_t OPT_NUMBER = 96;
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
   /**
    * \brief Get the instance type ID.
    * \return instance type ID
    */
   virtual TypeId GetInstanceTypeId () const;
-  /**
-   * \brief Constructor.
-   */
+
   DsrOptionSR ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~DsrOptionSR ();
-  /**
-   * \brief Get the option number.
-   * \return option number
-   */
+
   virtual uint8_t GetOptionNumber () const;
-  /**
-   * \brief Process method
-   *
-   * Called from DsrRouting::Receive.
-   * \param packet the packet
-   * \param dsrP  the clean packet with payload
-   * \param ipv4Header the IPv4 header of packet received
-   * \param protocol the protocol number of the up layer
-   * \param isPromisc if the packet must be dropped
-   * \return the processed size
-   */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource);
 
 private:
@@ -501,40 +432,18 @@
    * \brief Dsr Route Error option number.
    */
   static const uint8_t OPT_NUMBER = 3;
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
   /**
    * \brief Get the instance type ID.
    * \return instance type ID
    */
   virtual TypeId GetInstanceTypeId () const;
-  /**
-   * \brief Constructor.
-   */
+
   DsrOptionRerr ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~DsrOptionRerr ();
-  /**
-   * \brief Get the option number.
-   * \return option number
-   */
+
   virtual uint8_t GetOptionNumber () const;
-  /**
-   * \brief Process method
-   *
-   * Called from DsrRouting::Receive.
-   * \param packet the packet
-   * \param dsrP  the clean packet with payload
-   * \param ipv4Header the IPv4 header of packet received
-   * \param protocol the protocol number of the up layer
-   * \param isPromisc if the packet must be dropped
-   * \return the processed size
-   */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource);
   /**
    * \brief Do Send error message
@@ -570,40 +479,18 @@
    * \brief Dsr ack request option number.
    */
   static const uint8_t OPT_NUMBER = 160;
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
   /**
    * \brief Get the instance type ID.
    * \return instance type ID
    */
   virtual TypeId GetInstanceTypeId () const;
-  /**
-   * \brief Constructor.
-   */
+
   DsrOptionAckReq ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~DsrOptionAckReq ();
-  /**
-   * \brief Get the option number.
-   * \return option number
-   */
+
   virtual uint8_t GetOptionNumber () const;
-  /**
-   * \brief Process method
-   *
-   * Called from DsrRouting::Receive.
-   * \param packet the packet
-   * \param dsrP  the clean packet with payload
-   * \param ipv4Header the IPv4 header of packet received
-   * \param protocol the protocol number of the up layer
-   * \param isPromisc if the packet must be dropped
-   * \return the processed size
-   */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource);
 
 private:
@@ -628,40 +515,18 @@
    * \brief The Dsr Ack option number.
    */
   static const uint8_t OPT_NUMBER = 32;
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
   /**
    * \brief Get the instance type ID.
    * \return instance type ID
    */
   virtual TypeId GetInstanceTypeId () const;
-  /**
-   * \brief Constructor.
-   */
+
   DsrOptionAck ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~DsrOptionAck ();
-  /**
-   * \brief Get the option number.
-   * \return option number
-   */
+
   virtual uint8_t GetOptionNumber () const;
-  /**
-   * \brief Process method
-   *
-   * Called from DsrRouting::Receive.
-   * \param packet the packet
-   * \param dsrP  the clean packet with payload
-   * \param ipv4Header the IPv4 header of packet received
-   * \param protocol the protocol number of the up layer
-   * \param isPromisc if the packet must be dropped
-   * \return the processed size
-   */
   virtual uint8_t Process (Ptr<Packet> packet, Ptr<Packet> dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource);
 
 private:
diff -Naur ns-3.18.1/src/dsr/model/dsr-passive-buff.cc ns-3.19/src/dsr/model/dsr-passive-buff.cc
--- ns-3.18.1/src/dsr/model/dsr-passive-buff.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-passive-buff.cc	2013-12-20 09:44:50.000000000 -0800
@@ -41,7 +41,8 @@
 namespace ns3 {
 namespace dsr {
 
-NS_OBJECT_ENSURE_REGISTERED (PassiveBuffer);
+NS_OBJECT_ENSURE_REGISTERED (PassiveBuffer)
+  ;
 
 TypeId PassiveBuffer::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/dsr/model/dsr-passive-buff.h ns-3.19/src/dsr/model/dsr-passive-buff.h
--- ns-3.18.1/src/dsr/model/dsr-passive-buff.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-passive-buff.h	2013-12-20 09:44:50.000000000 -0800
@@ -45,7 +45,19 @@
 class PassiveBuffEntry
 {
 public:
-  // / c-tor
+  /**
+   * Construct a PassiveBuffEntry with the given parameters
+   *
+   * \param pa packet
+   * \param d IPv4 address of the destination
+   * \param s IPv4 address of the source
+   * \param n IPv4 address of the next hop node
+   * \param i ID
+   * \param f fragment offset
+   * \param seg number of segments left
+   * \param exp expiration time
+   * \param p protocol number
+   */
   PassiveBuffEntry (Ptr<const Packet> pa = 0, Ipv4Address d = Ipv4Address (), Ipv4Address s = Ipv4Address (),
                   Ipv4Address n = Ipv4Address (), uint16_t i = 0, uint16_t f = 0, uint8_t seg = 0, Time exp = Simulator::Now (),
                   uint8_t p = 0)
@@ -68,7 +80,7 @@
   {
     return ((m_packet == o.m_packet) && (m_source == o.m_source) && (m_nextHop == o.m_nextHop) && (m_dst == o.m_dst) && (m_expire == o.m_expire));
   }
-  // /\name Fields
+  ///\name Fields
   // \{
   Ptr<const Packet> GetPacket () const
   {
@@ -144,21 +156,21 @@
   }
   // \}
 private:
-  // / Data packet
+  /// Data packet
   Ptr<const Packet> m_packet;
-  // / Destination address
+  /// Destination address
   Ipv4Address m_dst;
-  // / Source address
+  /// Source address
   Ipv4Address m_source;
-  // / Nexthop address
+  /// Nexthop address
   Ipv4Address m_nextHop;
-  // /
+  ///
   uint16_t m_identification;
   uint16_t m_fragmentOffset;
   uint8_t m_segsLeft;
-  // / Expire time for queue entry
+  /// Expire time for queue entry
   Time m_expire;
-  // / The protocol number
+  /// The protocol number
   uint8_t m_protocol;
 };
 
@@ -170,31 +182,23 @@
 class PassiveBuffer  : public Object
 {
 public:
-  // / c-tor
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
-  /**
-   * \brief Constructor.
-   */
+
   PassiveBuffer ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~PassiveBuffer ();
-  // / Push entry in queue, if there is no entry with the same packet and destination address in queue.
+
+  /// Push entry in queue, if there is no entry with the same packet and destination address in queue.
   bool Enqueue (PassiveBuffEntry & entry);
-  // / Return first found (the earliest) entry for given destination
+  /// Return first found (the earliest) entry for given destination
   bool Dequeue (Ipv4Address dst, PassiveBuffEntry & entry);
-  // / Finds whether a packet with destination dst exists in the queue
+  /// Finds whether a packet with destination dst exists in the queue
   bool Find (Ipv4Address dst);
-  // / Check if all the entries in passive buffer entry is all equal or not
+  /// Check if all the entries in passive buffer entry is all equal or not
   bool AllEqual (PassiveBuffEntry & entry);
-  // / Number of entries
+  /// Number of entries
   uint32_t GetSize ();
-  // /\name Fields
+  ///\name Fields
   // \{
   uint32_t GetMaxQueueLen () const
   {
@@ -215,19 +219,19 @@
   // \}
 
 private:
-  // / The send buffer to cache unsent packet
+  /// The send buffer to cache unsent packet
   std::vector<PassiveBuffEntry> m_passiveBuffer;
-  // / Remove all expired entries
+  /// Remove all expired entries
   void Purge ();
-  // / Notify that packet is dropped from queue by timeout
+  /// Notify that packet is dropped from queue by timeout
   void Drop (PassiveBuffEntry en, std::string reason);
-  // / Notify that packet is dropped from queue by timeout
+  /// Notify that packet is dropped from queue by timeout
   void DropLink (PassiveBuffEntry en, std::string reason);
-  // / The maximum number of packets that we allow a routing protocol to buffer.
+  /// The maximum number of packets that we allow a routing protocol to buffer.
   uint32_t m_maxLen;
-  // / The maximum period of time that a routing protocol is allowed to buffer a packet for, seconds.
+  /// The maximum period of time that a routing protocol is allowed to buffer a packet for, seconds.
   Time m_passiveBufferTimeout;
-  // / Check if the send buffer entry is the same or not
+  /// Check if the send buffer entry is the same or not
   static bool LinkEqual (PassiveBuffEntry en, const std::vector<Ipv4Address> link)
   {
     return ((en.GetSource () == link[0]) && (en.GetNextHop () == link[1]));
diff -Naur ns-3.18.1/src/dsr/model/dsr-rcache.cc ns-3.19/src/dsr/model/dsr-rcache.cc
--- ns-3.18.1/src/dsr/model/dsr-rcache.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-rcache.cc	2013-12-20 09:44:50.000000000 -0800
@@ -131,7 +131,8 @@
      << "\t";
 }
 
-NS_OBJECT_ENSURE_REGISTERED (RouteCache);
+NS_OBJECT_ENSURE_REGISTERED (RouteCache)
+  ;
 
 TypeId RouteCache::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/dsr/model/dsr-rcache.h ns-3.19/src/dsr/model/dsr-rcache.h
--- ns-3.18.1/src/dsr/model/dsr-rcache.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-rcache.h	2013-12-20 09:44:50.000000000 -0800
@@ -155,14 +155,8 @@
 class NodeStab
 {
 public:
-  /**
-   * \brief Constructor
-   */
-//  NodeStab ();
+
   NodeStab (Time nodeStab = Simulator::Now ());
-  /**
-   * \brief Destructor
-   */
   virtual ~NodeStab ();
 
   void SetNodeStability (Time nodeStab)
@@ -182,18 +176,13 @@
 public:
   typedef std::vector<Ipv4Address> IP_VECTOR;                ///< Define the vector to hold Ip address
   typedef std::vector<Ipv4Address>::iterator Iterator;       ///< Define the iterator
-  // / c-tor
-  /**
-   * \brief Constructor
-   */
+
   RouteCacheEntry (IP_VECTOR const  & ip = IP_VECTOR (), Ipv4Address dst = Ipv4Address (), Time exp = Simulator::Now ());
-  /**
-   * \brief Destructor
-   */
   virtual ~RouteCacheEntry ();
-  // / Mark entry as "down" (i.e. disable it)
+
+  /// Mark entry as "down" (i.e. disable it)
   void Invalidate (Time badLinkLifetime);
-  // /\name Fields
+  ///\name Fields
   // \{
   void SetUnidirectional (bool u)
   {
@@ -278,23 +267,14 @@
 private:
 
   Timer m_ackTimer;                                                     ///< RREP_ACK timer
-
   Ipv4Address m_dst;                                                    ///< The destination Ip address
-
   IP_VECTOR m_path;                                                     ///< brief The IP address constructed route
-
   Time m_expire;                                                        ///< Expire time for queue entry
-
   Ipv4InterfaceAddress m_iface;                                         ///< Output interface address
-
   uint8_t m_reqCount;                                                   ///< Number of route requests
-
   bool m_blackListState;                                                ///< Indicate if this entry is in "blacklist"
-
   Time m_blackListTimeout;                                              ///< Time for which the node is put into the blacklist
-
   Ptr<Ipv4Route> m_ipv4Route;                                           ///< The Ipv4 route
-
   Ptr<Ipv4> m_ipv4;                                                     ///< The Ipv4 layer 3
 };
 /**
@@ -305,20 +285,12 @@
 class RouteCache : public Object
 {
 public:
-  // / Default c-tor
-/**
- * \ingroup dsr
- * \brief The Route Cache used by DSR
- */
+
   static TypeId GetTypeId ();
-  /**
-   * \brief Constructor.
-   */
+
   RouteCache ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~RouteCache ();
+
   /**
    * \brief Remove the aged route cache entries when the route cache is full
    */
@@ -327,7 +299,7 @@
    * \brief Define the vector of route entries.
    */
   typedef std::list<RouteCacheEntry::IP_VECTOR> routeVector;
-  // /\name Fields
+  ///\name Fields
   // \{
   bool GetSubRoute () const
   {
@@ -413,7 +385,6 @@
   /**
    * \brief Update route cache entry if it has been recently used and successfully delivered the data packet
    * \param dst destination address of the route
-   * \param vec the route vector
    * \return true in success
    */
   bool UpdateRouteEntry (Ipv4Address dst);
@@ -425,8 +396,8 @@
   bool AddRoute (RouteCacheEntry & rt);
   /**
    * \brief Lookup route cache entry with destination address dst
-   * \param dst destination address
-   * \param rt entry with destination address dst, if exists
+   * \param id destination address
+   * \param rt entry with destination address id, if exists
    * \return true on success
    */
   bool LookupRoute (Ipv4Address id, RouteCacheEntry & rt);
@@ -460,14 +431,14 @@
    * \param node This node's ip address
    */
   void DeleteAllRoutesIncludeLink (Ipv4Address errorSrc, Ipv4Address unreachNode, Ipv4Address node);
-  // / Delete all entries from routing table
+  /// Delete all entries from routing table
   void Clear ()
   {
     m_routeEntryVector.erase (m_routeEntryVector.begin (), m_routeEntryVector.end ());
   }
-  // / Delete all outdated entries and invalidate valid entry if Lifetime is expired
+  /// Delete all outdated entries and invalidate valid entry if Lifetime is expired
   void Purge ();
-  // / Print route cache
+  /// Print route cache
   void Print (std::ostream &os);
 
   //------------------------------------------------------------------------------------------
@@ -484,7 +455,7 @@
   /**
    * The following code handles link-layer acks
    */
-  // / Neighbor description
+  /// Neighbor description
   struct Neighbor
   {
     Ipv4Address m_neighborAddress;
@@ -549,7 +520,7 @@
   {
     return m_txErrorCallback;
   }
-  // /\name Handle link failure callback
+  ///\name Handle link failure callback
   // \{
   void SetCallback (Callback<void, Ipv4Address, uint8_t > cb)
   {
@@ -625,16 +596,16 @@
 
 public:
   /**
-   * \brief dijsktra algorithm to get the best route from m_netGraph and update the m_bestRoutesTable_link
-   * \when current graph information has changed
-   * \param The type of the cache
+   * \brief Dijsktra algorithm to get the best route from m_netGraph and update the m_bestRoutesTable_link
+   * when current graph information has changed
+   * \param type The type of the cache
    */
   void SetCacheType (std::string type);
   bool IsLinkCache ();
   bool AddRoute_Link (RouteCacheEntry::IP_VECTOR nodelist, Ipv4Address node);
   /**
    *  \brief USE MAXWEIGHT TO REPRESENT MAX; USE BROADCAST ADDRESS TO REPRESENT NULL PRECEEDING ADDRESS
-   *  \param The source address the routes based on
+   *  \param source The source address the routes based on
    */
   void RebuildBestRouteTable (Ipv4Address source);
   void PurgeLinkNode ();
diff -Naur ns-3.18.1/src/dsr/model/dsr-routing.cc ns-3.19/src/dsr/model/dsr-routing.cc
--- ns-3.18.1/src/dsr/model/dsr-routing.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-routing.cc	2013-12-20 09:44:50.000000000 -0800
@@ -79,7 +79,8 @@
 namespace ns3 {
 namespace dsr {
 
-NS_OBJECT_ENSURE_REGISTERED (DsrRouting);
+NS_OBJECT_ENSURE_REGISTERED (DsrRouting)
+  ;
 
 /* see http://www.iana.org/assignments/protocol-numbers */
 const uint8_t DsrRouting::PROT_NUMBER = 48;
diff -Naur ns-3.18.1/src/dsr/model/dsr-routing.h ns-3.19/src/dsr/model/dsr-routing.h
--- ns-3.18.1/src/dsr/model/dsr-routing.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-routing.h	2013-12-20 09:44:50.000000000 -0800
@@ -124,7 +124,7 @@
   void SetNode (Ptr<Node> node);
   /**
    * \brief Set the route cache.
-   * \param the route cache to set
+   * \param r the route cache to set
    */
   void SetRouteCache (Ptr<dsr::RouteCache> r);
   /**
@@ -134,7 +134,7 @@
   Ptr<dsr::RouteCache> GetRouteCache () const;
   /**
    * \brief Set the node.
-   * \param the request table to set
+   * \param r the request table to set
    */
   void SetRequestTable (Ptr<dsr::RreqTable> r);
   /**
@@ -144,7 +144,7 @@
   Ptr<dsr::RreqTable> GetRequestTable () const;
   /**
    * \brief Set the node.
-   * \param the passive buffer to set
+   * \param r the passive buffer to set
    */
   void SetPassiveBuffer (Ptr<dsr::PassiveBuffer> r);
   /**
@@ -153,7 +153,7 @@
     */
   Ptr<dsr::PassiveBuffer> GetPassiveBuffer () const;
 
-  ///\functions used to direct to route cache
+  /// functions used to direct to route cache
   //\{
   bool IsLinkCache ();
   void UseExtends (RouteCacheEntry::IP_VECTOR rt);
@@ -172,31 +172,37 @@
   void ConnectCallbacks ();
   /**
     * \brief Get the netdevice from the context.
+    * \param context context
     * \return the netdevice we are looking for
     */
   Ptr<NetDevice> GetNetDeviceFromContext (std::string context);
   /**
     * \brief Get the elements from the tracing context.
+    * \param context context
     * \return the elements we are looking for
     */
   std::vector<std::string> GetElementsFromContext (std::string context);
   /**
     * \brief Get the node id from ip address.
+    * \param address IPv4 address
     * \return the node id
     */
   uint16_t GetIDfromIP (Ipv4Address address);
   /**
     * \brief Get the ip address from id.
+    * \param id unique ID
     * \return the ip address for the id
     */
   Ipv4Address GetIPfromID (uint16_t id);
   /**
     * \brief Get the Ip address from mac address.
+    * \param address Mac48Address
     * \return the ip address
     */
   Ipv4Address GetIPfromMAC (Mac48Address address);
   /**
     * \brief Get the node with give ip address.
+    * \param ipv4Address IPv4 address
     * \return the node associated with the ip address
     */
   Ptr<Node> GetNodeWithAddress (Ipv4Address ipv4Address);
@@ -206,6 +212,8 @@
   void PrintVector (std::vector<Ipv4Address>& vec);
   /**
     * \brief Get the next hop of the route.
+    * \param ipv4Address
+    * \param vec Route
     * \return the next hop address of the route
     */
   Ipv4Address SearchNextHop (Ipv4Address ipv4Address, std::vector<Ipv4Address>& vec);
@@ -230,13 +238,16 @@
                        Ipv4Address destination,
                        uint8_t protocol);
   /**
-   * \brief Set the route to use for data packets
+   * \brief Set the route to use for data packets,
+   *        used by the option headers when sending data/control packets
+   * \param nextHop next hop IPv4 address
+   * \param srcAddress IPv4 address of the source
    * \return the route
-   * \used by the option headers when sending data/control packets
    */
   Ptr<Ipv4Route> SetRoute (Ipv4Address nextHop, Ipv4Address srcAddress);
   /**
    * \brief Set the priority of the packet in network queue
+   * \param messageType Message type
    * \return the priority value
    */
   uint32_t GetPriority (DsrMessageType messageType);
@@ -378,28 +389,28 @@
                            uint8_t protocol);
   /**
    * \brief Send the error request packet
-   * \param the route error header
-   * \param the protocol number
+   * \param rerr the route error header
+   * \param protocol the protocol number
    */
   void SendErrorRequest (DsrOptionRerrUnreachHeader &rerr, uint8_t protocol);
   /**
    * \brief Forward the route request if the node is not the destination
-   * \param the original packet
+   * \param packet the original packet
    * \param source address
    */
   void SendRequest (Ptr<Packet> packet,
                     Ipv4Address source);
   /**
    * \brief Schedule the intermediate route request
-   * \param the original packet
-   * \param source The source address
-   * \param destination The destination address
+   * \param packet the original packet
    */
   void ScheduleInterRequest (Ptr<Packet> packet);
   /**
    * \brief Send the gratuitous reply
    * \param replyTo The destination address to send the reply to
    * \param replyFrom The source address sending the reply
+   * \param nodeList Route
+   * \param protocol the protocol number
    */
   void SendGratuitousReply (Ipv4Address replyTo,
                             Ipv4Address replyFrom,
@@ -407,6 +418,11 @@
                             uint8_t protocol);
   /**
    * Send the route reply back to the request originator with the cumulated route
+   *
+   * \param packet the original packet
+   * \param source IPv4 address of the source (i.e. request originator)
+   * \param nextHop IPv4 address of the next hop
+   * \param route Route
    */
   void SendReply (Ptr<Packet> packet,
                   Ipv4Address source,
@@ -415,6 +431,11 @@
   /**
    * this is a generating the initial route reply from the destination address, a random delay time
    * [0, m_broadcastJitter] is used before unicasting back the route reply packet
+   *
+   * \param packet the original packet
+   * \param source IPv4 address of the source (i.e. request originator)
+   * \param nextHop IPv4 address of the next hop
+   * \param route Route
    */
   void ScheduleInitialReply (Ptr<Packet> packet,
                              Ipv4Address source,
@@ -422,6 +443,11 @@
                              Ptr<Ipv4Route> route);
   /**
    * Schedule the cached reply to a random start time to avoid possible route reply storm
+   *
+   * \param packet the original packet
+   * \param source IPv4 address of the source (i.e. request originator)
+   * \param destination IPv4 address of the destination
+   * \param route Route
    */
   void ScheduleCachedReply (Ptr<Packet> packet,
                             Ipv4Address source,
@@ -430,6 +456,13 @@
                             double hops);
   /**
    * Send network layer acknowledgment back to the earlier hop to notify the receipt of data packet
+   *
+   * \param ackId ACK ID
+   * \param destination IPv4 address of the immediate ACK receiver
+   * \param realSrc IPv4 address of the real source
+   * \param realDst IPv4 address of the real destination
+   * \param protocol the protocol number
+   * \param route Route
    */
   void SendAck   (uint16_t ackId,
                   Ipv4Address destination,
@@ -441,6 +474,7 @@
    * \param p packet to forward up
    * \param header IPv4 Header information
    * \param incomingInterface the Ipv4Interface on which the packet arrived
+   * \return receive status
    *
    * Called from lower-level layers to send the packet up
    * in the stack.
@@ -453,6 +487,7 @@
    * \param p packet to forward up
    * \param header IPv6 Header information
    * \param incomingInterface the Ipv6Interface on which the packet arrived
+   * \return receive status
    *
    * Called from lower-level layers to send the packet up
    * in the stack.  Not implemented (IPv6).
@@ -470,9 +505,10 @@
    * Called from Ipv4L3Protocol::Receive.
    *
    * \param packet the packet
-   * \param offset the offset of the extension to process
+   * \param ipv4Header IPv4 header of the packet
    * \param dst destination address of the packet received (i.e. us)
    * \param nextHeader the next header
+   * \param protocol the protocol number
    * \param isDropped if the packet must be dropped
    * \return the size processed
    */
@@ -496,10 +532,21 @@
   void CancelRreqTimer (Ipv4Address dst, bool isRemove);
   /**
    * \brief Schedule the route request retry.
-   * \param dst The dst address of the route request
+   * \param packet the original packet
+   * \param address List of IPv4 addresses
+   * \param nonProp flag if RREQ is non-propagating
+   * \param requestId Unique request ID
+   * \param protocol the protocol number
    */
   void ScheduleRreqRetry (Ptr<Packet> packet, std::vector<Ipv4Address> address, bool nonProp, uint32_t requestId, uint8_t protocol);
-  // / Handle route discovery timer
+  /**
+   * Handle route discovery timer
+   *
+   * \param packet the original packet
+   * \param address List of IPv4 addresses
+   * \param requestId Unique request ID
+   * \param protocol the protocol number
+   */
   void RouteRequestTimerExpire (Ptr<Packet> packet, std::vector<Ipv4Address> address, uint32_t requestId, uint8_t protocol);
 
  /**
@@ -548,6 +595,7 @@
    * \param from The from address we received the packet
    * \param to The address this packet is destined for
    * \param packetType The dsr packet type, 0 is for control packet, 1 for data packet
+   * \return true if the packet was processed, false otherwise
    */
   bool PromiscReceive (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol, const Address &from,
                        const Address &to, NetDevice::PacketType packetType);
diff -Naur ns-3.18.1/src/dsr/model/dsr-rreq-table.cc ns-3.19/src/dsr/model/dsr-rreq-table.cc
--- ns-3.18.1/src/dsr/model/dsr-rreq-table.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-rreq-table.cc	2013-12-20 09:44:50.000000000 -0800
@@ -39,7 +39,8 @@
 namespace ns3 {
 namespace dsr {
 
-NS_OBJECT_ENSURE_REGISTERED (RreqTable);
+NS_OBJECT_ENSURE_REGISTERED (RreqTable)
+  ;
 
 TypeId RreqTable::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/dsr/model/dsr-rreq-table.h ns-3.19/src/dsr/model/dsr-rreq-table.h
--- ns-3.18.1/src/dsr/model/dsr-rreq-table.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-rreq-table.h	2013-12-20 09:44:50.000000000 -0800
@@ -43,18 +43,27 @@
 namespace ns3 {
 namespace dsr {
 
+/**
+ * State of link
+ */
 enum LinkStates
 {
-  PROBABLE = 0,            // !< PROBABLE
-  QUESTIONABLE = 1,        // !< QUESTIONABLE
+  PROBABLE = 0,            //!< PROBABLE
+  QUESTIONABLE = 1,        //!< QUESTIONABLE
 };
-// / BlackList description
+/// BlackList description
 struct BlackList
 {
-  Ipv4Address m_neighborAddress;
-  Time m_expireTime;
-  LinkStates m_linkStates;
+  Ipv4Address m_neighborAddress; //!< IPv4 address of the black-listed neighbor
+  Time m_expireTime;             //!< Expire time in the black list
+  LinkStates m_linkStates;       //!< State of the link
 
+  /**
+   * Construct a BlackList with the given parameters
+   *
+   * \param ip IPv4 address of the neighbor
+   * \param t expire time for the black list entry
+   */
   BlackList (Ipv4Address ip, Time t)
     : m_neighborAddress (ip),
       m_expireTime (t),
@@ -67,8 +76,8 @@
  */
 struct RreqTableEntry
 {
-  uint32_t m_reqNo;
-  Time m_expire;
+  uint32_t m_reqNo; //!< Route request number
+  Time m_expire;    //!< Expire time
 };
 /**
  * The request entry for intermediate nodes to check if they have received this request or not
@@ -77,14 +86,20 @@
 class ReceivedRreqEntry
 {
 public:
-  // / c-tor
+  /**
+   * Construct a ReceivedRreqEntry with the given parameters
+   *
+   * \param d IPv4 address of the destination
+   * \param i identification
+   */
   ReceivedRreqEntry (Ipv4Address d = Ipv4Address (), uint16_t i = 0)
     : m_destination (d),
       m_identification (i)
   {
   }
   /**
-   * \brief Compare send buffer entries
+   * \brief Compare send buffer entries (destination address and identification)
+   * \param o another ReceivedRreqEntry
    * \return true if equal
    */
   bool operator== (ReceivedRreqEntry const & o) const
@@ -92,46 +107,89 @@
     return ((m_destination == o.m_destination) && (m_identification == o.m_identification)
            );
   }
-  // /\name Fields
-  // \{
+
+  /**
+   * Return IPv4 address of the destination
+   *
+   * \return IPv4 address of the destination
+   */
   Ipv4Address GetDestination () const
   {
     return m_destination;
   }
+  /**
+   * Set IPv4 address of the destination
+   *
+   * \param d IPv4 address of the destination
+   */
   void SetDestination (Ipv4Address d)
   {
     m_destination = d;
   }
+  /**
+   * Return IPv4 address of the source
+   *
+   * \return IPv4 address of the source
+   */
   Ipv4Address GetSource () const
   {
     return m_source;
   }
+  /**
+   * Set IPv4 address of the source
+   *
+   * \param s IPv4 address of the source
+   */
   void SetSource (Ipv4Address s)
   {
     m_source = s;
   }
+  /**
+   * Return identification
+   *
+   * \return identification
+   */
   uint16_t GetIdentification () const
   {
     return m_identification;
   }
+  /**
+   * Set identification
+   *
+   * \param i identification
+   */
   void SetIdentification (uint16_t i)
   {
     m_identification = i;
   }
+  /**
+   * Set expire time for the RREQ entry.
+   * Note that the parameter is duration but
+   * the stored value is the absolute time.
+   *
+   * \param exp duration before expire
+   */
   void SetExpireTime (Time exp)
   {
     m_expire = exp + Simulator::Now ();
   }
+  /**
+   * Return the remaining time before the RREQ entry expires.
+   * Note that we return the remaining time but the stored
+   * value is the absolute time.
+   *
+   * \return the remaining time before the RREQ entry expires
+   */
   Time GetExpireTime () const
   {
     return m_expire - Simulator::Now ();
   }
   // \}
 private:
-    Ipv4Address m_destination;
-    Ipv4Address m_source;
-    uint16_t m_identification;
-    Time m_expire;
+  Ipv4Address m_destination; //!< IPv4 address of the destinaton
+  Ipv4Address m_source;      //!< IPv4 address of the source
+  uint16_t m_identification; //!< Route request identification
+  Time m_expire;             //!< Route request expire time
 };
 
 /**
@@ -141,81 +199,122 @@
 class RreqTable  : public Object
 {
 public:
-  // / c-tor
-  /**
-   * \brief Get the type identificator.
-   * \return type identificator
-   */
+
   static TypeId GetTypeId ();
-  /**
-   * \brief Constructor.
-   */
+
   RreqTable ();
-  /**
-   * \brief Destructor.
-   */
   virtual ~RreqTable ();
 
-  // /\name Fields
-  // \{
+  /**
+   * Set the initial discovert hop limit
+   *
+   * \param hl the initial discovert hop limit
+   */
   void SetInitHopLimit (uint32_t hl)
   {
     m_initHopLimit = hl;
   }
+  /**
+   * Return the initial discovert hop limit
+   *
+   * \return the initial discovert hop limit
+   */
   uint32_t GetInitHopLimit () const
   {
     return m_initHopLimit;
   }
+  /**
+   * Set the maximum number of request entries in
+   * the request table.
+   *
+   * \param rt the maximum number of request entries
+   */
   void SetRreqTableSize (uint32_t rt)
   {
     m_requestTableSize = rt;
   }
+  /**
+   * Return the maximum number of request entries in
+   * the request table.
+   *
+   * \return the maximum number of request entries
+   */
   uint32_t GetRreqTableSize () const
   {
     return m_requestTableSize;
   }
+  /**
+   * Set the maximum number of request source Ids in
+   * the request table
+   *
+   * \param id the maximum number of request source Ids
+   */
   void SetRreqIdSize (uint32_t id)
   {
     m_requestIdSize = id;
   }
+  /**
+   * Return the maximum number of request source Ids in
+   * the request table
+   *
+   * \return the maximum number of request source Ids
+   */
   uint32_t GetRreqIdSize () const
   {
     return m_requestIdSize;
   }
+  /**
+   * Set the maximum number of request Ids in
+   * the request table for a single destination.
+   *
+   * \param uid the maximum number of request Ids
+   */
   void SetUniqueRreqIdSize (uint32_t uid)
   {
     m_maxRreqId = uid;
   }
+  /**
+   * Return the maximum number of request Ids in
+   * the request table for a single destination.
+   *
+   * \return the maximum number of request Ids
+   */
   uint32_t GetUniqueRreqIdSize () const
   {
     return m_maxRreqId;
   }
 
-  // \}
-  // / Remove the least used entry
+  /// Remove the least used entry
   void RemoveLeastExpire (std::map<Ipv4Address, RreqTableEntry > & rreqDstMap);
-  // / Find the entry in the route request queue to see if already exists
+  /// Find the entry in the route request queue to see if already exists
   void FindAndUpdate (Ipv4Address dst);
-  // / Remove route request entry for dst
+  /// Remove route request entry for dst
   void RemoveRreqEntry (Ipv4Address dst);
-  // / Get the request count number for one destination address
+  /// Get the request count number for one destination address
   uint32_t GetRreqCnt (Ipv4Address dst);
-  //----------------------------------------------------------------------------------------------------------
+
   /**
-   * The following code generates new request id for each destination
+   * The following code generates new request id for each destination.
+   * Check for duplicate ids and save new entries if the id is not present in the table.
+   *
+   * \param dst IPv4 address of the destination
+   * \return id
    */
-  // / Check for duplicate ids and save new entries if the id is not present in the table
   uint32_t CheckUniqueRreqId (Ipv4Address dst);
-  // / Get the request id size
+  /**
+   * Get the request id size
+   *
+   * \return the request id size
+   */
   uint32_t GetRreqSize ();
-  // ---------------------------------------------------------------------------------------------------------
+
   /**
    * set the unidirectional entry as QUESTIONABLE state
    */
   void Invalidate ();
   /**
    * \brief Verify if entry is unidirectional or not(e.g. add this neighbor to "blacklist" for blacklistTimeout period)
-   * \param neighbor - neighbor address link to which assumed to be unidirectional
+   * \param neighbor neighbor address link to which assumed to be unidirectional
    * \return true on success
    */
   BlackList* FindUnidirectional (Ipv4Address neighbor);
@@ -226,50 +325,59 @@
    * \return true on success
    */
   bool MarkLinkAsUnidirectional (Ipv4Address neighbor, Time blacklistTimeout);
-  ///< Remove all expired black list entries
+  /**
+   * Remove all expired black list entries
+   */
   void PurgeNeighbor ();
-  // ----------------------------------------------------------------------------------------------------------
+
   /**
    * Find the source request entry in the route request queue, return false if not found
    * \param src the source address we just received the source request
    * \param dst the destination address the request is targeted at
    * \param id the identification number for this request
+   * \return true if found, false otherwise
    */
   bool FindSourceEntry (Ipv4Address src, Ipv4Address dst, uint16_t id);
 
 private:
-  // / The max request period among requests
+  /// The max request period among requests
   Time  MaxRequestPeriod;
-  // / The original request period
+  /// The original request period
   Time  RequestPeriod;
-  // / The non-propagaton request timeout
+  /// The non-propagaton request timeout
   Time  NonpropRequestTimeout;
-  // / The source route entry expire time
+  /// The source route entry expire time
   Time m_rreqEntryExpire;
-  // / The initial hop limit
+  /// The initial hop limit
   uint32_t m_initHopLimit;
-  // / The request table size
+  /// The request table size
   uint32_t m_requestTableSize;
-  // / The request source id size
+  /// The request source id size
   uint32_t m_requestIdSize;
-  // / The unique request id for any destination
+  /// The unique request id for any destination
   uint32_t m_maxRreqId;
-  // / The state of the unidirectional link
+  /// The state of the unidirectional link
   LinkStates m_linkStates;
-  // / Map of entries
+  /// Map of entries
   std::list<ReceivedRreqEntry> m_sourceRequests;
-  // / The id cache to ensure all the ids are unique, it is used when sending out route request
+  /// The id cache to ensure all the ids are unique, it is used when sending out route request
   std::map<Ipv4Address, uint32_t> m_rreqIdCache;
-  // / The cache to save route request table entries indexed with destination address
+  /// The cache to save route request table entries indexed with destination address
   std::map<Ipv4Address, RreqTableEntry > m_rreqDstMap;
-  // / The cache to ensure all the route request from unique source
+  /// The cache to ensure all the route request from unique source
   std::map<Ipv4Address, std::list<ReceivedRreqEntry> > m_sourceRreqMap;
 
-  // / The Black list
+  /// The Black list
   std::vector<BlackList> m_blackList;
-  // / Check if the entry is expired or not
+  /// Check if the entry is expired or not
   struct IsExpired
   {
+    /**
+     * Check if the entry is expired
+     *
+     * \param b BlackList entry
+     * \return true if expired, false otherwise
+     */
     bool operator() (const struct BlackList & b) const
     {
       return (b.m_expireTime < Simulator::Now ());
diff -Naur ns-3.18.1/src/dsr/model/dsr-rsendbuff.h ns-3.19/src/dsr/model/dsr-rsendbuff.h
--- ns-3.18.1/src/dsr/model/dsr-rsendbuff.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/dsr/model/dsr-rsendbuff.h	2013-12-20 09:44:50.000000000 -0800
@@ -45,7 +45,14 @@
 class SendBuffEntry
 {
 public:
-  // / c-tor
+  /**
+   * Construct SendBuffEntry with the given parameters.
+   *
+   * \param pa packet
+   * \param d destination address
+   * \param exp expiration time
+   * \param p protocol number
+   */
   SendBuffEntry (Ptr<const Packet> pa = 0, Ipv4Address d = Ipv4Address (),
                  Time exp = Simulator::Now (), uint8_t p = 0)
     : m_packet (pa),
@@ -56,6 +63,7 @@
   }
   /**
    * Compare send buffer entries
+   * \param o another SendBuffEntry
    * \return true if equal
    */
   bool operator== (SendBuffEntry const & o) const
@@ -98,13 +106,13 @@
   }
   // \}
 private:
-  // / Data packet
+  /// Data packet
   Ptr<const Packet> m_packet;
-  // / Destination address
+  /// Destination address
   Ipv4Address m_dst;
-  // / Expire time for queue entry
+  /// Expire time for queue entry
   Time m_expire;
-  // / The protocol number
+  /// The protocol number
   uint8_t m_protocol;
 };
 
@@ -116,40 +124,93 @@
 class SendBuffer
 {
 public:
-  // / Default c-tor
+  /**
+   * Default constructor
+   */
   SendBuffer ()
   {
   }
-  // / Push entry in queue, if there is no entry with the same packet and destination address in queue.
+  /**
+   * Push entry in queue, if there is no entry with
+   * the same packet and destination address in queue.
+   *
+   * \param entry SendBuffEntry to put in the queue
+   * \return true if successfully enqueued,
+   *         false otherwise
+   */
   bool Enqueue (SendBuffEntry & entry);
-  // / Return first found (the earliest) entry for given destination
+  /**
+   * Return first found (the earliest) entry for
+   * the given destination.
+   *
+   * \param dst IPv4 address of the destination
+   * \param entry pointer to entry to return
+   * \return true if successfully dequeued,
+   *         false otherwise
+   */
   bool Dequeue (Ipv4Address dst, SendBuffEntry & entry);
-  // / Remove all packets with destination IP address dst
+  /**
+   * Remove all packets with destination IP address dst
+   *
+   * \param dst IPv4 address of the destination
+   */
   void DropPacketWithDst (Ipv4Address dst);
-  // / Finds whether a packet with destination dst exists in the queue
+  /**
+   * Check if a packet with destination dst exists in the queue
+   *
+   * \param dst IPv4 address of the destination
+   * \return true if found, false otherwise
+   */
   bool Find (Ipv4Address dst);
-  // / Number of entries
+  /**
+   * Number of entries
+   *
+   * \return the number of entries in the queue
+   */
   uint32_t GetSize ();
-  // /\name Fields
-  // \{
+  /**
+   * Return the maximum queue length
+   *
+   * \return the maximum queue length
+   */
   uint32_t GetMaxQueueLen () const
   {
     return m_maxLen;
   }
+  /**
+   * Set the maximum queue length
+   *
+   * \param len the maximum queue length
+   */
   void SetMaxQueueLen (uint32_t len)
   {
     m_maxLen = len;
   }
+  /**
+   * Return the entry lifetime in the queue
+   *
+   * \return the entry lifetime in the queue
+   */
   Time GetSendBufferTimeout () const
   {
     return m_sendBufferTimeout;
   }
+  /**
+   * Set the entry lifetime in the queue
+   *
+   * \param t the entry lifetime in the queue
+   */
   void SetSendBufferTimeout (Time t)
   {
     m_sendBufferTimeout = t;
   }
   // \}
 
+  /**
+   * Return a pointer to the internal queue
+   *
+   * \return a pointer to the internal queue
+   */
   std::vector<SendBuffEntry> & GetBuffer ()
   {
     return m_sendBuffer;
@@ -162,7 +223,15 @@
   void Drop (SendBuffEntry en, std::string reason);             ///< Notify that packet is dropped from queue by timeout
   uint32_t m_maxLen;                                            ///< The maximum number of packets that we allow a routing protocol to buffer.
   Time m_sendBufferTimeout;                                     ///< The maximum period of time that a routing protocol is allowed to buffer a packet for, seconds.
-  static bool IsEqual (SendBuffEntry en, const Ipv4Address dst) ///< Check if the send buffer entry is the same or not
+  /**
+   * Check if the send buffer entry is the same or not
+   *
+   * \param en SendBufferEntry
+   * \param dst IPv4 address to check
+   * \return true if the SendBufferEntry destination is the same,
+   *         false otherwise
+   */
+  static bool IsEqual (SendBuffEntry en, const Ipv4Address dst)
   {
     return (en.GetDestination () == dst);
   }
diff -Naur ns-3.18.1/src/emu/bindings/modulegen__gcc_ILP32.py ns-3.19/src/emu/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/emu/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/emu/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -169,7 +169,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1383,10 +1383,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3117,6 +3118,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3127,6 +3133,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3142,6 +3153,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3167,6 +3183,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/emu/bindings/modulegen__gcc_LP64.py ns-3.19/src/emu/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/emu/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/emu/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -169,7 +169,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1383,10 +1383,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3117,6 +3118,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3127,6 +3133,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3142,6 +3153,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3167,6 +3183,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/emu/doc/emu.rst ns-3.19/src/emu/doc/emu.rst
--- ns-3.18.1/src/emu/doc/emu.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/emu/doc/emu.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,11 +1,11 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Emu NetDevice
 -------------
 
 **Note:** The ``EmuNetDevice`` is being deprecated as of ns-3.17.  The
-``EmuFdNetDeviceHelper`` class replaces this functionality and API
-entirely.
+:doc:`fd-net-device` and ``EmuFdNetDeviceHelper`` class replaces this functionality and API entirely.
 
 Behavior
 ********
@@ -59,7 +59,7 @@
 Any mixing of |ns3| objects with real objects will typically require that
 |ns3| compute checksums in its protocols. By default, checksums are not
 computed by |ns3|. To enable checksums (e.g. UDP, TCP, IP), users must set
-the attribute ``ChecksumEnabled`` to true, such as follows:::
+the attribute ``ChecksumEnabled`` to true, such as follows::
 
     GlobalValue::Bind ("ChecksumEnabled", BooleanValue (true));
 
@@ -141,7 +141,7 @@
 
 The ``Emu`` net device and helper provide access to ASCII and pcap tracing
 functionality just as other |ns3| net devices to. You enable tracing similarly
-to these other net devices:::
+to these other net devices::
 
   EmuHelper::EnablePcapAll ("emu-udp-echo-client");
 
@@ -176,7 +176,7 @@
 
 Once the (promiscuous mode) socket is created, we bind it to an interface name 
 also provided as an attribute ("DeviceName") that is stored internally as 
-``m_deviceName``:::
+``m_deviceName``::
 
   struct ifreq ifr;
   bzero (&ifr, sizeof(ifr));
diff -Naur ns-3.18.1/src/emu/model/emu-net-device.cc ns-3.19/src/emu/model/emu-net-device.cc
--- ns-3.18.1/src/emu/model/emu-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/emu/model/emu-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -55,7 +55,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (EmuNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (EmuNetDevice)
+  ;
 
 #define EMU_MAGIC 65867
 
diff -Naur ns-3.18.1/src/emu/model/emu-net-device.h ns-3.19/src/emu/model/emu-net-device.h
--- ns-3.18.1/src/emu/model/emu-net-device.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/emu/model/emu-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,7 @@
 class Queue;
 
 /**
- * \defgroup emu EmuNetDevice
+ * \defgroup emu Emu Network Device
  * This section documents the API of the ns-3 emu module. For a generic functional description, please refer to the ns-3 manual.
  */
 
diff -Naur ns-3.18.1/src/energy/bindings/modulegen__gcc_ILP32.py ns-3.19/src/energy/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/energy/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -167,7 +167,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1401,10 +1401,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -2480,8 +2481,8 @@
     cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
     cls.add_constructor([])
-    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
-    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
@@ -2537,10 +2538,10 @@
     cls.add_method('SetShortGuardInterval', 
                    'void', 
                    [param('bool', 'guardinterval')])
-    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
-                   [param('bool', 'stbcsatuts')])
+                   [param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
     cls.add_method('SetTxPowerLevel', 
                    'void', 
@@ -2966,6 +2967,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2976,6 +2982,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2991,6 +3002,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3016,6 +3032,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -3789,15 +3810,15 @@
                    'void', 
                    [param('bool', 'greenfield')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
     cls.add_method('SetGuardInterval', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('bool', 'guardInterval')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
     cls.add_method('SetLdpc', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [param('bool', 'ldpc')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
diff -Naur ns-3.18.1/src/energy/bindings/modulegen__gcc_LP64.py ns-3.19/src/energy/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/energy/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -167,7 +167,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1401,10 +1401,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -2480,8 +2481,8 @@
     cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
     cls.add_constructor([])
-    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
-    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
@@ -2537,10 +2538,10 @@
     cls.add_method('SetShortGuardInterval', 
                    'void', 
                    [param('bool', 'guardinterval')])
-    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
-                   [param('bool', 'stbcsatuts')])
+                   [param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
     cls.add_method('SetTxPowerLevel', 
                    'void', 
@@ -2966,6 +2967,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2976,6 +2982,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2991,6 +3002,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3016,6 +3032,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -3789,15 +3810,15 @@
                    'void', 
                    [param('bool', 'greenfield')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
     cls.add_method('SetGuardInterval', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('bool', 'guardInterval')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
     cls.add_method('SetLdpc', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [param('bool', 'ldpc')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
diff -Naur ns-3.18.1/src/energy/model/basic-energy-source.cc ns-3.19/src/energy/model/basic-energy-source.cc
--- ns-3.18.1/src/energy/model/basic-energy-source.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/model/basic-energy-source.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BasicEnergySource);
+NS_OBJECT_ENSURE_REGISTERED (BasicEnergySource)
+  ;
 
 TypeId
 BasicEnergySource::GetTypeId (void)
diff -Naur ns-3.18.1/src/energy/model/device-energy-model.cc ns-3.19/src/energy/model/device-energy-model.cc
--- ns-3.18.1/src/energy/model/device-energy-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/model/device-energy-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (DeviceEnergyModel);
+NS_OBJECT_ENSURE_REGISTERED (DeviceEnergyModel)
+  ;
 
 TypeId
 DeviceEnergyModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/energy/model/energy-source.cc ns-3.19/src/energy/model/energy-source.cc
--- ns-3.18.1/src/energy/model/energy-source.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/model/energy-source.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (EnergySource);
+NS_OBJECT_ENSURE_REGISTERED (EnergySource)
+  ;
 
 TypeId
 EnergySource::GetTypeId (void)
diff -Naur ns-3.18.1/src/energy/model/li-ion-energy-source.cc ns-3.19/src/energy/model/li-ion-energy-source.cc
--- ns-3.18.1/src/energy/model/li-ion-energy-source.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/model/li-ion-energy-source.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LiIonEnergySource);
+NS_OBJECT_ENSURE_REGISTERED (LiIonEnergySource)
+  ;
 
 TypeId
 LiIonEnergySource::GetTypeId (void)
diff -Naur ns-3.18.1/src/energy/model/rv-battery-model.cc ns-3.19/src/energy/model/rv-battery-model.cc
--- ns-3.18.1/src/energy/model/rv-battery-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/model/rv-battery-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RvBatteryModel);
+NS_OBJECT_ENSURE_REGISTERED (RvBatteryModel)
+  ;
 
 TypeId
 RvBatteryModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/energy/model/simple-device-energy-model.cc ns-3.19/src/energy/model/simple-device-energy-model.cc
--- ns-3.18.1/src/energy/model/simple-device-energy-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/model/simple-device-energy-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SimpleDeviceEnergyModel);
+NS_OBJECT_ENSURE_REGISTERED (SimpleDeviceEnergyModel)
+  ;
 
 TypeId
 SimpleDeviceEnergyModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/energy/model/wifi-radio-energy-model.cc ns-3.19/src/energy/model/wifi-radio-energy-model.cc
--- ns-3.18.1/src/energy/model/wifi-radio-energy-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/model/wifi-radio-energy-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel);
+NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel)
+  ;
 
 TypeId
 WifiRadioEnergyModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/energy/test/li-ion-energy-source-test.cc ns-3.19/src/energy/test/li-ion-energy-source-test.cc
--- ns-3.18.1/src/energy/test/li-ion-energy-source-test.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/energy/test/li-ion-energy-source-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("LiIonEnergySourceTestSuite");
+NS_LOG_COMPONENT_DEFINE ("LiIonEnergySourceTestSuite")
+  ;
 
 class LiIonEnergyTestCase : public TestCase
 {
diff -Naur ns-3.18.1/src/fd-net-device/bindings/modulegen__gcc_ILP32.py ns-3.19/src/fd-net-device/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -173,7 +173,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1401,10 +1401,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3179,6 +3180,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3189,6 +3195,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3204,6 +3215,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3229,6 +3245,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/fd-net-device/bindings/modulegen__gcc_LP64.py ns-3.19/src/fd-net-device/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/fd-net-device/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/fd-net-device/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -173,7 +173,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1401,10 +1401,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3179,6 +3180,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3189,6 +3195,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3204,6 +3215,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3229,6 +3245,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/fd-net-device/doc/fd-net-device.rst ns-3.19/src/fd-net-device/doc/fd-net-device.rst
--- ns-3.18.1/src/fd-net-device/doc/fd-net-device.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/fd-net-device/doc/fd-net-device.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,6 +1,7 @@
 File Descriptor NetDevice
 -------------------------
-.. include:: replace.txt 
+.. include:: replace.txt
+.. highlight:: cpp
 
 .. heading hierarchy:
    ------------- Chapter
@@ -144,7 +145,7 @@
 provided helpers.  Support for these modes can be found in the output
 of the ``waf configure`` step, e.g.:
 
-::
+.. sourcecode:: text
 
    Threading Primitives          : enabled
    Real Time Simulator           : enabled
@@ -220,7 +221,7 @@
 The emulation helper permits to transparently integrate a simulated
 |ns3| node into a network composed of real nodes.
 
-::
+.. sourcecode:: text
 
  +----------------------+     +-----------------------+
  |         host 1       |     |         host 2        |
@@ -305,7 +306,7 @@
 provided by the TapBridge NetDevice found in ``src/tap-bridge``.
 The model in this helper is as follows:
 
-::
+.. sourcecode:: text
 
  +-------------------------------------+    
  |                host                 |
@@ -334,7 +335,7 @@
 
 The model in TapBridge (in another module) is as follows:
 
-::
+.. sourcecode:: text
 
     +--------+
     |  Linux |
@@ -404,7 +405,7 @@
 by the FdTapNetDeviceHelper, except that the underlying mechanisms
 to create the TAP device are different.
 
-::
+.. sourcecode:: text
 
  +-------------------------------------+    
  |         PlanetLab  host             |
diff -Naur ns-3.18.1/src/fd-net-device/model/fd-net-device.cc ns-3.19/src/fd-net-device/model/fd-net-device.cc
--- ns-3.18.1/src/fd-net-device/model/fd-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/fd-net-device/model/fd-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -74,7 +74,8 @@
   return FdReader::Data (buf, len);
 }
 
-NS_OBJECT_ENSURE_REGISTERED (FdNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (FdNetDevice)
+  ;
 
 TypeId
 FdNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/fd-net-device/model/fd-net-device.h ns-3.19/src/fd-net-device/model/fd-net-device.h
--- ns-3.18.1/src/fd-net-device/model/fd-net-device.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/fd-net-device/model/fd-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -63,7 +63,7 @@
 class Node;
 
 /**
- * \defgroup fd-net-device FdNetDevice
+ * \defgroup fd-net-device File Descriptor Network Device
  * This section documents the API of the ns-3 fd-net-device module.
  * For a generic functional description, please refer to the ns-3 manual.
  */
diff -Naur ns-3.18.1/src/flow-monitor/bindings/modulegen__gcc_ILP32.py ns-3.19/src/flow-monitor/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/flow-monitor/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -229,7 +229,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1619,10 +1619,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3983,6 +3984,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3993,6 +3999,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4008,6 +4019,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4033,6 +4049,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/flow-monitor/bindings/modulegen__gcc_LP64.py ns-3.19/src/flow-monitor/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/flow-monitor/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -229,7 +229,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1619,10 +1619,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3983,6 +3984,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3993,6 +3999,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4008,6 +4019,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4033,6 +4049,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/flow-monitor/examples/flowmon-parse-results.py ns-3.19/src/flow-monitor/examples/flowmon-parse-results.py
--- ns-3.18.1/src/flow-monitor/examples/flowmon-parse-results.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/examples/flowmon-parse-results.py	2013-12-20 09:44:50.000000000 -0800
@@ -8,7 +8,7 @@
 
 def parse_time_ns(tm):
     if tm.endswith('ns'):
-        return long(tm[:-2])
+        return long(tm[:-4])
     raise ValueError(tm)
 
 
@@ -39,8 +39,8 @@
         self.flowId = int(flow_el.get('flowId'))
         rxPackets = long(flow_el.get('rxPackets'))
         txPackets = long(flow_el.get('txPackets'))
-        tx_duration = float(long(flow_el.get('timeLastTxPacket')[:-2]) - long(flow_el.get('timeFirstTxPacket')[:-2]))*1e-9
-        rx_duration = float(long(flow_el.get('timeLastRxPacket')[:-2]) - long(flow_el.get('timeFirstRxPacket')[:-2]))*1e-9
+        tx_duration = float(long(flow_el.get('timeLastTxPacket')[:-4]) - long(flow_el.get('timeFirstTxPacket')[:-4]))*1e-9
+        rx_duration = float(long(flow_el.get('timeLastRxPacket')[:-4]) - long(flow_el.get('timeFirstRxPacket')[:-4]))*1e-9
         self.rx_duration = rx_duration
         self.probe_stats_unsorted = []
         if rxPackets:
@@ -48,7 +48,7 @@
         else:
             self.hopCount = -1000
         if rxPackets:
-            self.delayMean = float(flow_el.get('delaySum')[:-2]) / rxPackets * 1e-9
+            self.delayMean = float(flow_el.get('delaySum')[:-4]) / rxPackets * 1e-9
             self.packetSizeMean = float(flow_el.get('rxBytes')) / rxPackets
         else:
             self.delayMean = None
diff -Naur ns-3.18.1/src/flow-monitor/helper/flow-monitor-helper.h ns-3.19/src/flow-monitor/helper/flow-monitor-helper.h
--- ns-3.18.1/src/flow-monitor/helper/flow-monitor-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/helper/flow-monitor-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,38 +31,58 @@
 class AttributeValue;
 class Ipv4FlowClassifier;
 
-/// \brief Helper to enable IPv4 flow monitoring on a set of Nodes
+/**
+ * \ingroup flow-monitor
+ * \brief Helper to enable IPv4 flow monitoring on a set of Nodes
+ */
 class FlowMonitorHelper
 {
 public:
-  /// \brief Construct a FlowMonitorHelper class which makes it easier to 
-  /// configure and use the FlowMonitor
+
   FlowMonitorHelper ();
-  /// \brief Dispose of objects allocated by the helper
   ~FlowMonitorHelper ();
 
-  /// \brief Set an attribute for the to-be-created FlowMonitor object
+  /**
+   * \brief Set an attribute for the to-be-created FlowMonitor object
+   * \param n1 attribute name
+   * \param v1 attibute value
+   */
   void SetMonitorAttribute (std::string n1, const AttributeValue &v1);
 
-  /// \brief Enable flow monitoring on a set of nodes
-  /// \param nodes A NodeContainer holding the set of nodes to work with.
+  /**
+   * \brief Enable flow monitoring on a set of nodes
+   * \param nodes A NodeContainer holding the set of nodes to work with.
+   * \returns a pointer to the FlowMonitor object
+   */
   Ptr<FlowMonitor> Install (NodeContainer nodes);
-  /// \brief Enable flow monitoring on a single node
-  /// \param node A Ptr<Node> to the node on which to enable flow monitoring.
+  /**
+   * \brief Enable flow monitoring on a single node
+   * \param node A Ptr<Node> to the node on which to enable flow monitoring.
+   * \returns a pointer to the FlowMonitor object
+   */
   Ptr<FlowMonitor> Install (Ptr<Node> node);
-  /// \brief Enable flow monitoring on all nodes
+  /**
+   * \brief Enable flow monitoring on all nodes
+   * \returns a pointer to the FlowMonitor object
+   */
   Ptr<FlowMonitor> InstallAll ();
 
-  /// \brief Retrieve the FlowMonitor object created by the Install* methods
+  /**
+   * \brief Retrieve the FlowMonitor object created by the Install* methods
+   * \returns a pointer to the FlowMonitor object
+   */
   Ptr<FlowMonitor> GetMonitor ();
 
-  /// \brief Retrieve the FlowClassifier object created by the Install* methods
+  /**
+   * \brief Retrieve the FlowClassifier object created by the Install* methods
+   * \returns a pointer to the FlowClassifier object
+   */
   Ptr<FlowClassifier> GetClassifier ();
 
 private:
-  ObjectFactory m_monitorFactory;
-  Ptr<FlowMonitor> m_flowMonitor;
-  Ptr<FlowClassifier> m_flowClassifier;
+  ObjectFactory m_monitorFactory;       //!< Object factory
+  Ptr<FlowMonitor> m_flowMonitor;       //!< the FlowMonitor object
+  Ptr<FlowClassifier> m_flowClassifier; //!< the FlowClassifier object
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/flow-monitor/model/flow-classifier.h ns-3.19/src/flow-monitor/model/flow-classifier.h
--- ns-3.18.1/src/flow-monitor/model/flow-classifier.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/flow-classifier.h	2013-12-20 09:44:50.000000000 -0800
@@ -26,10 +26,21 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup flow-monitor
+ * \brief Abstract identifier of a packet flow
+ */
 typedef uint32_t FlowId;
+
+/**
+ * \ingroup flow-monitor
+ * \brief Abstract identifier of a packet within a flow
+ */
 typedef uint32_t FlowPacketId;
 
-/// provides a method to translate raw packet data into abstract
+
+/// \ingroup flow-monitor
+/// Provides a method to translate raw packet data into abstract
 /// ``flow identifier'' and ``packet identifier'' parameters.  These
 /// identifiers are unsigned 32-bit integers that uniquely identify a
 /// flow and a packet within that flow, respectively, for the whole
@@ -42,9 +53,12 @@
 class FlowClassifier : public SimpleRefCount<FlowClassifier>
 {
 private:
-  FlowId m_lastNewFlowId;
+  FlowId m_lastNewFlowId; //!< Last known Flow ID
 
+  /// Defined and not implemented to avoid misuse
   FlowClassifier (FlowClassifier const &);
+  /// Defined and not implemented to avoid misuse
+  /// \returns
   FlowClassifier& operator= (FlowClassifier const &);
 
 public:
@@ -52,9 +66,14 @@
   FlowClassifier ();
   virtual ~FlowClassifier ();
 
+  /// Serializes the results to an std::ostream in XML format
+  /// \param os the output stream
+  /// \param indent number of spaces to use as base indentation level
   virtual void SerializeToXmlStream (std::ostream &os, int indent) const = 0;
 
 protected:
+  /// Returns a new, unique Flow Identifier
+  /// \returns a new FlowId
   FlowId GetNewFlowId ();
 
 };
diff -Naur ns-3.18.1/src/flow-monitor/model/flow-monitor.cc ns-3.19/src/flow-monitor/model/flow-monitor.cc
--- ns-3.18.1/src/flow-monitor/model/flow-monitor.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/flow-monitor.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,9 +31,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("FlowMonitor");
+NS_LOG_COMPONENT_DEFINE ("FlowMonitor")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (FlowMonitor);
+NS_OBJECT_ENSURE_REGISTERED (FlowMonitor)
+  ;
 
 
 TypeId 
diff -Naur ns-3.18.1/src/flow-monitor/model/flow-monitor.h ns-3.19/src/flow-monitor/model/flow-monitor.h
--- ns-3.18.1/src/flow-monitor/model/flow-monitor.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/flow-monitor.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,10 +34,19 @@
 
 namespace ns3 {
 
-/// \brief An object that monitors and reports back packet flows observed during a simulation
-///
-/// The FlowMonitor class is responsible forcoordinating efforts
-/// regarding probes, and collects end-to-end flowstatistics.
+/**
+ * \defgroup flow-monitor Flow Monitor
+ * \brief  Collect and store performance data from a simulation
+ */
+
+/**
+ * \ingroup flow-monitor
+ * \brief An object that monitors and reports back packet flows observed during a simulation
+ *
+ * The FlowMonitor class is responsible for coordinating efforts
+ * regarding probes, and collects end-to-end flow statistics.
+ *
+ */
 class FlowMonitor : public Object
 {
 public:
@@ -77,6 +86,8 @@
     /// as defined in IETF \RFC{3393}.
     Time     jitterSum; // jitterCount == rxPackets - 1
 
+    /// Contains the last measured delay of a packet
+    /// It is stored to measure the packet's Jitter
     Time     lastDelay;
 
     /// Total number of transmitted bytes for the flow
@@ -123,20 +134,27 @@
     /// This attribute also tracks the number of lost bytes.  See also
     /// comment in attribute packetsDropped.
     std::vector<uint64_t> bytesDropped; // bytesDropped[reasonCode] => number of dropped bytes
-    Histogram flowInterruptionsHistogram; // histogram of durations of flow interruptions
+    Histogram flowInterruptionsHistogram; //!< histogram of durations of flow interruptions
   };
 
   // --- basic methods ---
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   TypeId GetInstanceTypeId () const;
   FlowMonitor ();
 
   /// Set the FlowClassifier to be used by the flow monitor.
+  /// \param classifier the FlowClassifier
   void SetFlowClassifier (Ptr<FlowClassifier> classifier);
 
-  /// Set the time, counting from the current time, from which to start monitoring flows
+  /// Set the time, counting from the current time, from which to start monitoring flows.
+  /// \param time delta time to start
   void Start (const Time &time);
-  /// Set the time, counting from the current time, from which to stop monitoring flows
+  /// Set the time, counting from the current time, from which to stop monitoring flows.
+  /// \param time delta time to stop
   void Stop (const Time &time);
   /// Begin monitoring flows *right now*
   void StartRightNow ();
@@ -147,21 +165,39 @@
   /// Register a new FlowProbe that will begin monitoring and report
   /// events to this monitor.  This method is normally only used by
   /// FlowProbe implementations.
+  /// \param probe the probe to add
   void AddProbe (Ptr<FlowProbe> probe);
 
   /// FlowProbe implementations are supposed to call this method to
   /// report that a new packet was transmitted (but keep in mind the
   /// distinction between a new packet entering the system and a
   /// packet that is already known and is only being forwarded).
+  /// \param probe the reporting probe
+  /// \param flowId flow identification
+  /// \param packetId Packet ID
+  /// \param packetSize packet size
   void ReportFirstTx (Ptr<FlowProbe> probe, FlowId flowId, FlowPacketId packetId, uint32_t packetSize);
   /// FlowProbe implementations are supposed to call this method to
   /// report that a known packet is being forwarded.
+  /// \param probe the reporting probe
+  /// \param flowId flow identification
+  /// \param packetId Packet ID
+  /// \param packetSize packet size
   void ReportForwarding (Ptr<FlowProbe> probe, FlowId flowId, FlowPacketId packetId, uint32_t packetSize);
   /// FlowProbe implementations are supposed to call this method to
   /// report that a known packet is being received.
+  /// \param probe the reporting probe
+  /// \param flowId flow identification
+  /// \param packetId Packet ID
+  /// \param packetSize packet size
   void ReportLastRx (Ptr<FlowProbe> probe, FlowId flowId, FlowPacketId packetId, uint32_t packetSize);
   /// FlowProbe implementations are supposed to call this method to
   /// report that a known packet is being dropped due to some reason.
+  /// \param probe the reporting probe
+  /// \param flowId flow identification
+  /// \param packetId Packet ID
+  /// \param packetSize packet size
+  /// \param reasonCode drop reason code
   void ReportDrop (Ptr<FlowProbe> probe, FlowId flowId, FlowPacketId packetId,
                    uint32_t packetSize, uint32_t reasonCode);
 
@@ -171,6 +207,7 @@
   /// Check right now for packets that appear to be lost, considering
   /// packets as lost if not seen in the network for a time larger
   /// than maxDelay
+  /// \param maxDelay the max delay for a packet
   void CheckForLostPackets (Time maxDelay);
 
   // --- methods to get the results ---
@@ -178,9 +215,11 @@
   /// FlowMonitor has not stopped monitoring yet, you should call
   /// CheckForLostPackets() to make sure all possibly lost packets are
   /// accounted for.
+  /// \returns the flows statistics
   std::map<FlowId, FlowStats> GetFlowStats () const;
 
   /// Get a list of all FlowProbe's associated with this FlowMonitor
+  /// \returns a list of all the probes
   std::vector< Ptr<FlowProbe> > GetAllProbes () const;
 
   /// Serializes the results to an std::ostream in XML format
@@ -209,35 +248,41 @@
 
 private:
 
+  /// Structure to represent a single tracked packet data
   struct TrackedPacket
   {
-    Time firstSeenTime; // absolute time when the packet was first seen by a probe
-    Time lastSeenTime; // absolute time when the packet was last seen by a probe
-    uint32_t timesForwarded; // number of times the packet was reportedly forwarded
+    Time firstSeenTime; //!< absolute time when the packet was first seen by a probe
+    Time lastSeenTime; //!< absolute time when the packet was last seen by a probe
+    uint32_t timesForwarded; //!< number of times the packet was reportedly forwarded
   };
 
-  // FlowId --> FlowStats
+  /// FlowId --> FlowStats
   std::map<FlowId, FlowStats> m_flowStats;
 
-  // (FlowId,PacketId) --> TrackedPacket
+  /// (FlowId,PacketId) --> TrackedPacket
   typedef std::map< std::pair<FlowId, FlowPacketId>, TrackedPacket> TrackedPacketMap;
-  TrackedPacketMap m_trackedPackets;
-  Time m_maxPerHopDelay;
-  std::vector< Ptr<FlowProbe> > m_flowProbes;
+  TrackedPacketMap m_trackedPackets; //!< Tracked packets
+  Time m_maxPerHopDelay; //!< Minimum per-hop delay
+  std::vector< Ptr<FlowProbe> > m_flowProbes; //!< all the FlowProbes
 
   // note: this is needed only for serialization
-  Ptr<FlowClassifier> m_classifier;
-
-  EventId m_startEvent;
-  EventId m_stopEvent;
-  bool m_enabled;
-  double m_delayBinWidth;
-  double m_jitterBinWidth;
-  double m_packetSizeBinWidth;
-  double m_flowInterruptionsBinWidth;
-  Time m_flowInterruptionsMinTime;
+  Ptr<FlowClassifier> m_classifier; //!< the FlowClassifier
 
+  EventId m_startEvent;     //!< Start event
+  EventId m_stopEvent;      //!< Stop event
+  bool m_enabled;           //!< FlowMon is enabled
+  double m_delayBinWidth;   //!< Delay bin width (for histograms)
+  double m_jitterBinWidth;  //!< Jitter bin width (for histograms)
+  double m_packetSizeBinWidth;  //!< packet size bin width (for histograms)
+  double m_flowInterruptionsBinWidth; //!< Flow interruptions bin width (for histograms)
+  Time m_flowInterruptionsMinTime; //!< Flow interruptions minimum time
+
+  /// Get the stats for a given flow
+  /// \param flowId the Flow identification
+  /// \returns the stats of the flow
   FlowStats& GetStatsForFlow (FlowId flowId);
+
+  /// Periodic function to check for lost packets and prune statistics
   void PeriodicCheckForLostPackets ();
 };
 
diff -Naur ns-3.18.1/src/flow-monitor/model/flow-probe.h ns-3.19/src/flow-monitor/model/flow-probe.h
--- ns-3.18.1/src/flow-monitor/model/flow-probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/flow-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -39,17 +39,22 @@
 class FlowProbe : public Object
 {
 private:
+  /// Defined and not implemented to avoid misuse
   FlowProbe (FlowProbe const &);
+  /// Defined and not implemented to avoid misuse
+  /// \returns
   FlowProbe& operator= (FlowProbe const &);
 
 protected:
-
+  /// Constructor
+  /// \param flowMonitor the FlowMonitor this probe is associated with
   FlowProbe (Ptr<FlowMonitor> flowMonitor);
   virtual void DoDispose (void);
 
 public:
   virtual ~FlowProbe ();
 
+  /// Structure to hold the statistics of a flow
   struct FlowStats
   {
     FlowStats () : delayFromFirstProbeSum (Seconds (0)), bytes (0), packets (0) {}
@@ -67,21 +72,35 @@
     uint32_t packets;
   };
 
+  /// Container to map FlowId -> FlowStats
   typedef std::map<FlowId, FlowStats> Stats;
 
+  /// Add a packet data to the flow stats
+  /// \param flowId the flow Identifier
+  /// \param packetSize the packet size
+  /// \param delayFromFirstProbe packet delay
   void AddPacketStats (FlowId flowId, uint32_t packetSize, Time delayFromFirstProbe);
+  /// Add a packet drop data to the flow stats
+  /// \param flowId the flow Identifier
+  /// \param packetSize the packet size
+  /// \param reasonCode reason code for the drop
   void AddPacketDropStats (FlowId flowId, uint32_t packetSize, uint32_t reasonCode);
 
   /// Get the partial flow statistics stored in this probe.  With this
   /// information you can, for example, find out what is the delay
   /// from the first probe to this one.
+  /// \returns the partial flow statistics
   Stats GetStats () const;
 
+  /// Serializes the results to an std::ostream in XML format
+  /// \param os the output stream
+  /// \param indent number of spaces to use as base indentation level
+  /// \param index FlowProbe index
   void SerializeToXmlStream (std::ostream &os, int indent, uint32_t index) const;
 
 protected:
-  Ptr<FlowMonitor> m_flowMonitor;
-  Stats m_stats;
+  Ptr<FlowMonitor> m_flowMonitor; //!< the FlowMonitor instance
+  Stats m_stats; //!< The flow stats
 
 };
 
diff -Naur ns-3.18.1/src/flow-monitor/model/histogram.cc ns-3.19/src/flow-monitor/model/histogram.cc
--- ns-3.18.1/src/flow-monitor/model/histogram.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/histogram.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Histogram");
+NS_LOG_COMPONENT_DEFINE ("Histogram")
+  ;
  
 // uint32_t 
 // Histogram::GetSize () const
diff -Naur ns-3.18.1/src/flow-monitor/model/histogram.h ns-3.19/src/flow-monitor/model/histogram.h
--- ns-3.18.1/src/flow-monitor/model/histogram.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/histogram.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,34 +27,94 @@
 
 namespace ns3 {
 
+/**
+ * \brief Class used to store data and make an histogram of the data frequency.
+ *
+ * Data are grouped in "bins", i.e., intervals. Each value is assigned to the
+ * bin according to the following formula: floor(value/binWidth).
+ * Hence, bin \a i groups the data from [i*binWidth, (i+1)binWidth).
+ *
+ * This class only handles \a positive bins, i.e., it does \a not handles negative data.
+ *
+ * \todo Add support for negative data.
+ *
+ * \todo Add method(s) to estimate \f$N\f$, \f$\mu\f$, and \f$s^2\f$ from the histogram,
+ * see http://www.dspguide.com/ch2/4.htm
+ *
+ */
 class Histogram
 {
 public:
 
   // --- basic methods ---
+  /**
+   * \brief Constructor
+   * \param binWidth width of the histogram "bin".
+   */
   Histogram (double binWidth);
   Histogram ();
 
   // Methods for Getting the Histogram Results
+  /**
+   * \brief Returns the number of bins in the histogram.
+   * \return the number of bins in the histogram
+   */
   uint32_t GetNBins () const;
+  /**
+   * \brief Returns the bin start, i.e., index*binWidth
+   * \param index the bin index
+   * \return the bin start
+   */
   double GetBinStart (uint32_t index);
+  /**
+   * \brief Returns the bin end, i.e., (index+1)*binWidth
+   * \param index the bin index
+   * \return the bin start
+   */
   double GetBinEnd (uint32_t index);
+  /**
+   * \brief Returns the bin width.
+   *
+   * Note that all the bins have the same width.
+   *
+   * \param index the bin index
+   * \return the bin width
+   */
   double GetBinWidth (uint32_t index) const;
+  /**
+   * \brief Set the bin width.
+   *
+   * Note that you can change the bin width only if the histogram is empty.
+   *
+   * \param binWidth the bin width
+   */
   void SetDefaultBinWidth (double binWidth);
+  /**
+   * \brief Get the number of data added to the bin.
+   * \param index the bin index
+   * \return the number of data added to the bin
+   */
   uint32_t GetBinCount (uint32_t index);
 
   // Method for adding values
+  /**
+   * \brief Add a value to the histogram
+   * \param value the value to add
+   */
   void AddValue (double value);
 
-
+  /**
+   * \brief Serializes the results to an std::ostream in XML format.
+   * \param os the output stream
+   * \param indent number of spaces to use as base indentation level
+   * \param elementName name of the element to serialize.
+   */
   void SerializeToXmlStream (std::ostream &os, int indent, std::string elementName) const;
 
-  /// \todo add method(s) to estimate N, µ, and s² from the histogram,
-  /// see http://www.dspguide.com/ch2/4.htm
 
 private:
-  std::vector<uint32_t> m_histogram;
-  double m_binWidth;
+  std::vector<uint32_t> m_histogram; //!< Histogram data
+  double m_binWidth; //!< Bin width
 };
 
 
diff -Naur ns-3.18.1/src/flow-monitor/model/ipv4-flow-classifier.cc ns-3.19/src/flow-monitor/model/ipv4-flow-classifier.cc
--- ns-3.18.1/src/flow-monitor/model/ipv4-flow-classifier.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/ipv4-flow-classifier.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,8 +27,8 @@
 namespace ns3 {
 
 /* see http://www.iana.org/assignments/protocol-numbers */
-const uint8_t TCP_PROT_NUMBER = 6;
-const uint8_t UDP_PROT_NUMBER = 17;
+const uint8_t TCP_PROT_NUMBER = 6;  //!< TCP Protocol number
+const uint8_t UDP_PROT_NUMBER = 17; //!< UDP Protocol number
 
 
 
@@ -109,35 +109,49 @@
       return false;
     }
 
+  if (ipHeader.GetFragmentOffset () > 0 )
+    {
+      // Ignore fragments: they don't carry a valid L4 header
+      return false;
+    }
+
   FiveTuple tuple;
   tuple.sourceAddress = ipHeader.GetSource ();
   tuple.destinationAddress = ipHeader.GetDestination ();
   tuple.protocol = ipHeader.GetProtocol ();
 
-  switch (tuple.protocol)
+  if ((tuple.protocol != UDP_PROT_NUMBER) && (tuple.protocol != TCP_PROT_NUMBER))
     {
-    case UDP_PROT_NUMBER:
-      {
-        UdpHeader udpHeader;
-        ipPayload->PeekHeader (udpHeader);
-        tuple.sourcePort = udpHeader.GetSourcePort ();
-        tuple.destinationPort = udpHeader.GetDestinationPort ();
-      }
-      break;
-
-    case TCP_PROT_NUMBER:
-      {
-        TcpHeader tcpHeader;
-        ipPayload->PeekHeader (tcpHeader);
-        tuple.sourcePort = tcpHeader.GetSourcePort ();
-        tuple.destinationPort = tcpHeader.GetDestinationPort ();
-      }
-      break;
+      return false;
+    }
 
-    default:
+  if (ipPayload->GetSize () < 4)
+    {
+      // the packet doesn't carry enough bytes
       return false;
     }
 
+  // we rely on the fact that for both TCP and UDP the ports are
+  // carried in the first 4 octects.
+  // This allows to read the ports even on fragmented packets
+  // not carrying a full TCP or UDP header.
+
+  uint8_t data[4];
+  ipPayload->CopyData (data, 4);
+
+  uint16_t srcPort = 0;
+  srcPort |= data[0];
+  srcPort <<= 8;
+  srcPort |= data[1];
+
+  uint16_t dstPort = 0;
+  dstPort |= data[2];
+  dstPort <<= 8;
+  dstPort |= data[3];
+
+  tuple.sourcePort = srcPort;
+  tuple.destinationPort = dstPort;
+
   // try to insert the tuple, but check if it already exists
   std::pair<std::map<FiveTuple, FlowId>::iterator, bool> insert
     = m_flowMap.insert (std::pair<FiveTuple, FlowId> (tuple, 0));
diff -Naur ns-3.18.1/src/flow-monitor/model/ipv4-flow-classifier.h ns-3.19/src/flow-monitor/model/ipv4-flow-classifier.h
--- ns-3.18.1/src/flow-monitor/model/ipv4-flow-classifier.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/ipv4-flow-classifier.h	2013-12-20 09:44:50.000000000 -0800
@@ -39,13 +39,14 @@
 {
 public:
 
+  /// Structure to classify a packet
   struct FiveTuple
   {
-    Ipv4Address sourceAddress;
-    Ipv4Address destinationAddress;
-    uint8_t protocol;
-    uint16_t sourcePort;
-    uint16_t destinationPort;
+    Ipv4Address sourceAddress;      //!< Source address
+    Ipv4Address destinationAddress; //!< Destination address
+    uint8_t protocol;               //!< Protocol
+    uint16_t sourcePort;            //!< Source port
+    uint16_t destinationPort;       //!< Destination port
   };
 
   Ipv4FlowClassifier ();
@@ -53,22 +54,43 @@
   /// \brief try to classify the packet into flow-id and packet-id
   /// \return true if the packet was classified, false if not (i.e. it
   /// does not appear to be part of a flow).
+  /// \param ipHeader packet's IP header
+  /// \param ipPayload packet's IP payload
+  /// \param out_flowId packet's FlowId
+  /// \param out_packetId packet's identifier
   bool Classify (const Ipv4Header &ipHeader, Ptr<const Packet> ipPayload,
                  uint32_t *out_flowId, uint32_t *out_packetId);
 
   /// Searches for the FiveTuple corresponding to the given flowId
+  /// \param flowId the FlowId to search for
+  /// \returns the FiveTuple corresponding to flowId
   FiveTuple FindFlow (FlowId flowId) const;
 
   virtual void SerializeToXmlStream (std::ostream &os, int indent) const;
 
 private:
 
+  /// Map to Flows Identifiers to FlowIds
   std::map<FiveTuple, FlowId> m_flowMap;
 
 };
 
-
+/**
+ * \brief Less than operator.
+ *
+ * \param t1 the first operand
+ * \param t2 the first operand
+ * \returns true if the operands are equal
+ */
 bool operator < (const Ipv4FlowClassifier::FiveTuple &t1, const Ipv4FlowClassifier::FiveTuple &t2);
+
+/**
+ * \brief Equal to operator.
+ *
+ * \param t1 the first operand
+ * \param t2 the first operand
+ * \returns true if the operands are equal
+ */
 bool operator == (const Ipv4FlowClassifier::FiveTuple &t1, const Ipv4FlowClassifier::FiveTuple &t2);
 
 
diff -Naur ns-3.18.1/src/flow-monitor/model/ipv4-flow-probe.cc ns-3.19/src/flow-monitor/model/ipv4-flow-probe.cc
--- ns-3.18.1/src/flow-monitor/model/ipv4-flow-probe.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/ipv4-flow-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,15 +30,29 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe");
+NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe")
+  ;
 
 //////////////////////////////////////
 // Ipv4FlowProbeTag class implementation //
 //////////////////////////////////////
 
+/**
+ * \ingroup flow-monitor
+ *
+ * \brief Tag used to allow a fast identification of the packet
+ *
+ * This tag is added by FlowMonitor when a packet is seen for
+ * the first time, and it is then used to classify the packet in
+ * the following hops.
+ */
 class Ipv4FlowProbeTag : public Tag
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
   virtual uint32_t GetSerializedSize (void) const;
@@ -46,17 +60,47 @@
   virtual void Deserialize (TagBuffer buf);
   virtual void Print (std::ostream &os) const;
   Ipv4FlowProbeTag ();
+  /**
+   * \brief Consructor
+   * \param flowId the flow identifier
+   * \param packetId the packet identifier
+   * \param packetSize the packet size
+   */
   Ipv4FlowProbeTag (uint32_t flowId, uint32_t packetId, uint32_t packetSize);
+  /**
+   * \brief Set the flow identifier
+   * \param flowId the flow identifier
+   */
   void SetFlowId (uint32_t flowId);
+  /**
+   * \brief Set the packet identifier
+   * \param packetId the packet identifier
+   */
   void SetPacketId (uint32_t packetId);
+  /**
+   * \brief Set the packet size
+   * \param packetSize the packet size
+   */
   void SetPacketSize (uint32_t packetSize);
+  /**
+   * \brief Set the flow identifier
+   * \returns the flow identifier
+   */
   uint32_t GetFlowId (void) const;
+  /**
+   * \brief Set the packet identifier
+   * \returns the packet identifier
+   */
   uint32_t GetPacketId (void) const;
+  /**
+   * \brief Get the packet size
+   * \returns the packet size
+   */
   uint32_t GetPacketSize (void) const;
 private:
-  uint32_t m_flowId;
-  uint32_t m_packetId;
-  uint32_t m_packetSize;
+  uint32_t m_flowId;      //!< flow identifier
+  uint32_t m_packetId;    //!< packet identifier
+  uint32_t m_packetSize;  //!< packet size
 
 };
 
diff -Naur ns-3.18.1/src/flow-monitor/model/ipv4-flow-probe.h ns-3.19/src/flow-monitor/model/ipv4-flow-probe.h
--- ns-3.18.1/src/flow-monitor/model/ipv4-flow-probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/flow-monitor/model/ipv4-flow-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -30,6 +30,7 @@
 class FlowMonitor;
 class Node;
 
+/// \ingroup flow-monitor
 /// \brief Class that monitors flows at the IPv4 layer of a Node
 ///
 /// For each node in the simulation, one instance of the class
@@ -40,6 +41,10 @@
 {
 
 public:
+  /// \brief Constructor
+  /// \param monitor the FlowMonitor this probe is associated with
+  /// \param classifier the Ipv4FlowClassifier this probe is associated with
+  /// \param node the Node this probe is associated with
   Ipv4FlowProbe (Ptr<FlowMonitor> monitor, Ptr<Ipv4FlowClassifier> classifier, Ptr<Node> node);
   virtual ~Ipv4FlowProbe ();
 
@@ -65,23 +70,42 @@
     DROP_ROUTE_ERROR,   /**< Route error */
     DROP_FRAGMENT_TIMEOUT, /**< Fragment timeout exceeded */
 
-    DROP_INVALID_REASON,
+    DROP_INVALID_REASON, /**< Fallback reason (no known reason) */
   };
 
 protected:
 
-    virtual void DoDispose (void);
+  virtual void DoDispose (void);
 
 private:
-
+  /// Log a packet being sent
+  /// \param ipHeader IP header
+  /// \param ipPayload IP payload
+  /// \param interface outgoing interface
   void SendOutgoingLogger (const Ipv4Header &ipHeader, Ptr<const Packet> ipPayload, uint32_t interface);
+  /// Log a packet being forwarded
+  /// \param ipHeader IP header
+  /// \param ipPayload IP payload
+  /// \param interface incoming interface
   void ForwardLogger (const Ipv4Header &ipHeader, Ptr<const Packet> ipPayload, uint32_t interface);
+  /// Log a packet being received by the destination
+  /// \param ipHeader IP header
+  /// \param ipPayload IP payload
+  /// \param interface incoming interface
   void ForwardUpLogger (const Ipv4Header &ipHeader, Ptr<const Packet> ipPayload, uint32_t interface);
+  /// Log a packet being dropped
+  /// \param ipHeader IP header
+  /// \param ipPayload IP payload
+  /// \param reason drop reason
+  /// \param ipv4 pointer to the IP object dropping the packet
+  /// \param ifIndex interface index
   void DropLogger (const Ipv4Header &ipHeader, Ptr<const Packet> ipPayload,
                    Ipv4L3Protocol::DropReason reason, Ptr<Ipv4> ipv4, uint32_t ifIndex);
+  /// Log a packet being dropped by a queue
+  /// \param ipPayload IP payload
   void QueueDropLogger (Ptr<const Packet> ipPayload);
 
-  Ptr<Ipv4FlowClassifier> m_classifier;
+  Ptr<Ipv4FlowClassifier> m_classifier; //!< the Ipv4FlowClassifier this probe is associated with
 };
 
 
diff -Naur ns-3.18.1/src/internet/bindings/modulegen__gcc_ILP32.py ns-3.19/src/internet/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/internet/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -439,7 +439,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -3000,10 +3000,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -7526,8 +7527,8 @@
 def register_Ns3RttEstimator_methods(root_module, cls):
     ## rtt-estimator.h (module 'internet'): ns3::RttEstimator::RttEstimator() [constructor]
     cls.add_constructor([])
-    ## rtt-estimator.h (module 'internet'): ns3::RttEstimator::RttEstimator(ns3::RttEstimator const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::RttEstimator const &', 'arg0')])
+    ## rtt-estimator.h (module 'internet'): ns3::RttEstimator::RttEstimator(ns3::RttEstimator const & r) [copy constructor]
+    cls.add_constructor([param('ns3::RttEstimator const &', 'r')])
     ## rtt-estimator.h (module 'internet'): ns3::Time ns3::RttEstimator::AckSeq(ns3::SequenceNumber32 ackSeq) [member function]
     cls.add_method('AckSeq', 
                    'ns3::Time', 
@@ -7606,8 +7607,8 @@
 def register_Ns3RttMeanDeviation_methods(root_module, cls):
     ## rtt-estimator.h (module 'internet'): ns3::RttMeanDeviation::RttMeanDeviation() [constructor]
     cls.add_constructor([])
-    ## rtt-estimator.h (module 'internet'): ns3::RttMeanDeviation::RttMeanDeviation(ns3::RttMeanDeviation const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::RttMeanDeviation const &', 'arg0')])
+    ## rtt-estimator.h (module 'internet'): ns3::RttMeanDeviation::RttMeanDeviation(ns3::RttMeanDeviation const & r) [copy constructor]
+    cls.add_constructor([param('ns3::RttMeanDeviation const &', 'r')])
     ## rtt-estimator.h (module 'internet'): ns3::Ptr<ns3::RttEstimator> ns3::RttMeanDeviation::Copy() const [member function]
     cls.add_method('Copy', 
                    'ns3::Ptr< ns3::RttEstimator >', 
@@ -8776,10 +8777,10 @@
                    'void', 
                    [param('ns3::Time', 'timeout')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
-    ## tcp-socket.h (module 'internet'): void ns3::TcpSocket::SetInitialCwnd(uint32_t count) [member function]
+    ## tcp-socket.h (module 'internet'): void ns3::TcpSocket::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
-                   [param('uint32_t', 'count')], 
+                   [param('uint32_t', 'cwnd')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
     ## tcp-socket.h (module 'internet'): void ns3::TcpSocket::SetPersistTimeout(ns3::Time timeout) [member function]
     cls.add_method('SetPersistTimeout', 
@@ -8933,10 +8934,10 @@
                    'int', 
                    [], 
                    is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::AddOptions(ns3::TcpHeader & arg0) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::AddOptions(ns3::TcpHeader & tcpHeader) [member function]
     cls.add_method('AddOptions', 
                    'void', 
-                   [param('ns3::TcpHeader &', 'arg0')], 
+                   [param('ns3::TcpHeader &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
     ## tcp-socket-base.h (module 'internet'): uint16_t ns3::TcpSocketBase::AdvertisedWindowSize() [member function]
     cls.add_method('AdvertisedWindowSize', 
@@ -8963,10 +8964,10 @@
                    'void', 
                    [], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::CompleteFork(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1, ns3::Address const & fromAddress, ns3::Address const & toAdress) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::CompleteFork(ns3::Ptr<ns3::Packet> p, ns3::TcpHeader const & tcpHeader, ns3::Address const & fromAddress, ns3::Address const & toAddress) [member function]
     cls.add_method('CompleteFork', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1'), param('ns3::Address const &', 'fromAddress'), param('ns3::Address const &', 'toAdress')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::TcpHeader const &', 'tcpHeader'), param('ns3::Address const &', 'fromAddress'), param('ns3::Address const &', 'toAddress')], 
                    visibility='protected')
     ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ConnectionSucceeded() [member function]
     cls.add_method('ConnectionSucceeded', 
@@ -9023,15 +9024,15 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::DupAck(ns3::TcpHeader const & t, uint32_t count) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::DupAck(ns3::TcpHeader const & tcpHeader, uint32_t count) [member function]
     cls.add_method('DupAck', 
                    'void', 
-                   [param('ns3::TcpHeader const &', 't'), param('uint32_t', 'count')], 
+                   [param('ns3::TcpHeader const &', 'tcpHeader'), param('uint32_t', 'count')], 
                    is_pure_virtual=True, visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::EstimateRtt(ns3::TcpHeader const & arg0) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::EstimateRtt(ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('EstimateRtt', 
                    'void', 
-                   [param('ns3::TcpHeader const &', 'arg0')], 
+                   [param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
     ## tcp-socket-base.h (module 'internet'): ns3::Ptr<ns3::TcpSocketBase> ns3::TcpSocketBase::Fork() [member function]
     cls.add_method('Fork', 
@@ -9053,10 +9054,10 @@
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'header'), param('uint16_t', 'port'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ForwardUp6(ns3::Ptr<ns3::Packet> packet, ns3::Ipv6Header header, uint16_t port) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ForwardUp6(ns3::Ptr<ns3::Packet> packet, ns3::Ipv6Header header, uint16_t port, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
     cls.add_method('ForwardUp6', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv6Header', 'header'), param('uint16_t', 'port')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv6Header', 'header'), param('uint16_t', 'port'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    visibility='protected')
     ## tcp-socket-base.h (module 'internet'): bool ns3::TcpSocketBase::GetAllowBroadcast() const [member function]
     cls.add_method('GetAllowBroadcast', 
@@ -9133,70 +9134,70 @@
                    'bool', 
                    [param('ns3::SequenceNumber32', 'head'), param('ns3::SequenceNumber32', 'tail')], 
                    is_const=True, visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::PeerClose(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::PeerClose(ns3::Ptr<ns3::Packet> p, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('PeerClose', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
     ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::PersistTimeout() [member function]
     cls.add_method('PersistTimeout', 
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessClosing(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessClosing(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessClosing', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessEstablished(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessEstablished(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessEstablished', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessLastAck(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessLastAck(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessLastAck', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessListen(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1, ns3::Address const & arg2, ns3::Address const & arg3) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessListen(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader, ns3::Address const & fromAddress, ns3::Address const & toAddress) [member function]
     cls.add_method('ProcessListen', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1'), param('ns3::Address const &', 'arg2'), param('ns3::Address const &', 'arg3')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader'), param('ns3::Address const &', 'fromAddress'), param('ns3::Address const &', 'toAddress')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessSynRcvd(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1, ns3::Address const & arg2, ns3::Address const & arg3) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessSynRcvd(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader, ns3::Address const & fromAddress, ns3::Address const & toAddress) [member function]
     cls.add_method('ProcessSynRcvd', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1'), param('ns3::Address const &', 'arg2'), param('ns3::Address const &', 'arg3')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader'), param('ns3::Address const &', 'fromAddress'), param('ns3::Address const &', 'toAddress')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessSynSent(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessSynSent(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessSynSent', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessWait(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessWait(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessWait', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
     ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReTxTimeout() [member function]
     cls.add_method('ReTxTimeout', 
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReadOptions(ns3::TcpHeader const & arg0) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReadOptions(ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ReadOptions', 
                    'void', 
-                   [param('ns3::TcpHeader const &', 'arg0')], 
+                   [param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReceivedAck(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReceivedAck(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ReceivedAck', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReceivedData(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReceivedData(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ReceivedData', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
     ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::Retransmit() [member function]
     cls.add_method('Retransmit', 
@@ -9481,10 +9482,10 @@
                    'int', 
                    [], 
                    is_virtual=True)
-    ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::DupAck(ns3::TcpHeader const & header, uint32_t count) [member function]
+    ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::DupAck(ns3::TcpHeader const & t, uint32_t count) [member function]
     cls.add_method('DupAck', 
                    'void', 
-                   [param('ns3::TcpHeader const &', 'header'), param('uint32_t', 'count')], 
+                   [param('ns3::TcpHeader const &', 't'), param('uint32_t', 'count')], 
                    visibility='protected', is_virtual=True)
     ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::EstimateRtt(ns3::TcpHeader const & header) [member function]
     cls.add_method('EstimateRtt', 
@@ -9602,6 +9603,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -9612,6 +9618,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -9627,6 +9638,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -9652,6 +9668,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -9865,6 +9886,18 @@
     cls.add_method('EnableChecksums', 
                    'void', 
                    [])
+    ## udp-header.h (module 'internet'): void ns3::UdpHeader::ForceChecksum(uint16_t checksum) [member function]
+    cls.add_method('ForceChecksum', 
+                   'void', 
+                   [param('uint16_t', 'checksum')])
+    ## udp-header.h (module 'internet'): void ns3::UdpHeader::ForcePayloadSize(uint16_t payloadSize) [member function]
+    cls.add_method('ForcePayloadSize', 
+                   'void', 
+                   [param('uint16_t', 'payloadSize')])
+    ## udp-header.h (module 'internet'): uint16_t ns3::UdpHeader::GetChecksum() [member function]
+    cls.add_method('GetChecksum', 
+                   'uint16_t', 
+                   [])
     ## udp-header.h (module 'internet'): uint16_t ns3::UdpHeader::GetDestinationPort() const [member function]
     cls.add_method('GetDestinationPort', 
                    'uint16_t', 
@@ -11575,10 +11608,10 @@
     cls.add_method('Send', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
-    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arg0) [member function]
+    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arpCache) [member function]
     cls.add_method('SetArpCache', 
                    'void', 
-                   [param('ns3::Ptr< ns3::ArpCache >', 'arg0')])
+                   [param('ns3::Ptr< ns3::ArpCache >', 'arpCache')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
     cls.add_method('SetDevice', 
                    'void', 
@@ -13221,10 +13254,10 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
-    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interfaceIndex, ns3::Ipv6Address address) [member function]
     cls.add_method('RemoveAddress', 
                    'bool', 
-                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   [param('uint32_t', 'interfaceIndex'), param('ns3::Ipv6Address', 'address')], 
                    is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
@@ -14727,10 +14760,10 @@
                    'ns3::IpL4Protocol::RxStatus', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')], 
                    is_virtual=True)
-    ## tcp-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::TcpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> interface) [member function]
+    ## tcp-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::TcpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
     cls.add_method('Receive', 
                    'ns3::IpL4Protocol::RxStatus', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'interface')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    is_virtual=True)
     ## tcp-l4-protocol.h (module 'internet'): void ns3::TcpL4Protocol::ReceiveIcmp(ns3::Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo, ns3::Ipv4Address payloadSource, ns3::Ipv4Address payloadDestination, uint8_t const * payload) [member function]
     cls.add_method('ReceiveIcmp', 
diff -Naur ns-3.18.1/src/internet/bindings/modulegen__gcc_LP64.py ns-3.19/src/internet/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/internet/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -439,7 +439,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -3000,10 +3000,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -7526,8 +7527,8 @@
 def register_Ns3RttEstimator_methods(root_module, cls):
     ## rtt-estimator.h (module 'internet'): ns3::RttEstimator::RttEstimator() [constructor]
     cls.add_constructor([])
-    ## rtt-estimator.h (module 'internet'): ns3::RttEstimator::RttEstimator(ns3::RttEstimator const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::RttEstimator const &', 'arg0')])
+    ## rtt-estimator.h (module 'internet'): ns3::RttEstimator::RttEstimator(ns3::RttEstimator const & r) [copy constructor]
+    cls.add_constructor([param('ns3::RttEstimator const &', 'r')])
     ## rtt-estimator.h (module 'internet'): ns3::Time ns3::RttEstimator::AckSeq(ns3::SequenceNumber32 ackSeq) [member function]
     cls.add_method('AckSeq', 
                    'ns3::Time', 
@@ -7606,8 +7607,8 @@
 def register_Ns3RttMeanDeviation_methods(root_module, cls):
     ## rtt-estimator.h (module 'internet'): ns3::RttMeanDeviation::RttMeanDeviation() [constructor]
     cls.add_constructor([])
-    ## rtt-estimator.h (module 'internet'): ns3::RttMeanDeviation::RttMeanDeviation(ns3::RttMeanDeviation const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::RttMeanDeviation const &', 'arg0')])
+    ## rtt-estimator.h (module 'internet'): ns3::RttMeanDeviation::RttMeanDeviation(ns3::RttMeanDeviation const & r) [copy constructor]
+    cls.add_constructor([param('ns3::RttMeanDeviation const &', 'r')])
     ## rtt-estimator.h (module 'internet'): ns3::Ptr<ns3::RttEstimator> ns3::RttMeanDeviation::Copy() const [member function]
     cls.add_method('Copy', 
                    'ns3::Ptr< ns3::RttEstimator >', 
@@ -8776,10 +8777,10 @@
                    'void', 
                    [param('ns3::Time', 'timeout')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
-    ## tcp-socket.h (module 'internet'): void ns3::TcpSocket::SetInitialCwnd(uint32_t count) [member function]
+    ## tcp-socket.h (module 'internet'): void ns3::TcpSocket::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
-                   [param('uint32_t', 'count')], 
+                   [param('uint32_t', 'cwnd')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
     ## tcp-socket.h (module 'internet'): void ns3::TcpSocket::SetPersistTimeout(ns3::Time timeout) [member function]
     cls.add_method('SetPersistTimeout', 
@@ -8933,10 +8934,10 @@
                    'int', 
                    [], 
                    is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::AddOptions(ns3::TcpHeader & arg0) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::AddOptions(ns3::TcpHeader & tcpHeader) [member function]
     cls.add_method('AddOptions', 
                    'void', 
-                   [param('ns3::TcpHeader &', 'arg0')], 
+                   [param('ns3::TcpHeader &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
     ## tcp-socket-base.h (module 'internet'): uint16_t ns3::TcpSocketBase::AdvertisedWindowSize() [member function]
     cls.add_method('AdvertisedWindowSize', 
@@ -8963,10 +8964,10 @@
                    'void', 
                    [], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::CompleteFork(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1, ns3::Address const & fromAddress, ns3::Address const & toAdress) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::CompleteFork(ns3::Ptr<ns3::Packet> p, ns3::TcpHeader const & tcpHeader, ns3::Address const & fromAddress, ns3::Address const & toAddress) [member function]
     cls.add_method('CompleteFork', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1'), param('ns3::Address const &', 'fromAddress'), param('ns3::Address const &', 'toAdress')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::TcpHeader const &', 'tcpHeader'), param('ns3::Address const &', 'fromAddress'), param('ns3::Address const &', 'toAddress')], 
                    visibility='protected')
     ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ConnectionSucceeded() [member function]
     cls.add_method('ConnectionSucceeded', 
@@ -9023,15 +9024,15 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::DupAck(ns3::TcpHeader const & t, uint32_t count) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::DupAck(ns3::TcpHeader const & tcpHeader, uint32_t count) [member function]
     cls.add_method('DupAck', 
                    'void', 
-                   [param('ns3::TcpHeader const &', 't'), param('uint32_t', 'count')], 
+                   [param('ns3::TcpHeader const &', 'tcpHeader'), param('uint32_t', 'count')], 
                    is_pure_virtual=True, visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::EstimateRtt(ns3::TcpHeader const & arg0) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::EstimateRtt(ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('EstimateRtt', 
                    'void', 
-                   [param('ns3::TcpHeader const &', 'arg0')], 
+                   [param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
     ## tcp-socket-base.h (module 'internet'): ns3::Ptr<ns3::TcpSocketBase> ns3::TcpSocketBase::Fork() [member function]
     cls.add_method('Fork', 
@@ -9053,10 +9054,10 @@
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'header'), param('uint16_t', 'port'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ForwardUp6(ns3::Ptr<ns3::Packet> packet, ns3::Ipv6Header header, uint16_t port) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ForwardUp6(ns3::Ptr<ns3::Packet> packet, ns3::Ipv6Header header, uint16_t port, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
     cls.add_method('ForwardUp6', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv6Header', 'header'), param('uint16_t', 'port')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv6Header', 'header'), param('uint16_t', 'port'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    visibility='protected')
     ## tcp-socket-base.h (module 'internet'): bool ns3::TcpSocketBase::GetAllowBroadcast() const [member function]
     cls.add_method('GetAllowBroadcast', 
@@ -9133,70 +9134,70 @@
                    'bool', 
                    [param('ns3::SequenceNumber32', 'head'), param('ns3::SequenceNumber32', 'tail')], 
                    is_const=True, visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::PeerClose(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::PeerClose(ns3::Ptr<ns3::Packet> p, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('PeerClose', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
     ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::PersistTimeout() [member function]
     cls.add_method('PersistTimeout', 
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessClosing(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessClosing(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessClosing', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessEstablished(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessEstablished(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessEstablished', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessLastAck(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessLastAck(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessLastAck', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessListen(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1, ns3::Address const & arg2, ns3::Address const & arg3) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessListen(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader, ns3::Address const & fromAddress, ns3::Address const & toAddress) [member function]
     cls.add_method('ProcessListen', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1'), param('ns3::Address const &', 'arg2'), param('ns3::Address const &', 'arg3')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader'), param('ns3::Address const &', 'fromAddress'), param('ns3::Address const &', 'toAddress')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessSynRcvd(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1, ns3::Address const & arg2, ns3::Address const & arg3) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessSynRcvd(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader, ns3::Address const & fromAddress, ns3::Address const & toAddress) [member function]
     cls.add_method('ProcessSynRcvd', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1'), param('ns3::Address const &', 'arg2'), param('ns3::Address const &', 'arg3')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader'), param('ns3::Address const &', 'fromAddress'), param('ns3::Address const &', 'toAddress')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessSynSent(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessSynSent(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessSynSent', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessWait(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ProcessWait(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ProcessWait', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected')
     ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReTxTimeout() [member function]
     cls.add_method('ReTxTimeout', 
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReadOptions(ns3::TcpHeader const & arg0) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReadOptions(ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ReadOptions', 
                    'void', 
-                   [param('ns3::TcpHeader const &', 'arg0')], 
+                   [param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReceivedAck(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReceivedAck(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ReceivedAck', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
-    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReceivedData(ns3::Ptr<ns3::Packet> arg0, ns3::TcpHeader const & arg1) [member function]
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ReceivedData(ns3::Ptr<ns3::Packet> packet, ns3::TcpHeader const & tcpHeader) [member function]
     cls.add_method('ReceivedData', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'arg0'), param('ns3::TcpHeader const &', 'arg1')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::TcpHeader const &', 'tcpHeader')], 
                    visibility='protected', is_virtual=True)
     ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::Retransmit() [member function]
     cls.add_method('Retransmit', 
@@ -9481,10 +9482,10 @@
                    'int', 
                    [], 
                    is_virtual=True)
-    ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::DupAck(ns3::TcpHeader const & header, uint32_t count) [member function]
+    ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::DupAck(ns3::TcpHeader const & t, uint32_t count) [member function]
     cls.add_method('DupAck', 
                    'void', 
-                   [param('ns3::TcpHeader const &', 'header'), param('uint32_t', 'count')], 
+                   [param('ns3::TcpHeader const &', 't'), param('uint32_t', 'count')], 
                    visibility='protected', is_virtual=True)
     ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::EstimateRtt(ns3::TcpHeader const & header) [member function]
     cls.add_method('EstimateRtt', 
@@ -9602,6 +9603,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -9612,6 +9618,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -9627,6 +9638,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -9652,6 +9668,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -9865,6 +9886,18 @@
     cls.add_method('EnableChecksums', 
                    'void', 
                    [])
+    ## udp-header.h (module 'internet'): void ns3::UdpHeader::ForceChecksum(uint16_t checksum) [member function]
+    cls.add_method('ForceChecksum', 
+                   'void', 
+                   [param('uint16_t', 'checksum')])
+    ## udp-header.h (module 'internet'): void ns3::UdpHeader::ForcePayloadSize(uint16_t payloadSize) [member function]
+    cls.add_method('ForcePayloadSize', 
+                   'void', 
+                   [param('uint16_t', 'payloadSize')])
+    ## udp-header.h (module 'internet'): uint16_t ns3::UdpHeader::GetChecksum() [member function]
+    cls.add_method('GetChecksum', 
+                   'uint16_t', 
+                   [])
     ## udp-header.h (module 'internet'): uint16_t ns3::UdpHeader::GetDestinationPort() const [member function]
     cls.add_method('GetDestinationPort', 
                    'uint16_t', 
@@ -11575,10 +11608,10 @@
     cls.add_method('Send', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
-    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arg0) [member function]
+    ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetArpCache(ns3::Ptr<ns3::ArpCache> arpCache) [member function]
     cls.add_method('SetArpCache', 
                    'void', 
-                   [param('ns3::Ptr< ns3::ArpCache >', 'arg0')])
+                   [param('ns3::Ptr< ns3::ArpCache >', 'arpCache')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::SetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
     cls.add_method('SetDevice', 
                    'void', 
@@ -13221,10 +13254,10 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
-    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interfaceIndex, ns3::Ipv6Address address) [member function]
     cls.add_method('RemoveAddress', 
                    'bool', 
-                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   [param('uint32_t', 'interfaceIndex'), param('ns3::Ipv6Address', 'address')], 
                    is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
@@ -14727,10 +14760,10 @@
                    'ns3::IpL4Protocol::RxStatus', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')], 
                    is_virtual=True)
-    ## tcp-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::TcpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> interface) [member function]
+    ## tcp-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::TcpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
     cls.add_method('Receive', 
                    'ns3::IpL4Protocol::RxStatus', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'interface')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    is_virtual=True)
     ## tcp-l4-protocol.h (module 'internet'): void ns3::TcpL4Protocol::ReceiveIcmp(ns3::Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo, ns3::Ipv4Address payloadSource, ns3::Ipv4Address payloadDestination, uint8_t const * payload) [member function]
     cls.add_method('ReceiveIcmp', 
diff -Naur ns-3.18.1/src/internet/doc/internet-stack.rst ns-3.19/src/internet/doc/internet-stack.rst
--- ns-3.18.1/src/internet/doc/internet-stack.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/doc/internet-stack.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Internet Stack
 --------------
@@ -16,7 +17,7 @@
 Internet Nodes are not subclasses of class Node; they are simply Nodes that have
 had a bunch of IP-related objects aggregated to them. They can be put together
 by hand, or via a helper function :cpp:func:`InternetStackHelper::Install ()`
-which does the following to all nodes passed in as arguments:::
+which does the following to all nodes passed in as arguments::
 
     void
     InternetStackHelper::Install (Ptr<Node> node) const
@@ -76,7 +77,7 @@
 are added by a factory object (TCP) or by a routing helper (m_routing).
 
 Note that the routing protocol is configured and set outside this
-function. By default, the following protocols are added:::
+function. By default, the following protocols are added::
 
     void InternetStackHelper::Initialize ()
     {
@@ -110,7 +111,7 @@
 typically class :cpp:class:`Ipv4`, but the
 Ipv4L3Protocol public API is also used internally at present.
 
-In class Ipv4L3Protocol, one method described below is ``Receive ()``:::
+In class Ipv4L3Protocol, one method described below is ``Receive ()``::
 
      /**
        * Lower layer calls this method after calling L3Demux::Lookup
@@ -119,22 +120,22 @@
        *    - implement a per-NetDevice ARP cache
        *    - send back arp replies on the right device
        */
-      void Receive( Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t protocol, 
-    const Address &from, const Address &to, NetDevice::PacketType packetType);
+     void Receive( Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t protocol, 
+     const Address &from, const Address &to, NetDevice::PacketType packetType);
 
 First, note that the ``Receive ()`` function has a matching signature to the
 ReceiveCallback in the class :cpp:class:`Node`. This function pointer is
 inserted into the Node's protocol handler when ``AddInterface ()`` is called.
 The actual registration is done
-with a statement such as follows:::
+with a statement such as follows::
 
      RegisterProtocolHandler ( MakeCallback (&Ipv4Protocol::Receive, ipv4),
-        Ipv4L3Protocol::PROT_NUMBER, 0);
+                               Ipv4L3Protocol::PROT_NUMBER, 0);
 
 The Ipv4L3Protocol object is aggregated to the Node; there is only one such
 Ipv4L3Protocol object. Higher-layer protocols that have a packet to send down to
 the Ipv4L3Protocol object can call ``GetObject<Ipv4L3Protocol> ()`` to obtain a
-pointer, as follows:::
+pointer, as follows::
 
   Ptr<Ipv4L3Protocol> ipv4 = m_node->GetObject<Ipv4L3Protocol> ();
   if (ipv4 != 0)
@@ -146,7 +147,7 @@
 objects together:  callbacks, and object aggregation.
 
 Once IPv4 routing has determined that a packet is for the local node, it
-forwards it up the stack.  This is done with the following function:::
+forwards it up the stack.  This is done with the following function::
 
     void
     Ipv4L3Protocol::LocalDeliver (Ptr<const Packet> packet, Ipv4Header const&ip, uint32_t iif)
@@ -168,7 +169,7 @@
 queue. This can be particularly puzzling when sending jumbo packets or packet bursts using UDP.
 The ARP cache pending queue is limited (3 datagrams) and IP packets might be fragmented, easily
 overfilling the ARP cache queue size. In those cases it is useful to increase the ARP cache
-pending size to a proper value, e.g.:::
+pending size to a proper value, e.g.::
 
     Config::SetDefault ("ns3::ArpCache::PendingQueueSize", UintegerValue (MAX_BURST_SIZE/L2MTU*3));
 
@@ -187,7 +188,7 @@
 factory. An application that needs a new socket 
 
 For instance, to create a UDP socket, an application would use a code snippet
-such as the following:::
+such as the following::
 
       Ptr<Udp> udpSocketFactory = GetNode ()->GetObject<Udp> ();
       Ptr<Socket> m_socket = socketFactory->CreateSocket ();
@@ -225,13 +226,14 @@
 |ns3| implements an asynchronous model for socket I/O; the application
 sets a callback to be notified of received data ready to be read, and the 
 callback is invoked by the transport protocol when data is available.
-This callback is specified as follows:::
+This callback is specified as follows::
 
   void Socket::SetRecvCallback (Callback<void, Ptr<Socket>, 
-    Ptr<Packet>, const Address&> receivedData);
+                                Ptr<Packet>,
+                                const Address&> receivedData);
 
 The data being received is conveyed in the Packet data buffer.  An example
-usage is in class :cpp:class:`PacketSink`:::
+usage is in class :cpp:class:`PacketSink`::
 
   m_socket->SetRecvCallback (MakeCallback(&PacketSink::HandleRead, this));
 
diff -Naur ns-3.18.1/src/internet/doc/ipv6.rst ns-3.19/src/internet/doc/ipv6.rst
--- ns-3.18.1/src/internet/doc/ipv6.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/doc/ipv6.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 IPv6
 ----
@@ -21,7 +22,7 @@
 
 The implementation of IPv6 is contained in the following files:
 
-::
+.. sourcecode:: text
 
     src/internet/model/icmpv6-header.{cc,h}
     src/internet/model/icmpv6-l4-protocol.{cc,h}
@@ -56,7 +57,7 @@
 
 Also some helpers are involved with IPv6:
 
-::
+.. sourcecode:: text
 
     src/internet/helper/internet-stack-helper.{cc,h}
     src/internet/helper/ipv6-address-helper.{cc,h}
diff -Naur ns-3.18.1/src/internet/doc/routing-overview.rst ns-3.19/src/internet/doc/routing-overview.rst
--- ns-3.18.1/src/internet/doc/routing-overview.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/doc/routing-overview.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Routing overview
 ----------------
@@ -110,14 +111,14 @@
 Global Unicast Routing API
 ++++++++++++++++++++++++++
 
-The public API is very minimal. User scripts include the following:::
+The public API is very minimal. User scripts include the following::
 
     #include "ns3/internet-module.h"
 
 If the default InternetStackHelper is used, then an instance of global routing
 will be aggregated to each node.  After IP addresses are configured, the
 following function call will cause all of the nodes that have an Ipv4 interface
-to receive forwarding tables entered automatically by the GlobalRouteManager:::
+to receive forwarding tables entered automatically by the GlobalRouteManager::
 
   Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
 
@@ -126,7 +127,7 @@
 described below.
 
 It is possible to call this function again in the midst of a simulation using
-the following additional public function:::
+the following additional public function::
 
   Ipv4GlobalRoutingHelper::RecomputeRoutingTables ();
 
@@ -134,10 +135,10 @@
 and rebuilds the routes.
 
 For instance, this scheduling call will cause the tables to be rebuilt
-at time 5 seconds:::
+at time 5 seconds::
 
   Simulator::Schedule (Seconds (5),
-    &Ipv4GlobalRoutingHelper::RecomputeRoutingTables);
+                       &Ipv4GlobalRoutingHelper::RecomputeRoutingTables);
 
 
 There are two attributes that govern the behavior. The first is
@@ -194,7 +195,7 @@
 be treated like a broadcast CSMA link).
 
 The GlobalRouteManager first walks the list of nodes and aggregates
-a GlobalRouter interface to each one as follows:::
+a GlobalRouter interface to each one as follows::
 
   typedef std::vector < Ptr<Node> >::iterator Iterator;
   for (Iterator i = NodeList::Begin (); i != NodeList::End (); i++)
@@ -219,9 +220,9 @@
 
 * class Ipv4StaticRouting (covering both unicast and multicast)
 * IPv4 Optimized Link State Routing (OLSR) (a MANET protocol defined in 
-  `RFC 3626 <http://www.ietf.org/rfc/rfc3626.txt>`_)
+  :rfc:`3626`)
 * IPv4 Ad Hoc On Demand Distance Vector (AODV) (a MANET protocol defined in
-  `RFC 3561 <http://www.ietf.org/rfc/rfc3561.txt>`_)
+  :rfc:`3561`)
 * IPv4 Destination Sequenced Distance Vector (DSDV) (a MANET protocol)
 * class Ipv4ListRouting (used to store a prioritized list of routing protocols)
 * class Ipv4GlobalRouting (used to store routes computed by the global route
@@ -256,7 +257,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Class Ipv4ListRouting provides a pure virtual function declaration for the
-method that allows one to add a routing protocol:::
+method that allows one to add a routing protocol::
 
   void AddRoutingProtocol (Ptr<Ipv4RoutingProtocol> routingProtocol,
                            int16_t priority);
@@ -271,7 +272,7 @@
 Ipv4RoutingProtocols is stored, and and the routing protocols are each consulted
 in decreasing order of priority to see whether a match is found. Therefore, if
 you want your Ipv4RoutingProtocol to have priority lower than the static
-routing, insert it with priority less than 0; e.g.:::
+routing, insert it with priority less than 0; e.g.::
 
   Ptr<MyRoutingProtocol> myRoutingProto = CreateObject<MyRoutingProtocol> ();
   listRoutingPtr->AddRoutingProtocol (myRoutingProto, -10);
@@ -334,13 +335,13 @@
 *****************
 
 The following function is used to add a static multicast route
-to a node:::
+to a node::
 
     void 
     Ipv4StaticRouting::AddMulticastRoute (Ipv4Address origin,
-                              Ipv4Address group,
-                              uint32_t inputInterface,
-                              std::vector<uint32_t> outputInterfaces);
+                                          Ipv4Address group,
+                                          uint32_t inputInterface,
+                                          std::vector<uint32_t> outputInterfaces);
 
 A multicast route must specify an origin IP address, a multicast group and an
 input network interface index as conditions and provide a vector of output
@@ -370,7 +371,7 @@
 limited to specifying a single output interface for compatibility with
 existing functionality in other systems.
 
-Another command sets the default multicast route:::
+Another command sets the default multicast route::
 
     void 
     Ipv4StaticRouting::SetDefaultMulticastRoute (uint32_t outputInterface);
@@ -391,7 +392,7 @@
 found.
 
 Finally, a number of additional functions are provided to fetch and remove
-multicast routes:::
+multicast routes::
 
   uint32_t GetNMulticastRoutes (void) const;
 
diff -Naur ns-3.18.1/src/internet/doc/tcp.rst ns-3.19/src/internet/doc/tcp.rst
--- ns-3.18.1/src/internet/doc/tcp.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/doc/tcp.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 TCP models in ns-3
 ------------------
@@ -41,7 +42,9 @@
 The model is a full TCP, in that it is bidirectional and attempts to model the
 connection setup and close logic. 
 
-The implementation of TCP is contained in the following files:::
+The implementation of TCP is contained in the following files:
+
+.. sourcecode:: text
 
     src/internet/model/tcp-header.{cc,h}
     src/internet/model/tcp-l4-protocol.{cc,h}
@@ -59,7 +62,7 @@
 
 Different variants of TCP congestion control are supported by subclassing
 the common base class :cpp:class:`TcpSocketBase`.  Several variants
-are supported, including RFC 793 (no congestion control), Tahoe, Reno, Westwood,
+are supported, including :rfc:`793` (no congestion control), Tahoe, Reno, Westwood,
 Westwood+, and NewReno.  NewReno is used by default.  See the Usage section of this
 document for on how to change the default TCP variant used in simulation.
 
@@ -70,7 +73,7 @@
 the |ns3| application which kind of socket factory to use.
 
 Using the helper functions defined in ``src/applications/helper`` and
-``src/network/helper``, here is how one would create a TCP receiver:::
+``src/network/helper``, here is how one would create a TCP receiver::
 
   // Create a packet sink on the star "hub" to receive these packets
   uint16_t port = 50000;
@@ -81,7 +84,7 @@
   sinkApp.Stop (Seconds (10.0));
 
 Similarly, the below snippet configures OnOffApplication traffic source to use
-TCP:::
+TCP::
 
   // Create the OnOff applications to send TCP to the server
   OnOffHelper clientHelper ("ns3::TcpSocketFactory", Address ());
@@ -103,7 +106,7 @@
 
 To set the default socket type before any internet stack-related objects are
 created, one may put the following statement at the top of the simulation
-program::: 
+program:: 
 
   Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue ("ns3::TcpTahoe")); 
 
@@ -116,7 +119,7 @@
 underlying TcpL4Protocol object.  The easiest way to get at this would be 
 through the attribute configuration system.  In the below example,
 the Node container "n0n1" is accessed
-to get the zeroth element, and a socket is created on this node:::
+to get the zeroth element, and a socket is created on this node::
 
   // Create and bind the socket...
   TypeId tid = TypeId::LookupByName ("ns3::TcpTahoe");
@@ -127,7 +130,7 @@
 Above, the "*" wild card for node number is passed to the attribute
 configuration system, so that all future sockets on all nodes are set to 
 Tahoe, not just on node 'n0n1.Get (0)'.  If one wants to limit it to just 
-the specified node, one would have to do something like:::
+the specified node, one would have to do something like::
 
   // Create and bind the socket...
   TypeId tid = TypeId::LookupByName ("ns3::TcpTahoe");
@@ -186,9 +189,11 @@
 
 Using the ``build.py`` script in ns-3-allinone directory, NSC will be enabled by
 default unless the platform does not support it. To disable it when building
-|ns3|, type:::
+|ns3|, type:
+
+.. sourcecode:: bash
 
-./waf configure --enable-examples --enable-tests --disable-nsc
+  $ ./waf configure --enable-examples --enable-tests --disable-nsc
 
 Building and validating
 +++++++++++++++++++++++
@@ -197,12 +202,16 @@
 additional arguments are needed for waf. Building nsc may take some time
 compared to |ns3|; it is interleaved in the |ns3| building process.
 
-Try running the following ns-3 test suite:::  
+Try running the following ns-3 test suite:
+
+.. sourcecode:: bash
 
-    ./test.py -s ns3-tcp-interoperability
+    $ ./test.py -s ns3-tcp-interoperability
 
 If NSC has been successfully built, the following test should show up 
-in the results:::
+in the results:
+
+.. sourcecode:: text
 
     PASS TestSuite ns3-tcp-interoperability
 
@@ -211,10 +220,12 @@
 Usage
 +++++
 
-There are a few example files.  Try::
+There are a few example files.  Try:
+
+.. sourcecode:: bash
 
-    ./waf --run tcp-nsc-zoo
-    ./waf --run tcp-nsc-lfn
+    $ ./waf --run tcp-nsc-zoo
+    $ ./waf --run tcp-nsc-lfn
 
 These examples will deposit some ``.pcap`` files in your directory,
 which can be examined by tcpdump or wireshark.
@@ -222,7 +233,7 @@
 Let's look at the ``examples/tcp/tcp-nsc-zoo.cc`` file for some typical
 usage. How does it differ from using native |ns3| TCP? There is one main
 configuration line, when using NSC and the |ns3| helper API, that needs to be
-set:::
+set::
 
   InternetStackHelper internetStack;
 
@@ -240,9 +251,11 @@
 Which stacks are available to use? Presently, the focus has been on
 Linux 2.6.18 and Linux 2.6.26 stacks for |ns3|. To see which stacks
 were built, one can execute the following find command at the |ns3| top level
-directory:::
+directory:
+
+.. sourcecode:: bash
 
-    ~/ns-3.10> find nsc -name "*.so" -type f 
+    $ find nsc -name "*.so" -type f 
     nsc/linux-2.6.18/liblinux2.6.18.so
     nsc/linux-2.6.26/liblinux2.6.26.so
 
@@ -258,7 +271,7 @@
 
 Additionally, NSC TCP exports a lot of configuration variables into the 
 |ns3| attributes system, via a `sysctl <http://en.wikipedia.org/wiki/Sysctl>`_-like interface. In the ``examples/tcp/tcp-nsc-zoo`` example, you
-can see the following configuration:::
+can see the following configuration::
 
 
   // this disables TCP SACK, wscale and timestamps on node 1 (the attributes 
@@ -272,10 +285,10 @@
 
 These additional configuration variables are not available to native |ns3| TCP.
 
-Also note that default values for TCP attributes in |ns3| TCP may differ from the nsc TCP implementation.  Specifically in |ns3|::: 
+Also note that default values for TCP attributes in |ns3| TCP may differ from the nsc TCP implementation.  Specifically in |ns3|:
 
-		1) TCP default MSS is 536
-		2) TCP Delayed Ack count is 2 
+  1) TCP default MSS is 536
+  2) TCP Delayed Ack count is 2 
 		
 Therefore when making comparisons between results obtained using nsc and |ns3| TCP, care must be taken to ensure these values are set appropriately.  See /examples/tcp/tcp-nsc-comparision.cc for an example.
 
diff -Naur ns-3.18.1/src/internet/helper/internet-stack-helper.cc ns-3.19/src/internet/helper/internet-stack-helper.cc
--- ns-3.18.1/src/internet/helper/internet-stack-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/internet-stack-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -216,16 +216,16 @@
 // Global maps of protocol/interface pairs to file objects seems to fit the 
 // bill.
 //
-typedef std::pair<Ptr<Ipv4>, uint32_t> InterfacePairIpv4; 
-typedef std::map<InterfacePairIpv4, Ptr<PcapFileWrapper> > InterfaceFileMapIpv4;
-typedef std::map<InterfacePairIpv4, Ptr<OutputStreamWrapper> > InterfaceStreamMapIpv4;
+typedef std::pair<Ptr<Ipv4>, uint32_t> InterfacePairIpv4;  /**< Ipv4/interface pair */
+typedef std::map<InterfacePairIpv4, Ptr<PcapFileWrapper> > InterfaceFileMapIpv4;  /**< Ipv4/interface and Pcap file wrapper container */
+typedef std::map<InterfacePairIpv4, Ptr<OutputStreamWrapper> > InterfaceStreamMapIpv4;  /**< Ipv4/interface and output stream container */
 
 static InterfaceFileMapIpv4 g_interfaceFileMapIpv4; /**< A mapping of Ipv4/interface pairs to pcap files */
 static InterfaceStreamMapIpv4 g_interfaceStreamMapIpv4; /**< A mapping of Ipv4/interface pairs to ascii streams */
 
-typedef std::pair<Ptr<Ipv6>, uint32_t> InterfacePairIpv6;
-typedef std::map<InterfacePairIpv6, Ptr<PcapFileWrapper> > InterfaceFileMapIpv6;
-typedef std::map<InterfacePairIpv6, Ptr<OutputStreamWrapper> > InterfaceStreamMapIpv6;
+typedef std::pair<Ptr<Ipv6>, uint32_t> InterfacePairIpv6;  /**< Ipv6/interface pair */
+typedef std::map<InterfacePairIpv6, Ptr<PcapFileWrapper> > InterfaceFileMapIpv6;  /**< Ipv6/interface and Pcap file wrapper container */
+typedef std::map<InterfacePairIpv6, Ptr<OutputStreamWrapper> > InterfaceStreamMapIpv6;  /**< Ipv6/interface and output stream container */
 
 static InterfaceFileMapIpv6 g_interfaceFileMapIpv6; /**< A mapping of Ipv6/interface pairs to pcap files */
 static InterfaceStreamMapIpv6 g_interfaceStreamMapIpv6; /**< A mapping of Ipv6/interface pairs to pcap files */
@@ -490,6 +490,12 @@
   Install (node);
 }
 
+/**
+ * \brief Sync function for IPv4 packet - Pcap output
+ * \param p smart pointer to the packet
+ * \param ipv4 smart pointer to the node's IPv4 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv4L3ProtocolRxTxSink (Ptr<const Packet> p, Ptr<Ipv4> ipv4, uint32_t interface)
 {
@@ -582,6 +588,12 @@
   g_interfaceFileMapIpv4[std::make_pair (ipv4, interface)] = file;
 }
 
+/**
+ * \brief Sync function for IPv6 packet - Pcap output
+ * \param p smart pointer to the packet
+ * \param ipv6 smart pointer to the node's IPv6 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv6L3ProtocolRxTxSink (Ptr<const Packet> p, Ptr<Ipv6> ipv6, uint32_t interface)
 {
@@ -674,6 +686,15 @@
   g_interfaceFileMapIpv6[std::make_pair (ipv6, interface)] = file;
 }
 
+/**
+ * \brief Sync function for IPv4 dropped packet - Ascii output
+ * \param stream the output stream
+ * \param header IPv4 header
+ * \param packet smart pointer to the packet
+ * \param reason the reason for the dropping
+ * \param ipv4 smart pointer to the node's IPv4 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv4L3ProtocolDropSinkWithoutContext (
   Ptr<OutputStreamWrapper> stream,
@@ -701,6 +722,13 @@
   *stream->GetStream () << "d " << Simulator::Now ().GetSeconds () << " " << *p << std::endl;
 }
 
+/**
+ * \brief Sync function for IPv4 transmitted packet - Ascii output
+ * \param stream the output stream
+ * \param packet smart pointer to the packet
+ * \param ipv4 smart pointer to the node's IPv4 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv4L3ProtocolTxSinkWithoutContext (
   Ptr<OutputStreamWrapper> stream,
@@ -718,6 +746,13 @@
   *stream->GetStream () << "t " << Simulator::Now ().GetSeconds () << " " << *packet << std::endl;
 }
 
+/**
+ * \brief Sync function for IPv4 received packet - Ascii output
+ * \param stream the output stream
+ * \param packet smart pointer to the packet
+ * \param ipv4 smart pointer to the node's IPv4 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv4L3ProtocolRxSinkWithoutContext (
   Ptr<OutputStreamWrapper> stream,
@@ -735,6 +770,16 @@
   *stream->GetStream () << "r " << Simulator::Now ().GetSeconds () << " " << *packet << std::endl;
 }
 
+/**
+ * \brief Sync function for IPv4 dropped packet - Ascii output
+ * \param stream the output stream
+ * \param context the context
+ * \param header IPv4 header
+ * \param packet smart pointer to the packet
+ * \param reason the reason for the dropping
+ * \param ipv4 smart pointer to the node's IPv4 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv4L3ProtocolDropSinkWithContext (
   Ptr<OutputStreamWrapper> stream,
@@ -768,6 +813,14 @@
 #endif
 }
 
+/**
+ * \brief Sync function for IPv4 transmitted packet - Ascii output
+ * \param stream the output stream
+ * \param context the context
+ * \param packet smart pointer to the packet
+ * \param ipv4 smart pointer to the node's IPv4 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv4L3ProtocolTxSinkWithContext (
   Ptr<OutputStreamWrapper> stream,
@@ -791,6 +844,14 @@
 #endif
 }
 
+/**
+ * \brief Sync function for IPv4 received packet - Ascii output
+ * \param stream the output stream
+ * \param context the context
+ * \param packet smart pointer to the packet
+ * \param ipv4 smart pointer to the node's IPv4 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv4L3ProtocolRxSinkWithContext (
   Ptr<OutputStreamWrapper> stream,
@@ -963,6 +1024,15 @@
   g_interfaceStreamMapIpv4[std::make_pair (ipv4, interface)] = stream;
 }
 
+/**
+ * \brief Sync function for IPv6 dropped packet - Ascii output
+ * \param stream the output stream
+ * \param header IPv6 header
+ * \param packet smart pointer to the packet
+ * \param reason the reason for the dropping
+ * \param ipv6 smart pointer to the node's IPv6 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv6L3ProtocolDropSinkWithoutContext (
   Ptr<OutputStreamWrapper> stream,
@@ -990,6 +1060,13 @@
   *stream->GetStream () << "d " << Simulator::Now ().GetSeconds () << " " << *p << std::endl;
 }
 
+/**
+ * \brief Sync function for IPv6 transmitted packet - Ascii output
+ * \param stream the output stream
+ * \param packet smart pointer to the packet
+ * \param ipv6 smart pointer to the node's IPv6 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv6L3ProtocolTxSinkWithoutContext (
   Ptr<OutputStreamWrapper> stream,
@@ -1007,6 +1084,13 @@
   *stream->GetStream () << "t " << Simulator::Now ().GetSeconds () << " " << *packet << std::endl;
 }
 
+/**
+ * \brief Sync function for IPv6 received packet - Ascii output
+ * \param stream the output stream
+ * \param packet smart pointer to the packet
+ * \param ipv6 smart pointer to the node's IPv6 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv6L3ProtocolRxSinkWithoutContext (
   Ptr<OutputStreamWrapper> stream,
@@ -1024,6 +1108,16 @@
   *stream->GetStream () << "r " << Simulator::Now ().GetSeconds () << " " << *packet << std::endl;
 }
 
+/**
+ * \brief Sync function for IPv6 dropped packet - Ascii output
+ * \param stream the output stream
+ * \param context the context
+ * \param header IPv6 header
+ * \param packet smart pointer to the packet
+ * \param reason the reason for the dropping
+ * \param ipv6 smart pointer to the node's IPv6 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv6L3ProtocolDropSinkWithContext (
   Ptr<OutputStreamWrapper> stream,
@@ -1057,6 +1151,14 @@
 #endif
 }
 
+/**
+ * \brief Sync function for IPv6 transmitted packet - Ascii output
+ * \param stream the output stream
+ * \param context the context
+ * \param packet smart pointer to the packet
+ * \param ipv6 smart pointer to the node's IPv6 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv6L3ProtocolTxSinkWithContext (
   Ptr<OutputStreamWrapper> stream,
@@ -1080,6 +1182,14 @@
 #endif
 }
 
+/**
+ * \brief Sync function for IPv6 received packet - Ascii output
+ * \param stream the output stream
+ * \param context the context
+ * \param packet smart pointer to the packet
+ * \param ipv6 smart pointer to the node's IPv6 stack
+ * \param interface incoming interface
+ */
 static void
 Ipv6L3ProtocolRxSinkWithContext (
   Ptr<OutputStreamWrapper> stream,
diff -Naur ns-3.18.1/src/internet/helper/internet-stack-helper.h ns-3.19/src/internet/helper/internet-stack-helper.h
--- ns-3.18.1/src/internet/helper/internet-stack-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/internet-stack-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -80,7 +80,15 @@
    * Destroy the InternetStackHelper
    */
   virtual ~InternetStackHelper(void);
+
+  /**
+   * \brief Copy constructor
+   */
   InternetStackHelper (const InternetStackHelper &);
+
+  /**
+   * \brief Copy constructor
+   */
   InternetStackHelper &operator = (const InternetStackHelper &o);
 
   /**
@@ -266,8 +274,21 @@
                                         uint32_t interface,
                                         bool explicitFilename);
 
+  /**
+   * \brief Initialize the helper to its default values
+   */
   void Initialize (void);
+
+  /**
+   * \internal
+   * \brief TCP objects factory
+   */
   ObjectFactory m_tcpFactory;
+
+  /**
+   * \internal
+   * \brief IPv4 routing helper.
+   */
   const Ipv4RoutingHelper *m_routing;
 
   /**
@@ -278,6 +299,10 @@
 
   /**
    * \internal
+   *
+   * \brief create an object from its TypeId and aggregates it to the node
+   * \param node the node
+   * \param typeId the object TypeId
    */
   static void CreateAndAggregateObjectFromTypeId (Ptr<Node> node, const std::string typeId);
 
@@ -288,40 +313,64 @@
 
   /**
    * \internal
+   *
+   * \brief checks if there is an hook to a Pcap wrapper
+   * \param ipv4 pointer to the IPv4 object
+   * \returns true if a hook is found
    */
   bool PcapHooked (Ptr<Ipv4> ipv4);
 
   /**
    * \internal
+   *
+   * \brief checks if there is an hook to an ascii output stream
+   * \param ipv4 pointer to the IPv4 object
+   * \returns true if a hook is found
    */
   bool AsciiHooked (Ptr<Ipv4> ipv4);
 
   /**
    * \internal
+   *
+   * \brief checks if there is an hook to a Pcap wrapper
+   * \param ipv6 pointer to the IPv6 object
+   * \returns true if a hook is found
    */
   bool PcapHooked (Ptr<Ipv6> ipv6);
 
   /**
    * \internal
+   *
+   * \brief checks if there is an hook to an ascii output stream
+   * \param ipv6 pointer to the IPv6 object
+   * \returns true if a hook is found
    */
   bool AsciiHooked (Ptr<Ipv6> ipv6);
 
   /**
+   * \internal
+   *
    * \brief IPv4 install state (enabled/disabled) ?
    */
   bool m_ipv4Enabled;
 
   /**
+   * \internal
+   *
    * \brief IPv6 install state (enabled/disabled) ?
    */
   bool m_ipv6Enabled;
 
   /**
+   * \internal
+   *
    * \brief IPv4 ARP Jitter state (enabled/disabled) ?
    */
   bool m_ipv4ArpJitterEnabled;
 
   /**
+   * \internal
+   *
    * \brief IPv6 IPv6 NS and RS Jitter state (enabled/disabled) ?
    */
   bool m_ipv6NsRsJitterEnabled;
diff -Naur ns-3.18.1/src/internet/helper/internet-trace-helper.h ns-3.19/src/internet/helper/internet-trace-helper.h
--- ns-3.18.1/src/internet/helper/internet-trace-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/internet-trace-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -268,7 +268,7 @@
   void EnableAsciiIpv4All (Ptr<OutputStreamWrapper> stream);
 
   /**
-   * @brief Enable pcap output on the Ipv4 and interface pair specified by a 
+   * @brief Enable ascii trace output on the Ipv4 and interface pair specified by a
    * global node-id (of a previously created node) and interface.  Since there
    * can be only one Ipv4 aggregated to a node, the node-id unambiguously 
    * determines the Ipv4.
@@ -283,7 +283,7 @@
   void EnableAsciiIpv4 (std::string prefix, uint32_t nodeid, uint32_t deviceid, bool explicitFilename);
 
   /**
-   * @brief Enable pcap output on the Ipv4 and interface pair specified by a 
+   * @brief Enable ascii trace output on the Ipv4 and interface pair specified by a
    * global node-id (of a previously created node) and interface.  Since there
    * can be only one Ipv4 aggregated to a node, the node-id unambiguously 
    * determines the Ipv4.
@@ -299,7 +299,21 @@
 
 private:
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv4 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv4 aggregated to a node, the node-id unambiguously
+   * determines the Ipv4.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param nodeid The node identifier/number of the node on which to enable
+   *               ascii tracing
+   * @param interface The device identifier/index of the device on which to enable
+   *               ascii tracing
+   * @param explicitFilename Treat the prefix as an explicit filename if true.
    */
   void EnableAsciiIpv4Impl (Ptr<OutputStreamWrapper> stream, 
                             std::string prefix, 
@@ -308,17 +322,50 @@
                             bool explicitFilename);
 
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv4 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv4 aggregated to a node, the node-id unambiguously
+   * determines the Ipv4.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param n container of nodes.
    */
   void EnableAsciiIpv4Impl (Ptr<OutputStreamWrapper> stream, std::string prefix, NodeContainer n);
 
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv4 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv4 aggregated to a node, the node-id unambiguously
+   * determines the Ipv4.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param c Ipv4InterfaceContainer of Ipv4 and interface pairs
    */
   void EnableAsciiIpv4Impl (Ptr<OutputStreamWrapper> stream, std::string prefix, Ipv4InterfaceContainer c);
 
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv4 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv4 aggregated to a node, the node-id unambiguously
+   * determines the Ipv4.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param ipv4Name Name of the Ptr<Ipv4> on which you want to enable tracing.
+   * @param interface The device identifier/index of the device on which to enable
+   *               ascii tracing
+   * @param explicitFilename Treat the prefix as an explicit filename if true.
    */
   void EnableAsciiIpv4Impl (Ptr<OutputStreamWrapper> stream, 
                             std::string prefix, 
@@ -327,7 +374,20 @@
                             bool explicitFilename);
 
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv4 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv4 aggregated to a node, the node-id unambiguously
+   * determines the Ipv4.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param ipv4 Ptr<Ipv4> on which you want to enable tracing.
+   * @param interface The device identifier/index of the device on which to enable
+   *               ascii tracing
+   * @param explicitFilename Treat the prefix as an explicit filename if true.
    */
   void EnableAsciiIpv4Impl (Ptr<OutputStreamWrapper> stream, 
                             std::string prefix, 
@@ -558,7 +618,7 @@
   void EnableAsciiIpv6 (Ptr<OutputStreamWrapper> stream, NodeContainer n);
 
   /**
-   * @brief Enable pcap output on the Ipv6 and interface pair specified by a 
+   * @brief Enable ascii trace output on the Ipv6 and interface pair specified by a
    * global node-id (of a previously created node) and interface.  Since there
    * can be only one Ipv6 aggregated to a node, the node-id unambiguously 
    * determines the Ipv6.
@@ -573,7 +633,7 @@
   void EnableAsciiIpv6 (std::string prefix, uint32_t nodeid, uint32_t interface, bool explicitFilename);
 
   /**
-   * @brief Enable pcap output on the Ipv6 and interface pair specified by a 
+   * @brief Enable ascii trace output on the Ipv6 and interface pair specified by a
    * global node-id (of a previously created node) and interface.  Since there
    * can be only one Ipv6 aggregated to a node, the node-id unambiguously 
    * determines the Ipv6.
@@ -605,7 +665,21 @@
 
 private:
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv6 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv6 aggregated to a node, the node-id unambiguously
+   * determines the Ipv6.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param nodeid The node identifier/number of the node on which to enable
+   *               ascii tracing
+   * @param interface The device identifier/index of the device on which to enable
+   *               ascii tracing
+   * @param explicitFilename Treat the prefix as an explicit filename if true.
    */
   void EnableAsciiIpv6Impl (Ptr<OutputStreamWrapper> stream, 
                             std::string prefix, 
@@ -614,17 +688,50 @@
                             bool explicitFilename);
 
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv6 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv6 aggregated to a node, the node-id unambiguously
+   * determines the Ipv6.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param n container of nodes.
    */
   void EnableAsciiIpv6Impl (Ptr<OutputStreamWrapper> stream, std::string prefix, NodeContainer n);
 
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv6 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv6 aggregated to a node, the node-id unambiguously
+   * determines the Ipv6.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param c Ipv6InterfaceContainer of Ipv6 and interface pairs
    */
   void EnableAsciiIpv6Impl (Ptr<OutputStreamWrapper> stream, std::string prefix, Ipv6InterfaceContainer c);
 
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv6 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv6 aggregated to a node, the node-id unambiguously
+   * determines the Ipv6.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param ipv6Name Name of the Ptr<Ipv6> on which you want to enable tracing.
+   * @param interface The device identifier/index of the device on which to enable
+   *               ascii tracing
+   * @param explicitFilename Treat the prefix as an explicit filename if true.
    */
   void EnableAsciiIpv6Impl (Ptr<OutputStreamWrapper> stream, 
                             std::string prefix, 
@@ -633,7 +740,20 @@
                             bool explicitFilename);
 
   /**
-   * @internal Avoid code duplication.
+   * @internal
+   *
+   * @brief Enable ascii trace output on the Ipv6 and interface pair specified by a
+   * global node-id (of a previously created node) and interface.  Since there
+   * can be only one Ipv6 aggregated to a node, the node-id unambiguously
+   * determines the Ipv6.
+   *
+   * @param stream An OutputStreamWrapper representing an existing file to use
+   *               when writing trace data.
+   * @param prefix Filename prefix to use when creating ascii trace files
+   * @param ipv6 Ptr<Ipv6> on which you want to enable tracing.
+   * @param interface The device identifier/index of the device on which to enable
+   *               ascii tracing
+   * @param explicitFilename Treat the prefix as an explicit filename if true.
    */
   void EnableAsciiIpv6Impl (Ptr<OutputStreamWrapper> stream, 
                             std::string prefix, 
diff -Naur ns-3.18.1/src/internet/helper/ipv4-address-helper.cc ns-3.19/src/internet/helper/ipv4-address-helper.cc
--- ns-3.18.1/src/internet/helper/ipv4-address-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv4-address-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -161,7 +161,7 @@
   return retval;
 }
 
-const uint32_t N_BITS = 32;
+const uint32_t N_BITS = 32; //!< number of bits in a IPv4 address
 
 uint32_t
 Ipv4AddressHelper::NumAddressBits (uint32_t maskbits) const
diff -Naur ns-3.18.1/src/internet/helper/ipv4-address-helper.h ns-3.19/src/internet/helper/ipv4-address-helper.h
--- ns-3.18.1/src/internet/helper/ipv4-address-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv4-address-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -178,15 +178,18 @@
 private:
   /**
    * @internal
+   * \brief Returns the number of address bits (hostpart) for a given netmask
+   * \param maskbits the netmask
+   * \returns the number of bits in the hostpart
    */
   uint32_t NumAddressBits (uint32_t maskbits) const;
 
-  uint32_t m_network;
-  uint32_t m_mask;
-  uint32_t m_address;
-  uint32_t m_base;
-  uint32_t m_shift;
-  uint32_t m_max;
+  uint32_t m_network; //!< network address
+  uint32_t m_mask;    //!< network mask
+  uint32_t m_address; //!< address
+  uint32_t m_base;    //!< base address
+  uint32_t m_shift;   //!< shift, equivalent to the number of bits in the hostpart
+  uint32_t m_max;     //!< maximum allowed address
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/helper/ipv4-global-routing-helper.h ns-3.19/src/internet/helper/ipv4-global-routing-helper.h
--- ns-3.18.1/src/internet/helper/ipv4-global-routing-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv4-global-routing-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -88,8 +88,9 @@
    * \internal
    * \brief Assignment operator declared private and not implemented to disallow
    * assignment and prevent the compiler from happily inserting its own.
+   * \return
    */
-  Ipv4GlobalRoutingHelper &operator = (const Ipv4GlobalRoutingHelper &o);
+  Ipv4GlobalRoutingHelper &operator = (const Ipv4GlobalRoutingHelper &);
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/helper/ipv4-interface-container.h ns-3.19/src/internet/helper/ipv4-interface-container.h
--- ns-3.18.1/src/internet/helper/ipv4-interface-container.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv4-interface-container.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,9 @@
 class Ipv4InterfaceContainer
 {
 public:
+  /**
+   * \brief Container Const Iterator for pairs of Ipv4 smart pointer / Interface Index.
+   */
   typedef std::vector<std::pair<Ptr<Ipv4>, uint32_t> >::const_iterator Iterator;
 
   /**
@@ -124,6 +127,11 @@
    */
   Ipv4Address GetAddress (uint32_t i, uint32_t j = 0) const;
 
+  /**
+   * \brief Set a metric for the given interface
+   * \param i Interface index
+   * \param metric the interface metric
+   */
   void SetMetric (uint32_t i, uint16_t metric);
 
   /**
@@ -163,15 +171,24 @@
    * Get the std::pair of an Ptr<Ipv4> and interface stored at the location 
    * specified by the index.
    *
-   * \param i the index of the entery to retrieve.
+   * \param i the index of the entry to retrieve.
+   * \return the Ipv4InterfaceContainer
    *
    * @see Ipv4InterfaceContainer
    */
   std::pair<Ptr<Ipv4>, uint32_t> Get (uint32_t i) const;
 
 private:
-
+  /**
+   * \internal
+   * \brief Container for pairs of Ipv4 smart pointer / Interface Index.
+   */
   typedef std::vector<std::pair<Ptr<Ipv4>,uint32_t> > InterfaceVector;
+
+  /**
+   * \internal
+   * \brief List of IPv4 stack and interfaces index.
+   */
   InterfaceVector m_interfaces;
 };
 
diff -Naur ns-3.18.1/src/internet/helper/ipv4-list-routing-helper.h ns-3.19/src/internet/helper/ipv4-list-routing-helper.h
--- ns-3.18.1/src/internet/helper/ipv4-list-routing-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv4-list-routing-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -85,9 +85,14 @@
    * \internal
    * \brief Assignment operator declared private and not implemented to disallow
    * assignment and prevent the compiler from happily inserting its own.
+   * \return
    */
-  Ipv4ListRoutingHelper &operator = (const Ipv4ListRoutingHelper &o);
+  Ipv4ListRoutingHelper &operator = (const Ipv4ListRoutingHelper &);
 
+  /**
+   * \internal
+   * \brief Container for pairs of Ipv4RoutingHelper pointer / priority.
+   */
   std::list<std::pair<const Ipv4RoutingHelper *,int16_t> > m_list;
 };
 
diff -Naur ns-3.18.1/src/internet/helper/ipv4-routing-helper.h ns-3.19/src/internet/helper/ipv4-routing-helper.h
--- ns-3.18.1/src/internet/helper/ipv4-routing-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv4-routing-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -110,7 +110,7 @@
   void PrintRoutingTableEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
 
   /**
-   * \brief Request a specified routing protocol <T> from Ipv4RoutingProtocol protocol
+   * \brief Request a specified routing protocol &lt;T&gt; from Ipv4RoutingProtocol protocol
    *
    * If protocol is Ipv4ListRouting, then protocol will be searched in the list,
    * otherwise a simple DynamicCast will be performed
@@ -122,11 +122,44 @@
   static Ptr<T> GetRouting (Ptr<Ipv4RoutingProtocol> protocol);
   
 private:
+  /**
+   * \internal
+   *
+   * \brief prints the routing tables of a node.
+   * \param node The node ptr for which we need the routing table to be printed
+   * \param stream The output stream object to use
+   *
+   * This method calls the PrintRoutingTable() method of the
+   * Ipv6RoutingProtocol stored in the Ipv6 object;
+   * the output format is routing protocol-specific.
+   */
   void Print (Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
+
+  /**
+   * \internal
+   *
+   * \brief prints the routing tables of a node at regular intervals specified by user.
+   * \param printInterval the time interval for which the routing table is supposed to be printed.
+   * \param node The node ptr for which we need the routing table to be printed
+   * \param stream The output stream object to use
+   *
+   * This method calls the PrintRoutingTable() method of the
+   * Ipv6RoutingProtocol stored in the Ipv6 object, for the selected node
+   * at the specified interval; the output format is routing protocol-specific.
+   */
   void PrintEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
 };
 
 
+/**
+ * \brief Request a specified routing protocol &lt;T&gt; from Ipv4RoutingProtocol protocol
+ *
+ * If protocol is Ipv4ListRouting, then protocol will be searched in the list,
+ * otherwise a simple DynamicCast will be performed
+ *
+ * \param protocol Smart pointer to Ipv4RoutingProtocol object
+ * \return a Smart Pointer to the requested protocol (zero if the protocol can't be found)
+ */
 template<class T>
 Ptr<T> Ipv4RoutingHelper::GetRouting (Ptr<Ipv4RoutingProtocol> protocol)
 {
diff -Naur ns-3.18.1/src/internet/helper/ipv4-static-routing-helper.h ns-3.19/src/internet/helper/ipv4-static-routing-helper.h
--- ns-3.18.1/src/internet/helper/ipv4-static-routing-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv4-static-routing-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -75,6 +75,7 @@
    * Ipv4 provided.
    *
    * \param ipv4 the Ptr<Ipv4> to search for the static routing protocol
+   * \returns Ipv4StaticRouting pointer or 0 if not found
    */
   Ptr<Ipv4StaticRouting> GetStaticRouting (Ptr<Ipv4> ipv4) const;
 
@@ -160,8 +161,9 @@
    * \internal
    * \brief Assignment operator declared private and not implemented to disallow
    * assignment and prevent the compiler from happily inserting its own.
+   * \returns
    */
-  Ipv4StaticRoutingHelper &operator = (const Ipv4StaticRoutingHelper &o);
+  Ipv4StaticRoutingHelper &operator = (const Ipv4StaticRoutingHelper &);
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/helper/ipv6-address-helper.cc ns-3.19/src/internet/helper/ipv6-address-helper.cc
--- ns-3.18.1/src/internet/helper/ipv6-address-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv6-address-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 namespace ns3 
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper");
+NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper")
+  ;
 
 Ipv6AddressHelper::Ipv6AddressHelper ()
 {
diff -Naur ns-3.18.1/src/internet/helper/ipv6-address-helper.h ns-3.19/src/internet/helper/ipv6-address-helper.h
--- ns-3.18.1/src/internet/helper/ipv6-address-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv6-address-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -73,6 +73,11 @@
  * If this method is called, the addressed returned will include a
  * modified EUI-64-format identifier created from the MAC address as 
  * specified in \RFC{4291}.
+ *
+ * BEWARE: the underlying implementation acts as a Singleton.
+ * In other terms, two different instances of Ipv6AddressHelper will
+ * pick IPv6 numbers from the same pool. Changing the network in one of them
+ * will also change the network in the other instances.
  */
 class Ipv6AddressHelper
 {
diff -Naur ns-3.18.1/src/internet/helper/ipv6-interface-container.h ns-3.19/src/internet/helper/ipv6-interface-container.h
--- ns-3.18.1/src/internet/helper/ipv6-interface-container.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv6-interface-container.h	2013-12-20 09:44:50.000000000 -0800
@@ -41,7 +41,12 @@
 class Ipv6InterfaceContainer
 {
 public:
+
+  /**
+   * \brief Container Const Iterator for pairs of Ipv6 smart pointer / Interface Index.
+   */
   typedef std::vector<std::pair<Ptr<Ipv6>, uint32_t> >::const_iterator Iterator;
+
   /**
    * \brief Constructor.
    */
@@ -205,6 +210,10 @@
   void SetDefaultRoute (uint32_t i, Ipv6Address routerAddr);
 
 private:
+  /**
+   * \internal
+   * \brief Container for pairs of Ipv6 smart pointer / Interface Index.
+   */
   typedef std::vector<std::pair<Ptr<Ipv6>, uint32_t> > InterfaceVector;
 
   /**
diff -Naur ns-3.18.1/src/internet/helper/ipv6-list-routing-helper.h ns-3.19/src/internet/helper/ipv6-list-routing-helper.h
--- ns-3.18.1/src/internet/helper/ipv6-list-routing-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv6-list-routing-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -86,9 +86,15 @@
    * \internal
    * \brief Assignment operator declared private and not implemented to disallow
    * assignment and prevent the compiler from happily inserting its own.
+   * \param o object to copy from
+   * \returns a reference to the new object
    */
   Ipv6ListRoutingHelper &operator = (const Ipv6ListRoutingHelper &o);
 
+  /**
+   * \internal
+   * \brief Container for pairs of Ipv6RoutingHelper pointer / priority.
+   */
   std::list<std::pair<const Ipv6RoutingHelper *,int16_t> > m_list;
 };
 
diff -Naur ns-3.18.1/src/internet/helper/ipv6-routing-helper.h ns-3.19/src/internet/helper/ipv6-routing-helper.h
--- ns-3.18.1/src/internet/helper/ipv6-routing-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv6-routing-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -112,7 +112,7 @@
   void PrintRoutingTableEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
 
   /**
-   * \brief Request a specified routing protocol <T> from Ipv6RoutingProtocol protocol
+   * \brief Request a specified routing protocol &lt;T&gt; from Ipv6RoutingProtocol protocol
    *
    * If protocol is Ipv6ListRouting, then protocol will be searched in the list,
    * otherwise a simple DynamicCast will be performed
@@ -124,10 +124,43 @@
   static Ptr<T> GetRouting (Ptr<Ipv6RoutingProtocol> protocol);
   
 private:
+  /**
+   * \internal
+   *
+   * \brief prints the routing tables of a node.
+   * \param node The node ptr for which we need the routing table to be printed
+   * \param stream The output stream object to use
+   *
+   * This method calls the PrintRoutingTable() method of the
+   * Ipv6RoutingProtocol stored in the Ipv6 object;
+   * the output format is routing protocol-specific.
+   */
   void Print (Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
+
+  /**
+   * \internal
+   *
+   * \brief prints the routing tables of a node at regular intervals specified by user.
+   * \param printInterval the time interval for which the routing table is supposed to be printed.
+   * \param node The node ptr for which we need the routing table to be printed
+   * \param stream The output stream object to use
+   *
+   * This method calls the PrintRoutingTable() method of the
+   * Ipv6RoutingProtocol stored in the Ipv6 object, for the selected node
+   * at the specified interval; the output format is routing protocol-specific.
+   */
   void PrintEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
 };
 
+/**
+ * \brief Request a specified routing protocol &lt;T&gt; from Ipv6RoutingProtocol protocol
+ *
+ * If protocol is Ipv6ListRouting, then protocol will be searched in the list,
+ * otherwise a simple DynamicCast will be performed
+ *
+ * \param protocol Smart pointer to Ipv6RoutingProtocol object
+ * \return a Smart Pointer to the requested protocol (zero if the protocol can't be found)
+ */
 template<class T>
 Ptr<T> Ipv6RoutingHelper::GetRouting (Ptr<Ipv6RoutingProtocol> protocol)
 {
diff -Naur ns-3.18.1/src/internet/helper/ipv6-static-routing-helper.h ns-3.19/src/internet/helper/ipv6-static-routing-helper.h
--- ns-3.18.1/src/internet/helper/ipv6-static-routing-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/helper/ipv6-static-routing-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -72,7 +72,7 @@
   /**
    * \brief Get Ipv6StaticRouting pointer from IPv6 stack.
    * \param ipv6 Ipv6 pointer
-   * \return Ipv6StaticRouting pointer or 0 if not exist
+   * \return Ipv6StaticRouting pointer or 0 if not found
    */
   Ptr<Ipv6StaticRouting> GetStaticRouting (Ptr<Ipv6> ipv6) const;
 
@@ -121,6 +121,8 @@
    * \internal
    * \brief Assignment operator declared private and not implemented to disallow
    * assignment and prevent the compiler from happily inserting its own.
+   * \param o object to copy from
+   * \returns a reference to the new object
    */
   Ipv6StaticRoutingHelper &operator = (const Ipv6StaticRoutingHelper &o);
 };
diff -Naur ns-3.18.1/src/internet/model/arp-cache.cc ns-3.19/src/internet/model/arp-cache.cc
--- ns-3.18.1/src/internet/model/arp-cache.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/arp-cache.cc	2013-12-20 09:44:50.000000000 -0800
@@ -33,7 +33,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ArpCache);
+NS_OBJECT_ENSURE_REGISTERED (ArpCache)
+  ;
 
 TypeId 
 ArpCache::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/arp-cache.h ns-3.19/src/internet/model/arp-cache.h
--- ns-3.18.1/src/internet/model/arp-cache.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/arp-cache.h	2013-12-20 09:44:50.000000000 -0800
@@ -49,34 +49,78 @@
 class ArpCache : public Object
 {
 private:
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   */
   ArpCache (ArpCache const &);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   * \returns
+   */
   ArpCache& operator= (ArpCache const &);
 
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   class Entry;
   ArpCache ();
   ~ArpCache ();
 
   /**
+   * \brief Set the NetDevice and Ipv4Interface associated with the ArpCache
+   *
    * \param device The hardware NetDevice associated with this ARP chache
    * \param interface the Ipv4Interface associated with this ARP chache
    */
   void SetDevice (Ptr<NetDevice> device, Ptr<Ipv4Interface> interface);
   /**
+   * \brief Returns the NetDevice that this ARP cache is associated with
    * \return The NetDevice that this ARP cache is associated with
    */
   Ptr<NetDevice> GetDevice (void) const;
   /**
+   * \brief Returns the Ipv4Interface that this ARP cache is associated with
    * \return the Ipv4Interface that this ARP cache is associated with
    */
   Ptr<Ipv4Interface> GetInterface (void) const;
 
+  /**
+   * \brief Set the time the entry will be in ALIVE state (unless refreshed)
+   * \param aliveTimeout the Alive state timeout
+   */
   void SetAliveTimeout (Time aliveTimeout);
+  /**
+   * \brief Set the time the entry will be in DEAD state before being removed
+   * \param deadTimeout the Dead state timeout
+   */
   void SetDeadTimeout (Time deadTimeout);
+  /**
+   * \brief Set the time the entry will be in WAIT_REPLY state
+   * \param waitReplyTimeout the WAIT_REPLY state timeout
+   */
   void SetWaitReplyTimeout (Time waitReplyTimeout);
+
+  /**
+   * \brief Get the time the entry will be in ALIVE state (unless refreshed)
+   * \returns the Alive state timeout
+   */
   Time GetAliveTimeout (void) const;
+  /**
+   * \brief Get the time the entry will be in DEAD state before being removed
+   * \returns the Dead state timeout
+   */
   Time GetDeadTimeout (void) const;
+  /**
+   * \brief Get the time the entry will be in WAIT_REPLY state
+   * \returns the WAIT_REPLY state timeout
+   */
   Time GetWaitReplyTimeout (void) const;
 
   /**
@@ -190,46 +234,65 @@
     void ClearRetries (void);
 
 private:
+    /**
+     * \brief ARP cache entry states
+     */
     enum ArpCacheEntryState_e {
       ALIVE,
       WAIT_REPLY,
       DEAD
     };
 
+    /**
+     * \brief Update the entry when seeing a packet
+     */
     void UpdateSeen (void);
+
+    /**
+     * \brief Returns the entry timeout
+     * \returns the entry timeout
+     */
     Time GetTimeout (void) const;
-    ArpCache *m_arp;
-    ArpCacheEntryState_e m_state;
-    Time m_lastSeen;
-    Address m_macAddress;
-    Ipv4Address m_ipv4Address;
-    std::list<Ptr<Packet> > m_pending;
-    uint32_t m_retries;
+
+    ArpCache *m_arp; //!< pointer to the ARP cache owning the entry
+    ArpCacheEntryState_e m_state; //!< state of the entry
+    Time m_lastSeen; //!< last moment a packet from that address has been seen
+    Address m_macAddress; //!< entry's MAC address
+    Ipv4Address m_ipv4Address; //!< entry's IP address
+    std::list<Ptr<Packet> > m_pending; //!< list of pending packets for the entry's IP
+    uint32_t m_retries; //!< rerty counter
   };
 
 private:
+  /**
+   * \brief ARP Cache container
+   */
   typedef sgi::hash_map<Ipv4Address, ArpCache::Entry *, Ipv4AddressHash> Cache;
+  /**
+   * \brief ARP Cache container iterator
+   */
   typedef sgi::hash_map<Ipv4Address, ArpCache::Entry *, Ipv4AddressHash>::iterator CacheI;
 
   virtual void DoDispose (void);
 
-  Ptr<NetDevice> m_device;
-  Ptr<Ipv4Interface> m_interface;
-  Time m_aliveTimeout;
-  Time m_deadTimeout;
-  Time m_waitReplyTimeout;
-  EventId m_waitReplyTimer;
-  Callback<void, Ptr<const ArpCache>, Ipv4Address> m_arpRequestCallback;
-  uint32_t m_maxRetries;
+  Ptr<NetDevice> m_device; //!< NetDevice associated with the cache
+  Ptr<Ipv4Interface> m_interface; //!< Ipv4Interface associated with the cache
+  Time m_aliveTimeout; //!< cache alive state timeout
+  Time m_deadTimeout; //!< cache dead state timeout
+  Time m_waitReplyTimeout; //!< cache reply state timeout
+  EventId m_waitReplyTimer;  //!< cache alive state timer
+  Callback<void, Ptr<const ArpCache>, Ipv4Address> m_arpRequestCallback;  //!< reply timeout callback
+  uint32_t m_maxRetries; //!< max retries for a resolution
+
   /**
    * This function is an event handler for the event that the
    * ArpCache wants to check whether it must retry any Arp requests.
    * If there are no Arp requests pending, this event is not scheduled.
    */
   void HandleWaitReplyTimeout (void);
-  uint32_t m_pendingQueueSize;
-  Cache m_arpCache;
-  TracedCallback<Ptr<const Packet> > m_dropTrace;
+  uint32_t m_pendingQueueSize; //!< number of packets waiting for a resolution
+  Cache m_arpCache; //!< the ARP cache
+  TracedCallback<Ptr<const Packet> > m_dropTrace; //!< trace for packets dropped by the ARP cache queue
 };
 
 
diff -Naur ns-3.18.1/src/internet/model/arp-header.cc ns-3.19/src/internet/model/arp-header.cc
--- ns-3.18.1/src/internet/model/arp-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/arp-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ArpHeader);
+NS_OBJECT_ENSURE_REGISTERED (ArpHeader)
+  ;
 
 void 
 ArpHeader::SetRequest (Address sourceHardwareAddress,
diff -Naur ns-3.18.1/src/internet/model/arp-header.h ns-3.19/src/internet/model/arp-header.h
--- ns-3.18.1/src/internet/model/arp-header.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/arp-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,21 +34,69 @@
 class ArpHeader : public Header 
 {
 public:
+  /**
+   * \brief Set the ARP request parameters
+   * \param sourceHardwareAddress the source hardware address
+   * \param sourceProtocolAddress the source IP address
+   * \param destinationHardwareAddress the destination hardware address (usually the broadcast address)
+   * \param destinationProtocolAddress the destination IP address
+   */
   void SetRequest (Address sourceHardwareAddress,
                    Ipv4Address sourceProtocolAddress,
                    Address destinationHardwareAddress,
                    Ipv4Address destinationProtocolAddress);
+  /**
+   * \brief Set the ARP reply parameters
+   * \param sourceHardwareAddress the source hardware address
+   * \param sourceProtocolAddress the source IP address
+   * \param destinationHardwareAddress the destination hardware address (usually the broadcast address)
+   * \param destinationProtocolAddress the destination IP address
+   */
   void SetReply (Address sourceHardwareAddress,
                  Ipv4Address sourceProtocolAddress,
                  Address destinationHardwareAddress,
                  Ipv4Address destinationProtocolAddress);
+
+  /**
+   * \brief Check if the ARP is a request
+   * \returns true if it is a request
+   */
   bool IsRequest (void) const;
+
+  /**
+   * \brief Check if the ARP is a reply
+   * \returns true if it is a reply
+   */
   bool IsReply (void) const;
+
+  /**
+   * \brief Returns the source hardware address
+   * \returns the source hardware address
+   */
   Address GetSourceHardwareAddress (void);
+
+  /**
+   * \brief Returns the destination hardware address
+   * \returns the destination hardware address
+   */
   Address GetDestinationHardwareAddress (void);
+
+  /**
+   * \brief Returns the source IP address
+   * \returns the source IP address
+   */
   Ipv4Address GetSourceIpv4Address (void);
+
+  /**
+   * \brief Returns the destination IP address
+   * \returns the destination IP address
+   */
   Ipv4Address GetDestinationIpv4Address (void);
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
   virtual void Print (std::ostream &os) const;
@@ -56,15 +104,18 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
+  /**
+   * \brief Enumeration listing the possible ARP types
+   */
   enum ArpType_e {
     ARP_TYPE_REQUEST = 1,
     ARP_TYPE_REPLY   = 2
   };
-  uint16_t m_type;
-  Address m_macSource;
-  Address m_macDest;
-  Ipv4Address m_ipv4Source;
-  Ipv4Address m_ipv4Dest;
+  uint16_t m_type;           //!< type of the ICMP (ARP_TYPE_REQUEST)
+  Address m_macSource;       //!< hardware source address
+  Address m_macDest;         //!< hardware destination address
+  Ipv4Address m_ipv4Source;  //!< IP source address
+  Ipv4Address m_ipv4Dest;    //!< IP destination address
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/arp-l3-protocol.cc ns-3.19/src/internet/model/arp-l3-protocol.cc
--- ns-3.18.1/src/internet/model/arp-l3-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/arp-l3-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 
 const uint16_t ArpL3Protocol::PROT_NUMBER = 0x0806;
 
-NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol);
+NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol)
+  ;
 
 TypeId 
 ArpL3Protocol::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/arp-l3-protocol.h ns-3.19/src/internet/model/arp-l3-protocol.h
--- ns-3.18.1/src/internet/model/arp-l3-protocol.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/arp-l3-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -49,29 +49,49 @@
 class ArpL3Protocol : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
-  static const uint16_t PROT_NUMBER;
+  static const uint16_t PROT_NUMBER; //!< ARP protocol number (0x0806)
 
   ArpL3Protocol ();
   virtual ~ArpL3Protocol ();
 
+  /**
+   * \brief Set the node the ARP L3 protocol is associated with
+   * \param node the node
+   */
   void SetNode (Ptr<Node> node);
 
+  /**
+   * \brief Create an ARP cache for the device/interface
+   * \param device the NetDevice
+   * \param interface the Ipv4Interface
+   * \returns a smart pointer to the ARP cache
+   */
   Ptr<ArpCache> CreateCache (Ptr<NetDevice> device, Ptr<Ipv4Interface> interface);
 
   /**
    * \brief Receive a packet
+   * \param device the source NetDevice
+   * \param p the packet
+   * \param protocol the protocol
+   * \param from the source address
+   * \param to the destination address
+   * \param packetType type of packet (i.e., unicast, multicast, etc.)
    */
   void Receive (Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t protocol, const Address &from, const Address &to,
                 NetDevice::PacketType packetType);
   /**
    * \brief Perform an ARP lookup
-   * \param p
-   * \param destination
-   * \param device
-   * \param cache
-   * \param hardwareDestination
-   * \return 
+   * \param p the packet
+   * \param destination destination IP address
+   * \param device outgoing device
+   * \param cache ARP cache
+   * \param hardwareDestination filled with the destination MAC address (if the entry exists)
+   * \return true if there is a matching ARP Entry
    */
   bool Lookup (Ptr<Packet> p, Ipv4Address destination, 
                Ptr<NetDevice> device,
@@ -96,16 +116,49 @@
    */
   virtual void NotifyNewAggregate ();
 private:
-  typedef std::list<Ptr<ArpCache> > CacheList;
+  typedef std::list<Ptr<ArpCache> > CacheList; //!< container of the ARP caches
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   * \param o
+   */
   ArpL3Protocol (const ArpL3Protocol &o);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   * \param o
+   * \returns
+   */
   ArpL3Protocol &operator = (const ArpL3Protocol &o);
+
+  /**
+   * \brief Finds the cache associated with a NetDevice
+   * \param device the NetDevice
+   * \returns the ARP cache, or null if no cache is found
+   */
   Ptr<ArpCache> FindCache (Ptr<NetDevice> device);
+
+  /**
+   * \brief Send an ARP request to an host
+   * \param cache the ARP cache to use
+   * \param to the destination IP
+   */
   void SendArpRequest (Ptr<const ArpCache>cache, Ipv4Address to);
+  /**
+   * \brief Send an ARP reply to an host
+   * \param cache the ARP cache to use
+   * \param myIp the source IP address
+   * \param toIp the destination IP
+   * \param toMac the destination MAC address
+   */
   void SendArpReply (Ptr<const ArpCache> cache, Ipv4Address myIp, Ipv4Address toIp, Address toMac);
-  CacheList m_cacheList;
-  Ptr<Node> m_node;
-  TracedCallback<Ptr<const Packet> > m_dropTrace;
-  Ptr<RandomVariableStream> m_requestJitter;
+
+  CacheList m_cacheList; //!< ARP cache container
+  Ptr<Node> m_node; //!< node the ARP L3 protocol is associated with
+  TracedCallback<Ptr<const Packet> > m_dropTrace; //!< trace for packets dropped by ARP
+  Ptr<RandomVariableStream> m_requestJitter; //!< jitter to de-sync ARP requests
 
 };
 
diff -Naur ns-3.18.1/src/internet/model/candidate-queue.cc ns-3.19/src/internet/model/candidate-queue.cc
--- ns-3.18.1/src/internet/model/candidate-queue.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/candidate-queue.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,6 +27,13 @@
 
 namespace ns3 {
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param t the SPFVertex type
+ * \returns the reference to the output stream
+ */
 std::ostream&
 operator<< (std::ostream& os, const SPFVertex::VertexType& t)
 {
diff -Naur ns-3.18.1/src/internet/model/candidate-queue.h ns-3.19/src/internet/model/candidate-queue.h
--- ns-3.18.1/src/internet/model/candidate-queue.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/candidate-queue.h	2013-12-20 09:44:50.000000000 -0800
@@ -176,6 +176,7 @@
  * prevent the compiler from slipping in incorrect versions that don't
  * properly deal with deep copies.
  * \param sr object to assign
+ * \return copied object
  */
   CandidateQueue& operator= (CandidateQueue& sr);
 /**
@@ -185,13 +186,22 @@
  * defined by this method. If v1 should be popped before v2, this 
  * method return true; false otherwise
  *
+ * \param v1 first operand
+ * \param v2 second operand
  * \return True if v1 should be popped before v2; false otherwise
  */
   static bool CompareSPFVertex (const SPFVertex* v1, const SPFVertex* v2);
 
-  typedef std::list<SPFVertex*> CandidateList_t;
-  CandidateList_t m_candidates;
+  typedef std::list<SPFVertex*> CandidateList_t; //!< container of SPFVertex pointers
+  CandidateList_t m_candidates;  //!< SPFVertex candidates
 
+  /**
+   * \brief Stream insertion operator.
+   *
+   * \param os the reference to the output stream
+   * \param q the CandidateQueue
+   * \returns the reference to the output stream
+   */
   friend std::ostream& operator<< (std::ostream& os, const CandidateQueue& q);
 };
 
diff -Naur ns-3.18.1/src/internet/model/global-route-manager-impl.cc ns-3.19/src/internet/model/global-route-manager-impl.cc
--- ns-3.18.1/src/internet/model/global-route-manager-impl.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/global-route-manager-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -44,6 +44,13 @@
 
 namespace ns3 {
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param exit the exit node
+ * \returns the reference to the output stream
+ */
 std::ostream& 
 operator<< (std::ostream& os, const SPFVertex::NodeExit_t& exit)
 {
@@ -704,8 +711,9 @@
       Ptr<GlobalRouter> rtr = 
         node->GetObject<GlobalRouter> ();
 
+      uint32_t systemId = MpiInterface::GetSystemId ();
       // Ignore nodes that are not assigned to our systemId (distributed sim)
-      if (node->GetSystemId () != MpiInterface::GetSystemId ()) 
+      if (node->GetSystemId () != systemId) 
         {
           continue;
         }
diff -Naur ns-3.18.1/src/internet/model/global-route-manager-impl.h ns-3.19/src/internet/model/global-route-manager-impl.h
--- ns-3.18.1/src/internet/model/global-route-manager-impl.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/global-route-manager-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,7 @@
 
 namespace ns3 {
 
-const uint32_t SPF_INFINITY = 0xffffffff;
+const uint32_t SPF_INFINITY = 0xffffffff; //!< "infinite" distance between nodes
 
 class CandidateQueue;
 class Ipv4GlobalRouting;
@@ -298,7 +298,9 @@
  * network represented by "this" SPFVertex.
  */
   void SetRootExitDirection (Ipv4Address nextHop, int32_t id = SPF_INFINITY);
-  typedef std::pair<Ipv4Address, int32_t> NodeExit_t;
+
+  typedef std::pair<Ipv4Address, int32_t> NodeExit_t; //!< IPv4 / interface container for exit nodes.
+
 /**
  * @brief Set the IP address and outgoing interface index that should be used 
  * to begin forwarding packets from the root SPFVertex to "this" SPFVertex.
@@ -532,22 +534,27 @@
    */ 
   bool IsVertexProcessed (void) const;
 
+  /**
+   * @brief Clear the value of the VertexProcessed flag
+   *
+   * Flag to note whether vertex has been processed in stage two of
+   * SPF computation
+   */
   void ClearVertexProcessed (void);
 
 private:
-  VertexType m_vertexType;
-  Ipv4Address m_vertexId;
-  GlobalRoutingLSA* m_lsa;
-  uint32_t m_distanceFromRoot;
-  int32_t m_rootOif;
-  Ipv4Address m_nextHop;
-  typedef std::list< NodeExit_t > ListOfNodeExit_t;
-  /// store the multiple root's exits for supporting ECMP
-  ListOfNodeExit_t m_ecmpRootExits;
-  typedef std::list<SPFVertex*> ListOfSPFVertex_t;
-  ListOfSPFVertex_t m_parents;
-  ListOfSPFVertex_t m_children;
-  bool m_vertexProcessed; 
+  VertexType m_vertexType; //!< Vertex type
+  Ipv4Address m_vertexId; //!< Vertex ID
+  GlobalRoutingLSA* m_lsa; //!< Link State Advertisement
+  uint32_t m_distanceFromRoot; //!< Distance from root node
+  int32_t m_rootOif; //!< root Output Interface
+  Ipv4Address m_nextHop; //!< next hop
+  typedef std::list< NodeExit_t > ListOfNodeExit_t; //!< container of Exit nodes
+  ListOfNodeExit_t m_ecmpRootExits; //!< store the multiple root's exits for supporting ECMP
+  typedef std::list<SPFVertex*> ListOfSPFVertex_t; //!< container of SPFVertexes
+  ListOfSPFVertex_t m_parents; //!< parent list
+  ListOfSPFVertex_t m_children; //!< Children list
+  bool m_vertexProcessed; //!< Flag to note whether vertex has been processed in stage two of SPF computation
 
 /**
  * @brief The SPFVertex copy construction is disallowed.  There's no need for
@@ -561,8 +568,13 @@
  */
   SPFVertex& operator= (SPFVertex& v);
 
-  //friend std::ostream& operator<< (std::ostream& os, const ListOfIf_t& ifs);
-  //friend std::ostream& operator<< (std::ostream& os, const ListOfAddr_t& addrs);
+  /**
+   * \brief Stream insertion operator.
+   *
+   * \param os the reference to the output stream
+   * \param vs a list of SPFVertexes
+   * \returns the reference to the output stream
+   */
   friend std::ostream& operator<< (std::ostream& os, const SPFVertex::ListOfSPFVertex_t& vs);
 };
 
@@ -662,16 +674,35 @@
  */
   void Initialize ();
 
+  /**
+   * @brief Look up the External Link State Advertisement associated with the given
+   * index.
+   * @internal
+   *
+   * The external database map is searched for the given index and corresponding
+   * GlobalRoutingLSA is returned.
+   *
+   * @see GlobalRoutingLSA
+   * @param index the index associated with the LSA.
+   * @returns A pointer to the Link State Advertisement.
+   */
   GlobalRoutingLSA* GetExtLSA (uint32_t index) const;
+  /**
+   * @brief Get the number of External Link State Advertisements.
+   * @internal
+   *
+   * @see GlobalRoutingLSA
+   * @returns the number of External Link State Advertisements.
+   */
   uint32_t GetNumExtLSAs () const;
 
 
 private:
-  typedef std::map<Ipv4Address, GlobalRoutingLSA*> LSDBMap_t;
-  typedef std::pair<Ipv4Address, GlobalRoutingLSA*> LSDBPair_t;
+  typedef std::map<Ipv4Address, GlobalRoutingLSA*> LSDBMap_t; //!< container of IPv4 addresses / Link State Advertisements
+  typedef std::pair<Ipv4Address, GlobalRoutingLSA*> LSDBPair_t; //!< pair of IPv4 addresses / Link State Advertisements
 
-  LSDBMap_t m_database;
-  std::vector<GlobalRoutingLSA*> m_extdatabase;
+  LSDBMap_t m_database; //!< database of IPv4 addresses / Link State Advertisements
+  std::vector<GlobalRoutingLSA*> m_extdatabase; //!< database of External Link State Advertisements
 
 /**
  * @brief GlobalRouteManagerLSDB copy construction is disallowed.  There's no 
@@ -736,6 +767,7 @@
 /**
  * @brief Debugging routine; call the core SPF from the unit tests
  * @internal
+ * @param root the root node to start calculations
  */
   void DebugSPFCalculate (Ipv4Address root);
 
@@ -754,22 +786,184 @@
  */
   GlobalRouteManagerImpl& operator= (GlobalRouteManagerImpl& srmi);
 
-  SPFVertex* m_spfroot;
-  GlobalRouteManagerLSDB* m_lsdb;
+  SPFVertex* m_spfroot; //!< the root node
+  GlobalRouteManagerLSDB* m_lsdb; //!< the Link State DataBase (LSDB) of the Global Route Manager
+
+  /**
+   * \brief Test if a node is a stub, from an OSPF sense.
+   *
+   * If there is only one link of type 1 or 2, then a default route
+   * can safely be added to the next-hop router and SPF does not need
+   * to be run
+   *
+   * \param root the root node
+   * \returns true if the node is a stub
+   */
   bool CheckForStubNode (Ipv4Address root);
+
+  /**
+   * \brief Calculate the shortest path first (SPF) tree
+   *
+   * Equivalent to quagga ospf_spf_calculate
+   * \param root the root node
+   */
   void SPFCalculate (Ipv4Address root);
+
+  /**
+   * \brief Process Stub nodes
+   *
+   * Processing logic from RFC 2328, page 166 and quagga ospf_spf_process_stubs ()
+   * stub link records will exist for point-to-point interfaces and for
+   * broadcast interfaces for which no neighboring router can be found
+   *
+   * \param v vertex to be processed
+   */
   void SPFProcessStubs (SPFVertex* v);
+
+  /**
+   * \brief Process Autonomous Systems (AS) External LSA
+   *
+   * \param v vertex to be processed
+   * \param extlsa external LSA
+   */
   void ProcessASExternals (SPFVertex* v, GlobalRoutingLSA* extlsa);
-  void SPFNext (SPFVertex*, CandidateQueue&);
+
+  /**
+   * \brief Examine the links in v's LSA and update the list of candidates with any
+   *        vertices not already on the list
+   *
+   * \internal
+   *
+   * This method is derived from quagga ospf_spf_next ().  See RFC2328 Section
+   * 16.1 (2) for further details.
+   *
+   * We're passed a parameter \a v that is a vertex which is already in the SPF
+   * tree.  A vertex represents a router node.  We also get a reference to the
+   * SPF candidate queue, which is a priority queue containing the shortest paths
+   * to the networks we know about.
+   *
+   * We examine the links in v's LSA and update the list of candidates with any
+   * vertices not already on the list.  If a lower-cost path is found to a
+   * vertex already on the candidate list, store the new (lower) cost.
+   *
+   * \param v the vertex
+   * \param candidate the SPF candidate queue
+   */
+  void SPFNext (SPFVertex* v, CandidateQueue& candidate);
+
+  /**
+   * \brief Calculate nexthop from root through V (parent) to vertex W (destination)
+   *        with given distance from root->W.
+   *
+   * This method is derived from quagga ospf_nexthop_calculation() 16.1.1.
+   * For now, this is greatly simplified from the quagga code
+   *
+   * \param v the parent
+   * \param w the destination
+   * \param l the link record
+   * \param distance the target distance
+   * \returns 1 on success
+   */
   int SPFNexthopCalculation (SPFVertex* v, SPFVertex* w, 
                              GlobalRoutingLinkRecord* l, uint32_t distance);
+
+  /**
+   * \brief Adds a vertex to the list of children *in* each of its parents
+   *
+   * Derived from quagga ospf_vertex_add_parents ()
+   *
+   * This is a somewhat oddly named method (blame quagga).  Although you might
+   * expect it to add a parent *to* something, it actually adds a vertex
+   * to the list of children *in* each of its parents.
+   *
+   * Given a pointer to a vertex, it links back to the vertex's parent that it
+   * already has set and adds itself to that vertex's list of children.
+   *
+   * \param v the vertex
+   */
   void SPFVertexAddParent (SPFVertex* v);
+
+  /**
+   * \brief Search for a link between two vertexes.
+   *
+   * This method is derived from quagga ospf_get_next_link ()
+   *
+   * First search the Global Router Link Records of vertex \a v for one
+   * representing a point-to point link to vertex \a w.
+   *
+   * What is done depends on prev_link.  Contrary to appearances, prev_link just
+   * acts as a flag here.  If prev_link is NULL, we return the first Global
+   * Router Link Record we find that describes a point-to-point link from \a v
+   * to \a w.  If prev_link is not NULL, we return a Global Router Link Record
+   * representing a possible *second* link from \a v to \a w.
+   *
+   * \param v first vertex
+   * \param w second vertex
+   * \param prev_link the previous link in the list
+   * \returns the link's record
+   */
   GlobalRoutingLinkRecord* SPFGetNextLink (SPFVertex* v, SPFVertex* w, 
                                            GlobalRoutingLinkRecord* prev_link);
+
+  /**
+   * \brief Add a host route to the routing tables
+   *
+   *
+   * This method is derived from quagga ospf_intra_add_router ()
+   *
+   * This is where we are actually going to add the host routes to the routing
+   * tables of the individual nodes.
+   *
+   * The vertex passed as a parameter has just been added to the SPF tree.
+   * This vertex must have a valid m_root_oid, corresponding to the outgoing
+   * interface on the root router of the tree that is the first hop on the path
+   * to the vertex.  The vertex must also have a next hop address, corresponding
+   * to the next hop on the path to the vertex.  The vertex has an m_lsa field
+   * that has some number of link records.  For each point to point link record,
+   * the m_linkData is the local IP address of the link.  This corresponds to
+   * a destination IP address, reachable from the root, to which we add a host
+   * route.
+   *
+   * \param v the vertex
+   *
+   */
   void SPFIntraAddRouter (SPFVertex* v);
+
+  /**
+   * \brief Add a transit to the routing tables
+   *
+   * \param v the vertex
+   */
   void SPFIntraAddTransit (SPFVertex* v);
+
+  /**
+   * \brief Add a stub to the routing tables
+   *
+   * \param l the global routing link record
+   * \param v the vertex
+   */
   void SPFIntraAddStub (GlobalRoutingLinkRecord *l, SPFVertex* v);
+
+  /**
+   * \brief Add an external route to the routing tables
+   *
+   * \param extlsa the external LSA
+   * \param v the vertex
+   */
   void SPFAddASExternal (GlobalRoutingLSA *extlsa, SPFVertex *v);
+
+  /**
+   * \brief Return the interface number corresponding to a given IP address and mask
+   *
+   * This is a wrapper around GetInterfaceForPrefix(), but we first
+   * have to find the right node pointer to pass to that function.
+   * If no such interface is found, return -1 (note:  unit test framework
+   * for routing assumes -1 to be a legal return value)
+   *
+   * \param a the target IP address
+   * \param amask the target subnet mask
+   * \return the outgoing interface number
+   */
   int32_t FindOutgoingInterfaceId (Ipv4Address a, 
                                    Ipv4Mask amask = Ipv4Mask ("255.255.255.255"));
 };
diff -Naur ns-3.18.1/src/internet/model/global-router-interface.cc ns-3.19/src/internet/model/global-router-interface.cc
--- ns-3.18.1/src/internet/model/global-router-interface.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/global-router-interface.cc	2013-12-20 09:44:50.000000000 -0800
@@ -504,7 +504,8 @@
 //
 // ---------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (GlobalRouter);
+NS_OBJECT_ENSURE_REGISTERED (GlobalRouter)
+  ;
 
 TypeId 
 GlobalRouter::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/global-router-interface.h ns-3.19/src/internet/model/global-router-interface.h
--- ns-3.18.1/src/internet/model/global-router-interface.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/global-router-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -559,9 +559,16 @@
  * proper position in the tree.
  */
   SPFStatus m_status;
-  uint32_t m_node_id;
+  uint32_t m_node_id; //!< node ID
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param lsa the LSA
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, GlobalRoutingLSA& lsa);
 
 /**
@@ -576,11 +583,10 @@
 class GlobalRouter : public Object
 {
 public:
-/**
- * @brief The Interface ID of the Global Router interface.
- *
- * @see Object::GetObject ()
- */
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
 /**
@@ -588,8 +594,16 @@
  */
   GlobalRouter ();
 
-
+  /**
+   * \brief Set the specific Global Routing Protocol to be used
+   * \param routing the routing protocol
+   */
   void SetRoutingProtocol (Ptr<Ipv4GlobalRouting> routing);
+
+  /**
+   * \brief Get the specific Global Routing Protocol used
+   * \returns the routing protocol
+   */
   Ptr<Ipv4GlobalRouting> GetRoutingProtocol (void);
 
 /**
@@ -709,31 +723,129 @@
 
 private:
   virtual ~GlobalRouter ();
+
+  /**
+   * \brief Clear list of LSAs
+   */
   void ClearLSAs (void);
 
+  /**
+   * \brief Link through the given channel and find the net device that's on the other end.
+   *
+   * This only makes sense with a point-to-point channel.
+   *
+   * \param nd outgoing NetDevice
+   * \param ch channel
+   * \returns the NetDevice on the other end
+   */
   Ptr<NetDevice> GetAdjacent (Ptr<NetDevice> nd, Ptr<Channel> ch) const;
+
+  /**
+   * \brief Given a node and a net device, find an IPV4 interface index that corresponds
+   *        to that net device.
+   *
+   * This function may fail for various reasons.  If a node
+   * does not have an internet stack (for example if it is a bridge) we won't have
+   * an IPv4 at all.  If the node does have a stack, but the net device in question
+   * is bridged, there will not be an interface associated directly with the device.
+   *
+   * \param node the node
+   * \param nd outgoing NetDevice
+   * \param index the IPV4 interface index
+   * \returns true on success
+   */
   bool FindInterfaceForDevice (Ptr<Node> node, Ptr<NetDevice> nd, uint32_t &index) const;
+
+  /**
+   * \brief Finds a designated router
+   *
+   * Given a local net device, we need to walk the channel to which the net device is
+   * attached and look for nodes with GlobalRouter interfaces on them (one of them
+   * will be us).  Of these, the router with the lowest IP address on the net device
+   * connecting to the channel becomes the designated router for the link.
+   *
+   * \param ndLocal local NetDevice to scan
+   * \param allowRecursion Recursively look for routers down bridge port
+   * \returns the IP address of the designated router
+   */
   Ipv4Address FindDesignatedRouterForLink (Ptr<NetDevice> ndLocal, bool allowRecursion) const;
+
+  /**
+   * \brief Checks for the presence of another router on the NetDevice
+   *
+   * Given a node and an attached net device, take a look off in the channel to
+   * which the net device is attached and look for a node on the other side
+   * that has a GlobalRouter interface aggregated.  Life gets more complicated
+   * when there is a bridged net device on the other side.
+   *
+   * \param nd NetDevice to scan
+   * \param allowRecursion Recursively look for routers down bridge port
+   * \returns true if a router is found
+   */
   bool AnotherRouterOnLink (Ptr<NetDevice> nd, bool allowRecursion) const;
+
+  /**
+   * \brief Process a generic broadcast link
+   *
+   * \param nd the NetDevice
+   * \param pLSA the Global LSA
+   * \param c the returned NetDevice container
+   */
   void ProcessBroadcastLink (Ptr<NetDevice> nd, GlobalRoutingLSA *pLSA, NetDeviceContainer &c);
+
+  /**
+   * \brief Process a single broadcast link
+   *
+   * \param nd the NetDevice
+   * \param pLSA the Global LSA
+   * \param c the returned NetDevice container
+   */
   void ProcessSingleBroadcastLink (Ptr<NetDevice> nd, GlobalRoutingLSA *pLSA, NetDeviceContainer &c);
+
+  /**
+   * \brief Process a bridged broadcast link
+   *
+   * \param nd the NetDevice
+   * \param pLSA the Global LSA
+   * \param c the returned NetDevice container
+   */
   void ProcessBridgedBroadcastLink (Ptr<NetDevice> nd, GlobalRoutingLSA *pLSA, NetDeviceContainer &c);
 
+  /**
+   * \brief Process a point to point link
+   *
+   * \param ndLocal the NetDevice
+   * \param pLSA the Global LSA
+   */
   void ProcessPointToPointLink (Ptr<NetDevice> ndLocal, GlobalRoutingLSA *pLSA);
+
+  /**
+   * \brief Build one NetworkLSA for each net device talking to a network that we are the
+   * designated router for.
+   *
+   * \param c the devices.
+   */
   void BuildNetworkLSAs (NetDeviceContainer c);
+
+  /**
+   * \brief Decide whether or not a given net device is being bridged by a BridgeNetDevice.
+   *
+   * \param nd the NetDevice
+   * \returns the BridgeNetDevice smart pointer or null if not found
+   */
   Ptr<BridgeNetDevice> NetDeviceIsBridged (Ptr<NetDevice> nd) const;
 
 
-  typedef std::list<GlobalRoutingLSA*> ListOfLSAs_t;
-  ListOfLSAs_t m_LSAs;
+  typedef std::list<GlobalRoutingLSA*> ListOfLSAs_t; //!< container for the GlobalRoutingLSAs
+  ListOfLSAs_t m_LSAs; //!< database of GlobalRoutingLSAs
 
-  Ipv4Address m_routerId;
-  Ptr<Ipv4GlobalRouting> m_routingProtocol;
+  Ipv4Address m_routerId; //!< router ID (its IPv4 address)
+  Ptr<Ipv4GlobalRouting> m_routingProtocol; //!< the Ipv4GlobalRouting in use
 
-  typedef std::list<Ipv4RoutingTableEntry *> InjectedRoutes;
-  typedef std::list<Ipv4RoutingTableEntry *>::const_iterator InjectedRoutesCI;
-  typedef std::list<Ipv4RoutingTableEntry *>::iterator InjectedRoutesI;
-  InjectedRoutes m_injectedRoutes; // Routes we are exporting
+  typedef std::list<Ipv4RoutingTableEntry *> InjectedRoutes; //!< container of Ipv4RoutingTableEntry
+  typedef std::list<Ipv4RoutingTableEntry *>::const_iterator InjectedRoutesCI; //!< Const Iterator to container of Ipv4RoutingTableEntry
+  typedef std::list<Ipv4RoutingTableEntry *>::iterator InjectedRoutesI; //!< Iterator to container of Ipv4RoutingTableEntry
+  InjectedRoutes m_injectedRoutes; //!< Routes we are exporting
 
   // inherited from Object
   virtual void DoDispose (void);
diff -Naur ns-3.18.1/src/internet/model/icmpv4.cc ns-3.19/src/internet/model/icmpv4.cc
--- ns-3.18.1/src/internet/model/icmpv4.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/icmpv4.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
  *        Icmpv4Header
  ********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4Header);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4Header)
+  ;
 
 TypeId 
 Icmpv4Header::GetTypeId (void)
@@ -133,7 +134,8 @@
  *        Icmpv4Echo
  ********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4Echo);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4Echo)
+  ;
 
 void 
 Icmpv4Echo::SetIdentifier (uint16_t id)
@@ -270,7 +272,8 @@
  *        Icmpv4DestinationUnreachable
  ********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4DestinationUnreachable);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4DestinationUnreachable)
+  ;
 
 TypeId 
 Icmpv4DestinationUnreachable::GetTypeId (void)
@@ -393,7 +396,8 @@
  *        Icmpv4TimeExceeded
  ********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4TimeExceeded);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4TimeExceeded)
+  ;
 
 TypeId 
 Icmpv4TimeExceeded::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/icmpv4.h ns-3.19/src/internet/model/icmpv4.h
--- ns-3.18.1/src/internet/model/icmpv4.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/icmpv4.h	2013-12-20 09:44:50.000000000 -0800
@@ -40,16 +40,42 @@
     TIME_EXCEEDED = 11
   };
 
+  /**
+   * Enables ICMP Checksum calculation
+   */
   void EnableChecksum (void);
+
+  /**
+   * Set ICMP type
+   * \param type the ICMP type
+   */
   void SetType (uint8_t type);
+
+  /**
+   * Set ICMP code
+   * \param code the ICMP code
+   */
   void SetCode (uint8_t code);
 
+  /**
+   * Get ICMP type
+   * \returns the ICMP type
+   */
   uint8_t GetType (void) const;
+  /**
+   * Get ICMP code
+   * \returns the ICMP code
+   */
   uint8_t GetCode (void) const;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   Icmpv4Header ();
   virtual ~Icmpv4Header ();
+
   virtual TypeId GetInstanceTypeId (void) const;
   virtual uint32_t GetSerializedSize (void) const;
   virtual void Serialize (Buffer::Iterator start) const;
@@ -57,23 +83,56 @@
   virtual void Print (std::ostream &os) const;
 
 private:
-  uint8_t m_type;
-  uint8_t m_code;
-  bool m_calcChecksum;
+  uint8_t m_type; //!< ICMP type
+  uint8_t m_code; //!< ICMP code
+  bool m_calcChecksum;  //!< true if checksum is calculated
 };
 
 class Icmpv4Echo : public Header
 {
 public:
+  /**
+   * \brief Set the Echo identifier
+   * \param id the identifier
+   */
   void SetIdentifier (uint16_t id);
+  /**
+   * \brief Set the Echo sequence number
+   * \param seq the sequence number
+   */
   void SetSequenceNumber (uint16_t seq);
+  /**
+   * \brief Set the Echo data
+   * \param data the data
+   */
   void SetData (Ptr<const Packet> data);
+  /**
+   * \brief Get the Echo identifier
+   * \returns the identifier
+   */
   uint16_t GetIdentifier (void) const;
+  /**
+   * \brief Get the Echo sequence number
+   * \returns the sequence number
+   */
   uint16_t GetSequenceNumber (void) const;
+  /**
+   * \brief Get the Echo data size
+   * \returns the data size
+   */
   uint32_t GetDataSize (void) const;
+  /**
+   * \brief Get the Echo data
+   * \param payload the data (filled)
+   * \returns the data length
+   */
   uint32_t GetData (uint8_t payload[]) const;
 
 
+  /**
+   * Get ICMP type
+   * \returns the ICMP type
+   */
   static TypeId GetTypeId (void);
   Icmpv4Echo ();
   virtual ~Icmpv4Echo ();
@@ -83,10 +142,10 @@
   virtual uint32_t Deserialize (Buffer::Iterator start);
   virtual void Print (std::ostream &os) const;
 private:
-  uint16_t m_identifier;
-  uint16_t m_sequence;
-  uint8_t *m_data;
-  uint32_t m_dataSize;
+  uint16_t m_identifier; //!< identifier
+  uint16_t m_sequence;   //!< sequence number
+  uint8_t *m_data;       //!< data
+  uint32_t m_dataSize;   //!< data size
 };
 
 class Icmpv4DestinationUnreachable : public Header
@@ -100,17 +159,46 @@
     FRAG_NEEDED = 4,
     SOURCE_ROUTE_FAILED = 5
   };
+
+  /**
+   * Get ICMP type
+   * \returns the ICMP type
+   */
   static TypeId GetTypeId (void);
   Icmpv4DestinationUnreachable ();
   virtual ~Icmpv4DestinationUnreachable ();
 
+  /**
+   * \brief Set the next hop MTU
+   * \param mtu the MTU
+   */
   void SetNextHopMtu (uint16_t mtu);
+  /**
+   * \brief Get the next hop MTU
+   * \returns the MTU
+   */
   uint16_t GetNextHopMtu (void) const;
 
+  /**
+   * \brief Set the ICMP carried data
+   * \param data the data
+   */
   void SetData (Ptr<const Packet> data);
+  /**
+   * \brief Set the ICMP carried IPv4 header
+   * \param header the header
+   */
   void SetHeader (Ipv4Header header);
 
+  /**
+   * \brief Get the ICMP carried data
+   * \param payload the data (filled)
+   */
   void GetData (uint8_t payload[8]) const;
+  /**
+   * \brief Get the ICMP carried IPv4 header
+   * \returns the header
+   */
   Ipv4Header GetHeader (void) const;
 
 private:
@@ -120,9 +208,9 @@
   virtual uint32_t Deserialize (Buffer::Iterator start);
   virtual void Print (std::ostream &os) const;
 private:
-  uint16_t m_nextHopMtu;
-  Ipv4Header m_header;
-  uint8_t m_data[8];
+  uint16_t m_nextHopMtu; //!< next hop MTU
+  Ipv4Header m_header;   //!< carried IPv4 header
+  uint8_t m_data[8];     //!< carried data
 };
 
 
@@ -134,12 +222,32 @@
     FRAGMENT_REASSEMBLY = 1
   };
 
+  /**
+   * \brief Get the ICMP carried data
+   * \param data the data
+   */
   void SetData (Ptr<const Packet> data);
+  /**
+   * \brief Set the ICMP carried IPv4 header
+   * \param header the header
+   */
   void SetHeader (Ipv4Header header);
 
+  /**
+   * \brief Get the ICMP carried data
+   * \param payload the data (filled)
+   */
   void GetData (uint8_t payload[8]) const;
+  /**
+   * \brief Get the ICMP carried IPv4 header
+   * \returns the header
+   */
   Ipv4Header GetHeader (void) const;
 
+  /**
+   * Get ICMP type
+   * \returns the ICMP type
+   */
   static TypeId GetTypeId (void);
   Icmpv4TimeExceeded ();
   virtual ~Icmpv4TimeExceeded ();
@@ -150,8 +258,8 @@
   virtual void Print (std::ostream &os) const;
 
 private:
-  Ipv4Header m_header;
-  uint8_t m_data[8];
+  Ipv4Header m_header;   //!< carried IPv4 header
+  uint8_t m_data[8];     //!< carried data
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/icmpv4-l4-protocol.cc ns-3.19/src/internet/model/icmpv4-l4-protocol.cc
--- ns-3.18.1/src/internet/model/icmpv4-l4-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/icmpv4-l4-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -11,9 +11,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol");
+NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4L4Protocol);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4L4Protocol)
+  ;
 
 // see rfc 792
 const uint8_t Icmpv4L4Protocol::PROT_NUMBER = 1;
diff -Naur ns-3.18.1/src/internet/model/icmpv4-l4-protocol.h ns-3.19/src/internet/model/icmpv4-l4-protocol.h
--- ns-3.18.1/src/internet/model/icmpv4-l4-protocol.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/icmpv4-l4-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -14,25 +14,76 @@
 class Icmpv4L4Protocol : public IpL4Protocol
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
-  static const uint8_t PROT_NUMBER;
+  static const uint8_t PROT_NUMBER; //!< ICMP protocol number (0x1)
 
   Icmpv4L4Protocol ();
   virtual ~Icmpv4L4Protocol ();
 
+  /**
+   * \brief Set the node the protocol is associated with.
+   * \param node the node
+   */
   void SetNode (Ptr<Node> node);
 
+  /**
+   * Get the protocol number
+   * \returns the protocol number
+   */
   static uint16_t GetStaticProtocolNumber (void);
+
+  /**
+   * Get the protocol number
+   * \returns the protocol number
+   */
   virtual int GetProtocolNumber (void) const;
+
+  /**
+   * \brief Receive method.
+   * \param p the packet
+   * \param header the IPv4 header
+   * \param incomingInterface the interface from which the packet is coming
+   * \returns the receive status
+   */
   virtual enum IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                                 Ipv4Header const &header,
-                                                 Ptr<Ipv4Interface> incomingInterface);
+                                               Ipv4Header const &header,
+                                               Ptr<Ipv4Interface> incomingInterface);
+
+  /**
+   * \brief Receive method.
+   * \param p the packet
+   * \param header the IPv6 header
+   * \param incomingInterface the interface from which the packet is coming
+   * \returns the receive status
+   */
   virtual enum IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                                 Ipv6Header const &header,
-                                                 Ptr<Ipv6Interface> incomingInterface);
+                                               Ipv6Header const &header,
+                                               Ptr<Ipv6Interface> incomingInterface);
 
+  /**
+   * \brief Send a Destination Unreachable - Fragmentation needed ICMP error
+   * \param header the original IP header
+   * \param orgData the original packet
+   * \param nextHopMtu the next hop MTU
+   */
   void SendDestUnreachFragNeeded (Ipv4Header header, Ptr<const Packet> orgData, uint16_t nextHopMtu);
+
+  /**
+   * \brief Send a Time Exceeded ICMP error
+   * \param header the original IP header
+   * \param orgData the original packet
+   */
   void SendTimeExceededTtl (Ipv4Header header, Ptr<const Packet> orgData);
+
+  /**
+   * \brief Send a Time Exceeded ICMP error
+   * \param header the original IP header
+   * \param orgData the original packet
+   */
   void SendDestUnreachPort (Ipv4Header header, Ptr<const Packet> orgData);
 
   // From IpL4Protocol
@@ -48,30 +99,86 @@
    */
   virtual void NotifyNewAggregate ();
 private:
+  /**
+   * \brief Handles an incoming ICMP Echo packet
+   * \param p the packet
+   * \param header the IP header
+   * \param source the source address
+   * \param destination the destination address
+   */
   void HandleEcho (Ptr<Packet> p,
                    Icmpv4Header header,
                    Ipv4Address source,
                    Ipv4Address destination);
+  /**
+   * \brief Handles an incoming ICMP Destination Unreachable packet
+   * \param p the packet
+   * \param header the IP header
+   * \param source the source address
+   * \param destination the destination address
+   */
   void HandleDestUnreach (Ptr<Packet> p,
                           Icmpv4Header header,
                           Ipv4Address source,
                           Ipv4Address destination);
+  /**
+   * \brief Handles an incoming ICMP Time Exceeded packet
+   * \param p the packet
+   * \param icmp the ICMP header
+   * \param source the source address
+   * \param destination the destination address
+   */
   void HandleTimeExceeded (Ptr<Packet> p,
                            Icmpv4Header icmp,
                            Ipv4Address source,
                            Ipv4Address destination);
+  /**
+   * \brief Send an ICMP Destination Unreachable packet
+   *
+   * \param header the original IP header
+   * \param orgData the original packet
+   * \param code the ICMP code
+   * \param nextHopMtu the next hop MTU
+   */
   void SendDestUnreach (Ipv4Header header, Ptr<const Packet> orgData, 
                         uint8_t code, uint16_t nextHopMtu);
+  /**
+   * \brief Send a generic ICMP packet
+   *
+   * \param packet the packet
+   * \param dest the destination
+   * \param type the ICMP type
+   * \param code the ICMP code
+   */
   void SendMessage (Ptr<Packet> packet, Ipv4Address dest, uint8_t type, uint8_t code);
+  /**
+   * \brief Send a generic ICMP packet
+   *
+   * \param packet the packet
+   * \param source the source
+   * \param dest the destination
+   * \param type the ICMP type
+   * \param code the ICMP code
+   * \param route the route to be used
+   */
   void SendMessage (Ptr<Packet> packet, Ipv4Address source, Ipv4Address dest, uint8_t type, uint8_t code, Ptr<Ipv4Route> route);
+  /**
+   * \brief Forward the message to an L4 protocol
+   *
+   * \param source the source
+   * \param icmp the ICMP header
+   * \param info info data (e.g., the target MTU)
+   * \param ipHeader the IP header carried by ICMP
+   * \param payload payload chunk carried by ICMP
+   */
   void Forward (Ipv4Address source, Icmpv4Header icmp,
                 uint32_t info, Ipv4Header ipHeader,
                 const uint8_t payload[8]);
 
   virtual void DoDispose (void);
 
-  Ptr<Node> m_node;
-  IpL4Protocol::DownTargetCallback m_downTarget;
+  Ptr<Node> m_node; //!< the node this protocol is associated with
+  IpL4Protocol::DownTargetCallback m_downTarget; //!< callback to Ipv4::Send
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/icmpv6-header.cc ns-3.19/src/internet/model/icmpv6-header.cc
--- ns-3.18.1/src/internet/model/icmpv6-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/icmpv6-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 namespace ns3
 {
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6Header);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6Header)
+  ;
 
 TypeId Icmpv6Header::GetTypeId ()
 {
@@ -172,7 +173,8 @@
   m_checksum = ~(it.CalculateIpChecksum (40));
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6NS);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6NS)
+  ;
 
 Icmpv6NS::Icmpv6NS ()
 {
@@ -294,7 +296,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6NA);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6NA)
+  ;
 
 TypeId Icmpv6NA::GetTypeId ()
 {
@@ -477,7 +480,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6RA);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6RA)
+  ;
 
 TypeId Icmpv6RA::GetTypeId ()
 {
@@ -696,7 +700,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6RS);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6RS)
+  ;
 
 TypeId Icmpv6RS::GetTypeId ()
 {
@@ -786,7 +791,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6Redirection);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6Redirection)
+  ;
 
 TypeId Icmpv6Redirection::GetTypeId ()
 {
@@ -916,7 +922,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6Echo);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6Echo)
+  ;
 
 TypeId Icmpv6Echo::GetTypeId ()
 {
@@ -1033,7 +1040,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6DestinationUnreachable);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6DestinationUnreachable)
+  ;
 
 TypeId Icmpv6DestinationUnreachable::GetTypeId ()
 {
@@ -1130,7 +1138,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6TooBig);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6TooBig)
+  ;
 
 TypeId Icmpv6TooBig::GetTypeId ()
 {
@@ -1240,7 +1249,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6TimeExceeded);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6TimeExceeded)
+  ;
 
 TypeId Icmpv6TimeExceeded::GetTypeId ()
 {
@@ -1339,7 +1349,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6ParameterError);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6ParameterError)
+  ;
 
 TypeId Icmpv6ParameterError::GetTypeId ()
 {
@@ -1449,7 +1460,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionHeader);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionHeader)
+  ;
 
 TypeId Icmpv6OptionHeader::GetTypeId ()
 {
@@ -1527,7 +1539,8 @@
   NS_LOG_FUNCTION (this << &start);
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionMtu);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionMtu)
+  ;
 
 TypeId Icmpv6OptionMtu::GetTypeId ()
 {
@@ -1623,7 +1636,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionPrefixInformation);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionPrefixInformation)
+  ;
 
 TypeId Icmpv6OptionPrefixInformation::GetTypeId ()
 {
@@ -1796,7 +1810,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionLinkLayerAddress);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionLinkLayerAddress)
+  ;
 
 TypeId Icmpv6OptionLinkLayerAddress::GetTypeId ()
 {
@@ -1903,7 +1918,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionRedirected);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionRedirected)
+  ;
 
 TypeId Icmpv6OptionRedirected::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/icmpv6-l4-protocol.cc ns-3.19/src/internet/model/icmpv6-l4-protocol.cc
--- ns-3.18.1/src/internet/model/icmpv6-l4-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/icmpv6-l4-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -39,9 +39,11 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6L4Protocol);
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6L4Protocol)
+  ;
 
-NS_LOG_COMPONENT_DEFINE ("Icmpv6L4Protocol");
+NS_LOG_COMPONENT_DEFINE ("Icmpv6L4Protocol")
+  ;
 
 const uint8_t Icmpv6L4Protocol::PROT_NUMBER = 58;
 
diff -Naur ns-3.18.1/src/internet/model/icmpv6-l4-protocol.h ns-3.19/src/internet/model/icmpv6-l4-protocol.h
--- ns-3.18.1/src/internet/model/icmpv6-l4-protocol.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/icmpv6-l4-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -338,6 +338,7 @@
    * \param p the packet
    * \param header the IPv4 header
    * \param interface the interface from which the packet is coming
+   * \returns the receive status
    */
   virtual enum IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
                                                Ipv4Header const &header,
@@ -346,9 +347,9 @@
   /**
    * \brief Receive method.
    * \param p the packet
-   * \param src source address
-   * \param dst destination address
+   * \param header the IPv6 header
    * \param interface the interface from which the packet is coming
+   * \returns the receive status
    */
   virtual enum IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
                                                Ipv6Header const &header,
@@ -364,11 +365,14 @@
 
   /**
    * \brief Lookup in the ND cache for the IPv6 address
+   *
+   * \note Unlike other Lookup method, it does not send NS request!
+   *
    * \param dst destination address
    * \param device device
    * \param cache the neighbor cache
    * \param hardwareDestination hardware address
-   * \note Unlike other Lookup method, it does not send NS request!
+   * \return true if the address is in the ND cache, the hardwareDestination is updated.
    */
   bool Lookup (Ipv6Address dst, Ptr<NetDevice> device, Ptr<NdiscCache> cache, Address* hardwareDestination);
 
@@ -424,7 +428,7 @@
   virtual void DoDispose ();
 
 private:
-  typedef std::list<Ptr<NdiscCache> > CacheList;
+  typedef std::list<Ptr<NdiscCache> > CacheList; //!< container of NdiscCaches
 
   /**
    * \brief The node.
@@ -560,6 +564,7 @@
   /**
    * \brief Get the cache corresponding to the device.
    * \param device the device
+   * \returns the NdiscCache associated with the device
    */
   Ptr<NdiscCache> FindCache (Ptr<NetDevice> device);
 
@@ -570,7 +575,7 @@
   virtual IpL4Protocol::DownTargetCallback GetDownTarget (void) const;
   virtual IpL4Protocol::DownTargetCallback6 GetDownTarget6 (void) const;
 
-  IpL4Protocol::DownTargetCallback6 m_downTarget;
+  IpL4Protocol::DownTargetCallback6 m_downTarget; //!< callback to Ipv6::Send
 
 };
 
diff -Naur ns-3.18.1/src/internet/model/ip-l4-protocol.cc ns-3.19/src/internet/model/ip-l4-protocol.cc
--- ns-3.18.1/src/internet/model/ip-l4-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ip-l4-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (IpL4Protocol);
+NS_OBJECT_ENSURE_REGISTERED (IpL4Protocol)
+  ;
 
 TypeId 
 IpL4Protocol::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/ip-l4-protocol.h ns-3.19/src/internet/model/ip-l4-protocol.h
--- ns-3.18.1/src/internet/model/ip-l4-protocol.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ip-l4-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -47,6 +47,9 @@
 class IpL4Protocol : public Object
 {
 public:
+  /**
+   * \brief Rx status codes
+   */
   enum RxStatus {
     RX_OK,
     RX_CSUM_FAILED,
@@ -54,6 +57,10 @@
     RX_ENDPOINT_UNREACH
   };
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   virtual ~IpL4Protocol ();
@@ -64,21 +71,29 @@
   virtual int GetProtocolNumber (void) const = 0;
 
   /**
+   * \brief Called from lower-level layers to send the packet up in the stack.
    * \param p packet to forward up
    * \param header IPv4 Header information
    * \param incomingInterface the Ipv4Interface on which the packet arrived
-   * 
-   * Called from lower-level layers to send the packet up
-   * in the stack. 
+   * \returns Rx status code
    */
   virtual enum RxStatus Receive (Ptr<Packet> p,
                                  Ipv4Header const &header,
                                  Ptr<Ipv4Interface> incomingInterface) = 0;
+
+  /**
+   * \brief Called from lower-level layers to send the packet up in the stack.
+   * \param p packet to forward up
+   * \param header IPv6 Header information
+   * \param incomingInterface the Ipv6Interface on which the packet arrived
+   * \returns Rx status code
+   */
   virtual enum RxStatus Receive (Ptr<Packet> p,
                                  Ipv6Header const &header,
                                  Ptr<Ipv6Interface> incomingInterface) = 0;
 
   /**
+   * \brief Called from lower-level layers to send the ICMP packet up in the stack.
    * \param icmpSource the source address of the icmp message
    * \param icmpTtl the ttl of the icmp message
    * \param icmpType the 'type' field of the icmp message
@@ -89,35 +104,74 @@
    *        the icmp message
    * \param payloadDestination the destination address of the packet which
    *        triggered the icmp message.
-   * \param payload the first 8 bytes of the udp header of the packet
+   * \param payload the first 8 bytes of the packet payload
    *        which triggered the icmp message.
    */
   virtual void ReceiveIcmp (Ipv4Address icmpSource, uint8_t icmpTtl,
                             uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo,
                             Ipv4Address payloadSource, Ipv4Address payloadDestination,
                             const uint8_t payload[8]);
+
+
+  /**
+   * \brief Called from lower-level layers to send the ICMPv6 packet up in the stack.
+   * \param icmpSource the source address of the icmp message
+   * \param icmpTtl the ttl of the icmp message
+   * \param icmpType the 'type' field of the icmp message
+   * \param icmpCode the 'code' field of the icmp message
+   * \param icmpInfo extra information dependent on the icmp message
+   *        generated by Icmpv6L4Protocol
+   * \param payloadSource the source address of the packet which triggered
+   *        the icmp message
+   * \param payloadDestination the destination address of the packet which
+   *        triggered the icmp message.
+   * \param payload the first 8 bytes of the packet payload
+   *        which triggered the icmp message.
+   */
   virtual void ReceiveIcmp (Ipv6Address icmpSource, uint8_t icmpTtl,
                             uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo,
                             Ipv6Address payloadSource, Ipv6Address payloadDestination,
                             const uint8_t payload[8]);
 
+  /**
+   * \brief callback to send packets over IPv4
+   */
   typedef Callback<void,Ptr<Packet>, Ipv4Address, Ipv4Address, uint8_t, Ptr<Ipv4Route> > DownTargetCallback;
+  /**
+   * \brief callback to send packets over IPv6
+   */
   typedef Callback<void,Ptr<Packet>, Ipv6Address, Ipv6Address, uint8_t, Ptr<Ipv6Route> > DownTargetCallback6;
+
   /**
    * This method allows a caller to set the current down target callback
-   * set for this L4 protocol
+   * set for this L4 protocol (IPv4 case)
    *
    * \param cb current Callback for the L4 protocol
    */
   virtual void SetDownTarget (DownTargetCallback cb) = 0;
+
+  /**
+   * This method allows a caller to set the current down target callback
+   * set for this L4 protocol (IPv6 case)
+   *
+   * \param cb current Callback for the L4 protocol
+   */
   virtual void SetDownTarget6 (DownTargetCallback6 cb) = 0;
+
   /**
    * This method allows a caller to get the current down target callback
-   * set for this L4 protocol, for
+   * set for this L4 protocol (IPv4 case)
    *
    * \return current Callback for the L4 protocol
    */
   virtual DownTargetCallback GetDownTarget (void) const = 0;
+
+  /**
+   * This method allows a caller to get the current down target callback
+   * set for this L4 protocol (IPv6 case)
+   *
+   * \return current Callback for the L4 protocol
+   */
   virtual DownTargetCallback6 GetDownTarget6 (void) const = 0;
 };
 
diff -Naur ns-3.18.1/src/internet/model/ipv4-address-generator.cc ns-3.19/src/internet/model/ipv4-address-generator.cc
--- ns-3.18.1/src/internet/model/ipv4-address-generator.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-address-generator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,53 +27,160 @@
 
 namespace ns3 {
 
+/**
+ * \internal
+ * \ingroup address
+ *
+ * \brief Implementation class of Ipv4AddressGenerator
+ * This generator assigns addresses sequentially from a provided
+ * network address; used in topology code. It also keeps track of all
+ * addresses assigned to perform duplicate detection.
+ */
 class Ipv4AddressGeneratorImpl
 {
 public:
   Ipv4AddressGeneratorImpl ();
   virtual ~Ipv4AddressGeneratorImpl ();
 
+  /**
+   * \internal
+   * \brief Initialise the base network, mask and address for the generator
+   *
+   * The first call to NextAddress() or GetAddress() will return the
+   * value passed in.
+   *
+   * \param net The network for the base Ipv4Address
+   * \param mask The network mask of the base Ipv4Address
+   * \param addr The base address used for initialization
+   */
   void Init (const Ipv4Address net, const Ipv4Mask mask, 
              const Ipv4Address addr);
 
+  /**
+   * \internal
+   * \brief Get the current network of the given Ipv4Mask
+   *
+   * Does not change the internal state; this just peeks at the current
+   * network
+   *
+   * \param mask The Ipv4Mask for the current network
+   * \returns the IPv4 address of the current network
+   */
   Ipv4Address GetNetwork (const Ipv4Mask mask) const;
+
+  /**
+   * \internal
+   * \brief Get the next network according to the given Ipv4Mask
+   *
+   * This operation is a pre-increment, meaning that the internal state
+   * is changed before returning the new network address.
+   *
+   * This also resets the address to the base address that was
+   * used for initialization.
+   *
+   * \param mask The Ipv4Mask used to set the next network
+   * \returns the IPv4 address of the next network
+   */
   Ipv4Address NextNetwork (const Ipv4Mask mask);
 
+  /**
+   * \internal
+   * \brief Set the address for the given mask
+   *
+   * \param addr The address to set for the current mask
+   * \param mask The Ipv4Mask whose address is to be set
+   */
   void InitAddress (const Ipv4Address addr, const Ipv4Mask mask);
-  Ipv4Address GetAddress (const Ipv4Mask mask) const;
+
+  /**
+   * \internal
+   * \brief Allocate the next Ipv4Address for the configured network and mask
+   *
+   * This operation is a post-increment, meaning that the first address
+   * allocated will be the one that was initially configured.
+   *
+   * \param mask The Ipv4Mask for the current network
+   * \returns the IPv4 address
+   */
   Ipv4Address NextAddress (const Ipv4Mask mask);
 
+  /**
+   * \internal
+   * \brief Get the Ipv4Address that will be allocated upon NextAddress ()
+   *
+   * Does not change the internal state; just is used to peek the next
+   * address that will be allocated upon NextAddress ()
+   *
+   * \param mask The Ipv4Mask for the current network
+   * \returns the IPv4 address
+   */
+  Ipv4Address GetAddress (const Ipv4Mask mask) const;
+
+  /**
+   * \internal
+   * \brief Reset the networks and Ipv4Address to zero
+   */
   void Reset (void);
+
+  /**
+   * \internal
+   * \brief Add the Ipv4Address to the list of IPv4 entries
+   *
+   * Typically, this is used by external address allocators that want
+   * to make use of this class's ability to track duplicates.  AddAllocated
+   * is always called internally for any address generated by NextAddress ()
+   *
+   * \param addr The Ipv4Address to be added to the list of Ipv4 entries
+   * \returns true on success
+   */
   bool AddAllocated (const Ipv4Address addr);
 
+  /**
+   * \internal
+   * \brief Used to turn off fatal errors and assertions, for testing
+   */
   void TestMode (void);
 private:
-  static const uint32_t N_BITS = 32;
-  static const uint32_t MOST_SIGNIFICANT_BIT = 0x80000000;
+  static const uint32_t N_BITS = 32;  //!< /internal the number of bits in the address
+  static const uint32_t MOST_SIGNIFICANT_BIT = 0x80000000; //!< /internal MSB set to 1
 
+  /**
+   * \internal
+   * \brief Create an index number for the network mask
+   * \param mask the mask to index
+   * \returns an index
+   */
   uint32_t MaskToIndex (Ipv4Mask mask) const;
 
+  /**
+   * \internal
+   * \brief This class holds the state for a given network
+   */
   class NetworkState
   {
 public:
-    uint32_t mask;
-    uint32_t shift;
-    uint32_t network;
-    uint32_t addr;
-    uint32_t addrMax;
+    uint32_t mask;      //!< /internal the network mask
+    uint32_t shift;     //!< /internal a shift
+    uint32_t network;   //!< /internal the network
+    uint32_t addr;      //!< /internal the address
+    uint32_t addrMax;   //!< /internal the maximum address
   };
 
-  NetworkState m_netTable[N_BITS];
+  NetworkState m_netTable[N_BITS]; //!< /internal the available networks
 
+  /**
+   * \internal
+   * \brief This class holds the allocated addresses
+   */
   class Entry
   {
 public:
-    uint32_t addrLow;
-    uint32_t addrHigh;
+    uint32_t addrLow;  //!< /internal the lowest allocated address
+    uint32_t addrHigh; //!< /internal the highest allocated address
   };
 
-  std::list<Entry> m_entries;
-  bool m_test;
+  std::list<Entry> m_entries; //!< /internal contained of allocated addresses
+  bool m_test; //!< /internal test mode (if true)
 };
 
 Ipv4AddressGeneratorImpl::Ipv4AddressGeneratorImpl () 
diff -Naur ns-3.18.1/src/internet/model/ipv4-address-generator.h ns-3.19/src/internet/model/ipv4-address-generator.h
--- ns-3.18.1/src/internet/model/ipv4-address-generator.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-address-generator.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,22 +28,103 @@
  *
  * \brief This generator assigns addresses sequentially from a provided
  * network address; used in topology code.
+ *
+ * \note BEWARE: this class acts as a Singleton.
+ * In other terms, two different instances of Ipv4AddressGenerator will
+ * pick IPv4 numbers from the same pool. Changing the network in one of them
+ * will also change the network in the other instances.
+ *
  */
 class Ipv4AddressGenerator {
 public:
+  /**
+   * \brief Initialise the base network, mask and address for the generator
+   *
+   * The first call to NextAddress() or GetAddress() will return the
+   * value passed in.
+   *
+   * \param net The network for the base Ipv4Address
+   * \param mask The network mask of the base Ipv4Address
+   * \param addr The base address used for initialization
+   */
   static void Init (const Ipv4Address net, const Ipv4Mask mask, 
                     const Ipv4Address addr = "0.0.0.1");
 
+  /**
+   * \brief Get the next network according to the given Ipv4Mask
+   *
+   * This operation is a pre-increment, meaning that the internal state
+   * is changed before returning the new network address.
+   *
+   * This also resets the address to the base address that was
+   * used for initialization.
+   *
+   * \param mask The Ipv4Mask used to set the next network
+   * \returns the IPv4 address of the next network
+   */
   static Ipv4Address NextNetwork (const Ipv4Mask mask);
+
+  /**
+   * \brief Get the current network of the given Ipv4Mask
+   *
+   * Does not change the internal state; this just peeks at the current
+   * network
+   *
+   * \param mask The Ipv4Mask for the current network
+   * \returns the IPv4 address of the current network
+   */
   static Ipv4Address GetNetwork (const Ipv4Mask mask);
 
+  /**
+   * \brief Set the address for the given mask
+   *
+   * \param addr The address to set for the current mask
+   * \param mask The Ipv4Mask whose address is to be set
+   */
   static void InitAddress (const Ipv4Address addr, const Ipv4Mask mask);
+
+  /**
+   * \brief Allocate the next Ipv4Address for the configured network and mask
+   *
+   * This operation is a post-increment, meaning that the first address
+   * allocated will be the one that was initially configured.
+   *
+   * \param mask The Ipv4Mask for the current network
+   * \returns the IPv4 address
+   */
   static Ipv4Address NextAddress (const Ipv4Mask mask);
+
+  /**
+   * \brief Get the Ipv4Address that will be allocated upon NextAddress ()
+   *
+   * Does not change the internal state; just is used to peek the next
+   * address that will be allocated upon NextAddress ()
+   *
+   * \param mask The Ipv4Mask for the current network
+   * \returns the IPv4 address
+   */
   static Ipv4Address GetAddress (const Ipv4Mask mask);
 
+  /**
+   * \brief Reset the networks and Ipv4Address to zero
+   */
   static void Reset (void);
+
+  /**
+   * \brief Add the Ipv4Address to the list of IPv4 entries
+   *
+   * Typically, this is used by external address allocators that want
+   * to make use of this class's ability to track duplicates.  AddAllocated
+   * is always called internally for any address generated by NextAddress ()
+   *
+   * \param addr The Ipv4Address to be added to the list of Ipv4 entries
+   * \returns true on success
+   */
   static bool AddAllocated (const Ipv4Address addr);
 
+  /**
+   * \brief Used to turn off fatal errors and assertions, for testing
+   */
   static void TestMode (void);
 };
 
diff -Naur ns-3.18.1/src/internet/model/ipv4.cc ns-3.19/src/internet/model/ipv4.cc
--- ns-3.18.1/src/internet/model/ipv4.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4)
+  ;
 
 TypeId 
 Ipv4::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/ipv4-end-point-demux.cc ns-3.19/src/internet/model/ipv4-end-point-demux.cc
--- ns-3.18.1/src/internet/model/ipv4-end-point-demux.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-end-point-demux.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv4EndPointDemux");
+NS_LOG_COMPONENT_DEFINE ("Ipv4EndPointDemux")
+  ;
 
 Ipv4EndPointDemux::Ipv4EndPointDemux ()
   : m_ephemeral (49152), m_portLast (65535), m_portFirst (49152)
diff -Naur ns-3.18.1/src/internet/model/ipv4-end-point-demux.h ns-3.19/src/internet/model/ipv4-end-point-demux.h
--- ns-3.18.1/src/internet/model/ipv4-end-point-demux.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-end-point-demux.h	2013-12-20 09:44:50.000000000 -0800
@@ -42,43 +42,141 @@
 
 class Ipv4EndPointDemux {
 public:
+  /**
+   * \brief Container of the IPv4 endpoints.
+   */
   typedef std::list<Ipv4EndPoint *> EndPoints;
+
+  /**
+   * \brief Iterator to the container of the IPv4 endpoints.
+   */
   typedef std::list<Ipv4EndPoint *>::iterator EndPointsI;
 
   Ipv4EndPointDemux ();
   ~Ipv4EndPointDemux ();
 
+  /**
+   * \brief Get the entire list of end points registered.
+   * \return list of Ipv4EndPoint
+   */
   EndPoints GetAllEndPoints (void);
+
+  /**
+   * \brief Lookup for port local.
+   * \param port port to test
+   * \return true if a port local is in EndPoints, false otherwise
+   */
   bool LookupPortLocal (uint16_t port);
+
+  /**
+   * \brief Lookup for address and port.
+   * \param addr address to test
+   * \param port port to test
+   * \return true if there is a match in EndPoints, false otherwise
+   */
   bool LookupLocal (Ipv4Address addr, uint16_t port);
+
+  /**
+   * \brief lookup for a match with all the parameters.
+   * \param daddr destination address to test
+   * \param dport destination port to test
+   * \param saddr source address to test
+   * \param sport source port to test
+   * \param incomingInterface the incoming interface
+   * \return list of IPv4EndPoints (could be 0 element)
+   */
   EndPoints Lookup (Ipv4Address daddr, 
                     uint16_t dport, 
                     Ipv4Address saddr, 
                     uint16_t sport,
                     Ptr<Ipv4Interface> incomingInterface);
 
+  /**
+   * \brief simple lookup for a match with all the parameters.
+   * \param daddr destination address to test
+   * \param dport destination port to test
+   * \param saddr source address to test
+   * \param sport source port to test
+   * \return IPv4EndPoint (0 if not found)
+   */
   Ipv4EndPoint *SimpleLookup (Ipv4Address daddr, 
                               uint16_t dport, 
                               Ipv4Address saddr, 
                               uint16_t sport);
 
+  /**
+   * \brief Allocate a Ipv4EndPoint.
+   * \return an empty Ipv4EndPoint instance
+   */
   Ipv4EndPoint *Allocate (void);
+
+  /**
+   * \brief Allocate a Ipv4EndPoint.
+   * \param address IPv4 address
+   * \return an Ipv4EndPoint instance
+   */
   Ipv4EndPoint *Allocate (Ipv4Address address);
+
+  /**
+   * \brief Allocate a Ipv4EndPoint.
+   * \param port local port
+   * \return an Ipv4EndPoint instance
+   */
   Ipv4EndPoint *Allocate (uint16_t port);
+
+  /**
+   * \brief Allocate a Ipv4EndPoint.
+   * \param address local address
+   * \param port local port
+   * \return an Ipv4EndPoint instance
+   */
   Ipv4EndPoint *Allocate (Ipv4Address address, uint16_t port);
+
+  /**
+   * \brief Allocate a Ipv4EndPoint.
+   * \param localAddress local address
+   * \param localPort local port
+   * \param peerAddress peer address
+   * \param peerPort peer port
+   * \return an Ipv4EndPoint instance
+   */
   Ipv4EndPoint *Allocate (Ipv4Address localAddress, 
                           uint16_t localPort,
                           Ipv4Address peerAddress, 
                           uint16_t peerPort);
 
+  /**
+   * \brief Remove a end point.
+   * \param endPoint the end point to remove
+   */
   void DeAllocate (Ipv4EndPoint *endPoint);
 
 private:
+
+  /**
+   * \brief Allocate an ephemeral port.
+   * \returns the ephemeral port
+   */
   uint16_t AllocateEphemeralPort (void);
 
+  /**
+   * \brief The ephemeral port.
+   */
   uint16_t m_ephemeral;
+
+  /**
+   * \brief The last ephemeral port.
+   */
   uint16_t m_portLast;
+
+  /**
+   * \brief The first ephemeral port.
+   */
   uint16_t m_portFirst;
+
+  /**
+   * \brief A list of IPv4 end points.
+   */
   EndPoints m_endPoints;
 };
 
diff -Naur ns-3.18.1/src/internet/model/ipv4-end-point.h ns-3.19/src/internet/model/ipv4-end-point.h
--- ns-3.18.1/src/internet/model/ipv4-end-point.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-end-point.h	2013-12-20 09:44:50.000000000 -0800
@@ -46,48 +46,188 @@
 
 class Ipv4EndPoint {
 public:
+  /**
+   * \brief Constructor.
+   * \param address the IPv4 address
+   * \param port the port
+   */
   Ipv4EndPoint (Ipv4Address address, uint16_t port);
   ~Ipv4EndPoint ();
 
+  /**
+   * \brief Get the local address.
+   * \return the local address
+   */
   Ipv4Address GetLocalAddress (void);
+
+  /**
+   * \brief Set the local address.
+   * \param address the address to set
+   */
   void SetLocalAddress (Ipv4Address address);
+
+  /**
+   * \brief Get the local port.
+   * \return the local port
+   */
   uint16_t GetLocalPort (void);
+
+  /**
+   * \brief Get the peer address.
+   * \return the peer address
+   */
   Ipv4Address GetPeerAddress (void);
+
+  /**
+   * \brief Get the peer port.
+   * \return the peer port
+   */
   uint16_t GetPeerPort (void);
 
+  /**
+   * \brief Set the peer informations (address and port).
+   * \param address peer address
+   * \param port peer port
+   */
   void SetPeer (Ipv4Address address, uint16_t port);
 
+  /**
+   * \brief Bind a socket to specific device.
+   *
+   * This method corresponds to using setsockopt() SO_BINDTODEVICE
+   * of real network or BSD sockets.   If set on a socket, this option will
+   * force packets to leave the bound device regardless of the device that
+   * IP routing would naturally choose.  In the receive direction, only
+   * packets received from the bound interface will be delivered.
+   *
+   * This option has no particular relationship to binding sockets to
+   * an address via Socket::Bind ().  It is possible to bind sockets to a
+   * specific IP address on the bound interface by calling both
+   * Socket::Bind (address) and Socket::BindToNetDevice (device), but it
+   * is also possible to bind to mismatching device and address, even if
+   * the socket can not receive any packets as a result.
+   *
+   * \param netdevice Pointer to Netdevice of desired interface
+   */
   void BindToNetDevice (Ptr<NetDevice> netdevice);
+
+  /**
+   * \brief Returns socket's bound netdevice, if any.
+   *
+   * This method corresponds to using getsockopt() SO_BINDTODEVICE
+   * of real network or BSD sockets.
+   *
+   *
+   * \returns Pointer to interface.
+   */
   Ptr<NetDevice> GetBoundNetDevice (void);
 
   // Called from socket implementations to get notified about important events.
+  /**
+   * \brief Set the reception callback.
+   * \param callback callback function
+   */
   void SetRxCallback (Callback<void,Ptr<Packet>, Ipv4Header, uint16_t, Ptr<Ipv4Interface> > callback);
+  /**
+   * \brief Set the ICMP callback.
+   * \param callback callback function
+   */
   void SetIcmpCallback (Callback<void,Ipv4Address,uint8_t,uint8_t,uint8_t,uint32_t> callback);
+  /**
+   * \brief Set the default destroy callback.
+   * \param callback callback function
+   */
   void SetDestroyCallback (Callback<void> callback);
 
-  // Called from an L4Protocol implementation to notify an endpoint of a
-  // packet reception.
+  /**
+   * \brief Forward the packet to the upper level.
+   *
+   * Called from an L4Protocol implementation to notify an endpoint of a
+   * packet reception.
+   * \param p the packet
+   * \param header the packet header
+   * \param sport source port
+   * \param incomingInterface incoming interface
+   */
   void ForwardUp (Ptr<Packet> p, const Ipv4Header& header, uint16_t sport, 
                   Ptr<Ipv4Interface> incomingInterface);
-  // Called from an L4Protocol implementation to notify an endpoint of
-  // an icmp message reception.
+
+  /**
+   * \brief Forward the ICMP packet to the upper level.
+   *
+   * Called from an L4Protocol implementation to notify an endpoint of
+   * an icmp message reception.
+   *
+   * \param icmpSource source IP address
+   * \param icmpTtl time-to-live
+   * \param icmpType ICMP type
+   * \param icmpCode ICMP code
+   * \param icmpInfo ICMP info
+   */
   void ForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, 
                     uint8_t icmpType, uint8_t icmpCode,
                     uint32_t icmpInfo);
 
 private:
+  /**
+   * \brief ForwardUp wrapper.
+   * \param p packet
+   * \param header the packet header
+   * \param sport source port
+   * \param incomingInterface incoming interface
+   */
   void DoForwardUp (Ptr<Packet> p, const Ipv4Header& header, uint16_t sport,
                     Ptr<Ipv4Interface> incomingInterface);
-  void DoForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, 
+  /**
+   * \brief ForwardIcmp wrapper.
+   * \param icmpSource source IP address
+   * \param icmpTtl time-to-live
+   * \param icmpType ICMP type
+   * \param icmpCode ICMP code
+   * \param icmpInfo ICMP info
+   */
+  void DoForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl,
                       uint8_t icmpType, uint8_t icmpCode,
                       uint32_t icmpInfo);
+
+  /**
+   * \brief The local address.
+   */
   Ipv4Address m_localAddr;
+
+  /**
+   * \brief The local port.
+   */
   uint16_t m_localPort;
+
+  /**
+   * \brief The peer address.
+   */
   Ipv4Address m_peerAddr;
+
+  /**
+   * \brief The peer port.
+   */
   uint16_t m_peerPort;
+
+  /**
+   * \brief The NetDevice the EndPoint is bound to (if any).
+   */
   Ptr<NetDevice> m_boundnetdevice;
+
+  /**
+   * \brief The RX callback.
+   */
   Callback<void,Ptr<Packet>, Ipv4Header, uint16_t, Ptr<Ipv4Interface> > m_rxCallback;
+
+  /**
+   * \brief The ICMPv6 callback.
+   */
   Callback<void,Ipv4Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback;
+
+  /**
+   * \brief The destroy callback.
+   */
   Callback<void> m_destroyCallback;
 };
 
diff -Naur ns-3.18.1/src/internet/model/ipv4-global-routing.cc ns-3.19/src/internet/model/ipv4-global-routing.cc
--- ns-3.18.1/src/internet/model/ipv4-global-routing.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-global-routing.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4GlobalRouting);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4GlobalRouting)
+  ;
 
 TypeId 
 Ipv4GlobalRouting::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/ipv4-global-routing.h ns-3.19/src/internet/model/ipv4-global-routing.h
--- ns-3.18.1/src/internet/model/ipv4-global-routing.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-global-routing.h	2013-12-20 09:44:50.000000000 -0800
@@ -69,15 +69,19 @@
 class Ipv4GlobalRouting : public Ipv4RoutingProtocol
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
-/**
- * \brief Construct an empty Ipv4GlobalRouting routing protocol,
- *
- * The Ipv4GlobalRouting class supports host and network unicast routes.
- * This method initializes the lists containing these routes to empty.
- *
- * \see Ipv4GlobalRouting
- */
+  /**
+   * \brief Construct an empty Ipv4GlobalRouting routing protocol,
+   *
+   * The Ipv4GlobalRouting class supports host and network unicast routes.
+   * This method initializes the lists containing these routes to empty.
+   *
+   * \see Ipv4GlobalRouting
+   */
   Ipv4GlobalRouting ();
   virtual ~Ipv4GlobalRouting ();
 
@@ -94,131 +98,132 @@
   virtual void SetIpv4 (Ptr<Ipv4> ipv4);
   virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const;
 
-/**
- * \brief Add a host route to the global routing table.
- *
- * \param dest The Ipv4Address destination for this route.
- * \param nextHop The Ipv4Address of the next hop in the route.
- * \param interface The network interface index used to send packets to the
- * destination.
- *
- * \see Ipv4Address
- */
+  /**
+   * \brief Add a host route to the global routing table.
+   *
+   * \param dest The Ipv4Address destination for this route.
+   * \param nextHop The Ipv4Address of the next hop in the route.
+   * \param interface The network interface index used to send packets to the
+   * destination.
+   *
+   * \see Ipv4Address
+   */
   void AddHostRouteTo (Ipv4Address dest, 
                        Ipv4Address nextHop, 
                        uint32_t interface);
-/**
- * \brief Add a host route to the global routing table.
- *
- * \param dest The Ipv4Address destination for this route.
- * \param interface The network interface index used to send packets to the
- * destination.
- *
- * \see Ipv4Address
- */
+  /**
+   * \brief Add a host route to the global routing table.
+   *
+   * \param dest The Ipv4Address destination for this route.
+   * \param interface The network interface index used to send packets to the
+   * destination.
+   *
+   * \see Ipv4Address
+   */
   void AddHostRouteTo (Ipv4Address dest, 
                        uint32_t interface);
 
-/**
- * \brief Add a network route to the global routing table.
- *
- * \param network The Ipv4Address network for this route.
- * \param networkMask The Ipv4Mask to extract the network.
- * \param nextHop The next hop in the route to the destination network.
- * \param interface The network interface index used to send packets to the
- * destination.
- *
- * \see Ipv4Address
- */
+  /**
+   * \brief Add a network route to the global routing table.
+   *
+   * \param network The Ipv4Address network for this route.
+   * \param networkMask The Ipv4Mask to extract the network.
+   * \param nextHop The next hop in the route to the destination network.
+   * \param interface The network interface index used to send packets to the
+   * destination.
+   *
+   * \see Ipv4Address
+   */
   void AddNetworkRouteTo (Ipv4Address network, 
                           Ipv4Mask networkMask, 
                           Ipv4Address nextHop, 
                           uint32_t interface);
 
-/**
- * \brief Add a network route to the global routing table.
- *
- * \param network The Ipv4Address network for this route.
- * \param networkMask The Ipv4Mask to extract the network.
- * \param interface The network interface index used to send packets to the
- * destination.
- *
- * \see Ipv4Address
- */
+  /**
+   * \brief Add a network route to the global routing table.
+   *
+   * \param network The Ipv4Address network for this route.
+   * \param networkMask The Ipv4Mask to extract the network.
+   * \param interface The network interface index used to send packets to the
+   * destination.
+   *
+   * \see Ipv4Address
+   */
   void AddNetworkRouteTo (Ipv4Address network, 
                           Ipv4Mask networkMask, 
                           uint32_t interface);
 
-/**
- * \brief Add an external route to the global routing table.
- *
- * \param network The Ipv4Address network for this route.
- * \param networkMask The Ipv4Mask to extract the network.
- * \param nextHop The next hop Ipv4Address
- * \param interface The network interface index used to send packets to the
- * destination.
- */
+  /**
+   * \brief Add an external route to the global routing table.
+   *
+   * \param network The Ipv4Address network for this route.
+   * \param networkMask The Ipv4Mask to extract the network.
+   * \param nextHop The next hop Ipv4Address
+   * \param interface The network interface index used to send packets to the
+   * destination.
+   */
   void AddASExternalRouteTo (Ipv4Address network,
                              Ipv4Mask networkMask,
                              Ipv4Address nextHop,
                              uint32_t interface);
 
-/**
- * \brief Get the number of individual unicast routes that have been added
- * to the routing table.
- *
- * \warning The default route counts as one of the routes.
- */
+  /**
+   * \brief Get the number of individual unicast routes that have been added
+   * to the routing table.
+   *
+   * \warning The default route counts as one of the routes.
+   * \returns the number of routes
+   */
   uint32_t GetNRoutes (void) const;
 
-/**
- * \brief Get a route from the global unicast routing table.
- *
- * Externally, the unicast global routing table appears simply as a table with
- * n entries.  The one subtlety of note is that if a default route has been set
- * it will appear as the zeroth entry in the table.  This means that if you
- * add only a default route, the table will have one entry that can be accessed
- * either by explicitly calling GetDefaultRoute () or by calling GetRoute (0).
- * 
- * Similarly, if the default route has been set, calling RemoveRoute (0) will
- * remove the default route.
- *
- * \param i The index (into the routing table) of the route to retrieve.  If
- * the default route has been set, it will occupy index zero.
- * \return If route is set, a pointer to that Ipv4RoutingTableEntry is returned, otherwise
- * a zero pointer is returned.
- *
- * \see Ipv4RoutingTableEntry
- * \see Ipv4GlobalRouting::RemoveRoute
- */
+  /**
+   * \brief Get a route from the global unicast routing table.
+   *
+   * Externally, the unicast global routing table appears simply as a table with
+   * n entries.  The one subtlety of note is that if a default route has been set
+   * it will appear as the zeroth entry in the table.  This means that if you
+   * add only a default route, the table will have one entry that can be accessed
+   * either by explicitly calling GetDefaultRoute () or by calling GetRoute (0).
+   *
+   * Similarly, if the default route has been set, calling RemoveRoute (0) will
+   * remove the default route.
+   *
+   * \param i The index (into the routing table) of the route to retrieve.  If
+   * the default route has been set, it will occupy index zero.
+   * \return If route is set, a pointer to that Ipv4RoutingTableEntry is returned, otherwise
+   * a zero pointer is returned.
+   *
+   * \see Ipv4RoutingTableEntry
+   * \see Ipv4GlobalRouting::RemoveRoute
+   */
   Ipv4RoutingTableEntry *GetRoute (uint32_t i) const;
 
-/**
- * \brief Remove a route from the global unicast routing table.
- *
- * Externally, the unicast global routing table appears simply as a table with
- * n entries.  The one subtlety of note is that if a default route has been set
- * it will appear as the zeroth entry in the table.  This means that if the
- * default route has been set, calling RemoveRoute (0) will remove the
- * default route.
- *
- * \param i The index (into the routing table) of the route to remove.  If
- * the default route has been set, it will occupy index zero.
- *
- * \see Ipv4RoutingTableEntry
- * \see Ipv4GlobalRouting::GetRoute
- * \see Ipv4GlobalRouting::AddRoute
- */
+  /**
+   * \brief Remove a route from the global unicast routing table.
+   *
+   * Externally, the unicast global routing table appears simply as a table with
+   * n entries.  The one subtlety of note is that if a default route has been set
+   * it will appear as the zeroth entry in the table.  This means that if the
+   * default route has been set, calling RemoveRoute (0) will remove the
+   * default route.
+   *
+   * \param i The index (into the routing table) of the route to remove.  If
+   * the default route has been set, it will occupy index zero.
+   *
+   * \see Ipv4RoutingTableEntry
+   * \see Ipv4GlobalRouting::GetRoute
+   * \see Ipv4GlobalRouting::AddRoute
+   */
   void RemoveRoute (uint32_t i);
 
- /**
-  * Assign a fixed random variable stream number to the random variables
-  * used by this model.  Return the number of streams (possibly zero) that
-  * have been assigned.
-  *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
-  */
+  /**
+   * Assign a fixed random variable stream number to the random variables
+   * used by this model.  Return the number of streams (possibly zero) that
+   * have been assigned.
+   *
+   * \param stream first stream index to use
+   * \return the number of stream indices assigned by this model
+   */
   int64_t AssignStreams (int64_t stream);
 
 protected:
@@ -232,23 +237,34 @@
   /// A uniform random number generator for randomly routing packets among ECMP 
   Ptr<UniformRandomVariable> m_rand;
 
+  /// container of Ipv4RoutingTableEntry (routes to hosts)
   typedef std::list<Ipv4RoutingTableEntry *> HostRoutes;
+  /// const iterator of container of Ipv4RoutingTableEntry (routes to hosts)
   typedef std::list<Ipv4RoutingTableEntry *>::const_iterator HostRoutesCI;
+  /// iterator of container of Ipv4RoutingTableEntry (routes to hosts)
   typedef std::list<Ipv4RoutingTableEntry *>::iterator HostRoutesI;
+
+  /// container of Ipv4RoutingTableEntry (routes to networks)
   typedef std::list<Ipv4RoutingTableEntry *> NetworkRoutes;
+  /// const iterator of container of Ipv4RoutingTableEntry (routes to networks)
   typedef std::list<Ipv4RoutingTableEntry *>::const_iterator NetworkRoutesCI;
+  /// iterator of container of Ipv4RoutingTableEntry (routes to networks)
   typedef std::list<Ipv4RoutingTableEntry *>::iterator NetworkRoutesI;
+
+  /// container of Ipv4RoutingTableEntry (routes to external AS)
   typedef std::list<Ipv4RoutingTableEntry *> ASExternalRoutes;
+  /// const iterator of container of Ipv4RoutingTableEntry (routes to external AS)
   typedef std::list<Ipv4RoutingTableEntry *>::const_iterator ASExternalRoutesCI;
+  /// iterator of container of Ipv4RoutingTableEntry (routes to external AS)
   typedef std::list<Ipv4RoutingTableEntry *>::iterator ASExternalRoutesI;
 
   Ptr<Ipv4Route> LookupGlobal (Ipv4Address dest, Ptr<NetDevice> oif = 0);
 
-  HostRoutes m_hostRoutes;
-  NetworkRoutes m_networkRoutes;
-  ASExternalRoutes m_ASexternalRoutes; // External routes imported
+  HostRoutes m_hostRoutes;             //!< Routes to hosts
+  NetworkRoutes m_networkRoutes;       //!< Routes to networks
+  ASExternalRoutes m_ASexternalRoutes; //!< External routes imported
 
-  Ptr<Ipv4> m_ipv4;
+  Ptr<Ipv4> m_ipv4; //!< associated IPv4 instance
 };
 
 } // Namespace ns3
diff -Naur ns-3.18.1/src/internet/model/ipv4.h ns-3.19/src/internet/model/ipv4.h
--- ns-3.18.1/src/internet/model/ipv4.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4.h	2013-12-20 09:44:50.000000000 -0800
@@ -75,6 +75,10 @@
 class Ipv4 : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   Ipv4 ();
   virtual ~Ipv4 ();
@@ -167,6 +171,7 @@
    *
    * \param address The IP address being considered
    * \param iif The incoming Ipv4 interface index
+   * \returns true if the address is associated with the interface index
    *
    * This method can be used to determine whether a received packet has
    * an acceptable address for local delivery on the host.  The address
@@ -378,13 +383,35 @@
   virtual void DeleteRawSocket (Ptr<Socket> socket) = 0;
 
 
-  static const uint32_t IF_ANY = 0xffffffff;
+  static const uint32_t IF_ANY = 0xffffffff; //!< interface wildcard, meaning any interface
 
 private:
   // Indirect the Ipv4 attributes through private pure virtual methods
+
+  /**
+   * \brief Set or unset the IP forwarding state
+   * \param forward the forwarding state
+   */
   virtual void SetIpForward (bool forward) = 0;
+  /**
+   * \brief Get the IP forwarding state
+   * \returns true if IP is in forwarding state
+   */
   virtual bool GetIpForward (void) const = 0;
+
+  /**
+   * \brief Set or unset the Weak Es Model
+   *
+   * RFC1122 term for whether host accepts datagram with a dest. address on another interface
+   * \param model true for Weak Es Model
+   */
   virtual void SetWeakEsModel (bool model) = 0;
+  /**
+   * \brief Get the Weak Es Model status
+   *
+   * RFC1122 term for whether host accepts datagram with a dest. address on another interface
+   * \returns true for Weak Es Model activated
+   */
   virtual bool GetWeakEsModel (void) const = 0;
 };
 
diff -Naur ns-3.18.1/src/internet/model/ipv4-header.cc ns-3.19/src/internet/model/ipv4-header.cc
--- ns-3.18.1/src/internet/model/ipv4-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4Header);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4Header)
+  ;
 
 Ipv4Header::Ipv4Header ()
   : m_calcChecksum (false),
diff -Naur ns-3.18.1/src/internet/model/ipv4-header.h ns-3.19/src/internet/model/ipv4-header.h
--- ns-3.18.1/src/internet/model/ipv4-header.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -172,6 +172,7 @@
    */
   DscpType GetDscp (void) const;
   /**
+   * \param dscp the dscp
    * \returns std::string of DSCPType
    */
   std::string DscpTypeToString (DscpType dscp) const;
@@ -180,6 +181,7 @@
    */
   EcnType GetEcn (void) const;
   /**
+   * \param ecn the ECNType
    * \returns std::string of ECNType
    */
   std::string EcnTypeToString (EcnType ecn) const;
@@ -220,6 +222,10 @@
    */
   bool IsChecksumOk (void) const;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
   virtual void Print (std::ostream &os) const;
@@ -228,25 +234,26 @@
   virtual uint32_t Deserialize (Buffer::Iterator start);
 private:
 
+  /// flags related to IP fragmentation
   enum FlagsE {
     DONT_FRAGMENT = (1<<0),
     MORE_FRAGMENTS = (1<<1)
   };
 
-  bool m_calcChecksum;
+  bool m_calcChecksum; //!< true if the checksum must be calculated
 
-  uint16_t m_payloadSize;
-  uint16_t m_identification;
-  uint32_t m_tos : 8; //Also used as DSCP + ECN value
-  uint32_t m_ttl : 8;
-  uint32_t m_protocol : 8;
-  uint32_t m_flags : 3;
-  uint16_t m_fragmentOffset;
-  Ipv4Address m_source;
-  Ipv4Address m_destination;
-  uint16_t m_checksum;
-  bool m_goodChecksum;
-  uint16_t m_headerSize;
+  uint16_t m_payloadSize; //!< payload size
+  uint16_t m_identification; //!< identification
+  uint32_t m_tos : 8; //!< TOS, also used as DSCP + ECN value
+  uint32_t m_ttl : 8; //!< TTL
+  uint32_t m_protocol : 8;  //!< Protocol
+  uint32_t m_flags : 3; //!< flags
+  uint16_t m_fragmentOffset;  //!< Fragment offset
+  Ipv4Address m_source; //!< source address
+  Ipv4Address m_destination; //!< destination address
+  uint16_t m_checksum; //!< checksum
+  bool m_goodChecksum; //!< true if checksum is correct
+  uint16_t m_headerSize; //!< IP header size
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/ipv4-interface-address.h ns-3.19/src/internet/model/ipv4-interface-address.h
--- ns-3.18.1/src/internet/model/ipv4-interface-address.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-interface-address.h	2013-12-20 09:44:50.000000000 -0800
@@ -42,6 +42,10 @@
 class Ipv4InterfaceAddress 
 {
 public:
+  /**
+   * \enum InterfaceAddressScope_e
+   * \brief Address scope.
+   */
   enum InterfaceAddressScope_e {
     HOST,
     LINK,
@@ -49,39 +53,116 @@
   };
 
   Ipv4InterfaceAddress ();
-  // Configure m_local, m_mask, and m_broadcast from the below constructor
+
+  /**
+   * \brief Configure local address, mask and broadcast address
+   * \param local the local address
+   * \param mask the network mask
+   */
   Ipv4InterfaceAddress (Ipv4Address local, Ipv4Mask mask);
+  /**
+   * Copy constructor
+   * \param o the object to copy
+   */
   Ipv4InterfaceAddress (const Ipv4InterfaceAddress &o);
 
+  /**
+   * \brief Set local address
+   * \param local the address
+   */
   void SetLocal (Ipv4Address local);
+  /**
+   * \brief Get the local address
+   * \returns the local address
+   */
   Ipv4Address GetLocal (void) const;
+  /**
+   * \brief Set the network mask
+   * \param mask the network mask
+   */
   void SetMask (Ipv4Mask mask);
+  /**
+   * \brief Get the network mask
+   * \returns the network mask
+   */
   Ipv4Mask GetMask (void) const;
+  /**
+   * \brief Set the broadcast address
+   * \param broadcast the broadcast address
+   */
   void SetBroadcast (Ipv4Address broadcast);
+  /**
+   * \brief Get the broadcast address
+   * \returns the broadcast address
+   */
   Ipv4Address GetBroadcast (void) const;
  
+  /**
+   * \brief Set the scope.
+   * \param scope the scope of address
+   */
   void SetScope (Ipv4InterfaceAddress::InterfaceAddressScope_e scope);
+
+  /**
+   * \brief Get address scope.
+   * \return scope
+   */
   Ipv4InterfaceAddress::InterfaceAddressScope_e GetScope (void) const;
 
+  /**
+   * \brief Check if the address is a secondary address
+   *
+   * Secondary address is used for multihoming
+   * \returns true if the address is secondary
+   */
   bool IsSecondary (void) const;
+
+  /**
+   * \brief Make the address secondary (used for multihoming)
+   */
   void SetSecondary (void);
+  /**
+   * \brief Make the address primary
+   */
   void SetPrimary (void);
 
 private:
 
-  Ipv4Address m_local;     // Interface address
+  Ipv4Address m_local;     //!< Interface address
   // Note:  m_peer may be added in future when necessary
-  // Ipv4Address m_peer;      // Peer destination address (in Linux:  m_address)
-  Ipv4Mask m_mask;         // Network mask
-  Ipv4Address m_broadcast; // Broadcast address
-
-  InterfaceAddressScope_e m_scope;
-  bool m_secondary;        // For use in multihoming
-
+  // Ipv4Address m_peer;   // Peer destination address (in Linux:  m_address)
+  Ipv4Mask m_mask;         //!< Network mask
+  Ipv4Address m_broadcast; //!< Broadcast address
+
+  InterfaceAddressScope_e m_scope; //!< Address scope
+  bool m_secondary;        //!< For use in multihoming
+
+  /**
+   * \brief Equal to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the operands are equal
+   */
   friend bool operator == (Ipv4InterfaceAddress const &a, Ipv4InterfaceAddress const &b);
+
+  /**
+   * \brief Not equal to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the operands are not equal
+   */
   friend bool operator != (Ipv4InterfaceAddress const &a, Ipv4InterfaceAddress const &b);
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param addr the Ipv4InterfaceAddress
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, const Ipv4InterfaceAddress &addr);
 
 inline bool operator == (const Ipv4InterfaceAddress &a, const Ipv4InterfaceAddress &b)
diff -Naur ns-3.18.1/src/internet/model/ipv4-interface.cc ns-3.19/src/internet/model/ipv4-interface.cc
--- ns-3.18.1/src/internet/model/ipv4-interface.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-interface.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface)
+  ;
 
 TypeId 
 Ipv4Interface::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/ipv4-interface.h ns-3.19/src/internet/model/ipv4-interface.h
--- ns-3.18.1/src/internet/model/ipv4-interface.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -43,20 +43,36 @@
  * specific information (addresses) about an interface.
  *
  * By default, Ipv4 interface are created in the "down" state
- * no IP addresses.  Before becoming useable, the user must 
+ * no IP addresses.  Before becoming usable, the user must
  * add an address of some type and invoke Setup on them.
  */
 class Ipv4Interface  : public Object
 {
 public:
+  /**
+   * \brief Get the type ID
+   * \return type ID
+   */
   static TypeId GetTypeId (void);
 
   Ipv4Interface ();
   virtual ~Ipv4Interface();
 
+  /**
+   * \brief Set node associated with interface.
+   * \param node node
+   */
   void SetNode (Ptr<Node> node); 
+  /**
+   * \brief Set the NetDevice.
+   * \param device NetDevice
+   */
   void SetDevice (Ptr<NetDevice> device);
-  void SetArpCache (Ptr<ArpCache>);
+  /**
+   * \brief Set ARP cache used by this interface
+   * \param arpCache the ARP cache
+   */
+  void SetArpCache (Ptr<ArpCache> arpCache);
 
   /**
    * \returns the underlying NetDevice. This method cannot return zero.
@@ -164,18 +180,36 @@
 protected:
   virtual void DoDispose (void);
 private:
+  /**
+   * \brief Initialize interface.
+   */
   void DoSetup (void);
+
+
+  /**
+   * \brief Container for the Ipv4InterfaceAddresses.
+   */
   typedef std::list<Ipv4InterfaceAddress> Ipv4InterfaceAddressList;
+
+  /**
+   * \brief Container Iterator for the Ipv4InterfaceAddresses.
+   */
   typedef std::list<Ipv4InterfaceAddress>::const_iterator Ipv4InterfaceAddressListCI;
+
+  /**
+   * \brief Const Container Iterator for the Ipv4InterfaceAddresses.
+   */
   typedef std::list<Ipv4InterfaceAddress>::iterator Ipv4InterfaceAddressListI;
 
-  bool m_ifup;
-  bool m_forwarding;  // IN_DEV_FORWARD
-  uint16_t m_metric;
-  Ipv4InterfaceAddressList m_ifaddrs;
-  Ptr<Node> m_node;
-  Ptr<NetDevice> m_device;
-  Ptr<ArpCache> m_cache; 
+
+
+  bool m_ifup; //!< The state of this interface
+  bool m_forwarding;  //!< Forwarding state.
+  uint16_t m_metric;  //!< Interface metric
+  Ipv4InterfaceAddressList m_ifaddrs; //!< Address list
+  Ptr<Node> m_node; //!< The associated node
+  Ptr<NetDevice> m_device; //!< The associated NetDevice
+  Ptr<ArpCache> m_cache; //!< ARP cache
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/ipv4-l3-protocol.cc ns-3.19/src/internet/model/ipv4-l3-protocol.cc
--- ns-3.18.1/src/internet/model/ipv4-l3-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-l3-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -46,7 +46,8 @@
 
 const uint16_t Ipv4L3Protocol::PROT_NUMBER = 0x0800;
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol)
+  ;
 
 TypeId 
 Ipv4L3Protocol::GetTypeId (void)
@@ -687,9 +688,9 @@
     }
 }
 
-/// \todo when should we set ip_id?   check whether we are incrementing
-/// m_identification on packets that may later be dropped in this stack
-/// and whether that deviates from Linux
+// \todo when should we set ip_id?   check whether we are incrementing
+// m_identification on packets that may later be dropped in this stack
+// and whether that deviates from Linux
 Ipv4Header
 Ipv4L3Protocol::BuildHeader (
   Ipv4Address source,
@@ -889,18 +890,20 @@
           return;
         }
       NS_LOG_LOGIC ("Got last fragment, Packet is complete " << *p );
+      ipHeader.SetFragmentOffset (0);
+      ipHeader.SetPayloadSize (p->GetSize () + ipHeader.GetSerializedSize ());
     }
 
-  m_localDeliverTrace (ip, packet, iif);
+  m_localDeliverTrace (ipHeader, p, iif);
 
-  Ptr<IpL4Protocol> protocol = GetProtocol (ip.GetProtocol ());
+  Ptr<IpL4Protocol> protocol = GetProtocol (ipHeader.GetProtocol ());
   if (protocol != 0)
     {
       // we need to make a copy in the unlikely event we hit the
       // RX_ENDPOINT_UNREACH codepath
       Ptr<Packet> copy = p->Copy ();
       enum IpL4Protocol::RxStatus status = 
-        protocol->Receive (p, ip, GetInterface (iif));
+        protocol->Receive (p, ipHeader, GetInterface (iif));
       switch (status) {
         case IpL4Protocol::RX_OK:
         // fall through
@@ -909,8 +912,8 @@
         case IpL4Protocol::RX_CSUM_FAILED:
           break;
         case IpL4Protocol::RX_ENDPOINT_UNREACH:
-          if (ip.GetDestination ().IsBroadcast () == true ||
-              ip.GetDestination ().IsMulticast () == true)
+          if (ipHeader.GetDestination ().IsBroadcast () == true ||
+              ipHeader.GetDestination ().IsMulticast () == true)
             {
               break; // Do not reply to broadcast or multicast
             }
@@ -919,15 +922,15 @@
           for (uint32_t i = 0; i < GetNAddresses (iif); i++)
             {
               Ipv4InterfaceAddress addr = GetAddress (iif, i);
-              if (addr.GetLocal ().CombineMask (addr.GetMask ()) == ip.GetDestination ().CombineMask (addr.GetMask ()) &&
-                  ip.GetDestination ().IsSubnetDirectedBroadcast (addr.GetMask ()))
+              if (addr.GetLocal ().CombineMask (addr.GetMask ()) == ipHeader.GetDestination ().CombineMask (addr.GetMask ()) &&
+                  ipHeader.GetDestination ().IsSubnetDirectedBroadcast (addr.GetMask ()))
                 {
                   subnetDirected = true;
                 }
             }
           if (subnetDirected == false)
             {
-              GetIcmp ()->SendDestUnreachPort (ip, copy);
+              GetIcmp ()->SendDestUnreachPort (ipHeader, copy);
             }
         }
     }
@@ -1092,11 +1095,23 @@
 {
   NS_LOG_FUNCTION (this << i);
   Ptr<Ipv4Interface> interface = GetInterface (i);
-  interface->SetUp ();
 
-  if (m_routingProtocol != 0)
+  // RFC 791, pg.25:
+  //  Every internet module must be able to forward a datagram of 68
+  //  octets without further fragmentation.  This is because an internet
+  //  header may be up to 60 octets, and the minimum fragment is 8 octets.
+  if (interface->GetDevice ()->GetMtu () >= 68)
+    {
+      interface->SetUp ();
+
+      if (m_routingProtocol != 0)
+        {
+          m_routingProtocol->NotifyInterfaceUp (i);
+        }
+    }
+  else
     {
-      m_routingProtocol->NotifyInterfaceUp (i);
+      NS_LOG_LOGIC ("Interface " << int(i) << " is set to be down for IPv4. Reason: not respecting minimum IPv4 MTU (68 octects)");
     }
 }
 
@@ -1392,10 +1407,11 @@
 
   std::list<std::pair<Ptr<Packet>, uint16_t> >::const_iterator it = m_fragments.begin ();
 
-  Ptr<Packet> p = Create<Packet> ();
-  uint16_t lastEndOffset = 0;
+  Ptr<Packet> p = it->first->Copy ();
+  uint16_t lastEndOffset = p->GetSize ();
+  it++;
 
-  for ( it = m_fragments.begin (); it != m_fragments.end (); it++)
+  for ( ; it != m_fragments.end (); it++)
     {
       if ( lastEndOffset > it->second )
         {
diff -Naur ns-3.18.1/src/internet/model/ipv4-l3-protocol.h ns-3.19/src/internet/model/ipv4-l3-protocol.h
--- ns-3.18.1/src/internet/model/ipv4-l3-protocol.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-l3-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -77,8 +77,12 @@
 class Ipv4L3Protocol : public Ipv4
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
-  static const uint16_t PROT_NUMBER;
+  static const uint16_t PROT_NUMBER; //!< Protocol number (0x0800)
 
   Ipv4L3Protocol();
   virtual ~Ipv4L3Protocol ();
@@ -97,6 +101,10 @@
     DROP_FRAGMENT_TIMEOUT /**< Fragment timeout exceeded */
   };
 
+  /**
+   * \brief Set node associated with this stack.
+   * \param node node to set
+   */
   void SetNode (Ptr<Node> node);
 
   // functions defined in base class Ipv4
@@ -182,6 +190,11 @@
   void SendWithHeader (Ptr<Packet> packet, Ipv4Header ipHeader, Ptr<Ipv4Route> route);
 
   uint32_t AddInterface (Ptr<NetDevice> device);
+  /**
+   * \brief Get an interface.
+   * \param i interface index
+   * \return IPv4 interface pointer
+   */
   Ptr<Ipv4Interface> GetInterface (uint32_t i) const;
   uint32_t GetNInterfaces (void) const;
 
@@ -220,7 +233,20 @@
   virtual void NotifyNewAggregate ();
 private:
   friend class Ipv4L3ProtocolTestCase;
+
+  /**
+   * \brief Copy constructor.
+   *
+   * Defined but not implemented to avoid misuse
+   */
   Ipv4L3Protocol(const Ipv4L3Protocol &);
+
+  /**
+   * \brief Copy constructor.
+   *
+   * Defined but not implemented to avoid misuse
+   * \returns the copied object
+   */
   Ipv4L3Protocol &operator = (const Ipv4L3Protocol &);
 
   // class Ipv4 attributes
@@ -229,6 +255,17 @@
   virtual void SetWeakEsModel (bool model);
   virtual bool GetWeakEsModel (void) const;
 
+  /**
+   * \brief Construct an IPv4 header.
+   * \param source source IPv4 address
+   * \param destination destination IPv4 address
+   * \param protocol L4 protocol
+   * \param payloadSize payload size
+   * \param ttl Time to Live
+   * \param tos Type of Service
+   * \param mayFragment true if the packet can be fragmented
+   * \return newly created IPv4 header
+   */
   Ipv4Header BuildHeader (
     Ipv4Address source,
     Ipv4Address destination,
@@ -238,25 +275,65 @@
     uint8_t tos,
     bool mayFragment);
 
+  /**
+   * \brief Send packet with route.
+   * \param route route
+   * \param packet packet to send
+   * \param ipHeader IPv4 header to add to the packet
+   */
   void
   SendRealOut (Ptr<Ipv4Route> route,
                Ptr<Packet> packet,
                Ipv4Header const &ipHeader);
 
+  /**
+   * \brief Forward a packet.
+   * \param rtentry route
+   * \param p packet to forward
+   * \param header IPv4 header to add to the packet
+   */
   void 
   IpForward (Ptr<Ipv4Route> rtentry, 
              Ptr<const Packet> p, 
              const Ipv4Header &header);
 
+  /**
+   * \brief Forward a multicast packet.
+   * \param mrtentry route
+   * \param p packet to forward
+   * \param header IPv6 header to add to the packet
+   */
   void
   IpMulticastForward (Ptr<Ipv4MulticastRoute> mrtentry, 
                       Ptr<const Packet> p, 
                       const Ipv4Header &header);
 
+  /**
+   * \brief Deliver a packet.
+   * \param p packet delivered
+   * \param ip IPv4 header
+   * \param iif input interface packet was received
+   */
   void LocalDeliver (Ptr<const Packet> p, Ipv4Header const&ip, uint32_t iif);
+
+  /**
+   * \brief Fallback when no route is found.
+   * \param p packet
+   * \param ipHeader IPv4 header
+   * \param sockErrno error number
+   */
   void RouteInputError (Ptr<const Packet> p, const Ipv4Header & ipHeader, Socket::SocketErrno sockErrno);
 
+  /**
+   * \brief Add an IPv4 interface to the stack.
+   * \param interface interface to add
+   * \return index of newly added interface
+   */
   uint32_t AddIpv4Interface (Ptr<Ipv4Interface> interface);
+
+  /**
+   * \brief Setup loopback interface.
+   */
   void SetupLoopback (void);
 
   /**
@@ -264,6 +341,13 @@
    * \return Icmpv4L4Protocol pointer
    */
   Ptr<Icmpv4L4Protocol> GetIcmp (void) const;
+
+  /**
+   * \brief Check if an IPv4 address is unicast.
+   * \param ad address
+   * \param interfaceMask the network mask
+   * \return true if the address is unicast
+   */
   bool IsUnicast (Ipv4Address ad, Ipv4Mask interfaceMask) const;
 
   /**
@@ -277,7 +361,7 @@
   /**
    * \brief Process a packet fragment
    * \param packet the packet
-   * \param fragmentSize the size of the fragment
+   * \param ipHeader the IP header
    * \param iif Input Interface
    * \return true is the fragment completed the packet
    */
@@ -291,32 +375,47 @@
    */
   void HandleFragmentsTimeout ( std::pair<uint64_t, uint32_t> key, Ipv4Header & ipHeader, uint32_t iif);
 
+  /**
+   * \brief Container of the IPv4 Interfaces.
+   */
   typedef std::vector<Ptr<Ipv4Interface> > Ipv4InterfaceList;
+  /**
+   * \brief Container of the IPv4 Raw Sockets.
+   */
   typedef std::list<Ptr<Ipv4RawSocketImpl> > SocketList;
-  typedef std::list<Ptr<IpL4Protocol> > L4List_t;
+  /**
+   * \brief Container of the IPv4 L4 instances.
+   */
+   typedef std::list<Ptr<IpL4Protocol> > L4List_t;
 
-  bool m_ipForward;
-  bool m_weakEsModel;
-  L4List_t m_protocols;
-  Ipv4InterfaceList m_interfaces;
-  uint8_t m_defaultTos;
-  uint8_t m_defaultTtl;
-  uint16_t m_identification;
-  Ptr<Node> m_node;
+  bool m_ipForward;      //!< Forwarding packets (i.e. router mode) state.
+  bool m_weakEsModel;    //!< Weak ES model state
+  L4List_t m_protocols;  //!< List of transport protocol.
+  Ipv4InterfaceList m_interfaces; //!< List of IPv4 interfaces.
+  uint8_t m_defaultTos;  //!< Default TOS
+  uint8_t m_defaultTtl;  //!< Default TTL
+  uint16_t m_identification; //!< Identification
+  Ptr<Node> m_node; //!< Node attached to stack.
 
+  /// Trace of sent packets
   TracedCallback<const Ipv4Header &, Ptr<const Packet>, uint32_t> m_sendOutgoingTrace;
+  /// Trace of unicast forwarded packets
   TracedCallback<const Ipv4Header &, Ptr<const Packet>, uint32_t> m_unicastForwardTrace;
+  /// Trace of locally delivered packets
   TracedCallback<const Ipv4Header &, Ptr<const Packet>, uint32_t> m_localDeliverTrace;
 
   // The following two traces pass a packet with an IP header
+  /// Trace of transmitted packets
   TracedCallback<Ptr<const Packet>, Ptr<Ipv4>,  uint32_t> m_txTrace;
+  /// Trace of received packets
   TracedCallback<Ptr<const Packet>, Ptr<Ipv4>, uint32_t> m_rxTrace;
   // <ip-header, payload, reason, ifindex> (ifindex not valid if reason is DROP_NO_ROUTE)
+  /// Trace of dropped packets
   TracedCallback<const Ipv4Header &, Ptr<const Packet>, DropReason, Ptr<Ipv4>, uint32_t> m_dropTrace;
 
-  Ptr<Ipv4RoutingProtocol> m_routingProtocol;
+  Ptr<Ipv4RoutingProtocol> m_routingProtocol; //!< Routing protocol associated with the stack
 
-  SocketList m_sockets;
+  SocketList m_sockets; //!< List of IPv4 raw sockets.
 
   /**
    * \class Fragments
@@ -374,15 +473,14 @@
 
   };
 
+  /// Container of fragments, stored as pairs(src+dst addr, src+dst port) / fragment
   typedef std::map< std::pair<uint64_t, uint32_t>, Ptr<Fragments> > MapFragments_t;
+  /// Container of fragment timeout event, stored as pairs(src+dst addr, src+dst port) / EventId
   typedef std::map< std::pair<uint64_t, uint32_t>, EventId > MapFragmentsTimers_t;
 
-  /**
-   * \brief The hash of fragmented packets.
-   */
-  MapFragments_t       m_fragments;
-  Time                 m_fragmentExpirationTimeout;
-  MapFragmentsTimers_t m_fragmentsTimers;
+  MapFragments_t       m_fragments; //!< Fragmented packets.
+  Time                 m_fragmentExpirationTimeout; //!< Expiration timeout
+  MapFragmentsTimers_t m_fragmentsTimers; //!< Expiration events.
 
 };
 
diff -Naur ns-3.18.1/src/internet/model/ipv4-list-routing.cc ns-3.19/src/internet/model/ipv4-list-routing.cc
--- ns-3.18.1/src/internet/model/ipv4-list-routing.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-list-routing.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4ListRouting);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4ListRouting)
+  ;
 
 TypeId
 Ipv4ListRouting::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/ipv4-list-routing.h ns-3.19/src/internet/model/ipv4-list-routing.h
--- ns-3.18.1/src/internet/model/ipv4-list-routing.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-list-routing.h	2013-12-20 09:44:50.000000000 -0800
@@ -45,6 +45,10 @@
 class Ipv4ListRouting : public Ipv4RoutingProtocol
 {
 public:
+  /**
+   * \brief Get the type ID of this class.
+   * \return type ID
+   */
   static TypeId GetTypeId (void);
 
   Ipv4ListRouting ();
@@ -92,11 +96,25 @@
   void DoDispose (void);
   void DoInitialize (void);
 private:
+  /**
+   * \brief Container identifying an IPv4 Routing Protocol entry in the list.
+   */
   typedef std::pair<int16_t, Ptr<Ipv4RoutingProtocol> > Ipv4RoutingProtocolEntry;
+  /**
+   * \brief Container of the IPv4 Routing Protocols.
+   */
   typedef std::list<Ipv4RoutingProtocolEntry> Ipv4RoutingProtocolList;
-  Ipv4RoutingProtocolList m_routingProtocols;
+  Ipv4RoutingProtocolList m_routingProtocols; //!<  List of routing protocols.
+
+  /**
+   * \brief Compare two routing protocols.
+   * \param a first object to compare
+   * \param b second object to compare
+   * \return true if they are the same, false otherwise
+   */
   static bool Compare (const Ipv4RoutingProtocolEntry& a, const Ipv4RoutingProtocolEntry& b);
-  Ptr<Ipv4> m_ipv4;
+  Ptr<Ipv4> m_ipv4; //!< Ipv4 this protocol is associated with.
+
 
 };
 
diff -Naur ns-3.18.1/src/internet/model/ipv4-packet-info-tag.h ns-3.19/src/internet/model/ipv4-packet-info-tag.h
--- ns-3.18.1/src/internet/model/ipv4-packet-info-tag.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-packet-info-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -43,23 +43,67 @@
 {
 public:
   Ipv4PacketInfoTag ();
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Set the tag's address
+   *
+   * \param addr the address
+   */
   void SetAddress (Ipv4Address addr);
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Get the tag's address
+   *
+   * \returns the address
+   */
   Ipv4Address GetAddress (void) const;
-  // This corresponds to "ipi_spec_dst" in struct in_pktinfo.
-  // Implemented, but not used in the stack yet
+  /**
+   * \brief Set the tag's \a local address
+   *
+   * This corresponds to "ipi_spec_dst" in struct in_pktinfo.
+   * Implemented, but not used in the stack yet
+   * \param addr the address
+   */
   void SetLocalAddress (Ipv4Address addr);
-  // This corresponds to "ipi_spec_dst" in struct in_pktinfo.
-  // Implemented, but not used in the stack yet
+  /**
+   * \brief Get the tag's \a local address
+   *
+   * This corresponds to "ipi_spec_dst" in struct in_pktinfo.
+   * Implemented, but not used in the stack yet
+   * \returns the address
+   */
   Ipv4Address GetLocalAddress (void) const;
+
+  /**
+   * \brief Set the tag's receiving interface
+   *
+   * \param ifindex the interface index
+   */
   void SetRecvIf (uint32_t ifindex);
+  /**
+   * \brief Get the tag's receiving interface
+   *
+   * \returns the interface index
+   */
   uint32_t GetRecvIf (void) const;
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Set the tag's Time to Live
+   * Implemented, but not used in the stack yet
+   * \param ttl the TTL
+   */
   void SetTtl (uint8_t ttl);
-  // Implemented, but not used in the stack yet
+  /**
+   * \brief Get the tag's Time to Live
+   * Implemented, but not used in the stack yet
+   * \returns the TTL
+   */
   uint8_t GetTtl (void) const;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
   virtual uint32_t GetSerializedSize (void) const;
@@ -77,12 +121,12 @@
   //                                   address */
   // };
 
-  Ipv4Address m_addr;
-  Ipv4Address m_spec_dst;
-  uint32_t m_ifindex;
+  Ipv4Address m_addr;     //!< Header destination address
+  Ipv4Address m_spec_dst; //!< Local address
+  uint32_t m_ifindex;     //!< interface index
 
-  // Uset for IP_RECVTTL, though not implemented yet.
-  uint8_t m_ttl;
+  // Used for IP_RECVTTL, though not implemented yet.
+  uint8_t m_ttl; //!< Time to Live
 };
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/internet/model/ipv4-packet-probe.cc ns-3.19/src/internet/model/ipv4-packet-probe.cc
--- ns-3.18.1/src/internet/model/ipv4-packet-probe.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-packet-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe)
+  ;
 
 TypeId
 Ipv4PacketProbe::GetTypeId ()
diff -Naur ns-3.18.1/src/internet/model/ipv4-packet-probe.h ns-3.19/src/internet/model/ipv4-packet-probe.h
--- ns-3.18.1/src/internet/model/ipv4-packet-probe.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-packet-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -47,6 +47,10 @@
 class Ipv4PacketProbe : public Probe
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   Ipv4PacketProbe ();
   virtual ~Ipv4PacketProbe ();
@@ -102,7 +106,9 @@
    */
   void TraceSink (Ptr<const Packet> packet, Ptr<Ipv4> ipv4, uint32_t interface);
 
+  /// Traced Callback: the packet, the Ipv4 object and the interface.
   TracedCallback<Ptr<const Packet>, Ptr<Ipv4>, uint32_t> m_output;
+  /// Traced Callback: the previous packet's size and the actual packet's size.
   TracedCallback<uint32_t, uint32_t> m_outputBytes;
 
   /// The traced packet.
diff -Naur ns-3.18.1/src/internet/model/ipv4-raw-socket-factory.cc ns-3.19/src/internet/model/ipv4-raw-socket-factory.cc
--- ns-3.18.1/src/internet/model/ipv4-raw-socket-factory.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-raw-socket-factory.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketFactory);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketFactory)
+  ;
 
 TypeId Ipv4RawSocketFactory::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/internet/model/ipv4-raw-socket-factory.h ns-3.19/src/internet/model/ipv4-raw-socket-factory.h
--- ns-3.18.1/src/internet/model/ipv4-raw-socket-factory.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-raw-socket-factory.h	2013-12-20 09:44:50.000000000 -0800
@@ -37,6 +37,10 @@
 class Ipv4RawSocketFactory : public SocketFactory
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
 };
diff -Naur ns-3.18.1/src/internet/model/ipv4-raw-socket-factory-impl.h ns-3.19/src/internet/model/ipv4-raw-socket-factory-impl.h
--- ns-3.18.1/src/internet/model/ipv4-raw-socket-factory-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-raw-socket-factory-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -25,6 +25,12 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup socket
+ *
+ * \class Ipv4RawSocketFactoryImpl
+ * \brief Implementation of IPv4 raw socket factory.
+ */
 class Ipv4RawSocketFactoryImpl : public Ipv4RawSocketFactory
 {
 public:
diff -Naur ns-3.18.1/src/internet/model/ipv4-raw-socket-impl.cc ns-3.19/src/internet/model/ipv4-raw-socket-impl.cc
--- ns-3.18.1/src/internet/model/ipv4-raw-socket-impl.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-raw-socket-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -17,7 +17,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketImpl);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketImpl)
+  ;
 
 TypeId 
 Ipv4RawSocketImpl::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/ipv4-raw-socket-impl.h ns-3.19/src/internet/model/ipv4-raw-socket-impl.h
--- ns-3.18.1/src/internet/model/ipv4-raw-socket-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-raw-socket-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -13,17 +13,41 @@
 class NetDevice;
 class Node;
 
+/**
+ * \class Ipv4RawSocketImpl
+ * \brief IPv4 raw socket.
+ * \ingroup socket
+ *
+ * A RAW Socket typically is used to access specific IP layers not usually
+ * available through L4 sockets, e.g., ICMP. The implementer should take
+ * particular care to define the Ipv4RawSocketImpl Attributes, and in
+ * particular the Protocol attribute.
+ */
 class Ipv4RawSocketImpl : public Socket
 {
 public:
+  /**
+   * \brief Get the type ID of this class.
+   * \return type ID
+   */
   static TypeId GetTypeId (void);
 
   Ipv4RawSocketImpl ();
 
+  /**
+   * \brief Set the node associated with this socket.
+   * \param node node to set
+   */
   void SetNode (Ptr<Node> node);
 
-  virtual enum Socket::SocketErrno GetErrno (void) const;
+  virtual enum Socket::SocketErrno GetErrno () const;
+
+  /**
+   * \brief Get socket type (NS3_SOCK_RAW)
+   * \return socket type
+   */
   virtual enum Socket::SocketType GetSocketType (void) const;
+
   virtual Ptr<Node> GetNode (void) const;
   virtual int Bind (const Address &address);
   virtual int Bind ();
@@ -43,7 +67,20 @@
   virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,
                                 Address &fromAddress);
 
+
+  /**
+   * \brief Set protocol field.
+   * \param protocol protocol to set
+   */
   void SetProtocol (uint16_t protocol);
+
+  /**
+   * \brief Forward up to receive method.
+   * \param p packet
+   * \param ipHeader IPv4 header
+   * \param incomingInterface incoming interface
+   * \return true if forwarded, false otherwise
+   */
   bool ForwardUp (Ptr<const Packet> p, Ipv4Header ipHeader, Ptr<Ipv4Interface> incomingInterface);
   virtual bool SetAllowBroadcast (bool allowBroadcast);
   virtual bool GetAllowBroadcast () const;
@@ -51,22 +88,26 @@
 private:
   virtual void DoDispose (void);
 
+  /**
+   * \struct Data
+   * \brief IPv4 raw data and additional information.
+   */
   struct Data {
-    Ptr<Packet> packet;
-    Ipv4Address fromIp;
-    uint16_t fromProtocol;
+    Ptr<Packet> packet;  /**< Packet data */
+    Ipv4Address fromIp;  /**< Source address */
+    uint16_t fromProtocol;   /**< Protocol used */
   };
 
-  enum Socket::SocketErrno m_err;
-  Ptr<Node> m_node;
-  Ipv4Address m_src;
-  Ipv4Address m_dst;
-  uint16_t m_protocol;
-  std::list<struct Data> m_recv;
-  bool m_shutdownSend;
-  bool m_shutdownRecv;
-  uint32_t m_icmpFilter;
-  bool m_iphdrincl;
+  enum Socket::SocketErrno m_err;   //!< Last error number.
+  Ptr<Node> m_node;                 //!< Node
+  Ipv4Address m_src;                //!< Source address.
+  Ipv4Address m_dst;                //!< Destination address.
+  uint16_t m_protocol;              //!< Protocol.
+  std::list<struct Data> m_recv;    //!< Packet waiting to be processed.
+  bool m_shutdownSend;              //!< Flag to shutdown send capability.
+  bool m_shutdownRecv;              //!< Flag to shutdown receive capability.
+  uint32_t m_icmpFilter;            //!< ICMPv4 filter specification
+  bool m_iphdrincl;                 //!< Include IP Header information (a.k.a setsockopt (IP_HDRINCL))
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/ipv4-route.h ns-3.19/src/internet/model/ipv4-route.h
--- ns-3.18.1/src/internet/model/ipv4-route.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-route.h	2013-12-20 09:44:50.000000000 -0800
@@ -89,15 +89,22 @@
 #endif
 
 private:
-  Ipv4Address m_dest;
-  Ipv4Address m_source;
-  Ipv4Address m_gateway;
-  Ptr<NetDevice> m_outputDevice;
+  Ipv4Address m_dest;             //!< Destination address.
+  Ipv4Address m_source;           //!< Source address.
+  Ipv4Address m_gateway;          //!< Gateway address.
+  Ptr<NetDevice> m_outputDevice;  //!< Output device.
 #ifdef NOTYET
   uint32_t m_inputIfIndex;
 #endif
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param route the Ipv4 route
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, Ipv4Route const& route);
 
 /**
@@ -154,14 +161,14 @@
    */
   std::map<uint32_t, uint32_t> GetOutputTtlMap () const;
 
-  static const uint32_t MAX_INTERFACES = 16;  // Maximum number of multicast interfaces on a router
-  static const uint32_t MAX_TTL = 255;  // Maximum time-to-live (TTL)
+  static const uint32_t MAX_INTERFACES = 16;  //!< Maximum number of multicast interfaces on a router
+  static const uint32_t MAX_TTL = 255;  //!< Maximum time-to-live (TTL)
 
 private:
-  Ipv4Address m_group;      // Group 
-  Ipv4Address m_origin;     // Source of packet
-  uint32_t m_parent;        // Source interface
-  std::map<uint32_t, uint32_t> m_ttls;
+  Ipv4Address m_group;      //!< Group
+  Ipv4Address m_origin;     //!< Source of packet
+  uint32_t m_parent;        //!< Source interface
+  std::map<uint32_t, uint32_t> m_ttls; //!< Time to Live container
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/ipv4-routing-protocol.cc ns-3.19/src/internet/model/ipv4-routing-protocol.cc
--- ns-3.18.1/src/internet/model/ipv4-routing-protocol.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-routing-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4RoutingProtocol);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4RoutingProtocol)
+  ;
 
 TypeId Ipv4RoutingProtocol::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/internet/model/ipv4-routing-protocol.h ns-3.19/src/internet/model/ipv4-routing-protocol.h
--- ns-3.18.1/src/internet/model/ipv4-routing-protocol.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-routing-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -50,11 +50,22 @@
 class Ipv4RoutingProtocol : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
+  /// Callback for unicast packets to be forwarded
   typedef Callback<void, Ptr<Ipv4Route>, Ptr<const Packet>, const Ipv4Header &> UnicastForwardCallback;
+
+  /// Callback for multicast packets to be forwarded
   typedef Callback<void, Ptr<Ipv4MulticastRoute>, Ptr<const Packet>, const Ipv4Header &> MulticastForwardCallback;
+
+  /// Callback for packets to be locally delivered
   typedef Callback<void, Ptr<const Packet>, const Ipv4Header &, uint32_t > LocalDeliverCallback;
+
+  /// Callback for routing errors (e.g., no route found)
   typedef Callback<void, Ptr<const Packet>, const Ipv4Header &, Socket::SocketErrno > ErrorCallback;
 
   /**
diff -Naur ns-3.18.1/src/internet/model/ipv4-routing-table-entry.h ns-3.19/src/internet/model/ipv4-routing-table-entry.h
--- ns-3.18.1/src/internet/model/ipv4-routing-table-entry.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-routing-table-entry.h	2013-12-20 09:44:50.000000000 -0800
@@ -135,25 +135,56 @@
                                                    uint32_t interface);
 
 private:
+  /**
+   * \brief Constructor.
+   * \param network network address
+   * \param mask network mask
+   * \param gateway the gateway
+   * \param interface the interface index
+   */
   Ipv4RoutingTableEntry (Ipv4Address network,
                          Ipv4Mask mask,
                          Ipv4Address gateway,
                          uint32_t interface);
+  /**
+   * \brief Constructor.
+   * \param dest destination address
+   * \param mask network mask
+   * \param interface the interface index
+   */
   Ipv4RoutingTableEntry (Ipv4Address dest,
                          Ipv4Mask mask,
                          uint32_t interface);
+  /**
+   * \brief Constructor.
+   * \param dest destination address
+   * \param gateway the gateway
+   * \param interface the interface index
+   */
   Ipv4RoutingTableEntry (Ipv4Address dest,
                          Ipv4Address gateway,
                          uint32_t interface);
+  /**
+   * \brief Constructor.
+   * \param dest destination address
+   * \param interface the interface index
+   */
   Ipv4RoutingTableEntry (Ipv4Address dest,
                          uint32_t interface);
 
-  Ipv4Address m_dest;
-  Ipv4Mask m_destNetworkMask;
-  Ipv4Address m_gateway;
-  uint32_t m_interface;
+  Ipv4Address m_dest;         //!< destination address
+  Ipv4Mask m_destNetworkMask; //!< destination network mask
+  Ipv4Address m_gateway;      //!< gateway
+  uint32_t m_interface;       //!< output interface
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param route the Ipv4 routing table entry
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, Ipv4RoutingTableEntry const& route);
 
 /**
@@ -215,15 +246,29 @@
                                                               std::vector<uint32_t> outputInterfaces);
 
 private:
+  /**
+   * \brief Constructor.
+   * \param origin source address
+   * \param group destination address
+   * \param inputInterface input interface
+   * \param outputInterfaces output interfaces
+   */
   Ipv4MulticastRoutingTableEntry (Ipv4Address origin, Ipv4Address group, 
                                   uint32_t inputInterface, std::vector<uint32_t> outputInterfaces);
 
-  Ipv4Address m_origin;
-  Ipv4Address m_group;
-  uint32_t m_inputInterface;
-  std::vector<uint32_t> m_outputInterfaces;
+  Ipv4Address m_origin;   //!< source address
+  Ipv4Address m_group;    //!< destination address
+  uint32_t m_inputInterface;    //!< input interface
+  std::vector<uint32_t> m_outputInterfaces;   //!< output interfaces
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param route the Ipv4 multicast routing table entry
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, Ipv4MulticastRoutingTableEntry const& route);
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/ipv4-static-routing.cc ns-3.19/src/internet/model/ipv4-static-routing.cc
--- ns-3.18.1/src/internet/model/ipv4-static-routing.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-static-routing.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4StaticRouting);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4StaticRouting)
+  ;
 
 TypeId
 Ipv4StaticRouting::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/ipv4-static-routing.h ns-3.19/src/internet/model/ipv4-static-routing.h
--- ns-3.18.1/src/internet/model/ipv4-static-routing.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv4-static-routing.h	2013-12-20 09:44:50.000000000 -0800
@@ -69,6 +69,10 @@
 class Ipv4StaticRouting : public Ipv4RoutingProtocol
 {
 public:
+  /**
+   * \brief The interface Id associated with this class.
+   * \return type identifier
+   */
   static TypeId GetTypeId (void);
 
   Ipv4StaticRouting ();
@@ -177,6 +181,7 @@
  * to the routing table.
  *
  * \warning The default route counts as one of the routes.
+ * \return number of entries
  */
   uint32_t GetNRoutes (void) const;
 
@@ -308,6 +313,7 @@
  * to the routing table.
  *
  * \warning The default multicast route counts as one of the routes.
+ * \return number of entries
  */
   uint32_t GetNMulticastRoutes (void) const;
 
@@ -375,23 +381,63 @@
   virtual void DoDispose (void);
 
 private:
+  /// Container for the network routes
   typedef std::list<std::pair <Ipv4RoutingTableEntry *, uint32_t> > NetworkRoutes;
+
+  /// Const Iterator for container for the network routes
   typedef std::list<std::pair <Ipv4RoutingTableEntry *, uint32_t> >::const_iterator NetworkRoutesCI;
+
+  /// Iterator for container for the network routes
   typedef std::list<std::pair <Ipv4RoutingTableEntry *, uint32_t> >::iterator NetworkRoutesI;
 
+  /// Container for the multicast routes
   typedef std::list<Ipv4MulticastRoutingTableEntry *> MulticastRoutes;
+
+  /// Const Iterator for container for the multicast routes
   typedef std::list<Ipv4MulticastRoutingTableEntry *>::const_iterator MulticastRoutesCI;
+
+  /// Iterator for container for the multicast routes
   typedef std::list<Ipv4MulticastRoutingTableEntry *>::iterator MulticastRoutesI;
 
+  /**
+   * \brief Lookup in the forwarding table for destination.
+   * \param dest destination address
+   * \param oif output interface if any (put 0 otherwise)
+   * \return Ipv4Route to route the packet to reach dest address
+   */
   Ptr<Ipv4Route> LookupStatic (Ipv4Address dest, Ptr<NetDevice> oif = 0);
+
+  /**
+   * \brief Lookup in the multicast forwarding table for destination.
+   * \param origin source address
+   * \param group group multicast address
+   * \param interface interface index
+   * \return Ipv4MulticastRoute to route the packet to reach dest address
+   */
   Ptr<Ipv4MulticastRoute> LookupStatic (Ipv4Address origin, Ipv4Address group,
                                         uint32_t interface);
 
+  /**
+   * \brief Choose the source address to use with destination address.
+   * \param interface interface index
+   * \param dest IPv4 destination address
+   * \return IPv4 source address to use
+   */
   Ipv4Address SourceAddressSelection (uint32_t interface, Ipv4Address dest);
 
+  /**
+   * \brief the forwarding table for network.
+   */
   NetworkRoutes m_networkRoutes;
+
+  /**
+   * \brief the forwarding table for multicast.
+   */
   MulticastRoutes m_multicastRoutes;
 
+  /**
+   * \brief Ipv4 reference.
+   */
   Ptr<Ipv4> m_ipv4;
 };
 
diff -Naur ns-3.18.1/src/internet/model/ipv6-address-generator.cc ns-3.19/src/internet/model/ipv6-address-generator.cc
--- ns-3.18.1/src/internet/model/ipv6-address-generator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-address-generator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,54 +28,163 @@
 
 namespace ns3 {
 
+/**
+ * \internal
+ * \ingroup address
+ *
+ * \brief Implementation class of Ipv6AddressGenerator
+ * This generator assigns addresses sequentially from a provided
+ * network address; used in topology code. It also keeps track of all
+ * addresses assigned to perform duplicate detection.
+ *
+ */
 class Ipv6AddressGeneratorImpl
 {
 public:
   Ipv6AddressGeneratorImpl ();
   virtual ~Ipv6AddressGeneratorImpl ();
 
+  /**
+   * \internal
+   * \brief Initialise the base network and interfaceId for the generator
+   *
+   * The first call to NextAddress() or GetAddress() will return the
+   * value passed in.
+   *
+   * \param net The network for the base Ipv6Address
+   * \param prefix The prefix of the base Ipv6Address
+   * \param interfaceId The base interface ID used for initialization
+   */
   void Init (const Ipv6Address net, const Ipv6Prefix prefix,
              const Ipv6Address interfaceId);
 
-  Ipv6Address GetNetwork (const Ipv6Prefix prefix) const;
+  /**
+   * \internal
+   * \brief Get the next network according to the given Ipv6Prefix
+   *
+   * This operation is a pre-increment, meaning that the internal state
+   * is changed before returning the new network address.
+   *
+   * This also resets the interface ID to the base interface ID that was
+   * used for initialization.
+   *
+   * \param prefix The Ipv6Prefix used to set the next network
+   * \returns the IPv6 address of the next network
+   */
   Ipv6Address NextNetwork (const Ipv6Prefix prefix);
 
+  /**
+   * \internal
+   * \brief Get the current network of the given Ipv6Prefix
+   *
+   * Does not change the internal state; this just peeks at the current
+   * network
+   *
+   * \param prefix The Ipv6Prefix for the current network
+   * \returns the IPv6 address of the current network
+   */
+  Ipv6Address GetNetwork (const Ipv6Prefix prefix) const;
+
+  /**
+   * \internal
+   * \brief Set the interfaceId for the given Ipv6Prefix
+   *
+   * \param interfaceId The interfaceId to set for the current Ipv6Prefix
+   * \param prefix The Ipv6Prefix whose address is to be set
+   */
   void InitAddress (const Ipv6Address interfaceId, const Ipv6Prefix prefix);
+
+  /**
+   * \internal
+   * \brief Get the Ipv6Address that will be allocated upon NextAddress ()
+   *
+   * Does not change the internal state; just is used to peek the next
+   * address that will be allocated upon NextAddress ()
+   *
+   * \param prefix The Ipv6Prefix for the current network
+   * \returns the IPv6 address
+   */
   Ipv6Address GetAddress (const Ipv6Prefix prefix) const;
+
+  /**
+   * \internal
+   * \brief Allocate the next Ipv6Address for the configured network and prefix
+   *
+   * This operation is a post-increment, meaning that the first address
+   * allocated will be the one that was initially configured.
+   *
+   * \param prefix The Ipv6Prefix for the current network
+   * \returns the IPv6 address
+   */
   Ipv6Address NextAddress (const Ipv6Prefix prefix);
 
+  /**
+   * \internal
+   * \brief Reset the networks and Ipv6Address to zero
+   */
   void Reset (void);
+
+  /**
+   * \internal
+   * \brief Add the Ipv6Address to the list of IPv6 entries
+   *
+   * Typically, this is used by external address allocators that want
+   * to make use of this class's ability to track duplicates.  AddAllocated
+   * is always called internally for any address generated by NextAddress ()
+   *
+   * \param addr The Ipv6Address to be added to the list of Ipv6 entries
+   * \returns true on success
+   */
   bool AddAllocated (const Ipv6Address addr);
 
+  /**
+   * \internal
+   * \brief Used to turn off fatal errors and assertions, for testing
+   */
   void TestMode (void);
+
 private:
-  static const uint32_t N_BITS = 128;
-  static const uint32_t MOST_SIGNIFICANT_BIT = 0x80;
+  static const uint32_t N_BITS = 128; //!< /internal the number of bits in the address
+  static const uint32_t MOST_SIGNIFICANT_BIT = 0x80; //!< /internal MSB set to 1
 
+  /**
+   * \internal
+   * \brief Create an index number for the prefix
+   * \param prefix the prefix to index
+   * \returns an index
+   */
   uint32_t PrefixToIndex (Ipv6Prefix prefix) const;
 
+  /**
+   * \internal
+   * \brief This class holds the state for a given network
+   */
   class NetworkState
   {
 public:
-    uint8_t prefix[16];
-    uint32_t shift;
-    uint8_t network[16];
-    uint8_t addr[16];
-    uint8_t addrMax[16];
+    uint8_t prefix[16];  //!< /internal the network prefix
+    uint32_t shift;      //!< /internal a shift
+    uint8_t network[16]; //!< /internal the network
+    uint8_t addr[16];    //!< /internal the address
+    uint8_t addrMax[16]; //!< /internal the maximum address
   };
 
-  NetworkState m_netTable[N_BITS];
+  NetworkState m_netTable[N_BITS]; //!< /internal the available networks
 
+  /**
+   * \internal
+   * \brief This class holds the allocated addresses
+   */
   class Entry
   {
 public:
-    uint8_t addrLow[16];
-    uint8_t addrHigh[16];
+    uint8_t addrLow[16];  //!< /internal the lowest allocated address
+    uint8_t addrHigh[16]; //!< /internal the highest allocated address
   };
 
-  std::list<Entry> m_entries;
-  Ipv6Address m_base;
-  bool m_test;
+  std::list<Entry> m_entries; //!< /internal contained of allocated addresses
+  Ipv6Address m_base; //!< /internal base address
+  bool m_test; //!< /internal test mode (if true)
 };
 
 Ipv6AddressGeneratorImpl::Ipv6AddressGeneratorImpl ()
diff -Naur ns-3.18.1/src/internet/model/ipv6-address-generator.h ns-3.19/src/internet/model/ipv6-address-generator.h
--- ns-3.18.1/src/internet/model/ipv6-address-generator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-address-generator.h	2013-12-20 09:44:50.000000000 -0800
@@ -50,6 +50,12 @@
  * The interface ID is often an EUI-64 address derived from the MAC address,
  * but can also be a pseudo-random value (\RFC{3041}).  This implementation
  * does not generate EUI-64-based interface IDs.
+ *
+ * \note BEWARE: this class acts as a Singleton.
+ * In other terms, two different instances of Ipv6AddressGenerator will
+ * pick IPv6 numbers from the same pool. Changing the network in one of them
+ * will also change the network in the other instances.
+ *
  */
 class Ipv6AddressGenerator
 {
@@ -68,7 +74,7 @@
                     const Ipv6Address interfaceId = "::1");
 
   /**
-   * \brief Get the next network acoording to the given Ipv6Prefix
+   * \brief Get the next network according to the given Ipv6Prefix
    *
    * This operation is a pre-increment, meaning that the internal state
    * is changed before returning the new network address.
@@ -77,6 +83,7 @@
    * used for initialization.
    *
    * \param prefix The Ipv6Prefix used to set the next network
+   * \returns the IPv6 address of the next network
    */
   static Ipv6Address NextNetwork (const Ipv6Prefix prefix);
 
@@ -87,6 +94,7 @@
    * network
    *
    * \param prefix The Ipv6Prefix for the current network
+   * \returns the IPv6 address of the current network
    */
   static Ipv6Address GetNetwork (const Ipv6Prefix prefix);
 
@@ -103,18 +111,20 @@
    *
    * This operation is a post-increment, meaning that the first address
    * allocated will be the one that was initially configured.
-   * .
+   *
    * \param prefix The Ipv6Prefix for the current network
+   * \returns the IPv6 address
    */
   static Ipv6Address NextAddress (const Ipv6Prefix prefix);
 
   /**
-   * \brief Get the Ipv6Address that will be allocated upon NextAddress()
+   * \brief Get the Ipv6Address that will be allocated upon NextAddress ()
    *
    * Does not change the internal state; just is used to peek the next
    * address that will be allocated upon NextAddress ()
    *
    * \param prefix The Ipv6Prefix for the current network
+   * \returns the IPv6 address
    */
   static Ipv6Address GetAddress (const Ipv6Prefix prefix);
 
@@ -128,9 +138,10 @@
    *
    * Typically, this is used by external address allocators that want
    * to make use of this class's ability to track duplicates.  AddAllocated
-   * is always called internally for any address generated by NextAddress()
+   * is always called internally for any address generated by NextAddress ()
    *
    * \param addr The Ipv6Address to be added to the list of Ipv6 entries
+   * \returns true on success
    */
   static bool AddAllocated (const Ipv6Address addr);
 
diff -Naur ns-3.18.1/src/internet/model/ipv6.cc ns-3.19/src/internet/model/ipv6.cc
--- ns-3.18.1/src/internet/model/ipv6.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 namespace ns3 
 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6)
+  ;
 
 TypeId Ipv6::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-end-point.cc ns-3.19/src/internet/model/ipv6-end-point.cc
--- ns-3.18.1/src/internet/model/ipv6-end-point.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-end-point.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6EndPoint");
+NS_LOG_COMPONENT_DEFINE ("Ipv6EndPoint")
+  ;
 
 Ipv6EndPoint::Ipv6EndPoint (Ipv6Address addr, uint16_t port)
   : m_localAddr (addr),
@@ -95,7 +96,7 @@
   m_peerPort = port;
 }
 
-void Ipv6EndPoint::SetRxCallback (Callback<void, Ptr<Packet>, Ipv6Header, uint16_t> callback)
+void Ipv6EndPoint::SetRxCallback (Callback<void, Ptr<Packet>, Ipv6Header, uint16_t, Ptr<Ipv6Interface> > callback)
 {
   m_rxCallback = callback;
 }
@@ -110,11 +111,12 @@
   m_destroyCallback = callback;
 }
 
-void Ipv6EndPoint::ForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t port)
+void Ipv6EndPoint::ForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface)
 {
   if (!m_rxCallback.IsNull ())
     {
-      m_rxCallback (p, header, port);
+      Simulator::ScheduleNow (&Ipv6EndPoint::DoForwardUp, this, p, header, port,
+                              incomingInterface);
     }
 }
 
@@ -128,9 +130,9 @@
     }
 }
 
-void Ipv6EndPoint::DoForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t sport)
+void Ipv6EndPoint::DoForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t sport, Ptr<Ipv6Interface> incomingInterface)
 {
-  m_rxCallback (p, header, sport);
+  m_rxCallback (p, header, sport, incomingInterface);
 }
 
 void Ipv6EndPoint::DoForwardIcmp (Ipv6Address src, uint8_t ttl, uint8_t type, 
diff -Naur ns-3.18.1/src/internet/model/ipv6-end-point-demux.cc ns-3.19/src/internet/model/ipv6-end-point-demux.cc
--- ns-3.18.1/src/internet/model/ipv6-end-point-demux.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-end-point-demux.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6EndPointDemux");
+NS_LOG_COMPONENT_DEFINE ("Ipv6EndPointDemux")
+  ;
 
 Ipv6EndPointDemux::Ipv6EndPointDemux ()
   : m_ephemeral (49152),
diff -Naur ns-3.18.1/src/internet/model/ipv6-end-point-demux.h ns-3.19/src/internet/model/ipv6-end-point-demux.h
--- ns-3.18.1/src/internet/model/ipv6-end-point-demux.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-end-point-demux.h	2013-12-20 09:44:50.000000000 -0800
@@ -37,17 +37,17 @@
 class Ipv6EndPointDemux
 {
 public:
-  typedef std::list<Ipv6EndPoint *>EndPoints;
-  typedef std::list<Ipv6EndPoint *>::iterator EndPointsI;
-
   /**
-   * \brief Constructor.
+   * \brief Container of the IPv6 endpoints.
    */
-  Ipv6EndPointDemux ();
+  typedef std::list<Ipv6EndPoint *>EndPoints;
 
   /**
-   * \brief Destructor.
+   * \brief Iterator to the container of the IPv6 endpoints.
    */
+  typedef std::list<Ipv6EndPoint *>::iterator EndPointsI;
+
+  Ipv6EndPointDemux ();
   ~Ipv6EndPointDemux ();
 
   /**
@@ -72,7 +72,7 @@
    * \param src source address to test
    * \param sport source port to test
    * \param incomingInterface the incoming interface
-   * \return list en IPv6EndPoints (could be 0 element)
+   * \return list of IPv6EndPoints (could be 0 element)
    */
   EndPoints Lookup (Ipv6Address dst, uint16_t dport, Ipv6Address src, uint16_t sport, Ptr<Ipv6Interface> incomingInterface);
 
diff -Naur ns-3.18.1/src/internet/model/ipv6-end-point.h ns-3.19/src/internet/model/ipv6-end-point.h
--- ns-3.18.1/src/internet/model/ipv6-end-point.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-end-point.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,6 +27,7 @@
 #include "ns3/callback.h"
 #include "ns3/ipv6-header.h"
 #include "ns3/net-device.h"
+#include "ns3/ipv6-interface.h"
 
 namespace ns3
 {
@@ -35,8 +36,14 @@
 class Packet;
 
 /**
- * \class Ipv6EndPoint
- * \brief An IPv6 end point, four tuples identification.
+ * \brief A representation of an internet IPv6 endpoint/connection
+ *
+ * This class provides an internet four-tuple (source and destination ports
+ * and addresses).  These are used in the ns3::Ipv6EndPointDemux as targets
+ * of lookups.  The class also has a callback for notification to higher
+ * layers that a packet from a lower layer was received.  In the ns3
+ * internet-stack, these notifications are automatically registered to be
+ * received by the corresponding socket.
  */
 class Ipv6EndPoint
 {
@@ -48,9 +55,6 @@
    */
   Ipv6EndPoint (Ipv6Address addr, uint16_t port);
 
-  /**
-   * \brief Destructor.
-   */
   ~Ipv6EndPoint ();
 
   /**
@@ -113,7 +117,6 @@
    * the socket can not receive any packets as a result.
    *
    * \param netdevice Pointer to Netdevice of desired interface
-   * \returns nothing
    */
   void BindToNetDevice (Ptr<NetDevice> netdevice);
 
@@ -132,7 +135,7 @@
    * \brief Set the reception callback.
    * \param callback callback function
    */
-  void SetRxCallback (Callback<void, Ptr<Packet>, Ipv6Header, uint16_t> callback);
+  void SetRxCallback (Callback<void, Ptr<Packet>, Ipv6Header, uint16_t, Ptr<Ipv6Interface> > callback);
 
   /**
    * \brief Set the ICMP callback.
@@ -148,16 +151,23 @@
 
   /**
    * \brief Forward the packet to the upper level.
+   *
+   * Called from an L4Protocol implementation to notify an endpoint of a
+   * packet reception.
+   *
    * \param p the packet
-   * \param srcAddr source address
-   * \param dstAddr source address
+   * \param header the packet header
    * \param port source port
+   * \param incomingInterface incoming interface
    */
-  void ForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t port);
+  void ForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface);
 
   /**
-   * \brief Function called from an L4Protocol implementation
-   * to notify an endpoint of an icmp message reception.
+   * \brief Forward the ICMP packet to the upper level.
+   *
+   * Called from an L4Protocol implementation to notify an endpoint of
+   * an icmp message reception.
+   *
    * \param src source IPv6 address
    * \param ttl time-to-live
    * \param type ICMPv6 type
@@ -171,11 +181,11 @@
   /**
    * \brief ForwardUp wrapper.
    * \param p packet
-   * \param saddr source IPv6 address
-   * \param daddr dest IPv6 address
+   * \param header the packet header
    * \param sport source port
+   * \param incomingInterface incoming interface
    */
-  void DoForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t sport);
+  void DoForwardUp (Ptr<Packet> p, Ipv6Header header, uint16_t sport, Ptr<Ipv6Interface> incomingInterface);
 
   /**
    * \brief ForwardIcmp wrapper.
@@ -216,7 +226,7 @@
   /**
    * \brief The RX callback.
    */
-  Callback<void, Ptr<Packet>, Ipv6Header, uint16_t> m_rxCallback;
+  Callback<void, Ptr<Packet>, Ipv6Header, uint16_t, Ptr<Ipv6Interface> > m_rxCallback;
 
   /**
    * \brief The ICMPv6 callback.
diff -Naur ns-3.18.1/src/internet/model/ipv6-extension.cc ns-3.19/src/internet/model/ipv6-extension.cc
--- ns-3.18.1/src/internet/model/ipv6-extension.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-extension.cc	2013-12-20 09:44:50.000000000 -0800
@@ -44,7 +44,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6Extension);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6Extension)
+  ;
 
 TypeId Ipv6Extension::GetTypeId ()
 {
@@ -182,7 +183,8 @@
   return 1;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHop);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHop)
+  ;
 
 TypeId Ipv6ExtensionHopByHop::GetTypeId ()
 {
@@ -234,7 +236,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestination);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestination)
+  ;
 
 TypeId Ipv6ExtensionDestination::GetTypeId ()
 {
@@ -286,7 +289,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragment);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragment)
+  ;
 
 TypeId Ipv6ExtensionFragment::GetTypeId ()
 {
@@ -506,6 +510,7 @@
         {
           moreFragment = true;
           currentFragmentablePartSize = maxFragmentablePartSize;
+          currentFragmentablePartSize -= currentFragmentablePartSize % 8;
         }
       else
         {
@@ -513,10 +518,8 @@
           currentFragmentablePartSize = p->GetSize () - offset;
         }
 
-      currentFragmentablePartSize -= currentFragmentablePartSize % 8;
 
       fragmentHeader.SetNextHeader (nextHeader);
-      fragmentHeader.SetLength (currentFragmentablePartSize);
       fragmentHeader.SetOffset (offset);
       fragmentHeader.SetMoreFragment (moreFragment);
       fragmentHeader.SetIdentification (identification);
@@ -704,7 +707,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting)
+  ;
 
 TypeId Ipv6ExtensionRouting::GetTypeId ()
 {
@@ -789,7 +793,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingDemux);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingDemux)
+  ;
 
 TypeId Ipv6ExtensionRoutingDemux::GetTypeId ()
 {
@@ -851,7 +856,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRouting);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRouting)
+  ;
 
 TypeId Ipv6ExtensionLooseRouting::GetTypeId ()
 {
@@ -1004,7 +1010,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESP);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESP)
+  ;
 
 TypeId Ipv6ExtensionESP::GetTypeId ()
 {
@@ -1042,7 +1049,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAH);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAH)
+  ;
 
 TypeId Ipv6ExtensionAH::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-extension-demux.cc ns-3.19/src/internet/model/ipv6-extension-demux.cc
--- ns-3.18.1/src/internet/model/ipv6-extension-demux.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-extension-demux.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 namespace ns3
 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDemux);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDemux)
+  ;
 
 TypeId Ipv6ExtensionDemux::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-extension-demux.h ns-3.19/src/internet/model/ipv6-extension-demux.h
--- ns-3.18.1/src/internet/model/ipv6-extension-demux.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-extension-demux.h	2013-12-20 09:44:50.000000000 -0800
@@ -86,6 +86,10 @@
   virtual void DoDispose ();
 
 private:
+
+  /**
+   * \brief Container of the IPv6 Extensions.
+   */
   typedef std::list<Ptr<Ipv6Extension> > Ipv6ExtensionList_t;
 
   /**
diff -Naur ns-3.18.1/src/internet/model/ipv6-extension.h ns-3.19/src/internet/model/ipv6-extension.h
--- ns-3.18.1/src/internet/model/ipv6-extension.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-extension.h	2013-12-20 09:44:50.000000000 -0800
@@ -381,7 +381,6 @@
    * \brief Process the timeout for packet fragments
    * \param key representing the packet fragments
    * \param ipHeader the IP header of the original packet
-   * \param iif Input Interface
    */
   void HandleFragmentsTimeout (std::pair<Ipv6Address, uint32_t> key, Ipv6Header & ipHeader);
 
@@ -401,6 +400,9 @@
    */
   void CancelTimeout ();
 
+  /**
+   * \brief Container for the packet fragments.
+   */
   typedef std::map<std::pair<Ipv6Address, uint32_t>, Ptr<Fragments> > MapFragments_t;
 
   /**
@@ -521,6 +523,9 @@
   virtual void DoDispose ();
 
 private:
+  /**
+   * \brief Container for the extension routing.
+   */
   typedef std::list<Ptr<Ipv6ExtensionRouting> > Ipv6ExtensionRoutingList_t;
 
   /**
diff -Naur ns-3.18.1/src/internet/model/ipv6-extension-header.cc ns-3.19/src/internet/model/ipv6-extension-header.cc
--- ns-3.18.1/src/internet/model/ipv6-extension-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-extension-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,9 +26,11 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader");
+NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader)
+  ;
 
 TypeId Ipv6ExtensionHeader::GetTypeId ()
 {
@@ -199,7 +201,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHopHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHopHeader)
+  ;
 
 TypeId Ipv6ExtensionHopByHopHeader::GetTypeId ()
 {
@@ -254,7 +257,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestinationHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestinationHeader)
+  ;
 
 TypeId Ipv6ExtensionDestinationHeader::GetTypeId ()
 {
@@ -309,7 +313,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragmentHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragmentHeader)
+  ;
 
 TypeId Ipv6ExtensionFragmentHeader::GetTypeId ()
 {
@@ -329,6 +334,7 @@
   : m_offset (0),
     m_identification (0)
 {
+  SetLength (0);
 }
 
 Ipv6ExtensionFragmentHeader::~Ipv6ExtensionFragmentHeader ()
@@ -383,7 +389,7 @@
   Buffer::Iterator i = start;
 
   i.WriteU8 (GetNextHeader ());
-  i.WriteU8 ((GetLength () >> 3) - 1);
+  i.WriteU8 (0);
   i.WriteHtonU16 (m_offset);
   i.WriteHtonU32 (m_identification);
 }
@@ -393,14 +399,16 @@
   Buffer::Iterator i = start;
 
   SetNextHeader (i.ReadU8 ());
-  SetLength ((i.ReadU8 () + 1) << 3);
+  i.ReadU8();
+  SetLength (0);
   m_offset = i.ReadNtohU16 ();
   m_identification = i.ReadNtohU32 ();
 
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingHeader)
+  ;
 
 TypeId Ipv6ExtensionRoutingHeader::GetTypeId ()
 {
@@ -479,7 +487,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRoutingHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRoutingHeader)
+  ;
 
 TypeId Ipv6ExtensionLooseRoutingHeader::GetTypeId ()
 {
@@ -586,7 +595,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESPHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESPHeader)
+  ;
 
 TypeId Ipv6ExtensionESPHeader::GetTypeId ()
 {
@@ -632,7 +642,8 @@
   return 0;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAHHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAHHeader)
+  ;
 
 TypeId Ipv6ExtensionAHHeader::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-extension-header.h ns-3.19/src/internet/model/ipv6-extension-header.h
--- ns-3.18.1/src/internet/model/ipv6-extension-header.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-extension-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -196,6 +196,7 @@
   /**
    * \brief Calculate padding.
    * \param alignment alignment
+   * \return the number of pad bytes
    */
   uint32_t CalculatePad (Ipv6OptionHeader::Alignment alignment) const;
 
diff -Naur ns-3.18.1/src/internet/model/ipv6.h ns-3.19/src/internet/model/ipv6.h
--- ns-3.18.1/src/internet/model/ipv6.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6.h	2013-12-20 09:44:50.000000000 -0800
@@ -79,6 +79,10 @@
 class Ipv6 : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   /**
diff -Naur ns-3.18.1/src/internet/model/ipv6-header.cc ns-3.19/src/internet/model/ipv6-header.cc
--- ns-3.18.1/src/internet/model/ipv6-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6Header);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6Header)
+  ;
 
 Ipv6Header::Ipv6Header ()
   : m_version (6),
diff -Naur ns-3.18.1/src/internet/model/ipv6-interface-address.cc ns-3.19/src/internet/model/ipv6-interface-address.cc
--- ns-3.18.1/src/internet/model/ipv6-interface-address.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-interface-address.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6InterfaceAddress");
+NS_LOG_COMPONENT_DEFINE ("Ipv6InterfaceAddress")
+  ;
 
 Ipv6InterfaceAddress::Ipv6InterfaceAddress () 
   : m_address (Ipv6Address ()),
@@ -139,8 +140,22 @@
 
 std::ostream& operator<< (std::ostream& os, const Ipv6InterfaceAddress &addr)
 {
-  os << "address=" << addr.GetAddress () << "; prefix=" <<
-  addr.GetPrefix () << "; scope=" << addr.GetScope ();
+  os << "address: " << addr.GetAddress () << addr.GetPrefix () << "; scope: ";
+  switch (addr.GetScope ())
+  {
+    case Ipv6InterfaceAddress::HOST:
+      os << "HOST";
+      break;
+    case Ipv6InterfaceAddress::LINKLOCAL:
+      os << "LINK-LOCAL";
+      break;
+    case Ipv6InterfaceAddress::GLOBAL:
+      os << "GLOBAL";
+      break;
+    default:
+      os << "UNKNOWN";
+      break;
+  }
   return os;
 }
 
diff -Naur ns-3.18.1/src/internet/model/ipv6-interface-address.h ns-3.19/src/internet/model/ipv6-interface-address.h
--- ns-3.18.1/src/internet/model/ipv6-interface-address.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-interface-address.h	2013-12-20 09:44:50.000000000 -0800
@@ -53,7 +53,7 @@
 
   /**
    * \enum Scope_e
-   * \brief Scope of address.
+   * \brief Address scope.
    */
   enum Scope_e
   {
@@ -179,7 +179,22 @@
    */
   Scope_e m_scope;
 
+  /**
+   * \brief Equal to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the operands are equal
+   */
   friend bool operator == (Ipv6InterfaceAddress const& a, Ipv6InterfaceAddress const& b);
+
+  /**
+   * \brief Not equal to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the operands are not equal
+   */
   friend bool operator != (Ipv6InterfaceAddress const& a, Ipv6InterfaceAddress const& b);
 
   /**
@@ -188,6 +203,13 @@
   uint32_t m_nsDadUid;
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param addr the Ipv6InterfaceAddress
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, const Ipv6InterfaceAddress &addr);
 
 /* follow Ipv4InterfaceAddress way, maybe not inline them */
diff -Naur ns-3.18.1/src/internet/model/ipv6-interface.cc ns-3.19/src/internet/model/ipv6-interface.cc
--- ns-3.18.1/src/internet/model/ipv6-interface.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-interface.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,9 +34,11 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6Interface");
+NS_LOG_COMPONENT_DEFINE ("Ipv6Interface")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface)
+  ;
 
 TypeId Ipv6Interface::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-interface.h ns-3.19/src/internet/model/ipv6-interface.h
--- ns-3.18.1/src/internet/model/ipv6-interface.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -42,7 +42,7 @@
  * \brief The IPv6 representation of a network interface
  *
  * By default IPv6 interfaces are created in the "down" state
- * with IP "fe80::1" and a /64 prefix. Before becoming useable,
+ * with IP "fe80::1" and a /64 prefix. Before becoming usable,
  * the user must invoke SetUp on them once the final IPv6 address
  * and mask has been set.
  */
@@ -257,8 +257,19 @@
   virtual void DoDispose ();
 
 private:
+  /**
+   * \brief Container for the Ipv6InterfaceAddresses.
+   */
   typedef std::list<Ipv6InterfaceAddress> Ipv6InterfaceAddressList;
+
+  /**
+   * \brief Container Iterator for the Ipv6InterfaceAddresses.
+   */
   typedef std::list<Ipv6InterfaceAddress>::iterator Ipv6InterfaceAddressListI;
+
+  /**
+   * \brief Const Container Iterator for the Ipv6InterfaceAddresses.
+   */
   typedef std::list<Ipv6InterfaceAddress>::const_iterator Ipv6InterfaceAddressListCI;
 
   /**
diff -Naur ns-3.18.1/src/internet/model/ipv6-l3-protocol.cc ns-3.19/src/internet/model/ipv6-l3-protocol.cc
--- ns-3.18.1/src/internet/model/ipv6-l3-protocol.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-l3-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -49,9 +49,11 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol)
+  ;
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6L3Protocol");
+NS_LOG_COMPONENT_DEFINE ("Ipv6L3Protocol")
+  ;
 
 const uint16_t Ipv6L3Protocol::PROT_NUMBER = 0x86DD;
 
@@ -484,11 +486,23 @@
   NS_LOG_FUNCTION (this << i);
   Ptr<Ipv6Interface> interface = GetInterface (i);
 
-  interface->SetUp ();
+  // RFC 2460, Section 5, pg. 24:
+  //  IPv6 requires that every link in the internet have an MTU of 1280
+  //  octets or greater.  On any link that cannot convey a 1280-octet
+  //  packet in one piece, link-specific fragmentation and reassembly must
+  //  be provided at a layer below IPv6.
+  if (interface->GetDevice ()->GetMtu () >= 1280)
+    {
+      interface->SetUp ();
 
-  if (m_routingProtocol != 0)
+      if (m_routingProtocol != 0)
+        {
+          m_routingProtocol->NotifyInterfaceUp (i);
+        }
+    }
+  else
     {
-      m_routingProtocol->NotifyInterfaceUp (i);
+      NS_LOG_LOGIC ("Interface " << int(i) << " is set to be down for IPv6. Reason: not respecting minimum IPv6 MTU (1280 octects)");
     }
 }
 
diff -Naur ns-3.18.1/src/internet/model/ipv6-l3-protocol.h ns-3.19/src/internet/model/ipv6-l3-protocol.h
--- ns-3.18.1/src/internet/model/ipv6-l3-protocol.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-l3-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -94,7 +94,7 @@
   virtual ~Ipv6L3Protocol ();
 
   /**
-   * \brief Set node for this stack.
+   * \brief Set node associated with this stack.
    * \param node node to set
    */
   void SetNode (Ptr<Node> node);
@@ -217,6 +217,7 @@
   /**
    * \brief Get interface index which is on a specified net device.
    * \param device net device
+   * \returns the interface index
    */
   int32_t GetInterfaceForDevice (Ptr<const NetDevice> device) const;
 
@@ -224,6 +225,7 @@
    * \brief Add an address on interface.
    * \param i interface index
    * \param address to add
+   * \returns true if the operation succeeded
    */
   bool AddAddress (uint32_t i, Ipv6InterfaceAddress address);
 
@@ -246,6 +248,7 @@
    * \brief Remove an address from an interface.
    * \param interfaceIndex interface index
    * \param addressIndex address index on the interface
+   * \returns true if the operation succeeded
    */
   bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);
 
@@ -255,7 +258,7 @@
    * \param address Ipv6Address to be removed from the interface
    * \returns true if the operation succeeded
    */
-  bool RemoveAddress (uint32_t interface, Ipv6Address address);
+  bool RemoveAddress (uint32_t interfaceIndex, Ipv6Address address);
 
   /**
    * \brief Set metric for an interface.
@@ -288,6 +291,7 @@
   /**
    * \brief Is specified interface up ?
    * \param i interface index
+   * \returns true if the interface is up
    */
   bool IsUp (uint32_t i) const;
 
@@ -306,6 +310,7 @@
   /**
    * \brief Is interface allows forwarding ?
    * \param i interface index
+   * \returns true if the interface is forwarding
    */
   bool IsForwarding (uint32_t i) const;
 
@@ -380,11 +385,29 @@
   friend class Ipv6L3ProtocolTestCase;
   friend class Ipv6ExtensionLooseRouting;
 
+  /**
+   * \brief Container of the IPv6 Interfaces.
+   */
   typedef std::list<Ptr<Ipv6Interface> > Ipv6InterfaceList;
+
+  /**
+   * \brief Container of the IPv6 Raw Sockets.
+   */
   typedef std::list<Ptr<Ipv6RawSocketImpl> > SocketList;
+
+  /**
+   * \brief Container of the IPv6 L4 instances.
+   */
   typedef std::list<Ptr<IpL4Protocol> > L4List_t;
 
+  /**
+   * \brief Container of the IPv6 Autoconfigured addresses.
+   */
   typedef std::list< Ptr<Ipv6AutoconfiguredPrefix> > Ipv6AutoconfiguredPrefixList;
+
+  /**
+   * \brief Iterator of the container of the IPv6 Autoconfigured addresses.
+   */
   typedef std::list< Ptr<Ipv6AutoconfiguredPrefix> >::iterator Ipv6AutoconfiguredPrefixListI;
 
   /**
@@ -404,15 +427,18 @@
 
   /**
    * \brief Copy constructor.
-   * \param o object to copy
+   *
+   * Defined but not implemented to avoid misuse
    */
-  Ipv6L3Protocol (const Ipv6L3Protocol& o);
+  Ipv6L3Protocol (const Ipv6L3Protocol&);
 
   /**
    * \brief Copy constructor.
-   * \param o object to copy
+   *
+   * Defined but not implemented to avoid misuse
+   * \returns the copied object
    */
-  Ipv6L3Protocol &operator = (const Ipv6L3Protocol& o);
+  Ipv6L3Protocol &operator = (const Ipv6L3Protocol&);
 
   /**
    * \brief Construct an IPv6 header.
@@ -421,6 +447,7 @@
    * \param protocol L4 protocol
    * \param payloadSize payload size
    * \param hopLimit Hop limit
+   * \param tclass Tclass
    * \return newly created IPv6 header
    */
   Ipv6Header BuildHeader (Ipv6Address src, Ipv6Address dst, uint8_t protocol,
@@ -444,7 +471,7 @@
   void IpForward (Ptr<const NetDevice> idev, Ptr<Ipv6Route> rtentry, Ptr<const Packet> p, const Ipv6Header& header);
 
   /**
-   * \brief Forward a packet in multicast.
+   * \brief Forward a multicast packet.
    * \param idev Pointer to ingress network device
    * \param mrtentry route 
    * \param p packet to forward
diff -Naur ns-3.18.1/src/internet/model/ipv6-list-routing.cc ns-3.19/src/internet/model/ipv6-list-routing.cc
--- ns-3.18.1/src/internet/model/ipv6-list-routing.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-list-routing.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ListRouting);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ListRouting)
+  ;
 
 TypeId
 Ipv6ListRouting::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/ipv6-list-routing.h ns-3.19/src/internet/model/ipv6-list-routing.h
--- ns-3.18.1/src/internet/model/ipv6-list-routing.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-list-routing.h	2013-12-20 09:44:50.000000000 -0800
@@ -118,7 +118,14 @@
   virtual void DoDispose (void);
 
 private:
+  /**
+   * \brief Container identifying an IPv6 Routing Protocol entry in the list.
+   */
   typedef std::pair<int16_t, Ptr<Ipv6RoutingProtocol> > Ipv6RoutingProtocolEntry;
+
+  /**
+   * \brief Container of the IPv6 Routing Protocols.
+   */
   typedef std::list<Ipv6RoutingProtocolEntry> Ipv6RoutingProtocolList;
 
   /**
@@ -129,15 +136,8 @@
    */
   static bool Compare (const Ipv6RoutingProtocolEntry& a, const Ipv6RoutingProtocolEntry& b);
 
-  /**
-   * \brief List of routing protocols.
-   */
-  Ipv6RoutingProtocolList m_routingProtocols;
-
-  /**
-   * \brief Ipv6 reference.
-   */
-  Ptr<Ipv6> m_ipv6;
+  Ipv6RoutingProtocolList m_routingProtocols; //!<  List of routing protocols.
+  Ptr<Ipv6> m_ipv6;  //!< Ipv6 this protocol is associated with.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/ipv6-option.cc ns-3.19/src/internet/model/ipv6-option.cc
--- ns-3.18.1/src/internet/model/ipv6-option.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-option.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 namespace ns3
 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6Option);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6Option)
+  ;
 
 TypeId Ipv6Option::GetTypeId ()
 {
@@ -55,7 +56,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1)
+  ;
 
 TypeId Ipv6OptionPad1::GetTypeId ()
 {
@@ -99,7 +101,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadn);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadn)
+  ;
 
 TypeId Ipv6OptionPadn::GetTypeId ()
 {
@@ -143,7 +146,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogram);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogram)
+  ;
 
 TypeId Ipv6OptionJumbogram::GetTypeId ()
 {
@@ -187,7 +191,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlert);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlert)
+  ;
 
 TypeId Ipv6OptionRouterAlert::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-option-demux.cc ns-3.19/src/internet/model/ipv6-option-demux.cc
--- ns-3.18.1/src/internet/model/ipv6-option-demux.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-option-demux.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 namespace ns3
 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionDemux);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionDemux)
+  ;
 
 TypeId Ipv6OptionDemux::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-option-demux.h ns-3.19/src/internet/model/ipv6-option-demux.h
--- ns-3.18.1/src/internet/model/ipv6-option-demux.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-option-demux.h	2013-12-20 09:44:50.000000000 -0800
@@ -86,6 +86,9 @@
   virtual void DoDispose ();
 
 private:
+  /**
+   * \brief Container of the IPv6 Options types.
+   */
   typedef std::list<Ptr<Ipv6Option> > Ipv6OptionList_t;
 
   /**
diff -Naur ns-3.18.1/src/internet/model/ipv6-option-header.cc ns-3.19/src/internet/model/ipv6-option-header.cc
--- ns-3.18.1/src/internet/model/ipv6-option-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-option-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,9 +26,11 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader");
+NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader)
+  ;
 
 TypeId Ipv6OptionHeader::GetTypeId ()
 {
@@ -116,7 +118,8 @@
   return (Alignment){ 1,0};
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1Header);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1Header)
+  ;
 
 TypeId Ipv6OptionPad1Header::GetTypeId ()
 {
@@ -167,7 +170,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadnHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadnHeader)
+  ;
 
 TypeId Ipv6OptionPadnHeader::GetTypeId ()
 {
@@ -227,7 +231,8 @@
   return GetSerializedSize ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogramHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogramHeader)
+  ;
 
 TypeId Ipv6OptionJumbogramHeader::GetTypeId ()
 {
@@ -298,7 +303,8 @@
   return (Alignment){ 4,2}; //4n+2
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlertHeader);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlertHeader)
+  ;
 
 TypeId Ipv6OptionRouterAlertHeader::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-packet-info-tag.h ns-3.19/src/internet/model/ipv6-packet-info-tag.h
--- ns-3.18.1/src/internet/model/ipv6-packet-info-tag.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-packet-info-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -45,22 +45,70 @@
 {
 public:
   Ipv6PacketInfoTag ();
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
+  static TypeId GetTypeId (void);
+
+  /**
+   * \brief Set the tag's address
+   *
+   * \param addr the address
+   */
   void SetAddress (Ipv6Address addr);
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Get the tag's address
+   *
+   * \returns the address
+   */
   Ipv6Address GetAddress (void) const;
+
+  /**
+   * \brief Set the tag's receiving interface
+   *
+   * \param ifindex the interface index
+   */
   void SetRecvIf (uint32_t ifindex);
+
+  /**
+   * \brief Get the tag's receiving interface
+   *
+   * \returns the interface index
+   */
   uint32_t GetRecvIf (void) const;
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Set the tag's Hop Limit
+   *
+   * \param ttl the hop limit
+   */
   void SetHoplimit (uint8_t ttl);
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Get the tag's Hop Limit
+   *
+   * \returns the Hop Limit
+   */
   uint8_t GetHoplimit (void) const;
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Set the tag's Traffic Class
+   *
+   * \param tclass the Traffic Class
+   */
   void SetTrafficClass (uint8_t tclass);
-  // Implemented, but not used in the stack yet
+
+  /**
+   * \brief Get the tag's Traffic Class
+   *
+   * \returns the Traffic Class
+   */
   uint8_t GetTrafficClass (void) const;
 
-  static TypeId GetTypeId (void);
+  // inherited functions, no doc necessary
   virtual TypeId GetInstanceTypeId (void) const;
   virtual uint32_t GetSerializedSize (void) const;
   virtual void Serialize (TagBuffer i) const;
@@ -83,10 +131,10 @@
    *  3.  the arriving hop limit, and
    *  4.  the arriving traffic class value.
   */
-  Ipv6Address m_addr;
-  uint8_t m_ifindex;
-  uint8_t m_hoplimit;
-  uint8_t m_tclass;
+  Ipv6Address m_addr;  //!< the packet address (src or dst)
+  uint8_t m_ifindex;   //!< the Interface index
+  uint8_t m_hoplimit;  //!< the Hop Limit
+  uint8_t m_tclass;    //!< the Traffic Class
 };
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/internet/model/ipv6-packet-probe.cc ns-3.19/src/internet/model/ipv6-packet-probe.cc
--- ns-3.18.1/src/internet/model/ipv6-packet-probe.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-packet-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -33,7 +33,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe)
+  ;
 
 TypeId
 Ipv6PacketProbe::GetTypeId ()
diff -Naur ns-3.18.1/src/internet/model/ipv6-packet-probe.h ns-3.19/src/internet/model/ipv6-packet-probe.h
--- ns-3.18.1/src/internet/model/ipv6-packet-probe.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-packet-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -48,7 +48,12 @@
 class Ipv6PacketProbe : public Probe
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
+
   Ipv6PacketProbe ();
   virtual ~Ipv6PacketProbe ();
 
@@ -103,7 +108,9 @@
    */
   void TraceSink (Ptr<const Packet> packet, Ptr<Ipv6> ipv6, uint32_t interface);
 
+  /// Traced Callback: the packet, the Ipv6 object and the interface.
   TracedCallback<Ptr<const Packet>, Ptr<Ipv6>, uint32_t> m_output;
+  /// Traced Callback: the previous packet's size and the actual packet's size.
   TracedCallback<uint32_t, uint32_t> m_outputBytes;
 
   /// The traced packet.
diff -Naur ns-3.18.1/src/internet/model/ipv6-pmtu-cache.cc ns-3.19/src/internet/model/ipv6-pmtu-cache.cc
--- ns-3.18.1/src/internet/model/ipv6-pmtu-cache.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-pmtu-cache.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache)
+  ;
 
 TypeId Ipv6PmtuCache::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-pmtu-cache.h ns-3.19/src/internet/model/ipv6-pmtu-cache.h
--- ns-3.18.1/src/internet/model/ipv6-pmtu-cache.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-pmtu-cache.h	2013-12-20 09:44:50.000000000 -0800
@@ -108,7 +108,11 @@
    */
   std::map<Ipv6Address, uint32_t> m_pathMtu;
 
+  /**
+   * \brief Container of the IPv6 PMTU data (Ipv6 destination address and expiration event).
+   */
   typedef std::map<Ipv6Address, EventId> ::iterator pathMtuTimerIter;
+
   /**
    * \brief Path MTU Expiration table
    */
diff -Naur ns-3.18.1/src/internet/model/ipv6-raw-socket-factory.cc ns-3.19/src/internet/model/ipv6-raw-socket-factory.cc
--- ns-3.18.1/src/internet/model/ipv6-raw-socket-factory.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-raw-socket-factory.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory)
+  ;
 
 TypeId Ipv6RawSocketFactory::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-raw-socket-factory-impl.h ns-3.19/src/internet/model/ipv6-raw-socket-factory-impl.h
--- ns-3.18.1/src/internet/model/ipv6-raw-socket-factory-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-raw-socket-factory-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,6 +27,8 @@
 {
 
 /**
+ * \ingroup socket
+ *
  * \class Ipv6RawSocketFactoryImpl
  * \brief Implementation of IPv6 raw socket factory.
  */
diff -Naur ns-3.18.1/src/internet/model/ipv6-raw-socket-impl.cc ns-3.19/src/internet/model/ipv6-raw-socket-impl.cc
--- ns-3.18.1/src/internet/model/ipv6-raw-socket-impl.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-raw-socket-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,10 +38,12 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl");
+NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl")
+  ;
 
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl)
+  ;
 
 TypeId Ipv6RawSocketImpl::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-raw-socket-impl.h ns-3.19/src/internet/model/ipv6-raw-socket-impl.h
--- ns-3.18.1/src/internet/model/ipv6-raw-socket-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-raw-socket-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -36,6 +36,7 @@
 /**
  * \class Ipv6RawSocketImpl
  * \brief IPv6 raw socket.
+ * \ingroup socket
  *
  * A RAW Socket typically is used to access specific IP layers not usually
  * available through L4 sockets, e.g., ICMP. The implementer should take
@@ -70,26 +71,15 @@
    */
   static TypeId GetTypeId ();
 
-  /**
-   * \brief Constructor.
-   */
   Ipv6RawSocketImpl ();
-
-  /**
-   * \brief Destructor.
-   */
   virtual ~Ipv6RawSocketImpl ();
 
   /**
-   * \brief Set the node.
+   * \brief Set the node associated with this socket.
    * \param node node to set
    */
   void SetNode (Ptr<Node> node);
 
-  /**
-   * \brief Get last error number.
-   * \return error number
-   */
   virtual enum Socket::SocketErrno GetErrno () const;
 
   /**
@@ -98,108 +88,24 @@
    */
   virtual enum Socket::SocketType GetSocketType () const;
 
-  /**
-   * \brief Get node.
-   * \return node associated with this raw socket.
-   */
   virtual Ptr<Node> GetNode () const;
 
-  /**
-   * \brief Bind the socket to address.
-   * \param address bind to this address
-   * \return 0 if success, -1 otherwise
-   */
   virtual int Bind (const Address& address);
-
-  /**
-   * \brief Bind socket.
-   * \return 0 if success, -1 otherwise
-   */
   virtual int Bind ();
   virtual int Bind6 ();
 
-  /**
-   * \brief Get socket address.
-   * \param address socket address if method success
-   * \return 0 if success, -1 otherwise
-   */
   virtual int GetSockName (Address& address) const;
 
-  /**
-   * \brief Close the socket.
-   * \return 0 if success, -1 otherwise
-   */
   virtual int Close ();
-
-  /**
-   * \brief Shutdown send capability.
-   * \return 0 if success, -1 otherwise
-   */
   virtual int ShutdownSend ();
-
-  /**
-   * \brief Shutdown receive capability.
-   * \return 0 if success, -1 otherwise
-   */
   virtual int ShutdownRecv ();
-
-  /**
-   * \brief Connect to address.
-   * \param address address
-   * \return 0 if success, -1 otherwise
-   */
   virtual int Connect (const Address& address);
-
-  /**
-   * \brief Listen.
-   * \return 0 if success, -1 otherwise
-   */
   virtual int Listen ();
-
-  /**
-   * \brief Get TX size available.
-   * \return TX size
-   */
   virtual uint32_t GetTxAvailable () const;
-
-  /**
-   * \brief Get RX size available.
-   * \return RX size
-   */
   virtual uint32_t GetRxAvailable () const;
-
-  /**
-   * \brief Send a packet.
-   * \param p packet to send
-   * \param flags additionnal flags
-   * \return 0 if success, -1 otherwise
-   */
   virtual int Send (Ptr<Packet> p, uint32_t flags);
-
-  /**
-   * \brief Send a packet.
-   * \param p packet to send
-   * \param flags additionnal flags
-   * \param toAddress destination address
-   * \return 0 if success, -1 otherwise
-   */
   virtual int SendTo (Ptr<Packet> p, uint32_t flags, const Address& toAddress);
-
-  /**
-   * \brief Receive packet.
-   * \param maxSize maximum size
-   * \param flags additionnal flags
-   * \return packet received
-   */
   virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags);
-
-  /**
-   * \brief Receive packet.
-   * \param maxSize maximum size
-   * \param flags additionnal flags
-   * \param fromAddress source address
-   * \return packet received
-   */
   virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags, Address& fromAddress);
 
   /**
@@ -232,26 +138,26 @@
 
   /**
    * \brief Set the filter to pass one ICMPv6 type
-   * \param the ICMPv6 type to pass
+   * \param type the ICMPv6 type to pass
    */
   void Icmpv6FilterSetPass(uint8_t type);
 
   /**
    * \brief Set the filter to block one ICMPv6 type
-   * \param the ICMPv6 type to block
+   * \param type the ICMPv6 type to block
    */
   void Icmpv6FilterSetBlock(uint8_t type);
 
   /**
    * \brief Ask the filter about the status of one ICMPv6 type
-   * \param the ICMPv6 type
+   * \param type the ICMPv6 type
    * \return true if the ICMP type is passing through
    */
   bool Icmpv6FilterWillPass(uint8_t type);
 
   /**
    * \brief Ask the filter about the status of one ICMPv6 type
-   * \param the ICMPv6 type
+   * \param type the ICMPv6 type
    * \return true if the ICMP type is being blocked
    */
   bool Icmpv6FilterWillBlock(uint8_t type);
@@ -319,7 +225,7 @@
    */
   typedef struct
   {
-    uint32_t icmpv6Filt[8];
+    uint32_t icmpv6Filt[8]; //!< ICMPv6 filter specification
   } icmpv6Filter;
 
   /**
diff -Naur ns-3.18.1/src/internet/model/ipv6-route.h ns-3.19/src/internet/model/ipv6-route.h
--- ns-3.18.1/src/internet/model/ipv6-route.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-route.h	2013-12-20 09:44:50.000000000 -0800
@@ -123,6 +123,13 @@
   Ptr<NetDevice> m_outputDevice;
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param route the Ipv6 route
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, Ipv6Route const& route);
 
 /**
@@ -231,6 +238,13 @@
   std::map<uint32_t, uint32_t> m_ttls;
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param route the Ipv6 multicast route
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, Ipv6MulticastRoute const& route);
 
 } /* namespace ns3 */
diff -Naur ns-3.18.1/src/internet/model/ipv6-routing-protocol.cc ns-3.19/src/internet/model/ipv6-routing-protocol.cc
--- ns-3.18.1/src/internet/model/ipv6-routing-protocol.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-routing-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 namespace ns3 
 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv6RoutingProtocol);
+NS_OBJECT_ENSURE_REGISTERED (Ipv6RoutingProtocol)
+  ;
 
 TypeId Ipv6RoutingProtocol::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ipv6-routing-protocol.h ns-3.19/src/internet/model/ipv6-routing-protocol.h
--- ns-3.18.1/src/internet/model/ipv6-routing-protocol.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-routing-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -54,11 +54,22 @@
 class Ipv6RoutingProtocol : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
+  /// Callback for unicast packets to be forwarded
   typedef Callback<void, Ptr<const NetDevice>, Ptr<Ipv6Route>, Ptr<const Packet>, const Ipv6Header &> UnicastForwardCallback;
+
+  /// Callback for multicast packets to be forwarded
   typedef Callback<void, Ptr<const NetDevice>, Ptr<Ipv6MulticastRoute>, Ptr<const Packet>, const Ipv6Header &> MulticastForwardCallback;
+
+  /// Callback for packets to be locally delivered
   typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, uint32_t > LocalDeliverCallback;
+
+  /// Callback for routing errors (e.g., no route found)
   typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, Socket::SocketErrno > ErrorCallback;
 
   /**
diff -Naur ns-3.18.1/src/internet/model/ipv6-routing-table-entry.cc ns-3.19/src/internet/model/ipv6-routing-table-entry.cc
--- ns-3.18.1/src/internet/model/ipv6-routing-table-entry.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-routing-table-entry.cc	2013-12-20 09:44:50.000000000 -0800
@@ -208,36 +208,36 @@
   if (route.IsDefault ())
     {
       NS_ASSERT (route.IsGateway ());
-      os << "default out =" << route.GetInterface () << ", next hop =" << route.GetGateway ();
+      os << "default out: " << route.GetInterface () << ", next hop: " << route.GetGateway ();
     }
   else if (route.IsHost ())
     {
       if (route.IsGateway ())
         {
-          os << "host ="<< route.GetDest () <<
-          ", out =" << route.GetInterface () <<
-          ", next hop =" << route.GetGateway ();
+          os << "host: "<< route.GetDest () <<
+          ", out: " << route.GetInterface () <<
+          ", next hop: " << route.GetGateway ();
         }
       else
         {
-          os << "host =" << route.GetDest () <<
-          ", out =" << route.GetInterface ();
+          os << "host: " << route.GetDest () <<
+          ", out: " << route.GetInterface ();
         }
     }
   else if (route.IsNetwork ())
     {
       if (route.IsGateway ())
         {
-          os << "network =" << route.GetDestNetwork () <<
-          ", mask =" << route.GetDestNetworkPrefix () <<
-          ",out =" << route.GetInterface () <<
-          ", next hop =" << route.GetGateway ();
+          os << "network: " << route.GetDestNetwork () <<
+          "/ " << int(route.GetDestNetworkPrefix ().GetPrefixLength ()) <<
+          ", out: " << route.GetInterface () <<
+          ", next hop: " << route.GetGateway ();
         }
       else
         {
-          os << "network =" << route.GetDestNetwork () <<
-          ", mask =" << route.GetDestNetworkPrefix () <<
-          ",out =" << route.GetInterface ();
+          os << "network: " << route.GetDestNetwork () <<
+          "/" << int(route.GetDestNetworkPrefix ().GetPrefixLength ()) <<
+          ", out: " << route.GetInterface ();
         }
     }
   else
@@ -314,10 +314,10 @@
 
 std::ostream& operator<< (std::ostream& os, Ipv6MulticastRoutingTableEntry const& route)
 {
-  os << "origin =" << route.GetOrigin () <<
-  ", group =" << route.GetGroup () <<
-  ", input interface =" << route.GetInputInterface () <<
-  ", output interfaces =";
+  os << "origin: " << route.GetOrigin () <<
+  ", group: " << route.GetGroup () <<
+  ", input interface: " << route.GetInputInterface () <<
+  ", output interfaces: ";
 
   for (uint32_t i = 0; i < route.GetNOutputInterfaces (); ++i)
     {
diff -Naur ns-3.18.1/src/internet/model/ipv6-routing-table-entry.h ns-3.19/src/internet/model/ipv6-routing-table-entry.h
--- ns-3.18.1/src/internet/model/ipv6-routing-table-entry.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-routing-table-entry.h	2013-12-20 09:44:50.000000000 -0800
@@ -260,6 +260,13 @@
 
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param route the Ipv6 routing table entry
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, Ipv6RoutingTableEntry const& route);
 
 /**
@@ -364,6 +371,13 @@
   std::vector<uint32_t> m_outputInterfaces;
 };
 
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param route the Ipv6 multicast routing table entry
+ * \returns the reference to the output stream
+ */
 std::ostream& operator<< (std::ostream& os, Ipv6MulticastRoutingTableEntry const& route);
 
 } /* namespace ns3 */
diff -Naur ns-3.18.1/src/internet/model/ipv6-static-routing.cc ns-3.19/src/internet/model/ipv6-static-routing.cc
--- ns-3.18.1/src/internet/model/ipv6-static-routing.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-static-routing.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,14 +25,17 @@
 #include "ns3/simulator.h"
 #include "ns3/ipv6-route.h"
 #include "ns3/net-device.h"
+#include "ns3/names.h"
 
 #include "ipv6-static-routing.h"
 #include "ipv6-routing-table-entry.h"
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting");
-NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting);
+NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting)
+  ;
 
 TypeId Ipv6StaticRouting::GetTypeId ()
 {
@@ -78,18 +81,48 @@
 void
 Ipv6StaticRouting::PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << stream);
   std::ostream* os = stream->GetStream ();
+
+  *os << "Node: " << m_ipv6->GetObject<Node> ()->GetId ()
+      << " Time: " << Simulator::Now ().GetSeconds () << "s "
+      << "Ipv6StaticRouting table" << std::endl;
+
   if (GetNRoutes () > 0)
     {
-      *os << "Node: " << m_ipv6->GetObject<Node> ()->GetId ()
-          << " Time: " << Simulator::Now ().GetSeconds () << "s "
-          << "Ipv6StaticRouting table" << std::endl;
-
+      *os << "Destination                    Next Hop                   Flag Met Ref Use If" << std::endl;
       for (uint32_t j = 0; j < GetNRoutes (); j++)
         {
+          std::ostringstream dest, gw, mask, flags;
           Ipv6RoutingTableEntry route = GetRoute (j);
-          *os << route << std::endl;
+          dest << route.GetDest () << "/" << int(route.GetDestNetworkPrefix ().GetPrefixLength ());
+          *os << std::setiosflags (std::ios::left) << std::setw (31) << dest.str ();
+          gw << route.GetGateway ();
+          *os << std::setiosflags (std::ios::left) << std::setw (27) << gw.str ();
+          flags << "U";
+          if (route.IsHost ())
+            {
+              flags << "H";
+            }
+          else if (route.IsGateway ())
+            {
+              flags << "G";
+            }
+          *os << std::setiosflags (std::ios::left) << std::setw (5) << flags.str ();
+          *os << std::setiosflags (std::ios::left) << std::setw (4) << GetMetric (j);
+          // Ref ct not implemented
+          *os << "-" << "   ";
+          // Use not implemented
+          *os << "-" << "   ";
+          if (Names::FindName (m_ipv6->GetNetDevice (route.GetInterface ())) != "")
+            {
+              *os << Names::FindName (m_ipv6->GetNetDevice (route.GetInterface ()));
+            }
+          else
+            {
+              *os << route.GetInterface ();
+            }
+          *os << std::endl;
         }
     }
 }
@@ -722,12 +755,12 @@
   else /* default route */
     {
       /* this case is mainly used by configuring default route following RA processing,
-       * in case of multipe prefix in RA, the first will configured default route
+       * in case of multiple prefix in RA, the first will configured default route
        */
 
       /* for the moment, all default route has the same metric
        * so according to the longest prefix algorithm,
-       * the default route choosen will be the last added
+       * the default route chosen will be the last added
        */
       SetDefaultRoute (nextHop, interface, prefixToUse);
     }
diff -Naur ns-3.18.1/src/internet/model/ipv6-static-routing.h ns-3.19/src/internet/model/ipv6-static-routing.h
--- ns-3.18.1/src/internet/model/ipv6-static-routing.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ipv6-static-routing.h	2013-12-20 09:44:50.000000000 -0800
@@ -48,9 +48,22 @@
 /**
  * \ingroup ipv6StaticRouting
  * \class Ipv6StaticRouting
- * \brief Static routing protocol for IP version 6 stack.
+ *
+ * \brief Static routing protocol for IP version 6 stacks.
+ *
+ * This class provides a basic set of methods for inserting static
+ * unicast and multicast routes into the Ipv6 routing system.
+ * This particular protocol is designed to be inserted into an
+ * Ipv6ListRouting protocol but can be used also as a standalone
+ * protocol.
+ *
+ * The Ipv6StaticRouting class inherits from the abstract base class
+ * Ipv6RoutingProtocol that defines the interface methods that a routing
+ * protocol must support.
+ *
  * \see Ipv6RoutingProtocol
  * \see Ipv6ListRouting
+ * \see Ipv6ListRouting::AddRoutingProtocol
  */
 class Ipv6StaticRouting : public Ipv6RoutingProtocol
 {
@@ -61,14 +74,7 @@
    */
   static TypeId GetTypeId ();
 
-  /**
-   * \brief Constructor.
-   */
   Ipv6StaticRouting ();
-
-  /**
-   * \brief Destructor.
-   */
   virtual ~Ipv6StaticRouting ();
 
   /**
@@ -205,6 +211,7 @@
    * \param origin IPv6 address of the source
    * \param group the multicast group address.
    * \param inputInterface the input interface index
+   * \return true on success
    */
   bool RemoveMulticastRoute (Ipv6Address origin, Ipv6Address group, uint32_t inputInterface);
 
@@ -250,12 +257,22 @@
   virtual void DoDispose ();
 
 private:
+  /// Container for the network routes
   typedef std::list<std::pair <Ipv6RoutingTableEntry *, uint32_t> > NetworkRoutes;
+
+  /// Const Iterator for container for the network routes
   typedef std::list<std::pair <Ipv6RoutingTableEntry *, uint32_t> >::const_iterator NetworkRoutesCI;
+
+  /// Iterator for container for the network routes
   typedef std::list<std::pair <Ipv6RoutingTableEntry *, uint32_t> >::iterator NetworkRoutesI;
 
+  /// Container for the multicast routes
   typedef std::list<Ipv6MulticastRoutingTableEntry *> MulticastRoutes;
+
+  /// Const Iterator for container for the multicast routes
   typedef std::list<Ipv6MulticastRoutingTableEntry *>::const_iterator MulticastRoutesCI;
+
+  /// Iterator for container for the multicast routes
   typedef std::list<Ipv6MulticastRoutingTableEntry *>::iterator MulticastRoutesI;
 
   /**
diff -Naur ns-3.18.1/src/internet/model/loopback-net-device.cc ns-3.19/src/internet/model/loopback-net-device.cc
--- ns-3.18.1/src/internet/model/loopback-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/loopback-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice)
+  ;
 
 TypeId 
 LoopbackNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/loopback-net-device.h ns-3.19/src/internet/model/loopback-net-device.h
--- ns-3.18.1/src/internet/model/loopback-net-device.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/loopback-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -38,6 +38,10 @@
 class LoopbackNetDevice : public NetDevice
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   LoopbackNetDevice ();
 
@@ -72,13 +76,30 @@
 protected:
   virtual void DoDispose (void);
 private:
+  /**
+   * Receive a packet from tge Loopback NetDevice.
+   *
+   * \param packet a reference to the received packet
+   * \param protocol the protocol
+   * \param to destination address
+   * \param from source address
+   */
   void Receive (Ptr<Packet> packet, uint16_t protocol, Mac48Address to, Mac48Address from);
+
+  /**
+   * The callback used to notify higher layers that a packet has been received.
+   */
   NetDevice::ReceiveCallback m_rxCallback;
+
+  /**
+   * The callback used to notify higher layers that a packet has been received in promiscuous mode.
+   */
   NetDevice::PromiscReceiveCallback m_promiscCallback;
-  Ptr<Node> m_node;
-  uint16_t m_mtu;
-  uint32_t m_ifIndex;
-  Mac48Address m_address;
+
+  Ptr<Node> m_node; //!< the node this NetDevice is associated with
+  uint16_t m_mtu; //!< device MTU
+  uint32_t m_ifIndex; //!< interface index
+  Mac48Address m_address; //!< NetDevice MAC address
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/ndisc-cache.cc ns-3.19/src/internet/model/ndisc-cache.cc
--- ns-3.18.1/src/internet/model/ndisc-cache.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ndisc-cache.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,9 +30,11 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("NdiscCache");
+NS_LOG_COMPONENT_DEFINE ("NdiscCache")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (NdiscCache);
+NS_OBJECT_ENSURE_REGISTERED (NdiscCache)
+  ;
 
 TypeId NdiscCache::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/internet/model/ndisc-cache.h ns-3.19/src/internet/model/ndisc-cache.h
--- ns-3.18.1/src/internet/model/ndisc-cache.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/ndisc-cache.h	2013-12-20 09:44:50.000000000 -0800
@@ -412,20 +412,29 @@
   };
 
 private:
+  /**
+   * \brief Neighbor Discovery Cache container
+   */
   typedef sgi::hash_map<Ipv6Address, NdiscCache::Entry *, Ipv6AddressHash> Cache;
+  /**
+   * \brief Neighbor Discovery Cache container iterator
+   */
   typedef sgi::hash_map<Ipv6Address, NdiscCache::Entry *, Ipv6AddressHash>::iterator CacheI;
 
   /**
    * \brief Copy constructor.
-   * \param a cache to copy
+   *
+   * Not implemented to avoid misuse
    */
-  NdiscCache (NdiscCache const &a);
+  NdiscCache (NdiscCache const &);
 
   /**
-   * \brief Equal operator.
-   * \param a cache to copy
+   * \brief Copy constructor.
+   *
+   * Not implemented to avoid misuse
+   * \returns
    */
-  NdiscCache& operator= (NdiscCache const &a);
+  NdiscCache& operator= (NdiscCache const &);
 
   /**
    * \brief Dispose this object.
diff -Naur ns-3.18.1/src/internet/model/nsc-sysctl.cc ns-3.19/src/internet/model/nsc-sysctl.cc
--- ns-3.18.1/src/internet/model/nsc-sysctl.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/nsc-sysctl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,9 +23,19 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup nsctcp
+ *
+ * This object represent the underlying nsc stack attributes and
+ * provide a ns-3-like system to access them though sysctls
+ */
 class NscStackStringAccessor : public AttributeAccessor
 {
 public:
+  /**
+   * \brief Constructor
+   * \param name name of the attribute
+   */
   NscStackStringAccessor (std::string name) : m_name (name) {}
 
   virtual bool Set (ObjectBase * object, const AttributeValue &val) const;
@@ -33,7 +43,7 @@
   virtual bool HasGetter (void) const;
   virtual bool HasSetter (void) const;
 private:
-  std::string m_name;
+  std::string m_name; //!< name of the attribute
 };
 
 bool NscStackStringAccessor::HasGetter (void) const
@@ -142,7 +152,8 @@
     }
 }
 
-NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack);
+NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack)
+  ;
 
 TypeId
 Ns3NscStack::Ns3NscStack::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/nsc-sysctl.h ns-3.19/src/internet/model/nsc-sysctl.h
--- ns-3.18.1/src/internet/model/nsc-sysctl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/nsc-sysctl.h	2013-12-20 09:44:50.000000000 -0800
@@ -25,20 +25,42 @@
 
 namespace ns3 {
 
-// This object represents the underlying nsc stack,
-// which is aggregated to a Node object, and which provides access to the
-// sysctls of the nsc stack through attributes.
+/**
+ * \ingroup nsctcp
+ *
+ * This object represents the underlying nsc stack,
+ * which is aggregated to a Node object, and which provides access to the
+ * sysctls of the nsc stack through attributes.
+ */
 class Ns3NscStack : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
+  /**
+   * \brief Set the underlying stack
+   * \param stack the stack
+   */
   void SetStack (INetStack *stack) { m_stack = stack; }
 
 private:
   friend class NscStackStringAccessor;
+  /**
+   * \brief Set an attribute
+   * \param name the attribute name
+   * \param value the attribute value
+   */
   void Set (std::string name, std::string value);
+  /**
+   * \brief Get an attribute
+   * \param name the attribute name
+   * \returns the attribute value
+   */
   std::string Get (std::string name) const;
-  INetStack *m_stack;
+  INetStack *m_stack; //!< the underlying stack
 };
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/nsc-tcp-l4-protocol.cc ns-3.19/src/internet/model/nsc-tcp-l4-protocol.cc
--- ns-3.18.1/src/internet/model/nsc-tcp-l4-protocol.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/nsc-tcp-l4-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -49,21 +49,51 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (NscTcpL4Protocol);
+NS_OBJECT_ENSURE_REGISTERED (NscTcpL4Protocol)
+  ;
 
 /* see http://www.iana.org/assignments/protocol-numbers */
 const uint8_t NscTcpL4Protocol::PROT_NUMBER = 6;
 
+/**
+ * \ingroup nsctcp
+ * \brief Nsc interface implementation class.
+ */
 class NscInterfaceImpl : public ISendCallback, public IInterruptCallback 
 {
 public:
+  /**
+   * Constructor
+   * \param prot the NSC TCP protocol
+   */
   NscInterfaceImpl (Ptr<NscTcpL4Protocol> prot);
 private:
+  /**
+   * \brief Invoked by NSCs 'ethernet driver' to re-inject a packet into ns-3.
+   *
+   * A packet is an octet soup consisting of an IP Header, TCP Header
+   * and user payload, if any
+   *
+   * \param data the data
+   * \param datalen the data length
+   */
   virtual void send_callback (const void *data, int datalen);
+  /**
+   * \brief Called by the NSC stack whenever something of interest has happened
+   *
+   * Examples: when data arrives on a socket, a listen socket
+   * has a new connection pending, etc.
+   */
   virtual void wakeup ();
+  /**
+   * \brief Called by the Linux stack RNG initialization
+   *
+   * Its also used by the cradle code to add a timestamp to
+   * printk/printf/debug output.
+   */
   virtual void gettime (unsigned int *, unsigned int *);
 private:
-  Ptr<NscTcpL4Protocol> m_prot;
+  Ptr<NscTcpL4Protocol> m_prot; //!< the NSC TCP protocol
 };
 
 NscInterfaceImpl::NscInterfaceImpl (Ptr<NscTcpL4Protocol> prot)
@@ -112,9 +142,16 @@
   return tid;
 }
 
+/**
+ * \brief External Random number generator
+ *
+ * \todo make it random...
+ *
+ * \returns a random number
+ */
 int external_rand ()
 {
-  return 1;   /// \todo
+  return 1;
 }
 
 NscTcpL4Protocol::NscTcpL4Protocol ()
@@ -384,7 +421,7 @@
 
 void NscTcpL4Protocol::wakeup ()
 {
-  /// \todo
+  // \todo
   // this should schedule a timer to read from all tcp sockets now... this is
   // an indication that data might be waiting on the socket
 
@@ -450,7 +487,7 @@
           // IP address of the subnet but this was found to fail for
           // some use cases in /30 subnets.
 
-          /// \todo \bugid{1398} NSC's limitation to single-interface nodes
+          // \todo \bugid{1398} NSC's limitation to single-interface nodes
           m_nscStack->add_default_gateway (addrOss.str ().c_str ());
         }
     }
diff -Naur ns-3.18.1/src/internet/model/nsc-tcp-l4-protocol.h ns-3.19/src/internet/model/nsc-tcp-l4-protocol.h
--- ns-3.18.1/src/internet/model/nsc-tcp-l4-protocol.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/nsc-tcp-l4-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -45,18 +45,39 @@
  */
 class NscTcpL4Protocol : public IpL4Protocol {
 public:
-  static const uint8_t PROT_NUMBER;
-  static TypeId GetTypeId (void);
+  static const uint8_t PROT_NUMBER; //!< protocol number (0x6)
   /**
-   * \brief Constructor
+   * \brief Get the type ID.
+   * \return the object TypeId
    */
+  static TypeId GetTypeId (void);
+
   NscTcpL4Protocol ();
   virtual ~NscTcpL4Protocol ();
 
+  /**
+   * Set node associated with this stack
+   * \param node the node
+   */
   void SetNode (Ptr<Node> node);
+
+  /**
+   * Set the NSC library to be used
+   * \param lib the library path
+   */
   void SetNscLibrary (const std::string &lib);
+
+  /**
+   * Get the NSC library being used
+   * \returns the library path
+   */
   std::string GetNscLibrary (void) const;
   virtual int GetProtocolNumber (void) const;
+
+  /**
+   * Get the NSC version
+   * \returns the NSC version
+   */
   virtual int GetVersion (void) const;
 
   /**
@@ -65,27 +86,54 @@
    */
   Ptr<Socket> CreateSocket (void);
 
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (void);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param address address to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address address);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (uint16_t port);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param address address to use
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address address, uint16_t port);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param localAddress local address to use
+   * \param localPort local port to use
+   * \param peerAddress remote address to use
+   * \param peerPort remote port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address localAddress, uint16_t localPort,
                           Ipv4Address peerAddress, uint16_t peerPort);
 
-  void DeAllocate (Ipv4EndPoint *endPoint);
 
   /**
-   * \brief Receive a packet up the protocol stack
-   * \param p The Packet to dump the contents into
-   * \param header IPv4 Header information
-   * \param incomingInterface The Ipv4Interface it was received on
+   * \brief Remove an IPv4 Endpoint.
+   * \param endPoint the end point to remove
    */
+  void DeAllocate (Ipv4EndPoint *endPoint);
+
   virtual IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                            Ipv4Header const &header,
-                                            Ptr<Ipv4Interface> incomingInterface);
+                                          Ipv4Header const &header,
+                                          Ptr<Ipv4Interface> incomingInterface);
   virtual IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                                 Ipv6Header const &header,
-                                                 Ptr<Ipv6Interface> interface);
+                                          Ipv6Header const &header,
+                                          Ptr<Ipv6Interface> interface);
 
   // From IpL4Protocol
   virtual void SetDownTarget (IpL4Protocol::DownTargetCallback cb);
@@ -97,38 +145,73 @@
   virtual void DoDispose (void);
   virtual void NotifyNewAggregate ();
 private:
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and not implemented to avoid misuse
+   */
   NscTcpL4Protocol (NscTcpL4Protocol const &);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and not implemented to avoid misuse
+   * \returns
+   */
   NscTcpL4Protocol& operator= (NscTcpL4Protocol const &);
 
   // NSC callbacks.
   // NSC invokes these hooks to interact with the simulator.
   // In any case, these methods are only to be called by NSC.
-  //
-  // send_callback is invoked by NSCs 'ethernet driver' to re-inject
-  // a packet (i.e. an octet soup consisting of an IP Header, TCP Header
-  // and user payload, if any), into ns-3.
+
+  /**
+   * \brief Invoked by NSCs 'ethernet driver' to re-inject a packet into ns-3.
+   *
+   * A packet is an octet soup consisting of an IP Header, TCP Header
+   * and user payload, if any
+   *
+   * \param data the data
+   * \param datalen the data length
+   */
   void send_callback (const void *data, int datalen);
-  // This is called by the NSC stack whenever something of interest
-  // has happened, e.g. when data arrives on a socket, a listen socket
-  // has a new connection pending, etc.
+  /**
+   * \brief Called by the NSC stack whenever something of interest has happened
+   *
+   * Examples: when data arrives on a socket, a listen socket
+   * has a new connection pending, etc.
+   */
   void wakeup ();
-  // This is called by the Linux stack RNG initialization.
-  // Its also used by the cradle code to add a timestamp to
-  // printk/printf/debug output.
+  /**
+   * \brief Called by the Linux stack RNG initialization
+   *
+   * Its also used by the cradle code to add a timestamp to
+   * printk/printf/debug output.
+   * \param sec seconds
+   * \param usec microseconds
+   */
   void gettime (unsigned int *sec, unsigned int *usec);
+  /**
+   * \brief Add an interface
+   *
+   * Actually NSC only supports one interface per node (\bugid{1398})
+   */
   void AddInterface (void);
+
+  /**
+   * \brief Provide a "soft" interrupt to NSC
+   */
   void SoftInterrupt (void);
   friend class NscInterfaceImpl;
   friend class NscTcpSocketImpl;
-  Ptr<Node> m_node;
-  Ipv4EndPointDemux *m_endPoints;
-  INetStack* m_nscStack;
-  NscInterfaceImpl *m_nscInterface;
-  void *m_dlopenHandle;
-  std::string m_nscLibrary;
-  Timer m_softTimer;
-  std::vector<Ptr<NscTcpSocketImpl> > m_sockets;
-  IpL4Protocol::DownTargetCallback m_downTarget;
+
+  Ptr<Node> m_node; //!< the node this stack is associated with
+  Ipv4EndPointDemux *m_endPoints; //!< A list of IPv4 end points.
+  INetStack* m_nscStack; //!< the NSC stack.
+  NscInterfaceImpl *m_nscInterface; //!< the NSC Interface.
+  void *m_dlopenHandle; //!< dynamic library handle.
+  std::string m_nscLibrary; //!< path to the NSC library.
+  Timer m_softTimer; //!< Soft interrupt timer
+  std::vector<Ptr<NscTcpSocketImpl> > m_sockets; //!< list of sockets
+  IpL4Protocol::DownTargetCallback m_downTarget; //!< Callback to send packets over IPv4
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/nsc-tcp-socket-factory-impl.h ns-3.19/src/internet/model/nsc-tcp-socket-factory-impl.h
--- ns-3.18.1/src/internet/model/nsc-tcp-socket-factory-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/nsc-tcp-socket-factory-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -47,6 +47,10 @@
   NscTcpSocketFactoryImpl ();
   virtual ~NscTcpSocketFactoryImpl ();
 
+  /**
+   * \brief Set the associated TCP L4 protocol.
+   * \param tcp the TCP L4 protocol
+   */
   void SetTcp (Ptr<NscTcpL4Protocol> tcp);
 
   virtual Ptr<Socket> CreateSocket (void);
@@ -54,7 +58,7 @@
 protected:
   virtual void DoDispose (void);
 private:
-  Ptr<NscTcpL4Protocol> m_tcp;
+  Ptr<NscTcpL4Protocol> m_tcp; //!< the associated TCP L4 protocol
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/nsc-tcp-socket-impl.cc ns-3.19/src/internet/model/nsc-tcp-socket-impl.cc
--- ns-3.18.1/src/internet/model/nsc-tcp-socket-impl.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/nsc-tcp-socket-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -47,7 +47,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (NscTcpSocketImpl);
+NS_OBJECT_ENSURE_REGISTERED (NscTcpSocketImpl)
+  ;
 
 TypeId
 NscTcpSocketImpl::GetTypeId ()
diff -Naur ns-3.18.1/src/internet/model/nsc-tcp-socket-impl.h ns-3.19/src/internet/model/nsc-tcp-socket-impl.h
--- ns-3.18.1/src/internet/model/nsc-tcp-socket-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/nsc-tcp-socket-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -53,15 +53,34 @@
 class NscTcpSocketImpl : public TcpSocket
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   /**
    * Create an unbound tcp socket.
    */
   NscTcpSocketImpl ();
+
+  /**
+   * Clone a TCP socket, for use upon receiving a connection request in LISTEN state
+   *
+   * \param sock the original Tcp Socket
+   */
   NscTcpSocketImpl (const NscTcpSocketImpl& sock);
   virtual ~NscTcpSocketImpl ();
 
+  /**
+   * \brief Set the associated node.
+   * \param node the node
+   */
   void SetNode (Ptr<Node> node);
+
+  /**
+   * \brief Set the associated TCP L4 protocol.
+   * \param tcp the TCP L4 protocol
+   */
   void SetTcp (Ptr<NscTcpL4Protocol> tcp);
 
   virtual enum SocketErrno GetErrno (void) const;
@@ -87,22 +106,68 @@
   virtual bool GetAllowBroadcast () const;
 
 private:
+  /**
+   * \brief Called by NscTcpSocketImpl::ForwardUp()
+   *
+   * Actually performs the ForwardUp operations
+   */
   void NSCWakeup (void);
   friend class Tcp;
   // invoked by Tcp class
+  /**
+   * Finish the binding process
+   * \returns 0 on success, -1 on failure
+   */
   int FinishBind (void);
+  /**
+   * \brief Called by the L3 protocol when it received a packet to pass on to TCP.
+   *
+   * \param p the incoming packet
+   * \param header the packet's IPv4 header
+   * \param port the incoming port
+   * \param incomingInterface the incoming interface
+   */
   void ForwardUp (Ptr<Packet> p, Ipv4Header header, uint16_t port, 
                   Ptr<Ipv4Interface> incomingInterface);
+  /**
+   * \brief Kill this socket by zeroing its attributes (IPv4)
+   *
+   * This is a callback function configured to m_endpoint in
+   * SetupCallback(), invoked when the endpoint is destroyed.
+   */
   void Destroy (void);
   //methods for state
+  /**
+   * \brief Send all the pending data
+   * \returns true on success
+   */
   bool SendPendingData (void);
+  /**
+   * \brief Read all the pending data
+   * \returns true on success
+   */
   bool ReadPendingData (void);
+  /**
+   * \brief Accept an incoming connection
+   * \returns true on success
+   */
   bool Accept (void);
+  /**
+   * \brief Complete the Fork operations (after a connection has been accepted)
+   */
   void CompleteFork (void);
+
+  /**
+   * \brief Called when a connection is in Established state
+   */
   void ConnectionSucceeded ();
 
   // Manage data tx/rx
-  /// \todo This should be virtual and overridden
+  // \todo This should be virtual and overridden
+  /**
+   * \brief Copy self
+   * \returns a copy of self
+   */
   Ptr<NscTcpSocketImpl> Copy ();
 
   // attribute related
@@ -112,7 +177,15 @@
   virtual uint32_t GetRcvBufSize (void) const;
   virtual void SetSegSize (uint32_t size);
   virtual uint32_t GetSegSize (void) const;
+  /**
+   * \brief Set the Advertised Window size
+   * \param window the window size
+   */
   virtual void SetAdvWin (uint32_t window);
+  /**
+   * \brief Get the Advertised Window size
+   * \returns the window size
+   */
   virtual uint32_t GetAdvWin (void) const;
   virtual void SetSSThresh (uint32_t threshold);
   virtual uint32_t GetSSThresh (void) const;
@@ -131,57 +204,62 @@
   virtual void SetPersistTimeout (Time timeout);
   virtual Time GetPersistTimeout (void) const;
 
+  /**
+   * \brief Translate between a NSC error and a ns-3 error code
+   * \param err NSC error
+   * \returns ns-3 error code
+   */
   enum Socket::SocketErrno GetNativeNs3Errno (int err) const;
-  uint32_t m_delAckMaxCount;
-  Time m_delAckTimeout;
-  bool m_noDelay;
-
-  Ipv4EndPoint *m_endPoint;
-  Ptr<Node> m_node;
-  Ptr<NscTcpL4Protocol> m_tcp;
-  Ipv4Address m_remoteAddress;
-  uint16_t m_remotePort;
+  uint32_t m_delAckMaxCount;  //!< Number of packet to fire an ACK before delay timeout
+  Time m_delAckTimeout;       //!< Time to delay an ACK
+  bool m_noDelay;             //!< Disable ACk delay
+
+  Ipv4EndPoint *m_endPoint;     //!< the IPv4 endpoint
+  Ptr<Node> m_node;             //!< the associated node
+  Ptr<NscTcpL4Protocol> m_tcp;  //!< the associated TCP L4 protocol
+  Ipv4Address m_remoteAddress;  //!< peer IP address
+  uint16_t m_remotePort;        //!< peer port
   //these two are so that the socket/endpoint cloning works
-  Ipv4Address m_localAddress;
-  uint16_t m_localPort;
-  InetSocketAddress m_peerAddress;
-  enum SocketErrno m_errno;
-  bool m_shutdownSend;
-  bool m_shutdownRecv;
-  bool m_connected;
+  Ipv4Address m_localAddress;   //!< local address
+  uint16_t m_localPort;         //!< local port
+  InetSocketAddress m_peerAddress; //!< peer IP and port
+  enum SocketErrno m_errno;     //!< last error number
+  bool m_shutdownSend;          //!< Send no longer allowed
+  bool m_shutdownRecv;          //!< Receive no longer allowed
+  bool m_connected;             //!< Connection established
 
   //manage the state information
-  TracedValue<TcpStates_t> m_state;
-  bool m_closeOnEmpty;
+  TracedValue<TcpStates_t> m_state; //!< state information
+  bool m_closeOnEmpty;              //!< true if socket will close when buffer is empty
 
   //needed to queue data when in SYN_SENT state
-  std::queue<Ptr<Packet> > m_txBuffer;
-  uint32_t m_txBufferSize;
+  std::queue<Ptr<Packet> > m_txBuffer; //!< transmission buffer
+  uint32_t m_txBufferSize;             //!< transmission buffer size
 
   // Window management
-  uint32_t                       m_segmentSize;          //SegmentSize
-  uint32_t                       m_rxWindowSize;
-  uint32_t                       m_advertisedWindowSize; //Window to advertise
-  TracedValue<uint32_t>          m_cWnd;                 //Congestion window
-  uint32_t                       m_ssThresh;             //Slow Start Threshold
-  uint32_t                       m_initialCWnd;          //Initial cWnd value
+  uint32_t                       m_segmentSize;          //!< SegmentSize
+  uint32_t                       m_rxWindowSize;         //!< Receive window size
+  uint32_t                       m_advertisedWindowSize; //!< Window to advertise
+  TracedValue<uint32_t>          m_cWnd;                 //!< Congestion window
+  uint32_t                       m_ssThresh;             //!< Slow Start Threshold
+  uint32_t                       m_initialCWnd;          //!< Initial cWnd value
 
   // Round trip time estimation
-  Time m_lastMeasuredRtt;
+  Time m_lastMeasuredRtt; //!< Last measured RTT
 
   // Timer-related members
-  Time              m_cnTimeout; 
-  uint32_t          m_cnCount;
-  Time              m_persistTimeout; 
+  Time              m_cnTimeout;       //!< Timeout for connection retry
+  uint32_t          m_cnCount;         //!< Count of remaining connection retries
+  Time              m_persistTimeout;  //!< Time between sending 1-byte probes
 
   // Temporary queue for delivering data to application
-  std::queue<Ptr<Packet> > m_deliveryQueue;
-  uint32_t m_rxAvailable;
-  INetStreamSocket* m_nscTcpSocket;
+  std::queue<Ptr<Packet> > m_deliveryQueue; //!< receive buffer
+  uint32_t m_rxAvailable;                   //!< receive buffer available size
+  INetStreamSocket* m_nscTcpSocket;         //!< the real NSC TCP socket
 
   // Attributes
-  uint32_t m_sndBufSize;   // buffer limit for the outgoing queue
-  uint32_t m_rcvBufSize;   // maximum receive socket buffer size
+  uint32_t m_sndBufSize;   //!< buffer limit for the outgoing queue
+  uint32_t m_rcvBufSize;   //!< maximum receive socket buffer size
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/pending-data.h ns-3.19/src/internet/model/pending-data.h
--- ns-3.18.1/src/internet/model/pending-data.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/pending-data.h	2013-12-20 09:44:50.000000000 -0800
@@ -41,17 +41,48 @@
 class PendingData {
 public:
   PendingData ();
+  /**
+   * Constructor
+   * \param s size
+   * \param d data
+   * \param msg message size
+   * \param resp response size
+   */
   PendingData (uint32_t s, uint8_t* d = NULL, uint32_t msg = 0, uint32_t resp = 0);
-  PendingData (const std::string&); // Construct from string
-  PendingData (uint8_t*, uint32_t&, Packet*); // Construct from serialized buffer
-  PendingData (const PendingData&);   // Copy constructor
+  /**
+   * Constructor from string
+   * \param s string
+   */
+  PendingData (const std::string& s); // Construct from string
+
+  /**
+   * Copy constructor
+   * \param o object to copy
+   */
+  PendingData (const PendingData& o);   // Copy constructor
   virtual ~PendingData ();     // Destructor
+
+  /**
+   * Returns the size of the pending data
+   * \returns size of pending data
+   */
   uint32_t Size () const { return size; }
-  // Serialization
-  uint8_t*  Serialize (uint8_t*, uint32_t&); // Serialize to a buffer
-  uint8_t*  Construct (uint8_t*, uint32_t&); // Construct from buffer
-  virtual void Clear (); // Remove all associated data
-  virtual void Add (uint32_t s, const uint8_t* d = 0); // Add some data to end
+
+  /**
+   * \brief Remove all associated data
+   */
+  virtual void Clear ();
+
+  /**
+   * \brief Add some data to end
+   * \param s the data size.
+   * \param d the data to store.
+   */
+  virtual void Add (uint32_t s, const uint8_t* d = 0); //
+  /**
+   * \brief Add some data to end
+   * \param p packet containing the data.
+   */
   virtual void Add (Ptr<Packet> p);
   /**
    * This method returns the number of bytes in the PendingData buffer
@@ -89,9 +120,24 @@
    * \return seqOffset-seqFront
    */
   virtual uint32_t OffsetFromSeq (const SequenceNumber32& seqFront, const SequenceNumber32& seqOffset);
-  virtual Ptr<Packet> CopyFromOffset (uint32_t, uint32_t);  // Size, offset, ret packet
-  // Copy data, size, offset specified by sequence difference
-  virtual Ptr<Packet> CopyFromSeq (uint32_t, const SequenceNumber32&, const SequenceNumber32&);
+
+  /**
+   * \brief Copy data starting from a give offset
+   * \param s size of data to copy
+   * \param o offset
+   * \returns a packet containing the requested data
+   */
+  virtual Ptr<Packet> CopyFromOffset  (uint32_t s, uint32_t o);  // Size, offset, ret packet
+  /**
+   * \brief Copy data starting from a give offset
+   * \param s size of data to copy
+   * \param f Front sequence
+   * \param o Offset sequence
+   *
+   * \see PendingData::OffsetFromSeq()
+   * \returns a packet containing the requested data
+   */
+  virtual Ptr<Packet> CopyFromSeq (uint32_t s, const SequenceNumber32& f, const SequenceNumber32& o);
   /**
    * Permits object to clear any pending data between seqFront and 
    * seqOffset - 1).  Callers should check the return value to determine
@@ -102,15 +148,35 @@
    * \return number of bytes from the front that were removed from the buffer
    */
   virtual uint32_t RemoveToSeq (const SequenceNumber32& seqFront, const SequenceNumber32& seqOffset);
-  PendingData*   Copy () const;          // Create a copy of this header
-  PendingData*   CopyS (uint32_t);         // Copy with new size
-  PendingData*   CopySD (uint32_t, uint8_t*); // Copy with new size, new data
+
+  /**
+   * \brief Create a copy of self
+   * \returns copy of pending data
+   */
+  PendingData*   Copy () const;
+  /**
+   * \brief Create a copy of self with new size
+   *
+   * Assumes no associated data
+   * \param s new size
+   * \returns copy of pending data
+   */
+  PendingData*   CopyS (uint32_t s);         // Copy
+  /**
+   * \brief Create a copy of self with new size, new data
+   *
+   * Assumes no associated data
+   * \param s new size
+   * \param d new data
+   * \returns copy of pending data
+   */
+  PendingData*   CopySD (uint32_t s, uint8_t* d);
 public:
-  uint32_t size;        // Number of data bytes
-  std::vector<Ptr<Packet> > data;         // Corresponding data (may be null)
+  uint32_t size;        //!< Number of data bytes
+  std::vector<Ptr<Packet> > data;         //!< Corresponding data (may be null)
   // The next two fields allow simulated applications to exchange some info
-  uint32_t msgSize;     // Total size of message
-  uint32_t responseSize; // Size of response requested
+  uint32_t msgSize;     //!< Total size of message
+  uint32_t responseSize; //!< Size of response requested
 };
 
 } //namepsace ns3
diff -Naur ns-3.18.1/src/internet/model/rtt-estimator.cc ns-3.19/src/internet/model/rtt-estimator.cc
--- ns-3.18.1/src/internet/model/rtt-estimator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/rtt-estimator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RttEstimator);
+NS_OBJECT_ENSURE_REGISTERED (RttEstimator)
+  ;
 
 TypeId 
 RttEstimator::GetTypeId (void)
@@ -231,7 +232,8 @@
 //-----------------------------------------------------------------------------
 // Mean-Deviation Estimator
 
-NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation);
+NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation)
+  ;
 
 TypeId 
 RttMeanDeviation::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/rtt-estimator.h ns-3.19/src/internet/model/rtt-estimator.h
--- ns-3.18.1/src/internet/model/rtt-estimator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/rtt-estimator.h	2013-12-20 09:44:50.000000000 -0800
@@ -39,15 +39,26 @@
  */
 class RttHistory {
 public:
+  /**
+   * \brief Constructor - builds an RttHistory with the given parameters
+   * \param s First sequence number in packet sent
+   * \param c Number of bytes sent
+   * \param t Time this one was sent
+   */
   RttHistory (SequenceNumber32 s, uint32_t c, Time t);
+  /**
+   * \brief Copy constructor
+   * \param h the object to copy
+   */
   RttHistory (const RttHistory& h); // Copy constructor
 public:
-  SequenceNumber32  seq;  // First sequence number in packet sent
-  uint32_t        count;  // Number of bytes sent
-  Time            time;   // Time this one was sent
-  bool            retx;   // True if this has been retransmitted
+  SequenceNumber32  seq;  //!< First sequence number in packet sent
+  uint32_t        count;  //!< Number of bytes sent
+  Time            time;   //!< Time this one was sent
+  bool            retx;   //!< True if this has been retransmitted
 };
 
+/// Container for RttHistory objects
 typedef std::deque<RttHistory> RttHistory_t;
 
 /**
@@ -57,10 +68,18 @@
  */
 class RttEstimator : public Object {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   RttEstimator();
-  RttEstimator (const RttEstimator&); 
+  /**
+   * \brief Copy constructor
+   * \param r the object to copy
+   */
+  RttEstimator (const RttEstimator& r);
 
   virtual ~RttEstimator();
 
@@ -97,6 +116,10 @@
    */
   virtual Time RetransmitTimeout () = 0;
 
+  /**
+   * \brief Copy object
+   * \returns a copy of itself
+   */
   virtual Ptr<RttEstimator> Copy () const = 0;
 
   /**
@@ -139,16 +162,16 @@
   Time GetCurrentEstimate (void) const;
 
 private:
-  SequenceNumber32 m_next;    // Next expected sequence to be sent
-  RttHistory_t m_history;     // List of sent packet
-  uint16_t m_maxMultiplier;
-  Time m_initialEstimatedRtt;
+  SequenceNumber32 m_next;    //!< Next expected sequence to be sent
+  RttHistory_t m_history;     //!< List of sent packet
+  uint16_t m_maxMultiplier;   //!< Maximum RTO Multiplier
+  Time m_initialEstimatedRtt; //!< Initial RTT estimation
 
 protected:
-  Time         m_currentEstimatedRtt;     // Current estimate
-  Time         m_minRto;                  // minimum value of the timeout
-  uint32_t     m_nSamples;                // Number of samples
-  uint16_t     m_multiplier;              // RTO Multiplier
+  Time         m_currentEstimatedRtt;     //!< Current estimate
+  Time         m_minRto;                  //!< minimum value of the timeout
+  uint32_t     m_nSamples;                //!< Number of samples
+  uint16_t     m_multiplier;              //!< RTO Multiplier
 };
 
 /**
@@ -163,11 +186,19 @@
  */
 class RttMeanDeviation : public RttEstimator {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   RttMeanDeviation ();
 
-  RttMeanDeviation (const RttMeanDeviation&);
+  /**
+   * \brief Copy constructor
+   * \param r the object to copy
+   */
+  RttMeanDeviation (const RttMeanDeviation& r);
 
   virtual TypeId GetInstanceTypeId (void) const;
 
@@ -186,7 +217,7 @@
   Ptr<RttEstimator> Copy () const;
 
   /**
-   * \brief Resets sthe estimator.
+   * \brief Resets the estimator.
    */
   void Reset ();
 
@@ -197,8 +228,8 @@
   void Gain (double g);
 
 private:
-  double       m_gain;       // Filter gain
-  Time         m_variance;   // Current variance
+  double       m_gain;       //!< Filter gain
+  Time         m_variance;   //!< Current variance
 };
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/internet/model/sim_interface.h ns-3.19/src/internet/model/sim_interface.h
--- ns-3.18.1/src/internet/model/sim_interface.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/sim_interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -24,49 +24,122 @@
 
 #define NSC_VERSION 0x000500
 
+/**
+ * \ingroup nsctcp
+ * \brief Struct interface to NSC stack
+ */
 struct INetStack
 {
   virtual ~INetStack() {}
 
+  /**
+   * \brief Initialize the stack
+   * \param hz timer_interrupt frequency
+   */
   virtual void init (int hz) = 0;
 
+  /**
+   * \brief Deliver complete packet to the NSC network stack
+   * \param if_id interface ID
+   * \param data data
+   * \param datalen data length
+   */
   virtual void if_receive_packet (int if_id, const void *data, int datalen) = 0;
-
+  /**
+   * \brief Send complete packet to the NSC network stack
+   * \param data data
+   * \param datalen data length
+   */
   virtual void if_send_packet (const void *data, int datalen) = 0;
+  /**
+   * \brief Signal the completion of send procedure to the NSC network stack
+   * \param if_id interface ID
+   */
   virtual void if_send_finish (int if_id) = 0;
 
+  /**
+   * \brief Attach an interface to the stack
+   * \param addr address
+   * \param mask network mask
+   * \param mtu MTU
+   */
   virtual void if_attach (const char *addr, const char *mask, int mtu) = 0;
+  /**
+   * \brief Add a default gateway to the interface
+   * \param addr gateway address
+   */
   virtual void add_default_gateway (const char *addr) = 0;
 
-  /** Purely for debugging/diagnostic purposes. This returns the internal id
-   * of the stack instance.
+  /**
+   * \brief Returns the internal id of the stack instance.
+   *
+   * Purely for debugging/diagnostic purposes.
+   * \return internal stack id
    */
   virtual int get_id () = 0;
 
-  /** Should return a short one-word name of the stack. Eg. Linux 2.4.x ->
+  /**
+   * \brief Return a short one-word name of the stack
+   *
+   * Should return a short one-word name of the stack. Eg. Linux 2.4.x ->
    * linux24, FreeBSD 5.x -> freebsd5. This can be used to identify output
-   * from a stack, for example a packet trace file. */
+   * from a stack, for example a packet trace file.
+   * \return short one-word name of the stack
+   */
   virtual const char *get_name () = 0;
 
-  /** This is used so the simulator can call the stack timer_interrupt function
+  /**
+   * \brief Get the timer_interrupt frequency
+   *
+   * This is used so the simulator can call the stack timer_interrupt function
    * the correct amount of times per second. For example, lwip has a hz of 10,
    * which it returns here to say that it's timer_interrupt should be called
    * 10 times a second. FreeBSD uses 100, as does Linux 2.4, while Linux 2.6
    * uses 1000. (This is often configurable in the kernel in question, also.)
+   *
+   * \return frequency
    */
   virtual int get_hz () = 0;
 
+  /**
+   * \brief The stack timer_interrupt function
+   */
   virtual void timer_interrupt () = 0;
+
+  /**
+   * \brief Increment the time ticks
+   */
   virtual void increment_ticks () = 0;
 
+  /**
+   * \brief Set the buffer size
+   */
   virtual void buffer_size (int size) = 0;
 
+  /**
+   * \brief Create a new UDP socket
+   */
   virtual struct INetDatagramSocket *new_udp_socket () { return NULL; }
+  /**
+   * \brief Create a new TCP socket
+   */
   virtual struct INetStreamSocket *new_tcp_socket () { return NULL; }
+  /**
+   * \brief Create a new SCTP socket
+   */
   virtual struct INetStreamSocket *new_sctp_socket () { return NULL; }
 
   // The following I've made optional to implement for now. Eases
   // integration of new features.
+  /**
+   * \brief use sysctl to modify system parameters
+   * \param sysctl_name name of the parameter to modify
+   * \param oldval old value
+   * \param oldlenp old value length
+   * \param newval new value
+   * \param newlen new value length
+   * \returns
+   */
   virtual int sysctl (const char *sysctl_name, void *oldval, size_t *oldlenp,
                       void *newval, size_t newlen)
   {
@@ -77,6 +150,12 @@
   // to convert the string-value to something that the stack can handle.
   // The idea here is that this is a front-end to the sysctl(2) call,
   // much like the sysctl(8) program.
+  /**
+   * \brief Set system parameters using sysctl
+   * \param name name of the parameter to modify
+   * \param value new value
+   * \returns
+   */
   virtual int sysctl_set (const char *name, const char *value)
   {
     return -1;
@@ -85,45 +164,81 @@
   // same as above, cradle code is expected to convert the sysctl value
   // into a string.
   // returns length of the string in value, i.e. retval > len: 'output truncated'.
+  /**
+   * \brief Get system parameters using sysctl
+   * \param name name of the parameter to modify
+   * \param value value
+   * \param len value length
+   * \returns length of the string in value, i.e. retval > len: 'output truncated'.
+   */
   virtual int sysctl_get (const char *name, char *value, size_t len)
   {
     return -1;
   }
 
-  // this tells the cradle code to put the name of sysctl number 'idx'
-  // into name[].
-  // The idea is that this can be used to get a list of all available sysctls:
-  // char buf[256]
-  // for (i=0; sysctl_getnum(i, buf, sizeof(buf)) > 0 ;i++)
-  //    puts(buf);
-  // returns -1 if idx is out of range and the length of the sysctl name otherwise.
+  /**
+   * \brief Tell the cradle code to put the name of sysctl number 'idx' into name[].
+   *
+   * The idea is that this can be used to get a list of all available sysctls:
+   * \verbatim
+     char buf[256]
+     for (i=0; sysctl_getnum(i, buf, sizeof(buf)) > 0 ;i++)
+        puts(buf);
+     \endverbatim
+   *
+   * \param idx index
+   * \param name sysctl name
+   * \param len sysctl length
+   * \returns -1 if idx is out of range and the length of the sysctl name otherwise.
+   */
   virtual int sysctl_getnum (size_t idx, char *name, size_t len)
   {
     return -1;
   }
 
+  /**
+   * \brief Show the NSC configuration
+   */
   virtual void show_config ()
   {
     ;
   }
 
-  /* Optional functions used to get and set variables for this stack */
+  /**
+   * \brief Optional function to get variables for this stack
+   * \param var the variable
+   * \param result the result
+   * \param result_len result length
+   * \returns true on success
+   */
   virtual bool get_var (const char *var, char *result, int result_len)
   {
     return false;
   }
 
+  /**
+   * \brief Optional function to set variables for this stack
+   * \param var the variable
+   * \param val the new value
+   * \returns true on success
+   */
   virtual bool set_var (const char *var, const char *val)
   {
     return false;
   }
 
-  /** The level of debugging or diagnostic information to print out. This
-   * normally means kernel messages printed out during initialisation but
-   * may also include extra debugging messages that are part of NSC. */
+  /**
+   * \brief Set the level of debugging or diagnostic information to print out.
+   *
+   * This normally means kernel messages printed out during initialisation but
+   * may also include extra debugging messages that are part of NSC.
+   *
+   * \param level debugging/diagnostic level
+   */
   virtual void set_diagnostic (int level) {}
 
-  /** Simple interface to support sending any textual command to a stack
+  /**
+   * \brief Simple interface to support sending any textual command to a stack
    *
    * @returns 0 on success
    */
@@ -133,62 +248,173 @@
   }
 };
 
+/**
+ * \ingroup nsctcp
+ * \brief Struct interface to NSC Stream (i.e., TCP) Sockets
+ */
 struct INetStreamSocket
 {
   virtual ~INetStreamSocket() {}
 
+  /**
+   * \brief Connect to a remote peer
+   */
   virtual void connect (const char *, int) = 0;
+  /**
+   * \brief Disconnect from a remote peer
+   */
   virtual void disconnect () = 0;
+  /**
+   * \brief Put the socket in Listening state on a port
+   */
   virtual void listen (int) = 0;
+  /**
+   * \brief Accept an incoming connection
+   */
   virtual int accept (INetStreamSocket **) = 0;
+  /**
+   * \brief Send some data
+   * \param data the data
+   * \param datalen data length
+   * \return the number of data sent or -1 on error
+   */
   virtual int send_data (const void *data, int datalen) = 0;
+  /**
+   * \brief Read some data
+   * \param buf the buffer to store the data
+   * \param buflen buffer length
+   * \return the number of data read or -1 on error
+   */
   virtual int read_data (void *buf, int *buflen) = 0;
-  /* We need to pass the option name in as a string here. The reason for
+  /**
+   * \brief Set the socket options
+   *
+   * We need to pass the option name in as a string here. The reason for
    * this is that different operating systems you compile on will have
-   * different numbers defined for the constants SO_SNDBUF and so on. */
+   * different numbers defined for the constants SO_SNDBUF and so on.
+   *
+   * \param optname name of the option
+   * \param val option value
+   * \param valsize size of the option value
+   * \returns
+   */
   virtual int setsockopt (char *optname, void *val, size_t valsize) = 0;
+  /**
+   * \brief Print the socket state
+   */
   virtual void print_state (FILE *) = 0;
+  /**
+   * \brief Check the connection state
+   * \returns true if socket is in connected state
+   */
   virtual bool is_connected () = 0;
+  /**
+   * \brief Check the listening state
+   * \returns true if socket is in listening state
+   */
   virtual bool is_listening () = 0;
-
+  /**
+   * \brief Get the peer name
+   *
+   * \note not implemented
+   *
+   * \param sa sockaddr structure to fill
+   * \param salen sockaddr structure length
+   * \returns -1 on error (always returns -1)
+   */
   virtual int getpeername (struct sockaddr *sa, size_t *salen) {
     return -1;
   }
+  /**
+   * \brief Get the socket local name
+   *
+   * \note not implemented
+   *
+   * \param sa sockaddr structure to fill
+   * \param salen sockaddr structure length
+   * \returns -1 on error (always returns -1)
+   */
   virtual int getsockname (struct sockaddr *sa, size_t *salen) {
     return -1;
   }
-  /* Optional functions used to get and set variables for this TCP
-   * connection. */
+  /**
+   * \brief Optional function used to get variables for this TCP connection.
+   *
+   * \note not implemented
+   *
+   * \param var variable requested
+   * \param result result result
+   * \param result_len result length
+   * \return always false
+   */
   virtual bool get_var (const char *var, char *result, int result_len)
   {
     return false;
   }
-
+  /**
+   * \brief Optional function used to set variables for this TCP connection.
+   *
+   * \note not implemented
+   *
+   * \param var variable to set
+   * \param val value to set
+   * \return always false
+   */
   virtual bool set_var (const char *var, const char *val)
   {
     return false;
   }
 };
 
+/**
+ * \ingroup nsctcp
+ * \brief Struct interface to NSC Datagram (i.e., UDP) Sockets
+ */
 struct INetDatagramSocket
 {
   virtual ~INetDatagramSocket() {}
 
+  /**
+   * \brief Set the destination address and port
+   */
   virtual void set_destination (const char *, int) = 0;
+  /**
+   * \brief Send a datagram
+   * \param data the data
+   * \param datalen data length
+   */
   virtual void send_data (const void *data, int datalen) = 0;
 };
+
+/**
+ * \ingroup nsctcp
+ * \brief Struct interface to NSC send capabilities
+ */
 struct ISendCallback
 {
   virtual ~ISendCallback() {}
 
+  /**
+   * \brief Invoked by NSCs 'ethernet driver' to re-inject a packet into ns-3.
+   */
   virtual void send_callback (const void *data, int datalen) = 0;
 };
 
+/**
+ * \ingroup nsctcp
+ * \brief Struct interface to NSC soft interrupt capabilities
+ */
 struct IInterruptCallback
 {
   virtual ~IInterruptCallback() {}
 
+  /**
+   * \brief Called by the NSC stack whenever something of interest has happened
+   */
   virtual void wakeup () = 0;
+  /**
+   * \brief Get the actual time
+   */
   virtual void gettime (unsigned int *, unsigned int *) = 0;
 };
 
diff -Naur ns-3.18.1/src/internet/model/tcp-header.cc ns-3.19/src/internet/model/tcp-header.cc
--- ns-3.18.1/src/internet/model/tcp-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpHeader);
+NS_OBJECT_ENSURE_REGISTERED (TcpHeader)
+  ;
 
 TcpHeader::TcpHeader ()
   : m_sourcePort (0),
diff -Naur ns-3.18.1/src/internet/model/tcp-header.h ns-3.19/src/internet/model/tcp-header.h
--- ns-3.18.1/src/internet/model/tcp-header.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -122,29 +122,69 @@
   uint16_t GetUrgentPointer () const;
 
   /**
-   * \param source the ip source to use in the underlying
-   *        ip packet.
-   * \param destination the ip destination to use in the
-   *        underlying ip packet.
-   * \param protocol the protocol number to use in the underlying
-   *        ip packet.
+   * \brief Initialize the TCP checksum.
    *
    * If you want to use tcp checksums, you should call this
    * method prior to adding the header to a packet.
+   *
+   * \param source the IP source to use in the underlying
+   *        IP packet.
+   * \param destination the IP destination to use in the
+   *        underlying IP packet.
+   * \param protocol the protocol number to use in the underlying
+   *        IP packet.
+   *
    */
   void InitializeChecksum (Ipv4Address source, 
                            Ipv4Address destination,
                            uint8_t protocol);
+
+  /**
+   * \brief Initialize the TCP checksum.
+   *
+   * If you want to use tcp checksums, you should call this
+   * method prior to adding the header to a packet.
+   *
+   * \param source the IP source to use in the underlying
+   *        IP packet.
+   * \param destination the IP destination to use in the
+   *        underlying IP packet.
+   * \param protocol the protocol number to use in the underlying
+   *        IP packet.
+   *
+   */
   void InitializeChecksum (Ipv6Address source, 
                            Ipv6Address destination,
                            uint8_t protocol);
+
+  /**
+   * \brief Initialize the TCP checksum.
+   *
+   * If you want to use tcp checksums, you should call this
+   * method prior to adding the header to a packet.
+   *
+   * \param source the IP source to use in the underlying
+   *        IP packet.
+   * \param destination the IP destination to use in the
+   *        underlying IP packet.
+   * \param protocol the protocol number to use in the underlying
+   *        IP packet.
+   *
+   */
   void InitializeChecksum (Address source, 
                            Address destination,
                            uint8_t protocol);
 
+  /**
+   * \brief TCP flag field values
+   */
   typedef enum { NONE = 0, FIN = 1, SYN = 2, RST = 4, PSH = 8, ACK = 16, 
                  URG = 32, ECE = 64, CWR = 128} Flags_t;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
   virtual void Print (std::ostream &os) const;
@@ -159,22 +199,27 @@
   bool IsChecksumOk (void) const;
 
 private:
+  /**
+   * \brief Calculate the header checksum
+   * \param size packet size
+   * \returns the checksum
+   */
   uint16_t CalculateHeaderChecksum (uint16_t size) const;
-  uint16_t m_sourcePort;
-  uint16_t m_destinationPort;
-  SequenceNumber32 m_sequenceNumber;
-  SequenceNumber32 m_ackNumber;
-  uint8_t m_length; // really a uint4_t
-  uint8_t m_flags;      // really a uint6_t
-  uint16_t m_windowSize;
-  uint16_t m_urgentPointer;
-
-  Address m_source;
-  Address m_destination;
-  uint8_t m_protocol;
+  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_length;             //!< Length (really a uint4_t)
+  uint8_t m_flags;              //!< Flags (really a uint6_t)
+  uint16_t m_windowSize;        //!< Window size
+  uint16_t m_urgentPointer;     //!< Urgent pointer
+
+  Address m_source;       //!< Source IP address
+  Address m_destination;  //!< Destination IP address
+  uint8_t m_protocol;     //!< Protocol number
 
-  bool m_calcChecksum;
-  bool m_goodChecksum;
+  bool m_calcChecksum;    //!< Flag to calculate checksum
+  bool m_goodChecksum;    //!< Flag to indicate that checksum is correct
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-l4-protocol.cc ns-3.19/src/internet/model/tcp-l4-protocol.cc
--- ns-3.18.1/src/internet/model/tcp-l4-protocol.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-l4-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -51,7 +51,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol);
+NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol)
+  ;
 
 //TcpL4Protocol stuff----------------------------------------------------------
 
@@ -506,7 +507,7 @@
     }
   NS_ASSERT_MSG (endPoints.size () == 1, "Demux returned more than one endpoint");
   NS_LOG_LOGIC ("TcpL4Protocol "<<this<<" forwarding up to endpoint/socket");
-  (*endPoints.begin ())->ForwardUp (packet, ipHeader, tcpHeader.GetSourcePort ());
+  (*endPoints.begin ())->ForwardUp (packet, ipHeader, tcpHeader.GetSourcePort (), interface);
   return IpL4Protocol::RX_OK;
 }
 
diff -Naur ns-3.18.1/src/internet/model/tcp-l4-protocol.h ns-3.19/src/internet/model/tcp-l4-protocol.h
--- ns-3.18.1/src/internet/model/tcp-l4-protocol.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-l4-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -55,43 +55,123 @@
 
 class TcpL4Protocol : public IpL4Protocol {
 public:
-  static TypeId GetTypeId (void);
-  static const uint8_t PROT_NUMBER;
   /**
-   * \brief Constructor
+   * \brief Get the type ID.
+   * \return the object TypeId
    */
+  static TypeId GetTypeId (void);
+  static const uint8_t PROT_NUMBER; //!< protocol number (0x6)
+
   TcpL4Protocol ();
   virtual ~TcpL4Protocol ();
 
+  /**
+   * Set node associated with this stack
+   * \param node the node
+   */
   void SetNode (Ptr<Node> node);
 
   virtual int GetProtocolNumber (void) const;
 
   /**
+   * \brief Create a TCP socket
    * \return A smart Socket pointer to a TcpSocket allocated by this instance
    * of the TCP protocol
    */
   Ptr<Socket> CreateSocket (void);
+  /**
+   * \brief Create a TCP socket
+   * \return A smart Socket pointer to a TcpSocket allocated by this instance
+   * of the TCP protocol
+   *
+   * \warning using a socketTypeId other than TCP is a bad idea.
+   *
+   * \param socketTypeId the socket TypeId
+   */
   Ptr<Socket> CreateSocket (TypeId socketTypeId);
 
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (void);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param address address to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address address);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (uint16_t port);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param address address to use
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address address, uint16_t port);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param localAddress local address to use
+   * \param localPort local port to use
+   * \param peerAddress remote address to use
+   * \param peerPort remote port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address localAddress, uint16_t localPort,
                           Ipv4Address peerAddress, uint16_t peerPort);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (void);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \param address address to use
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (Ipv6Address address);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (uint16_t port);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \param address address to use
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (Ipv6Address address, uint16_t port);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \param localAddress local address to use
+   * \param localPort local port to use
+   * \param peerAddress remote address to use
+   * \param peerPort remote port to use
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (Ipv6Address localAddress, uint16_t localPort,
                            Ipv6Address peerAddress, uint16_t peerPort);
 
+  /**
+   * \brief Remove an IPv4 Endpoint.
+   * \param endPoint the end point to remove
+   */
   void DeAllocate (Ipv4EndPoint *endPoint);
+  /**
+   * \brief Remove an IPv6 Endpoint.
+   * \param endPoint the end point to remove
+   */
   void DeAllocate (Ipv6EndPoint *endPoint);
 
   /**
-   * \brief Send a packet via TCP
+   * \brief Send a packet via TCP (IPv4)
    * \param packet The packet to send
    * \param saddr The source Ipv4Address
    * \param daddr The destination Ipv4Address
@@ -102,33 +182,27 @@
   void Send (Ptr<Packet> packet,
              Ipv4Address saddr, Ipv4Address daddr, 
              uint16_t sport, uint16_t dport, Ptr<NetDevice> oif = 0);
+  /**
+   * \brief Send a packet via TCP (IPv6)
+   * \param packet The packet to send
+   * \param saddr The source Ipv4Address
+   * \param daddr The destination Ipv4Address
+   * \param sport The source port number
+   * \param dport The destination port number
+   * \param oif The output interface bound. Defaults to null (unspecified).
+   */
   void Send (Ptr<Packet> packet,
              Ipv6Address saddr, Ipv6Address daddr, 
              uint16_t sport, uint16_t dport, Ptr<NetDevice> oif = 0);
-  /**
-   * \brief Receive a packet up the protocol stack
-   * \param p The Packet to dump the contents into
-   * \param header IPv4 Header information
-   * \param incomingInterface The Ipv4Interface it was received on
-   */
+
+
   virtual enum IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                                 Ipv4Header const &header,
-                                                 Ptr<Ipv4Interface> incomingInterface);
+                                               Ipv4Header const &header,
+                                               Ptr<Ipv4Interface> incomingInterface);
   virtual enum IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                                 Ipv6Header const &header,
-                                                 Ptr<Ipv6Interface> interface);
+                                               Ipv6Header const &header,
+                                               Ptr<Ipv6Interface> incomingInterface);
 
-  /**
-   * \brief Receive an ICMP packet
-   * \param icmpSource The IP address of the source of the packet.
-   * \param icmpTtl The time to live from the IP header
-   * \param icmpType The type of the message from the ICMP header
-   * \param icmpCode The message code from the ICMP header
-   * \param icmpInfo 32-bit integer carrying informational value of varying semantics.
-   * \param payloadSource The IP source address from the IP header of the packet
-   * \param payloadDestination The IP destination address from the IP header of the packet
-   * \param payload Payload of the ICMP packet
-   */
   virtual void ReceiveIcmp (Ipv4Address icmpSource, uint8_t icmpTtl,
                             uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo,
                             Ipv4Address payloadSource,Ipv4Address payloadDestination,
@@ -153,23 +227,35 @@
    */
   virtual void NotifyNewAggregate ();
 private:
-  Ptr<Node> m_node;
-  Ipv4EndPointDemux *m_endPoints;
-  Ipv6EndPointDemux *m_endPoints6;
-  TypeId m_rttTypeId;
-  TypeId m_socketTypeId;
+  Ptr<Node> m_node; //!< the node this stack is associated with
+  Ipv4EndPointDemux *m_endPoints; //!< A list of IPv4 end points.
+  Ipv6EndPointDemux *m_endPoints6; //!< A list of IPv6 end points.
+  TypeId m_rttTypeId; //!< The RTT Estimator TypeId
+  TypeId m_socketTypeId; //!< The socket TypeId
 private:
   friend class TcpSocketBase;
   void SendPacket (Ptr<Packet>, const TcpHeader &,
                    Ipv4Address, Ipv4Address, Ptr<NetDevice> oif = 0);
   void SendPacket (Ptr<Packet>, const TcpHeader &,
                    Ipv6Address, Ipv6Address, Ptr<NetDevice> oif = 0);
-  TcpL4Protocol (const TcpL4Protocol &o);
-  TcpL4Protocol &operator = (const TcpL4Protocol &o);
 
-  std::vector<Ptr<TcpSocketBase> > m_sockets;
-  IpL4Protocol::DownTargetCallback m_downTarget;
-  IpL4Protocol::DownTargetCallback6 m_downTarget6;
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and not implemented to avoid misuse
+   */
+  TcpL4Protocol (const TcpL4Protocol &);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and not implemented to avoid misuse
+   * \returns
+   */
+  TcpL4Protocol &operator = (const TcpL4Protocol &);
+
+  std::vector<Ptr<TcpSocketBase> > m_sockets;      //!< list of sockets
+  IpL4Protocol::DownTargetCallback m_downTarget;   //!< Callback to send packets over IPv4
+  IpL4Protocol::DownTargetCallback6 m_downTarget6; //!< Callback to send packets over IPv6
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-newreno.cc ns-3.19/src/internet/model/tcp-newreno.cc
--- ns-3.18.1/src/internet/model/tcp-newreno.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-newreno.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpNewReno);
+NS_OBJECT_ENSURE_REGISTERED (TcpNewReno)
+  ;
 
 TypeId
 TcpNewReno::GetTypeId (void)
@@ -80,7 +81,7 @@
 {
 }
 
-/** We initialize m_cWnd from this function, after attributes initialized */
+/* We initialize m_cWnd from this function, after attributes initialized */
 int
 TcpNewReno::Listen (void)
 {
@@ -89,7 +90,7 @@
   return TcpSocketBase::Listen ();
 }
 
-/** We initialize m_cWnd from this function, after attributes initialized */
+/* We initialize m_cWnd from this function, after attributes initialized */
 int
 TcpNewReno::Connect (const Address & address)
 {
@@ -98,7 +99,7 @@
   return TcpSocketBase::Connect (address);
 }
 
-/** Limit the size of in-flight data by cwnd and receiver's rxwin */
+/* Limit the size of in-flight data by cwnd and receiver's rxwin */
 uint32_t
 TcpNewReno::Window (void)
 {
@@ -112,7 +113,7 @@
   return CopyObject<TcpNewReno> (this);
 }
 
-/** New ACK (up to seqnum seq) received. Increase cwnd and call TcpSocketBase::NewAck() */
+/* New ACK (up to seqnum seq) received. Increase cwnd and call TcpSocketBase::NewAck() */
 void
 TcpNewReno::NewAck (const SequenceNumber32& seq)
 {
@@ -157,7 +158,7 @@
   TcpSocketBase::NewAck (seq);
 }
 
-/** Cut cwnd and enter fast recovery mode upon triple dupack */
+/* Cut cwnd and enter fast recovery mode upon triple dupack */
 void
 TcpNewReno::DupAck (const TcpHeader& t, uint32_t count)
 {
@@ -186,7 +187,7 @@
     };
 }
 
-/** Retransmit timeout */
+/* Retransmit timeout */
 void
 TcpNewReno::Retransmit (void)
 {
diff -Naur ns-3.18.1/src/internet/model/tcp-newreno.h ns-3.19/src/internet/model/tcp-newreno.h
--- ns-3.18.1/src/internet/model/tcp-newreno.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-newreno.h	2013-12-20 09:44:50.000000000 -0800
@@ -36,11 +36,19 @@
 class TcpNewReno : public TcpSocketBase
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   /**
    * Create an unbound tcp socket.
    */
   TcpNewReno (void);
+  /**
+   * \brief Copy constructor
+   * \param sock the object to copy
+   */
   TcpNewReno (const TcpNewReno& sock);
   virtual ~TcpNewReno (void);
 
@@ -62,16 +70,19 @@
   virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
 private:
-  void InitializeCwnd (void);            // set m_cWnd when connection starts
+  /**
+   * \brief Set the congestion window when connection starts
+   */
+  void InitializeCwnd (void);
 
 protected:
-  TracedValue<uint32_t>  m_cWnd;         //< Congestion window
-  uint32_t               m_ssThresh;     //< Slow Start Threshold
-  uint32_t               m_initialCWnd;  //< Initial cWnd value
-  SequenceNumber32       m_recover;      //< Previous highest Tx seqnum for fast recovery
-  uint32_t               m_retxThresh;   //< Fast Retransmit threshold
-  bool                   m_inFastRec;    //< currently in fast recovery
-  bool                   m_limitedTx;    //< perform limited transmit
+  TracedValue<uint32_t>  m_cWnd;         //!< Congestion window
+  uint32_t               m_ssThresh;     //!< Slow Start Threshold
+  uint32_t               m_initialCWnd;  //!< Initial cWnd value
+  SequenceNumber32       m_recover;      //!< Previous highest Tx seqnum for fast recovery
+  uint32_t               m_retxThresh;   //!< Fast Retransmit threshold
+  bool                   m_inFastRec;    //!< currently in fast recovery
+  bool                   m_limitedTx;    //!< perform limited transmit
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-reno.cc ns-3.19/src/internet/model/tcp-reno.cc
--- ns-3.18.1/src/internet/model/tcp-reno.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-reno.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpReno);
+NS_OBJECT_ENSURE_REGISTERED (TcpReno)
+  ;
 
 TypeId
 TcpReno::GetTypeId (void)
@@ -72,7 +73,7 @@
 {
 }
 
-/** We initialize m_cWnd from this function, after attributes initialized */
+/* We initialize m_cWnd from this function, after attributes initialized */
 int
 TcpReno::Listen (void)
 {
@@ -81,7 +82,7 @@
   return TcpSocketBase::Listen ();
 }
 
-/** We initialize m_cWnd from this function, after attributes initialized */
+/* We initialize m_cWnd from this function, after attributes initialized */
 int
 TcpReno::Connect (const Address & address)
 {
@@ -90,7 +91,7 @@
   return TcpSocketBase::Connect (address);
 }
 
-/** Limit the size of in-flight data by cwnd and receiver's rxwin */
+/* Limit the size of in-flight data by cwnd and receiver's rxwin */
 uint32_t
 TcpReno::Window (void)
 {
@@ -104,7 +105,7 @@
   return CopyObject<TcpReno> (this);
 }
 
-/** New ACK (up to seqnum seq) received. Increase cwnd and call TcpSocketBase::NewAck() */
+/* New ACK (up to seqnum seq) received. Increase cwnd and call TcpSocketBase::NewAck() */
 void
 TcpReno::NewAck (const SequenceNumber32& seq)
 {
diff -Naur ns-3.18.1/src/internet/model/tcp-reno.h ns-3.19/src/internet/model/tcp-reno.h
--- ns-3.18.1/src/internet/model/tcp-reno.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-reno.h	2013-12-20 09:44:50.000000000 -0800
@@ -38,11 +38,19 @@
 class TcpReno : public TcpSocketBase
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   /**
    * Create an unbound tcp socket.
    */
   TcpReno (void);
+  /**
+   * \brief Copy constructor
+   * \param sock the object to copy
+   */
   TcpReno (const TcpReno& sock);
   virtual ~TcpReno (void);
 
@@ -64,14 +72,17 @@
   virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
 private:
-  void InitializeCwnd (void);            // set m_cWnd when connection starts
+  /**
+   * \brief Set the congestion window when connection starts
+   */
+  void InitializeCwnd (void);
 
 protected:
-  TracedValue<uint32_t>  m_cWnd;         //< Congestion window
-  uint32_t               m_ssThresh;     //< Slow Start Threshold
-  uint32_t               m_initialCWnd;  //< Initial cWnd value
-  uint32_t               m_retxThresh;   //< Fast Retransmit threshold
-  bool                   m_inFastRec;    //< currently in fast recovery
+  TracedValue<uint32_t>  m_cWnd;         //!< Congestion window
+  uint32_t               m_ssThresh;     //!< Slow Start Threshold
+  uint32_t               m_initialCWnd;  //!< Initial cWnd value
+  uint32_t               m_retxThresh;   //!< Fast Retransmit threshold
+  bool                   m_inFastRec;    //!< currently in fast recovery
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-rfc793.cc ns-3.19/src/internet/model/tcp-rfc793.cc
--- ns-3.18.1/src/internet/model/tcp-rfc793.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-rfc793.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpRfc793);
+NS_OBJECT_ENSURE_REGISTERED (TcpRfc793)
+  ;
 
 TypeId
 TcpRfc793::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/tcp-rfc793.h ns-3.19/src/internet/model/tcp-rfc793.h
--- ns-3.18.1/src/internet/model/tcp-rfc793.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-rfc793.h	2013-12-20 09:44:50.000000000 -0800
@@ -39,11 +39,19 @@
 class TcpRfc793 : public TcpSocketBase
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   /**
    * Create an unbound tcp socket.
    */
   TcpRfc793 (void);
+  /**
+   * \brief Copy constructor
+   * \param sock the object to copy
+   */
   TcpRfc793 (const TcpRfc793& sock);
   virtual ~TcpRfc793 (void);
 
diff -Naur ns-3.18.1/src/internet/model/tcp-rx-buffer.h ns-3.19/src/internet/model/tcp-rx-buffer.h
--- ns-3.18.1/src/internet/model/tcp-rx-buffer.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-rx-buffer.h	2013-12-20 09:44:50.000000000 -0800
@@ -40,20 +40,67 @@
 class TcpRxBuffer : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
+  /**
+   * \brief Constructor
+   * \param n initial Sequence number to be received
+   */
   TcpRxBuffer (uint32_t n = 0);
   virtual ~TcpRxBuffer ();
 
   // Accessors
+  /**
+   * \brief Get Next Rx Sequence number
+   * \returns Next Rx Sequence number
+   */
   SequenceNumber32 NextRxSequence (void) const;
+  /**
+   * \brief Get the lowest sequence number that this TcpRxBuffer cannot accept
+   * \returns the lowest sequence number that this TcpRxBuffer cannot accept
+   */
   SequenceNumber32 MaxRxSequence (void) const;
+  /**
+   * \brief Increment the Next Sequence number
+   */
   void IncNextRxSequence (void);
+  /**
+   * \brief Set the Next Sequence number
+   * \param s the Sequence number
+   */
   void SetNextRxSequence (const SequenceNumber32& s);
+  /**
+   * \brief Set the FIN Sequence number (i.e., the one closing the connection)
+   * \param s the Sequence number
+   */
   void SetFinSequence (const SequenceNumber32& s);
+  /**
+   * \brief Get the Maximum buffer size
+   * \returns the Maximum buffer size
+   */
   uint32_t MaxBufferSize (void) const;
+  /**
+   * \brief Set the Maximum buffer size
+   * \param s the Maximum buffer size
+   */
   void SetMaxBufferSize (uint32_t s);
+  /**
+   * \brief Get the actual buffer occupancy
+   * \returns buffer occupancy (in bytes)
+   */
   uint32_t Size (void) const;
+  /**
+   * \brief Get the actual number of bytes available to be read
+   * \returns size of available data (in bytes)
+   */
   uint32_t Available () const;
+  /**
+   * \brief Check if the buffer did receive all the data (and the connection is closed)
+   * \returns true if all data have been received
+   */
   bool Finished (void);
 
   /**
@@ -63,6 +110,8 @@
    * removing data from the buffer that overlaps the tail of the inputted
    * packet
    *
+   * \param p packet
+   * \param tcph packet's TCP header
    * \return True when success, false otherwise.
    */
   bool Add (Ptr<Packet> p, TcpHeader const& tcph);
@@ -70,18 +119,21 @@
   /**
    * Extract data from the head of the buffer as indicated by nextRxSeq.
    * The extracted data is going to be forwarded to the application.
+   *
+   * \param maxSize maximum number of bytes to extract
+   * \returns a packet
    */
   Ptr<Packet> Extract (uint32_t maxSize);
 public:
+  /// container for data stored in the buffer
   typedef std::map<SequenceNumber32, Ptr<Packet> >::iterator BufIterator;
-  TracedValue<SequenceNumber32> m_nextRxSeq; //< Seqnum of the first missing byte in data (RCV.NXT)
-  SequenceNumber32 m_finSeq;                 //< Seqnum of the FIN packet
-  bool m_gotFin;                             //< Did I received FIN packet?
-  uint32_t m_size;                           //< Number of total data bytes in the buffer, not necessarily contiguous
-  uint32_t m_maxBuffer;                      //< Upper bound of the number of data bytes in buffer (RCV.WND)
-  uint32_t m_availBytes;                     //< Number of bytes available to read, i.e. contiguous block at head
-  std::map<SequenceNumber32, Ptr<Packet> > m_data;
-  //< Corresponding data (may be null)
+  TracedValue<SequenceNumber32> m_nextRxSeq; //!< Seqnum of the first missing byte in data (RCV.NXT)
+  SequenceNumber32 m_finSeq;                 //!< Seqnum of the FIN packet
+  bool m_gotFin;                             //!< Did I received FIN packet?
+  uint32_t m_size;                           //!< Number of total data bytes in the buffer, not necessarily contiguous
+  uint32_t m_maxBuffer;                      //!< Upper bound of the number of data bytes in buffer (RCV.WND)
+  uint32_t m_availBytes;                     //!< Number of bytes available to read, i.e. contiguous block at head
+  std::map<SequenceNumber32, Ptr<Packet> > m_data; //!< Corresponding data (may be null)
 };
 
 } //namepsace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-socket-base.cc ns-3.19/src/internet/model/tcp-socket-base.cc
--- ns-3.18.1/src/internet/model/tcp-socket-base.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-socket-base.cc	2013-12-20 09:44:50.000000000 -0800
@@ -54,7 +54,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpSocketBase);
+NS_OBJECT_ENSURE_REGISTERED (TcpSocketBase)
+  ;
 
 TypeId
 TcpSocketBase::GetTypeId (void)
@@ -210,42 +211,42 @@
   CancelAllTimers ();
 }
 
-/** Associate a node with this TCP socket */
+/* Associate a node with this TCP socket */
 void
 TcpSocketBase::SetNode (Ptr<Node> node)
 {
   m_node = node;
 }
 
-/** Associate the L4 protocol (e.g. mux/demux) with this socket */
+/* Associate the L4 protocol (e.g. mux/demux) with this socket */
 void
 TcpSocketBase::SetTcp (Ptr<TcpL4Protocol> tcp)
 {
   m_tcp = tcp;
 }
 
-/** Set an RTT estimator with this socket */
+/* Set an RTT estimator with this socket */
 void
 TcpSocketBase::SetRtt (Ptr<RttEstimator> rtt)
 {
   m_rtt = rtt;
 }
 
-/** Inherit from Socket class: Returns error code */
+/* Inherit from Socket class: Returns error code */
 enum Socket::SocketErrno
 TcpSocketBase::GetErrno (void) const
 {
   return m_errno;
 }
 
-/** Inherit from Socket class: Returns socket type, NS3_SOCK_STREAM */
+/* Inherit from Socket class: Returns socket type, NS3_SOCK_STREAM */
 enum Socket::SocketType
 TcpSocketBase::GetSocketType (void) const
 {
   return NS3_SOCK_STREAM;
 }
 
-/** Inherit from Socket class: Returns associated node */
+/* Inherit from Socket class: Returns associated node */
 Ptr<Node>
 TcpSocketBase::GetNode (void) const
 {
@@ -253,7 +254,7 @@
   return m_node;
 }
 
-/** Inherit from Socket class: Bind socket to an end-point in TcpL4Protocol */
+/* Inherit from Socket class: Bind socket to an end-point in TcpL4Protocol */
 int
 TcpSocketBase::Bind (void)
 {
@@ -282,7 +283,7 @@
   return SetupCallback ();
 }
 
-/** Inherit from Socket class: Bind socket (with specific address) to an end-point in TcpL4Protocol */
+/* Inherit from Socket class: Bind socket (with specific address) to an end-point in TcpL4Protocol */
 int
 TcpSocketBase::Bind (const Address &address)
 {
@@ -352,7 +353,7 @@
   return SetupCallback ();
 }
 
-/** Inherit from Socket class: Initiate connection to a remote address:port */
+/* Inherit from Socket class: Initiate connection to a remote address:port */
 int
 TcpSocketBase::Connect (const Address & address)
 {
@@ -424,7 +425,7 @@
   return DoConnect ();
 }
 
-/** Inherit from Socket class: Listen on the endpoint for an incoming connection */
+/* Inherit from Socket class: Listen on the endpoint for an incoming connection */
 int
 TcpSocketBase::Listen (void)
 {
@@ -441,7 +442,7 @@
   return 0;
 }
 
-/** Inherit from Socket class: Kill this socket and signal the peer (if any) */
+/* Inherit from Socket class: Kill this socket and signal the peer (if any) */
 int
 TcpSocketBase::Close (void)
 {
@@ -468,7 +469,7 @@
   return DoClose ();
 }
 
-/** Inherit from Socket class: Signal a termination of send */
+/* Inherit from Socket class: Signal a termination of send */
 int
 TcpSocketBase::ShutdownSend (void)
 {
@@ -502,7 +503,7 @@
   return 0;
 }
 
-/** Inherit from Socket class: Signal a termination of receive */
+/* Inherit from Socket class: Signal a termination of receive */
 int
 TcpSocketBase::ShutdownRecv (void)
 {
@@ -511,7 +512,7 @@
   return 0;
 }
 
-/** Inherit from Socket class: Send a packet. Parameter flags is not used.
+/* Inherit from Socket class: Send a packet. Parameter flags is not used.
     Packet has no TCP header. Invoked by upper-layer application */
 int
 TcpSocketBase::Send (Ptr<Packet> p, uint32_t flags)
@@ -546,15 +547,15 @@
     }
 }
 
-/** Inherit from Socket class: In TcpSocketBase, it is same as Send() call */
+/* Inherit from Socket class: In TcpSocketBase, it is same as Send() call */
 int
 TcpSocketBase::SendTo (Ptr<Packet> p, uint32_t flags, const Address &address)
 {
   return Send (p, flags); // SendTo() and Send() are the same
 }
 
-/** Inherit from Socket class: Return data to upper-layer application. Parameter flags
-    is not used. Data is returned as a packet of size no larger than maxSize */
+/* Inherit from Socket class: Return data to upper-layer application. Parameter flags
+   is not used. Data is returned as a packet of size no larger than maxSize */
 Ptr<Packet>
 TcpSocketBase::Recv (uint32_t maxSize, uint32_t flags)
 {
@@ -581,7 +582,7 @@
   return outPacket;
 }
 
-/** Inherit from Socket class: Recv and return the remote's address */
+/* Inherit from Socket class: Recv and return the remote's address */
 Ptr<Packet>
 TcpSocketBase::RecvFrom (uint32_t maxSize, uint32_t flags, Address &fromAddress)
 {
@@ -606,7 +607,7 @@
   return packet;
 }
 
-/** Inherit from Socket class: Get the max number of bytes an app can send */
+/* Inherit from Socket class: Get the max number of bytes an app can send */
 uint32_t
 TcpSocketBase::GetTxAvailable (void) const
 {
@@ -614,7 +615,7 @@
   return m_txBuffer.Available ();
 }
 
-/** Inherit from Socket class: Get the max number of bytes an app can read */
+/* Inherit from Socket class: Get the max number of bytes an app can read */
 uint32_t
 TcpSocketBase::GetRxAvailable (void) const
 {
@@ -622,7 +623,7 @@
   return m_rxBuffer.Available ();
 }
 
-/** Inherit from Socket class: Return local address:port */
+/* Inherit from Socket class: Return local address:port */
 int
 TcpSocketBase::GetSockName (Address &address) const
 {
@@ -644,7 +645,7 @@
   return 0;
 }
 
-/** Inherit from Socket class: Bind this socket to the specified NetDevice */
+/* Inherit from Socket class: Bind this socket to the specified NetDevice */
 void
 TcpSocketBase::BindToNetDevice (Ptr<NetDevice> netdevice)
 {
@@ -668,7 +669,7 @@
   return;
 }
 
-/** Clean up after Bind. Set up callback functions in the end-point. */
+/* Clean up after Bind. Set up callback functions in the end-point. */
 int
 TcpSocketBase::SetupCallback (void)
 {
@@ -694,7 +695,7 @@
   return 0;
 }
 
-/** Perform the real connection tasks: Send SYN if allowed, RST if invalid */
+/* Perform the real connection tasks: Send SYN if allowed, RST if invalid */
 int
 TcpSocketBase::DoConnect (void)
 {
@@ -716,7 +717,7 @@
   return 0;
 }
 
-/** Do the action to close the socket. Usually send a packet with appropriate
+/* Do the action to close the socket. Usually send a packet with appropriate
     flags depended on the current m_state. */
 int
 TcpSocketBase::DoClose (void)
@@ -759,7 +760,7 @@
   return 0;
 }
 
-/** Peacefully close the socket by notifying the upper layer and deallocate end point */
+/* Peacefully close the socket by notifying the upper layer and deallocate end point */
 void
 TcpSocketBase::CloseAndNotify (void)
 {
@@ -780,7 +781,7 @@
 }
 
 
-/** Tell if a sequence number range is out side the range that my rx buffer can
+/* Tell if a sequence number range is out side the range that my rx buffer can
     accpet */
 bool
 TcpSocketBase::OutOfRange (SequenceNumber32 head, SequenceNumber32 tail) const
@@ -799,7 +800,7 @@
   return (tail < m_rxBuffer.NextRxSequence () || m_rxBuffer.MaxRxSequence () <= head);
 }
 
-/** Function called by the L3 protocol when it received a packet to pass on to
+/* Function called by the L3 protocol when it received a packet to pass on to
     the TCP. This function is registered as the "RxCallback" function in
     SetupCallback(), which invoked by Bind(), and CompleteFork() */
 void
@@ -810,7 +811,7 @@
 }
 
 void
-TcpSocketBase::ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port)
+TcpSocketBase::ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface)
 {
   DoForwardUp (packet, header, port);
 }
@@ -841,7 +842,7 @@
     }
 }
 
-/** The real function to handle the incoming packet from lower layers. This is
+/* The real function to handle the incoming packet from lower layers. This is
     wrapped by ForwardUp() so that this function can be overloaded by daughter
     classes. */
 void
@@ -1035,7 +1036,7 @@
     }
 }
 
-/** Received a packet upon ESTABLISHED state. This function is mimicking the
+/* Received a packet upon ESTABLISHED state. This function is mimicking the
     role of tcp_rcv_established() in tcp_input.c in Linux kernel. */
 void
 TcpSocketBase::ProcessEstablished (Ptr<Packet> packet, const TcpHeader& tcpHeader)
@@ -1081,7 +1082,7 @@
     }
 }
 
-/** Process the newly received ACK */
+/* Process the newly received ACK */
 void
 TcpSocketBase::ReceivedAck (Ptr<Packet> packet, const TcpHeader& tcpHeader)
 {
@@ -1118,7 +1119,7 @@
     }
 }
 
-/** Received a packet upon LISTEN state. */
+/* Received a packet upon LISTEN state. */
 void
 TcpSocketBase::ProcessListen (Ptr<Packet> packet, const TcpHeader& tcpHeader,
                               const Address& fromAddress, const Address& toAddress)
@@ -1148,7 +1149,7 @@
                           packet, tcpHeader, fromAddress, toAddress);
 }
 
-/** Received a packet upon SYN_SENT */
+/* Received a packet upon SYN_SENT */
 void
 TcpSocketBase::ProcessSynSent (Ptr<Packet> packet, const TcpHeader& tcpHeader)
 {
@@ -1206,7 +1207,7 @@
     }
 }
 
-/** Received a packet upon SYN_RCVD */
+/* Received a packet upon SYN_RCVD */
 void
 TcpSocketBase::ProcessSynRcvd (Ptr<Packet> packet, const TcpHeader& tcpHeader,
                                const Address& fromAddress, const Address& toAddress)
@@ -1296,7 +1297,7 @@
     }
 }
 
-/** Received a packet upon CLOSE_WAIT, FIN_WAIT_1, or FIN_WAIT_2 states */
+/* Received a packet upon CLOSE_WAIT, FIN_WAIT_1, or FIN_WAIT_2 states */
 void
 TcpSocketBase::ProcessWait (Ptr<Packet> packet, const TcpHeader& tcpHeader)
 {
@@ -1367,7 +1368,7 @@
     }
 }
 
-/** Received a packet upon CLOSING */
+/* Received a packet upon CLOSING */
 void
 TcpSocketBase::ProcessClosing (Ptr<Packet> packet, const TcpHeader& tcpHeader)
 {
@@ -1399,7 +1400,7 @@
     }
 }
 
-/** Received a packet upon LAST_ACK */
+/* Received a packet upon LAST_ACK */
 void
 TcpSocketBase::ProcessLastAck (Ptr<Packet> packet, const TcpHeader& tcpHeader)
 {
@@ -1435,7 +1436,7 @@
     }
 }
 
-/** Peer sent me a FIN. Remember its sequence in rx buffer. */
+/* Peer sent me a FIN. Remember its sequence in rx buffer. */
 void
 TcpSocketBase::PeerClose (Ptr<Packet> p, const TcpHeader& tcpHeader)
 {
@@ -1472,7 +1473,7 @@
   DoPeerClose (); // Change state, respond with ACK
 }
 
-/** Received a in-sequence FIN. Close down this socket. */
+/* Received a in-sequence FIN. Close down this socket. */
 void
 TcpSocketBase::DoPeerClose (void)
 {
@@ -1510,7 +1511,7 @@
     }
 }
 
-/** Kill this socket. This is a callback function configured to m_endpoint in
+/* Kill this socket. This is a callback function configured to m_endpoint in
    SetupCallback(), invoked when the endpoint is destroyed. */
 void
 TcpSocketBase::Destroy (void)
@@ -1531,7 +1532,7 @@
   CancelAllTimers ();
 }
 
-/** Kill this socket. This is a callback function configured to m_endpoint in
+/* Kill this socket. This is a callback function configured to m_endpoint in
    SetupCallback(), invoked when the endpoint is destroyed. */
 void
 TcpSocketBase::Destroy6 (void)
@@ -1552,7 +1553,7 @@
   CancelAllTimers ();
 }
 
-/** Send an empty packet with specified TCP flags */
+/* Send an empty packet with specified TCP flags */
 void
 TcpSocketBase::SendEmptyPacket (uint8_t flags)
 {
@@ -1667,7 +1668,7 @@
     }
 }
 
-/** This function closes the endpoint completely. Called upon RST_TX action. */
+/* This function closes the endpoint completely. Called upon RST_TX action. */
 void
 TcpSocketBase::SendRST (void)
 {
@@ -1677,7 +1678,7 @@
   DeallocateEndPoint ();
 }
 
-/** Deallocate the end point and cancel all the timers */
+/* Deallocate the end point and cancel all the timers */
 void
 TcpSocketBase::DeallocateEndPoint (void)
 {
@@ -1709,7 +1710,7 @@
     }
 }
 
-/** Configure the endpoint to a local address. Called by Connect() if Bind() didn't specify one. */
+/* Configure the endpoint to a local address. Called by Connect() if Bind() didn't specify one. */
 int
 TcpSocketBase::SetupEndpoint ()
 {
@@ -1770,7 +1771,7 @@
   return 0;
 }
 
-/** This function is called only if a SYN received in LISTEN state. After
+/* This function is called only if a SYN received in LISTEN state. After
    TcpSocketBase cloned, allocate a new end point to handle the incoming
    connection and send a SYN+ACK to complete the handshake. */
 void
@@ -1820,7 +1821,7 @@
     }
 }
 
-/** Extract at most maxSize bytes from the TxBuffer at sequence seq, add the
+/* Extract at most maxSize bytes from the TxBuffer at sequence seq, add the
     TCP header, and send to TcpL4Protocol */
 uint32_t
 TcpSocketBase::SendDataPacket (SequenceNumber32 seq, uint32_t maxSize, bool withAck)
@@ -1926,7 +1927,7 @@
   return sz;
 }
 
-/** Send as much pending data as possible according to the Tx window. Note that
+/* Send as much pending data as possible according to the Tx window. Note that
  *  this function did not implement the PSH flag
  */
 bool
@@ -2071,7 +2072,7 @@
     }
 }
 
-/** Called by ForwardUp() to estimate RTT */
+/* Called by ForwardUp() to estimate RTT */
 void
 TcpSocketBase::EstimateRtt (const TcpHeader& tcpHeader)
 {
@@ -2281,7 +2282,7 @@
   m_timewaitEvent.Cancel ();
 }
 
-/** Move TCP to Time_Wait state and schedule a transition to Closed state */
+/* Move TCP to Time_Wait state and schedule a transition to Closed state */
 void
 TcpSocketBase::TimeWait ()
 {
@@ -2294,7 +2295,7 @@
                                          &TcpSocketBase::CloseAndNotify, this);
 }
 
-/** Below are the attribute get/set functions */
+/* Below are the attribute get/set functions */
 
 void
 TcpSocketBase::SetSndBufSize (uint32_t size)
@@ -2418,13 +2419,13 @@
   return false;
 }
 
-/** Placeholder function for future extension that reads more from the TCP header */
+/* Placeholder function for future extension that reads more from the TCP header */
 void
 TcpSocketBase::ReadOptions (const TcpHeader&)
 {
 }
 
-/** Placeholder function for future extension that changes the TCP header */
+/* Placeholder function for future extension that changes the TCP header */
 void
 TcpSocketBase::AddOptions (TcpHeader&)
 {
diff -Naur ns-3.18.1/src/internet/model/tcp-socket-base.h ns-3.19/src/internet/model/tcp-socket-base.h
--- ns-3.18.1/src/internet/model/tcp-socket-base.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-socket-base.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,6 +31,7 @@
 #include "ns3/ipv4-header.h"
 #include "ns3/ipv4-interface.h"
 #include "ns3/ipv6-header.h"
+#include "ns3/ipv6-interface.h"
 #include "ns3/event-id.h"
 #include "tcp-tx-buffer.h"
 #include "tcp-rx-buffer.h"
@@ -61,6 +62,11 @@
 class TcpSocketBase : public TcpSocket
 {
 public:
+  /**
+   * Get the type ID.
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   /**
    * Create an unbound TCP socket
@@ -69,13 +75,30 @@
 
   /**
    * Clone a TCP socket, for use upon receiving a connection request in LISTEN state
+   *
+   * \param sock the original Tcp Socket
    */
   TcpSocketBase (const TcpSocketBase& sock);
   virtual ~TcpSocketBase (void);
 
   // Set associated Node, TcpL4Protocol, RttEstimator to this socket
+
+  /**
+   * \brief Set the associated node.
+   * \param node the node
+   */
   virtual void SetNode (Ptr<Node> node);
+
+  /**
+   * \brief Set the associated TCP L4 protocol.
+   * \param tcp the TCP L4 protocol
+   */
   virtual void SetTcp (Ptr<TcpL4Protocol> tcp);
+
+  /**
+   * \brief Set the associated RTT estimator.
+   * \param rtt the RTT estimator
+   */
   virtual void SetRtt (Ptr<RttEstimator> rtt);
 
   // Necessary implementations of null functions from ns3::Socket
@@ -101,6 +124,8 @@
 
 protected:
   // Implementing ns3::TcpSocket -- Attribute get/set
+  // inherited, no need to doc
+
   virtual void     SetSndBufSize (uint32_t size);
   virtual uint32_t GetSndBufSize (void) const;
   virtual void     SetRcvBufSize (uint32_t size);
@@ -126,120 +151,455 @@
   virtual bool     SetAllowBroadcast (bool allowBroadcast);
   virtual bool     GetAllowBroadcast (void) const;
 
+
+
   // Helper functions: Connection set up
-  int SetupCallback (void);        // Common part of the two Bind(), i.e. set callback and remembering local addr:port
-  int DoConnect (void);            // Sending a SYN packet to make a connection if the state allows
-  void ConnectionSucceeded (void); // Schedule-friendly wrapper for Socket::NotifyConnectionSucceeded()
-  int SetupEndpoint (void);        // Configure m_endpoint for local addr for given remote addr
-  int SetupEndpoint6 (void);       // Configure m_endpoint6 for local addr for given remote addr
-  void CompleteFork (Ptr<Packet>, const TcpHeader&, const Address& fromAddress, const Address& toAdress);
+
+  /**
+   * \brief Common part of the two Bind(), i.e. set callback and remembering local addr:port
+   *
+   * \returns 0 on success, -1 on failure
+   */
+  int SetupCallback (void);
+
+  /**
+   * \brief Perform the real connection tasks: Send SYN if allowed, RST if invalid
+   *
+   * \returns 0 on success
+   */
+  int DoConnect (void);
+
+  /**
+   * \brief Schedule-friendly wrapper for Socket::NotifyConnectionSucceeded()
+   */
+  void ConnectionSucceeded (void);
+
+  /**
+   * \brief Configure the endpoint to a local address. Called by Connect() if Bind() didn't specify one.
+   *
+   * \returns 0 on success
+   */
+  int SetupEndpoint (void);
+
+  /**
+   * \brief Configure the endpoint v6 to a local address. Called by Connect() if Bind() didn't specify one.
+   *
+   * \returns 0 on success
+   */
+  int SetupEndpoint6 (void);
+
+  /**
+   * \brief Complete a connection by forking the socket
+   *
+   * This function is called only if a SYN received in LISTEN state. After
+   * TcpSocketBase cloned, allocate a new end point to handle the incoming
+   * connection and send a SYN+ACK to complete the handshake.
+   *
+   * \param p the packet triggering the fork
+   * \param tcpHeader the TCP header of the triggering packet
+   * \param fromAddress the address of the remote host
+   * \param toAddress the address the connection is directed to
+   */
+  void CompleteFork (Ptr<Packet> p, const TcpHeader& tcpHeader, const Address& fromAddress, const Address& toAddress);
+
+
 
   // Helper functions: Transfer operation
+
+  /**
+   * \brief Called by the L3 protocol when it received a packet to pass on to TCP.
+   *
+   * \param packet the incoming packet
+   * \param header the packet's IPv4 header
+   * \param port the incoming port
+   * \param incomingInterface the incoming interface
+   */
   void ForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port, Ptr<Ipv4Interface> incomingInterface);
-  void ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port);
+
+  /**
+   * \brief Called by the L3 protocol when it received a packet to pass on to TCP.
+   *
+   * \param packet the incoming packet
+   * \param header the packet's IPv6 header
+   * \param port the incoming port
+   * \param incomingInterface the incoming interface
+   */
+  void ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface);
+
+  /**
+   * \brief Called by TcpSocketBase::ForwardUp().
+   *
+   * \param packet the incoming packet
+   * \param header the packet's IPv4 header
+   * \param port the incoming port
+   * \param incomingInterface the incoming interface
+   */
   virtual void DoForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port, Ptr<Ipv4Interface> incomingInterface); //Get a pkt from L3
-  virtual void DoForwardUp (Ptr<Packet> packet, Ipv6Header header, uint16_t port); // Ipv6 version
+
+  /**
+   * \brief Called by TcpSocketBase::ForwardUp6().
+   *
+   * \param packet the incoming packet
+   * \param header the packet's IPv6 header
+   * \param port the incoming port
+   */
+  virtual void DoForwardUp (Ptr<Packet> packet, Ipv6Header header, uint16_t port);
+
+  /**
+   * \brief Called by the L3 protocol when it received an ICMP packet to pass on to TCP.
+   *
+   * \param icmpSource the ICMP source address
+   * \param icmpTtl the ICMP Time to Live
+   * \param icmpType the ICMP Type
+   * \param icmpCode the ICMP Code
+   * \param icmpInfo the ICMP Info
+   */
   void ForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo);
-  void ForwardIcmp6 (Ipv6Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo);  
-  bool SendPendingData (bool withAck = false); // Send as much as the window allows
-  uint32_t SendDataPacket (SequenceNumber32 seq, uint32_t maxSize, bool withAck); // Send a data packet
-  void SendEmptyPacket (uint8_t flags); // Send a empty packet that carries a flag, e.g. ACK
-  void SendRST (void); // Send reset and tear down this socket
-  bool OutOfRange (SequenceNumber32 head, SequenceNumber32 tail) const; // Check if a sequence number range is within the rx window
+
+  /**
+   * \brief Called by the L3 protocol when it received an ICMPv6 packet to pass on to TCP.
+   *
+   * \param icmpSource the ICMP source address
+   * \param icmpTtl the ICMP Time to Live
+   * \param icmpType the ICMP Type
+   * \param icmpCode the ICMP Code
+   * \param icmpInfo the ICMP Info
+   */
+  void ForwardIcmp6 (Ipv6Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo);
+
+  /**
+   * \brief Send as much pending data as possible according to the Tx window.
+   *
+   * Note that this function did not implement the PSH flag.
+   *
+   * \param withAck forces an ACK to be sent
+   * \returns true if some data have been sent
+   */
+  bool SendPendingData (bool withAck = false);
+
+  /**
+   * \brief Extract at most maxSize bytes from the TxBuffer at sequence seq, add the
+   *        TCP header, and send to TcpL4Protocol
+   *
+   * \param seq the sequence number
+   * \param maxSize the maximum data block to be transmitted (in bytes)
+   * \param withAck forces an ACK to be sent
+   * \returns the number of bytes sent
+   */
+  uint32_t SendDataPacket (SequenceNumber32 seq, uint32_t maxSize, bool withAck);
+
+  /**
+   * \brief Send a empty packet that carries a flag, e.g. ACK
+   *
+   * \param flags the packet's flags
+   */
+  void SendEmptyPacket (uint8_t flags);
+
+  /**
+   * \brief Send reset and tear down this socket
+   */
+  void SendRST (void);
+
+  /**
+   * \brief Check if a sequence number range is within the rx window
+   *
+   * \param head start of the Sequence window
+   * \param tail end of the Sequence window
+   * \returns true if it is in range
+   */
+  bool OutOfRange (SequenceNumber32 head, SequenceNumber32 tail) const;
+
 
   // Helper functions: Connection close
-  int DoClose (void); // Close a socket by sending RST, FIN, or FIN+ACK, depend on the current state
-  void CloseAndNotify (void); // To CLOSED state, notify upper layer, and deallocate end point
-  void Destroy (void); // Kill this socket by zeroing its attributes
-  void Destroy6 (void); // Kill this socket by zeroing its attributes
-  void DeallocateEndPoint (void); // Deallocate m_endPoint
-  void PeerClose (Ptr<Packet>, const TcpHeader&); // Received a FIN from peer, notify rx buffer
-  void DoPeerClose (void); // FIN is in sequence, notify app and respond with a FIN
-  void CancelAllTimers (void); // Cancel all timer when endpoint is deleted
-  void TimeWait (void);  // Move from CLOSING or FIN_WAIT_2 to TIME_WAIT state
+
+  /**
+   * \brief Close a socket by sending RST, FIN, or FIN+ACK, depend on the current state
+   *
+   * \returns 0 on success
+   */
+  int DoClose (void);
+
+  /**
+   * \brief Peacefully close the socket by notifying the upper layer and deallocate end point
+   */
+  void CloseAndNotify (void);
+
+  /**
+   * \brief Kill this socket by zeroing its attributes (IPv4)
+   *
+   * This is a callback function configured to m_endpoint in
+   * SetupCallback(), invoked when the endpoint is destroyed.
+   */
+  void Destroy (void);
+
+  /**
+   * \brief Kill this socket by zeroing its attributes (IPv6)
+   *
+   * This is a callback function configured to m_endpoint in
+   * SetupCallback(), invoked when the endpoint is destroyed.
+   */
+  void Destroy6 (void);
+
+  /**
+   * \brief Deallocate m_endPoint
+   */
+  void DeallocateEndPoint (void);
+
+  /**
+   * \brief Received a FIN from peer, notify rx buffer
+   *
+   * \param p the packet
+   * \param tcpHeader the packet's TCP header
+   */
+  void PeerClose (Ptr<Packet> p, const TcpHeader& tcpHeader);
+
+  /**
+   * \brief FIN is in sequence, notify app and respond with a FIN
+   */
+  void DoPeerClose (void);
+
+  /**
+   * \brief Cancel all timer when endpoint is deleted
+   */
+  void CancelAllTimers (void);
+
+  /**
+   * \brief Move from CLOSING or FIN_WAIT_2 to TIME_WAIT state
+   */
+  void TimeWait (void);
 
   // State transition functions
-  void ProcessEstablished (Ptr<Packet>, const TcpHeader&); // Received a packet upon ESTABLISHED state
-  void ProcessListen (Ptr<Packet>, const TcpHeader&, const Address&, const Address&); // Process the newly received ACK
-  void ProcessSynSent (Ptr<Packet>, const TcpHeader&); // Received a packet upon SYN_SENT
-  void ProcessSynRcvd (Ptr<Packet>, const TcpHeader&, const Address&, const Address&); // Received a packet upon SYN_RCVD
-  void ProcessWait (Ptr<Packet>, const TcpHeader&); // Received a packet upon CLOSE_WAIT, FIN_WAIT_1, FIN_WAIT_2
-  void ProcessClosing (Ptr<Packet>, const TcpHeader&); // Received a packet upon CLOSING
-  void ProcessLastAck (Ptr<Packet>, const TcpHeader&); // Received a packet upon LAST_ACK
+
+  /**
+   * \brief Received a packet upon ESTABLISHED state.
+   *
+   * This function is mimicking the role of tcp_rcv_established() in tcp_input.c in Linux kernel.
+   *
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   */
+  void ProcessEstablished (Ptr<Packet> packet, const TcpHeader& tcpHeader); // Received a packet upon ESTABLISHED state
+
+  /**
+   * \brief Received a packet upon LISTEN state.
+   *
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   * \param fromAddress the source address
+   * \param toAddress the destination address
+   */
+  void ProcessListen (Ptr<Packet> packet, const TcpHeader& tcpHeader,
+                      const Address& fromAddress, const Address& toAddress);
+
+  /**
+   * \brief Received a packet upon SYN_SENT
+   *
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   */
+  void ProcessSynSent (Ptr<Packet> packet, const TcpHeader& tcpHeader);
+
+  /**
+   * \brief Received a packet upon SYN_RCVD.
+   *
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   * \param fromAddress the source address
+   * \param toAddress the destination address
+   */
+  void ProcessSynRcvd (Ptr<Packet> packet, const TcpHeader& tcpHeader,
+                       const Address& fromAddress, const Address& toAddress);
+
+  /**
+   * \brief Received a packet upon CLOSE_WAIT, FIN_WAIT_1, FIN_WAIT_2
+   *
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   */
+  void ProcessWait (Ptr<Packet> packet, const TcpHeader& tcpHeader);
+
+  /**
+   * \brief Received a packet upon CLOSING
+   *
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   */
+  void ProcessClosing (Ptr<Packet> packet, const TcpHeader& tcpHeader);
+
+  /**
+   * \brief Received a packet upon LAST_ACK
+   *
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   */
+  void ProcessLastAck (Ptr<Packet> packet, const TcpHeader& tcpHeader);
 
   // Window management
-  virtual uint32_t UnAckDataCount (void);       // Return count of number of unacked bytes
-  virtual uint32_t BytesInFlight (void);        // Return total bytes in flight
-  virtual uint32_t Window (void);               // Return the max possible number of unacked bytes
-  virtual uint32_t AvailableWindow (void);      // Return unfilled portion of window
-  virtual uint16_t AdvertisedWindowSize (void); // The amount of Rx window announced to the peer
+
+  /**
+   * \brief Return count of number of unacked bytes
+   * \returns count of number of unacked bytes
+   */
+  virtual uint32_t UnAckDataCount (void);
+
+  /**
+   * \brief Return total bytes in flight
+   * \returns total bytes in flight
+   */
+  virtual uint32_t BytesInFlight (void);
+
+  /**
+   * \brief Return the max possible number of unacked bytes
+   * \returns the max possible number of unacked bytes
+   */
+  virtual uint32_t Window (void);
+
+  /**
+   * \brief Return unfilled portion of window
+   * \return unfilled portion of window
+   */
+  virtual uint32_t AvailableWindow (void);
+
+  /**
+   * \brief The amount of Rx window announced to the peer
+   * \returns size of Rx window announced to the peer
+   */
+  virtual uint16_t AdvertisedWindowSize (void);
+
 
   // Manage data tx/rx
-  virtual Ptr<TcpSocketBase> Fork (void) = 0; // Call CopyObject<> to clone me
-  virtual void ReceivedAck (Ptr<Packet>, const TcpHeader&); // Received an ACK packet
-  virtual void ReceivedData (Ptr<Packet>, const TcpHeader&); // Recv of a data, put into buffer, call L7 to get it if necessary
-  virtual void EstimateRtt (const TcpHeader&); // RTT accounting
-  virtual void NewAck (SequenceNumber32 const& seq); // Update buffers w.r.t. ACK
-  virtual void DupAck (const TcpHeader& t, uint32_t count) = 0; // Received dupack
-  virtual void ReTxTimeout (void); // Call Retransmit() upon RTO event
-  virtual void Retransmit (void); // Halving cwnd and call DoRetransmit()
-  virtual void DelAckTimeout (void);  // Action upon delay ACK timeout, i.e. send an ACK
-  virtual void LastAckTimeout (void); // Timeout at LAST_ACK, close the connection
-  virtual void PersistTimeout (void); // Send 1 byte probe to get an updated window size
-  virtual void DoRetransmit (void); // Retransmit the oldest packet
-  virtual void ReadOptions (const TcpHeader&); // Read option from incoming packets
-  virtual void AddOptions (TcpHeader&); // Add option to outgoing packets
+
+  /**
+   * \brief Call CopyObject<> to clone me
+   * \returns a copy of the socket
+   */
+  virtual Ptr<TcpSocketBase> Fork (void) = 0;
+
+  /**
+   * \brief Received an ACK packet
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   */
+  virtual void ReceivedAck (Ptr<Packet> packet, const TcpHeader& tcpHeader);
+
+  /**
+   * \brief Recv of a data, put into buffer, call L7 to get it if necessary
+   * \param packet the packet
+   * \param tcpHeader the packet's TCP header
+   */
+  virtual void ReceivedData (Ptr<Packet> packet, const TcpHeader& tcpHeader);
+
+  /**
+   * \brief Take into account the packet for RTT estimation
+   * \param tcpHeader the packet's TCP header
+   */
+  virtual void EstimateRtt (const TcpHeader& tcpHeader);
+
+  /**
+   * \brief Update buffers w.r.t. ACK
+   * \param seq the sequence number
+   */
+  virtual void NewAck (SequenceNumber32 const& seq);
+
+  /**
+   * \brief Received dupack (duplicate ACK)
+   * \param tcpHeader the packet's TCP header
+   * \param count counter of duplicate ACKs
+   */
+  virtual void DupAck (const TcpHeader& tcpHeader, uint32_t count) = 0;
+
+  /**
+   * \brief Call Retransmit() upon RTO event
+   */
+  virtual void ReTxTimeout (void);
+
+  /**
+   * \brief Halving cwnd and call DoRetransmit()
+   */
+  virtual void Retransmit (void);
+
+  /**
+   * \brief Action upon delay ACK timeout, i.e. send an ACK
+   */
+  virtual void DelAckTimeout (void);
+
+  /**
+   * \brief Timeout at LAST_ACK, close the connection
+   */
+  virtual void LastAckTimeout (void);
+
+  /**
+   * \brief Send 1 byte probe to get an updated window size
+   */
+  virtual void PersistTimeout (void);
+
+  /**
+   * \brief Retransmit the oldest packet
+   */
+  virtual void DoRetransmit (void);
+
+  /**
+   * \brief Read option from incoming packets
+   * \param tcpHeader the packet's TCP header
+   */
+  virtual void ReadOptions (const TcpHeader& tcpHeader);
+
+  /**
+   * \brief Add option to outgoing packets
+   * \param tcpHeader the packet's TCP header
+   */
+  virtual void AddOptions (TcpHeader& tcpHeader);
+
 
 protected:
   // Counters and events
-  EventId           m_retxEvent;       //< Retransmission event
-  EventId           m_lastAckEvent;    //< Last ACK timeout event
-  EventId           m_delAckEvent;     //< Delayed ACK timeout event
-  EventId           m_persistEvent;    //< Persist event: Send 1 byte to probe for a non-zero Rx window
-  EventId           m_timewaitEvent;   //< TIME_WAIT expiration event: Move this socket to CLOSED state
-  uint32_t          m_dupAckCount;     //< Dupack counter
-  uint32_t          m_delAckCount;     //< Delayed ACK counter
-  uint32_t          m_delAckMaxCount;  //< Number of packet to fire an ACK before delay timeout
-  bool              m_noDelay;         //< Set to true to disable Nagle's algorithm
-  uint32_t          m_cnCount;         //< Count of remaining connection retries
-  uint32_t          m_cnRetries;       //< Number of connection retries before giving up
-  TracedValue<Time> m_rto;             //< Retransmit timeout
-  TracedValue<Time> m_lastRtt;         //< Last RTT sample collected
-  Time              m_delAckTimeout;   //< Time to delay an ACK
-  Time              m_persistTimeout;  //< Time between sending 1-byte probes
-  Time              m_cnTimeout;       //< Timeout for connection retry
+  EventId           m_retxEvent;       //!< Retransmission event
+  EventId           m_lastAckEvent;    //!< Last ACK timeout event
+  EventId           m_delAckEvent;     //!< Delayed ACK timeout event
+  EventId           m_persistEvent;    //!< Persist event: Send 1 byte to probe for a non-zero Rx window
+  EventId           m_timewaitEvent;   //!< TIME_WAIT expiration event: Move this socket to CLOSED state
+  uint32_t          m_dupAckCount;     //!< Dupack counter
+  uint32_t          m_delAckCount;     //!< Delayed ACK counter
+  uint32_t          m_delAckMaxCount;  //!< Number of packet to fire an ACK before delay timeout
+  bool              m_noDelay;         //!< Set to true to disable Nagle's algorithm
+  uint32_t          m_cnCount;         //!< Count of remaining connection retries
+  uint32_t          m_cnRetries;       //!< Number of connection retries before giving up
+  TracedValue<Time> m_rto;             //!< Retransmit timeout
+  TracedValue<Time> m_lastRtt;         //!< Last RTT sample collected
+  Time              m_delAckTimeout;   //!< Time to delay an ACK
+  Time              m_persistTimeout;  //!< Time between sending 1-byte probes
+  Time              m_cnTimeout;       //!< Timeout for connection retry
 
   // Connections to other layers of TCP/IP
-  Ipv4EndPoint*       m_endPoint;
-  Ipv6EndPoint*       m_endPoint6;
-  Ptr<Node>           m_node;
-  Ptr<TcpL4Protocol>  m_tcp;
-  Callback<void, Ipv4Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback;
-  Callback<void, Ipv6Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback6;
+  Ipv4EndPoint*       m_endPoint;   //!< the IPv4 endpoint
+  Ipv6EndPoint*       m_endPoint6;  //!< the IPv6 endpoint
+  Ptr<Node>           m_node;       //!< the associated node
+  Ptr<TcpL4Protocol>  m_tcp;        //!< the associated TCP L4 protocol
+  Callback<void, Ipv4Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback;  //!< ICMP callback
+  Callback<void, Ipv6Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback6; //!< ICMPv6 callback
 
-  // Round trip time estimation
-  Ptr<RttEstimator> m_rtt;
+  Ptr<RttEstimator> m_rtt; //!< Round trip time estimator
 
   // Rx and Tx buffer management
-  TracedValue<SequenceNumber32> m_nextTxSequence; //< Next seqnum to be sent (SND.NXT), ReTx pushes it back
-  TracedValue<SequenceNumber32> m_highTxMark;     //< Highest seqno ever sent, regardless of ReTx
-  TcpRxBuffer                   m_rxBuffer;       //< Rx buffer (reordering buffer)
-  TcpTxBuffer                   m_txBuffer;       //< Tx buffer
+  TracedValue<SequenceNumber32> m_nextTxSequence; //!< Next seqnum to be sent (SND.NXT), ReTx pushes it back
+  TracedValue<SequenceNumber32> m_highTxMark;     //!< Highest seqno ever sent, regardless of ReTx
+  TcpRxBuffer                   m_rxBuffer;       //!< Rx buffer (reordering buffer)
+  TcpTxBuffer                   m_txBuffer;       //!< Tx buffer
 
   // State-related attributes
-  TracedValue<TcpStates_t> m_state;         //< TCP state
-  enum SocketErrno         m_errno;         //< Socket error code
-  bool                     m_closeNotified; //< Told app to close socket
-  bool                     m_closeOnEmpty;  //< Close socket upon tx buffer emptied
-  bool                     m_shutdownSend;  //< Send no longer allowed
-  bool                     m_shutdownRecv;  //< Receive no longer allowed
-  bool                     m_connected;     //< Connection established
-  double                   m_msl;           //< Max segment lifetime
+  TracedValue<TcpStates_t> m_state;         //!< TCP state
+  enum SocketErrno         m_errno;         //!< Socket error code
+  bool                     m_closeNotified; //!< Told app to close socket
+  bool                     m_closeOnEmpty;  //!< Close socket upon tx buffer emptied
+  bool                     m_shutdownSend;  //!< Send no longer allowed
+  bool                     m_shutdownRecv;  //!< Receive no longer allowed
+  bool                     m_connected;     //!< Connection established
+  double                   m_msl;           //!< Max segment lifetime
 
   // 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
+  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
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-socket.cc ns-3.19/src/internet/model/tcp-socket.cc
--- ns-3.18.1/src/internet/model/tcp-socket.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-socket.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpSocket);
+NS_OBJECT_ENSURE_REGISTERED (TcpSocket)
+  ;
 
 const char* const TcpSocket::TcpStateName[LAST_STATE] = { "CLOSED", "LISTEN", "SYN_SENT", "SYN_RCVD", "ESTABLISHED", "CLOSE_WAIT", "LAST_ACK", "FIN_WAIT_1", "FIN_WAIT_2", "CLOSING", "TIME_WAIT" };
 
diff -Naur ns-3.18.1/src/internet/model/tcp-socket-factory.cc ns-3.19/src/internet/model/tcp-socket-factory.cc
--- ns-3.18.1/src/internet/model/tcp-socket-factory.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-socket-factory.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpSocketFactory);
+NS_OBJECT_ENSURE_REGISTERED (TcpSocketFactory)
+  ;
 
 TypeId
 TcpSocketFactory::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/tcp-socket-factory.h ns-3.19/src/internet/model/tcp-socket-factory.h
--- ns-3.18.1/src/internet/model/tcp-socket-factory.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-socket-factory.h	2013-12-20 09:44:50.000000000 -0800
@@ -46,6 +46,11 @@
 class TcpSocketFactory : public SocketFactory
 {
 public:
+  /**
+   * Get the type ID.
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
 };
diff -Naur ns-3.18.1/src/internet/model/tcp-socket-factory-impl.h ns-3.19/src/internet/model/tcp-socket-factory-impl.h
--- ns-3.18.1/src/internet/model/tcp-socket-factory-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-socket-factory-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -46,6 +46,10 @@
   TcpSocketFactoryImpl ();
   virtual ~TcpSocketFactoryImpl ();
 
+  /**
+   * \brief Set the associated TCP L4 protocol.
+   * \param tcp the TCP L4 protocol
+   */
   void SetTcp (Ptr<TcpL4Protocol> tcp);
 
   virtual Ptr<Socket> CreateSocket (void);
@@ -53,7 +57,7 @@
 protected:
   virtual void DoDispose (void);
 private:
-  Ptr<TcpL4Protocol> m_tcp;
+  Ptr<TcpL4Protocol> m_tcp; //!< the associated TCP L4 protocol
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-socket.h ns-3.19/src/internet/model/tcp-socket.h
--- ns-3.18.1/src/internet/model/tcp-socket.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-socket.h	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,9 @@
 class Node;
 class Packet;
 
-/* Names of the 11 TCP states */
+/**
+ * \brief Names of the 11 TCP states
+ */
 typedef enum {
   CLOSED,       // 0
   LISTEN,       // 1
@@ -62,37 +64,164 @@
 class TcpSocket : public Socket
 {
 public:
+  /**
+   * Get the type ID.
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
  
   TcpSocket (void);
   virtual ~TcpSocket (void);
 
-  // Literal names of TCP states for use in log messages */
+  /**
+   * \brief Literal names of TCP states for use in log messages
+   */
   static const char* const TcpStateName[LAST_STATE];
 
 private:
   // Indirect the attribute setting and getting through private virtual methods
+
+  /**
+   * \brief Set the send buffer size.
+   * \param size the buffer size (in bytes)
+   */
   virtual void SetSndBufSize (uint32_t size) = 0;
+
+  /**
+   * \brief Get the send buffer size.
+   * \returns the buffer size (in bytes)
+   */
   virtual uint32_t GetSndBufSize (void) const = 0;
+
+  /**
+   * \brief Set the receive buffer size.
+   * \param size the buffer size (in bytes)
+   */
   virtual void SetRcvBufSize (uint32_t size) = 0;
+
+  /**
+   * \brief Get the receive buffer size.
+   * \returns the buffer size (in bytes)
+   */
   virtual uint32_t GetRcvBufSize (void) const = 0;
+
+  /**
+   * \brief Set the segment size.
+   * \param size the segment size (in bytes)
+   */
   virtual void SetSegSize (uint32_t size) = 0;
+
+  /**
+   * \brief Get the segment size.
+   * \returns the segment size (in bytes)
+   */
   virtual uint32_t GetSegSize (void) const = 0;
+
+  /**
+   * \brief Set the Slow Start Threshold.
+   * \param threshold the Slow Start Threshold (in bytes)
+   */
   virtual void SetSSThresh (uint32_t threshold) = 0;
+
+  /**
+   * \brief Get the Slow Start Threshold.
+   * \returns the Slow Start Threshold (in bytes)
+   */
   virtual uint32_t GetSSThresh (void) const = 0;
-  virtual void SetInitialCwnd (uint32_t count) = 0;
+
+  /**
+   * \brief Set the initial Congestion Window.
+   * \param cwnd the initial congestion window (in bytes)
+   */
+  virtual void SetInitialCwnd (uint32_t cwnd) = 0;
+
+  /**
+   * \brief Get the initial Congestion Window.
+   * \returns the initial congestion window (in bytes)
+   */
   virtual uint32_t GetInitialCwnd (void) const = 0;
+
+  /**
+   * \brief Set the connection timeout.
+   * \param timeout the connection timeout
+   */
   virtual void SetConnTimeout (Time timeout) = 0;
+
+  /**
+   * \brief Get the connection timeout.
+   * \returns the connection timeout
+   */
   virtual Time GetConnTimeout (void) const = 0;
+
+  /**
+   * \brief Set the number of connection retries before giving up.
+   * \param count the number of connection retries
+   */
   virtual void SetConnCount (uint32_t count) = 0;
+
+  /**
+   * \brief Get the number of connection retries before giving up.
+   * \returns the number of connection retries
+   */
   virtual uint32_t GetConnCount (void) const = 0;
+
+  /**
+   * \brief Set the time to delay an ACK.
+   * \param timeout the time to delay an ACK
+   */
   virtual void SetDelAckTimeout (Time timeout) = 0;
+
+  /**
+   * \brief Get the time to delay an ACK.
+   * \returns the time to delay an ACK
+   */
   virtual Time GetDelAckTimeout (void) const = 0;
+
+  /**
+   * \brief Set the number of packet to fire an ACK before delay timeout.
+   * \param count the umber of packet to fire an ACK before delay timeout
+   */
   virtual void SetDelAckMaxCount (uint32_t count) = 0;
+
+  /**
+   * \brief Get the number of packet to fire an ACK before delay timeout.
+   * \returns the number of packet to fire an ACK before delay timeout
+   */
   virtual uint32_t GetDelAckMaxCount (void) const = 0;
+
+  /**
+   * \brief Enable/Disable Nagle's algorithm.
+   * \param noDelay true to DISABLE Nagle's algorithm
+   */
   virtual void SetTcpNoDelay (bool noDelay) = 0;
+
+  /**
+   * \brief Check if Nagle's algorithm is enabled or not.
+   * \returns true if Nagle's algorithm is DISABLED
+   */
   virtual bool GetTcpNoDelay (void) const = 0;
+
+  /**
+   * \brief Set the timout for persistent connection
+   *
+   * When the timout expires, send 1-byte data to probe for the window
+   * size at the receiver when the local knowledge tells that the
+   * receiver has zero window size
+   *
+   * \param timeout the persistent timout
+   */
   virtual void SetPersistTimeout (Time timeout) = 0;
+
+  /**
+   * \brief Get the timout for persistent connection
+   *
+   * When the timout expires, send 1-byte data to probe for the window
+   * size at the receiver when the local knowledge tells that the
+   * receiver has zero window size
+   *
+   * \returns the persistent timout
+   */
   virtual Time GetPersistTimeout (void) const = 0;
 
 };
diff -Naur ns-3.18.1/src/internet/model/tcp-tahoe.cc ns-3.19/src/internet/model/tcp-tahoe.cc
--- ns-3.18.1/src/internet/model/tcp-tahoe.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-tahoe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TcpTahoe);
+NS_OBJECT_ENSURE_REGISTERED (TcpTahoe)
+  ;
 
 TypeId
 TcpTahoe::GetTypeId (void)
@@ -71,7 +72,7 @@
 {
 }
 
-/** We initialize m_cWnd from this function, after attributes initialized */
+/* We initialize m_cWnd from this function, after attributes initialized */
 int
 TcpTahoe::Listen (void)
 {
@@ -80,7 +81,7 @@
   return TcpSocketBase::Listen ();
 }
 
-/** We initialize m_cWnd from this function, after attributes initialized */
+/* We initialize m_cWnd from this function, after attributes initialized */
 int
 TcpTahoe::Connect (const Address & address)
 {
@@ -89,7 +90,7 @@
   return TcpSocketBase::Connect (address);
 }
 
-/** Limit the size of in-flight data by cwnd and receiver's rxwin */
+/* Limit the size of in-flight data by cwnd and receiver's rxwin */
 uint32_t
 TcpTahoe::Window (void)
 {
@@ -103,7 +104,7 @@
   return CopyObject<TcpTahoe> (this);
 }
 
-/** New ACK (up to seqnum seq) received. Increase cwnd and call TcpSocketBase::NewAck() */
+/* New ACK (up to seqnum seq) received. Increase cwnd and call TcpSocketBase::NewAck() */
 void
 TcpTahoe::NewAck (SequenceNumber32 const& seq)
 {
@@ -127,7 +128,7 @@
   TcpSocketBase::NewAck (seq);           // Complete newAck processing
 }
 
-/** Cut down ssthresh upon triple dupack */
+/* Cut down ssthresh upon triple dupack */
 void
 TcpTahoe::DupAck (const TcpHeader& t, uint32_t count)
 {
@@ -147,7 +148,7 @@
     }
 }
 
-/** Retransmit timeout */
+/* Retransmit timeout */
 void TcpTahoe::Retransmit (void)
 {
   NS_LOG_FUNCTION (this);
diff -Naur ns-3.18.1/src/internet/model/tcp-tahoe.h ns-3.19/src/internet/model/tcp-tahoe.h
--- ns-3.18.1/src/internet/model/tcp-tahoe.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-tahoe.h	2013-12-20 09:44:50.000000000 -0800
@@ -42,11 +42,19 @@
 class TcpTahoe : public TcpSocketBase
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   /**
    * Create an unbound tcp socket.
    */
   TcpTahoe (void);
+  /**
+   * \brief Copy constructor
+   * \param sock the object to copy
+   */
   TcpTahoe (const TcpTahoe& sock);
   virtual ~TcpTahoe (void);
 
@@ -68,13 +76,16 @@
   virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
 private:
-  void InitializeCwnd (void);            // set m_cWnd when connection starts
+  /**
+   * \brief Set the congestion window when connection starts
+   */
+  void InitializeCwnd (void);
 
 protected:
-  TracedValue<uint32_t>  m_cWnd;         //< Congestion window
-  uint32_t               m_ssThresh;     //< Slow Start Threshold
-  uint32_t               m_initialCWnd;  //< Initial cWnd value
-  uint32_t               m_retxThresh;   //< Fast Retransmit threshold
+  TracedValue<uint32_t>  m_cWnd;         //!< Congestion window
+  uint32_t               m_ssThresh;     //!< Slow Start Threshold
+  uint32_t               m_initialCWnd;  //!< Initial cWnd value
+  uint32_t               m_retxThresh;   //!< Fast Retransmit threshold
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-tx-buffer.h ns-3.19/src/internet/model/tcp-tx-buffer.h
--- ns-3.18.1/src/internet/model/tcp-tx-buffer.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-tx-buffer.h	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,15 @@
 class TcpTxBuffer : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
+  /**
+   * \brief Constructor
+   * \param n initial Sequence number to be transmitted
+   */
   TcpTxBuffer (uint32_t n = 0);
   virtual ~TcpTxBuffer (void);
 
@@ -48,31 +56,37 @@
 
   /**
    * Returns the first byte's sequence number
+   * \returns the first byte's sequence number
    */
   SequenceNumber32 HeadSequence (void) const;
 
   /**
    * Returns the last byte's sequence number + 1
+   * \returns the last byte's sequence number + 1
    */
   SequenceNumber32 TailSequence (void) const;
 
   /**
    * Returns total number of bytes in this Tx buffer
+   * \returns total number of bytes in this Tx buffer
    */
   uint32_t Size (void) const;
 
   /**
    * Returns the Tx window size
+   * \returns the Tx window size (in bytes)
    */
   uint32_t MaxBufferSize (void) const;
 
   /**
    * Set the Tx window size
+   * \param n Tx window size (in bytes)
    */
   void SetMaxBufferSize (uint32_t n);
 
   /**
    * Returns the available capacity in this Tx window
+   * \returns available capacity in this Tx window
    */
   uint32_t Available (void) const;
 
@@ -86,17 +100,23 @@
 
   /**
    * Returns the number of bytes from the buffer in the range [seq, tailSequence)
+   * \param seq initial sequence number
+   * \returns the number of bytes from the buffer in the range
    */
   uint32_t SizeFromSequence (const SequenceNumber32& seq) const;
 
   /**
    * Copy data of size numBytes into a packet, data from the range [seq, seq+numBytes)
+   * \param numBytes number of bytes to copy
+   * \param seq start sequence number to extract
+   * \returns a packet
    */
   Ptr<Packet> CopyFromSequence (uint32_t numBytes, const SequenceNumber32& seq);
 
   /**
    * Set the m_firstByteSeq to seq. Supposed to be called only when the
    * connection is just set up and we did not send any data out yet.
+   * \param seq The sequence number of the head byte
    */
   void SetHeadSequence (const SequenceNumber32& seq);
 
@@ -108,12 +128,13 @@
   void DiscardUpTo (const SequenceNumber32& seq);
 
 private:
+  /// container for data stored in the buffer
   typedef std::list<Ptr<Packet> >::iterator BufIterator;
 
-  TracedValue<SequenceNumber32> m_firstByteSeq; //< Sequence number of the first byte in data (SND.UNA)
-  uint32_t m_size;                              //< Number of data bytes
-  uint32_t m_maxBuffer;                         //< Max number of data bytes in buffer (SND.WND)
-  std::list<Ptr<Packet> > m_data;               //< Corresponding data (may be null)
+  TracedValue<SequenceNumber32> m_firstByteSeq; //!< Sequence number of the first byte in data (SND.UNA)
+  uint32_t m_size;                              //!< Number of data bytes
+  uint32_t m_maxBuffer;                         //!< Max number of data bytes in buffer (SND.WND)
+  std::list<Ptr<Packet> > m_data;               //!< Corresponding data (may be null)
 };
 
 } // namepsace ns3
diff -Naur ns-3.18.1/src/internet/model/tcp-westwood.cc ns-3.19/src/internet/model/tcp-westwood.cc
--- ns-3.18.1/src/internet/model/tcp-westwood.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-westwood.cc	2013-12-20 09:44:50.000000000 -0800
@@ -46,7 +46,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED(TcpWestwood);
+NS_OBJECT_ENSURE_REGISTERED(TcpWestwood)
+  ;
 
 TypeId
 TcpWestwood::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/tcp-westwood.h ns-3.19/src/internet/model/tcp-westwood.h
--- ns-3.18.1/src/internet/model/tcp-westwood.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/tcp-westwood.h	2013-12-20 09:44:50.000000000 -0800
@@ -62,18 +62,32 @@
 class TcpWestwood : public TcpSocketBase
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   TcpWestwood (void);
+  /**
+   * \brief Copy constructor
+   * \param sock the object to copy
+   */
   TcpWestwood (const TcpWestwood& sock);
   virtual ~TcpWestwood (void);
 
+  /**
+   * \brief Protocol variant (Westwood or Westwood+)
+   */
   enum ProtocolType 
   {
     WESTWOOD,
     WESTWOODPLUS
   };
 
+  /**
+   * \brief Filter type (None or Tustin)
+   */
   enum FilterType 
   {
     NONE,
@@ -85,17 +99,11 @@
   virtual int Listen (void);
 
 protected:
-  /**
-   * Limit the size of outstanding data based on the cwnd and the receiver's advertised window
-   *
-   * \return the max. possible number of unacked bytes
-   */  
-  virtual uint32_t Window (void);
-
-  /**
-   * Call CopyObject<TcpWestwood> to clone me
-   */  
-  virtual Ptr<TcpSocketBase> Fork (void);
+  virtual uint32_t Window (void); // Return the max possible number of unacked bytes
+  virtual Ptr<TcpSocketBase> Fork (void); // Call CopyObject<TcpTahoe> to clone me
+  virtual void NewAck (SequenceNumber32 const& seq); // Inc cwnd and call NewAck() of parent
+  virtual void DupAck (const TcpHeader& t, uint32_t count);  // Treat 3 dupack as timeout
+  virtual void Retransmit (void); // Retransmit time out
 
   /**
    * Process the newly received ACK
@@ -106,58 +114,17 @@
   virtual void ReceivedAck (Ptr<Packet> packet, const TcpHeader& tcpHeader);
   
   /**
-   * Adjust the cwnd based on the current congestion control phase,
-   * and then call the TcpSocketBase::NewAck() to complete the processing
-   *
-   * \param seq the acknowledgment number
-   */  
-  virtual void NewAck (SequenceNumber32 const& seq);
-
-  /**
-   * Adjust the cwnd using the currently estimated bandwidth,
-   * retransmit the missing packet, and enter fast recovery if 3 DUPACKs are received
-   *
-   * \param header the TCP header of the ACK packet
-   * \param count the number of DUPACKs
-   */  
-  virtual void DupAck (const TcpHeader& header, uint32_t count);
-
-  /**
-   * Upon an RTO event, adjust the cwnd using the currently estimated bandwidth,
-   * retransmit the missing packet, and exit fast recovery
-   */  
-  virtual void Retransmit (void);
-
-  /**
    * Estimate the RTT, record the minimum value,
    * and run a clock on the RTT to trigger Westwood+ bandwidth sampling
+   * \param header the packet header
    */
   virtual void EstimateRtt (const TcpHeader& header);
 
   // Implementing ns3::TcpSocket -- Attribute get/set
-  /**
-   * \param size the segment size to be used in a connection
-   */  
-  virtual void SetSegSize (uint32_t size);
-
-  /**
-   * \param the slow-start threshold
-   */  
-  virtual void SetSSThresh (uint32_t threshold);
-
-  /**
-   * \return the slow-start threshold
-   */  
+  virtual void     SetSegSize (uint32_t size);
+  virtual void     SetSSThresh (uint32_t threshold);
   virtual uint32_t GetSSThresh (void) const;
-
-  /**
-   * \param cwnd the initial cwnd
-   */  
-  virtual void SetInitialCwnd (uint32_t cwnd);
-
-  /**
-   * \return the initial cwnd
-   */ 
+  virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
 
 private:
@@ -196,24 +163,24 @@
   void Filtering (void);
 
 protected:
-  TracedValue<uint32_t>  m_cWnd;                   //< Congestion window
-  uint32_t               m_ssThresh;               //< Slow Start Threshold
-  uint32_t               m_initialCWnd;            //< Initial cWnd value
-  bool                   m_inFastRec;              //< Currently in fast recovery if TRUE
-
-  TracedValue<double>    m_currentBW;              //< Current value of the estimated BW
-  double                 m_lastSampleBW;           //< Last bandwidth sample
-  double                 m_lastBW;                 //< Last bandwidth sample after being filtered
-  Time                   m_minRtt;                 //< Minimum RTT
-  double                 m_lastAck;                //< The time last ACK was received
-  SequenceNumber32       m_prevAckNo;              //< Previously received ACK number
-  int                    m_accountedFor;           //< The number of received DUPACKs
-  enum ProtocolType      m_pType;                  //< 0 for Westwood, 1 for Westwood+
-  enum FilterType        m_fType;                  //< 0 for none, 1 for Tustin
-
-  int                    m_ackedSegments;          //< The number of segments ACKed between RTTs
-  bool                   m_IsCount;                //< Start keeping track of m_ackedSegments for Westwood+ if TRUE
-  EventId                m_bwEstimateEvent;        //< The BW estimation event for Westwood+
+  TracedValue<uint32_t>  m_cWnd;                   //!< Congestion window
+  uint32_t               m_ssThresh;               //!< Slow Start Threshold
+  uint32_t               m_initialCWnd;            //!< Initial cWnd value
+  bool                   m_inFastRec;              //!< Currently in fast recovery if TRUE
+
+  TracedValue<double>    m_currentBW;              //!< Current value of the estimated BW
+  double                 m_lastSampleBW;           //!< Last bandwidth sample
+  double                 m_lastBW;                 //!< Last bandwidth sample after being filtered
+  Time                   m_minRtt;                 //!< Minimum RTT
+  double                 m_lastAck;                //!< The time last ACK was received
+  SequenceNumber32       m_prevAckNo;              //!< Previously received ACK number
+  int                    m_accountedFor;           //!< The number of received DUPACKs
+  enum ProtocolType      m_pType;                  //!< 0 for Westwood, 1 for Westwood+
+  enum FilterType        m_fType;                  //!< 0 for none, 1 for Tustin
+
+  int                    m_ackedSegments;          //!< The number of segments ACKed between RTTs
+  bool                   m_IsCount;                //!< Start keeping track of m_ackedSegments for Westwood+ if TRUE
+  EventId                m_bwEstimateEvent;        //!< The BW estimation event for Westwood+
 
 };
 
diff -Naur ns-3.18.1/src/internet/model/udp-header.cc ns-3.19/src/internet/model/udp-header.cc
--- ns-3.18.1/src/internet/model/udp-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UdpHeader);
+NS_OBJECT_ENSURE_REGISTERED (UdpHeader)
+  ;
 
 /* The magic values below are used only for debugging.
  * They can be used to easily detect memory corruption
@@ -32,7 +33,8 @@
 UdpHeader::UdpHeader ()
   : m_sourcePort (0xfffd),
     m_destinationPort (0xfffd),
-    m_payloadSize (0xfffd),
+    m_payloadSize (0),
+    m_checksum (0),
     m_calcChecksum (false),
     m_goodChecksum (true)
 {
@@ -107,7 +109,7 @@
 
   WriteTo (it, m_source);
   WriteTo (it, m_destination);
-  if (Ipv4Address::IsMatchingType(m_source))
+  if (Ipv4Address::IsMatchingType (m_source))
     {
       it.WriteU8 (0); /* protocol */
       it.WriteU8 (m_protocol); /* protocol */
@@ -115,7 +117,7 @@
       it.WriteU8 (size & 0xff); /* length */
       hdrSize = 12;
     }
-  else if (Ipv6Address::IsMatchingType(m_source))
+  else if (Ipv6Address::IsMatchingType (m_source))
     {
       it.WriteU16 (0);
       it.WriteU8 (size >> 8); /* length */
@@ -137,6 +139,17 @@
   return m_goodChecksum; 
 }
 
+void
+UdpHeader::ForceChecksum (uint16_t checksum)
+{
+  m_checksum = checksum;
+}
+
+void
+UdpHeader::ForcePayloadSize (uint16_t payloadSize)
+{
+  m_payloadSize = payloadSize;
+}
 
 TypeId 
 UdpHeader::GetTypeId (void)
@@ -174,18 +187,33 @@
 
   i.WriteHtonU16 (m_sourcePort);
   i.WriteHtonU16 (m_destinationPort);
-  i.WriteHtonU16 (start.GetSize ());
-  i.WriteU16 (0);
+  if (m_payloadSize == 0)
+    {
+      i.WriteHtonU16 (start.GetSize ());
+    }
+  else
+    {
+      i.WriteHtonU16 (m_payloadSize);
+    }
 
-  if (m_calcChecksum)
+  if ( m_checksum == 0)
     {
-      uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());
-      i = start;
-      uint16_t checksum = i.CalculateIpChecksum (start.GetSize (), headerChecksum);
+      i.WriteU16 (0);
 
-      i = start;
-      i.Next (6);
-      i.WriteU16 (checksum);
+      if (m_calcChecksum)
+        {
+          uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());
+          i = start;
+          uint16_t checksum = i.CalculateIpChecksum (start.GetSize (), headerChecksum);
+
+          i = start;
+          i.Next (6);
+          i.WriteU16 (checksum);
+        }
+    }
+  else
+    {
+      i.WriteU16 (m_checksum);
     }
 }
 uint32_t
@@ -195,9 +223,9 @@
   m_sourcePort = i.ReadNtohU16 ();
   m_destinationPort = i.ReadNtohU16 ();
   m_payloadSize = i.ReadNtohU16 () - GetSerializedSize ();
-  i.Next (2);
+  m_checksum = i.ReadU16 ();
 
-  if(m_calcChecksum)
+  if (m_calcChecksum)
     {
       uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());
       i = start;
@@ -209,5 +237,10 @@
   return GetSerializedSize ();
 }
 
+uint16_t
+UdpHeader::GetChecksum ()
+{
+  return m_checksum;
+}
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/udp-header.h ns-3.19/src/internet/model/udp-header.h
--- ns-3.18.1/src/internet/model/udp-header.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -114,6 +114,10 @@
                            Ipv6Address destination,
                            uint8_t protocol);
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
   virtual void Print (std::ostream &os) const;
@@ -127,17 +131,58 @@
    */
   bool IsChecksumOk (void) const;
 
+  /**
+   * \brief Force the UDP checksum to a given value.
+   *
+   * This might be useful for test purposes or to
+   * restore the UDP checksum when the UDP header
+   * has been compressed (e.g., in 6LoWPAN).
+   * Note that, normally, the header checksum is
+   * calculated on the fly when the packet is
+   * serialized.
+   *
+   * When this option is used, the UDP checksum is written in
+   * the header, regardless of the global ChecksumEnabled option.
+   *
+   * \note The checksum value must be a big endian number.
+   *
+   * \param checksum the checksum to use (big endian).
+   */
+  void ForceChecksum (uint16_t checksum);
+
+  /**
+   * \brief Force the UDP payload length to a given value.
+   *
+   * This might be useful when forging a packet for test
+   * purposes.
+   *
+   * \param payloadSize the payload length to use.
+   */
+  void ForcePayloadSize (uint16_t payloadSize);
+
+  /**
+   * \brief Return the checksum (only known after a Deserialize)
+   * \return The checksum for this UdpHeader
+   */
+  uint16_t GetChecksum ();
+
 private:
+  /**
+   * \brief Calculate the header checksum
+   * \param size packet size
+   * \returns the checksum
+   */
   uint16_t CalculateHeaderChecksum (uint16_t size) const;
-  uint16_t m_sourcePort;
-  uint16_t m_destinationPort;
-  uint16_t m_payloadSize;
-
-  Address m_source;
-  Address m_destination;
-  uint8_t m_protocol;
-  bool m_calcChecksum;
-  bool m_goodChecksum;
+  uint16_t m_sourcePort;      //!< Source port
+  uint16_t m_destinationPort; //!< Destination port
+  uint16_t m_payloadSize;     //!< Payload size
+
+  Address m_source;           //!< Source IP address
+  Address m_destination;      //!< Destination IP address
+  uint8_t m_protocol;         //!< Protocol number
+  uint16_t m_checksum;        //!< Forced Checksum value
+  bool m_calcChecksum;        //!< Flag to calculate checksum
+  bool m_goodChecksum;        //!< Flag to indicate that checksum is correct
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/udp-l4-protocol.cc ns-3.19/src/internet/model/udp-l4-protocol.cc
--- ns-3.18.1/src/internet/model/udp-l4-protocol.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-l4-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -44,7 +44,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UdpL4Protocol);
+NS_OBJECT_ENSURE_REGISTERED (UdpL4Protocol)
+  ;
 
 /* see http://www.iana.org/assignments/protocol-numbers */
 const uint8_t UdpL4Protocol::PROT_NUMBER = 17;
@@ -402,7 +403,7 @@
   for (Ipv6EndPointDemux::EndPointsI endPoint = endPoints.begin ();
        endPoint != endPoints.end (); endPoint++)
     {
-      (*endPoint)->ForwardUp (packet->Copy (), header, udpHeader.GetSourcePort ());
+      (*endPoint)->ForwardUp (packet->Copy (), header, udpHeader.GetSourcePort (), interface);
     }
   return IpL4Protocol::RX_OK;
 }
diff -Naur ns-3.18.1/src/internet/model/udp-l4-protocol.h ns-3.19/src/internet/model/udp-l4-protocol.h
--- ns-3.18.1/src/internet/model/udp-l4-protocol.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-l4-protocol.h	2013-12-20 09:44:50.000000000 -0800
@@ -47,12 +47,20 @@
  */
 class UdpL4Protocol : public IpL4Protocol {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
-  static const uint8_t PROT_NUMBER;
+  static const uint8_t PROT_NUMBER; //!< protocol number (0x11)
 
   UdpL4Protocol ();
   virtual ~UdpL4Protocol ();
 
+  /**
+   * Set node associated with this stack
+   * \param node the node
+   */
   void SetNode (Ptr<Node> node);
 
   virtual int GetProtocolNumber (void) const;
@@ -63,25 +71,90 @@
    */
   Ptr<Socket> CreateSocket (void);
 
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (void);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param address address to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address address);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (uint16_t port);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param address address to use
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address address, uint16_t port);
+  /**
+   * \brief Allocate an IPv4 Endpoint
+   * \param localAddress local address to use
+   * \param localPort local port to use
+   * \param peerAddress remote address to use
+   * \param peerPort remote port to use
+   * \return the Endpoint
+   */
   Ipv4EndPoint *Allocate (Ipv4Address localAddress, uint16_t localPort,
                           Ipv4Address peerAddress, uint16_t peerPort);
+
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (void);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \param address address to use
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (Ipv6Address address);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (uint16_t port);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \param address address to use
+   * \param port port to use
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (Ipv6Address address, uint16_t port);
+  /**
+   * \brief Allocate an IPv6 Endpoint
+   * \param localAddress local address to use
+   * \param localPort local port to use
+   * \param peerAddress remote address to use
+   * \param peerPort remote port to use
+   * \return the Endpoint
+   */
   Ipv6EndPoint *Allocate6 (Ipv6Address localAddress, uint16_t localPort,
-                          Ipv6Address peerAddress, uint16_t peerPort);
+                           Ipv6Address peerAddress, uint16_t peerPort);
 
+  /**
+   * \brief Remove an IPv4 Endpoint.
+   * \param endPoint the end point to remove
+   */
   void DeAllocate (Ipv4EndPoint *endPoint);
+  /**
+   * \brief Remove an IPv6 Endpoint.
+   * \param endPoint the end point to remove
+   */
   void DeAllocate (Ipv6EndPoint *endPoint);
 
   // called by UdpSocket.
   /**
-   * \brief Send a packet via UDP
+   * \brief Send a packet via UDP (IPv4)
    * \param packet The packet to send
    * \param saddr The source Ipv4Address
    * \param daddr The destination Ipv4Address
@@ -91,40 +164,50 @@
   void Send (Ptr<Packet> packet,
              Ipv4Address saddr, Ipv4Address daddr, 
              uint16_t sport, uint16_t dport);
+  /**
+   * \brief Send a packet via UDP (IPv4)
+   * \param packet The packet to send
+   * \param saddr The source Ipv4Address
+   * \param daddr The destination Ipv4Address
+   * \param sport The source port number
+   * \param dport The destination port number
+   * \param route The route
+   */
   void Send (Ptr<Packet> packet,
              Ipv4Address saddr, Ipv4Address daddr, 
              uint16_t sport, uint16_t dport, Ptr<Ipv4Route> route);
+  /**
+   * \brief Send a packet via UDP (IPv6)
+   * \param packet The packet to send
+   * \param saddr The source Ipv4Address
+   * \param daddr The destination Ipv4Address
+   * \param sport The source port number
+   * \param dport The destination port number
+   */
   void Send (Ptr<Packet> packet,
              Ipv6Address saddr, Ipv6Address daddr, 
              uint16_t sport, uint16_t dport);
+  /**
+   * \brief Send a packet via UDP (IPv6)
+   * \param packet The packet to send
+   * \param saddr The source Ipv4Address
+   * \param daddr The destination Ipv4Address
+   * \param sport The source port number
+   * \param dport The destination port number
+   * \param route The route
+   */
   void Send (Ptr<Packet> packet,
              Ipv6Address saddr, Ipv6Address daddr, 
              uint16_t sport, uint16_t dport, Ptr<Ipv6Route> route);
-  /**
-   * \brief Receive a packet up the protocol stack
-   * \param p The Packet to dump the contents into
-   * \param header IPv4 Header information
-   * \param interface the interface from which the packet is coming.
-   */
+
   // inherited from Ipv4L4Protocol
   virtual enum IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                                 Ipv4Header const &header,
-                                                 Ptr<Ipv4Interface> interface);
+                                               Ipv4Header const &header,
+                                               Ptr<Ipv4Interface> interface);
   virtual enum IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                                 Ipv6Header const &header,
-                                                 Ptr<Ipv6Interface> interface);
+                                               Ipv6Header const &header,
+                                               Ptr<Ipv6Interface> interface);
 
-  /**
-   * \brief Receive an ICMP packet
-   * \param icmpSource The IP address of the source of the packet.
-   * \param icmpTtl The time to live from the IP header
-   * \param icmpType The type of the message from the ICMP header
-   * \param icmpCode The message code from the ICMP header
-   * \param icmpInfo 32-bit integer carrying informational value of varying semantics.
-   * \param payloadSource The IP source address from the IP header of the packet
-   * \param payloadDestination The IP destination address from the IP header of the packet
-   * \param payload Payload of the ICMP packet
-   */
   virtual void ReceiveIcmp (Ipv4Address icmpSource, uint8_t icmpTtl,
                             uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo,
                             Ipv4Address payloadSource,Ipv4Address payloadDestination,
@@ -149,14 +232,28 @@
    */
   virtual void NotifyNewAggregate ();
 private:
-  Ptr<Node> m_node;
-  Ipv4EndPointDemux *m_endPoints;
-  Ipv6EndPointDemux *m_endPoints6;
-  UdpL4Protocol (const UdpL4Protocol &o);
-  UdpL4Protocol &operator = (const UdpL4Protocol &o);
-  std::vector<Ptr<UdpSocketImpl> > m_sockets;
-  IpL4Protocol::DownTargetCallback m_downTarget;
-  IpL4Protocol::DownTargetCallback6 m_downTarget6;
+  Ptr<Node> m_node; //!< the node this stack is associated with
+  Ipv4EndPointDemux *m_endPoints; //!< A list of IPv4 end points.
+  Ipv6EndPointDemux *m_endPoints6; //!< A list of IPv6 end points.
+
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and not implemented to avoid misuse
+   */
+  UdpL4Protocol (const UdpL4Protocol &);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and not implemented to avoid misuse
+   * \returns
+   */
+  UdpL4Protocol &operator = (const UdpL4Protocol &);
+
+  std::vector<Ptr<UdpSocketImpl> > m_sockets;      //!< list of sockets
+  IpL4Protocol::DownTargetCallback m_downTarget;   //!< Callback to send packets over IPv4
+  IpL4Protocol::DownTargetCallback6 m_downTarget6; //!< Callback to send packets over IPv6
+
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/udp-socket.cc ns-3.19/src/internet/model/udp-socket.cc
--- ns-3.18.1/src/internet/model/udp-socket.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-socket.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UdpSocket);
+NS_OBJECT_ENSURE_REGISTERED (UdpSocket)
+  ;
 
 TypeId
 UdpSocket::GetTypeId (void)
diff -Naur ns-3.18.1/src/internet/model/udp-socket-factory.cc ns-3.19/src/internet/model/udp-socket-factory.cc
--- ns-3.18.1/src/internet/model/udp-socket-factory.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-socket-factory.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory);
+NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory)
+  ;
 
 TypeId UdpSocketFactory::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/internet/model/udp-socket-factory.h ns-3.19/src/internet/model/udp-socket-factory.h
--- ns-3.18.1/src/internet/model/udp-socket-factory.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-socket-factory.h	2013-12-20 09:44:50.000000000 -0800
@@ -40,6 +40,10 @@
 class UdpSocketFactory : public SocketFactory
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
 };
diff -Naur ns-3.18.1/src/internet/model/udp-socket-factory-impl.h ns-3.19/src/internet/model/udp-socket-factory-impl.h
--- ns-3.18.1/src/internet/model/udp-socket-factory-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-socket-factory-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -57,6 +57,10 @@
   UdpSocketFactoryImpl ();
   virtual ~UdpSocketFactoryImpl ();
 
+  /**
+   * \brief Set the associated UDP L4 protocol.
+   * \param udp the UDP L4 protocol
+   */
   void SetUdp (Ptr<UdpL4Protocol> udp);
 
   /**
@@ -71,7 +75,7 @@
 protected:
   virtual void DoDispose (void);
 private:
-  Ptr<UdpL4Protocol> m_udp;
+  Ptr<UdpL4Protocol> m_udp; //!< the associated UDP L4 protocol
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/model/udp-socket.h ns-3.19/src/internet/model/udp-socket.h
--- ns-3.18.1/src/internet/model/udp-socket.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-socket.h	2013-12-20 09:44:50.000000000 -0800
@@ -46,6 +46,11 @@
 class UdpSocket : public Socket
 {
 public:
+  /**
+   * Get the type ID.
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
  
   UdpSocket (void);
@@ -99,15 +104,67 @@
 
 private:
   // Indirect the attribute setting and getting through private virtual methods
+  /**
+   * \brief Set the receiving buffer size
+   * \param size the buffer size
+   */
   virtual void SetRcvBufSize (uint32_t size) = 0;
+  /**
+   * \brief Get the receiving buffer size
+   * \returns the buffer size
+   */
   virtual uint32_t GetRcvBufSize (void) const = 0;
+  /**
+   * \brief Set the IP multicast TTL
+   * \param ipTtl the IP multicast TTL
+   */
   virtual void SetIpMulticastTtl (uint8_t ipTtl) = 0;
+  /**
+   * \brief Get the IP multicast TTL
+   * \returns the IP multicast TTL
+   */
   virtual uint8_t GetIpMulticastTtl (void) const = 0;
+  /**
+   * \brief Set the IP multicast interface
+   * \param ipIf the IP multicast interface
+   */
   virtual void SetIpMulticastIf (int32_t ipIf) = 0;
+  /**
+   * \brief Get the IP multicast interface
+   * \returns the IP multicast interface
+   */
   virtual int32_t GetIpMulticastIf (void) const = 0;
+  /**
+   * \brief Set the IP multicast loop capability
+   *
+   * This means that the socket will receive the packets
+   * sent by itself on a multicast address.
+   * Equivalent to setsockopt  IP_MULTICAST_LOOP
+   *
+   * \param loop the IP multicast loop capability
+   */
   virtual void SetIpMulticastLoop (bool loop) = 0;
+  /**
+   * \brief Get the IP multicast loop capability
+   *
+   * This means that the socket will receive the packets
+   * sent by itself on a multicast address.
+   * Equivalent to setsockopt  IP_MULTICAST_LOOP
+   *
+   * \returns the IP multicast loop capability
+   */
   virtual bool GetIpMulticastLoop (void) const = 0;
+  /**
+   * \brief Set the MTU discover capability
+   *
+   * \param discover the MTU discover capability
+   */
   virtual void SetMtuDiscover (bool discover) = 0;
+  /**
+   * \brief Get the MTU discover capability
+   *
+   * \returns the MTU discover capability
+   */
   virtual bool GetMtuDiscover (void) const = 0;
 };
 
diff -Naur ns-3.18.1/src/internet/model/udp-socket-impl.cc ns-3.19/src/internet/model/udp-socket-impl.cc
--- ns-3.18.1/src/internet/model/udp-socket-impl.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-socket-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,7 @@
 #include "ns3/udp-socket-factory.h"
 #include "ns3/trace-source-accessor.h"
 #include "ns3/ipv4-packet-info-tag.h"
+#include "ns3/ipv6-packet-info-tag.h"
 #include "udp-socket-impl.h"
 #include "udp-l4-protocol.h"
 #include "ipv4-end-point.h"
@@ -42,9 +43,13 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UdpSocketImpl);
+NS_OBJECT_ENSURE_REGISTERED (UdpSocketImpl)
+  ;
 
-static const uint32_t MAX_IPV4_UDP_DATAGRAM_SIZE = 65507;
+// The correct maximum UDP message size is 65507, as determined by the following formula:
+// 0xffff - (sizeof(IP Header) + sizeof(UDP Header)) = 65535-(20+8) = 65507
+// \todo MAX_IPV4_UDP_DATAGRAM_SIZE is correct only for IPv4
+static const uint32_t MAX_IPV4_UDP_DATAGRAM_SIZE = 65507; //!< Maximum UDP datagram size
 
 // Add attributes generic to all UdpSockets to base class UdpSocket
 TypeId
@@ -243,6 +248,11 @@
         {
           m_endPoint = m_udp->Allocate (ipv4, port);
         }
+      if (0 == m_endPoint)
+        {
+          m_errno = port ? ERROR_ADDRINUSE : ERROR_ADDRNOTAVAIL;
+          return -1;
+        }
     }
   else if (Inet6SocketAddress::IsMatchingType (address))
     {
@@ -265,6 +275,11 @@
         {
           m_endPoint6 = m_udp->Allocate6 (ipv6, port);
         }
+      if (0 == m_endPoint6)
+        {
+          m_errno = port ? ERROR_ADDRINUSE : ERROR_ADDRNOTAVAIL;
+          return -1;
+        }
     }
   else
     {
@@ -735,9 +750,9 @@
 }
 
 
-//  maximum message size for UDP broadcast is limited by MTU
+// maximum message size for UDP broadcast is limited by MTU
 // size of underlying link; we are not checking that now.
-/// \todo Check MTU size of underlying link
+// \todo Check MTU size of underlying link
 uint32_t
 UdpSocketImpl::GetTxAvailable (void) const
 {
@@ -951,7 +966,7 @@
 }
 
 void 
-UdpSocketImpl::ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port)
+UdpSocketImpl::ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface)
 {
   NS_LOG_FUNCTION (this << packet << header.GetSourceAddress () << port);
 
@@ -960,6 +975,14 @@
       return;
     }
 
+  // Should check via getsockopt ()..
+  if (IsRecvPktInfo ())
+    {
+      Ipv6PacketInfoTag tag;
+      packet->RemovePacketTag (tag);
+      tag.SetRecvIf (incomingInterface->GetDevice ()->GetIfIndex ());
+      packet->AddPacketTag (tag);
+    }
 
   //Check only version 6 options
   if (IsIpv6RecvTclass ())
diff -Naur ns-3.18.1/src/internet/model/udp-socket-impl.h ns-3.19/src/internet/model/udp-socket-impl.h
--- ns-3.18.1/src/internet/model/udp-socket-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/model/udp-socket-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -50,6 +50,10 @@
 class UdpSocketImpl : public UdpSocket
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
   /**
    * Create an unbound udp socket.
@@ -57,7 +61,15 @@
   UdpSocketImpl ();
   virtual ~UdpSocketImpl ();
 
+  /**
+   * \brief Set the associated node.
+   * \param node the node
+   */
   void SetNode (Ptr<Node> node);
+  /**
+   * \brief Set the associated UDP L4 protocol.
+   * \param udp the UDP L4 protocol
+   */
   void SetUdp (Ptr<UdpL4Protocol> udp);
 
   virtual enum SocketErrno GetErrno (void) const;
@@ -101,48 +113,128 @@
 
   friend class UdpSocketFactory;
   // invoked by Udp class
+
+  /**
+   * Finish the binding process
+   * \returns 0 on success, -1 on failure
+   */
   int FinishBind (void);
-  void ForwardUp (Ptr<Packet> p, Ipv4Header header, uint16_t port, 
-                  Ptr<Ipv4Interface> incomingInterface);
-  void ForwardUp6 (Ptr<Packet> p, Ipv6Header header, uint16_t port);
+
+  /**
+   * \brief Called by the L3 protocol when it received a packet to pass on to TCP.
+   *
+   * \param packet the incoming packet
+   * \param header the packet's IPv4 header
+   * \param port the incoming port
+   * \param incomingInterface the incoming interface
+   */
+  void ForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port, Ptr<Ipv4Interface> incomingInterface);
+
+  /**
+   * \brief Called by the L3 protocol when it received a packet to pass on to TCP.
+   *
+   * \param packet the incoming packet
+   * \param header the packet's IPv6 header
+   * \param port the incoming port
+   * \param incomingInterface the incoming interface
+   */
+  void ForwardUp6 (Ptr<Packet> packet, Ipv6Header header, uint16_t port, Ptr<Ipv6Interface> incomingInterface);
+
+  /**
+   * \brief Kill this socket by zeroing its attributes (IPv4)
+   *
+   * This is a callback function configured to m_endpoint in
+   * SetupCallback(), invoked when the endpoint is destroyed.
+   */
   void Destroy (void);
+
+  /**
+   * \brief Kill this socket by zeroing its attributes (IPv6)
+   *
+   * This is a callback function configured to m_endpoint in
+   * SetupCallback(), invoked when the endpoint is destroyed.
+   */
   void Destroy6 (void);
+
+  /**
+   * \brief Send a packet
+   * \param p packet
+   * \returns 0 on success, -1 on failure
+   */
   int DoSend (Ptr<Packet> p);
+  /**
+   * \brief Send a packet to a specific destination
+   * \param p packet
+   * \param daddr destination address
+   * \returns 0 on success, -1 on failure
+   */
   int DoSendTo (Ptr<Packet> p, const Address &daddr);
+  /**
+   * \brief Send a packet to a specific destination and port (IPv4)
+   * \param p packet
+   * \param daddr destination address
+   * \param dport destination port
+   * \returns 0 on success, -1 on failure
+   */
   int DoSendTo (Ptr<Packet> p, Ipv4Address daddr, uint16_t dport);
+  /**
+   * \brief Send a packet to a specific destination and port (IPv6)
+   * \param p packet
+   * \param daddr destination address
+   * \param dport destination port
+   * \returns 0 on success, -1 on failure
+   */
   int DoSendTo (Ptr<Packet> p, Ipv6Address daddr, uint16_t dport);
-  void ForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, 
-                    uint8_t icmpType, uint8_t icmpCode,
-                    uint32_t icmpInfo);
-  void ForwardIcmp6 (Ipv6Address icmpSource, uint8_t icmpTtl, 
-                     uint8_t icmpType, uint8_t icmpCode,
-                     uint32_t icmpInfo);
-
-  Ipv4EndPoint *m_endPoint;
-  Ipv6EndPoint *m_endPoint6;
-  Ptr<Node> m_node;
-  Ptr<UdpL4Protocol> m_udp;
-  Address m_defaultAddress;
-  uint16_t m_defaultPort;
-  TracedCallback<Ptr<const Packet> > m_dropTrace;
-
-  enum SocketErrno m_errno;
-  bool m_shutdownSend;
-  bool m_shutdownRecv;
-  bool m_connected;
-  bool m_allowBroadcast;
 
-  std::queue<Ptr<Packet> > m_deliveryQueue;
-  uint32_t m_rxAvailable;
+  /**
+   * \brief Called by the L3 protocol when it received an ICMP packet to pass on to TCP.
+   *
+   * \param icmpSource the ICMP source address
+   * \param icmpTtl the ICMP Time to Live
+   * \param icmpType the ICMP Type
+   * \param icmpCode the ICMP Code
+   * \param icmpInfo the ICMP Info
+   */
+  void ForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo);
+
+  /**
+   * \brief Called by the L3 protocol when it received an ICMPv6 packet to pass on to TCP.
+   *
+   * \param icmpSource the ICMP source address
+   * \param icmpTtl the ICMP Time to Live
+   * \param icmpType the ICMP Type
+   * \param icmpCode the ICMP Code
+   * \param icmpInfo the ICMP Info
+   */
+  void ForwardIcmp6 (Ipv6Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo);
+
+  // Connections to other layers of TCP/IP
+  Ipv4EndPoint*       m_endPoint;   //!< the IPv4 endpoint
+  Ipv6EndPoint*       m_endPoint6;  //!< the IPv6 endpoint
+  Ptr<Node>           m_node;       //!< the associated node
+  Ptr<UdpL4Protocol> m_udp;         //!< the associated UDP L4 protocol
+  Callback<void, Ipv4Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback;  //!< ICMP callback
+  Callback<void, Ipv6Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback6; //!< ICMPv6 callback
+
+  Address m_defaultAddress; //!< Default address
+  uint16_t m_defaultPort;   //!< Default port
+  TracedCallback<Ptr<const Packet> > m_dropTrace; //!< Trace for dropped packets
+
+  enum SocketErrno         m_errno;           //!< Socket error code
+  bool                     m_shutdownSend;    //!< Send no longer allowed
+  bool                     m_shutdownRecv;    //!< Receive no longer allowed
+  bool                     m_connected;       //!< Connection established
+  bool                     m_allowBroadcast;  //!< Allow send broadcast packets
+
+  std::queue<Ptr<Packet> > m_deliveryQueue; //!< Queue for incoming packets
+  uint32_t m_rxAvailable;                   //!< Number of available bytes to be received
 
   // Socket attributes
-  uint32_t m_rcvBufSize;
-  uint8_t m_ipMulticastTtl;
-  int32_t m_ipMulticastIf;
-  bool m_ipMulticastLoop;
-  bool m_mtuDiscover;
-  Callback<void, Ipv4Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback;
-  Callback<void, Ipv6Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback6;
+  uint32_t m_rcvBufSize;    //!< Receive buffer size
+  uint8_t m_ipMulticastTtl; //!< Multicast TTL
+  int32_t m_ipMulticastIf;  //!< Multicast Interface
+  bool m_ipMulticastLoop;   //!< Allow multicast loop
+  bool m_mtuDiscover;       //!< Allow MTU discovery
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/internet/test/error-channel.cc ns-3.19/src/internet/test/error-channel.cc
--- ns-3.18.1/src/internet/test/error-channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/test/error-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -18,7 +18,7 @@
  * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
  */
 #include "error-channel.h"
-#include "error-net-device.h"
+#include "ns3/simple-net-device.h"
 #include "ns3/simulator.h"
 #include "ns3/packet.h"
 #include "ns3/node.h"
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ErrorChannel);
+NS_OBJECT_ENSURE_REGISTERED (ErrorChannel)
+  ;
 
 TypeId 
 ErrorChannel::GetTypeId (void)
@@ -62,12 +63,12 @@
 void
 ErrorChannel::Send (Ptr<Packet> p, uint16_t protocol,
                     Mac48Address to, Mac48Address from,
-                    Ptr<ErrorNetDevice> sender)
+                    Ptr<SimpleNetDevice> sender)
 {
   NS_LOG_FUNCTION (p << protocol << to << from << sender);
-  for (std::vector<Ptr<ErrorNetDevice> >::const_iterator i = m_devices.begin (); i != m_devices.end (); ++i)
+  for (std::vector<Ptr<SimpleNetDevice> >::const_iterator i = m_devices.begin (); i != m_devices.end (); ++i)
     {
-      Ptr<ErrorNetDevice> tmp = *i;
+      Ptr<SimpleNetDevice> tmp = *i;
       if (tmp == sender)
         {
           continue;
@@ -75,20 +76,20 @@
       if( !jumping || jumpingState%2 )
         {
           Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), Seconds (0),
-                                      &ErrorNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
+                                      &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
           jumpingState++;
         }
       else
         {
           Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), jumpingTime,
-                                      &ErrorNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
+                                      &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
           jumpingState++;
         }
     }
 }
 
 void 
-ErrorChannel::Add (Ptr<ErrorNetDevice> device)
+ErrorChannel::Add (Ptr<SimpleNetDevice> device)
 {
   m_devices.push_back (device);
 }
@@ -104,7 +105,8 @@
   return m_devices[i];
 }
 
-NS_OBJECT_ENSURE_REGISTERED (ErrorModel);
+NS_OBJECT_ENSURE_REGISTERED (BinaryErrorModel)
+  ;
 
 TypeId BinaryErrorModel::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/internet/test/error-channel.h ns-3.19/src/internet/test/error-channel.h
--- ns-3.18.1/src/internet/test/error-channel.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/test/error-channel.h	2013-12-20 09:44:50.000000000 -0800
@@ -20,7 +20,7 @@
 #ifndef ERROR_CHANNEL_H
 #define ERROR_CHANNEL_H
 
-#include "ns3/channel.h"
+#include "ns3/simple-channel.h"
 #include "ns3/error-model.h"
 #include "ns3/mac48-address.h"
 #include "ns3/nstime.h"
@@ -28,23 +28,23 @@
 
 namespace ns3 {
 
-class ErrorNetDevice;
+class SimpleNetDevice;
 class Packet;
 
 /**
  * \ingroup channel
  * \brief A Error channel, introducing deterministic delays on even/odd packets. Used for testing
  */
-class ErrorChannel : public Channel
+class ErrorChannel : public SimpleChannel
 {
 public:
   static TypeId GetTypeId (void);
   ErrorChannel ();
 
-  void Send (Ptr<Packet> p, uint16_t protocol, Mac48Address to, Mac48Address from,
-	     Ptr<ErrorNetDevice> sender);
+  virtual void Send (Ptr<Packet> p, uint16_t protocol, Mac48Address to, Mac48Address from,
+                     Ptr<SimpleNetDevice> sender);
 
-  void Add (Ptr<ErrorNetDevice> device);
+  virtual void Add (Ptr<SimpleNetDevice> device);
 
   // inherited from ns3::Channel
   virtual uint32_t GetNDevices (void) const;
@@ -63,7 +63,7 @@
 void SetJumpingMode(bool mode);
 
 private:
-  std::vector<Ptr<ErrorNetDevice> > m_devices;
+  std::vector<Ptr<SimpleNetDevice> > m_devices;
   Time jumpingTime;
   uint8_t jumpingState;
   bool jumping;
diff -Naur ns-3.18.1/src/internet/test/error-net-device.cc ns-3.19/src/internet/test/error-net-device.cc
--- ns-3.18.1/src/internet/test/error-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/test/error-net-device.cc	1969-12-31 16:00:00.000000000 -0800
@@ -1,255 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2011 Universita' di Firenze, Italy
- *
- * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
- */
-#include "error-net-device.h"
-#include "error-channel.h"
-#include "ns3/node.h"
-#include "ns3/packet.h"
-#include "ns3/log.h"
-#include "ns3/pointer.h"
-#include "ns3/error-model.h"
-#include "ns3/trace-source-accessor.h"
-
-NS_LOG_COMPONENT_DEFINE ("ErrorNetDevice");
-
-namespace ns3 {
-
-NS_OBJECT_ENSURE_REGISTERED (ErrorNetDevice);
-
-TypeId 
-ErrorNetDevice::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::ErrorNetDevice")
-    .SetParent<NetDevice> ()
-    .AddConstructor<ErrorNetDevice> ()
-    .AddAttribute ("ReceiveErrorModel",
-                   "The receiver error model used to simulate packet loss",
-                   PointerValue (),
-                   MakePointerAccessor (&ErrorNetDevice::m_receiveErrorModel),
-                   MakePointerChecker<ErrorModel> ())
-    .AddTraceSource ("PhyRxDrop",
-                     "Trace source indicating a packet has been dropped by the device during reception",
-                     MakeTraceSourceAccessor (&ErrorNetDevice::m_phyRxDropTrace))
-    ;
-  return tid;
-}
-
-ErrorNetDevice::ErrorNetDevice ()
-  : m_channel (0),
-    m_node (0),
-    m_mtu (0xffff),
-    m_ifIndex (0)
-{}
-
-void 
-ErrorNetDevice::Receive (Ptr<Packet> packet, uint16_t protocol,
-			  Mac48Address to, Mac48Address from)
-{
-  NS_LOG_FUNCTION (packet << protocol << to << from << *packet);
-  NetDevice::PacketType packetType;
-
-  if (m_receiveErrorModel && m_receiveErrorModel->IsCorrupt (packet) )
-    {
-      m_phyRxDropTrace (packet);
-      return;
-    }
-
-  if (to == m_address)
-    {
-      packetType = NetDevice::PACKET_HOST;
-    }
-  else if (to.IsBroadcast ())
-    {
-      packetType = NetDevice::PACKET_HOST;
-    }
-  else if (to.IsGroup ())
-    {
-      packetType = NetDevice::PACKET_MULTICAST;
-    }
-  else 
-    {
-      packetType = NetDevice::PACKET_OTHERHOST;
-    }
-  m_rxCallback (this, packet, protocol, from);
-  if (!m_promiscCallback.IsNull ())
-    {
-      m_promiscCallback (this, packet, protocol, from, to, packetType);
-    }
-}
-
-void 
-ErrorNetDevice::SetChannel (Ptr<ErrorChannel> channel)
-{
-  m_channel = channel;
-  m_channel->Add (this);
-}
-
-void
-ErrorNetDevice::SetReceiveErrorModel (Ptr<ErrorModel> em)
-{
-  m_receiveErrorModel = em;
-}
-
-void 
-ErrorNetDevice::SetIfIndex(const uint32_t index)
-{
-  m_ifIndex = index;
-}
-uint32_t 
-ErrorNetDevice::GetIfIndex(void) const
-{
-  return m_ifIndex;
-}
-Ptr<Channel> 
-ErrorNetDevice::GetChannel (void) const
-{
-  return m_channel;
-}
-void
-ErrorNetDevice::SetAddress (Address address)
-{
-  m_address = Mac48Address::ConvertFrom(address);
-}
-Address 
-ErrorNetDevice::GetAddress (void) const
-{
-  //
-  // Implicit conversion from Mac48Address to Address
-  //
-  return m_address;
-}
-bool 
-ErrorNetDevice::SetMtu (const uint16_t mtu)
-{
-  m_mtu = mtu;
-  return true;
-}
-uint16_t 
-ErrorNetDevice::GetMtu (void) const
-{
-  return m_mtu;
-}
-bool 
-ErrorNetDevice::IsLinkUp (void) const
-{
-  return true;
-}
-void 
-ErrorNetDevice::AddLinkChangeCallback (Callback<void> callback)
-{}
-bool 
-ErrorNetDevice::IsBroadcast (void) const
-{
-  return true;
-}
-Address
-ErrorNetDevice::GetBroadcast (void) const
-{
-  return Mac48Address ("ff:ff:ff:ff:ff:ff");
-}
-bool 
-ErrorNetDevice::IsMulticast (void) const
-{
-  return false;
-}
-Address 
-ErrorNetDevice::GetMulticast (Ipv4Address multicastGroup) const
-{
-  return Mac48Address::GetMulticast (multicastGroup);
-}
-
-Address ErrorNetDevice::GetMulticast (Ipv6Address addr) const
-{
-  return Mac48Address::GetMulticast (addr);
-}
-
-bool 
-ErrorNetDevice::IsPointToPoint (void) const
-{
-  return false;
-}
-
-bool 
-ErrorNetDevice::IsBridge (void) const
-{
-  return false;
-}
-
-bool 
-ErrorNetDevice::Send(Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber)
-{
-  NS_LOG_FUNCTION (packet << dest << protocolNumber << *packet);
-  Mac48Address to = Mac48Address::ConvertFrom (dest);
-  m_channel->Send (packet, protocolNumber, to, m_address, this);
-  return true;
-}
-bool 
-ErrorNetDevice::SendFrom(Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber)
-{
-  NS_LOG_FUNCTION (packet << source << dest << protocolNumber << *packet);
-  Mac48Address to = Mac48Address::ConvertFrom (dest);
-  Mac48Address from = Mac48Address::ConvertFrom (source);
-  m_channel->Send (packet, protocolNumber, to, from, this);
-  return true;
-}
-
-Ptr<Node> 
-ErrorNetDevice::GetNode (void) const
-{
-  return m_node;
-}
-void 
-ErrorNetDevice::SetNode (Ptr<Node> node)
-{
-  m_node = node;
-}
-bool 
-ErrorNetDevice::NeedsArp (void) const
-{
-  return false;
-}
-void 
-ErrorNetDevice::SetReceiveCallback (NetDevice::ReceiveCallback cb)
-{
-  m_rxCallback = cb;
-}
-
-void
-ErrorNetDevice::DoDispose (void)
-{
-  m_channel = 0;
-  m_node = 0;
-  m_receiveErrorModel = 0;
-  NetDevice::DoDispose ();
-}
-
-
-void
-ErrorNetDevice::SetPromiscReceiveCallback (PromiscReceiveCallback cb)
-{
-  m_promiscCallback = cb;
-}
-
-bool
-ErrorNetDevice::SupportsSendFrom (void) const
-{
-  return true;
-}
-
-} // namespace ns3
diff -Naur ns-3.18.1/src/internet/test/error-net-device.h ns-3.19/src/internet/test/error-net-device.h
--- ns-3.18.1/src/internet/test/error-net-device.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/test/error-net-device.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,117 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2011 Universita' di Firenze, Italy
- *
- * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
- */
-#ifndef ERROR_NET_DEVICE_H
-#define ERROR_NET_DEVICE_H
-
-#include "ns3/net-device.h"
-#include "ns3/mac48-address.h"
-#include <stdint.h>
-#include <string>
-#include "ns3/traced-callback.h"
-
-namespace ns3 {
-
-class ErrorChannel;
-class Node;
-class ErrorModel;
-
-/**
- * \ingroup netdevice
- *
- * This device does not have a helper and assumes 48-bit mac addressing;
- * the default address assigned to each device is zero, so you must 
- * assign a real address to use it.  There is also the possibility to
- * add an ErrorModel if you want to force losses on the device.
- * 
- * \brief Error net device for Error things and testing
- */
-class ErrorNetDevice : public NetDevice
-{
-public:
-  static TypeId GetTypeId (void);
-  ErrorNetDevice ();
-
-  void Receive (Ptr<Packet> packet, uint16_t protocol, Mac48Address to, Mac48Address from);
-  void SetChannel (Ptr<ErrorChannel> channel);
-
-  /**
-   * Attach a receive ErrorModel to the ErrorNetDevice.
-   *
-   * The ErrorNetDevice may optionally include an ErrorModel in
-   * the packet receive chain.
-   *
-   * \see ErrorModel
-   * \param em Ptr to the ErrorModel.
-   */
-  void SetReceiveErrorModel(Ptr<ErrorModel> em);
-
-  // inherited from NetDevice base class.
-  virtual void SetIfIndex(const uint32_t index);
-  virtual uint32_t GetIfIndex(void) const;
-  virtual Ptr<Channel> GetChannel (void) const;
-  virtual void SetAddress (Address address);
-  virtual Address GetAddress (void) const;
-  virtual bool SetMtu (const uint16_t mtu);
-  virtual uint16_t GetMtu (void) const;
-  virtual bool IsLinkUp (void) const;
-  virtual void AddLinkChangeCallback (Callback<void> callback);
-  virtual bool IsBroadcast (void) const;
-  virtual Address GetBroadcast (void) const;
-  virtual bool IsMulticast (void) const;
-  virtual Address GetMulticast (Ipv4Address multicastGroup) const;
-  virtual bool IsPointToPoint (void) const;
-  virtual bool IsBridge (void) const;
-  virtual bool Send(Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);
-  virtual bool SendFrom(Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber);
-  virtual Ptr<Node> GetNode (void) const;
-  virtual void SetNode (Ptr<Node> node);
-  virtual bool NeedsArp (void) const;
-  virtual void SetReceiveCallback (NetDevice::ReceiveCallback cb);
-
-  virtual Address GetMulticast (Ipv6Address addr) const;
-
-  virtual void SetPromiscReceiveCallback (PromiscReceiveCallback cb);
-  virtual bool SupportsSendFrom (void) const;
-
-protected:
-  virtual void DoDispose (void);
-private:
-  Ptr<ErrorChannel> m_channel;
-  NetDevice::ReceiveCallback m_rxCallback;
-  NetDevice::PromiscReceiveCallback m_promiscCallback;
-  Ptr<Node> m_node;
-  uint16_t m_mtu;
-  uint32_t m_ifIndex;
-  Mac48Address m_address;
-  Ptr<ErrorModel> m_receiveErrorModel;
-  /**
-   * The trace source fired when the phy layer drops a packet it has received
-   * due to the error model being active.  Although ErrorNetDevice doesn't
-   * really have a Phy model, we choose this trace source name for alignment
-   * with other trace sources.
-   *
-   * \see class CallBackTraceSource
-   */
-  TracedCallback<Ptr<const Packet> > m_phyRxDropTrace;
-};
-
-} // namespace ns3
-
-#endif /* Error_NET_DEVICE_H */
diff -Naur ns-3.18.1/src/internet/test/ipv4-fragmentation-test.cc ns-3.19/src/internet/test/ipv4-fragmentation-test.cc
--- ns-3.18.1/src/internet/test/ipv4-fragmentation-test.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/test/ipv4-fragmentation-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,7 @@
 #include "ns3/udp-socket-factory.h"
 #include "ns3/simulator.h"
 #include "error-channel.h"
-#include "error-net-device.h"
+#include "ns3/simple-net-device.h"
 #include "ns3/drop-tail-queue.h"
 #include "ns3/socket.h"
 #include "ns3/udp-socket.h"
@@ -264,10 +264,10 @@
   // Receiver Node
   Ptr<Node> serverNode = CreateObject<Node> ();
   AddInternetStack (serverNode);
-  Ptr<ErrorNetDevice> serverDev;
+  Ptr<SimpleNetDevice> serverDev;
   Ptr<BinaryErrorModel> serverDevErrorModel = CreateObject<BinaryErrorModel> ();
   {
-    serverDev = CreateObject<ErrorNetDevice> ();
+    serverDev = CreateObject<SimpleNetDevice> ();
     serverDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
     serverDev->SetMtu(1500);
     serverDev->SetReceiveErrorModel(serverDevErrorModel);
@@ -284,10 +284,10 @@
   // Sender Node
   Ptr<Node> clientNode = CreateObject<Node> ();
   AddInternetStack (clientNode);
-  Ptr<ErrorNetDevice> clientDev;
+  Ptr<SimpleNetDevice> clientDev;
   Ptr<BinaryErrorModel> clientDevErrorModel = CreateObject<BinaryErrorModel> ();
   {
-    clientDev = CreateObject<ErrorNetDevice> ();
+    clientDev = CreateObject<SimpleNetDevice> ();
     clientDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
     clientDev->SetMtu(1000);
     clientDev->SetReceiveErrorModel(clientDevErrorModel);
diff -Naur ns-3.18.1/src/internet/test/ipv6-fragmentation-test.cc ns-3.19/src/internet/test/ipv6-fragmentation-test.cc
--- ns-3.18.1/src/internet/test/ipv6-fragmentation-test.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/test/ipv6-fragmentation-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,7 @@
 #include "ns3/udp-socket-factory.h"
 #include "ns3/simulator.h"
 #include "error-channel.h"
-#include "error-net-device.h"
+#include "ns3/simple-net-device.h"
 #include "ns3/drop-tail-queue.h"
 #include "ns3/socket.h"
 #include "ns3/udp-socket.h"
@@ -270,10 +270,10 @@
   // Receiver Node
   Ptr<Node> serverNode = CreateObject<Node> ();
   AddInternetStack (serverNode);
-  Ptr<ErrorNetDevice> serverDev;
+  Ptr<SimpleNetDevice> serverDev;
   Ptr<BinaryErrorModel> serverDevErrorModel = CreateObject<BinaryErrorModel> ();
   {
-    serverDev = CreateObject<ErrorNetDevice> ();
+    serverDev = CreateObject<SimpleNetDevice> ();
     serverDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
     serverDev->SetMtu (1500);
     serverDev->SetReceiveErrorModel (serverDevErrorModel);
@@ -290,12 +290,12 @@
   // Sender Node
   Ptr<Node> clientNode = CreateObject<Node> ();
   AddInternetStack (clientNode);
-  Ptr<ErrorNetDevice> clientDev;
+  Ptr<SimpleNetDevice> clientDev;
   Ptr<BinaryErrorModel> clientDevErrorModel = CreateObject<BinaryErrorModel> ();
   {
-    clientDev = CreateObject<ErrorNetDevice> ();
+    clientDev = CreateObject<SimpleNetDevice> ();
     clientDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
-    clientDev->SetMtu (1000);
+    clientDev->SetMtu (1500);
     clientDev->SetReceiveErrorModel (clientDevErrorModel);
     clientDevErrorModel->Disable ();
     clientNode->AddDevice (clientDev);
@@ -315,7 +315,7 @@
 
 
   // some small packets, some rather big ones
-  uint32_t packetSizes[5] = {1000, 2000, 5000, 10000, 65000};
+  uint32_t packetSizes[5] = {2000, 2500, 5000, 10000, 65000};
 
   // using the alphabet
   uint8_t fillData[78];
diff -Naur ns-3.18.1/src/internet/wscript ns-3.19/src/internet/wscript
--- ns-3.18.1/src/internet/wscript	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/internet/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -206,7 +206,6 @@
         'test/ipv4-fragmentation-test.cc',
         'test/ipv4-forwarding-test.cc',
         'test/error-channel.cc',
-        'test/error-net-device.cc',
         'test/ipv4-test.cc',
         'test/ipv6-extension-header-test-suite.cc',
         'test/ipv6-list-routing-test-suite.cc',
diff -Naur ns-3.18.1/src/lte/bindings/modulegen__gcc_ILP32.py ns-3.19/src/lte/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/lte/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -354,6 +354,10 @@
     module.add_enum('Direction_e', ['DIR_UL', 'DIR_DL', 'DIR_BOTH'], outer_class=root_module['ns3::LogicalChannelConfigListElement_s'])
     ## ff-mac-common.h (module 'lte'): ns3::LogicalChannelConfigListElement_s::QosBearerType_e [enumeration]
     module.add_enum('QosBearerType_e', ['QBT_NON_GBR', 'QBT_GBR'], outer_class=root_module['ns3::LogicalChannelConfigListElement_s'])
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapProvider [class]
+    module.add_class('LteAnrSapProvider', allow_subclassing=True)
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapUser [class]
+    module.add_class('LteAnrSapUser', allow_subclassing=True)
     ## lte-as-sap.h (module 'lte'): ns3::LteAsSapProvider [class]
     module.add_class('LteAsSapProvider', allow_subclassing=True)
     ## lte-as-sap.h (module 'lte'): ns3::LteAsSapUser [class]
@@ -386,6 +390,10 @@
     module.add_class('LteFlowId_t')
     ## lte-global-pathloss-database.h (module 'lte'): ns3::LteGlobalPathlossDatabase [class]
     module.add_class('LteGlobalPathlossDatabase', allow_subclassing=True)
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapProvider [class]
+    module.add_class('LteHandoverManagementSapProvider', allow_subclassing=True)
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapUser [class]
+    module.add_class('LteHandoverManagementSapUser', allow_subclassing=True)
     ## lte-mac-sap.h (module 'lte'): ns3::LteMacSapProvider [class]
     module.add_class('LteMacSapProvider', allow_subclassing=True)
     ## lte-mac-sap.h (module 'lte'): ns3::LteMacSapProvider::ReportBufferStatusParameters [struct]
@@ -426,6 +434,8 @@
     module.add_class('CarrierFreqEutra', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellAccessRelatedInfo [struct]
     module.add_class('CellAccessRelatedInfo', outer_class=root_module['ns3::LteRrcSap'])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo [struct]
+    module.add_class('CellSelectionInfo', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellsToAddMod [struct]
     module.add_class('CellsToAddMod', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CgiInfo [struct]
@@ -891,7 +901,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-fading-loss-model.h (module 'lte'): ns3::TraceFadingLossModel [class]
@@ -906,8 +916,6 @@
     module.add_class('UeManager', parent=root_module['ns3::Object'])
     ## lte-enb-rrc.h (module 'lte'): ns3::UeManager::State [enumeration]
     module.add_enum('State', ['INITIAL_RANDOM_ACCESS', 'CONNECTION_SETUP', 'CONNECTION_REJECTED', 'CONNECTED_NORMALLY', 'CONNECTION_RECONFIGURATION', 'CONNECTION_REESTABLISHMENT', 'HANDOVER_PREPARATION', 'HANDOVER_JOINING', 'HANDOVER_PATH_SWITCH', 'HANDOVER_LEAVING', 'NUM_STATES'], outer_class=root_module['ns3::UeManager'])
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure [class]
-    module.add_class('UeMeasure', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable [class]
     module.add_class('UniformRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## ff-mac-common.h (module 'lte'): ns3::VendorSpecificValue [struct]
@@ -1060,10 +1068,12 @@
     module.add_class('LteAmc', parent=root_module['ns3::Object'])
     ## lte-amc.h (module 'lte'): ns3::LteAmc::AmcModel [enumeration]
     module.add_enum('AmcModel', ['PiroEW2010', 'MiErrorModel'], outer_class=root_module['ns3::LteAmc'])
+    ## lte-anr.h (module 'lte'): ns3::LteAnr [class]
+    module.add_class('LteAnr', parent=root_module['ns3::Object'])
     ## lte-control-messages.h (module 'lte'): ns3::LteControlMessage [class]
     module.add_class('LteControlMessage', parent=root_module['ns3::SimpleRefCount< ns3::LteControlMessage, ns3::empty, ns3::DefaultDeleter<ns3::LteControlMessage> >'])
     ## lte-control-messages.h (module 'lte'): ns3::LteControlMessage::MessageType [enumeration]
-    module.add_enum('MessageType', ['DL_DCI', 'UL_DCI', 'DL_CQI', 'UL_CQI', 'BSR', 'DL_HARQ', 'RACH_PREAMBLE', 'RAR', 'MIB'], outer_class=root_module['ns3::LteControlMessage'])
+    module.add_enum('MessageType', ['DL_DCI', 'UL_DCI', 'DL_CQI', 'UL_CQI', 'BSR', 'DL_HARQ', 'RACH_PREAMBLE', 'RAR', 'MIB', 'SIB1'], outer_class=root_module['ns3::LteControlMessage'])
     ## lte-enb-mac.h (module 'lte'): ns3::LteEnbMac [class]
     module.add_class('LteEnbMac', parent=root_module['ns3::Object'])
     ## lte-enb-rrc.h (module 'lte'): ns3::LteEnbRrc [class]
@@ -1074,6 +1084,8 @@
     module.add_class('LteEnbRrcProtocolIdeal', parent=root_module['ns3::Object'])
     ## lte-rrc-protocol-real.h (module 'lte'): ns3::LteEnbRrcProtocolReal [class]
     module.add_class('LteEnbRrcProtocolReal', parent=root_module['ns3::Object'])
+    ## lte-handover-algorithm.h (module 'lte'): ns3::LteHandoverAlgorithm [class]
+    module.add_class('LteHandoverAlgorithm', parent=root_module['ns3::Object'])
     ## lte-harq-phy.h (module 'lte'): ns3::LteHarqPhy [class]
     module.add_class('LteHarqPhy', parent=root_module['ns3::SimpleRefCount< ns3::LteHarqPhy, ns3::empty, ns3::DefaultDeleter<ns3::LteHarqPhy> >'])
     ## lte-helper.h (module 'lte'): ns3::LteHelper [class]
@@ -1124,10 +1136,12 @@
     module.add_class('LteUeMac', parent=root_module['ns3::Object'])
     ## lte-ue-phy.h (module 'lte'): ns3::LteUePhy [class]
     module.add_class('LteUePhy', parent=root_module['ns3::LtePhy'])
+    ## lte-ue-phy.h (module 'lte'): ns3::LteUePhy::State [enumeration]
+    module.add_enum('State', ['CELL_SEARCH', 'SYNCHRONIZED', 'NUM_STATES'], outer_class=root_module['ns3::LteUePhy'])
     ## lte-ue-rrc.h (module 'lte'): ns3::LteUeRrc [class]
     module.add_class('LteUeRrc', parent=root_module['ns3::Object'])
     ## lte-ue-rrc.h (module 'lte'): ns3::LteUeRrc::State [enumeration]
-    module.add_enum('State', ['IDLE_CELL_SELECTION', 'IDLE_WAIT_SYSTEM_INFO', 'IDLE_CAMPED_NORMALLY', 'IDLE_RANDOM_ACCESS', 'IDLE_CONNECTING', 'CONNECTED_NORMALLY', 'CONNECTED_REESTABLISHING', 'CONNECTED_HANDOVER', 'NUM_STATES'], outer_class=root_module['ns3::LteUeRrc'])
+    module.add_enum('State', ['IDLE_START', 'IDLE_CELL_SEARCH', 'IDLE_WAIT_MIB_SIB1', 'IDLE_WAIT_MIB', 'IDLE_WAIT_SIB1', 'IDLE_CAMPED_NORMALLY', 'IDLE_WAIT_SIB2', 'IDLE_RANDOM_ACCESS', 'IDLE_CONNECTING', 'CONNECTED_NORMALLY', 'CONNECTED_HANDOVER', 'CONNECTED_PHY_PROBLEM', 'CONNECTED_REESTABLISHING', 'NUM_STATES'], outer_class=root_module['ns3::LteUeRrc'])
     ## lte-rrc-protocol-ideal.h (module 'lte'): ns3::LteUeRrcProtocolIdeal [class]
     module.add_class('LteUeRrcProtocolIdeal', parent=root_module['ns3::Object'])
     ## lte-rrc-protocol-real.h (module 'lte'): ns3::LteUeRrcProtocolReal [class]
@@ -1142,14 +1156,14 @@
     module.add_class('MibLteControlMessage', parent=root_module['ns3::LteControlMessage'])
     ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class]
     module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation [class]
-    module.add_class('NeighbourRelation', 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]
     module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network')
     ## nix-vector.h (module 'network'): ns3::NixVector [class]
     module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    ## no-op-handover-algorithm.h (module 'lte'): ns3::NoOpHandoverAlgorithm [class]
+    module.add_class('NoOpHandoverAlgorithm', parent=root_module['ns3::LteHandoverAlgorithm'])
     ## node.h (module 'network'): ns3::Node [class]
     module.add_class('Node', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::NormalRandomVariable [class]
@@ -1170,6 +1184,8 @@
     module.add_class('PhyStatsCalculator', parent=root_module['ns3::LteStatsCalculator'])
     ## phy-tx-stats-calculator.h (module 'lte'): ns3::PhyTxStatsCalculator [class]
     module.add_class('PhyTxStatsCalculator', parent=root_module['ns3::LteStatsCalculator'])
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::PointToPointEpcHelper [class]
+    module.add_class('PointToPointEpcHelper', parent=root_module['ns3::EpcHelper'])
     ## pointer.h (module 'core'): ns3::PointerChecker [class]
     module.add_class('PointerChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## pointer.h (module 'core'): ns3::PointerValue [class]
@@ -1198,6 +1214,8 @@
     module.add_class('RrcUlCcchMessage', parent=root_module['ns3::RrcAsn1Header'])
     ## lte-rrc-header.h (module 'lte'): ns3::RrcUlDcchMessage [class]
     module.add_class('RrcUlDcchMessage', parent=root_module['ns3::RrcAsn1Header'])
+    ## lte-control-messages.h (module 'lte'): ns3::Sib1LteControlMessage [class]
+    module.add_class('Sib1LteControlMessage', parent=root_module['ns3::LteControlMessage'])
     ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel [class]
     module.add_class('SpectrumChannel', import_from_module='ns.spectrum', parent=root_module['ns3::Channel'])
     ## lte-vendor-specific-parameters.h (module 'lte'): ns3::SrsCqiRntiVsp [class]
@@ -1234,6 +1252,10 @@
     module.add_class('Vector3DValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## virtual-net-device.h (module 'virtual-net-device'): ns3::VirtualNetDevice [class]
     module.add_class('VirtualNetDevice', import_from_module='ns.virtual_net_device', parent=root_module['ns3::NetDevice'])
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): ns3::A2A4RsrqHandoverAlgorithm [class]
+    module.add_class('A2A4RsrqHandoverAlgorithm', parent=root_module['ns3::LteHandoverAlgorithm'])
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): ns3::A3RsrpHandoverAlgorithm [class]
+    module.add_class('A3RsrpHandoverAlgorithm', parent=root_module['ns3::LteHandoverAlgorithm'])
     ## address.h (module 'network'): ns3::AddressChecker [class]
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
@@ -1664,6 +1686,8 @@
     register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
     register_Ns3LogComponent_methods(root_module, root_module['ns3::LogComponent'])
     register_Ns3LogicalChannelConfigListElement_s_methods(root_module, root_module['ns3::LogicalChannelConfigListElement_s'])
+    register_Ns3LteAnrSapProvider_methods(root_module, root_module['ns3::LteAnrSapProvider'])
+    register_Ns3LteAnrSapUser_methods(root_module, root_module['ns3::LteAnrSapUser'])
     register_Ns3LteAsSapProvider_methods(root_module, root_module['ns3::LteAsSapProvider'])
     register_Ns3LteAsSapUser_methods(root_module, root_module['ns3::LteAsSapUser'])
     register_Ns3LteEnbCmacSapProvider_methods(root_module, root_module['ns3::LteEnbCmacSapProvider'])
@@ -1680,6 +1704,8 @@
     register_Ns3LteFfConverter_methods(root_module, root_module['ns3::LteFfConverter'])
     register_Ns3LteFlowId_t_methods(root_module, root_module['ns3::LteFlowId_t'])
     register_Ns3LteGlobalPathlossDatabase_methods(root_module, root_module['ns3::LteGlobalPathlossDatabase'])
+    register_Ns3LteHandoverManagementSapProvider_methods(root_module, root_module['ns3::LteHandoverManagementSapProvider'])
+    register_Ns3LteHandoverManagementSapUser_methods(root_module, root_module['ns3::LteHandoverManagementSapUser'])
     register_Ns3LteMacSapProvider_methods(root_module, root_module['ns3::LteMacSapProvider'])
     register_Ns3LteMacSapProviderReportBufferStatusParameters_methods(root_module, root_module['ns3::LteMacSapProvider::ReportBufferStatusParameters'])
     register_Ns3LteMacSapProviderTransmitPduParameters_methods(root_module, root_module['ns3::LteMacSapProvider::TransmitPduParameters'])
@@ -1699,6 +1725,7 @@
     register_Ns3LteRrcSapCarrierBandwidthEutra_methods(root_module, root_module['ns3::LteRrcSap::CarrierBandwidthEutra'])
     register_Ns3LteRrcSapCarrierFreqEutra_methods(root_module, root_module['ns3::LteRrcSap::CarrierFreqEutra'])
     register_Ns3LteRrcSapCellAccessRelatedInfo_methods(root_module, root_module['ns3::LteRrcSap::CellAccessRelatedInfo'])
+    register_Ns3LteRrcSapCellSelectionInfo_methods(root_module, root_module['ns3::LteRrcSap::CellSelectionInfo'])
     register_Ns3LteRrcSapCellsToAddMod_methods(root_module, root_module['ns3::LteRrcSap::CellsToAddMod'])
     register_Ns3LteRrcSapCgiInfo_methods(root_module, root_module['ns3::LteRrcSap::CgiInfo'])
     register_Ns3LteRrcSapDrbToAddMod_methods(root_module, root_module['ns3::LteRrcSap::DrbToAddMod'])
@@ -1895,7 +1922,6 @@
     register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
     register_Ns3TriangularRandomVariable_methods(root_module, root_module['ns3::TriangularRandomVariable'])
     register_Ns3UeManager_methods(root_module, root_module['ns3::UeManager'])
-    register_Ns3UeMeasure_methods(root_module, root_module['ns3::UeMeasure'])
     register_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
     register_Ns3VendorSpecificValue_methods(root_module, root_module['ns3::VendorSpecificValue'])
     register_Ns3WeibullRandomVariable_methods(root_module, root_module['ns3::WeibullRandomVariable'])
@@ -1965,11 +1991,13 @@
     register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
     register_Ns3LogNormalRandomVariable_methods(root_module, root_module['ns3::LogNormalRandomVariable'])
     register_Ns3LteAmc_methods(root_module, root_module['ns3::LteAmc'])
+    register_Ns3LteAnr_methods(root_module, root_module['ns3::LteAnr'])
     register_Ns3LteControlMessage_methods(root_module, root_module['ns3::LteControlMessage'])
     register_Ns3LteEnbMac_methods(root_module, root_module['ns3::LteEnbMac'])
     register_Ns3LteEnbRrc_methods(root_module, root_module['ns3::LteEnbRrc'])
     register_Ns3LteEnbRrcProtocolIdeal_methods(root_module, root_module['ns3::LteEnbRrcProtocolIdeal'])
     register_Ns3LteEnbRrcProtocolReal_methods(root_module, root_module['ns3::LteEnbRrcProtocolReal'])
+    register_Ns3LteHandoverAlgorithm_methods(root_module, root_module['ns3::LteHandoverAlgorithm'])
     register_Ns3LteHarqPhy_methods(root_module, root_module['ns3::LteHarqPhy'])
     register_Ns3LteHelper_methods(root_module, root_module['ns3::LteHelper'])
     register_Ns3LteHexGridEnbTopologyHelper_methods(root_module, root_module['ns3::LteHexGridEnbTopologyHelper'])
@@ -2001,9 +2029,9 @@
     register_Ns3MacStatsCalculator_methods(root_module, root_module['ns3::MacStatsCalculator'])
     register_Ns3MibLteControlMessage_methods(root_module, root_module['ns3::MibLteControlMessage'])
     register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
-    register_Ns3NeighbourRelation_methods(root_module, root_module['ns3::NeighbourRelation'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
+    register_Ns3NoOpHandoverAlgorithm_methods(root_module, root_module['ns3::NoOpHandoverAlgorithm'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
     register_Ns3NormalRandomVariable_methods(root_module, root_module['ns3::NormalRandomVariable'])
     register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
@@ -2014,6 +2042,7 @@
     register_Ns3PhyRxStatsCalculator_methods(root_module, root_module['ns3::PhyRxStatsCalculator'])
     register_Ns3PhyStatsCalculator_methods(root_module, root_module['ns3::PhyStatsCalculator'])
     register_Ns3PhyTxStatsCalculator_methods(root_module, root_module['ns3::PhyTxStatsCalculator'])
+    register_Ns3PointToPointEpcHelper_methods(root_module, root_module['ns3::PointToPointEpcHelper'])
     register_Ns3PointerChecker_methods(root_module, root_module['ns3::PointerChecker'])
     register_Ns3PointerValue_methods(root_module, root_module['ns3::PointerValue'])
     register_Ns3PssFfMacScheduler_methods(root_module, root_module['ns3::PssFfMacScheduler'])
@@ -2028,6 +2057,7 @@
     register_Ns3RrcDlDcchMessage_methods(root_module, root_module['ns3::RrcDlDcchMessage'])
     register_Ns3RrcUlCcchMessage_methods(root_module, root_module['ns3::RrcUlCcchMessage'])
     register_Ns3RrcUlDcchMessage_methods(root_module, root_module['ns3::RrcUlDcchMessage'])
+    register_Ns3Sib1LteControlMessage_methods(root_module, root_module['ns3::Sib1LteControlMessage'])
     register_Ns3SpectrumChannel_methods(root_module, root_module['ns3::SpectrumChannel'])
     register_Ns3SrsCqiRntiVsp_methods(root_module, root_module['ns3::SrsCqiRntiVsp'])
     register_Ns3StringChecker_methods(root_module, root_module['ns3::StringChecker'])
@@ -2046,6 +2076,8 @@
     register_Ns3Vector3DChecker_methods(root_module, root_module['ns3::Vector3DChecker'])
     register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue'])
     register_Ns3VirtualNetDevice_methods(root_module, root_module['ns3::VirtualNetDevice'])
+    register_Ns3A2A4RsrqHandoverAlgorithm_methods(root_module, root_module['ns3::A2A4RsrqHandoverAlgorithm'])
+    register_Ns3A3RsrpHandoverAlgorithm_methods(root_module, root_module['ns3::A3RsrpHandoverAlgorithm'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3BsrLteControlMessage_methods(root_module, root_module['ns3::BsrLteControlMessage'])
@@ -3143,10 +3175,10 @@
                    'void', 
                    [param('uint64_t', 'mmeUeS1Id'), param('uint16_t', 'enbUeS1Id'), param('std::list< ns3::EpcS1apSapMme::ErabSetupItem >', 'erabSetupList')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## epc-s1ap-sap.h (module 'lte'): void ns3::EpcS1apSapMme::InitialUeMessage(uint64_t mmeUeS1Id, uint16_t enbUeS1Id, uint64_t imsi, uint16_t ecgi) [member function]
+    ## epc-s1ap-sap.h (module 'lte'): void ns3::EpcS1apSapMme::InitialUeMessage(uint64_t mmeUeS1Id, uint16_t enbUeS1Id, uint64_t stmsi, uint16_t ecgi) [member function]
     cls.add_method('InitialUeMessage', 
                    'void', 
-                   [param('uint64_t', 'mmeUeS1Id'), param('uint16_t', 'enbUeS1Id'), param('uint64_t', 'imsi'), param('uint16_t', 'ecgi')], 
+                   [param('uint64_t', 'mmeUeS1Id'), param('uint16_t', 'enbUeS1Id'), param('uint64_t', 'stmsi'), param('uint16_t', 'ecgi')], 
                    is_pure_virtual=True, is_virtual=True)
     ## epc-s1ap-sap.h (module 'lte'): void ns3::EpcS1apSapMme::PathSwitchRequest(uint64_t enbUeS1Id, uint64_t mmeUeS1Id, uint16_t gci, std::list<ns3::EpcS1apSapMme::ErabSwitchedInDownlinkItem, std::allocator<ns3::EpcS1apSapMme::ErabSwitchedInDownlinkItem> > erabToBeSwitchedInDownlinkList) [member function]
     cls.add_method('PathSwitchRequest', 
@@ -3609,6 +3641,16 @@
     cls.add_constructor([])
     ## lte-common.h (module 'lte'): ns3::EutranMeasurementMapping::EutranMeasurementMapping(ns3::EutranMeasurementMapping const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::EutranMeasurementMapping const &', 'arg0')])
+    ## lte-common.h (module 'lte'): static int8_t ns3::EutranMeasurementMapping::ActualA3Offset2IeValue(double a3OffsetDb) [member function]
+    cls.add_method('ActualA3Offset2IeValue', 
+                   'int8_t', 
+                   [param('double', 'a3OffsetDb')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static uint8_t ns3::EutranMeasurementMapping::ActualHysteresis2IeValue(double hysteresisDb) [member function]
+    cls.add_method('ActualHysteresis2IeValue', 
+                   'uint8_t', 
+                   [param('double', 'hysteresisDb')], 
+                   is_static=True)
     ## lte-common.h (module 'lte'): static uint8_t ns3::EutranMeasurementMapping::Db2RsrqRange(double db) [member function]
     cls.add_method('Db2RsrqRange', 
                    'uint8_t', 
@@ -3619,6 +3661,26 @@
                    'uint8_t', 
                    [param('double', 'dbm')], 
                    is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::IeValue2ActualA3Offset(int8_t a3OffsetIeValue) [member function]
+    cls.add_method('IeValue2ActualA3Offset', 
+                   'double', 
+                   [param('int8_t', 'a3OffsetIeValue')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::IeValue2ActualHysteresis(uint8_t hysteresisIeValue) [member function]
+    cls.add_method('IeValue2ActualHysteresis', 
+                   'double', 
+                   [param('uint8_t', 'hysteresisIeValue')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::IeValue2ActualQQualMin(int8_t qQualMinIeValue) [member function]
+    cls.add_method('IeValue2ActualQQualMin', 
+                   'double', 
+                   [param('int8_t', 'qQualMinIeValue')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::IeValue2ActualQRxLevMin(int8_t qRxLevMinIeValue) [member function]
+    cls.add_method('IeValue2ActualQRxLevMin', 
+                   'double', 
+                   [param('int8_t', 'qRxLevMinIeValue')], 
+                   is_static=True)
     ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::QuantizeRsrp(double v) [member function]
     cls.add_method('QuantizeRsrp', 
                    'double', 
@@ -4939,10 +5001,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -5210,6 +5273,50 @@
     cls.add_instance_attribute('m_qosBearerType', 'ns3::LogicalChannelConfigListElement_s::QosBearerType_e', is_const=False)
     return
 
+def register_Ns3LteAnrSapProvider_methods(root_module, cls):
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapProvider::LteAnrSapProvider() [constructor]
+    cls.add_constructor([])
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapProvider::LteAnrSapProvider(ns3::LteAnrSapProvider const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteAnrSapProvider const &', 'arg0')])
+    ## lte-anr-sap.h (module 'lte'): void ns3::LteAnrSapProvider::AddNeighbourRelation(uint16_t cellId) [member function]
+    cls.add_method('AddNeighbourRelation', 
+                   'void', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-anr-sap.h (module 'lte'): bool ns3::LteAnrSapProvider::GetNoHo(uint16_t cellId) const [member function]
+    cls.add_method('GetNoHo', 
+                   'bool', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## lte-anr-sap.h (module 'lte'): bool ns3::LteAnrSapProvider::GetNoRemove(uint16_t cellId) const [member function]
+    cls.add_method('GetNoRemove', 
+                   'bool', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## lte-anr-sap.h (module 'lte'): bool ns3::LteAnrSapProvider::GetNoX2(uint16_t cellId) const [member function]
+    cls.add_method('GetNoX2', 
+                   'bool', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## lte-anr-sap.h (module 'lte'): void ns3::LteAnrSapProvider::ReportUeMeas(ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('ReportUeMeas', 
+                   'void', 
+                   [param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3LteAnrSapUser_methods(root_module, cls):
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapUser::LteAnrSapUser() [constructor]
+    cls.add_constructor([])
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapUser::LteAnrSapUser(ns3::LteAnrSapUser const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteAnrSapUser const &', 'arg0')])
+    ## lte-anr-sap.h (module 'lte'): uint8_t ns3::LteAnrSapUser::AddUeMeasReportConfigForAnr(ns3::LteRrcSap::ReportConfigEutra reportConfig) [member function]
+    cls.add_method('AddUeMeasReportConfigForAnr', 
+                   'uint8_t', 
+                   [param('ns3::LteRrcSap::ReportConfigEutra', 'reportConfig')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
 def register_Ns3LteAsSapProvider_methods(root_module, cls):
     ## lte-as-sap.h (module 'lte'): ns3::LteAsSapProvider::LteAsSapProvider() [constructor]
     cls.add_constructor([])
@@ -5225,16 +5332,26 @@
                    'void', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::ForceCampedOnEnb(uint16_t cellId, uint16_t earfcn) [member function]
+    ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::ForceCampedOnEnb(uint16_t cellId, uint16_t dlEarfcn) [member function]
     cls.add_method('ForceCampedOnEnb', 
                    'void', 
-                   [param('uint16_t', 'cellId'), param('uint16_t', 'earfcn')], 
+                   [param('uint16_t', 'cellId'), param('uint16_t', 'dlEarfcn')], 
                    is_pure_virtual=True, is_virtual=True)
     ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::SendData(ns3::Ptr<ns3::Packet> packet, uint8_t bid) [member function]
     cls.add_method('SendData', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint8_t', 'bid')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::SetCsgWhiteList(uint32_t csgId) [member function]
+    cls.add_method('SetCsgWhiteList', 
+                   'void', 
+                   [param('uint32_t', 'csgId')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::StartCellSelection(uint16_t dlEarfcn) [member function]
+    cls.add_method('StartCellSelection', 
+                   'void', 
+                   [param('uint16_t', 'dlEarfcn')], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3LteAsSapUser_methods(root_module, cls):
@@ -5451,6 +5568,11 @@
                    'void', 
                    [param('uint16_t', 'rnti'), param('uint16_t', 'srsCi')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## lte-enb-cphy-sap.h (module 'lte'): void ns3::LteEnbCphySapProvider::SetSystemInformationBlockType1(ns3::LteRrcSap::SystemInformationBlockType1 sib1) [member function]
+    cls.add_method('SetSystemInformationBlockType1', 
+                   'void', 
+                   [param('ns3::LteRrcSap::SystemInformationBlockType1', 'sib1')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## lte-enb-cphy-sap.h (module 'lte'): void ns3::LteEnbCphySapProvider::SetTransmissionMode(uint16_t rnti, uint8_t txMode) [member function]
     cls.add_method('SetTransmissionMode', 
                    'void', 
@@ -5586,6 +5708,35 @@
                    is_pure_virtual=True, is_virtual=True)
     return
 
+def register_Ns3LteHandoverManagementSapProvider_methods(root_module, cls):
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapProvider::LteHandoverManagementSapProvider() [constructor]
+    cls.add_constructor([])
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapProvider::LteHandoverManagementSapProvider(ns3::LteHandoverManagementSapProvider const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteHandoverManagementSapProvider const &', 'arg0')])
+    ## lte-handover-management-sap.h (module 'lte'): void ns3::LteHandoverManagementSapProvider::ReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('ReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3LteHandoverManagementSapUser_methods(root_module, cls):
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapUser::LteHandoverManagementSapUser() [constructor]
+    cls.add_constructor([])
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapUser::LteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteHandoverManagementSapUser const &', 'arg0')])
+    ## lte-handover-management-sap.h (module 'lte'): uint8_t ns3::LteHandoverManagementSapUser::AddUeMeasReportConfigForHandover(ns3::LteRrcSap::ReportConfigEutra reportConfig) [member function]
+    cls.add_method('AddUeMeasReportConfigForHandover', 
+                   'uint8_t', 
+                   [param('ns3::LteRrcSap::ReportConfigEutra', 'reportConfig')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-handover-management-sap.h (module 'lte'): void ns3::LteHandoverManagementSapUser::TriggerHandover(uint16_t rnti, uint16_t targetCellId) [member function]
+    cls.add_method('TriggerHandover', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('uint16_t', 'targetCellId')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
 def register_Ns3LteMacSapProvider_methods(root_module, cls):
     ## lte-mac-sap.h (module 'lte'): ns3::LteMacSapProvider::LteMacSapProvider() [constructor]
     cls.add_constructor([])
@@ -5864,6 +6015,17 @@
     cls.add_instance_attribute('plmnIdentityInfo', 'ns3::LteRrcSap::PlmnIdentityInfo', is_const=False)
     return
 
+def register_Ns3LteRrcSapCellSelectionInfo_methods(root_module, cls):
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo::CellSelectionInfo() [constructor]
+    cls.add_constructor([])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo::CellSelectionInfo(ns3::LteRrcSap::CellSelectionInfo const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteRrcSap::CellSelectionInfo const &', 'arg0')])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo::qQualMin [variable]
+    cls.add_instance_attribute('qQualMin', 'int8_t', is_const=False)
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo::qRxLevMin [variable]
+    cls.add_instance_attribute('qRxLevMin', 'int8_t', is_const=False)
+    return
+
 def register_Ns3LteRrcSapCellsToAddMod_methods(root_module, cls):
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellsToAddMod::CellsToAddMod() [constructor]
     cls.add_constructor([])
@@ -6276,10 +6438,10 @@
     return
 
 def register_Ns3LteRrcSapReportConfigEutra_methods(root_module, cls):
-    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::ReportConfigEutra() [constructor]
-    cls.add_constructor([])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::ReportConfigEutra(ns3::LteRrcSap::ReportConfigEutra const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteRrcSap::ReportConfigEutra const &', 'arg0')])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::ReportConfigEutra() [constructor]
+    cls.add_constructor([])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::a3Offset [variable]
     cls.add_instance_attribute('a3Offset', 'int8_t', is_const=False)
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::hysteresis [variable]
@@ -6504,6 +6666,8 @@
     cls.add_constructor([param('ns3::LteRrcSap::SystemInformationBlockType1 const &', 'arg0')])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::SystemInformationBlockType1::cellAccessRelatedInfo [variable]
     cls.add_instance_attribute('cellAccessRelatedInfo', 'ns3::LteRrcSap::CellAccessRelatedInfo', is_const=False)
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::SystemInformationBlockType1::cellSelectionInfo [variable]
+    cls.add_instance_attribute('cellSelectionInfo', 'ns3::LteRrcSap::CellSelectionInfo', is_const=False)
     return
 
 def register_Ns3LteRrcSapSystemInformationBlockType2_methods(root_module, cls):
@@ -6712,8 +6876,18 @@
                    'void', 
                    [param('uint8_t', 'txMode')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapProvider::SyncronizeWithEnb(uint16_t cellId, uint16_t dlEarfcn) [member function]
-    cls.add_method('SyncronizeWithEnb', 
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapProvider::StartCellSearch(uint16_t dlEarfcn) [member function]
+    cls.add_method('StartCellSearch', 
+                   'void', 
+                   [param('uint16_t', 'dlEarfcn')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapProvider::SynchronizeWithEnb(uint16_t cellId) [member function]
+    cls.add_method('SynchronizeWithEnb', 
+                   'void', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapProvider::SynchronizeWithEnb(uint16_t cellId, uint16_t dlEarfcn) [member function]
+    cls.add_method('SynchronizeWithEnb', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint16_t', 'dlEarfcn')], 
                    is_pure_virtual=True, is_virtual=True)
@@ -6724,10 +6898,15 @@
     cls.add_constructor([])
     ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::LteUeCphySapUser(ns3::LteUeCphySapUser const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteUeCphySapUser const &', 'arg0')])
-    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::RecvMasterInformationBlock(ns3::LteRrcSap::MasterInformationBlock mib) [member function]
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::RecvMasterInformationBlock(uint16_t cellId, ns3::LteRrcSap::MasterInformationBlock mib) [member function]
     cls.add_method('RecvMasterInformationBlock', 
                    'void', 
-                   [param('ns3::LteRrcSap::MasterInformationBlock', 'mib')], 
+                   [param('uint16_t', 'cellId'), param('ns3::LteRrcSap::MasterInformationBlock', 'mib')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::RecvSystemInformationBlockType1(uint16_t cellId, ns3::LteRrcSap::SystemInformationBlockType1 sib1) [member function]
+    cls.add_method('RecvSystemInformationBlockType1', 
+                   'void', 
+                   [param('uint16_t', 'cellId'), param('ns3::LteRrcSap::SystemInformationBlockType1', 'sib1')], 
                    is_pure_virtual=True, is_virtual=True)
     ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::ReportUeMeasurements(ns3::LteUeCphySapUser::UeMeasurementsParameters params) [member function]
     cls.add_method('ReportUeMeasurements', 
@@ -6812,11 +6991,6 @@
                    'void', 
                    [param('ns3::LteUeRrcSapProvider::CompleteSetupParameters', 'params')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapProvider::RecvMasterInformationBlock(ns3::LteRrcSap::MasterInformationBlock msg) [member function]
-    cls.add_method('RecvMasterInformationBlock', 
-                   'void', 
-                   [param('ns3::LteRrcSap::MasterInformationBlock', 'msg')], 
-                   is_pure_virtual=True, is_virtual=True)
     ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapProvider::RecvRrcConnectionReconfiguration(ns3::LteRrcSap::RrcConnectionReconfiguration msg) [member function]
     cls.add_method('RecvRrcConnectionReconfiguration', 
                    'void', 
@@ -6852,11 +7026,6 @@
                    'void', 
                    [param('ns3::LteRrcSap::SystemInformation', 'msg')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapProvider::RecvSystemInformationBlockType1(ns3::LteRrcSap::SystemInformationBlockType1 msg) [member function]
-    cls.add_method('RecvSystemInformationBlockType1', 
-                   'void', 
-                   [param('ns3::LteRrcSap::SystemInformationBlockType1', 'msg')], 
-                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3LteUeRrcSapProviderCompleteSetupParameters_methods(root_module, cls):
@@ -8833,10 +9002,10 @@
     cls.add_method('SetBid', 
                    'void', 
                    [param('uint8_t', 'bid')])
-    ## eps-bearer-tag.h (module 'lte'): void ns3::EpsBearerTag::SetRnti(uint16_t tid) [member function]
+    ## eps-bearer-tag.h (module 'lte'): void ns3::EpsBearerTag::SetRnti(uint16_t rnti) [member function]
     cls.add_method('SetRnti', 
                    'void', 
-                   [param('uint16_t', 'tid')])
+                   [param('uint16_t', 'rnti')])
     return
 
 def register_Ns3Header_methods(root_module, cls):
@@ -9262,11 +9431,6 @@
                    'void', 
                    [param('ns3::LteRrcSap::SystemInformation', 'msg')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-rrc-sap.h (module 'lte'): void ns3::LteEnbRrcSapUser::SendSystemInformationBlockType1(ns3::LteRrcSap::SystemInformationBlockType1 msg) [member function]
-    cls.add_method('SendSystemInformationBlockType1', 
-                   'void', 
-                   [param('ns3::LteRrcSap::SystemInformationBlockType1', 'msg')], 
-                   is_pure_virtual=True, is_virtual=True)
     ## lte-rrc-sap.h (module 'lte'): void ns3::LteEnbRrcSapUser::SetupUe(uint16_t rnti, ns3::LteEnbRrcSapUser::SetupUeParameters params) [member function]
     cls.add_method('SetupUe', 
                    'void', 
@@ -9438,18 +9602,18 @@
                    'void', 
                    [param('ns3::TagBuffer', 'i')], 
                    is_const=True, is_virtual=True)
-    ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetLayer(uint8_t lcid) [member function]
+    ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetLayer(uint8_t layer) [member function]
     cls.add_method('SetLayer', 
                    'void', 
-                   [param('uint8_t', 'lcid')])
+                   [param('uint8_t', 'layer')])
     ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetLcid(uint8_t lcid) [member function]
     cls.add_method('SetLcid', 
                    'void', 
                    [param('uint8_t', 'lcid')])
-    ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetRnti(uint16_t tid) [member function]
+    ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetRnti(uint16_t rnti) [member function]
     cls.add_method('SetRnti', 
                    'void', 
-                   [param('uint16_t', 'tid')])
+                   [param('uint16_t', 'rnti')])
     return
 
 def register_Ns3LteRlcAmHeader_methods(root_module, cls):
@@ -11203,6 +11367,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -11213,6 +11382,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -11228,6 +11402,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -11253,6 +11432,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -11467,30 +11651,34 @@
     cls.add_method('GetErabList', 
                    'std::vector< ns3::EpcX2Sap::ErabToBeSetupItem >', 
                    [])
-    ## lte-enb-rrc.h (module 'lte'): uint64_t ns3::UeManager::GetImsi() [member function]
+    ## lte-enb-rrc.h (module 'lte'): uint64_t ns3::UeManager::GetImsi() const [member function]
     cls.add_method('GetImsi', 
                    'uint64_t', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-enb-rrc.h (module 'lte'): ns3::LteRrcSap::RadioResourceConfigDedicated ns3::UeManager::GetRadioResourceConfigForHandoverPreparationInfo() [member function]
     cls.add_method('GetRadioResourceConfigForHandoverPreparationInfo', 
                    'ns3::LteRrcSap::RadioResourceConfigDedicated', 
                    [])
-    ## lte-enb-rrc.h (module 'lte'): uint16_t ns3::UeManager::GetRnti() [member function]
+    ## lte-enb-rrc.h (module 'lte'): uint16_t ns3::UeManager::GetRnti() const [member function]
     cls.add_method('GetRnti', 
                    'uint16_t', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-enb-rrc.h (module 'lte'): ns3::LteRrcSap::RrcConnectionReconfiguration ns3::UeManager::GetRrcConnectionReconfigurationForHandover() [member function]
     cls.add_method('GetRrcConnectionReconfigurationForHandover', 
                    'ns3::LteRrcSap::RrcConnectionReconfiguration', 
                    [])
-    ## lte-enb-rrc.h (module 'lte'): uint16_t ns3::UeManager::GetSrsConfigurationIndex() [member function]
+    ## lte-enb-rrc.h (module 'lte'): uint16_t ns3::UeManager::GetSrsConfigurationIndex() const [member function]
     cls.add_method('GetSrsConfigurationIndex', 
                    'uint16_t', 
-                   [])
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeManager::State ns3::UeManager::GetState() [member function]
+                   [], 
+                   is_const=True)
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeManager::State ns3::UeManager::GetState() const [member function]
     cls.add_method('GetState', 
                    'ns3::UeManager::State', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-enb-rrc.h (module 'lte'): static ns3::TypeId ns3::UeManager::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -11592,19 +11780,6 @@
                    visibility='protected', is_virtual=True)
     return
 
-def register_Ns3UeMeasure_methods(root_module, cls):
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::UeMeasure() [constructor]
-    cls.add_constructor([])
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::UeMeasure(ns3::UeMeasure const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::UeMeasure const &', 'arg0')])
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_cellId [variable]
-    cls.add_instance_attribute('m_cellId', 'uint16_t', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_rsrp [variable]
-    cls.add_instance_attribute('m_rsrp', 'uint8_t', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_rsrq [variable]
-    cls.add_instance_attribute('m_rsrq', 'uint8_t', is_const=False)
-    return
-
 def register_Ns3UniformRandomVariable_methods(root_module, cls):
     ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::UniformRandomVariable::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -12757,23 +12932,28 @@
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::ActivateEpsBearer(ns3::Ptr<ns3::NetDevice> ueLteDevice, uint64_t imsi, ns3::Ptr<ns3::EpcTft> tft, ns3::EpsBearer bearer) [member function]
     cls.add_method('ActivateEpsBearer', 
                    'void', 
-                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi'), param('ns3::Ptr< ns3::EpcTft >', 'tft'), param('ns3::EpsBearer', 'bearer')])
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi'), param('ns3::Ptr< ns3::EpcTft >', 'tft'), param('ns3::EpsBearer', 'bearer')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::AddEnb(ns3::Ptr<ns3::Node> enbNode, ns3::Ptr<ns3::NetDevice> lteEnbNetDevice, uint16_t cellId) [member function]
     cls.add_method('AddEnb', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Node >', 'enbNode'), param('ns3::Ptr< ns3::NetDevice >', 'lteEnbNetDevice'), param('uint16_t', 'cellId')])
+                   [param('ns3::Ptr< ns3::Node >', 'enbNode'), param('ns3::Ptr< ns3::NetDevice >', 'lteEnbNetDevice'), param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::AddUe(ns3::Ptr<ns3::NetDevice> ueLteDevice, uint64_t imsi) [member function]
     cls.add_method('AddUe', 
                    'void', 
-                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi')])
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::AddX2Interface(ns3::Ptr<ns3::Node> enbNode1, ns3::Ptr<ns3::Node> enbNode2) [member function]
     cls.add_method('AddX2Interface', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Node >', 'enbNode1'), param('ns3::Ptr< ns3::Node >', 'enbNode2')])
+                   [param('ns3::Ptr< ns3::Node >', 'enbNode1'), param('ns3::Ptr< ns3::Node >', 'enbNode2')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): ns3::Ipv4InterfaceContainer ns3::EpcHelper::AssignUeIpv4Address(ns3::NetDeviceContainer ueDevices) [member function]
     cls.add_method('AssignUeIpv4Address', 
                    'ns3::Ipv4InterfaceContainer', 
-                   [param('ns3::NetDeviceContainer', 'ueDevices')])
+                   [param('ns3::NetDeviceContainer', 'ueDevices')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -12782,7 +12962,8 @@
     ## epc-helper.h (module 'lte'): ns3::Ptr<ns3::Node> ns3::EpcHelper::GetPgwNode() [member function]
     cls.add_method('GetPgwNode', 
                    'ns3::Ptr< ns3::Node >', 
-                   [])
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): static ns3::TypeId ns3::EpcHelper::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -12791,7 +12972,8 @@
     ## epc-helper.h (module 'lte'): ns3::Ipv4Address ns3::EpcHelper::GetUeDefaultGatewayAddress() [member function]
     cls.add_method('GetUeDefaultGatewayAddress', 
                    'ns3::Ipv4Address', 
-                   [])
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3EpcMme_methods(root_module, cls):
@@ -12803,10 +12985,10 @@
     cls.add_method('AddBearer', 
                    'void', 
                    [param('uint64_t', 'imsi'), param('ns3::Ptr< ns3::EpcTft >', 'tft'), param('ns3::EpsBearer', 'bearer')])
-    ## epc-mme.h (module 'lte'): void ns3::EpcMme::AddEnb(uint16_t egci, ns3::Ipv4Address enbS1UAddr, ns3::EpcS1apSapEnb * enbS1apSap) [member function]
+    ## epc-mme.h (module 'lte'): void ns3::EpcMme::AddEnb(uint16_t ecgi, ns3::Ipv4Address enbS1UAddr, ns3::EpcS1apSapEnb * enbS1apSap) [member function]
     cls.add_method('AddEnb', 
                    'void', 
-                   [param('uint16_t', 'egci'), param('ns3::Ipv4Address', 'enbS1UAddr'), param('ns3::EpcS1apSapEnb *', 'enbS1apSap')])
+                   [param('uint16_t', 'ecgi'), param('ns3::Ipv4Address', 'enbS1UAddr'), param('ns3::EpcS1apSapEnb *', 'enbS1apSap')])
     ## epc-mme.h (module 'lte'): void ns3::EpcMme::AddUe(uint64_t imsi) [member function]
     cls.add_method('AddUe', 
                    'void', 
@@ -12971,10 +13153,14 @@
     cls.add_method('ActivateEpsBearer', 
                    'void', 
                    [param('ns3::EpsBearer', 'bearer'), param('ns3::Ptr< ns3::EpcTft >', 'tft')])
-    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::Connect(uint16_t cellId, uint16_t earfcn) [member function]
+    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::Connect() [member function]
+    cls.add_method('Connect', 
+                   'void', 
+                   [])
+    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::Connect(uint16_t cellId, uint16_t dlEarfcn) [member function]
     cls.add_method('Connect', 
                    'void', 
-                   [param('uint16_t', 'cellId'), param('uint16_t', 'earfcn')])
+                   [param('uint16_t', 'cellId'), param('uint16_t', 'dlEarfcn')])
     ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::Disconnect() [member function]
     cls.add_method('Disconnect', 
                    'void', 
@@ -12988,6 +13174,16 @@
     cls.add_method('GetAsSapUser', 
                    'ns3::LteAsSapUser *', 
                    [])
+    ## epc-ue-nas.h (module 'lte'): uint32_t ns3::EpcUeNas::GetCsgId() const [member function]
+    cls.add_method('GetCsgId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## epc-ue-nas.h (module 'lte'): ns3::EpcUeNas::State ns3::EpcUeNas::GetState() const [member function]
+    cls.add_method('GetState', 
+                   'ns3::EpcUeNas::State', 
+                   [], 
+                   is_const=True)
     ## epc-ue-nas.h (module 'lte'): static ns3::TypeId ns3::EpcUeNas::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -13001,6 +13197,10 @@
     cls.add_method('SetAsSapProvider', 
                    'void', 
                    [param('ns3::LteAsSapProvider *', 's')])
+    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::SetCsgId(uint32_t csgId) [member function]
+    cls.add_method('SetCsgId', 
+                   'void', 
+                   [param('uint32_t', 'csgId')])
     ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::SetDevice(ns3::Ptr<ns3::NetDevice> dev) [member function]
     cls.add_method('SetDevice', 
                    'void', 
@@ -13013,6 +13213,10 @@
     cls.add_method('SetImsi', 
                    'void', 
                    [param('uint64_t', 'imsi')])
+    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::StartCellSelection(uint16_t dlEarfcn) [member function]
+    cls.add_method('StartCellSelection', 
+                   'void', 
+                   [param('uint16_t', 'dlEarfcn')])
     return
 
 def register_Ns3EpcX2_methods(root_module, cls):
@@ -14743,6 +14947,46 @@
                    is_static=True)
     return
 
+def register_Ns3LteAnr_methods(root_module, cls):
+    ## lte-anr.h (module 'lte'): ns3::LteAnr::LteAnr(ns3::LteAnr const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteAnr const &', 'arg0')])
+    ## lte-anr.h (module 'lte'): ns3::LteAnr::LteAnr(uint16_t servingCellId) [constructor]
+    cls.add_constructor([param('uint16_t', 'servingCellId')])
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::AddNeighbourRelation(uint16_t cellId) [member function]
+    cls.add_method('AddNeighbourRelation', 
+                   'void', 
+                   [param('uint16_t', 'cellId')])
+    ## lte-anr.h (module 'lte'): ns3::LteAnrSapProvider * ns3::LteAnr::GetLteAnrSapProvider() [member function]
+    cls.add_method('GetLteAnrSapProvider', 
+                   'ns3::LteAnrSapProvider *', 
+                   [], 
+                   is_virtual=True)
+    ## lte-anr.h (module 'lte'): static ns3::TypeId ns3::LteAnr::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::RemoveNeighbourRelation(uint16_t cellId) [member function]
+    cls.add_method('RemoveNeighbourRelation', 
+                   'void', 
+                   [param('uint16_t', 'cellId')])
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::SetLteAnrSapUser(ns3::LteAnrSapUser * s) [member function]
+    cls.add_method('SetLteAnrSapUser', 
+                   'void', 
+                   [param('ns3::LteAnrSapUser *', 's')], 
+                   is_virtual=True)
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3LteControlMessage_methods(root_module, cls):
     ## lte-control-messages.h (module 'lte'): ns3::LteControlMessage::LteControlMessage(ns3::LteControlMessage const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteControlMessage const &', 'arg0')])
@@ -14824,6 +15068,10 @@
     cls.add_constructor([param('ns3::LteEnbRrc const &', 'arg0')])
     ## lte-enb-rrc.h (module 'lte'): ns3::LteEnbRrc::LteEnbRrc() [constructor]
     cls.add_constructor([])
+    ## lte-enb-rrc.h (module 'lte'): uint8_t ns3::LteEnbRrc::AddUeMeasReportConfig(ns3::LteRrcSap::ReportConfigEutra config) [member function]
+    cls.add_method('AddUeMeasReportConfig', 
+                   'uint8_t', 
+                   [param('ns3::LteRrcSap::ReportConfigEutra', 'config')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::AddX2Neighbour(uint16_t cellId) [member function]
     cls.add_method('AddX2Neighbour', 
                    'void', 
@@ -14844,6 +15092,10 @@
     cls.add_method('GetEpcX2SapUser', 
                    'ns3::EpcX2SapUser *', 
                    [])
+    ## lte-enb-rrc.h (module 'lte'): ns3::LteAnrSapUser * ns3::LteEnbRrc::GetLteAnrSapUser() [member function]
+    cls.add_method('GetLteAnrSapUser', 
+                   'ns3::LteAnrSapUser *', 
+                   [])
     ## lte-enb-rrc.h (module 'lte'): ns3::LteEnbCmacSapUser * ns3::LteEnbRrc::GetLteEnbCmacSapUser() [member function]
     cls.add_method('GetLteEnbCmacSapUser', 
                    'ns3::LteEnbCmacSapUser *', 
@@ -14856,6 +15108,10 @@
     cls.add_method('GetLteEnbRrcSapProvider', 
                    'ns3::LteEnbRrcSapProvider *', 
                    [])
+    ## lte-enb-rrc.h (module 'lte'): ns3::LteHandoverManagementSapUser * ns3::LteEnbRrc::GetLteHandoverManagementSapUser() [member function]
+    cls.add_method('GetLteHandoverManagementSapUser', 
+                   'ns3::LteHandoverManagementSapUser *', 
+                   [])
     ## lte-enb-rrc.h (module 'lte'): ns3::EpcEnbS1SapUser * ns3::LteEnbRrc::GetS1SapUser() [member function]
     cls.add_method('GetS1SapUser', 
                    'ns3::EpcEnbS1SapUser *', 
@@ -14894,6 +15150,10 @@
     cls.add_method('SetCellId', 
                    'void', 
                    [param('uint16_t', 'm_cellId')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetCsgId(uint32_t csgId, bool csgIndication) [member function]
+    cls.add_method('SetCsgId', 
+                   'void', 
+                   [param('uint32_t', 'csgId'), param('bool', 'csgIndication')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetEpcX2SapProvider(ns3::EpcX2SapProvider * s) [member function]
     cls.add_method('SetEpcX2SapProvider', 
                    'void', 
@@ -14902,6 +15162,10 @@
     cls.add_method('SetForwardUpCallback', 
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'cb')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetLteAnrSapProvider(ns3::LteAnrSapProvider * s) [member function]
+    cls.add_method('SetLteAnrSapProvider', 
+                   'void', 
+                   [param('ns3::LteAnrSapProvider *', 's')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetLteEnbCmacSapProvider(ns3::LteEnbCmacSapProvider * s) [member function]
     cls.add_method('SetLteEnbCmacSapProvider', 
                    'void', 
@@ -14914,6 +15178,10 @@
     cls.add_method('SetLteEnbRrcSapUser', 
                    'void', 
                    [param('ns3::LteEnbRrcSapUser *', 's')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetLteHandoverManagementSapProvider(ns3::LteHandoverManagementSapProvider * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapProvider', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapProvider *', 's')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetLteMacSapProvider(ns3::LteMacSapProvider * s) [member function]
     cls.add_method('SetLteMacSapProvider', 
                    'void', 
@@ -15007,6 +15275,38 @@
                    [param('uint16_t', 'rnti'), param('ns3::LteUeRrcSapProvider *', 'p')])
     return
 
+def register_Ns3LteHandoverAlgorithm_methods(root_module, cls):
+    ## lte-handover-algorithm.h (module 'lte'): ns3::LteHandoverAlgorithm::LteHandoverAlgorithm(ns3::LteHandoverAlgorithm const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteHandoverAlgorithm const &', 'arg0')])
+    ## lte-handover-algorithm.h (module 'lte'): ns3::LteHandoverAlgorithm::LteHandoverAlgorithm() [constructor]
+    cls.add_constructor([])
+    ## lte-handover-algorithm.h (module 'lte'): ns3::LteHandoverManagementSapProvider * ns3::LteHandoverAlgorithm::GetLteHandoverManagementSapProvider() [member function]
+    cls.add_method('GetLteHandoverManagementSapProvider', 
+                   'ns3::LteHandoverManagementSapProvider *', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-handover-algorithm.h (module 'lte'): static ns3::TypeId ns3::LteHandoverAlgorithm::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## lte-handover-algorithm.h (module 'lte'): void ns3::LteHandoverAlgorithm::SetLteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapUser', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapUser *', 's')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-handover-algorithm.h (module 'lte'): void ns3::LteHandoverAlgorithm::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## lte-handover-algorithm.h (module 'lte'): void ns3::LteHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('DoReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3LteHarqPhy_methods(root_module, cls):
     ## lte-harq-phy.h (module 'lte'): ns3::LteHarqPhy::LteHarqPhy(ns3::LteHarqPhy const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteHarqPhy const &', 'arg0')])
@@ -15083,6 +15383,14 @@
     cls.add_method('AssignStreams', 
                    'int64_t', 
                    [param('ns3::NetDeviceContainer', 'c'), param('int64_t', 'stream')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::Attach(ns3::NetDeviceContainer ueDevices) [member function]
+    cls.add_method('Attach', 
+                   'void', 
+                   [param('ns3::NetDeviceContainer', 'ueDevices')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::Attach(ns3::Ptr<ns3::NetDevice> ueDevice) [member function]
+    cls.add_method('Attach', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueDevice')])
     ## lte-helper.h (module 'lte'): void ns3::LteHelper::Attach(ns3::NetDeviceContainer ueDevices, ns3::Ptr<ns3::NetDevice> enbDevice) [member function]
     cls.add_method('Attach', 
                    'void', 
@@ -15160,6 +15468,11 @@
     cls.add_method('EnableUlTxPhyTraces', 
                    'void', 
                    [])
+    ## lte-helper.h (module 'lte'): std::string ns3::LteHelper::GetHandoverAlgorithmType() const [member function]
+    cls.add_method('GetHandoverAlgorithmType', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
     ## lte-helper.h (module 'lte'): ns3::Ptr<ns3::RadioBearerStatsCalculator> ns3::LteHelper::GetPdcpStats() [member function]
     cls.add_method('GetPdcpStats', 
                    'ns3::Ptr< ns3::RadioBearerStatsCalculator >', 
@@ -15214,6 +15527,14 @@
     cls.add_method('SetFadingModelAttribute', 
                    'void', 
                    [param('std::string', 'n'), param('ns3::AttributeValue const &', 'v')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::SetHandoverAlgorithmAttribute(std::string n, ns3::AttributeValue const & v) [member function]
+    cls.add_method('SetHandoverAlgorithmAttribute', 
+                   'void', 
+                   [param('std::string', 'n'), param('ns3::AttributeValue const &', 'v')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::SetHandoverAlgorithmType(std::string type) [member function]
+    cls.add_method('SetHandoverAlgorithmType', 
+                   'void', 
+                   [param('std::string', 'type')])
     ## lte-helper.h (module 'lte'): void ns3::LteHelper::SetPathlossModelAttribute(std::string n, ns3::AttributeValue const & v) [member function]
     cls.add_method('SetPathlossModelAttribute', 
                    'void', 
@@ -15246,6 +15567,10 @@
     cls.add_method('SetUeAntennaModelType', 
                    'void', 
                    [param('std::string', 'type')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::SetUeDeviceAttribute(std::string n, ns3::AttributeValue const & v) [member function]
+    cls.add_method('SetUeDeviceAttribute', 
+                   'void', 
+                   [param('std::string', 'n'), param('ns3::AttributeValue const &', 'v')])
     ## lte-helper.h (module 'lte'): void ns3::LteHelper::DoInitialize() [member function]
     cls.add_method('DoInitialize', 
                    'void', 
@@ -15476,15 +15801,15 @@
     cls.add_method('GetUplinkSpectrumPhy', 
                    'ns3::Ptr< ns3::LteSpectrumPhy >', 
                    [])
-    ## lte-phy.h (module 'lte'): void ns3::LtePhy::ReportInterference(ns3::SpectrumValue const & power) [member function]
+    ## lte-phy.h (module 'lte'): void ns3::LtePhy::ReportInterference(ns3::SpectrumValue const & interf) [member function]
     cls.add_method('ReportInterference', 
                    'void', 
-                   [param('ns3::SpectrumValue const &', 'power')], 
+                   [param('ns3::SpectrumValue const &', 'interf')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-phy.h (module 'lte'): void ns3::LtePhy::ReportRsReceivedPower(ns3::SpectrumValue const & interf) [member function]
+    ## lte-phy.h (module 'lte'): void ns3::LtePhy::ReportRsReceivedPower(ns3::SpectrumValue const & power) [member function]
     cls.add_method('ReportRsReceivedPower', 
                    'void', 
-                   [param('ns3::SpectrumValue const &', 'interf')], 
+                   [param('ns3::SpectrumValue const &', 'power')], 
                    is_pure_virtual=True, is_virtual=True)
     ## lte-phy.h (module 'lte'): void ns3::LtePhy::SetControlMessages(ns3::Ptr<ns3::LteControlMessage> m) [member function]
     cls.add_method('SetControlMessages', 
@@ -16215,6 +16540,11 @@
                    'double', 
                    [], 
                    is_const=True)
+    ## lte-ue-phy.h (module 'lte'): ns3::LteUePhy::State ns3::LteUePhy::GetState() const [member function]
+    cls.add_method('GetState', 
+                   'ns3::LteUePhy::State', 
+                   [], 
+                   is_const=True)
     ## lte-ue-phy.h (module 'lte'): std::vector<int, std::allocator<int> > ns3::LteUePhy::GetSubChannelsForReception() [member function]
     cls.add_method('GetSubChannelsForReception', 
                    'std::vector< int >', 
@@ -16283,10 +16613,10 @@
     cls.add_method('SetLteUePhySapUser', 
                    'void', 
                    [param('ns3::LteUePhySapUser *', 's')])
-    ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::SetNoiseFigure(double pow) [member function]
+    ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::SetNoiseFigure(double nf) [member function]
     cls.add_method('SetNoiseFigure', 
                    'void', 
-                   [param('double', 'pow')])
+                   [param('double', 'nf')])
     ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::SetSubChannelsForReception(std::vector<int, std::allocator<int> > mask) [member function]
     cls.add_method('SetSubChannelsForReception', 
                    'void', 
@@ -16344,10 +16674,11 @@
                    'uint16_t', 
                    [], 
                    is_const=True)
-    ## lte-ue-rrc.h (module 'lte'): uint64_t ns3::LteUeRrc::GetImsi() [member function]
+    ## lte-ue-rrc.h (module 'lte'): uint64_t ns3::LteUeRrc::GetImsi() const [member function]
     cls.add_method('GetImsi', 
                    'uint64_t', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-ue-rrc.h (module 'lte'): ns3::LteUeCmacSapUser * ns3::LteUeRrc::GetLteUeCmacSapUser() [member function]
     cls.add_method('GetLteUeCmacSapUser', 
                    'ns3::LteUeCmacSapUser *', 
@@ -16365,10 +16696,11 @@
                    'uint16_t', 
                    [], 
                    is_const=True)
-    ## lte-ue-rrc.h (module 'lte'): ns3::LteUeRrc::State ns3::LteUeRrc::GetState() [member function]
+    ## lte-ue-rrc.h (module 'lte'): ns3::LteUeRrc::State ns3::LteUeRrc::GetState() const [member function]
     cls.add_method('GetState', 
                    'ns3::LteUeRrc::State', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-ue-rrc.h (module 'lte'): static ns3::TypeId ns3::LteUeRrc::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -16557,10 +16889,10 @@
     cls.add_method('SetUlOutputFilename', 
                    'void', 
                    [param('std::string', 'outputFilename')])
-    ## mac-stats-calculator.h (module 'lte'): void ns3::MacStatsCalculator::UlScheduling(uint16_t cellId, uint64_t imsi, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcs, uint16_t sizeTb) [member function]
+    ## mac-stats-calculator.h (module 'lte'): void ns3::MacStatsCalculator::UlScheduling(uint16_t cellId, uint64_t imsi, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcsTb, uint16_t sizeTb) [member function]
     cls.add_method('UlScheduling', 
                    'void', 
-                   [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcs'), param('uint16_t', 'sizeTb')])
+                   [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcsTb'), param('uint16_t', 'sizeTb')])
     ## mac-stats-calculator.h (module 'lte'): static void ns3::MacStatsCalculator::UlSchedulingCallback(ns3::Ptr<ns3::MacStatsCalculator> macStats, std::string path, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcs, uint16_t size) [member function]
     cls.add_method('UlSchedulingCallback', 
                    'void', 
@@ -16649,23 +16981,6 @@
                    is_pure_virtual=True, visibility='private', is_virtual=True)
     return
 
-def register_Ns3NeighbourRelation_methods(root_module, cls):
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::NeighbourRelation() [constructor]
-    cls.add_constructor([])
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::NeighbourRelation(ns3::NeighbourRelation const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::NeighbourRelation const &', 'arg0')])
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_detectedAsNeighbour [variable]
-    cls.add_instance_attribute('m_detectedAsNeighbour', 'bool', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noHo [variable]
-    cls.add_instance_attribute('m_noHo', 'bool', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noRemove [variable]
-    cls.add_instance_attribute('m_noRemove', 'bool', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noX2 [variable]
-    cls.add_instance_attribute('m_noX2', 'bool', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_physCellId [variable]
-    cls.add_instance_attribute('m_physCellId', 'uint16_t', is_const=False)
-    return
-
 def register_Ns3NetDevice_methods(root_module, cls):
     ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
     cls.add_constructor([])
@@ -16842,6 +17157,43 @@
                    is_const=True)
     return
 
+def register_Ns3NoOpHandoverAlgorithm_methods(root_module, cls):
+    ## no-op-handover-algorithm.h (module 'lte'): ns3::NoOpHandoverAlgorithm::NoOpHandoverAlgorithm(ns3::NoOpHandoverAlgorithm const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NoOpHandoverAlgorithm const &', 'arg0')])
+    ## no-op-handover-algorithm.h (module 'lte'): ns3::NoOpHandoverAlgorithm::NoOpHandoverAlgorithm() [constructor]
+    cls.add_constructor([])
+    ## no-op-handover-algorithm.h (module 'lte'): ns3::LteHandoverManagementSapProvider * ns3::NoOpHandoverAlgorithm::GetLteHandoverManagementSapProvider() [member function]
+    cls.add_method('GetLteHandoverManagementSapProvider', 
+                   'ns3::LteHandoverManagementSapProvider *', 
+                   [], 
+                   is_virtual=True)
+    ## no-op-handover-algorithm.h (module 'lte'): static ns3::TypeId ns3::NoOpHandoverAlgorithm::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## no-op-handover-algorithm.h (module 'lte'): void ns3::NoOpHandoverAlgorithm::SetLteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapUser', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapUser *', 's')], 
+                   is_virtual=True)
+    ## no-op-handover-algorithm.h (module 'lte'): void ns3::NoOpHandoverAlgorithm::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## no-op-handover-algorithm.h (module 'lte'): void ns3::NoOpHandoverAlgorithm::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## no-op-handover-algorithm.h (module 'lte'): void ns3::NoOpHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('DoReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3Node_methods(root_module, cls):
     ## node.h (module 'network'): ns3::Node::Node(ns3::Node const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Node const &', 'arg0')])
@@ -17434,6 +17786,58 @@
                    is_static=True)
     return
 
+def register_Ns3PointToPointEpcHelper_methods(root_module, cls):
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::PointToPointEpcHelper::PointToPointEpcHelper(ns3::PointToPointEpcHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointToPointEpcHelper const &', 'arg0')])
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::PointToPointEpcHelper::PointToPointEpcHelper() [constructor]
+    cls.add_constructor([])
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::ActivateEpsBearer(ns3::Ptr<ns3::NetDevice> ueLteDevice, uint64_t imsi, ns3::Ptr<ns3::EpcTft> tft, ns3::EpsBearer bearer) [member function]
+    cls.add_method('ActivateEpsBearer', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi'), param('ns3::Ptr< ns3::EpcTft >', 'tft'), param('ns3::EpsBearer', 'bearer')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::AddEnb(ns3::Ptr<ns3::Node> enbNode, ns3::Ptr<ns3::NetDevice> lteEnbNetDevice, uint16_t cellId) [member function]
+    cls.add_method('AddEnb', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'enbNode'), param('ns3::Ptr< ns3::NetDevice >', 'lteEnbNetDevice'), param('uint16_t', 'cellId')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::AddUe(ns3::Ptr<ns3::NetDevice> ueLteDevice, uint64_t imsi) [member function]
+    cls.add_method('AddUe', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::AddX2Interface(ns3::Ptr<ns3::Node> enbNode1, ns3::Ptr<ns3::Node> enbNode2) [member function]
+    cls.add_method('AddX2Interface', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'enbNode1'), param('ns3::Ptr< ns3::Node >', 'enbNode2')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::Ipv4InterfaceContainer ns3::PointToPointEpcHelper::AssignUeIpv4Address(ns3::NetDeviceContainer ueDevices) [member function]
+    cls.add_method('AssignUeIpv4Address', 
+                   'ns3::Ipv4InterfaceContainer', 
+                   [param('ns3::NetDeviceContainer', 'ueDevices')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::Ptr<ns3::Node> ns3::PointToPointEpcHelper::GetPgwNode() [member function]
+    cls.add_method('GetPgwNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): static ns3::TypeId ns3::PointToPointEpcHelper::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::Ipv4Address ns3::PointToPointEpcHelper::GetUeDefaultGatewayAddress() [member function]
+    cls.add_method('GetUeDefaultGatewayAddress', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_Ns3PointerChecker_methods(root_module, cls):
     ## pointer.h (module 'core'): ns3::PointerChecker::PointerChecker() [constructor]
     cls.add_constructor([])
@@ -18153,6 +18557,22 @@
                    is_const=True, visibility='protected')
     return
 
+def register_Ns3Sib1LteControlMessage_methods(root_module, cls):
+    ## lte-control-messages.h (module 'lte'): ns3::Sib1LteControlMessage::Sib1LteControlMessage(ns3::Sib1LteControlMessage const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Sib1LteControlMessage const &', 'arg0')])
+    ## lte-control-messages.h (module 'lte'): ns3::Sib1LteControlMessage::Sib1LteControlMessage() [constructor]
+    cls.add_constructor([])
+    ## lte-control-messages.h (module 'lte'): ns3::LteRrcSap::SystemInformationBlockType1 ns3::Sib1LteControlMessage::GetSib1() const [member function]
+    cls.add_method('GetSib1', 
+                   'ns3::LteRrcSap::SystemInformationBlockType1', 
+                   [], 
+                   is_const=True)
+    ## lte-control-messages.h (module 'lte'): void ns3::Sib1LteControlMessage::SetSib1(ns3::LteRrcSap::SystemInformationBlockType1 sib1) [member function]
+    cls.add_method('SetSib1', 
+                   'void', 
+                   [param('ns3::LteRrcSap::SystemInformationBlockType1', 'sib1')])
+    return
+
 def register_Ns3SpectrumChannel_methods(root_module, cls):
     ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel::SpectrumChannel() [constructor]
     cls.add_constructor([])
@@ -18763,6 +19183,80 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3A2A4RsrqHandoverAlgorithm_methods(root_module, cls):
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): ns3::A2A4RsrqHandoverAlgorithm::A2A4RsrqHandoverAlgorithm(ns3::A2A4RsrqHandoverAlgorithm const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::A2A4RsrqHandoverAlgorithm const &', 'arg0')])
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): ns3::A2A4RsrqHandoverAlgorithm::A2A4RsrqHandoverAlgorithm() [constructor]
+    cls.add_constructor([])
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): ns3::LteHandoverManagementSapProvider * ns3::A2A4RsrqHandoverAlgorithm::GetLteHandoverManagementSapProvider() [member function]
+    cls.add_method('GetLteHandoverManagementSapProvider', 
+                   'ns3::LteHandoverManagementSapProvider *', 
+                   [], 
+                   is_virtual=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): static ns3::TypeId ns3::A2A4RsrqHandoverAlgorithm::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): void ns3::A2A4RsrqHandoverAlgorithm::SetLteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapUser', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapUser *', 's')], 
+                   is_virtual=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): void ns3::A2A4RsrqHandoverAlgorithm::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): void ns3::A2A4RsrqHandoverAlgorithm::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): void ns3::A2A4RsrqHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('DoReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3A3RsrpHandoverAlgorithm_methods(root_module, cls):
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): ns3::A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm(ns3::A3RsrpHandoverAlgorithm const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::A3RsrpHandoverAlgorithm const &', 'arg0')])
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): ns3::A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm() [constructor]
+    cls.add_constructor([])
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): ns3::LteHandoverManagementSapProvider * ns3::A3RsrpHandoverAlgorithm::GetLteHandoverManagementSapProvider() [member function]
+    cls.add_method('GetLteHandoverManagementSapProvider', 
+                   'ns3::LteHandoverManagementSapProvider *', 
+                   [], 
+                   is_virtual=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): static ns3::TypeId ns3::A3RsrpHandoverAlgorithm::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): void ns3::A3RsrpHandoverAlgorithm::SetLteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapUser', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapUser *', 's')], 
+                   is_virtual=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): void ns3::A3RsrpHandoverAlgorithm::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): void ns3::A3RsrpHandoverAlgorithm::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): void ns3::A3RsrpHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('DoReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3AddressChecker_methods(root_module, cls):
     ## address.h (module 'network'): ns3::AddressChecker::AddressChecker() [constructor]
     cls.add_constructor([])
@@ -18812,10 +19306,10 @@
     cls.add_method('GetBsr', 
                    'ns3::MacCeListElement_s', 
                    [])
-    ## lte-control-messages.h (module 'lte'): void ns3::BsrLteControlMessage::SetBsr(ns3::MacCeListElement_s ulcqi) [member function]
+    ## lte-control-messages.h (module 'lte'): void ns3::BsrLteControlMessage::SetBsr(ns3::MacCeListElement_s bsr) [member function]
     cls.add_method('SetBsr', 
                    'void', 
-                   [param('ns3::MacCeListElement_s', 'ulcqi')])
+                   [param('ns3::MacCeListElement_s', 'bsr')])
     return
 
 def register_Ns3DlCqiLteControlMessage_methods(root_module, cls):
@@ -19224,10 +19718,10 @@
                    'void', 
                    [param('ns3::SpectrumValue const &', 'interf')], 
                    is_virtual=True)
-    ## lte-enb-phy.h (module 'lte'): void ns3::LteEnbPhy::ReportRsReceivedPower(ns3::SpectrumValue const & interf) [member function]
+    ## lte-enb-phy.h (module 'lte'): void ns3::LteEnbPhy::ReportRsReceivedPower(ns3::SpectrumValue const & power) [member function]
     cls.add_method('ReportRsReceivedPower', 
                    'void', 
-                   [param('ns3::SpectrumValue const &', 'interf')], 
+                   [param('ns3::SpectrumValue const &', 'power')], 
                    is_virtual=True)
     ## lte-enb-phy.h (module 'lte'): void ns3::LteEnbPhy::SendControlChannels(std::list<ns3::Ptr<ns3::LteControlMessage>, std::allocator<ns3::Ptr<ns3::LteControlMessage> > > ctrlMsgList) [member function]
     cls.add_method('SendControlChannels', 
@@ -19466,8 +19960,6 @@
                    is_static=True)
     ## lte-ue-net-device.h (module 'lte'): ns3::LteUeNetDevice::LteUeNetDevice() [constructor]
     cls.add_constructor([])
-    ## lte-ue-net-device.h (module 'lte'): ns3::LteUeNetDevice::LteUeNetDevice(ns3::Ptr<ns3::Node> node, ns3::Ptr<ns3::LteUePhy> phy, ns3::Ptr<ns3::LteUeMac> mac, ns3::Ptr<ns3::LteUeRrc> rrc, ns3::Ptr<ns3::EpcUeNas> nas, uint64_t imsi) [constructor]
-    cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::LteUePhy >', 'phy'), param('ns3::Ptr< ns3::LteUeMac >', 'mac'), param('ns3::Ptr< ns3::LteUeRrc >', 'rrc'), param('ns3::Ptr< ns3::EpcUeNas >', 'nas'), param('uint64_t', 'imsi')])
     ## lte-ue-net-device.h (module 'lte'): void ns3::LteUeNetDevice::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -19503,6 +19995,24 @@
                    'uint64_t', 
                    [], 
                    is_const=True)
+    ## lte-ue-net-device.h (module 'lte'): uint16_t ns3::LteUeNetDevice::GetDlEarfcn() const [member function]
+    cls.add_method('GetDlEarfcn', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## lte-ue-net-device.h (module 'lte'): void ns3::LteUeNetDevice::SetDlEarfcn(uint16_t earfcn) [member function]
+    cls.add_method('SetDlEarfcn', 
+                   'void', 
+                   [param('uint16_t', 'earfcn')])
+    ## lte-ue-net-device.h (module 'lte'): uint32_t ns3::LteUeNetDevice::GetCsgId() const [member function]
+    cls.add_method('GetCsgId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## lte-ue-net-device.h (module 'lte'): void ns3::LteUeNetDevice::SetCsgId(uint32_t csgId) [member function]
+    cls.add_method('SetCsgId', 
+                   'void', 
+                   [param('uint32_t', 'csgId')])
     ## lte-ue-net-device.h (module 'lte'): void ns3::LteUeNetDevice::SetTargetEnb(ns3::Ptr<ns3::LteEnbNetDevice> enb) [member function]
     cls.add_method('SetTargetEnb', 
                    'void', 
@@ -20108,6 +20618,24 @@
     cls.add_method('SetUlEarfcn', 
                    'void', 
                    [param('uint16_t', 'earfcn')])
+    ## lte-enb-net-device.h (module 'lte'): uint32_t ns3::LteEnbNetDevice::GetCsgId() const [member function]
+    cls.add_method('GetCsgId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## lte-enb-net-device.h (module 'lte'): void ns3::LteEnbNetDevice::SetCsgId(uint32_t csgId) [member function]
+    cls.add_method('SetCsgId', 
+                   'void', 
+                   [param('uint32_t', 'csgId')])
+    ## lte-enb-net-device.h (module 'lte'): bool ns3::LteEnbNetDevice::GetCsgIndication() const [member function]
+    cls.add_method('GetCsgIndication', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## lte-enb-net-device.h (module 'lte'): void ns3::LteEnbNetDevice::SetCsgIndication(bool csgIndication) [member function]
+    cls.add_method('SetCsgIndication', 
+                   'void', 
+                   [param('bool', 'csgIndication')])
     ## lte-enb-net-device.h (module 'lte'): void ns3::LteEnbNetDevice::DoInitialize() [member function]
     cls.add_method('DoInitialize', 
                    'void', 
diff -Naur ns-3.18.1/src/lte/bindings/modulegen__gcc_LP64.py ns-3.19/src/lte/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/lte/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -354,6 +354,10 @@
     module.add_enum('Direction_e', ['DIR_UL', 'DIR_DL', 'DIR_BOTH'], outer_class=root_module['ns3::LogicalChannelConfigListElement_s'])
     ## ff-mac-common.h (module 'lte'): ns3::LogicalChannelConfigListElement_s::QosBearerType_e [enumeration]
     module.add_enum('QosBearerType_e', ['QBT_NON_GBR', 'QBT_GBR'], outer_class=root_module['ns3::LogicalChannelConfigListElement_s'])
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapProvider [class]
+    module.add_class('LteAnrSapProvider', allow_subclassing=True)
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapUser [class]
+    module.add_class('LteAnrSapUser', allow_subclassing=True)
     ## lte-as-sap.h (module 'lte'): ns3::LteAsSapProvider [class]
     module.add_class('LteAsSapProvider', allow_subclassing=True)
     ## lte-as-sap.h (module 'lte'): ns3::LteAsSapUser [class]
@@ -386,6 +390,10 @@
     module.add_class('LteFlowId_t')
     ## lte-global-pathloss-database.h (module 'lte'): ns3::LteGlobalPathlossDatabase [class]
     module.add_class('LteGlobalPathlossDatabase', allow_subclassing=True)
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapProvider [class]
+    module.add_class('LteHandoverManagementSapProvider', allow_subclassing=True)
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapUser [class]
+    module.add_class('LteHandoverManagementSapUser', allow_subclassing=True)
     ## lte-mac-sap.h (module 'lte'): ns3::LteMacSapProvider [class]
     module.add_class('LteMacSapProvider', allow_subclassing=True)
     ## lte-mac-sap.h (module 'lte'): ns3::LteMacSapProvider::ReportBufferStatusParameters [struct]
@@ -426,6 +434,8 @@
     module.add_class('CarrierFreqEutra', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellAccessRelatedInfo [struct]
     module.add_class('CellAccessRelatedInfo', outer_class=root_module['ns3::LteRrcSap'])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo [struct]
+    module.add_class('CellSelectionInfo', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellsToAddMod [struct]
     module.add_class('CellsToAddMod', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CgiInfo [struct]
@@ -891,7 +901,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-fading-loss-model.h (module 'lte'): ns3::TraceFadingLossModel [class]
@@ -906,8 +916,6 @@
     module.add_class('UeManager', parent=root_module['ns3::Object'])
     ## lte-enb-rrc.h (module 'lte'): ns3::UeManager::State [enumeration]
     module.add_enum('State', ['INITIAL_RANDOM_ACCESS', 'CONNECTION_SETUP', 'CONNECTION_REJECTED', 'CONNECTED_NORMALLY', 'CONNECTION_RECONFIGURATION', 'CONNECTION_REESTABLISHMENT', 'HANDOVER_PREPARATION', 'HANDOVER_JOINING', 'HANDOVER_PATH_SWITCH', 'HANDOVER_LEAVING', 'NUM_STATES'], outer_class=root_module['ns3::UeManager'])
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure [class]
-    module.add_class('UeMeasure', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable [class]
     module.add_class('UniformRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## ff-mac-common.h (module 'lte'): ns3::VendorSpecificValue [struct]
@@ -1060,10 +1068,12 @@
     module.add_class('LteAmc', parent=root_module['ns3::Object'])
     ## lte-amc.h (module 'lte'): ns3::LteAmc::AmcModel [enumeration]
     module.add_enum('AmcModel', ['PiroEW2010', 'MiErrorModel'], outer_class=root_module['ns3::LteAmc'])
+    ## lte-anr.h (module 'lte'): ns3::LteAnr [class]
+    module.add_class('LteAnr', parent=root_module['ns3::Object'])
     ## lte-control-messages.h (module 'lte'): ns3::LteControlMessage [class]
     module.add_class('LteControlMessage', parent=root_module['ns3::SimpleRefCount< ns3::LteControlMessage, ns3::empty, ns3::DefaultDeleter<ns3::LteControlMessage> >'])
     ## lte-control-messages.h (module 'lte'): ns3::LteControlMessage::MessageType [enumeration]
-    module.add_enum('MessageType', ['DL_DCI', 'UL_DCI', 'DL_CQI', 'UL_CQI', 'BSR', 'DL_HARQ', 'RACH_PREAMBLE', 'RAR', 'MIB'], outer_class=root_module['ns3::LteControlMessage'])
+    module.add_enum('MessageType', ['DL_DCI', 'UL_DCI', 'DL_CQI', 'UL_CQI', 'BSR', 'DL_HARQ', 'RACH_PREAMBLE', 'RAR', 'MIB', 'SIB1'], outer_class=root_module['ns3::LteControlMessage'])
     ## lte-enb-mac.h (module 'lte'): ns3::LteEnbMac [class]
     module.add_class('LteEnbMac', parent=root_module['ns3::Object'])
     ## lte-enb-rrc.h (module 'lte'): ns3::LteEnbRrc [class]
@@ -1074,6 +1084,8 @@
     module.add_class('LteEnbRrcProtocolIdeal', parent=root_module['ns3::Object'])
     ## lte-rrc-protocol-real.h (module 'lte'): ns3::LteEnbRrcProtocolReal [class]
     module.add_class('LteEnbRrcProtocolReal', parent=root_module['ns3::Object'])
+    ## lte-handover-algorithm.h (module 'lte'): ns3::LteHandoverAlgorithm [class]
+    module.add_class('LteHandoverAlgorithm', parent=root_module['ns3::Object'])
     ## lte-harq-phy.h (module 'lte'): ns3::LteHarqPhy [class]
     module.add_class('LteHarqPhy', parent=root_module['ns3::SimpleRefCount< ns3::LteHarqPhy, ns3::empty, ns3::DefaultDeleter<ns3::LteHarqPhy> >'])
     ## lte-helper.h (module 'lte'): ns3::LteHelper [class]
@@ -1124,10 +1136,12 @@
     module.add_class('LteUeMac', parent=root_module['ns3::Object'])
     ## lte-ue-phy.h (module 'lte'): ns3::LteUePhy [class]
     module.add_class('LteUePhy', parent=root_module['ns3::LtePhy'])
+    ## lte-ue-phy.h (module 'lte'): ns3::LteUePhy::State [enumeration]
+    module.add_enum('State', ['CELL_SEARCH', 'SYNCHRONIZED', 'NUM_STATES'], outer_class=root_module['ns3::LteUePhy'])
     ## lte-ue-rrc.h (module 'lte'): ns3::LteUeRrc [class]
     module.add_class('LteUeRrc', parent=root_module['ns3::Object'])
     ## lte-ue-rrc.h (module 'lte'): ns3::LteUeRrc::State [enumeration]
-    module.add_enum('State', ['IDLE_CELL_SELECTION', 'IDLE_WAIT_SYSTEM_INFO', 'IDLE_CAMPED_NORMALLY', 'IDLE_RANDOM_ACCESS', 'IDLE_CONNECTING', 'CONNECTED_NORMALLY', 'CONNECTED_REESTABLISHING', 'CONNECTED_HANDOVER', 'NUM_STATES'], outer_class=root_module['ns3::LteUeRrc'])
+    module.add_enum('State', ['IDLE_START', 'IDLE_CELL_SEARCH', 'IDLE_WAIT_MIB_SIB1', 'IDLE_WAIT_MIB', 'IDLE_WAIT_SIB1', 'IDLE_CAMPED_NORMALLY', 'IDLE_WAIT_SIB2', 'IDLE_RANDOM_ACCESS', 'IDLE_CONNECTING', 'CONNECTED_NORMALLY', 'CONNECTED_HANDOVER', 'CONNECTED_PHY_PROBLEM', 'CONNECTED_REESTABLISHING', 'NUM_STATES'], outer_class=root_module['ns3::LteUeRrc'])
     ## lte-rrc-protocol-ideal.h (module 'lte'): ns3::LteUeRrcProtocolIdeal [class]
     module.add_class('LteUeRrcProtocolIdeal', parent=root_module['ns3::Object'])
     ## lte-rrc-protocol-real.h (module 'lte'): ns3::LteUeRrcProtocolReal [class]
@@ -1142,14 +1156,14 @@
     module.add_class('MibLteControlMessage', parent=root_module['ns3::LteControlMessage'])
     ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class]
     module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation [class]
-    module.add_class('NeighbourRelation', 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]
     module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network')
     ## nix-vector.h (module 'network'): ns3::NixVector [class]
     module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    ## no-op-handover-algorithm.h (module 'lte'): ns3::NoOpHandoverAlgorithm [class]
+    module.add_class('NoOpHandoverAlgorithm', parent=root_module['ns3::LteHandoverAlgorithm'])
     ## node.h (module 'network'): ns3::Node [class]
     module.add_class('Node', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::NormalRandomVariable [class]
@@ -1170,6 +1184,8 @@
     module.add_class('PhyStatsCalculator', parent=root_module['ns3::LteStatsCalculator'])
     ## phy-tx-stats-calculator.h (module 'lte'): ns3::PhyTxStatsCalculator [class]
     module.add_class('PhyTxStatsCalculator', parent=root_module['ns3::LteStatsCalculator'])
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::PointToPointEpcHelper [class]
+    module.add_class('PointToPointEpcHelper', parent=root_module['ns3::EpcHelper'])
     ## pointer.h (module 'core'): ns3::PointerChecker [class]
     module.add_class('PointerChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## pointer.h (module 'core'): ns3::PointerValue [class]
@@ -1198,6 +1214,8 @@
     module.add_class('RrcUlCcchMessage', parent=root_module['ns3::RrcAsn1Header'])
     ## lte-rrc-header.h (module 'lte'): ns3::RrcUlDcchMessage [class]
     module.add_class('RrcUlDcchMessage', parent=root_module['ns3::RrcAsn1Header'])
+    ## lte-control-messages.h (module 'lte'): ns3::Sib1LteControlMessage [class]
+    module.add_class('Sib1LteControlMessage', parent=root_module['ns3::LteControlMessage'])
     ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel [class]
     module.add_class('SpectrumChannel', import_from_module='ns.spectrum', parent=root_module['ns3::Channel'])
     ## lte-vendor-specific-parameters.h (module 'lte'): ns3::SrsCqiRntiVsp [class]
@@ -1234,6 +1252,10 @@
     module.add_class('Vector3DValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## virtual-net-device.h (module 'virtual-net-device'): ns3::VirtualNetDevice [class]
     module.add_class('VirtualNetDevice', import_from_module='ns.virtual_net_device', parent=root_module['ns3::NetDevice'])
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): ns3::A2A4RsrqHandoverAlgorithm [class]
+    module.add_class('A2A4RsrqHandoverAlgorithm', parent=root_module['ns3::LteHandoverAlgorithm'])
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): ns3::A3RsrpHandoverAlgorithm [class]
+    module.add_class('A3RsrpHandoverAlgorithm', parent=root_module['ns3::LteHandoverAlgorithm'])
     ## address.h (module 'network'): ns3::AddressChecker [class]
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
@@ -1664,6 +1686,8 @@
     register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
     register_Ns3LogComponent_methods(root_module, root_module['ns3::LogComponent'])
     register_Ns3LogicalChannelConfigListElement_s_methods(root_module, root_module['ns3::LogicalChannelConfigListElement_s'])
+    register_Ns3LteAnrSapProvider_methods(root_module, root_module['ns3::LteAnrSapProvider'])
+    register_Ns3LteAnrSapUser_methods(root_module, root_module['ns3::LteAnrSapUser'])
     register_Ns3LteAsSapProvider_methods(root_module, root_module['ns3::LteAsSapProvider'])
     register_Ns3LteAsSapUser_methods(root_module, root_module['ns3::LteAsSapUser'])
     register_Ns3LteEnbCmacSapProvider_methods(root_module, root_module['ns3::LteEnbCmacSapProvider'])
@@ -1680,6 +1704,8 @@
     register_Ns3LteFfConverter_methods(root_module, root_module['ns3::LteFfConverter'])
     register_Ns3LteFlowId_t_methods(root_module, root_module['ns3::LteFlowId_t'])
     register_Ns3LteGlobalPathlossDatabase_methods(root_module, root_module['ns3::LteGlobalPathlossDatabase'])
+    register_Ns3LteHandoverManagementSapProvider_methods(root_module, root_module['ns3::LteHandoverManagementSapProvider'])
+    register_Ns3LteHandoverManagementSapUser_methods(root_module, root_module['ns3::LteHandoverManagementSapUser'])
     register_Ns3LteMacSapProvider_methods(root_module, root_module['ns3::LteMacSapProvider'])
     register_Ns3LteMacSapProviderReportBufferStatusParameters_methods(root_module, root_module['ns3::LteMacSapProvider::ReportBufferStatusParameters'])
     register_Ns3LteMacSapProviderTransmitPduParameters_methods(root_module, root_module['ns3::LteMacSapProvider::TransmitPduParameters'])
@@ -1699,6 +1725,7 @@
     register_Ns3LteRrcSapCarrierBandwidthEutra_methods(root_module, root_module['ns3::LteRrcSap::CarrierBandwidthEutra'])
     register_Ns3LteRrcSapCarrierFreqEutra_methods(root_module, root_module['ns3::LteRrcSap::CarrierFreqEutra'])
     register_Ns3LteRrcSapCellAccessRelatedInfo_methods(root_module, root_module['ns3::LteRrcSap::CellAccessRelatedInfo'])
+    register_Ns3LteRrcSapCellSelectionInfo_methods(root_module, root_module['ns3::LteRrcSap::CellSelectionInfo'])
     register_Ns3LteRrcSapCellsToAddMod_methods(root_module, root_module['ns3::LteRrcSap::CellsToAddMod'])
     register_Ns3LteRrcSapCgiInfo_methods(root_module, root_module['ns3::LteRrcSap::CgiInfo'])
     register_Ns3LteRrcSapDrbToAddMod_methods(root_module, root_module['ns3::LteRrcSap::DrbToAddMod'])
@@ -1895,7 +1922,6 @@
     register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
     register_Ns3TriangularRandomVariable_methods(root_module, root_module['ns3::TriangularRandomVariable'])
     register_Ns3UeManager_methods(root_module, root_module['ns3::UeManager'])
-    register_Ns3UeMeasure_methods(root_module, root_module['ns3::UeMeasure'])
     register_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
     register_Ns3VendorSpecificValue_methods(root_module, root_module['ns3::VendorSpecificValue'])
     register_Ns3WeibullRandomVariable_methods(root_module, root_module['ns3::WeibullRandomVariable'])
@@ -1965,11 +1991,13 @@
     register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
     register_Ns3LogNormalRandomVariable_methods(root_module, root_module['ns3::LogNormalRandomVariable'])
     register_Ns3LteAmc_methods(root_module, root_module['ns3::LteAmc'])
+    register_Ns3LteAnr_methods(root_module, root_module['ns3::LteAnr'])
     register_Ns3LteControlMessage_methods(root_module, root_module['ns3::LteControlMessage'])
     register_Ns3LteEnbMac_methods(root_module, root_module['ns3::LteEnbMac'])
     register_Ns3LteEnbRrc_methods(root_module, root_module['ns3::LteEnbRrc'])
     register_Ns3LteEnbRrcProtocolIdeal_methods(root_module, root_module['ns3::LteEnbRrcProtocolIdeal'])
     register_Ns3LteEnbRrcProtocolReal_methods(root_module, root_module['ns3::LteEnbRrcProtocolReal'])
+    register_Ns3LteHandoverAlgorithm_methods(root_module, root_module['ns3::LteHandoverAlgorithm'])
     register_Ns3LteHarqPhy_methods(root_module, root_module['ns3::LteHarqPhy'])
     register_Ns3LteHelper_methods(root_module, root_module['ns3::LteHelper'])
     register_Ns3LteHexGridEnbTopologyHelper_methods(root_module, root_module['ns3::LteHexGridEnbTopologyHelper'])
@@ -2001,9 +2029,9 @@
     register_Ns3MacStatsCalculator_methods(root_module, root_module['ns3::MacStatsCalculator'])
     register_Ns3MibLteControlMessage_methods(root_module, root_module['ns3::MibLteControlMessage'])
     register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
-    register_Ns3NeighbourRelation_methods(root_module, root_module['ns3::NeighbourRelation'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
+    register_Ns3NoOpHandoverAlgorithm_methods(root_module, root_module['ns3::NoOpHandoverAlgorithm'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
     register_Ns3NormalRandomVariable_methods(root_module, root_module['ns3::NormalRandomVariable'])
     register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
@@ -2014,6 +2042,7 @@
     register_Ns3PhyRxStatsCalculator_methods(root_module, root_module['ns3::PhyRxStatsCalculator'])
     register_Ns3PhyStatsCalculator_methods(root_module, root_module['ns3::PhyStatsCalculator'])
     register_Ns3PhyTxStatsCalculator_methods(root_module, root_module['ns3::PhyTxStatsCalculator'])
+    register_Ns3PointToPointEpcHelper_methods(root_module, root_module['ns3::PointToPointEpcHelper'])
     register_Ns3PointerChecker_methods(root_module, root_module['ns3::PointerChecker'])
     register_Ns3PointerValue_methods(root_module, root_module['ns3::PointerValue'])
     register_Ns3PssFfMacScheduler_methods(root_module, root_module['ns3::PssFfMacScheduler'])
@@ -2028,6 +2057,7 @@
     register_Ns3RrcDlDcchMessage_methods(root_module, root_module['ns3::RrcDlDcchMessage'])
     register_Ns3RrcUlCcchMessage_methods(root_module, root_module['ns3::RrcUlCcchMessage'])
     register_Ns3RrcUlDcchMessage_methods(root_module, root_module['ns3::RrcUlDcchMessage'])
+    register_Ns3Sib1LteControlMessage_methods(root_module, root_module['ns3::Sib1LteControlMessage'])
     register_Ns3SpectrumChannel_methods(root_module, root_module['ns3::SpectrumChannel'])
     register_Ns3SrsCqiRntiVsp_methods(root_module, root_module['ns3::SrsCqiRntiVsp'])
     register_Ns3StringChecker_methods(root_module, root_module['ns3::StringChecker'])
@@ -2046,6 +2076,8 @@
     register_Ns3Vector3DChecker_methods(root_module, root_module['ns3::Vector3DChecker'])
     register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue'])
     register_Ns3VirtualNetDevice_methods(root_module, root_module['ns3::VirtualNetDevice'])
+    register_Ns3A2A4RsrqHandoverAlgorithm_methods(root_module, root_module['ns3::A2A4RsrqHandoverAlgorithm'])
+    register_Ns3A3RsrpHandoverAlgorithm_methods(root_module, root_module['ns3::A3RsrpHandoverAlgorithm'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3BsrLteControlMessage_methods(root_module, root_module['ns3::BsrLteControlMessage'])
@@ -3143,10 +3175,10 @@
                    'void', 
                    [param('uint64_t', 'mmeUeS1Id'), param('uint16_t', 'enbUeS1Id'), param('std::list< ns3::EpcS1apSapMme::ErabSetupItem >', 'erabSetupList')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## epc-s1ap-sap.h (module 'lte'): void ns3::EpcS1apSapMme::InitialUeMessage(uint64_t mmeUeS1Id, uint16_t enbUeS1Id, uint64_t imsi, uint16_t ecgi) [member function]
+    ## epc-s1ap-sap.h (module 'lte'): void ns3::EpcS1apSapMme::InitialUeMessage(uint64_t mmeUeS1Id, uint16_t enbUeS1Id, uint64_t stmsi, uint16_t ecgi) [member function]
     cls.add_method('InitialUeMessage', 
                    'void', 
-                   [param('uint64_t', 'mmeUeS1Id'), param('uint16_t', 'enbUeS1Id'), param('uint64_t', 'imsi'), param('uint16_t', 'ecgi')], 
+                   [param('uint64_t', 'mmeUeS1Id'), param('uint16_t', 'enbUeS1Id'), param('uint64_t', 'stmsi'), param('uint16_t', 'ecgi')], 
                    is_pure_virtual=True, is_virtual=True)
     ## epc-s1ap-sap.h (module 'lte'): void ns3::EpcS1apSapMme::PathSwitchRequest(uint64_t enbUeS1Id, uint64_t mmeUeS1Id, uint16_t gci, std::list<ns3::EpcS1apSapMme::ErabSwitchedInDownlinkItem, std::allocator<ns3::EpcS1apSapMme::ErabSwitchedInDownlinkItem> > erabToBeSwitchedInDownlinkList) [member function]
     cls.add_method('PathSwitchRequest', 
@@ -3609,6 +3641,16 @@
     cls.add_constructor([])
     ## lte-common.h (module 'lte'): ns3::EutranMeasurementMapping::EutranMeasurementMapping(ns3::EutranMeasurementMapping const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::EutranMeasurementMapping const &', 'arg0')])
+    ## lte-common.h (module 'lte'): static int8_t ns3::EutranMeasurementMapping::ActualA3Offset2IeValue(double a3OffsetDb) [member function]
+    cls.add_method('ActualA3Offset2IeValue', 
+                   'int8_t', 
+                   [param('double', 'a3OffsetDb')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static uint8_t ns3::EutranMeasurementMapping::ActualHysteresis2IeValue(double hysteresisDb) [member function]
+    cls.add_method('ActualHysteresis2IeValue', 
+                   'uint8_t', 
+                   [param('double', 'hysteresisDb')], 
+                   is_static=True)
     ## lte-common.h (module 'lte'): static uint8_t ns3::EutranMeasurementMapping::Db2RsrqRange(double db) [member function]
     cls.add_method('Db2RsrqRange', 
                    'uint8_t', 
@@ -3619,6 +3661,26 @@
                    'uint8_t', 
                    [param('double', 'dbm')], 
                    is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::IeValue2ActualA3Offset(int8_t a3OffsetIeValue) [member function]
+    cls.add_method('IeValue2ActualA3Offset', 
+                   'double', 
+                   [param('int8_t', 'a3OffsetIeValue')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::IeValue2ActualHysteresis(uint8_t hysteresisIeValue) [member function]
+    cls.add_method('IeValue2ActualHysteresis', 
+                   'double', 
+                   [param('uint8_t', 'hysteresisIeValue')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::IeValue2ActualQQualMin(int8_t qQualMinIeValue) [member function]
+    cls.add_method('IeValue2ActualQQualMin', 
+                   'double', 
+                   [param('int8_t', 'qQualMinIeValue')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::IeValue2ActualQRxLevMin(int8_t qRxLevMinIeValue) [member function]
+    cls.add_method('IeValue2ActualQRxLevMin', 
+                   'double', 
+                   [param('int8_t', 'qRxLevMinIeValue')], 
+                   is_static=True)
     ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::QuantizeRsrp(double v) [member function]
     cls.add_method('QuantizeRsrp', 
                    'double', 
@@ -4939,10 +5001,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -5210,6 +5273,50 @@
     cls.add_instance_attribute('m_qosBearerType', 'ns3::LogicalChannelConfigListElement_s::QosBearerType_e', is_const=False)
     return
 
+def register_Ns3LteAnrSapProvider_methods(root_module, cls):
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapProvider::LteAnrSapProvider() [constructor]
+    cls.add_constructor([])
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapProvider::LteAnrSapProvider(ns3::LteAnrSapProvider const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteAnrSapProvider const &', 'arg0')])
+    ## lte-anr-sap.h (module 'lte'): void ns3::LteAnrSapProvider::AddNeighbourRelation(uint16_t cellId) [member function]
+    cls.add_method('AddNeighbourRelation', 
+                   'void', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-anr-sap.h (module 'lte'): bool ns3::LteAnrSapProvider::GetNoHo(uint16_t cellId) const [member function]
+    cls.add_method('GetNoHo', 
+                   'bool', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## lte-anr-sap.h (module 'lte'): bool ns3::LteAnrSapProvider::GetNoRemove(uint16_t cellId) const [member function]
+    cls.add_method('GetNoRemove', 
+                   'bool', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## lte-anr-sap.h (module 'lte'): bool ns3::LteAnrSapProvider::GetNoX2(uint16_t cellId) const [member function]
+    cls.add_method('GetNoX2', 
+                   'bool', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## lte-anr-sap.h (module 'lte'): void ns3::LteAnrSapProvider::ReportUeMeas(ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('ReportUeMeas', 
+                   'void', 
+                   [param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3LteAnrSapUser_methods(root_module, cls):
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapUser::LteAnrSapUser() [constructor]
+    cls.add_constructor([])
+    ## lte-anr-sap.h (module 'lte'): ns3::LteAnrSapUser::LteAnrSapUser(ns3::LteAnrSapUser const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteAnrSapUser const &', 'arg0')])
+    ## lte-anr-sap.h (module 'lte'): uint8_t ns3::LteAnrSapUser::AddUeMeasReportConfigForAnr(ns3::LteRrcSap::ReportConfigEutra reportConfig) [member function]
+    cls.add_method('AddUeMeasReportConfigForAnr', 
+                   'uint8_t', 
+                   [param('ns3::LteRrcSap::ReportConfigEutra', 'reportConfig')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
 def register_Ns3LteAsSapProvider_methods(root_module, cls):
     ## lte-as-sap.h (module 'lte'): ns3::LteAsSapProvider::LteAsSapProvider() [constructor]
     cls.add_constructor([])
@@ -5225,16 +5332,26 @@
                    'void', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::ForceCampedOnEnb(uint16_t cellId, uint16_t earfcn) [member function]
+    ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::ForceCampedOnEnb(uint16_t cellId, uint16_t dlEarfcn) [member function]
     cls.add_method('ForceCampedOnEnb', 
                    'void', 
-                   [param('uint16_t', 'cellId'), param('uint16_t', 'earfcn')], 
+                   [param('uint16_t', 'cellId'), param('uint16_t', 'dlEarfcn')], 
                    is_pure_virtual=True, is_virtual=True)
     ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::SendData(ns3::Ptr<ns3::Packet> packet, uint8_t bid) [member function]
     cls.add_method('SendData', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint8_t', 'bid')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::SetCsgWhiteList(uint32_t csgId) [member function]
+    cls.add_method('SetCsgWhiteList', 
+                   'void', 
+                   [param('uint32_t', 'csgId')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-as-sap.h (module 'lte'): void ns3::LteAsSapProvider::StartCellSelection(uint16_t dlEarfcn) [member function]
+    cls.add_method('StartCellSelection', 
+                   'void', 
+                   [param('uint16_t', 'dlEarfcn')], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3LteAsSapUser_methods(root_module, cls):
@@ -5451,6 +5568,11 @@
                    'void', 
                    [param('uint16_t', 'rnti'), param('uint16_t', 'srsCi')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## lte-enb-cphy-sap.h (module 'lte'): void ns3::LteEnbCphySapProvider::SetSystemInformationBlockType1(ns3::LteRrcSap::SystemInformationBlockType1 sib1) [member function]
+    cls.add_method('SetSystemInformationBlockType1', 
+                   'void', 
+                   [param('ns3::LteRrcSap::SystemInformationBlockType1', 'sib1')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## lte-enb-cphy-sap.h (module 'lte'): void ns3::LteEnbCphySapProvider::SetTransmissionMode(uint16_t rnti, uint8_t txMode) [member function]
     cls.add_method('SetTransmissionMode', 
                    'void', 
@@ -5586,6 +5708,35 @@
                    is_pure_virtual=True, is_virtual=True)
     return
 
+def register_Ns3LteHandoverManagementSapProvider_methods(root_module, cls):
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapProvider::LteHandoverManagementSapProvider() [constructor]
+    cls.add_constructor([])
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapProvider::LteHandoverManagementSapProvider(ns3::LteHandoverManagementSapProvider const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteHandoverManagementSapProvider const &', 'arg0')])
+    ## lte-handover-management-sap.h (module 'lte'): void ns3::LteHandoverManagementSapProvider::ReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('ReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3LteHandoverManagementSapUser_methods(root_module, cls):
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapUser::LteHandoverManagementSapUser() [constructor]
+    cls.add_constructor([])
+    ## lte-handover-management-sap.h (module 'lte'): ns3::LteHandoverManagementSapUser::LteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteHandoverManagementSapUser const &', 'arg0')])
+    ## lte-handover-management-sap.h (module 'lte'): uint8_t ns3::LteHandoverManagementSapUser::AddUeMeasReportConfigForHandover(ns3::LteRrcSap::ReportConfigEutra reportConfig) [member function]
+    cls.add_method('AddUeMeasReportConfigForHandover', 
+                   'uint8_t', 
+                   [param('ns3::LteRrcSap::ReportConfigEutra', 'reportConfig')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-handover-management-sap.h (module 'lte'): void ns3::LteHandoverManagementSapUser::TriggerHandover(uint16_t rnti, uint16_t targetCellId) [member function]
+    cls.add_method('TriggerHandover', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('uint16_t', 'targetCellId')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
 def register_Ns3LteMacSapProvider_methods(root_module, cls):
     ## lte-mac-sap.h (module 'lte'): ns3::LteMacSapProvider::LteMacSapProvider() [constructor]
     cls.add_constructor([])
@@ -5864,6 +6015,17 @@
     cls.add_instance_attribute('plmnIdentityInfo', 'ns3::LteRrcSap::PlmnIdentityInfo', is_const=False)
     return
 
+def register_Ns3LteRrcSapCellSelectionInfo_methods(root_module, cls):
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo::CellSelectionInfo() [constructor]
+    cls.add_constructor([])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo::CellSelectionInfo(ns3::LteRrcSap::CellSelectionInfo const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteRrcSap::CellSelectionInfo const &', 'arg0')])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo::qQualMin [variable]
+    cls.add_instance_attribute('qQualMin', 'int8_t', is_const=False)
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellSelectionInfo::qRxLevMin [variable]
+    cls.add_instance_attribute('qRxLevMin', 'int8_t', is_const=False)
+    return
+
 def register_Ns3LteRrcSapCellsToAddMod_methods(root_module, cls):
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::CellsToAddMod::CellsToAddMod() [constructor]
     cls.add_constructor([])
@@ -6276,10 +6438,10 @@
     return
 
 def register_Ns3LteRrcSapReportConfigEutra_methods(root_module, cls):
-    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::ReportConfigEutra() [constructor]
-    cls.add_constructor([])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::ReportConfigEutra(ns3::LteRrcSap::ReportConfigEutra const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteRrcSap::ReportConfigEutra const &', 'arg0')])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::ReportConfigEutra() [constructor]
+    cls.add_constructor([])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::a3Offset [variable]
     cls.add_instance_attribute('a3Offset', 'int8_t', is_const=False)
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra::hysteresis [variable]
@@ -6504,6 +6666,8 @@
     cls.add_constructor([param('ns3::LteRrcSap::SystemInformationBlockType1 const &', 'arg0')])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::SystemInformationBlockType1::cellAccessRelatedInfo [variable]
     cls.add_instance_attribute('cellAccessRelatedInfo', 'ns3::LteRrcSap::CellAccessRelatedInfo', is_const=False)
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::SystemInformationBlockType1::cellSelectionInfo [variable]
+    cls.add_instance_attribute('cellSelectionInfo', 'ns3::LteRrcSap::CellSelectionInfo', is_const=False)
     return
 
 def register_Ns3LteRrcSapSystemInformationBlockType2_methods(root_module, cls):
@@ -6712,8 +6876,18 @@
                    'void', 
                    [param('uint8_t', 'txMode')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapProvider::SyncronizeWithEnb(uint16_t cellId, uint16_t dlEarfcn) [member function]
-    cls.add_method('SyncronizeWithEnb', 
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapProvider::StartCellSearch(uint16_t dlEarfcn) [member function]
+    cls.add_method('StartCellSearch', 
+                   'void', 
+                   [param('uint16_t', 'dlEarfcn')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapProvider::SynchronizeWithEnb(uint16_t cellId) [member function]
+    cls.add_method('SynchronizeWithEnb', 
+                   'void', 
+                   [param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapProvider::SynchronizeWithEnb(uint16_t cellId, uint16_t dlEarfcn) [member function]
+    cls.add_method('SynchronizeWithEnb', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint16_t', 'dlEarfcn')], 
                    is_pure_virtual=True, is_virtual=True)
@@ -6724,10 +6898,15 @@
     cls.add_constructor([])
     ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::LteUeCphySapUser(ns3::LteUeCphySapUser const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteUeCphySapUser const &', 'arg0')])
-    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::RecvMasterInformationBlock(ns3::LteRrcSap::MasterInformationBlock mib) [member function]
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::RecvMasterInformationBlock(uint16_t cellId, ns3::LteRrcSap::MasterInformationBlock mib) [member function]
     cls.add_method('RecvMasterInformationBlock', 
                    'void', 
-                   [param('ns3::LteRrcSap::MasterInformationBlock', 'mib')], 
+                   [param('uint16_t', 'cellId'), param('ns3::LteRrcSap::MasterInformationBlock', 'mib')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::RecvSystemInformationBlockType1(uint16_t cellId, ns3::LteRrcSap::SystemInformationBlockType1 sib1) [member function]
+    cls.add_method('RecvSystemInformationBlockType1', 
+                   'void', 
+                   [param('uint16_t', 'cellId'), param('ns3::LteRrcSap::SystemInformationBlockType1', 'sib1')], 
                    is_pure_virtual=True, is_virtual=True)
     ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::ReportUeMeasurements(ns3::LteUeCphySapUser::UeMeasurementsParameters params) [member function]
     cls.add_method('ReportUeMeasurements', 
@@ -6812,11 +6991,6 @@
                    'void', 
                    [param('ns3::LteUeRrcSapProvider::CompleteSetupParameters', 'params')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapProvider::RecvMasterInformationBlock(ns3::LteRrcSap::MasterInformationBlock msg) [member function]
-    cls.add_method('RecvMasterInformationBlock', 
-                   'void', 
-                   [param('ns3::LteRrcSap::MasterInformationBlock', 'msg')], 
-                   is_pure_virtual=True, is_virtual=True)
     ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapProvider::RecvRrcConnectionReconfiguration(ns3::LteRrcSap::RrcConnectionReconfiguration msg) [member function]
     cls.add_method('RecvRrcConnectionReconfiguration', 
                    'void', 
@@ -6852,11 +7026,6 @@
                    'void', 
                    [param('ns3::LteRrcSap::SystemInformation', 'msg')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapProvider::RecvSystemInformationBlockType1(ns3::LteRrcSap::SystemInformationBlockType1 msg) [member function]
-    cls.add_method('RecvSystemInformationBlockType1', 
-                   'void', 
-                   [param('ns3::LteRrcSap::SystemInformationBlockType1', 'msg')], 
-                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3LteUeRrcSapProviderCompleteSetupParameters_methods(root_module, cls):
@@ -8833,10 +9002,10 @@
     cls.add_method('SetBid', 
                    'void', 
                    [param('uint8_t', 'bid')])
-    ## eps-bearer-tag.h (module 'lte'): void ns3::EpsBearerTag::SetRnti(uint16_t tid) [member function]
+    ## eps-bearer-tag.h (module 'lte'): void ns3::EpsBearerTag::SetRnti(uint16_t rnti) [member function]
     cls.add_method('SetRnti', 
                    'void', 
-                   [param('uint16_t', 'tid')])
+                   [param('uint16_t', 'rnti')])
     return
 
 def register_Ns3Header_methods(root_module, cls):
@@ -9262,11 +9431,6 @@
                    'void', 
                    [param('ns3::LteRrcSap::SystemInformation', 'msg')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-rrc-sap.h (module 'lte'): void ns3::LteEnbRrcSapUser::SendSystemInformationBlockType1(ns3::LteRrcSap::SystemInformationBlockType1 msg) [member function]
-    cls.add_method('SendSystemInformationBlockType1', 
-                   'void', 
-                   [param('ns3::LteRrcSap::SystemInformationBlockType1', 'msg')], 
-                   is_pure_virtual=True, is_virtual=True)
     ## lte-rrc-sap.h (module 'lte'): void ns3::LteEnbRrcSapUser::SetupUe(uint16_t rnti, ns3::LteEnbRrcSapUser::SetupUeParameters params) [member function]
     cls.add_method('SetupUe', 
                    'void', 
@@ -9438,18 +9602,18 @@
                    'void', 
                    [param('ns3::TagBuffer', 'i')], 
                    is_const=True, is_virtual=True)
-    ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetLayer(uint8_t lcid) [member function]
+    ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetLayer(uint8_t layer) [member function]
     cls.add_method('SetLayer', 
                    'void', 
-                   [param('uint8_t', 'lcid')])
+                   [param('uint8_t', 'layer')])
     ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetLcid(uint8_t lcid) [member function]
     cls.add_method('SetLcid', 
                    'void', 
                    [param('uint8_t', 'lcid')])
-    ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetRnti(uint16_t tid) [member function]
+    ## lte-radio-bearer-tag.h (module 'lte'): void ns3::LteRadioBearerTag::SetRnti(uint16_t rnti) [member function]
     cls.add_method('SetRnti', 
                    'void', 
-                   [param('uint16_t', 'tid')])
+                   [param('uint16_t', 'rnti')])
     return
 
 def register_Ns3LteRlcAmHeader_methods(root_module, cls):
@@ -11203,6 +11367,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -11213,6 +11382,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -11228,6 +11402,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -11253,6 +11432,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -11467,30 +11651,34 @@
     cls.add_method('GetErabList', 
                    'std::vector< ns3::EpcX2Sap::ErabToBeSetupItem >', 
                    [])
-    ## lte-enb-rrc.h (module 'lte'): uint64_t ns3::UeManager::GetImsi() [member function]
+    ## lte-enb-rrc.h (module 'lte'): uint64_t ns3::UeManager::GetImsi() const [member function]
     cls.add_method('GetImsi', 
                    'uint64_t', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-enb-rrc.h (module 'lte'): ns3::LteRrcSap::RadioResourceConfigDedicated ns3::UeManager::GetRadioResourceConfigForHandoverPreparationInfo() [member function]
     cls.add_method('GetRadioResourceConfigForHandoverPreparationInfo', 
                    'ns3::LteRrcSap::RadioResourceConfigDedicated', 
                    [])
-    ## lte-enb-rrc.h (module 'lte'): uint16_t ns3::UeManager::GetRnti() [member function]
+    ## lte-enb-rrc.h (module 'lte'): uint16_t ns3::UeManager::GetRnti() const [member function]
     cls.add_method('GetRnti', 
                    'uint16_t', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-enb-rrc.h (module 'lte'): ns3::LteRrcSap::RrcConnectionReconfiguration ns3::UeManager::GetRrcConnectionReconfigurationForHandover() [member function]
     cls.add_method('GetRrcConnectionReconfigurationForHandover', 
                    'ns3::LteRrcSap::RrcConnectionReconfiguration', 
                    [])
-    ## lte-enb-rrc.h (module 'lte'): uint16_t ns3::UeManager::GetSrsConfigurationIndex() [member function]
+    ## lte-enb-rrc.h (module 'lte'): uint16_t ns3::UeManager::GetSrsConfigurationIndex() const [member function]
     cls.add_method('GetSrsConfigurationIndex', 
                    'uint16_t', 
-                   [])
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeManager::State ns3::UeManager::GetState() [member function]
+                   [], 
+                   is_const=True)
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeManager::State ns3::UeManager::GetState() const [member function]
     cls.add_method('GetState', 
                    'ns3::UeManager::State', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-enb-rrc.h (module 'lte'): static ns3::TypeId ns3::UeManager::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -11592,19 +11780,6 @@
                    visibility='protected', is_virtual=True)
     return
 
-def register_Ns3UeMeasure_methods(root_module, cls):
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::UeMeasure() [constructor]
-    cls.add_constructor([])
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::UeMeasure(ns3::UeMeasure const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::UeMeasure const &', 'arg0')])
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_cellId [variable]
-    cls.add_instance_attribute('m_cellId', 'uint16_t', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_rsrp [variable]
-    cls.add_instance_attribute('m_rsrp', 'uint8_t', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_rsrq [variable]
-    cls.add_instance_attribute('m_rsrq', 'uint8_t', is_const=False)
-    return
-
 def register_Ns3UniformRandomVariable_methods(root_module, cls):
     ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::UniformRandomVariable::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -12757,23 +12932,28 @@
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::ActivateEpsBearer(ns3::Ptr<ns3::NetDevice> ueLteDevice, uint64_t imsi, ns3::Ptr<ns3::EpcTft> tft, ns3::EpsBearer bearer) [member function]
     cls.add_method('ActivateEpsBearer', 
                    'void', 
-                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi'), param('ns3::Ptr< ns3::EpcTft >', 'tft'), param('ns3::EpsBearer', 'bearer')])
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi'), param('ns3::Ptr< ns3::EpcTft >', 'tft'), param('ns3::EpsBearer', 'bearer')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::AddEnb(ns3::Ptr<ns3::Node> enbNode, ns3::Ptr<ns3::NetDevice> lteEnbNetDevice, uint16_t cellId) [member function]
     cls.add_method('AddEnb', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Node >', 'enbNode'), param('ns3::Ptr< ns3::NetDevice >', 'lteEnbNetDevice'), param('uint16_t', 'cellId')])
+                   [param('ns3::Ptr< ns3::Node >', 'enbNode'), param('ns3::Ptr< ns3::NetDevice >', 'lteEnbNetDevice'), param('uint16_t', 'cellId')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::AddUe(ns3::Ptr<ns3::NetDevice> ueLteDevice, uint64_t imsi) [member function]
     cls.add_method('AddUe', 
                    'void', 
-                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi')])
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::AddX2Interface(ns3::Ptr<ns3::Node> enbNode1, ns3::Ptr<ns3::Node> enbNode2) [member function]
     cls.add_method('AddX2Interface', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Node >', 'enbNode1'), param('ns3::Ptr< ns3::Node >', 'enbNode2')])
+                   [param('ns3::Ptr< ns3::Node >', 'enbNode1'), param('ns3::Ptr< ns3::Node >', 'enbNode2')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): ns3::Ipv4InterfaceContainer ns3::EpcHelper::AssignUeIpv4Address(ns3::NetDeviceContainer ueDevices) [member function]
     cls.add_method('AssignUeIpv4Address', 
                    'ns3::Ipv4InterfaceContainer', 
-                   [param('ns3::NetDeviceContainer', 'ueDevices')])
+                   [param('ns3::NetDeviceContainer', 'ueDevices')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): void ns3::EpcHelper::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -12782,7 +12962,8 @@
     ## epc-helper.h (module 'lte'): ns3::Ptr<ns3::Node> ns3::EpcHelper::GetPgwNode() [member function]
     cls.add_method('GetPgwNode', 
                    'ns3::Ptr< ns3::Node >', 
-                   [])
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
     ## epc-helper.h (module 'lte'): static ns3::TypeId ns3::EpcHelper::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -12791,7 +12972,8 @@
     ## epc-helper.h (module 'lte'): ns3::Ipv4Address ns3::EpcHelper::GetUeDefaultGatewayAddress() [member function]
     cls.add_method('GetUeDefaultGatewayAddress', 
                    'ns3::Ipv4Address', 
-                   [])
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3EpcMme_methods(root_module, cls):
@@ -12803,10 +12985,10 @@
     cls.add_method('AddBearer', 
                    'void', 
                    [param('uint64_t', 'imsi'), param('ns3::Ptr< ns3::EpcTft >', 'tft'), param('ns3::EpsBearer', 'bearer')])
-    ## epc-mme.h (module 'lte'): void ns3::EpcMme::AddEnb(uint16_t egci, ns3::Ipv4Address enbS1UAddr, ns3::EpcS1apSapEnb * enbS1apSap) [member function]
+    ## epc-mme.h (module 'lte'): void ns3::EpcMme::AddEnb(uint16_t ecgi, ns3::Ipv4Address enbS1UAddr, ns3::EpcS1apSapEnb * enbS1apSap) [member function]
     cls.add_method('AddEnb', 
                    'void', 
-                   [param('uint16_t', 'egci'), param('ns3::Ipv4Address', 'enbS1UAddr'), param('ns3::EpcS1apSapEnb *', 'enbS1apSap')])
+                   [param('uint16_t', 'ecgi'), param('ns3::Ipv4Address', 'enbS1UAddr'), param('ns3::EpcS1apSapEnb *', 'enbS1apSap')])
     ## epc-mme.h (module 'lte'): void ns3::EpcMme::AddUe(uint64_t imsi) [member function]
     cls.add_method('AddUe', 
                    'void', 
@@ -12971,10 +13153,14 @@
     cls.add_method('ActivateEpsBearer', 
                    'void', 
                    [param('ns3::EpsBearer', 'bearer'), param('ns3::Ptr< ns3::EpcTft >', 'tft')])
-    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::Connect(uint16_t cellId, uint16_t earfcn) [member function]
+    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::Connect() [member function]
+    cls.add_method('Connect', 
+                   'void', 
+                   [])
+    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::Connect(uint16_t cellId, uint16_t dlEarfcn) [member function]
     cls.add_method('Connect', 
                    'void', 
-                   [param('uint16_t', 'cellId'), param('uint16_t', 'earfcn')])
+                   [param('uint16_t', 'cellId'), param('uint16_t', 'dlEarfcn')])
     ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::Disconnect() [member function]
     cls.add_method('Disconnect', 
                    'void', 
@@ -12988,6 +13174,16 @@
     cls.add_method('GetAsSapUser', 
                    'ns3::LteAsSapUser *', 
                    [])
+    ## epc-ue-nas.h (module 'lte'): uint32_t ns3::EpcUeNas::GetCsgId() const [member function]
+    cls.add_method('GetCsgId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## epc-ue-nas.h (module 'lte'): ns3::EpcUeNas::State ns3::EpcUeNas::GetState() const [member function]
+    cls.add_method('GetState', 
+                   'ns3::EpcUeNas::State', 
+                   [], 
+                   is_const=True)
     ## epc-ue-nas.h (module 'lte'): static ns3::TypeId ns3::EpcUeNas::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -13001,6 +13197,10 @@
     cls.add_method('SetAsSapProvider', 
                    'void', 
                    [param('ns3::LteAsSapProvider *', 's')])
+    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::SetCsgId(uint32_t csgId) [member function]
+    cls.add_method('SetCsgId', 
+                   'void', 
+                   [param('uint32_t', 'csgId')])
     ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::SetDevice(ns3::Ptr<ns3::NetDevice> dev) [member function]
     cls.add_method('SetDevice', 
                    'void', 
@@ -13013,6 +13213,10 @@
     cls.add_method('SetImsi', 
                    'void', 
                    [param('uint64_t', 'imsi')])
+    ## epc-ue-nas.h (module 'lte'): void ns3::EpcUeNas::StartCellSelection(uint16_t dlEarfcn) [member function]
+    cls.add_method('StartCellSelection', 
+                   'void', 
+                   [param('uint16_t', 'dlEarfcn')])
     return
 
 def register_Ns3EpcX2_methods(root_module, cls):
@@ -14743,6 +14947,46 @@
                    is_static=True)
     return
 
+def register_Ns3LteAnr_methods(root_module, cls):
+    ## lte-anr.h (module 'lte'): ns3::LteAnr::LteAnr(ns3::LteAnr const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteAnr const &', 'arg0')])
+    ## lte-anr.h (module 'lte'): ns3::LteAnr::LteAnr(uint16_t servingCellId) [constructor]
+    cls.add_constructor([param('uint16_t', 'servingCellId')])
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::AddNeighbourRelation(uint16_t cellId) [member function]
+    cls.add_method('AddNeighbourRelation', 
+                   'void', 
+                   [param('uint16_t', 'cellId')])
+    ## lte-anr.h (module 'lte'): ns3::LteAnrSapProvider * ns3::LteAnr::GetLteAnrSapProvider() [member function]
+    cls.add_method('GetLteAnrSapProvider', 
+                   'ns3::LteAnrSapProvider *', 
+                   [], 
+                   is_virtual=True)
+    ## lte-anr.h (module 'lte'): static ns3::TypeId ns3::LteAnr::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::RemoveNeighbourRelation(uint16_t cellId) [member function]
+    cls.add_method('RemoveNeighbourRelation', 
+                   'void', 
+                   [param('uint16_t', 'cellId')])
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::SetLteAnrSapUser(ns3::LteAnrSapUser * s) [member function]
+    cls.add_method('SetLteAnrSapUser', 
+                   'void', 
+                   [param('ns3::LteAnrSapUser *', 's')], 
+                   is_virtual=True)
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## lte-anr.h (module 'lte'): void ns3::LteAnr::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3LteControlMessage_methods(root_module, cls):
     ## lte-control-messages.h (module 'lte'): ns3::LteControlMessage::LteControlMessage(ns3::LteControlMessage const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteControlMessage const &', 'arg0')])
@@ -14824,6 +15068,10 @@
     cls.add_constructor([param('ns3::LteEnbRrc const &', 'arg0')])
     ## lte-enb-rrc.h (module 'lte'): ns3::LteEnbRrc::LteEnbRrc() [constructor]
     cls.add_constructor([])
+    ## lte-enb-rrc.h (module 'lte'): uint8_t ns3::LteEnbRrc::AddUeMeasReportConfig(ns3::LteRrcSap::ReportConfigEutra config) [member function]
+    cls.add_method('AddUeMeasReportConfig', 
+                   'uint8_t', 
+                   [param('ns3::LteRrcSap::ReportConfigEutra', 'config')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::AddX2Neighbour(uint16_t cellId) [member function]
     cls.add_method('AddX2Neighbour', 
                    'void', 
@@ -14844,6 +15092,10 @@
     cls.add_method('GetEpcX2SapUser', 
                    'ns3::EpcX2SapUser *', 
                    [])
+    ## lte-enb-rrc.h (module 'lte'): ns3::LteAnrSapUser * ns3::LteEnbRrc::GetLteAnrSapUser() [member function]
+    cls.add_method('GetLteAnrSapUser', 
+                   'ns3::LteAnrSapUser *', 
+                   [])
     ## lte-enb-rrc.h (module 'lte'): ns3::LteEnbCmacSapUser * ns3::LteEnbRrc::GetLteEnbCmacSapUser() [member function]
     cls.add_method('GetLteEnbCmacSapUser', 
                    'ns3::LteEnbCmacSapUser *', 
@@ -14856,6 +15108,10 @@
     cls.add_method('GetLteEnbRrcSapProvider', 
                    'ns3::LteEnbRrcSapProvider *', 
                    [])
+    ## lte-enb-rrc.h (module 'lte'): ns3::LteHandoverManagementSapUser * ns3::LteEnbRrc::GetLteHandoverManagementSapUser() [member function]
+    cls.add_method('GetLteHandoverManagementSapUser', 
+                   'ns3::LteHandoverManagementSapUser *', 
+                   [])
     ## lte-enb-rrc.h (module 'lte'): ns3::EpcEnbS1SapUser * ns3::LteEnbRrc::GetS1SapUser() [member function]
     cls.add_method('GetS1SapUser', 
                    'ns3::EpcEnbS1SapUser *', 
@@ -14894,6 +15150,10 @@
     cls.add_method('SetCellId', 
                    'void', 
                    [param('uint16_t', 'm_cellId')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetCsgId(uint32_t csgId, bool csgIndication) [member function]
+    cls.add_method('SetCsgId', 
+                   'void', 
+                   [param('uint32_t', 'csgId'), param('bool', 'csgIndication')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetEpcX2SapProvider(ns3::EpcX2SapProvider * s) [member function]
     cls.add_method('SetEpcX2SapProvider', 
                    'void', 
@@ -14902,6 +15162,10 @@
     cls.add_method('SetForwardUpCallback', 
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'cb')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetLteAnrSapProvider(ns3::LteAnrSapProvider * s) [member function]
+    cls.add_method('SetLteAnrSapProvider', 
+                   'void', 
+                   [param('ns3::LteAnrSapProvider *', 's')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetLteEnbCmacSapProvider(ns3::LteEnbCmacSapProvider * s) [member function]
     cls.add_method('SetLteEnbCmacSapProvider', 
                    'void', 
@@ -14914,6 +15178,10 @@
     cls.add_method('SetLteEnbRrcSapUser', 
                    'void', 
                    [param('ns3::LteEnbRrcSapUser *', 's')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetLteHandoverManagementSapProvider(ns3::LteHandoverManagementSapProvider * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapProvider', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapProvider *', 's')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::SetLteMacSapProvider(ns3::LteMacSapProvider * s) [member function]
     cls.add_method('SetLteMacSapProvider', 
                    'void', 
@@ -15007,6 +15275,38 @@
                    [param('uint16_t', 'rnti'), param('ns3::LteUeRrcSapProvider *', 'p')])
     return
 
+def register_Ns3LteHandoverAlgorithm_methods(root_module, cls):
+    ## lte-handover-algorithm.h (module 'lte'): ns3::LteHandoverAlgorithm::LteHandoverAlgorithm(ns3::LteHandoverAlgorithm const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteHandoverAlgorithm const &', 'arg0')])
+    ## lte-handover-algorithm.h (module 'lte'): ns3::LteHandoverAlgorithm::LteHandoverAlgorithm() [constructor]
+    cls.add_constructor([])
+    ## lte-handover-algorithm.h (module 'lte'): ns3::LteHandoverManagementSapProvider * ns3::LteHandoverAlgorithm::GetLteHandoverManagementSapProvider() [member function]
+    cls.add_method('GetLteHandoverManagementSapProvider', 
+                   'ns3::LteHandoverManagementSapProvider *', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-handover-algorithm.h (module 'lte'): static ns3::TypeId ns3::LteHandoverAlgorithm::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## lte-handover-algorithm.h (module 'lte'): void ns3::LteHandoverAlgorithm::SetLteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapUser', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapUser *', 's')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## lte-handover-algorithm.h (module 'lte'): void ns3::LteHandoverAlgorithm::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## lte-handover-algorithm.h (module 'lte'): void ns3::LteHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('DoReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3LteHarqPhy_methods(root_module, cls):
     ## lte-harq-phy.h (module 'lte'): ns3::LteHarqPhy::LteHarqPhy(ns3::LteHarqPhy const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteHarqPhy const &', 'arg0')])
@@ -15083,6 +15383,14 @@
     cls.add_method('AssignStreams', 
                    'int64_t', 
                    [param('ns3::NetDeviceContainer', 'c'), param('int64_t', 'stream')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::Attach(ns3::NetDeviceContainer ueDevices) [member function]
+    cls.add_method('Attach', 
+                   'void', 
+                   [param('ns3::NetDeviceContainer', 'ueDevices')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::Attach(ns3::Ptr<ns3::NetDevice> ueDevice) [member function]
+    cls.add_method('Attach', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueDevice')])
     ## lte-helper.h (module 'lte'): void ns3::LteHelper::Attach(ns3::NetDeviceContainer ueDevices, ns3::Ptr<ns3::NetDevice> enbDevice) [member function]
     cls.add_method('Attach', 
                    'void', 
@@ -15160,6 +15468,11 @@
     cls.add_method('EnableUlTxPhyTraces', 
                    'void', 
                    [])
+    ## lte-helper.h (module 'lte'): std::string ns3::LteHelper::GetHandoverAlgorithmType() const [member function]
+    cls.add_method('GetHandoverAlgorithmType', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
     ## lte-helper.h (module 'lte'): ns3::Ptr<ns3::RadioBearerStatsCalculator> ns3::LteHelper::GetPdcpStats() [member function]
     cls.add_method('GetPdcpStats', 
                    'ns3::Ptr< ns3::RadioBearerStatsCalculator >', 
@@ -15214,6 +15527,14 @@
     cls.add_method('SetFadingModelAttribute', 
                    'void', 
                    [param('std::string', 'n'), param('ns3::AttributeValue const &', 'v')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::SetHandoverAlgorithmAttribute(std::string n, ns3::AttributeValue const & v) [member function]
+    cls.add_method('SetHandoverAlgorithmAttribute', 
+                   'void', 
+                   [param('std::string', 'n'), param('ns3::AttributeValue const &', 'v')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::SetHandoverAlgorithmType(std::string type) [member function]
+    cls.add_method('SetHandoverAlgorithmType', 
+                   'void', 
+                   [param('std::string', 'type')])
     ## lte-helper.h (module 'lte'): void ns3::LteHelper::SetPathlossModelAttribute(std::string n, ns3::AttributeValue const & v) [member function]
     cls.add_method('SetPathlossModelAttribute', 
                    'void', 
@@ -15246,6 +15567,10 @@
     cls.add_method('SetUeAntennaModelType', 
                    'void', 
                    [param('std::string', 'type')])
+    ## lte-helper.h (module 'lte'): void ns3::LteHelper::SetUeDeviceAttribute(std::string n, ns3::AttributeValue const & v) [member function]
+    cls.add_method('SetUeDeviceAttribute', 
+                   'void', 
+                   [param('std::string', 'n'), param('ns3::AttributeValue const &', 'v')])
     ## lte-helper.h (module 'lte'): void ns3::LteHelper::DoInitialize() [member function]
     cls.add_method('DoInitialize', 
                    'void', 
@@ -15476,15 +15801,15 @@
     cls.add_method('GetUplinkSpectrumPhy', 
                    'ns3::Ptr< ns3::LteSpectrumPhy >', 
                    [])
-    ## lte-phy.h (module 'lte'): void ns3::LtePhy::ReportInterference(ns3::SpectrumValue const & power) [member function]
+    ## lte-phy.h (module 'lte'): void ns3::LtePhy::ReportInterference(ns3::SpectrumValue const & interf) [member function]
     cls.add_method('ReportInterference', 
                    'void', 
-                   [param('ns3::SpectrumValue const &', 'power')], 
+                   [param('ns3::SpectrumValue const &', 'interf')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## lte-phy.h (module 'lte'): void ns3::LtePhy::ReportRsReceivedPower(ns3::SpectrumValue const & interf) [member function]
+    ## lte-phy.h (module 'lte'): void ns3::LtePhy::ReportRsReceivedPower(ns3::SpectrumValue const & power) [member function]
     cls.add_method('ReportRsReceivedPower', 
                    'void', 
-                   [param('ns3::SpectrumValue const &', 'interf')], 
+                   [param('ns3::SpectrumValue const &', 'power')], 
                    is_pure_virtual=True, is_virtual=True)
     ## lte-phy.h (module 'lte'): void ns3::LtePhy::SetControlMessages(ns3::Ptr<ns3::LteControlMessage> m) [member function]
     cls.add_method('SetControlMessages', 
@@ -16215,6 +16540,11 @@
                    'double', 
                    [], 
                    is_const=True)
+    ## lte-ue-phy.h (module 'lte'): ns3::LteUePhy::State ns3::LteUePhy::GetState() const [member function]
+    cls.add_method('GetState', 
+                   'ns3::LteUePhy::State', 
+                   [], 
+                   is_const=True)
     ## lte-ue-phy.h (module 'lte'): std::vector<int, std::allocator<int> > ns3::LteUePhy::GetSubChannelsForReception() [member function]
     cls.add_method('GetSubChannelsForReception', 
                    'std::vector< int >', 
@@ -16283,10 +16613,10 @@
     cls.add_method('SetLteUePhySapUser', 
                    'void', 
                    [param('ns3::LteUePhySapUser *', 's')])
-    ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::SetNoiseFigure(double pow) [member function]
+    ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::SetNoiseFigure(double nf) [member function]
     cls.add_method('SetNoiseFigure', 
                    'void', 
-                   [param('double', 'pow')])
+                   [param('double', 'nf')])
     ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::SetSubChannelsForReception(std::vector<int, std::allocator<int> > mask) [member function]
     cls.add_method('SetSubChannelsForReception', 
                    'void', 
@@ -16344,10 +16674,11 @@
                    'uint16_t', 
                    [], 
                    is_const=True)
-    ## lte-ue-rrc.h (module 'lte'): uint64_t ns3::LteUeRrc::GetImsi() [member function]
+    ## lte-ue-rrc.h (module 'lte'): uint64_t ns3::LteUeRrc::GetImsi() const [member function]
     cls.add_method('GetImsi', 
                    'uint64_t', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-ue-rrc.h (module 'lte'): ns3::LteUeCmacSapUser * ns3::LteUeRrc::GetLteUeCmacSapUser() [member function]
     cls.add_method('GetLteUeCmacSapUser', 
                    'ns3::LteUeCmacSapUser *', 
@@ -16365,10 +16696,11 @@
                    'uint16_t', 
                    [], 
                    is_const=True)
-    ## lte-ue-rrc.h (module 'lte'): ns3::LteUeRrc::State ns3::LteUeRrc::GetState() [member function]
+    ## lte-ue-rrc.h (module 'lte'): ns3::LteUeRrc::State ns3::LteUeRrc::GetState() const [member function]
     cls.add_method('GetState', 
                    'ns3::LteUeRrc::State', 
-                   [])
+                   [], 
+                   is_const=True)
     ## lte-ue-rrc.h (module 'lte'): static ns3::TypeId ns3::LteUeRrc::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -16557,10 +16889,10 @@
     cls.add_method('SetUlOutputFilename', 
                    'void', 
                    [param('std::string', 'outputFilename')])
-    ## mac-stats-calculator.h (module 'lte'): void ns3::MacStatsCalculator::UlScheduling(uint16_t cellId, uint64_t imsi, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcs, uint16_t sizeTb) [member function]
+    ## mac-stats-calculator.h (module 'lte'): void ns3::MacStatsCalculator::UlScheduling(uint16_t cellId, uint64_t imsi, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcsTb, uint16_t sizeTb) [member function]
     cls.add_method('UlScheduling', 
                    'void', 
-                   [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcs'), param('uint16_t', 'sizeTb')])
+                   [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcsTb'), param('uint16_t', 'sizeTb')])
     ## mac-stats-calculator.h (module 'lte'): static void ns3::MacStatsCalculator::UlSchedulingCallback(ns3::Ptr<ns3::MacStatsCalculator> macStats, std::string path, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcs, uint16_t size) [member function]
     cls.add_method('UlSchedulingCallback', 
                    'void', 
@@ -16649,23 +16981,6 @@
                    is_pure_virtual=True, visibility='private', is_virtual=True)
     return
 
-def register_Ns3NeighbourRelation_methods(root_module, cls):
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::NeighbourRelation() [constructor]
-    cls.add_constructor([])
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::NeighbourRelation(ns3::NeighbourRelation const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::NeighbourRelation const &', 'arg0')])
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_detectedAsNeighbour [variable]
-    cls.add_instance_attribute('m_detectedAsNeighbour', 'bool', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noHo [variable]
-    cls.add_instance_attribute('m_noHo', 'bool', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noRemove [variable]
-    cls.add_instance_attribute('m_noRemove', 'bool', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noX2 [variable]
-    cls.add_instance_attribute('m_noX2', 'bool', is_const=False)
-    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_physCellId [variable]
-    cls.add_instance_attribute('m_physCellId', 'uint16_t', is_const=False)
-    return
-
 def register_Ns3NetDevice_methods(root_module, cls):
     ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
     cls.add_constructor([])
@@ -16842,6 +17157,43 @@
                    is_const=True)
     return
 
+def register_Ns3NoOpHandoverAlgorithm_methods(root_module, cls):
+    ## no-op-handover-algorithm.h (module 'lte'): ns3::NoOpHandoverAlgorithm::NoOpHandoverAlgorithm(ns3::NoOpHandoverAlgorithm const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NoOpHandoverAlgorithm const &', 'arg0')])
+    ## no-op-handover-algorithm.h (module 'lte'): ns3::NoOpHandoverAlgorithm::NoOpHandoverAlgorithm() [constructor]
+    cls.add_constructor([])
+    ## no-op-handover-algorithm.h (module 'lte'): ns3::LteHandoverManagementSapProvider * ns3::NoOpHandoverAlgorithm::GetLteHandoverManagementSapProvider() [member function]
+    cls.add_method('GetLteHandoverManagementSapProvider', 
+                   'ns3::LteHandoverManagementSapProvider *', 
+                   [], 
+                   is_virtual=True)
+    ## no-op-handover-algorithm.h (module 'lte'): static ns3::TypeId ns3::NoOpHandoverAlgorithm::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## no-op-handover-algorithm.h (module 'lte'): void ns3::NoOpHandoverAlgorithm::SetLteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapUser', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapUser *', 's')], 
+                   is_virtual=True)
+    ## no-op-handover-algorithm.h (module 'lte'): void ns3::NoOpHandoverAlgorithm::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## no-op-handover-algorithm.h (module 'lte'): void ns3::NoOpHandoverAlgorithm::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## no-op-handover-algorithm.h (module 'lte'): void ns3::NoOpHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('DoReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3Node_methods(root_module, cls):
     ## node.h (module 'network'): ns3::Node::Node(ns3::Node const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Node const &', 'arg0')])
@@ -17434,6 +17786,58 @@
                    is_static=True)
     return
 
+def register_Ns3PointToPointEpcHelper_methods(root_module, cls):
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::PointToPointEpcHelper::PointToPointEpcHelper(ns3::PointToPointEpcHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointToPointEpcHelper const &', 'arg0')])
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::PointToPointEpcHelper::PointToPointEpcHelper() [constructor]
+    cls.add_constructor([])
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::ActivateEpsBearer(ns3::Ptr<ns3::NetDevice> ueLteDevice, uint64_t imsi, ns3::Ptr<ns3::EpcTft> tft, ns3::EpsBearer bearer) [member function]
+    cls.add_method('ActivateEpsBearer', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi'), param('ns3::Ptr< ns3::EpcTft >', 'tft'), param('ns3::EpsBearer', 'bearer')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::AddEnb(ns3::Ptr<ns3::Node> enbNode, ns3::Ptr<ns3::NetDevice> lteEnbNetDevice, uint16_t cellId) [member function]
+    cls.add_method('AddEnb', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'enbNode'), param('ns3::Ptr< ns3::NetDevice >', 'lteEnbNetDevice'), param('uint16_t', 'cellId')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::AddUe(ns3::Ptr<ns3::NetDevice> ueLteDevice, uint64_t imsi) [member function]
+    cls.add_method('AddUe', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'ueLteDevice'), param('uint64_t', 'imsi')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::AddX2Interface(ns3::Ptr<ns3::Node> enbNode1, ns3::Ptr<ns3::Node> enbNode2) [member function]
+    cls.add_method('AddX2Interface', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'enbNode1'), param('ns3::Ptr< ns3::Node >', 'enbNode2')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::Ipv4InterfaceContainer ns3::PointToPointEpcHelper::AssignUeIpv4Address(ns3::NetDeviceContainer ueDevices) [member function]
+    cls.add_method('AssignUeIpv4Address', 
+                   'ns3::Ipv4InterfaceContainer', 
+                   [param('ns3::NetDeviceContainer', 'ueDevices')], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): void ns3::PointToPointEpcHelper::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::Ptr<ns3::Node> ns3::PointToPointEpcHelper::GetPgwNode() [member function]
+    cls.add_method('GetPgwNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_virtual=True)
+    ## point-to-point-epc-helper.h (module 'lte'): static ns3::TypeId ns3::PointToPointEpcHelper::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## point-to-point-epc-helper.h (module 'lte'): ns3::Ipv4Address ns3::PointToPointEpcHelper::GetUeDefaultGatewayAddress() [member function]
+    cls.add_method('GetUeDefaultGatewayAddress', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_Ns3PointerChecker_methods(root_module, cls):
     ## pointer.h (module 'core'): ns3::PointerChecker::PointerChecker() [constructor]
     cls.add_constructor([])
@@ -18153,6 +18557,22 @@
                    is_const=True, visibility='protected')
     return
 
+def register_Ns3Sib1LteControlMessage_methods(root_module, cls):
+    ## lte-control-messages.h (module 'lte'): ns3::Sib1LteControlMessage::Sib1LteControlMessage(ns3::Sib1LteControlMessage const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Sib1LteControlMessage const &', 'arg0')])
+    ## lte-control-messages.h (module 'lte'): ns3::Sib1LteControlMessage::Sib1LteControlMessage() [constructor]
+    cls.add_constructor([])
+    ## lte-control-messages.h (module 'lte'): ns3::LteRrcSap::SystemInformationBlockType1 ns3::Sib1LteControlMessage::GetSib1() const [member function]
+    cls.add_method('GetSib1', 
+                   'ns3::LteRrcSap::SystemInformationBlockType1', 
+                   [], 
+                   is_const=True)
+    ## lte-control-messages.h (module 'lte'): void ns3::Sib1LteControlMessage::SetSib1(ns3::LteRrcSap::SystemInformationBlockType1 sib1) [member function]
+    cls.add_method('SetSib1', 
+                   'void', 
+                   [param('ns3::LteRrcSap::SystemInformationBlockType1', 'sib1')])
+    return
+
 def register_Ns3SpectrumChannel_methods(root_module, cls):
     ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel::SpectrumChannel() [constructor]
     cls.add_constructor([])
@@ -18763,6 +19183,80 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3A2A4RsrqHandoverAlgorithm_methods(root_module, cls):
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): ns3::A2A4RsrqHandoverAlgorithm::A2A4RsrqHandoverAlgorithm(ns3::A2A4RsrqHandoverAlgorithm const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::A2A4RsrqHandoverAlgorithm const &', 'arg0')])
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): ns3::A2A4RsrqHandoverAlgorithm::A2A4RsrqHandoverAlgorithm() [constructor]
+    cls.add_constructor([])
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): ns3::LteHandoverManagementSapProvider * ns3::A2A4RsrqHandoverAlgorithm::GetLteHandoverManagementSapProvider() [member function]
+    cls.add_method('GetLteHandoverManagementSapProvider', 
+                   'ns3::LteHandoverManagementSapProvider *', 
+                   [], 
+                   is_virtual=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): static ns3::TypeId ns3::A2A4RsrqHandoverAlgorithm::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): void ns3::A2A4RsrqHandoverAlgorithm::SetLteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapUser', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapUser *', 's')], 
+                   is_virtual=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): void ns3::A2A4RsrqHandoverAlgorithm::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): void ns3::A2A4RsrqHandoverAlgorithm::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## a2-a4-rsrq-handover-algorithm.h (module 'lte'): void ns3::A2A4RsrqHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('DoReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3A3RsrpHandoverAlgorithm_methods(root_module, cls):
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): ns3::A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm(ns3::A3RsrpHandoverAlgorithm const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::A3RsrpHandoverAlgorithm const &', 'arg0')])
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): ns3::A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm() [constructor]
+    cls.add_constructor([])
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): ns3::LteHandoverManagementSapProvider * ns3::A3RsrpHandoverAlgorithm::GetLteHandoverManagementSapProvider() [member function]
+    cls.add_method('GetLteHandoverManagementSapProvider', 
+                   'ns3::LteHandoverManagementSapProvider *', 
+                   [], 
+                   is_virtual=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): static ns3::TypeId ns3::A3RsrpHandoverAlgorithm::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): void ns3::A3RsrpHandoverAlgorithm::SetLteHandoverManagementSapUser(ns3::LteHandoverManagementSapUser * s) [member function]
+    cls.add_method('SetLteHandoverManagementSapUser', 
+                   'void', 
+                   [param('ns3::LteHandoverManagementSapUser *', 's')], 
+                   is_virtual=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): void ns3::A3RsrpHandoverAlgorithm::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): void ns3::A3RsrpHandoverAlgorithm::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## a3-rsrp-handover-algorithm.h (module 'lte'): void ns3::A3RsrpHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, ns3::LteRrcSap::MeasResults measResults) [member function]
+    cls.add_method('DoReportUeMeas', 
+                   'void', 
+                   [param('uint16_t', 'rnti'), param('ns3::LteRrcSap::MeasResults', 'measResults')], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3AddressChecker_methods(root_module, cls):
     ## address.h (module 'network'): ns3::AddressChecker::AddressChecker() [constructor]
     cls.add_constructor([])
@@ -18812,10 +19306,10 @@
     cls.add_method('GetBsr', 
                    'ns3::MacCeListElement_s', 
                    [])
-    ## lte-control-messages.h (module 'lte'): void ns3::BsrLteControlMessage::SetBsr(ns3::MacCeListElement_s ulcqi) [member function]
+    ## lte-control-messages.h (module 'lte'): void ns3::BsrLteControlMessage::SetBsr(ns3::MacCeListElement_s bsr) [member function]
     cls.add_method('SetBsr', 
                    'void', 
-                   [param('ns3::MacCeListElement_s', 'ulcqi')])
+                   [param('ns3::MacCeListElement_s', 'bsr')])
     return
 
 def register_Ns3DlCqiLteControlMessage_methods(root_module, cls):
@@ -19224,10 +19718,10 @@
                    'void', 
                    [param('ns3::SpectrumValue const &', 'interf')], 
                    is_virtual=True)
-    ## lte-enb-phy.h (module 'lte'): void ns3::LteEnbPhy::ReportRsReceivedPower(ns3::SpectrumValue const & interf) [member function]
+    ## lte-enb-phy.h (module 'lte'): void ns3::LteEnbPhy::ReportRsReceivedPower(ns3::SpectrumValue const & power) [member function]
     cls.add_method('ReportRsReceivedPower', 
                    'void', 
-                   [param('ns3::SpectrumValue const &', 'interf')], 
+                   [param('ns3::SpectrumValue const &', 'power')], 
                    is_virtual=True)
     ## lte-enb-phy.h (module 'lte'): void ns3::LteEnbPhy::SendControlChannels(std::list<ns3::Ptr<ns3::LteControlMessage>, std::allocator<ns3::Ptr<ns3::LteControlMessage> > > ctrlMsgList) [member function]
     cls.add_method('SendControlChannels', 
@@ -19466,8 +19960,6 @@
                    is_static=True)
     ## lte-ue-net-device.h (module 'lte'): ns3::LteUeNetDevice::LteUeNetDevice() [constructor]
     cls.add_constructor([])
-    ## lte-ue-net-device.h (module 'lte'): ns3::LteUeNetDevice::LteUeNetDevice(ns3::Ptr<ns3::Node> node, ns3::Ptr<ns3::LteUePhy> phy, ns3::Ptr<ns3::LteUeMac> mac, ns3::Ptr<ns3::LteUeRrc> rrc, ns3::Ptr<ns3::EpcUeNas> nas, uint64_t imsi) [constructor]
-    cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::LteUePhy >', 'phy'), param('ns3::Ptr< ns3::LteUeMac >', 'mac'), param('ns3::Ptr< ns3::LteUeRrc >', 'rrc'), param('ns3::Ptr< ns3::EpcUeNas >', 'nas'), param('uint64_t', 'imsi')])
     ## lte-ue-net-device.h (module 'lte'): void ns3::LteUeNetDevice::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -19503,6 +19995,24 @@
                    'uint64_t', 
                    [], 
                    is_const=True)
+    ## lte-ue-net-device.h (module 'lte'): uint16_t ns3::LteUeNetDevice::GetDlEarfcn() const [member function]
+    cls.add_method('GetDlEarfcn', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## lte-ue-net-device.h (module 'lte'): void ns3::LteUeNetDevice::SetDlEarfcn(uint16_t earfcn) [member function]
+    cls.add_method('SetDlEarfcn', 
+                   'void', 
+                   [param('uint16_t', 'earfcn')])
+    ## lte-ue-net-device.h (module 'lte'): uint32_t ns3::LteUeNetDevice::GetCsgId() const [member function]
+    cls.add_method('GetCsgId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## lte-ue-net-device.h (module 'lte'): void ns3::LteUeNetDevice::SetCsgId(uint32_t csgId) [member function]
+    cls.add_method('SetCsgId', 
+                   'void', 
+                   [param('uint32_t', 'csgId')])
     ## lte-ue-net-device.h (module 'lte'): void ns3::LteUeNetDevice::SetTargetEnb(ns3::Ptr<ns3::LteEnbNetDevice> enb) [member function]
     cls.add_method('SetTargetEnb', 
                    'void', 
@@ -20108,6 +20618,24 @@
     cls.add_method('SetUlEarfcn', 
                    'void', 
                    [param('uint16_t', 'earfcn')])
+    ## lte-enb-net-device.h (module 'lte'): uint32_t ns3::LteEnbNetDevice::GetCsgId() const [member function]
+    cls.add_method('GetCsgId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## lte-enb-net-device.h (module 'lte'): void ns3::LteEnbNetDevice::SetCsgId(uint32_t csgId) [member function]
+    cls.add_method('SetCsgId', 
+                   'void', 
+                   [param('uint32_t', 'csgId')])
+    ## lte-enb-net-device.h (module 'lte'): bool ns3::LteEnbNetDevice::GetCsgIndication() const [member function]
+    cls.add_method('GetCsgIndication', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## lte-enb-net-device.h (module 'lte'): void ns3::LteEnbNetDevice::SetCsgIndication(bool csgIndication) [member function]
+    cls.add_method('SetCsgIndication', 
+                   'void', 
+                   [param('bool', 'csgIndication')])
     ## lte-enb-net-device.h (module 'lte'): void ns3::LteEnbNetDevice::DoInitialize() [member function]
     cls.add_method('DoInitialize', 
                    'void', 
diff -Naur ns-3.18.1/src/lte/doc/Makefile ns-3.19/src/lte/doc/Makefile
--- ns-3.18.1/src/lte/doc/Makefile	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/Makefile	2013-12-20 09:44:50.000000000 -0800
@@ -11,7 +11,7 @@
 # specify dia figures from which .png and .pdf figures need to be built
 
 IMAGES_DIA = \
-        $(FIGURES)/epc-ctrl-arch.dia \
+	$(FIGURES)/epc-ctrl-arch.dia \
 	$(FIGURES)/epc-data-flow-dl.dia \
 	$(FIGURES)/epc-data-flow-ul.dia \
 	$(FIGURES)/epc-profiling-scenario.dia \
@@ -26,12 +26,20 @@
 	$(FIGURES)/lte-arch-ue-ctrl.dia \
 	$(FIGURES)/lte-enb-phy.dia \
 	$(FIGURES)/lte-ue-phy.dia \
+	$(FIGURES)/lte-epc-x2-handover-seq-diagram.dia \
 	$(FIGURES)/lte-epc-e2e-data-protocol-stack.dia \
 	$(FIGURES)/lte-interference-test-scenario.dia \
 	$(FIGURES)/lte-subframe-structure.dia \
 	$(FIGURES)/lte-epc-x2-interface.dia \
 	$(FIGURES)/lte-harq-architecture.dia \
-	$(FIGURES)/lte-harq-processes-scheme.dia
+	$(FIGURES)/lte-harq-processes-scheme.dia \
+	$(FIGURES)/ue-meas-consumer.dia \
+	$(FIGURES)/ue-meas-piecewise-motion.dia \
+	$(FIGURES)/ue-meas-piecewise-a1.dia \
+	$(FIGURES)/ue-meas-piecewise-a1-hys.dia \
+	$(FIGURES)/lte-cell-selection-timeline.dia \
+	$(FIGURES)/lte-cell-selection-scenario.dia \
+	$(FIGURES)/lte-handover-target-scenario.dia
 
 
 # specify eps figures from which .png and .pdf figures need to be built
@@ -53,9 +61,8 @@
 	$(FIGURES)/lte-rlc-data-retx-dl.eps \
 	$(FIGURES)/lte-rlc-data-txon-ul.eps \
 	$(FIGURES)/lte-rlc-data-retx-ul.eps \
-	$(FIGURES)/lte-epc-x2-handover-seq-diagram.eps \
-	$(FIGURES)/lte-epc-x2-entity-saps.eps
-
+	$(FIGURES)/lte-epc-x2-entity-saps.eps \
+	$(FIGURES)/lte-strongest-cell-handover-algorithm.eps
 
 # rescale pdf figures as necessary
 $(FIGURES)/lte-interference-test-scenario.pdf_width = 3in
@@ -78,8 +85,6 @@
 $(FIGURES)/lte-subframe-structure.pdf_width = 2in
 $(FIGURES)/mac-random-access-contention.pdf_width = 10cm
 $(FIGURES)/mac-random-access-noncontention.pdf_width = 15cm
-$(FIGURES)/lte-ue-rrc-states.pdf_width = 7cm
-$(FIGURES)/lte-handover-algorithm.pdf_width = 10cm
 $(FIGURES)/helpers.pdf_width = 8cm
 
 IMAGES_SEQDIAG = \
@@ -95,7 +100,7 @@
 IMAGES_DOT = \
 	$(FIGURES)/lte-enb-rrc-states.dot \
 	$(FIGURES)/lte-ue-rrc-states.dot \
-	$(FIGURES)/lte-handover-algorithm.dot
+	$(FIGURES)/lte-legacy-handover-algorithm.dot
 
 IMAGES_NOBUILD = $(FIGURES)/fading_pedestrian.png \
 	$(FIGURES)/fading_vehicular.png \
@@ -131,6 +136,8 @@
 	$(FIGURES)/helpers.pdf \
 	$(FIGURES)/miesm_scheme.pdf \
 	$(FIGURES)/miesm_scheme.png \
+	$(FIGURES)/lte-handover-campaign-rem.pdf \
+	$(FIGURES)/lte-handover-campaign-rem.png \
 	${IMAGES_SEQDIAG:.seqdiag=.png} \
 	${IMAGES_SEQDIAG:.seqdiag=.pdf} \
 	${IMAGES_DOT:.dot=.png} \
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-cell-selection-scenario.dia ns-3.19/src/lte/doc/source/figures/lte-cell-selection-scenario.dia
--- ns-3.18.1/src/lte/doc/source/figures/lte-cell-selection-scenario.dia	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-cell-selection-scenario.dia	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,9 @@
+��][s�H~ϯ��W"��2L25I��>l�>d��%@���%	;އ���ݒc�Z
�iO%���n������߾/��C�q�~��
�E�,��������ヸ��ӻ_�q�������H}"-�o����������� y*�2˃$^Et�W�$ᵺ���ӻ�����{��aY��tUF�4\F�����"�V������n�%Y>z��W�o���u����:{־�4��o���G�.K�G�������%����%;�������P��O�'�[��xY��Fw)�a���m:�l�� P B�0�p���OnzZr�i��%7�Y^�a\n��fY�iE��WQw:�,L��ۖ�.n����m�m6P��Cڎ��E����;Vy�����wG�U���h�����I�t�qZ���S?�o~;�_>n�
�j;��\D4�ǫ��*�G�
6[�f�Jw�eׇN}�S����
�$|��z��/jzT�5��Y?<���L���YYo�k��0��>����S?�e���W�맵�?��­��~�c6�����N7�����"�j���D����
WD�k7ʳ,Mo�tn�q��/�`;n?]-g����d��E�6�n�ūA�ĔIH,(�SmR�Ԏ��|�fŪ-x�oI�M�m��1d.�W�?�xE7*Q-����Vm?�0����J��;z�(^ܕ��F�֞f�<��x9%�`
+�q(8�>`aE�p)TtĄ8M{#ћ�!kA�]Ѧ����'����A!�؆2/d��[�b�R����Ɛ:����B�l��Cl%�vf�VF�WD�����pF��ձ����^�<�����/q1��~��d�����.[c`X30�x;�kW�B�,��SΕY�e7�˨�D�����@�$�2�3ryZ�HÁ}���[�^��F7�q�� ��;�Dq�=�4d��������Et�ٛ�,����e����F��h2
+	�x�H���DL��l��Ba�o���~�@Z�b��3[(���7P�Fbw0.��v���Ea+�z\��&��Mkx�z}s>�p:��WT>f�7Ÿ��")F.�60��
y�S�Ts+�� �t�5	�ޏÜĆ1�Ҫ&
�k?©�kc���|m�?e��<�a��2�L	��u�Z;j��8�:e�6��n�e�<)��Ҭ�gJ�2R}��:�8�_#��7��g�rv��ж��
+��vt6uJ+���0��2j�>U�������#]��Y^�T����N�`�a��RwF�A���Vw^۽�8��voL�i��k�����u��rЅ˴���ju���������S����;��._ߙ�WxoF�����p[�OMHA�<dT�ʃZ�A��|D��!�<S��uޅ�ֵqкIA��C�'te�c�+ㄘ({�*��/��|l�0����8_�V_�{>krh�cH ץ�`�]s�K���H�@$����ەwl����쬄��p}��mw����f�hg�>\�PiU%2Ƹp�-u���O(.�N��_Fw��kS��Li���_�`�ᳰ��r��>��l�Q?BIz�"wΉ�F)ҙd	$�`�	6�
�P���om
ƓW��(y�×F��I�	���el��(w
+TiD;E٩4Z7�0��+�S��ۗ��J9���MZA9s-�;��/>]�P~�L.�P�� r�B	�����Q����3u�"�}j��V�XU�+YT��FDz����v�ʢ����ȢE$R����Z�X(H](���B�^�� ����H!�#�`������%Tȱ�Pa��>v�c�>vx��a{�?*��h5=A�<������t>I���O�$��jB���\'�t:�z1��A�`�P����]�l��o G$@P2I��a:Ш��`���Y`�����mL�$Ȍ]c��k	#�A���X�tA��9�\ 9��ЏT�M�H�5���%�/��Ir�����'�9o�}!�y_觟$��ˡ�r��<�Bb8�A.3�)�g����7�`r	u#4�KYUyy�y��}`��o�(]�ejO� �w�/��я���	���	A�kn�A���'��:��~2<ɓ��w׀1�Π��!?
���;�L�a�q�!<����@�4U�;w!��E����m�E�������H[�o�G�D
����#�`n��;������)Ҩ,1��л��r��ɀ:-�cBӀ�!]+��:�@p�=�{ͅA���#䇁�7�cݍ�"��XZg}`]
��z\���Y���Y��iSmc��ªR�|L�"��۴�a ��3&
e�7f��f��w��
+�GB.����L�0s�yj��p��� әM�3f�
�Ē9�m/�o�3[��IIfc�`���Ry��ld],���VRI�"�02y�ٽ*��,��������ϵ0R�� j�T��:m���9�S�v,=��y�
����E��v�`0���=�M� �@ÿP!��D*=/�r(=��T�,�3�
+�S�Bhbպ�R܏<<�(g1e�0�b�)�T*gވQ��p&��$r�Ig*��B`o��M\l@� я��$:~�T�7t����P3�������j�î��X��Hb
+ B�$<_��H���}o�h҇.��9Z?�N0���Pg~n���R����ǵ�Y>���)~�� �ZQ�;(�6�����D�9�~*?�u���si"��C��gPnR4���/_�>�EIr����(���n�Ίo��\N�'>
 �R�n�fl,f
H�оa����l��*1�4*��`�
��#�px<2
�x��6�f�2�̵#4l�#��h�q�����ǥa�}աt;
F��.x�ƀ.�AΛ��ƈ�A'Ġ�ҭ���O&c�}sd\� ��t(�0��9�����Q��g�Qb?
Z��%���"E�E:�{u>h��<�z=�Z��s���`"��c?{yu����q����pԺ�^L���W����4Ey��#i�y(�Pz>(�=<U��
��
+KA���[�K��c����a�u?�#]b�ZWX�k,%>R건��<�z,=���0�n���UḁTN�S:�ˠ�c)�%�K/K��pC�ς��*��j,��R��y��<�z,=��>�����h<
��K�@��y,u������ciXZ���OQ��]�������w��%�3E�
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-cell-selection-timeline.dia ns-3.19/src/lte/doc/source/figures/lte-cell-selection-timeline.dia
--- ns-3.18.1/src/lte/doc/source/figures/lte-cell-selection-timeline.dia	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-cell-selection-timeline.dia	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,9 @@
+��][s�H~�������r0}�L2e;��T9�����O*,a��N��۷$K`$$���qU.�P7�>�s�w}~���<2�4�������I2
�ٛѿ���������i��f�?7�'�L��ft�緯���~�jF��'��wf��G��:�=0��
�~����y��Wwy`��<x3��'���.��ʣ�M�(I�{?z3zq]����U��2��?����c�����}��a�I�C��'�lG��v�⨌�޾8�/�SZ����D7N���t�O���&*/6]�1��s=ˡZ^�����;]�w�T�ta6�M�<����WI~\Κ�w����&~�!�mYVq�y�r��~������ǻm�;w����7n�
�|
�������U���h��0������8�6������N�ޫ�wDC9�F�0u�����.�Y̪�l�fq�Q�U���)_��b�����'+3m,����$�]����$_,�2�㩟N��Ɨ�[>ZsBFF8}3�dU�V}}|4N�O.�m�)�Щ��)wl��>r�OޏgQ��qV�1{��I]��&r�Þ7g..B�k�l"��5�W�"../>�����`�����i27>_^��
��^���$���
>ǖu�'q�tb�u�ڟ��?� 
�GF�?Hq����pd//���c���	��M�i���2]���n�V�ڌVۤa�m�*mqr-��D�;��=M���|q%w��������S��D�S�-wf�b�Rϧ-ԕ��!QH[��;Ħ]P��$� -˘g@D�H`����FD�;!�L�L��P0y-�L�~�D��x�"]T�
+."@E��"ҕ�N
+��o������2m���P���{�Az�����Ip�Ҹ|�'7i���'F~p&�ς,/B<�����_������������>~�e�������	���xyȤy����cj��!|���0�E0	��`jpj2
+骤/�^�΍+��z�+ßL���8�����O5�p�>���q��8֝�Z�[
+��C�y��M�g���˳��/�?}��u*x,�tr��l��8L�aP��a���U*�!�C�`B�2�[�}���_��i���B���lt��Y6r��S�QQӶ=�-��^3��;��D�8I�x��b
;/��m�Lu������MEI��/w\8dO��$P�$�g��_��������EGGA<۾�u��˵�R���ʞع�;�
��!O�@F������ڨ{��a�-�J���{��aW���kǴl�r�|d=�[��Wc�z�W��T/�������������W6��T�+�Ip��W�>f�Y2��
+�s���PFgI����鈠edNp_��@G���0D��#$�O��f;l�-���#��-�+r����_ޝχ��y�h�MR~&i�?gw�I�e�x�ԟ߮r��,����g��?]|8>?����$0bԓvLI���
a	��(10+(��"�c9HP�e?�K�Y�pZdw�����RB�)V�G���w
�RT+�H���o�c��F
���QF- ՁFReGΖ�?�ّ��#kym�>q���-����e[DTm�<p>$�(��[�kq�z�qq��ݧ���ӳ���47R���O�E4cܦ�$�ޥ
�#Z��DA�p��:���.�!�E�lܛ,�
Y,��1�xt�Hp�l��+�HL�&
+�����S��PeF�	��~	��~�%�RgF�v	�@��^6ѓF���rؕ�g2c���� �EC�y0�'E?}�(-���G����8]U�^�YFW�ѥ C`�%�;�QK-�yܻ�����t�&�֘�2��nW�������0=��=pX�,����]�Z���]���%i�]�]�eT%�h�Ԩ;r�[(�ܢ�D�wl�u	� ��8J�2#���V�#E:����8R�����2���̰��_~�0�0h����)倂�	��:�$b[m�Zi� f��	�FO m��F�6R�8
���	�l�:
��
����ȑ�)� �_�O��'@���5&��	�`=W�Ť���<�^xL6�����1OF4骍&+[����@IM8�����Y2JO�o�VQECM�c��2��
��^f�~�z �pҎ/N����x���@L�=Ĥ¶BAlϻ3��ŰXm�+l�5h���
Օ5�=�GC�
����@��I���f�#�]�'�4 �]jk8�m�� F�h�r��M����*G
��5n�!$��QOdT +����s�m���t,G�6���5�I��N�N���Iu�i����B{�X����Nj�����_{�Q\�m��V�d���0�uR�
�4J�Q_�?9����b�	r�z"&lN�tjmt�����-[gDՐQ���U�sdU��t�����nS5<P5��'��1iS�����UW�ɶ|�8�ǁ�R�ɘ�z2�z@	!,$`ܷ�ޟ��ɪ���d���.�0�ħ6x�P������#I��)��uT��%UoPC3��Қs\���D����(MŠ�ø�jX_>Y���Zޓ,�Iiy��j�[0�8<Kd֡�X��]�-T����bԦ�@x����2v'�R�=�l	�K�%�!e�q�2)���l)��9��-��m�� �����8���q��(�#:�qYvr.�V�@IM8�k�$�P�(.�#����T��h��=(J�H*ewD�!
�l�I54t�-�������y?�(� �(�
Zvu��:CWgͶ�: `2J���P[4v���3ИT���	!��JF�����*��JF�V�H�*���~�KP���V��߹�
<��l!��1�2���x~4�n�Hjh�\[Z�����YC���>[3	ň&Sܞ�6)�	�M������մq���hbIPcr���C��A��k���5[�\�Ps֠�ꂚ�5���)PS�+d
5�x�jb�R-Pkyx���j�����֠f낚�5���<)PS�H@
5�VP#X�Z�=�K��f[r��>, ka
�����@X�#Ԑ���	�P�VP��&��hkN���xP�rXM����i�(���e���s:�*}��1چ0�`T��r��Đ&��V�Af`W�1)(c�QFW(c�P�ZQ���(����U�2g�2W��V�A>`G�9R\2�e�n�t�f�U5c ��2W
+ʔ[L���D��$���]Q��@�R����2�K,��Z�1�����ҷ�/��,��o��(Y
+

\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-enb-rrc-states.dot ns-3.19/src/lte/doc/source/figures/lte-enb-rrc-states.dot
--- ns-3.18.1/src/lte/doc/source/figures/lte-enb-rrc-states.dot	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-enb-rrc-states.dot	2013-12-20 09:44:50.000000000 -0800
@@ -1,37 +1,40 @@
 digraph LteEnbRrcStates {
 
-size="20,20"
-
 
 NO_CONTEXT [shape="ellipse", label="no context"]
-INITIAL_RANDOM_ACCESS  [shape="box",width=4]
-CONNECTION_SETUP [shape="box",width=4]
-CONNECTION_REJECTED [shape="box",width=4] 
-CONNECTED_NORMALLY [shape="box",width=4] 
-CONNECTION_RECONFIGURATION [shape="box",width=4] 
-HANDOVER_PREPARATION [shape="box",width=4] 
-HANDOVER_JOINING [shape="box",width=4] 
-HANDOVER_PATH_SWITCH [shape="box",width=4] 
-HANDOVER_LEAVING [shape="box",width=4]
+INITIAL_RANDOM_ACCESS [shape="box",width=3]
+CONNECTION_SETUP [shape="box",width=3]
+CONNECTION_REJECTED [shape="box",width=3] 
+CONNECTED_NORMALLY [shape="box",width=3] 
+CONNECTION_RECONFIGURATION [shape="box",width=3] 
+HANDOVER_PREPARATION [shape="box",width=3] 
+HANDOVER_JOINING [shape="box",width=3] 
+HANDOVER_PATH_SWITCH [shape="box",width=3] 
+HANDOVER_LEAVING [shape="box",width=3]
 CONTEXT_DESTROYED [shape="ellipse", label="context destroyed"]
 
-NO_CONTEXT -> INITIAL_RANDOM_ACCESS [label="rx RA preamble",labeldistance=0]
-INITIAL_RANDOM_ACCESS -> CONNECTION_REJECTED [label="rx RRC CONN REQUEST, AdmitRrcConnectionRequest = false"]
-CONNECTION_REJECTED -> CONTEXT_DESTROYED [label="ConnectionRejectedTimeout"]
-INITIAL_RANDOM_ACCESS -> CONTEXT_DESTROYED [label="ConnectionTimeout"]
-INITIAL_RANDOM_ACCESS -> CONNECTION_SETUP [label="rx RRC CONN REQUEST, AdmitRrcConnectionRequest = true"]
-CONNECTION_SETUP -> CONNECTED_NORMALLY [label="rx RRC CONN SETUP COMPLETED"]
-CONNECTED_NORMALLY -> CONNECTION_RECONFIGURATION [label="reconfiguration trigger"]
-CONNECTION_RECONFIGURATION -> CONNECTED_NORMALLY [label="rx RRC CONN RECONF COMPLETED"]
-CONNECTED_NORMALLY -> HANDOVER_PREPARATION [label="handover trigger"]
-HANDOVER_PREPARATION -> CONNECTED_NORMALLY [label="rx X2 HO PREP FAILURE"]
-HANDOVER_PREPARATION -> HANDOVER_LEAVING [label="rx X2 HO REQUEST ACK"]
+// connection establishment
+NO_CONTEXT -> INITIAL_RANDOM_ACCESS [label="rx RA\npreamble"]
+INITIAL_RANDOM_ACCESS -> CONNECTION_REJECTED [label="rx RRC CONN REQ,\nAdmit = false"]
+CONNECTION_REJECTED -> CONTEXT_DESTROYED [label="connection\nrejected\ntimeout"]
+INITIAL_RANDOM_ACCESS -> CONTEXT_DESTROYED [label="connection\ntimeout"]
+INITIAL_RANDOM_ACCESS -> CONNECTION_SETUP [label="rx RRC CONN REQ,\nAdmit = true"]
+CONNECTION_SETUP -> CONNECTED_NORMALLY [label="rx RRC CONN SETUP\nCOMPLETED"]
+CONNECTED_NORMALLY -> CONNECTION_RECONFIGURATION [label="reconfiguration\ntrigger"]
+CONNECTION_RECONFIGURATION -> CONNECTED_NORMALLY [label="rx RRC CONN RECONF\nCOMPLETED"]
+
+// leaving because of handover
+CONNECTED_NORMALLY -> HANDOVER_PREPARATION [label="handover\ntrigger"]
+HANDOVER_PREPARATION -> CONNECTED_NORMALLY [label="rx X2 HO PREP\nFAILURE"]
+HANDOVER_PREPARATION -> HANDOVER_LEAVING [label="rx X2 HO REQ ACK"]
 HANDOVER_LEAVING -> CONTEXT_DESTROYED [label="rx X2 UE CONTEXT RELEASE"]
-HANDOVER_LEAVING -> CONTEXT_DESTROYED [label="HandoverLeavingTimeout"]
-NO_CONTEXT -> HANDOVER_JOINING [label="rx & admit X2 HANDOVER REQUEST"]
-HANDOVER_JOINING -> HANDOVER_PATH_SWITCH [label="RRC CONN RECONF COMPLETED"]
-HANDOVER_JOINING -> CONTEXT_DESTROYED [label="HandoverJoiningTimeout"]
-HANDOVER_PATH_SWITCH -> CONNECTED_NORMALLY [label="rx S1 PATH SWITCH REQUEST ACK"]
+HANDOVER_LEAVING -> CONTEXT_DESTROYED [label="handover\nleaving\ntimeout"]
+
+// joining because of handover
+NO_CONTEXT -> HANDOVER_JOINING [label="rx X2 HANDOVER REQ,\nAdmit = true"]
+HANDOVER_JOINING -> HANDOVER_PATH_SWITCH [label="rx RRC CONN RECONF\nCOMPLETED"]
+HANDOVER_JOINING -> CONTEXT_DESTROYED [label="handover\njoining\ntimeout"]
+HANDOVER_PATH_SWITCH -> CONNECTED_NORMALLY [label="rx S1 PATH SWITCH REQ ACK"]
 
 
-}
\ No newline at end of file
+}
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-enb-rrc-states.pdf ns-3.19/src/lte/doc/source/figures/lte-enb-rrc-states.pdf
--- ns-3.18.1/src/lte/doc/source/figures/lte-enb-rrc-states.pdf	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-enb-rrc-states.pdf	2013-12-20 09:44:50.000000000 -0800
@@ -5,18 +5,20 @@
    /Filter /FlateDecode
 >>
 stream
-x��Zˮ���W��6�oA/
d�D@��H��������cz����\]�B����:u���&�(f��R|�B
-�	2��q����If������wf��߭����l�\��&3�����~��f�0A�_������?����XG��8����`�u��Ro�e�|�����dT4�qk��0�琖�z�/s�v)��X�5iN�,!�^<�U\$�yj5їŔֹ��S/��]zWl�K	Mv+��ح�O�u���	+߭��c�8�7o'q����7֝K1y�IY����qi~�8����<�������1�>~�j-�n}p��5�m}o�{�?�j��V�>�_��8�����۲H���z�6�%{?;���T��+�);�%�❻���>����A.*�a���2ޣ�.����V:��k���m���	M�I~�`�5n��.b�6�˙�Y�~}��{d�bv���["��q��,!�9�E�����b�³G�%؄�%'����~},�3�
}}S�P�b����P�/�o�$e�d��}�7G�6(�Ka^��|�u��v7�J�=(��A���EǦ��@���k������*�6<r.����[�~�Vg����M|F�����N���\���n��>U{���ʇfC�ϖ�o�IU�㡭�:..�9ɒ\&C�-~�aI��`�#܊!��9g�l��J����R��2�`=�E�Ŭ*��9�&Z�	>����UY�+�̾Te��j˶��њ�Ǧ�Z�����у�l������Ր鈊4a�<X�d����A
0{DCBs�V�bE.�'�c<GP�ã�ٔp�����Y���t��
��bt�F_�R�"����{�=*!�B�2��;8��;dIbY��9*.�k�3��ɞ�������b����z��K��=��J�W$i�k�)J��P�i�&���z5��6=�����w��zL�E�����шxq��{�vf0�5 5)}V�6i�ᆹ����:/�1��(H�Td'j��y����i�qM�m=m�Pd˥D�nuZ�(2m�e�,k���-��7Ž��+J%��%�5��u��"�4�s����,d�ߍ��?L��cD��C���\\䄀 Ò��"�%�?�t���
-�A)8A����ӰD��
���>���G����#�
�@�xʒ4��Igmȋ���7�E��>�y�B�� ĞV�2	�nw#�C�1 �Pz�<��L ���5%��z
�b	�V�h@֎2̂�\@{�	�h�Ћm�Ө�aQr��x��˧1�^3&�D��t�����!4���Br�(7#�;�{��h��Հ�myV�6�����ʘ���(R)w
-$
��
;8{�L(�s��U�tU�T9�*`�������0���Q��@�����#|��+:����/&�Lz��aʥ�%�s��Jٗ��M��n���;@��sh�$��|K��A`DMUW�
���L��mn��e�2X,��N���/�#,F�|�c�Sę�%$�8���tNO���i
f��X���iMl��p�
�Q3���%�`�ěS��R�P����`J6;L�������N�ωS�M '�f��̝	�E��� k�!-�1@�xSXaxߚ/�u;jSmy>����B���~�G�r�
����vJwK
�hqD]� a�
�YC4:F�60ޤ�IM�r�Z��\W=U>#���^�V���1%x
�������r�eߠ�|o�z�=������,FsQ^*	k0#[�?���j[]
��т�@z��M����<���Iq��7N;�����H��&����-���/����-���S��!�`��6]i��K�Rh�9x�=��s����'a+u�-[h�dڽ<=��c�m8�����p� ʤ�p�A;V���LBV�-&�[A�Z-CV�U��j/�����kb������PU ��2�<3��3�uEj-���n��V��U'�ʼn`-LC@��8�̀��11Tp5��w=��u������Ȱ�+���0��e8'�pǏk�ܑ�k�6d�Lw�߰�������7pL�o����Uod�>u�.��\D�O���֨,��ׂ����
!� �rA`E,�&�f�b�97���ob�!�*�&�ӎf'�tf9�i�q�J��
�g)Q��ђ���{��pV�'S�i��0m��c"���|3�t��=�Q����vh��Z7R��0�=t���.��x�6J�	€6��W$b�N!$(o�D��f-x;C*Q!3���^�S�"�Qܽ1���g��c�3>�p��k��1	�T�1�]#�u��eR�����r��̻wPo]�c����'5Qv����G����*��g�ClNR�Ct+h����%J�Ϟwʥ�pq@Y�^�Zl��R�b��+&T��>L.��_��
-�2U���]�W�
�
-�lFSha����������
-�ȕJ��vT���j���o����K=���Y�)�.��v��jܖ�A��jʖv�=��#��|}��^�q���h�+�o������6������D(����G5pnd�P>Ol�4���4&ďV�Ò+-z8e:��\)�g�j��2Fø�����qsn�|��;�`�3�g0��������ܹ�c��UKσ(��o|���"�"D
��ME����ef�"j;�#��xe�Ə�?�s��%i/ �cQ��D�g�h_�W��`\�Y��\b"j[�> ���(��<�A�GW�aL|�`�Kȗ��[&��y����B/09�;k���
��agA�S<'��̯��M�f�%�$�u�y6gp�B6C\4���La)N�1����>z�s�%�0Ŝ��|e�L�Q�q�2�,�r�*�aR�q(��)���3=��^�\�Yo`^�-���t�6�I���Mo�����������u�?�=���!�O�,̻�U��S
-~��u�s
���.�P��i^*�]7s��H�,��5���3$>H��\�א!z��Ջ�]���d�)T)�^�*�s4�������l���q�C�-�^L�/(ڑ�4�����
+x��Zko����b>����c@�e)�D[��N��BYrR��8v�}�zf�'�-uGI0�}���vWWW����*�w�J}�ܨW�>���ʵ�U�^]��^O���|����g��V�6�����^mԋ��D�Y���?L5��8Duy}�C*�%��K:Y������׬�/�
?U��n3}s��ϯ�b��fz�ڗ�o��o~{~<�O�����q�_
+6�|=ؠ�1.�w}�k�s������r���ʬ0H�_ߍo�U��մ����J�����4�0?�>y\~�~4�__�z�bP�&���־}c���[�֟����)e\cNn��޴�~|,w�!�;�|��n<�B�|��4>��ԇܛ�xr2��>���ٴ*�s�]|�p
���.��U'SU�Fㆫ�q�:��\(:�')�����o�u��i'xN�T�c�
��6!��I��R���<��aNX^^2��T�u�n�M�_]]�1���8Iթ�L��"fEx�~>�0^Nɏ�����<�i�P�	
����!=k6��F��xF���@���-؜>��ht:���e
��2۪l�|�6sX���x��@��e˂��+�X�Q^�U��� ��ak�O�F{+.�#<�k{���*���o���|dz�PO�����X6�֗p�SH
�"A�O��v��^�F%��B�Y�"<p4d\@œa� '�BOO����'��)��
���6���_d�_O�Ύ�b&٬kb�N4w�l �q�(;&cs�@�1L�*��m�H���S1W��:i�q��,��۪�2����^JKra��[�+W�0��`0R,�@&9�BO�I��f���P�S1r��Tk�OxՀu��Sf�p��v~O4�hz$O�ۡ_}��q��TU���& ]���x\{I�$�\��)"Р"Ƨ�e��6'a#b�
�f�X��)�g��h %�
�XiMm
+�
+�P�ϕV<R��G����R/'o��|�i�03�a)d|)l��>��.�4"m
�)|�O��7�
+�h�<�_a������y^�"(�f?=�o�����S��z�>�ޒL��˻� A/���H1�����0��
+��Z�R
+�T5W
��$���C�rꘃ�����4��X#�" ]עk�Ua1Up�	慆)N~�N���!(�>B�Q�k�px`_>-K�6~����Ƃd��iC�38����]FK�:�����Y-)���<�����u4s�\��+�ӯ��Ϟ1���Ύ��f́�-g�j艹d)�d�#��!�#0b��G�~OU�@�%���H��Z8^;`��)��ZB}JA�$w� ax������
+-�ec��]2�Թ(o�"-S��Qwܓ)a�*���e�L�#���!�.%M�,���6�rPiy�r�f;��AN�����ij�,M
���<��G�b�9�A�F""ұ��ՠ�H��N��P�G�K="�y����C�H��ʦ&{=�\$��}������

��#,,~dYD��5�<��M����
�c��(��="vߍ�&0���n��y�l�K��7T�U�ZpƢ����
!���m7|�1�J#�Z<H�f,���e��H��
%3l�AA�ab���z�"�pd&d�ے�MQކ��}ا���X�~�y�Ya1����4q.�����
J`q/*�t�#k��ȉ�ݔ�b���)��
���54:���/�O���_�>M���Pm]2¤9�&a��nE����"op�
{���Qr��a�
����g�A�z#�1H��@��d�t���pф�<�S���W@��'����@�̬�i�s.����b�P��vo����#�������
��lL%�L^f��T�+�� 48��3�np� �hD�
r��	N�.Q(��A�7��<X:�ň��k�2q�qCEb�n�5
[�Ț+�l�ҶQ�Y�Uv�1���t�![�(��횿�~s�J�@ȴ!'Ơ���p�ҽ#�!G*(�I"�^��']9�C�S�d')P*(��K��EJ'��Q�m/�1�;� �Q��*,��1���=�;}@ڵ;d���F	2z�99���xc������{z`s�>0	̖��?�b�ݺ7E7~#��»�`b�����ԗ҃s"ZT��pt��E
�z���!��
+���ִ���6�R���1A��G@e�s�Sn��[���ɟ�v��Ԧ
`�ۚ���ZI�=���{E�-�й������ព���B��c�c��Ⱦ�c<G��c����H��v�Bl���gu��M}���:c�[�]J���Qs���0��+���	�r �ҧ�϶�C/��V�慕��Z(SB)Jj��FU����N�E{��v�bie�Zn)�_j�ز��)�E��b��a�=|
�����e��z#�E���h�O+L��q��ޥ^�wnn���	��.��pGtEL%���N�>�h�����!ݓ���)7e)��!�e�'I��:˱��%)S��-�
V����u�mM���M�nxs�4�z&� �iqM��<��0�F���jXYf�`�@m?*��Q��c˃�	� x#`���[x8�����_�I[l
���`�a��	�6wP�Ԅ?%�d^�OD��k[@PT�T�
+��rg��T�F##1�LpkI
�
&�<t�l���R�wzl����
��dmPE~eqB�����w9����®l&mv�������,�s�u�S@�n�X�M)�
������(��p-	�~L_������pv��'��J��h�@�ˬ=�dY���r�����{Wv
 endstream
 endobj
 4 0 obj
-   3089
+   2892
 endobj
 2 0 obj
 <<
@@ -25,82 +27,132 @@
    >>
    /Font <<
       /f-0-0 5 0 R
+      /f-0-1 6 0 R
    >>
 >>
 endobj
-6 0 obj
+7 0 obj
 << /Type /Page
    /Parent 1 0 R
-   /MediaBox [ 0 0 1512 646 ]
+   /MediaBox [ 0 0 870 804 ]
    /Contents 3 0 R
    /Group <<
       /Type /Group
       /S /Transparency
+      /I true
       /CS /DeviceRGB
    >>
    /Resources 2 0 R
 >>
 endobj
-7 0 obj
-<< /Length 8 0 R
+8 0 obj
+<< /Length 9 0 R
    /Filter /FlateDecode
-   /Length1 12944
+   /Length1 12408
 >>
 stream
-x��z{|����<;{;�=9'�+�sKL@Y#w�$( D����5�,	4*$R�
1"��AD�V���z
���H}��!����I�{�����dϞ�ݝ�y����>��BLRE�$ϸo�\�r)HH�Z,�?c��dvB!!YC��|�=����^Bz�1�{�ϖ���K�G�{!�Κ9���ɷ����X����Մ�J��Y�=���n��x��93���k{�����-���T��G����Ϝ;X�;��E�E)�J9߁��H��V.�2�y%SHN˩���T���+�JO�R��>�ڿ����o�W�	%�	Qʔ
-A��1`�R��k5�����d���]#���ּKXaΐs�ZZ�@Ta����{!F�R+�ꗑ�C
���
4?/R)kZ��n_ss��^;�vt�ɶn����t�̲o���:�*�.E��js�4��k���o<Bã���s�Z�r�ԡ1�B��*�J�ҬtU�+=��J_��Ҫ4�\���5؎`d~^��~�y�����߰oo��}��_�
q����7ԂO�?~�˷�}�E�%Z���-�4H���l#��6Ɛ�v���o�g��l)�QM��X-�!���c����[*.]����������k��جP_��ݴ
!/
�*%/Ώ�u��G�>_��q���!>�}�:q�R��W��'O���kOZ��zi�Ju�5��-ߊc6Ў�r�O��kL�n�����W�ِ��+,�qk�4��5�*,�=�l��QK	�X���4��#��J-ȷ�"Z!V����K�������ڎ���6o�=+��7ࣻƭm$qd��FBԨ�W��Ӕ7���́&�����C:�����@�X�°���/���,ȵ��&�MhH�]��>��C����8�[��s���2��asBs〈�Si������VS*��O�p��3~�Sq	�2��s�5���67{�]S^>֯�����@j��$�ܲ����Ҟ�q,QJ���d�������&w\����uYx�i&�;���a�Vdj
-Ut�
-g]�������6��6�&�1��/��	wLn&*���mN��;_X�r�Ŋ�#4�5g���&k~���׻6����KzP�qSQ�X%df��+י�۵�f���.Uj���&e��Q{�|��E�V�Uvj�1�x�
�!2b]ِ�Ӎ��d� Zx?��Q�����|�1�e{J�$Z�J�v>I-�&铌W�g�g1��<A7h{�����O�'g*�j�T���A�2�S��8,��ϋ���l���v|��m��)��Z9��k=?�X���,��DQ���vh)"�&�5�ڞ\n�b^�k�6�N�ȷR���6?�֫����d���Y8zLh�ƀ<�s�j,^�a�&�e{�U�e��.�+_˭�ǁ$�;�?��b#�٬\�b�J
5Dc�t�z;����%�J��ZG7��\~�@D
-��-�J=N���E\츷�����|��K��r��m�s_a;5D?����r��Ol��O�k?���Ԛ�K�M~������DG��,�#��D�X}��7lc���0���ԩV��|�q�D�~zO�i�K�[���<���u�F��p�Y=�2�$#����B�S�'�hu���qF�����%��N���m����^4h�[��G}̧�t�L��d-14�3%�ưIt2+v�Cg��t![�+���z
]Ū܏�MP�DI'�)4��B
-��#�K_��߯�{�i�툁�m�h�XN�|B���I���:EE�^u�5�6r�b�
-��J�BC����n���{p�ZE���?}�%OS�K�u�+�R���G���6���'��"H<y�.@���"���T��@	��:�r��U���fL�b

��n%AF�v�Q�衎�/�JK��U��_�hZ;�1���	���)!�� ��(%���t�
�j���gɉ�i6��`��e
_�J]�=�>�%�ii"��H�����)ɑ������TXwc�
'ϼ2f��ߦoQ��P�j�X]�c�H�#��he�����\w����B�C��I#�D'�k�H�����u�7	���xC	8�Bv7�Zs�F8�*�����g�M��K��&���	QD���^��bϹ��FӾ�7��%6�*�Q���γ�����T�u
R�~T�_>Ą��\��GWx�����o��XtP��cJE��t],V���MQC��E��B�U4�Q4���Q;�b��&�;�t����G5	m�&�����H��t�f�NH����@���™�ӎ�j�r����	#Wx�ɰ���^��@N7��!�"���%kf��O+0g�e�B[bV��
-��PD�8H��!S�2��!0I/1f���%8n렎>
A�p"���T���i%��<!*��u���Oj'
-i����L�䛱�'���:�>I�+uQ�JJ�!�A�t������݅܃���8�E��r-@*�3�ϯ�$�"�S��|��_�R<#��jz[��|������q쮻?5
-�Q�ny#�����w�u��	�Ny������l�)9�sZ�6�H�u#$�vmǡ�#��(d߷߀�+F��8�ǩ�y�v�w&��=��f^KLJD���,))��t%&)!JBO7D�YJِ��J4]Iq�����{d�?n��?��ə'h�s���G���W�B����fꡤ��d�5T4	gz(�����,phN��;��$�5���w>�h���� �,���MUE�����\���4����w�9���3�bz�9t��ܜ�
��?_���սG�e����1�-�kU�F,�x��#��b8��=X�0r�S�HRx�8b[��pC�ʊ(�4������^�7�/w@QQ>�sg����<?b�
v\l3�����]K_�#	V�52
-2� l^Xa����߂��(M�JlH�4�@��'��1��4�sO�c+��x�tv�S���c�=%���UsO�4qD|��#���N�?�pl�@?��3I:9bg�$��/y:Jm�Z��I��SQZD�IDK�zpx���S��0[i9w�=�(�hÃ��?�M�M�M�M�M��14�N��$;�N�{''''��(Μ��2�&�&�&�&ee�G22/f&v��}S�
���I�ɥ)s�&�M��R�X�T�\�=��u=��AJ���~��S
-+iΐ��?ٷ|Φ榦�GV�;�q���6��0��)�y��WL��`�����O{m�K�*����'3���w��U2��PF���	Z�]��MqGb��M>]W�-�W�ǎHu�f;�c�
G��@J�jG���M{$�
?��}�֙f`?�v��U��&g�����ٗ��_P����E�v57m\�t/�^���Kq��)n���O��G��3}Yx��x�P��+�R�A��g4G�����6Ɛ@`d�[ņ_�ƜV��^�=�E�6^�x�8df�_t�^ǯ�z��f���y��k��l7������K��/����d��0Ƕ=�.�=�_D��p�ך���Z�9�`+{�A��=��妊(��*۝Y=���=P� %�*���)$cgy����;����^5e��<U%/ؙ��T��T�S�c����,�d�pN�n.�$���ź���	��H>��@S��tE�� �UbyO�A3X�����d} ɧ�l�2�PG��t8���#U�Cj9����K�B��K�%|�Z�?N6��S��ɧlL������wC��|��v֋rG�H��bD��d���ja��~�y΅1��)���؞bO��ֳ��h�ڋH�>��ɳ���9����K{�_�o�`�I �v2�q��������P��Q}m"#�V?%?:��O���\{˕�+N]��M�R
-R,U鎴JԵ1XyCb��
b�X@�л�ڜ��k��5*��Ow����꨼m"�D�?��F���ݥ�]���x7ݙ'˱��i�\zҮ�P���
-X�j�XF51B�!��zudd%9�NHL �ILLHNb)��aFE� :hE�8g�aED�(���O���	�Ң�������Y�j]t���
i�F��F�}]^��
�2���7���|)��_��i9uJNN�]������=��_eZ�(K�u�$r��v?,�nzm̾�WBx������0��I<MbQ���'�"��\w�:Ŝ�;%�$���
-��L7��z�k}�.��Ǧ>I��p�;ӝ��W�;ƊƇ"��2I&�6R=#z�B9y��~�ˆ�yc���cC#b~�7�N1J�%w&ݝw�{�U���.q/�֓�t#��[�-�6}��k������ƼB�'��+�e v
�W�FS3�Ƌ
�o����
-/���1�T�ݻF�
-�>�H=�5�F���:���Ż�չyi�m��۷���`H����^j�ڎ�KN��K�������i��>�1��!��LK;�sݜ���t實 ���x���z��Fp��H��-��w�[~��Ɯ���I�s�����4�e':I�e�uCd޽����պ�lFu��&B�Ԁ]���e{՗���Ʃ����}H�#!��.����R��<��$<75)����Wr�_��mգ���&?F�z��T�l*�9�C���ܱ�Eœ��f!���2mebo皿�ʿ�S�
E#�PT�LP��J"򝔏����g�|���Hf䌸S�����O�^��߳���� ۈ�L�s>�lF&��W�L?���6x��*��?�c3>�j���Є���2�trjΣ���j8��T5���?�4˛�L⓴��R�0�&FS���*q<�
�P];?���:fE슸���8�7y}A2�z-�QPc����k�7ϧ����T��,^zj�48��qiϞ=�裃��8zQ}�M�\����w �֣��.=�@n�{b<�Q������ȗ�vj4
-TO�'��#&Α���Y+	;�G��(%�����nWE,���J�KNI��5,,5���.e����1��N�B����Wr vg��YĶ#uf���y�dy@�7bX�1p5�����y]j?�J��E�ҝ�S	gX��N����'�'ؘ/�'(*\�������N�����i]�e��_� ��hZ�)���ԙ"3C-�b��IX:˄�Lԇ�BCCw��
qgf��qz�cE�@�z�n��ub }�4�e�6��xﱚ��v���ϟw�Fl��7� ���n�JR��Đh�c:������F\�`��[�>�*�%�^�⬃8z��6��ƽs$�a�#�'^�H�z���ʵ D�
����ӍCl�Ut��t�%v������;�O�#^Nvև�d�u�h�I��ܨQ��q�cH6�0�S8���DsB��e�뚑�t�\&z������}�f�:�m���Vq�a_����[�לγpېI�wi�ۺ��mW�3����`uhu�\�Io���o�ӽ��1<Kj�S?���q�!l?���q�"�����xW���������l6��]�$���,3��3"'������������YmV���՞�da����7x�>�C�B�+	FfN��컳+����nȾ���3��"]M�w�.�&��{����7m���?Ny�g�G��X;s����O�-?�ݟ�5a�=:��s��-�RS_.((?�8ݗV�b�İF9CK�G�݉=�la�E�T!�2���]YID,��3��	���������{�_�Ď�~�֟Vi
��U��,B#��u��usP"�)��^
-�:�%*8�U-
G�J�࿐p���B2u�6I��$wjA��
��q�-4G���ظ�%5��x֌��x�v܋{e��U��]c߄�а�O.��C^G|��!r��`�s[.�Y�q~��5��u����MC����߽��;��u�r�Ӈ��jN�Y?@�k�tt���dX��d�x"�(�ߓ�)��6b��L1����5�*�zO�$�w��._
1���Qf�t�zc}�$
=1YI��z��n���ܙ��ޞ�dk)�,W������Bo�/׺���f6؊�m��l��n�������2��g�X)�ԉ�$�v�vs�k���[�+��i9�e�����Z�b�b�j�ҵҽڳڻڷɨsչ7{7�v�v��z�����O�Nk&:8�ҰlJ��֏۰l��n���"�A�w�1뭥�GUOPƵo��I?�������`g9E�M��
"��|��Er�9&�*�ؚᬦ�wyHL9͇pdh)��s�m�m}<���3�/�z揤��df�l@�m�Cg�b�kn3=�)pt��r�n�O��xY�fV��mG!;��A�2�Ur���qT��>���H��(�!-�sݚP���@wtG��C�R�W�ؽ��U�jV�e;�.d���B��Ad���d��eR�d
��|�j��* �(�z9)��a�r������*�|������a���W���5�fx\y�oTw��F�U��S�A�S�^jqg�R�>
�]n�x�����pa�av��i���[��/�#������?�P�MF�f|��Y[nuȐwI�-�*�J��V�$�ur�,��#��}�Ø�~��i�Ԭ���S���l;ЕV�A0t��f8	^��)`���p�q��1�w4�-����tȥz����O�� ׳�F�(=�Tt"M��Xc%���$Fv@������r�sލ9�iΐ��]Ra^���u�5�=W�w^.�T�qpJR�2�Yh��<�,Q�_��R!��a||�Y	���W�<$���Sc�	F�:"����M�G�f�K�	1Dw�T����2�vI��sa�$N����gUφ�?�\E���\���%f(�}g݆�;7��l�mھ����ۃ��������M���>���c�7��*!���=_z�ӑ�U��3����Y�8���l���gi�&*J��E\������Y�`�V�:KWNL�1��;K�y+GLu�p�ht��Q\XU]&{\ao�~���\�p�D� �� �
-3�H�ų�
�?紐d#�M�Dv[���*^�o`O��YH�j�h�S��,�K���W���j����x��ӡT������5���J��jݛ��꯵C�[�MxS�|�}	_)_��P�	������C�����e �d��R�#b�w�2���-��~���q]����k_���cQn��k���R�
X�Kb-׵$�ƫ�E&�#�.��2
]�r9ڥ���;�/Q��oQ��.MK�w�ƾU��FWb�,�f&�7�x?3׼��‹L�,A��)��,5%�.㕼ʬgu<A#Ӂ(*GگRM���PL�M��RBz���MVRx���%�F���J�&{��AP��c���[u�z%ގaΘ�"�H+�m�6����m���&�%�bo9��)�y�Z���eF�Y�ZD�
-�)�%�m�>W_�tWz�Y
�B<^i<��nT�y���э��\�Ρ³��X-P�.���
���zq�Eg�>ù5��q�A���r�4z�$��d���HE��eK8���(-F}�S��
)/Hw��#6љo�1�;�(�G5��+�af
-�^��_?���
-wYrq@g'~��N?�B%K�}��-y�"�y���n"����x1��Q�U"�$�D#6ǒ8Ta	$�$�sRH�J�H:�@�E�IOҋ�&}H_D�\r�#�ئ�_��EH9�������£rl�<,i`�J�Kޠ'�j��va�?�+k�	؃��u���Z�Kt9�u� -�T��8�r�Ҥ�WN�
�|�R�̧�|߅[!���AI��~B�����e��%��I�C���(X�	RKv�
-lK��!�HnŒc�$ٌ�9x�$���u��C�4y6�l���_'�w�!��*	�|V��?�u���7��h���$���2l=>k��}�i�s�T�'�j��R�)�b���U]O�p'̃��J%U٭�"�a@)�ź7�{�r��.?�v�H)�{�WJ�6�~S��y�݊=*'Gp[���O��JX�-�g�Im����c
ڃ�kB�@
�U������kr�����[�ϰϵt����a����5���d�����N�7���e�����o�������d���H�=K��:;�'+q����7B�ި��~�?���O�œ�;��ux�0,�m2��GX��Ç9��Cy:��.mL�1+�a�é����'<[؄��s��}C�A�tgڜxzú��??l��ߘ��:�_���'�|����{��*��7=���a�2����ZN�A*zm+��!�ٝ�8o'Ǖ��m|	�+�7�l�业���d�z��'��ARc�a�VΓ
-�D�7+$���8.�`wv֫�x��d9��'��
-r=�"��>�9�|@�c{���ؾ�J/2G=Hΰ�I��zlO�ܳ�Ώ��X�Ir��=̇���Wd��YW?�;�G� �]��h�p^����\���y�7Z,7�0��h�}�Xf4b$�u3nX�ށ6�{<X��)����S�XXH�
���
���JH>'z!1n����BHln_��Dz�7Q<	�I�#!)p�MH|~*>7�I�ss��Ψ�	�w�1��c��(!�{��Uٝ���_��}�����?\����^�ᛇo���P_�Ck��
�C�W���"8/�y�Ź���p/<w��<��m��s�3
�
-�$��?���>
-���3/�|��� �>5��~N��~�?��8x_���'�]
'����
'��<8.��J���7#�E�^�W�"�e
/	8"�E
�-h�N���^x�7	x��T�‹�B�r����T���o�᠀��က�4
-xV��2x�����}e�wO��M�=
x�t��]v`���l�����v/<Y
xIC=l���n�U��ݰ�������O��f?l2�q
�=|��z��Mu��a��oȂ�^x�
}�E���Gj��G^�G���_��کPk+�J�u֮���
-X��n>|#�^�⫃��5XPS�h��tXi�/<���	Xa�r
U*؝�x�A�
>�ʠbB�W��R
K,��"7,4a���`~����`��9~.�g)�S
�ZE���`��Y�=xP.`��2
3L0m���]n�*�
S�L6yIL6���~{L0�<�&��6��EíA?&��P삟w���p�n0ό0f������	>��<0R��z^�����ڠ�E�q,��
-����!����0d���;}0��
-8 �����~> �\��
-\�/�=�w���	���9.����c�~�c@�<��3��*���
�3����γn��t�Hw��� M@��>H�~� ��� ��X	�G��k��"���
�e����7E�@H@P@��^`a_�"�?�2�
-�#�G��vG�K��C����� �e��I= X
-����>@�@�&Z�r�����݀��/�Ҵn
+x��zy|E�vU����~so�冐��%& ��e�"���0
��
+	��
D@��� �DDG
GF|Q�A߉���ㄤ��:�����~���V�]u�ԩs��T%���	M�gr�����#$�B�ĩ���	y��
 ��Ⓕ��k�LB��=�y���S����]�M���&ɿF���`Y��X�W*��}���ܷ�̉ه�����ݳ�N&0#�����O��oVf�����;����7��m�鄑bYË��V%���_"�%��2�If��k��x��_�/5ٗ\�I��k�Z֨��W� ��'��RAz�1�pS����w0(��h��9��-M����
g/66��QyY{��D})�^i)�� ^�Ҝ�H^T�xq������y�mi��mܴ�-���p����Q��mg�\l�A��H3Bi�g�u����
pH4�i5�={��{>�LSJJ�2�L+�ˌ2G���U�.�y�|��ژ1>��D�d��핖�M|^���:�9kw��^�kך�/�_��������Ç�}��o7�we��N�y4�h_T3�d�s(cdƑ
+���+\+�o�����U�.2<0$��r6�CRy��G���ƕ�=W'P�`O��!Z�����JΎ�s��*x����}��I��ڃ*�l湻�u;s��n�vt�LR7��~)�\}�q���1n�y�Y��Já�8�����l@#�e���5]�ؔ������|�Z��L�"��`J��\_Jn��Χ�r��9��zbse��(ߪj�]9z���Ya�M��[�$@�H�ٙ�^���g�hp�W������qA�52��=C��l����*:�=����X�efJ(I�M�c…1���ؠ�8�]��2���,2��b�����I�-5&'�
�,
�d�V���Z�8��<�Д�����C���U�����쎉���kw��/5p����7�ۻ{����8�B�כC�OQ��Z'�)��c�:|����
j�����O��|C�k�u�گ��8��G�cG�y��6��k|co�@b��0�.0ֺn{���㍾(k�4e�u�x�+�S�Z�.�����N�|��܈�A#͸�_c��oU���<���S�3�ˌ'�&�N}�x��F������Z#�.�n8b!(�z�#�D���r��y�G�R{�y�,�*��#�kG'�	p��LP�i��	��,�Z�z��Uw�-j��C�iW�+s�����_�Ny��-�qR��O��'i�����[ߤ�r8�"�lZe��a<�'З�|�<�h<���b�5E,�Y�)���,a�Q(��&�L���~�=q��[{="���B3Q���1k@�U�yM(Te񼷊�h�-M��v��+�g�:�Ir�<1�z���p6L����r�*TW�4VJG(����4:CY�,�*�t����E
D$S_�)����4��3ʼnKI���n��KI��5��}�r����
+�&K95!��B�?�r��ؔ�E-3�*ш��ӈ�6���w�A�$���T�n�%�&]�֤N�%+����GZϋ;�O�nּ�c��0��e^���p��O���0��CE�W�B��f=�'�VSX�]�
�]��ưٞ=��b���*��zQ�!���|�0���<d<�GJ�j��Tc
+�<�ưqt<+p�E��t[�������`����Pã,#��4��@2���<K��_���W�޹�p�����n�L.%�6�gb�I5�aU�C?��˪�6e�z�Z��C9��2)T���؟Z�D�:�ǫI&��܅��y�<K	����k�WtJ�<p�S���*�#-��E�x򂙋zCA���9�+����@�k��|:��t#&���x'O�"n�ڨ<�P[��,M[�/!��P�f���ETA*S�A��
	Q<���T��J������޴7J���b.�+�G�PV��+��I�Z�H�"R�'�f���Pd0��=�!5��t�ѓ��\���{�]JZh])��~��|�~9���Li])N|��C��oZ�W>����ԡN4�#=� �֗�j�Ƽ1�l�s�(��#VS֞�;V�ؾ>95�>gP��"ͥI�KyD��Mt���e��,2/ͧѴ'�N���u�\�/k�1��vF�l���x��O���Zx#Ɠ1Ao��.�
ک=��1=ܼ}��S��©S�ʶS�] Wȃ�YI�d��Z�E���4����[�mr��$o�[�ܶvأ���p���^��H��Qi�	�n�8!
�
+�rZ�y8턡��z.W�s����u�@�(q[v1��3#�j����Ԑ�f��^j�1�-f��B��-S���HNA� �v�t��ދ�q�}�6S��-�q{���=ND��b;�t	-�=ޑeGdz�
~n�&�Z'�_�}��!�!�f��i�n��G�&�yuԣ��q���7�2�������Y{=qIq�J��j �PJ��[�F��dٹ���^>'�
+zs�wbʉ;��<tǝdžG�A/C7
��#V�8,�T���&�j��!���_�NK��֜�l�e�ړ�B�FX>�}?u���Pk��e :_9tG�v����6c��������,1)�j����|Ñ�ă�������j�6�%�p$ũ�S\������{��,�'{�����
+��ln�+���<8a&�K����M\E�p�<�SZz�
�p�g�������������o[�՟�������K��}�@��үޣQ?�����N����NK��vr��/�2�8d���8)��;�M#a~
#/�H�P*�9��]�P
��P��h��F�x�}�-��a�tX�+�"
+F&��ᙆ�~��G􌇽~ߑ�Z� �(�*�=���q|��E�;Ќ�m �@���ݫ�p ��w�B�̆�6;�0�Z��ۈ�]/L,O�M�"�@�����d�96��sP�J�'mm��>��c�X���݊��h�< ���d��#���=J�z�|I%���$G��&�F)
n_�"i|C
+R�('��h�{%������
��Ƴ[�"��ax�p������BY�Y���	f��d��d�SABAbARA� ��SAzI����ʤ�Pe��N��צ_HO���㣎
+�
+C��%�%I%�������Pyr����ֵ���Ҥ��ꝓ�kkI͵���vz��YO4��:�bב�K�=��p��i�M��,��tʜ�{3nh]��x�_}�_��g���-���&��:��f��ף=DIP��ʄ����5y4M)�i���h-vh�6[�9�m�t�v�a5#�:t.��H�Z�^�|�s[g�a��������Ʋ�_k�wnն�{�?���aP��E;a��y?~e�ۧ7X�m�����I�]S��{?��%�~%�bk����
��՞��u1���TP�+֘�d���Y�¶(�Նw�A�QF����Z�b��Xf�屛��Ǣ�(
%o����N/�u�jd(��0�6]�v�]". d�1����J�M���+��
��=��RCA/)���U�سz�Y���S`{J�U��SX����{�vB�޺�5w���UwNU��f:�/E ��:q��))�N�'%BP��"��7q�@���]a&&�xT��L���X+��4��2x�HUBZ_�Cs�>@�Q��!t�G�a
+�!����3�"2!�B�P�Uʵ��:%cb��|r(�z�=I��q�!��Q�[$(��F�<�A��#j��#K�BS��U��s6��m�bs��*p��\�\6��*�h���w�̍�*~��u���⎚�.��UwH�""�VC\��ڷ;X�~T[��H��ω�qx-\q���rܕ��[����s�}
+<���ߖ����K��,��U�Ǩ:��e�</�C�������m�e7�B������'��ӝ�����X~�j�y�e�*6W�����۽��`��!���e���/oT��3Z�Ed�s�z�.��
|�M�*:W(3@��M�ȱ)��U�ғt�{R�9)o��̂h�'X�֜��Yi�rH�dD$�G�.��z�ܱq�t�Xt)���o��6�('�H�F��(/(	�xǎ���r
;a����a/e���^�Pvئf�-|��.�ļ����cy�����S��Ή�/~��Y�,nY�v�=·旊8$�7�3�^�9�x�w����r��P������؂E��CCn��w��1�>��u#���_��5�߼u�֒��0~�?���r�����:]N7u����D�
��P�]q'�1q6�N�`�>ːmp�+
+c��*�AS�/�:��~
�Q����)�0��-��?C�����3F����x�|�Ǎm~�6��cL'l$(�ObH�����b������Ƕ,�I�oP�=�5}�7��;��jw=]6���bH��c��/���_�r����=���J,�\_���G�Hۑ�/�B��};zv����G����t0�p<Y;`�ʗ����V^�/�LP�����e@_a�L��+(��]��:�8˵����K�J�[k�O�B�l��7]dS6pMPNR���/g��֬��`���a��;l{ٍ�o���%��ڠ�N�6
�h�a'h�+/,������Y�7��r�+���zK�����s��׿0��w�t?��:yӦ׶��K����^���8�Aߗ�>�GL3Rc>t���:Y��⍾�n��_q�֤l'���,4��K��B0
+��.K��=Gv����#�4���4������Zn���'�+���{�C6� ��h���{
�q���Y�7��aJg}+�L
+
+�|>(l�	�Hj�5���������ɾ��K�ĸ$���>VY�ض3�}�U�v�A&
+�3�F�`�/uj�*���s+�U���!`i°4��(����;��跡�ν���r�`A�6hQ
+4�N>���X0��\7�F�)?j�����x�`�Ԫ�L��j�+;Q�Ymg��G:9�·nn�C7_�C���䁊��h+�Z����U-�iH�?�¸�������u�!�na�{�xG�����������7�;�;!��Y���kDf 3�5�Kb���PFr��
+��Q�p���Řb(p���
/�@,�A<O��33eܙQ�Q��HFmƅ�h�˳M���&^������'�\9e��ƭ�t��w��l�����ǿ��x/��K��c���O�ܰ/%���	cF�z:W/۸+���)�2^H<t�y��1�G<Vښ���!���"�������9F�ˡ{�CT«n�
���4t�����#���!�qU۶��p�}��~��NekV|�ʶ��� ���iD���W�k��c�k�>јiT��]k\~���t��(d^�QF�pƺc=�3�V��D��EO5:;:;�]]�]=!_�KsY�}�ގ�ξ�<w�'�w1��L0�)L�TM-_bs�p�𘾱d�n�^ �)���[�[�[�8'�'x
+|Ŵ�M7f�gx
+}����J�ܱܹҵҽ��^��v�w��lqlq�t����>�������7
õA�F�l�赋��}�؜d��mz�����.Z?�b,ݲ�Dz
�?g���f�X�"a�=����h�V�[a*�*���ng���Ú
+0��Y�P���6��c�i��l
�F�XH2�h��}�4��a
��v
+l��S����'[/A�����К��<��39ΎQ�!��xS��5�Z)^%�/x5�P~㢚����l��^�dkr[��g�
+|��_8x:�o8��ᥡ�̸��d�?yc��'�.�^����k��=�ßÀf'v�pb'�r��:��i���0����ֽget��h�c�����h�_v!#͔g��l�@CZJ}�
���jlBZќ��?4$�rT����l���+�Z޵�믘^��]��\K�!��J������k�n][��^��ɻƌ�x�K{��,�����{��ٵ�:��S��*���&$�ؽ뫯�6u
+�%����2u�X���C�_������M
zOax�j���_V�@�Fk�7��m���Kf��mZ!�eӊeӯ[�Q��j�up#��X��������@j><��d���U�r�(��4�!t;W�<�XF��CZ.z�~Џ� C����ኩ��V�`/ЊI1�
3�]b�R��%��R(�s�"e9YNW�J�RT(5���c��q��X�l�(u��i�Mh�O���rmx��ۛya�X�u���n��na���.�Ņm�Ӯ-�uh��͊�)�E ak��jI�_�c�ni`M���r�k�����a�E/m*��naw�yl�x��U�Z��v�Ѕ��A�*0�h�"�)]�޼���Y��Ы	{U�(���]�|Q�\���J�Z�\O)O���%�xG�|�~��o�+���?��fc���M��2�3)o��X�Sk��/X��o9�>l�&��n����!b�:�5t����b)��Xiv��kO�;�m41g��*�(��Cs:]S����P��{������2�]��e9T;�����0r�ot���1�
��,�v��7LcZ�o�]F�a��bQ&ʍV-T�3
W����������c!ȃZ����dRBjHK�;���;���A.�A/n��rf�-���1�J������6nt�n�=���&8���.�̧�B�P-Ԋ�"��1�̣�l
������Bu�V�-p�9���V�m/�tT���M��ݷuزm�H���~&�u8*WJ�joIq⒟����n��|��/�L�m�4��P�Y�X��Z]KR�$Q�5�=֬�vF�1��ʶQ2
+N��p6�O�O��kw���O�i�ё-[v�9��[�xak��H8����xND6�M�H���z?}�d�Bi��P�Ю�Nmm��ߐZz-��KڟG�������b��z�
��FZ۾��]�.>��]��W�H�_���~v��ǸAzb[q�H6�Їϋ�)�@
�#o�!I��Uu $Q$� �C_��|!�t&=�4�D[�6��A��1�X9�����?�K����$;��
x6�Բ=d9��%o�#t%�e��r߬$G`'t$��|�4�Hǒ�XG
�<Uᄏ�{�M����GI>��|E Ɖm���;̏�"����d��B���������|��p���"[H)���H�Û��8J��6�E+=������q�l8�HO`�����0�����b���u�_O� �=A
"Y7,C鱭)�1
z��v
gY)K�(�J@M�V,�m�o�&e
�%��v�
���<�o��IUXPH�����7J1]�}��R�v6���[^�N��߱z�m�e7a���
��+^�S�V����rT�3�{�A]��&d䒙xUJv�=�Ԑ*����G��_n�_b���C�'r�\)��Q�8�����j8t��!oKQTg�zwBr�
y�P)�s-շ���qbB����T����|��~٣�����!��kR8�n���c����3��:��#
+�BS���>���A�~=��
��E1�����#I�l>�w@Z���vݫ߂��C6r��=2
��W��y�����+�\��b�'���d6[�޽�̆��&2� ����h!����f��x�\�&mM��V2p���Q��;5d�p�9@*a$ُ���)U���Yy��a�v{[���kE�����7�{��������3��#��G$�w#�P�kQ����_o�5ۖ�� rX�����l���P	���Ϩ��p.�^��X

A�s���w�o�㨾]��X��b�Ew}�X�܂z�o\X���8�{�������w�;������#qL"������w����xB�!$�H@9c�C��Y����vj��G��\�}:�뿄��F�Y$�y=+7�.Ih�?R��l�{
��%\��?����VR����K8_��@S3���[·���|8'�/���ٛ��5p_<{3��*S�i��2�K	_H8�
���k�������%p��T�'��'K���a��8>�}'�I�8>��G	J�@��x�H�x_‘Dx/K8��'��;��(�m	oIxS�^��W%�����>h�H
�_~E�Kxy�$��+�r9��R��7�l�}&)�Jx��HxAB���%�.��ܰkg��U;w���T��gQ�g�a��g$l���[$�a�[�!6���"��Wjk`���O9�F	O9aÓ1bC<��+����^x€�%��q�uj\P�U���5n���q�c���#��G%<R5I<�
+<RΫNU������CV��)VKX��n>x�\�+��
�XPY���TX��Kx`�O< a��J(�P&�l��q��%K`q��
��TX$a��n��y̕p_3�i�{�av3�H�%�w�N��J���3o��/���X�4	E�J�"ar?(l�;�0I�m&J�0��a�
�Fƈ[�a��[��[�aln�^qs4��1##�	����7z�h	7z�	���(	#Gx����#�0��$��!50X�������_��F�)a�������\;�#��À�.1�l�@���'�o����}z{E���u��^�u@�D�qA�5�-�de:D�2г�.zz��ݳ�[�Tѭ�f�E�T��C��T��:HO��T�H�@�:KH������d?�� ���E���x�`���f�͇���]Q��(	��Qd%$DH��~	>�/�K�Sn	.g�pIp���HpH0��K��5M��8>�h
A�R�ݼ���"��Ӣ��n�/���m
��/��<���
 endstream
 endobj
-8 0 obj
-   9456
-endobj
 9 0 obj
-<< /Length 10 0 R
+   8822
+endobj
+10 0 obj
+<< /Length 11 0 R
    /Filter /FlateDecode
 >>
 stream
-x�]�M��0@��:n�-ْw!���C?h�`[r���Fq�����-4����H�ƙ�o�/�y�T�#.�9lj�f�m��!�>\���F�i؄��p�֢L���m��<.��ʟ)x��C=}�K>J��{�!N�E=�~;������5̛���Q�0��v��T���O>ŧ����e�z�A�̚��Ň��
!v�%�*���0�ױ��/n-e�8�w1��^U.3h��L��b5d3�
�Y�%��dj^�WH��2Y9�'��
 O�t �dr�� 25~���kp��5t��?n���LB���S��������p���\4~�A�5�_�B�2
~[#Ϗ��,7�jz1�G�?�����g�3tm�k��V��k����f?']��J�����kɬŏI���$���}E/5~�)���ĽƯ�!�L������.�˲o��&�����۷��4���uY����Ã�
+x�]Sˎ�0��>n+��	�m.s�C���6� s��O�k��r���jׯ�ϧe�M�=��v3�K���sHfL�y���s�߾�;\���������zZ���{S���۞��S\���2���rLy^.���뙥�}���kZv�Tǣ�iR�/��u�&S���S��y<k�?��ǖL[��֘n�R�K���9�~��UZ�{�e�8��C�zIJm]O��طM��h�c�S�m��hݱ�Pa�E��X�.��o�����k��q�<��������c���8ӧ�OKo�������gF_2ҏ��PS�)��B���y-�:���>�>{b����4���ߖ�-�y��3�Sp��u��ї�Į`�r%�	�y��/�@MMG쀅���g�E�0� �0� �'Ǘ�#�#4�w�w̨�m�0��C�3�9븗�V�>/��.n놮���$�v
 endstream
 endobj
-10 0 obj
-   462
-endobj
 11 0 obj
+   459
+endobj
+12 0 obj
+<< /Type /FontDescriptor
+   /FontName /QWMFPY+DejaVuSans
+   /FontFamily (DejaVu Sans)
+   /Flags 32
+   /FontBBox [ -1020 -415 1680 1166 ]
+   /ItalicAngle 0
+   /Ascent 928
+   /Descent -235
+   /CapHeight 1166
+   /StemV 80
+   /StemH 80
+   /FontFile2 8 0 R
+>>
+endobj
+5 0 obj
+<< /Type /Font
+   /Subtype /TrueType
+   /BaseFont /QWMFPY+DejaVuSans
+   /FirstChar 32
+   /LastChar 121
+   /FontDescriptor 12 0 R
+   /Encoding /WinAnsiEncoding
+   /Widths [ 317 0 0 0 0 0 0 0 0 0 0 0 317 0 0 0 0 636 636 0 0 0 0 0 0 0 0 0 0 837 0 0 0 684 0 698 770 631 575 774 751 294 294 655 557 862 748 787 603 787 694 634 610 731 684 988 685 610 0 0 0 0 0 500 0 612 634 549 634 615 352 634 633 277 277 0 277 974 633 611 634 0 411 520 392 633 591 0 591 591 ]
+    /ToUnicode 10 0 R
+>>
+endobj
+13 0 obj
+<< /Length 14 0 R
+   /Filter /FlateDecode
+   /Length1 2600
+>>
+stream
+x��TktT���~��$����0	�H���B`Bx;� �	ڦ
d"�&$��4��
�`�� i�4��8"��P��6�!�ֶ�J��t�{�]]�k��z�=��o?��X�\҈(�jd�,[�B&�!��Ł����X���i߂E+M�n�~���J�����=O��,Al�%_p��;K/]�[�"x��Ee%s�w��͂c�]Qn�Y�n�R^1�|��S���R�)�A#��HvV��5n���V�e;}y8��/��<��3��Iu��U��[9hu|�Y�e�pd_��M�H�|Τ{�gTB�ۈ�BB�����c�c�29[}�(�%s��׫	/9�F��ed��WL��a>[WRC�Ƥ�$3IiE�3M��9Ӳ2�F��ŧ�aIִ��4#������/��J�i7Z[��
8y+'�7��mFi�v�iY�B�2_�&ک5
+
+H���A?@���H�j��:=]d�t�N��ZjG�AZe���]���Z
�1�[c�dL7���C��F�F�QlTj�ح�W�����7��hg���2q��5th����v��=T%���2Z�W�DrBu�v�e���vi�$���jꤧa�i��)u��5Z�}���L= �����N��N-�X,���gk^�;骳{^�U���XZ,nk�D�t�Q;�]�l�:�oa	��j�4�9c2�����^��G|,
m���Uv}�Q�5�%��:O��G*���YRQ���Zn1��qZ-�I�m2uX��k�TMT�,Z(�*�O(A���z-��5��i����
�5�@.
��qEzMn� Q�բ�
I1C�g�?�Y���9��C�
��֔��W��tu�(4�Ԝ���'*dx���'��!Sg���>1�+։Ź"�/�m�X�s�u��!�gJq(��4�άK��.�W*����j�N\��/�"�ctv�~�����^=;r��G�ۺ����篟	ϴW|%����TL�v���?�v<�`*�X��&m���z�|����u�v�_zq=�k|����7>s�� �z�I��	�J
�r��ƥ��(2>���|u1�bx!��P�q>�f���On�1�?0�s���x�
�c��3��<=IuV��$�z'I�b������0�f����[�}�[�����o2ިu�7��x�1�2~�x����W?ca�1;ѺƣZ-�m���|�H5����8�G*�u��xŃ����8�x�b�����<�ϣ��c_�K��Ʌ����0�c������{��v�g������h�� ~���L���x&;w$��~��n���nb[�fl
��VFЎ-�%�͛j�lr��a<��M=��X_�6�ac�Q��G���g<����'����'��Nʬ��u���:7�a����F:�ƃZ'c�~ԩV3u���*����j������� ^Uy�0c%c��c�,1��QFEK�(g�1��X���2:s��|<�(��

�|��Q˜ǘ;�a|;E�o2���S��Q��^�Ϙ-�g� ����{a�3�z���6|�1}���3����1U4SySL��S��j���vLb��� r����0r�0a*|��1��Rw�1>;N�w!{�]e���0Ύ��1�ѣ�jt�F�j�#�lj��,F�E���6�e�aX�M
�#Æ���j���h�b� ��Ǡ�.5ȃ�.�ˣL�]���T�8xl���Ƹ#�Rg�)~�����׏d;�H�0��蝃D
��^~��N�d$�SB"�nF�K\���́Y�8?{l��3b�:6
6F��hF��E1�nX�0Di�	��H��5���1��_�A��0�����W�Ű
+endstream
+endobj
+14 0 obj
+   1860
+endobj
+15 0 obj
+<< /Length 16 0 R
+   /Filter /FlateDecode
+>>
+stream
+x�]��j�0��~
+�Cq�s�����l��rfhd�8���d7t0�-$}?�Y�ڿ�2�O�v�>�c\��a�)�j.���{Uo;����öd�{�Q�-���^\�@�C4���:<ZÚ�g�g�u���so&��AW��;�����S|m	�R��a�F�K2�Є�=Kt�z�N!����1\�MQ���z��|�iʮ��n�)�sY)�B��S�p�
+endstream
+endobj
+16 0 obj
+   223
+endobj
+17 0 obj
 << /Type /FontDescriptor
-   /FontName /AOYUWE+DejaVuSans
+   /FontName /OIEQEX+DejaVuSans
    /FontFamily (DejaVu Sans)
    /Flags 4
    /FontBBox [ -1020 -415 1680 1166 ]
@@ -110,69 +162,75 @@
    /CapHeight 1166
    /StemV 80
    /StemH 80
-   /FontFile2 7 0 R
+   /FontFile2 13 0 R
 >>
 endobj
-12 0 obj
+18 0 obj
 << /Type /Font
    /Subtype /CIDFontType2
-   /BaseFont /AOYUWE+DejaVuSans
+   /BaseFont /OIEQEX+DejaVuSans
    /CIDSystemInfo
    << /Registry (Adobe)
       /Ordering (Identity)
       /Supplement 0
    >>
-   /FontDescriptor 11 0 R
-   /W [0 [ 600 633 611 317 549 392 615 591 294 748 610 684 557 500 694 770 787 862 698 631 634 411 634 612 974 634 277 751 684 294 774 779 634 277 685 636 787 731 603 317 634 633 520 837 352 591 610 591 277 575 629 634 633 655 988 636 ]]
+   /FontDescriptor 17 0 R
+   /W [0 [ 600 629 ]]
 >>
 endobj
-5 0 obj
+6 0 obj
 << /Type /Font
    /Subtype /Type0
-   /BaseFont /AOYUWE+DejaVuSans
+   /BaseFont /OIEQEX+DejaVuSans
    /Encoding /Identity-H
-   /DescendantFonts [ 12 0 R]
-   /ToUnicode 9 0 R
+   /DescendantFonts [ 18 0 R]
+   /ToUnicode 15 0 R
 >>
 endobj
 1 0 obj
 << /Type /Pages
-   /Kids [ 6 0 R ]
+   /Kids [ 7 0 R ]
    /Count 1
 >>
 endobj
-13 0 obj
-<< /Creator (cairo 1.10.2 (http://cairographics.org))
-   /Producer (cairo 1.10.2 (http://cairographics.org))
+19 0 obj
+<< /Creator (cairo 1.12.14 (http://cairographics.org))
+   /Producer (cairo 1.12.14 (http://cairographics.org))
 >>
 endobj
-14 0 obj
+20 0 obj
 << /Type /Catalog
    /Pages 1 0 R
 >>
 endobj
 xref
-0 15
+0 21
 0000000000 65535 f 
-0000014531 00000 n 
-0000003204 00000 n 
+0000016590 00000 n 
+0000003007 00000 n 
 0000000015 00000 n 
-0000003181 00000 n 
-0000014372 00000 n 
-0000003313 00000 n 
-0000003514 00000 n 
-0000013065 00000 n 
-0000013088 00000 n 
-0000013628 00000 n 
-0000013651 00000 n 
-0000013921 00000 n 
-0000014596 00000 n 
-0000014724 00000 n 
+0000002984 00000 n 
+0000013121 00000 n 
+0000016430 00000 n 
+0000003135 00000 n 
+0000003349 00000 n 
+0000012266 00000 n 
+0000012289 00000 n 
+0000012827 00000 n 
+0000012850 00000 n 
+0000013619 00000 n 
+0000015575 00000 n 
+0000015599 00000 n 
+0000015901 00000 n 
+0000015924 00000 n 
+0000016195 00000 n 
+0000016655 00000 n 
+0000016785 00000 n 
 trailer
-<< /Size 15
-   /Root 14 0 R
-   /Info 13 0 R
+<< /Size 21
+   /Root 20 0 R
+   /Info 19 0 R
 >>
 startxref
-14777
+16838
 %%EOF
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-enb-rrc-states.png ns-3.19/src/lte/doc/source/figures/lte-enb-rrc-states.png
--- ns-3.18.1/src/lte/doc/source/figures/lte-enb-rrc-states.png	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-enb-rrc-states.png	2013-12-20 09:44:50.000000000 -0800
@@ -1,325 +1,318 @@
 �PNG
 
-
IHDR��ED�)bKGD������� IDATx���w\TW���3����bC#
-j��[�Ɔq5Ac,��^�&jL6��1��K��$F�&nT�&v@z��e������f�a����_3gNy��r/�p�B��
-ʛ��
j&��
-AP!H@*���
�Z�j����iii�����ɏ?���V��iiiyyyYYYJ�R�Vgffꚤ����������~/utt���qww���upppqq���uvv����[������������>��L��j�
UQFF��Ǐ?~��ѣ�����؄����������t]M777{{{;;;777''''''[[[WWW]5www�)�ʂ��J����KOO���������P��*�J�R���J՜��=<<���}||�ׯ���W�~}__߆
֯_��ۻŽ
-�R 

P۩��{��ݽ{��ݻ��J���¢nݺ
4�_�~Æ
�֭������������ҲrBMIIIIIINN��'%����������M�4iڴ����I�&��Ε'		h�Z'666***222:::222&&F�RYYY����gl4h���W�n��߅V�MHH���}��.�.%��j���M˖-[�jԺu����&M�XX�(@"

P�=~��ʕ+���˕+W�_����nmmԦM��m�6o���ϯ�$�KK�����ݹs'22222����7o����vpphݺuǎ;u�Աc�-Z(
-��j�5�F��v���ӧ/]�t�ʕ��X�g�}�S�N:thӦM@@�����a�F�����_ׯ_�z���˗��7�R���.%�{��ݥK��||��B�����S�N�:u�����d??��^J�>��dT�SXXs���˗/_�p!::����^�۷�/���h�lH@ToZ���ի8x��[��֭�����厮Zz��ɹs�Μ9s���?���^�z#F�5jTϞ=k�.%@!

P-i�ڟ�y���|��app�Q��
(wh5ʣG�����;w���e�С�F�8p����ܡ
�	h�j&>>><<|���<�ҥˈ#F�٨Q#���RSS�9r���3g�888���L�>=  @��*�4@�q���u��=z�E�ӦM		���;�Z'++k߾}_����v��ꫯN�8���Q$�
�:�Fs���%K�DFF�?~�̙]�v�;(�?���믿ްa���ǂ�M�foo/wP@�B���j�;v�����߿?mڴ4n�X��?���V�Z��W_Y[[ϟ?�ܹ���rT$�
��k׮͙3��~�3g�����֭+wD(�J�
-[�t�����_~9x�`�#��@Qyyy���?:t�����|�r��U�������oݺճg�aÆ
><%%E����j���;v�;w֮];f���A�]�|y���YYY���o߾���rb4@r�ҥ�������W��}B(
-�BQ���שS�_~��cǎݺu۾}{�
T}$�
�����_�~8�|Æ
�e���k׮E����˛6m�;@6l�
P%<|�088xȐ!�7o����Ջt(��W֊�8+W��׿�u��ɞ={V�p@U�
-h�i��iӦ5o�|Æ
�}�6���Ξ>}�������[o����������O۵k������Ю]��>�,??��
-
-V�\١C'''��={~����tUb$�C��/�K۶m�ٳ����������o����!�4~�x�B��J��)�I�&��"̛7oڴi!!!J��B�&V@������ƍ���lѢEE�%�\nj�o�>]�U�fϞ-�P������駟���ի���ǭ�������2�ĉEʵZm�]��D�%����j��'OޱcG��Z�n}��E���Ԡ�����]�v���KB�]�vM�0�Q�Fׯ_wss3��� �'�J0}��V�@@�
-h��_�~���}ֹ{�ndddzzzhh�"<<\*_�b�O?����y��������M�6����={vŊ��|��W'N�prrZ�r�G�rss/^�8b��*.�����bӦM;v�hР��={������/^���s�EEE-Y�D���!m��p�B�FSXX�p�B��[������B999-X�`��������V@�L�V����޽{ذa�0�����_~�ԩ�"..������Q�R	!ڶm{�ƍo��f�ԩ�&�6mz�Wڵk����]�vׯ_{��W��TbW�#яV�W�Ν;_�|����ݻw�޽{�Y�f͛7�}��T2k֬u��EDDh�ڗ_~��w���O�볢���6h���ի�۷��A
���4�̤��_�մi�JNJ�������
-!�Z�����oB���>777))���K�$))������>;;�Ho999������E^*�+ӑ�G�_���h����://Oz���ݦM鱳��+Wt��T~Z���~��q��U���؂@f���mxEH9����#1�8���������Լ�������8�W���‚-8P���Y������u{G�Kڇ��~�/����<�a}�����OߕQRV���PWҺuk!ĕ+W���͜93--��?~���u_lh�ϊ������ڸq�J�"H@�����k׮�;!��8q����{DDDrrrrr�-[�ϟ�{����!����׬Y�V��嗑#G��+�<<<��N��-�5k�bذa_�����srr�j��۷7n�صkW��Ν;>8y�����~~~�w�޿q}V����v�Сr������Ν;�O�ӨQ���pd��Zݷo����iճg��Ǐ���)���8p��ӧ��k���2�d�ر�����V1w��U�V��V�MLLlݺurr��~;d�!Ď;&M�������e�ϊ���׺u�#G._��B� V@�綾^j׮�̙3e�&�����ɓ˖-kӦ������}�6m>��S��g!����ѣG?��3����cϞ=�9R���Z�r��ѣ=<<�w��ꫯN�:5f�___kkk{{�֭[ϟ?�ڵkB��_=99�[�nR�Y1a„�{.11QZ=m�ϊ�x����̷�~���V@T	�o��ر�3>��S�cA�ٹsgHH��Ç,w,���BѢE�ݻw�1���`��喖�rG���iӦ�3g~��gd�
Pk��
-9y��qゃ�w�����-w8(#�Z=o޼M�6�X����_�;@6$�
��?��s���iii{���ܹ�����߿?~������޽�G�r�ȉ/!�Z���/^�ػw�nݺM�>=11Q�`������j������իd�
�U����-[Μ9��o�=��3+V���ɑ;(���h���ӪU��7����;w���W���@�UPP�nݺ?����zΜ9�f����;(��Z���?x�`�ܹ�������A
U	h��N�T�_���/�P�TӧO�1cF@@��AA�����7�V�R*�3f���?�Y�~}�����Cnn��͛׮]խ[�iӦ�7���I�j����~��믿>z�h�:u^y�ٳg{yy�P���f._��iӦ]�v	!F�5jԨ~������W
WXXx�…��޽;99yȐ!ӧO0`����ܡ
U	h�j)++k߾}���?y򤕕���G�ջwo�C�Q233/]�t���C�%''w��mԨQ&L�S��ܡ
�	h��M�R������Je``��/�طo�=z8::�]������/��:u�ԩSW�\����իרQ��N�(�5�Z��t��ٳgϜ9s��!D�Ν{��ѱc�N�:y{{�`��T*���˗/_�p�ܹs���AAA�{��իW�=\\\���H@�@YYYR"�ҥKW�^U*�M�6�ԩS�N��������Qf���111���._�|��嘘�V[�N�޽{�9�gϞ���r�T{$�
j�������+W����/W�\���������mݺuPPP�V����Z�h���*w�(''����111���QQQ7o޼w�V�m֬��B�C��ϟߺukTTT�Ν�������K5����4@풗�y�ƍ�ׯ߸q#11Q���]�n�v��5o������߿A�u�Ա���;��INN����Sϝ;wbcc�Z���kPPPPPP۶m۴i���\�yLLLxx��-[������7eʔ#FX[[�2��#

P�%%%9rdɒ%����~��������!�������_�~���S������������oe&g5MJJJrr������������'O����&$$��j!�������.�.���3s���³gφ��:t���sܸqӦMk۶mEN��H@�jO�<y�7�m�6y��%K�4h�@*OJJ�����qbb��Ǐ�����J��ooo777{{{;;;777''''''[[[�],��ݍƠT*
-
-��*�*///===777'''##C�V�T*�J%%�u�<==�ԩSOO����֭���[�^=�B���'55u߾}�֭�v�ZpppHH��ɓ�0	h�Z*//��/�\�ti���W�ZէO�R�խANJJJNN������V��iiiyyyYYYJ�R�Vgff�Z����������Jz���hcc���nkk������bkk������(-��������?��K��ի;v�P�TC�
		4h���ee�T;$�
j�S�N͙3������Y����Lj��ȑ#ǎ�S���ɓ_}��f͚�PE���]=z4k֬��.$$d�ҥ���rGT-���mݺuӦMw��	

�8q�����q
U	h��"//oɒ%��y�F�V�Zջwo�#�	�^��s�N�B1|��)S���ӧ\��j���ɓ'�̙�x�b��(w999�}�]XX��ӧ�7o>a„�S�6n�X�������s�2=z�hǎ6lx��A�޽CBBƌ��� w\�<H@�X�=77n�jժ^�z�Qm��hΜ9��~�q�ƅ��t��]���F�f:q��ܹs�sC^�w��p�B�V��L������G��JB����scٲe��ח;"�������-[�$''���+44tĈ�U5	h��CύիW���S��?
-Ϟ=v��!OO�q��M�6�m۶r�T�5ĉ'�̙��ɓE���F����w������������!!!�'O����;.������>|�������'Ofύ�%**j�֭�6mR*�Æ
		4h�����q
�4@5�V��.]��g�5m�t���=z��;"��Z�>r�HDDıc��ԩ3y��W^y���_���E��:~��ܹs�=7^�u+++�#�ӊ���D߹s'88844t�ĉNNNr��	h��GύO?��^�zrG�rv��հ���;w2$44�O�>
-�B��ұ�;��Z�^�pa@@��Ν;A��F
-ްaCbbbxxxZZZ�~�Z�l�p������P
-���6�;6w�܄��ܨm=z�cǎ
6<x�w��!!!cƌqpp�;.�$�
��̞=[�sc���u�֕;"�@��\�xq�֭۷o���7n\HHH����(	h�*M�V/]����>���_�z���?/wD�_FF��ݻ#"".\����/O�:�N�:r�E����HLL�裏�s�nݺ�e˖��𤤤^�z����1���Z���×TE<:t����{��u�֭y��}���-[.[�����ǎsww�<yrݺug̘q��5�C�`4@U��s�u��k֬y����FZZ�޽{ׯ_������L�4���K�P{���B�=:w�ܴ��/��b���|^
e�u��͛7gff6,$$d���,�@��-
@�p����C�2dРA�oߞ2e
-�g�Y�֭�-[��ѣ�{�
-!F�ոq��z��?��;4�.����nύ���5k�t��A�P�����ݻwӦM���������&Lpvv�;.�|$�
���?̛7/==����7{n��]�z5,,l�ΝC�	

�ӧ�B��;.�X��
�����СC
����F�R(&�_�����7lؐ�����֯_?ik�{���Z5���S�=
@-���ʖ���p��V�Z%%%]�re�ʕ�>�B���S�Νw��i��Z����������-�0P��ٍ;��ɓ<�5k�޽{���������-wt����ԩ��������a�N�:%wD%03=x�`�B1l�0�¾}�*�1c�HO/_�<cƌf͚�������9��_-sF�K�zH�,X`��"�+??�!C��[�N�R�����p�¶m�:99999�i��>HOO�Uh߾�B��6@/b�޽
-�"88�������ĵ�p��[�8��|����{���T��I��r��������lmm7n<u��.�nn"~�����������/,,������aXs۶mҫ���O%3��.�	�+,,<�|hh������khh������|�ٳ�0Vo�f�v��m!ıcǤ���0!���Ǔ'O���gaa����`��ī�������[�L�V��U??��~�M�att����њ���R��k�
-!`O�����֭+qh��^K
'h�U�C������7L��j]��8������V���PI�޽;d�KK˹s禤�T�p��������!D۶m
kv��]�ܵk׊��Ҙ΃�%1*===<<��_T(


˖-ӥ2��F�	!>��󴴴���o�����/�Q��t2����zKѲe˼��G����!�nݪ�еk�o����Ç������{׮]��e�hy�W]R���&z����{�޽-[��l�R��㓜�,����ռys�Rv��Q�R�R��?ޮ];!D��ͳ���Zmzz������ţG��}�𡅅���CFFF��5Z������J��|7n���Ybo&�Q�[�����]��������{��=z�8M�í�����|������;w�z�j�������ٳg���񱴴|饗�����F���h�'N4щ�ibb���ֶH���(!D�N��t�"����43������POOO''�#Fܻw���u
�n�ڣGWWW�f͚-X� ==]z�ĉ�vuu����ҥ˩S���T*�N����R�n�+Vh�ڔ��I�&���yzz���;��cN���������������,--_|��={����U��FO�2�h�ZKKK!�~����ƻw�>������s�̙YYYF|�=W��3�R��_�����?8p�b���&�߽{Waeeez�f�1��]=�VRx�*�7���T�6m�!.\(��X�B�T*�k*�J)[�r�J�d�ԩB�ŋ�W[�h�b�ԩ�̷�
-�]K�ЪġK�����K�͜C����Va��J�
-	h����w�5k�L�sC�r2MzK?z�h]*%%E�4�ڵK�#m'ڨQ���F����E�͝;W�aÆ��!��ٳ�oԨQ�i�
H˺
��j��f�ĉESkB�n�ZZ�X���ں����#G�W;|�pǎ�Kt�p7'H�f���Z���'O�;v������{hh���J��)T�
�V+m�<��2`�lLNNnР����s�H�Ҟ�F�%���o�.����B���>~��De�"���h���)7��!�������jҤINN��ފt���B�N�:IO_x��s@�t>��J{7k�L�/M�6B\�p���W��kiZ�8t���֭[���y�u��-JJJ2Q���В�H��@ IDAT�8�{n�����PzK���������=zTѲe���‚��g�y���⧟~2݉�8>>^�x������nnn��srr<==]]]�ϰ�^�F�Ν;�T*Ϟ=+mQ��o�ƍ�
4سgORRRvv�ŋ�{�9!ěo���jnjs�����ܿ��K�܍?�p�v��]�~=##c֬YRƭH�.cN�fƆ���
6�o�^ѪU�e˖���*3�����?yyyӧO�z�5k���њ<�x�
��a����j�����^j�q�F�5�|�M!�/�`��0IW�̫��ռy�f�f-�m��ݥ����&$$֌�����mժ���ٳ��3g�H'���5[q�RC�*q��;2�R&�M�k�.]a�f�^z�m۶���@�
-���s�K�.��Q������E�_{�5!DDDDxx��w�)�}]�t)����o�!!!�����!6o�lNxG�ѕ<xPP\�:uB�j����KѼy�"�K)��
z��%�i\\���,Cl��͛7�|�Mooo[[۱c�9r$??��G)��ז�G ;;�w�������ߥoT�1c�F�y�������`���Ҿ��a����j��f���j,5�|���j۷oW(VVV%~�dq	�"��y�еJMM���tppx��������zۆHk���uyyy�7���/��'O��N�4I��_�9_���F�V%]�|���(��8ÆgΜ:t������v����Sq���[@9���o�5k���c��EHo�
Mgee5��v�ڙޖ�Hr������/RGʽ�V޾}[�P�>�n�紴4]Ijj���ή����zX[[|��g�ڵӯfccc8hnn��T��-Q(�iNl�E픛�{�ȑ�c�ZYYկ_��7߼}�v9�_���-͏�?��!Ď;�Z��ݻ�������ʞ={�ɭfL�������0H��\-Ҽ�����/$�;w.}�vKKK�B�m۶�,.�"�f^=�[�Y�F1f��ފ4!!A���!=5�"�ɓ'�W@'''������gdd����������ϰġ�T�1z--[��.q�M�4ѕ(
-!Daa�~���B��͜Au
-
-
-���֬YӸqc!Č3���9�
j3n��{nQ�[���xww��
��������A�Inn�;lmmmll��c_�vM�ڵk%�lNnW��޾���R�А�cb��� M�f�8 ..nŊAAAB����
6�����2q�������?
�=*%��ԩ���[\C�g��	h�32<W͙~���R�r������B���p�jaaa
-�bÆ
�t[\���_=�[H�y��i3g�o�>!D�����
-�0a�b����֭B���K��װBq��2�*qhi�6l�����Ud��<����������J)so�Z�[@9���ѵkק������>\�1-]���dJq�,_�\ѩS'�Ii7�^{��{6gw�:!�\�b�C)����RPP���b�IiK��tl0�o��6w�\;;��cǞ<y�lk�%&RZ��8;;9
֯_/�lts�g��[p���Ṫ{IZ�ZPP`"HɈ#�=z��h4�W�BԫW����m(
-�ڵkK참h
�Ϳz��ԩSBiwf�M�ժT*��}��T�b�
-��J�*RS�s�ʕ��Ҿ��=���c~��)��[\�ki�[�8���gb��}����K�.B�"�ܥ5�]�v5PC�����S)e�
Pq�xZ�~�mӦM�fύ"���߱c�"00���0''G��}����I^^^@@�b���Z�V�T���XXX<|�P��Ç-,,\\\��;{6���t6o�,��[��ƍ�ݻ�����������u��EZ�y��A�k�F�]��a��A�����C999{��y��
-EÆ
�|�ͻw��RZ��3f����{�֭			���R�R�ꫯ����h�����Ṫ{���Sq�ر"{)=���w���j�mڴѝᒏ?�X�P(��z3w�u奺z�&���AS��������>>>�}3T*�����}��ǏW�TYYY'O���!�y��E�Q��H��M�65z}.1�j�Z�4�JZ�R5mڴ���9RF�����{��������]�vyyy���˗8hǎ׮]����T*/^�(-<7��Fsz@K�i���_�=7�?�����'$$Hy�o��V*پ}���)n�NN�<)�puu���B0��a����7n4�ȑ#��
���W2g�Q��'�?��u��H@���؊;0�ѣG˖-kڴ���E�n�6l�`�������<x�@���ܹ��`޼yōn�lLNNnР�~�Q�F	�l��%)un�����ߺ�s��	!lllt[rwV��{Oq奺z�v���͐��߯����<::�aÆ�56lmҲeˤ
-�|��21�k��>�lU��Z���͛����u&M�T$ۮV��v�jX�[�n����9�",,,����0`q�(�J5w�\�nݺ�����۹�[z)'խ[7]�F�y��cǎ5��V+-�9rdpp�bϞ=�
�oi6�J��>}����������uk]M�#N�:5f�___kkk{{�֭[ϟ?�ڵk)))�&M���pss�����T*
;)mIi�,.��JTXXx�����PGGGWW������ϛ���)T�����7�x�E�666���zAA��]��������V%��w��6l������ǫ�����e4gzF������ѣG{xxH{q
R:�:u*�Jz���B�A���l�)Х�z�m��F���޾A��
Z�v�R�4%--�>
-
-rppppp|�������'O���---������dz
-�k��>�lU�В�����{/00P�Ř�m>����x����@;;;{{����ŋggg�j�����y�ڴicooomm���;z���~x�;[Ч��Q��n~~����CBB�<Q��ˋ������C�mݺ�����<��ԩS_~��u��P��>}z��
_���������(�[�n͙3�ܹs�f��裏����H$�Q6���Ν;������^�z���>\�slܸ144�����ѣ}���;JF�,*���w�]�~}ǎW�^ݶm[�#�
	h<
�Fs�̙���}����ٍ;v�̙�>���q
�B��(Y-�s��(���{��	�z�j�V��L�2}�t��Pc��0%&&fΜ9?���Y�-Z���*wD@M�u��͛7gff���wʔ)#G�����;.����T*ռy�ڶm�P("##W�\I���[�^�l��Ǐ���koo?iҤF����[w�ܑ;4<-V@!���P(֬Y3t�P��
j����={�l޼�ƍ������&Lpvv�;.�	h��3{�������^�`�����
��իW#""�mۖ��=t�����>}����
����?�=7���nܸ�p�B�π����W�\���3`�ik��w����
-h!����x�w,,,�s��?~�}���7޻w�K�.S�L�4i%��H@��.::zΜ9�
T���ŋ[�nݱc����aæL���U[p��K�TΛ7�]�v��֑���
T}ݻw߰aCll�W_}߯_�V�Z}��O�<�;:�
-hPKI{nXZZ�^��=7���?�عs�-[?~ܫW�����Ç����� 

j����ٳg_�x��z�7����h4gΜ���طo����رcg̘Ѿ}{����؂�"�=7lmm�=7�>5���ŋ/��lٲ������֭[��IIIrGP{��o�������U��s�񢣣#""��曌���}�N�2e�ȑVVVr�P���5_TTԜ9s�s�����?�u��C�yyy�;��W^	
-
-�;.�ڂ-8@��V�srr��$�������ٱ�P���:tϞ=<x��7���6m�t��!,,L�T�@��
-hP�M�4������>*R.��acc��W_���իW#""�oߞ��5t�����>}�(
-����X

���K��ܹs�ҥw���FEE���+44��W_���"�@'88x�ʕ�?������0`����[o��
)ΩS�*!B���4��v�����J��6m�"33S�s�����͛�
�(;;��c�~���<�={��}��7o޽{������,�M����~��͚5��������؂TW���k�������g,--����ٳG�V��g&L�3��w��հ��;vXXX>|ʔ)E��x��>��S�V����:t���U�h
���Z���m׮]ZZZaa�T�P(lmmCCC?��cgggy�PMeff:th�֭�O�nѢ����M����WXXX�n���d!���u�:uN�8 w�U[p��';;{�����B��j4;;;������eʔ)'O������f͚-Z�7�O>IMM�����?y�$88��ￗ7Z�������0a���_����q��
��Fs�̙����Ǐ������K�P(�/��r�ܹ2FPő���_|��o见�YYY����O����`������3�݃ӦM[�v���u�P���N�;�`���g;;�����g���㏕��j�Ν��:i4�-[����?==����X

�����:dggKO---mmmsrr�Zm�
:w�ܡC�:����*���U�V111&*���֫W�رc�<�L�EP-��u����������?�855U�Ph�Z�&M�4nܸQ�F�5rrr�;@ռy�^�z�Em��=�����>����J��Y��h
-�F����R999͙3�q��2F�;�#F��#

0n������oذ�܁B��j���4��YZZ�LILL5jTxx�܁�v�N��۷oӦM�������͕�7IIg��V+�K�I�������d(W�������/_�;@5�/F�b5k���'�
�8/����!���믿�
@��dɒÇ��z�K
�4�B��T��
-AP!H@*	h@� 

�$�
�4�B��T��
-AP!H@j8�B�P(K,X`���S���%Q��^^^����DX��I���:w�s��� JyLt����
2dݺu*�ʰό����m������ɩM�6|�AzzzqSشi�~��'��J�lAAAxx����֭kcc�����k����/��f�L�\�re���~~~����7�:u��cN嫸��\�+��پ}{�B�w�^��{��U(����C�X�y+1��+�]���T��R5Bdgg��W={���򲶶vuu}��g�̙s��e�'
̦��U�V�l�R�(ʁ��N*����u떉��Oͼ�woݶm��Rxx�9�vvEDDD�*m)��!??��~�M�att����њ��цC8::>�����cǎutt,��1=ٸ���;��O4���W8`aa�/����S���2eʔ)S�ړ'O֘�����V\�9��ʿ~�]�V1`�Ð���/�X�n��M�fx+1��Е�.`XR��t�޹s�g�)�@��'�t��Q�(�+�
�T~~��y�̬\��i�Ш���K6l��41�/...$$D����l
�yL��rss�ݻ�e˖�-[>|�pРA)))R�����Ç?|��m۶G�U*�*������ڵ{�����ó����9jԨ����ݻ�����Ç�=ڌ�eb����C��r�J�
֯_�޽��������谰��]������0<��}�Fӿ�k׮���$&&�޽�G��mͩ@v�\B+��9q�D�'N<~�X�G��<y���a�ĉ�C��m�x+1_��Ju�6�avv��!C���-ZDDD<z�(//O�Rݼys�ڵ�;w.È�e�\j��z���B�C�W�č�����GEE	!:u�ԥK!Ddd�����H���D!���m��>�1Q�TmڴB,\�P*Y�b�"  @�T��T*�-[�B�\��H��O�B|��R�_|!�8s�Li��Ɇ��	!7n���`�3������V���=�S��bt�
-hCq
���9u�T!��ŋ�k.Z�H1u���[\��ӊ�P���aoe8��4\�r�[FF����X

xz���R_|񅕕�?���v
-./Ҋ�iӦ���k��A�srr*[e;&���~����ѣRɁ�~�a�H�����R}�z����>�-�شiS�F�z��i~ӓݵk�bѢE>>>&:1��iM�6B���%''?M�2�*����W_BlٲE��cݲe�Q$�R)�]�P�oӦ�߿_�p�B�Ru�N�8����+��Z���E��i�FY�K�����nnn999������YYY��f�������'N�X��O}L��r����S!�������BOOO�>�{�=!�ٳg/^�(�x���M�hT�����f�86���_��,��Y�f/��Ҷm�����{0�N��
-�*�І�T�kx�_?�Zm�V��+��T��H�V�̙��،�JJT�ò�KJ{H�i(Ŗ��X���ZV@��W�q�!
������������Ú&ވ��a�7�|#�		��Ο?_�y�fsz3�aB�K�.����	@���$??_aee%=���B�������ӯ���;w�/���iӄ�����*q�&�gf5Ã_$�3g�:T�U�B�v��%%%�wbN�j�tA�Pq?�Oy
���V����/��'O��N�4I��_�3_��JJT�ò�KJ{H�ih��Z���������}ѢE������?+h髫���b�̙
-���v�prrz���7�(me;&���B�Ǚ�R�њ����/���w��m߾}{���޽{�f��@R�d�qu_�U3�I�ҽԫW�#G�dddDEE�Y��q��׮]�z����`�W�T�PY��!!!������������8p����͔)S��3_�᭤��v0T�۴�����B���t]I�<%��Zmƌ�������}�]9�~���˗��z�R(
-��E�Z�����ׯ_/ǁ�Zmnn�;���G������i(�19���E�����@!�ٳg
kJ�RCS�N���R�T�7k��9�����ĉ��2���,--[�j5k֬~�A!�[�:*Y.������5jTNN�Ν;w�ܙ��3r�Hi��*�VRe�*�m���Ҧ%�^O�r���j���+V�B̙3��;7�и�A���N�0a���yyy�f͒Vr�-�������>�H1p�@�dԨQB�E�eee��x�b]C�ƍsppppp7n�9C�3g��ǏB|��III&�2�ZiI+�����Q�K�,�O��7mڴi�&�t_?h�VRe�*�m���#F�B|��'��'�2��6���6�
�3|�p�;��eq/�+�J����y�𡅅����J�*q�i��� �X�~��
���c�V��߿޲eK!���Orr���J����B�o�����*�*++��ɓ�۷B4o�\�+�LO�̃c�d�j���>+�hذ�
�߿������ֵkW��̩f:��;�]�6&&&77W�T^�x�^���`�ԩ����`hC}
���D��HM�M�6�h4fη�
-���L��w�2ߦ�i���٨Q#!D�.]�=����V��ݻ'e��a1������`\�J@߹s��Ʀ�w�%��_&�0`�a����!6nܨ��P�f'%�\]]�Uu�`��Đ��߯����<::�aÆ�56lmz
-濪c��~��qppp��ܜjex���b߾}��g�:�	�*����.,�好��W���βe˅�xD IDAT�:�|�Iq�*�bet
-�[I\\���Q�Y�-�!-C�7n����zݺu�̷V!

xzl�
�����7o^��)}@[��U��O�.���V���_=ztFFƇ~�4
�xL���4h0hР�k�FEEu��A�Հ��7n|��AAAҮ�������7��u�������{�ҥ͛7������������100��^�t钮���L���_�͛צM{{{kkk__�ѣG��㏣G�.U�x�kx�_?�N�jmmmiiY�
���J^��+���	!ty^I���|�6�0(((22��?�С������M�&Mf̘5s��2�LSh��_�1�W�^�fMLL�܁��^~�e!Dxx�܁�v�N��۷/���ܼy3((������rǂ�dɒÇK_�	@�X����h4������]�v�;PE���V�sss厢�S(ŽT3r4@.&��kk����vH@@
�������T*333���u��JeFFFFF�~�T!333//�^�z���r��.gg��{�>(��5�	h�6tib)w����_�������_������YXX�߉��������������������K�ƍ�www遳�����8 �d!X���8 ���i���J��j���srr�����.)��B�pss���s�coo_�N��-[�V(U�7n�(ש�Z�4<���|i#���ti
r���Ҫdi���l���X�o���u딝��]]]����K����2��H@����h222��Ҋ$�333��/egg�� %�����7i�D?�,��J����/@�"

��JKK+����-/��������,��E�z�Z�j�n@�{\�l$�
Tj�:%%Ŝ<��l������w�͑�6mZ\*�;&��d��h���RSS�f�%�{+��ZXXH�[�v����hҤ�������V$�
*	h�I�)�)##C�P�PY����ݢE�<�ne�	s��`�V����73�\d׋z���)���ny�f5	h�6���+����=��)@B�9���RRRRSSSRR����FwXNOO�oX$w\�~�������r��	h����LNNN�S$�,=V*��&���������&V+{xx�S@!

�F��$��.�,�Y.�e.((��XZZJ9e]r900���������K�%;;;yg��*D~~�.�����㄄���$�S�F#՗,K���|}}۴i��2K���X��Jv����@�PXXhii�_��j5M�B@'++k���rG����UG~~�������܁�,���AAArG
��Z�V��j&77�0�������(=NJJJMM��www���){{{שS��1�Q��矿����Q�J�s��{ｷa�777]att�G}�m�6kkkcCU֨Q��;�Em�����O?���-_��֭[���k۶�ܱ�,}���;
-@5F�Z�6����O�<ILLLJJ��̺��-,,��K?����U�Nooo�1��ݒ%Kv��q��M��{��5m��Ν;���r�v�Z�����}����_K�,a)45[p�v��͕2��j�'O�H���<y"�������R��ǧaÆ�۷��̺̲���1�
~��Ǟ={)������x��	h��
-śo�٪U��������۷���<$�Q����������?y�$...)))!!A?Ŭ[�lcc������]�^=oo�6m����_*�[�������������
�� //��~�W��������<z�H����СC/_�<bĈ�;<x�u��rG*
-	hT3����������?NLL���MHH���{��I|||ZZ�T������W�#����y\g��'@�OQ*r�
E�x�j���z�m�T�k�m�zPu��z��xT\ţJ��Zų^U[�Hբ��
(�3���Ǽ��f2�'�d�}���g��=Of�'o���HvfYuG3�����˗+++�w@B���0

�			9s�Lbbb������ߣG�
�Q`�KYY�����={VXXXPP��j~Y*����y{{�h����;""B����GӦMq�2@}9u�TXXX�f͸/a�iӦG��:uj����o�>|�p�
@��4�@�P<~�8//��Ç����?<z�����bmm�����������K/������������@�BCCϞ=k�8Р��ج]�6$$$11q������b'�z�	h0�B���#�Y�������B||||||z����ТE�Y�~?����s��M�8Q�m۶ݰa��#
@�3m�4??�ѣG�Z�
-4$�a����ŋ���������5�efg�������}}}}||�������;>�p�B׮]_z�%���G�=z��U��:uj�С={�LKKspp;��

��r����ٹ�\5��ń{{��� ???��}���2������bg�9s�M�6|�ˡ��VVVYYY�����ٳ�'^}��A����������
&�ASEEEvv6���a����)44488888�O�>������^f��̙3ݻw�{���!(((+++>>ޔ���j߾�����?hРÇ;;;���
-Ѝ]IIɭ[�nݺ���s�֭?��377����ҴiӠ�����>}��?�����ڊ�LA�T�;wn���eڶm{��
�E�/00��ٳ����ʱc�p����t#�P(rssU��999���EEE��f͚�m�6$$�G�-[�d�]\\Ďb���y��Y�n��t��yϞ=&��A�f�N�8߷oߌ��AX4|	a�UYYy�ƍ��lv��֭[�oߖ��R�488��n		a�%pmڴiΜ9���e�?ޯ_���<����Ǐ��������gWWW����0
�p��������S[[ۤIv��M�6����R�T�`
�������������d?��s�>}L�����={zyya�r�����ʕ+/^�p��ŋ<x �HZ�lپ}�Q�FEGGGGG�h�B�`�Ν;7i�$�2...���.\�4�;__�#G����sȐ!?������؉@o��¼x���ɓǏ���_333kjj���:w�ܩS���(<��œ'O�7o~�…Ν;�LJJ���O?�d�`��ܾ}�W�^����wﶲ�;��@�T^�|9##��ѣ.\�H$111ݺu������m޼��

�
ڿ��ѣ�?���M���~��ӧO1)Fr���.]�����7n;���K�P�={v�޽���=����ݻw�^�z�����,v:h�>���K�.�:uJgɧO�6o���_~�ڵ��s
@#u�ԩ
̛7o֬Ybg
=�����ӧ_�uJJJqqq�n�f͚5l�0<�L��ŋ���4%�5ks��!L@�����s˖-cǎ���|���Ď��QY�RPP0eʔ���ݻwϛ7��Ç�N��2e
-f�
��jkk��7�	hB�k����?5��Q�>�쳑#G޸qC�,@��0#			


�g�>|8��	b�~�zdd�|}}i�gff�o�>77700����QS*�o������/_�ܴiS���n��4Ǐ����}����=!!
�� �˗/{{{S�>B���:d�TVVV���R���w���T
��f�ڵkC��<y�_~ic�s��._�ܩS'�V�ׯ�����@���㧟~:q�ĪU����aZ|���Æ
�ѣ�W_}%v�z&�H$����Х&V]]��'�I�R��7�7�ҥK/���^����[���7R$���ά�K�V�Z�X���O?��?��:`ZdÌ?���q׮]����X�D���sll�Ν;
+V[[���:p���͛���:;;�k�.))��_@�ViiirrrTT������sdd�ܹs�?Ηs�̙Z��[̰~��P/��"''�v��͞=����o�:����K�����ogg8~��s���\�/�����M�6iҤ���~��"�c��
��̈́��l]�R�=o��,]��޽{�����V�����~�zLL�^k���#$$��o�5R*�(�C�b�e��N��M�QSvD��N�DŽ�;X�`G0��b��1�V�z���0v����J��i�G�2�,�x�&����GI�Z�3��sJ$�͛7�/?z�(7�zB�=zp��Y8�@{�^�v��NS_������?hРu�֕��	w,�1 �ŋ���ܾ}��k��vo۶M�bs|[�Y+++��ߟ����VV�֜R��֭[���3��tv_�|||�]��u�|I(7�����q�:W�ZX��۷�����R���&�Jk����^��͇ir��M�4]Lٷo_uu�����믿J$���b}W\�d���_mm�1RiE��,��N��F���_$�-�ۨ�;F��΀M�[��F5����x��)���[�STT������CgI��Qg�
�>������%�j�p0
�����Խ{w��			NNN4i8 �@
��^�N�U��������@��X��eC�����ڮY�����cƌ!�DEE�UL.�w�ؑ���~����\�\^^^������ҥK���Y����u���>,����ʎ9Miݺuyy97'!���|���]•�(00�ŋ4�im�F�����fffVVV>y�d��ݯ��
-M3
Э[7����޷HS�Nϰ�ެ�c�Sn�^zޔL�E��Z�J%eyӤ����_��G��R�ѣG�=v��.���5�Y�`��?�a��;a��Q�8q���*##C���'@S���E�>J��j�`��9f��Dr��]v�ӧOmmmǎ+�6???!!�ҹsg���o�@I�v������ܭ[����B������h@#g�6N
-��S�N���M������)S�xyyY[['&&B"""T��JeDD!dԨQZ��E�<yB���ӫXJJ
-!$00�����M�Yk�ʕ���m��d2��2���V�Z��9p�@B������S��.�Jt�h�ҥ4��u	eggGy��˄*��͛7�롸�8B���׹e���!C�899yzz���{����[d��d�Ǐwuum޼�ʕ+�)..=z�������g�}��ɹ��k��{�~L1SSS�r�ʎ;:99988���+?��C��WWW/^�8**������!**j�ҥr�\c����&Lpuu�����Oԏw��������+������ڶl�r�̙ϟ?W���	�}%����=/����	�K�ꯨ��3gNHH������k�>}<�^��.�/�M�[9z��k��������w��1��	�hu}3f�ȑ#
[w����4%�&;6�9v4�R��j�y��3�`�P�w�5�1<��Y
v��i�o���.����`G��b
v�x!�;�#�;��I�X��j5a„�� ���֨�_iN�&,=�6���>J��j�`��y��qB�ܹsم˗/'��8qB8��Ǐ	!�[n}{J�K����"##	!���4
����hV�\���VXX�}�=�>\u%W\\ܢEBȮ]��2�s���ƴ^7xzz�U�W�^D��ҬգG��c��qg�3;;���&((���Rk~�b\4�%\��u�ڕ�6�.�ڶmK�?�ӧO���7A�ԩS	!6lضm!dʔ)���|}}��aÆ�o��y�С�e8��7՞�]W_��;�cJ.����Ok�4;pUU��k������vĈ�����T|�J�Q���/--e��	�}��	��z^�	:w�&4��?n�8���"
ܒuY��\*��nQ�N��:w�z�l�2��=p����=�\!��7�9v4�R��j��"�-�r�ct�w�5�1����v��Ӛ�x��]�?�}�����v�x��?\ܒ�+
-o��Uc�n,M{�***�����OtFU�Js4�`��9^�9�|���QR�Vl�49�J���`` �Z���


J�R8�eM@3�o�>¹e@+L@���ӧK�,��*{~���9t��Y>L	

U(���!!!VVV����&����B��S�;Ȅ�yzz}�9�_�I�&����\XX(p�3m�4B������q�t�A�"�-
-,��]�TKZ�l����}�v����+�WQQ������XZZZYY���������?��p��)�Lv��IՃ�Է}�����������榱D5s���
-4J��S?����+B����U�<xPUUu���7�x��ہ/^Lqww߲e˓'O�<y�y�fWWW�v���:\�~����'N$�t��I#_��7B|}}������ӊ����Ͽ��˄��+�&����&P��y�&��a�6D}�p���e˖���TWW_�xqذa5k�w�Ь��dĈ���{UU�ݻw��)������׹c�]YY���թS�[]�T���}���:KrL��r��`G�(��/���m�d�C1�Y�`��f2�1�Nk�_w�/��`���������@����k��i/�ݻw���j<�oC�_�
���*�9�>J��j�}�x9gϞM9y�����	!s���K�����Ñ#G��A�d�ztV·.���h�	hq|���mڴ��ۉ=����k,OJJ"�l۶-55���g�	l�;~���qGM�b666�����ZG��@�\N�����d��������������.\�����f�-��ؚ��m�a�'N<X������h�{�t��o���2f���?���e��2���OŲ���{�-�?_�p�����@�///���k�{�~LEEEBRRR������;��[���6mb�_}����+��Ç	!NNN��
-t�ܙr���Mܽ{�Һuk�&��]:�@�_�煛�s����%�����{��ג��O�>�P(h��~	o��d����Z�/����Ο?/�H��L�͛7���<{�L���da�c�x��i��x�Ik�6j�����,k�c�3�]�5�����.��u�]�/�`���|�S�wZ�R��L݆��^{�{��|_�@�1�`!\�;^�:�B��/�^����ۄ�q��M�0�r��ʴ�ᮢA�AS��J�֭��!���0
-����ۧ���`��%%%����[�Gtt���?gqvv>t萾�D�)�ѣGD�C^k֬!��1���.�E�]•�lQPP��B�DBјS(��DB�Q���ڛ7o�Y�&00�2i�$�fꬍ��c��ɓ����D"���y���SN%%%�[d���bU}Mc�����=���1���@y��	�B���ޞ�1���'�>4��^�T|	�T*�ᾢle~��n��FkC��رc^^^�%�Z������E�Kc+���_~�ett�zr[[[������1�nݺu���u�������{޼y�����9ٟ�s��i��xgY�C1�Y�`��f2�1�Nk���]��>�1�:_����/�����m�]��C
-7���0w��;;;��I`�9��ʈu4w�P�4�,�}�4��4���k׮NNN���ݺu�O������u���4-�o�@I�]���}fH�&Mh@#�	h|��'mڴ����+�w~/,,������suu���~��������4;;;[[���]�b���D�'�Ѭe�c1ٟkkk��b�ہ�C�Mw	Wҽ{w��������ܸ�1����;�F�������SI�>�����������y��7����f���\ �p
6!�&��+�&����y�&��M������J�.���8t��?�����ݻw��EZ{Lx+:WW�:}�t�J4~՚_g��.))iȐ!u�dÆ
<(���yv���
v�xgY��?X��`��:��fZ�N��}�c��;���׍:�"�:�r��R�W��~��8�<4��Ơ��?��`Q
��aԜ�#e!�6m� IDAT��.�}
:K�����K����	�&�M�}���
��߇BIMM��/!�����,]��ҹsg����(�a�BHPP�u�V4k�_%VVV�����,,,���W	ss;v�]]x�+�E�]•�X�B�E?�����8B�������wԥKʍr�U��R����؏�k����*F��d�<�����sc�{Mٸq#��4;0�����T��[�l!�O%D.ЩS'BȥK��24���t6A��ܞnͧ��6mJ���g�p�^]��~����Q����4���*4��~eo�IMM-..���-..ֹKp�ӷ�`]�tQ}i���ry�6m>���2|��`���;F��΂;�n������,�d�ct��;������`�]����3�1���4��NK�X������Ͻ��?��s�KD&,=����9X��(iX�u2j���RGGGGG�/^h�G�V�}{J�K����ڵkG�z�
h���mݺ���]�˫h=����B"""
-Eee%�&{�D.��_"�~�z�b����۷'����mذ�޽{r����";;;%%E�OGu4k����jՊҡC�#G�������gddt�ЁҺuk�.��	;C�s�Z̰�����,88��EC�՘
a�c�5k�{�����]�v��WZbbb֮]���]UU%��Ο?���|XXM3i�d2WWW++���<��yyyVVV�����0��e�#P��|��?�,�0_��nٲe��իW���WUU]�p��R#���R#���ԧO�>}���o�e�H�{��
-`�<n޼�ƍsss+**���rrrRRR��ℛ@�W:��o~n�7��{�ة�I�&���޸q�=�(�h��
G�-++��dk׮%���۫j�����B����~	������/����
-������Bo�޽���YYY|���0���=�;K���β;��0����uZ���K���v:;_����/����Q�4��i�N�7ovrr*,,�Xn�Ad����s�����>J�ja&ȩ΀�zUhX=z�������KMMe����˫���&4r��6�nݺ�=�P�;<~���kM�L�;v��{�o���� ���������ر#����������������q',���}������!\k1úKg'ܸq��LJ[`�����r����ҥ�p׮]�x*�Q�/YYY�M����@����B�}���D�����"___�$Æ
�ޮ@�#Fh�vn%|�z�\޻wo��չWUU�B�гg���j���,��dhM_�l�
��=/��;�0�7oV/�����K������~iT>j�(�����]*�_xǨ�;w�Bn߾]���4hPLL��73;���p�c��,e�c��;�����L;F�&<^k�.���>��t���#8^�f���ii���:��ֆ��O�<Yc9����d���x�ݜy�;J�j���S�U�����_��������/_����I����ϔq��®k׮�%J���_&�$$$PV�0{�7t�P�����-[�������������)"""))I�}�ZѬ��ٳ�s�k׎�hRDDĜ9s��'�s�̙4C8�e��@3����̞=;""B�
*���X�`ADD������CDDĂ***���6z���iӦEFF:88H�R��Çk|o��f��
hժ��Uث�={�p_ڳg!�cǎ�%���믿���ԤI�w�}���\}�ܭ/�x��ÇÇoҤ	�IO�Fi}�4����/��222�����ɩgϞꟐչWUU-^��]���!22rɒ%�?�i�K�!ǎ1b����EL���~���Q�|M��+�&�����M�a�Q*��|򉧧����رc������ɓÇ���tpp		�?�����E�K#mqq��ѣ�4i�������]&�	t�p~��.��ӝ����^���;;;���p�MvZs��`��3�Y�`��3�Y�`��wf2�1��5��Z�K��:v��/�`������ii+�^���T*���T�"�
�x�5�y�8J֥�:;'߫4i����ޖ�J�:88������k׮��d��
T$�������W�^��_�L�������ݴi��o�-v^�|��'�|r�…��(��@c���U� �Wrr�ѣGϟ?__.]�t���W�^�z�41�a���������


MMM;B���
�<X�`"�{�f�ė�����f3�e˖իW�r �\�z��ή�2s��Ν;�9������b�;��C"�,Y�dǎ���bg
B�ЦSQQ���~��������0ѵl�rƌIII�X�{�"##?��y���c�
-��i�����LJ�.
�6�K�.)��nݺ�@�Lv�޽v���o����{��Y�`AZZZ���g޼y�w�u��A�&t��������)��	�N�xeee)�ʈ��z�y��
�gϞ4i�իW�r˂��4���;w�d���&�M�ʕ+111b��.''��������ϛ7o��
�}��1���駟�ر#??_� �&�M';;;,,L����䄆��r�D�cǎ����}�>x��H[
P<xpXXزe����a�D
-�ݻw[�n-v�nݺb��mmm����u�v��u�m�5}��7��Q������WWW�j�J� ����u���蘑�ѳgϸ��u[#G�tqqټy��A5L@�ȣG�!���b
Т�������{�����֭[�N�:bĈo�����cgg7u��5k�(
-��4^��6���"[[[WWW��hq��=�\n�;�Y�dѢE�6m�5k���>|h��@�4q��'O����b
h�0
m"���M�6;�v999vvvAAA&��q�\�RRRҮ]�]�v�l�Шxzz&$$�[�N� �&�M������I��ݺu�U�V��֦�h�6mΝ;����3fРA999��:4IIIǎ���?��Ha�D�J��z̔	��P+�T�p����lBHXX�رc�<yb�Ѐ���EGGoܸQ� ��DM�`�rrrL�
�|Z�j��?����<y�]�v�ׯ���b�
��g�ĉ�~�mUU��A#L������0b����?�lӦ��oݺ��{�}��!!![�l���74o��VMM�w�}�ZRRRr��]#
4��6�L&v
--***?~,v������߻woܸq}�QXXضm�p�ԑ����ѣ׭[W^^���6p���^zI}>��&�	h0[yyy�������'''���=z�ԩ���s��}��ع�R���������7i�d�رG��H$�D�\�&�M��յ��L�P�@����mllZ�h!v�����>o޼,\�pϞ=>>>�>v�ع�b(��ӧOO�8�iӦӧO��\.W(����`�40
m"-Z�P*����b
Д�����cmm-v-\\\&N�x����۷?~��o߾=z�HKK���;��ӧO���k˖-2�L�T*�J�
4F��6___BH~~��A4�����B�T*}��7/]�t���V�ZM�8���w�̙�o�;�����ŋk}�a�

`��6WWWL@��������)����mٲ���`�…�N�
-		�ݻ�ڵkKJJt�;a„����1cƌ�C����r_�4�i`�t����޽+v
-M���7�;�5���N�4����W�\	����[�h1lذ��r��<|�p�֭��ћ6m2qZ�D"ٺukpp�T*�$J$��Ц~��M�Sh��˳�;�5DGG���>����G�ݢE�>�����3ч�������4iҐ!Ch����������3Θ�0
L@�NXXXVV��)��B�x��e�
����f�����Z�*77��7�x饗ƌs�����JB����P(!J���nժաC��&�w�^L@�Ц���][[+v��*((�����;�5899�=��|����_-��F���������رcJ��-&��KKK<q�Ċ�
-q3�i���799��ښ���&�	h��ҥKEE�իW��_yyy�������}̘1������M�?~\SS�^@�T2���}��5�r�)͞={����à��4�i`�t���.^�(v����~ӦM�b��Ή��;v�~�!D.�߻w�S�N�V�b�����$ɶm�llln�0L@�TLL̥K��N
�_>>>b�0�}��i|'�JMMMMM͌3������#sqqIOOg����a#v���W^Y�d��)�����Y�f��JFF�ҥK���*++�nj���=v�X```�v����M�ҵk�����0a„�S�l�[��~��ڵk<(v�$�W�		;����I���wʔ)���m۶;!�5m���[)((�x����o�
q]�rEc�T*�J�������vvv����϶��aaa��	222����.���u�С^"��stttqq�ر��A�2TWW�\����T� 	�&զM�����Ǐc�DQQ����	6���x�blH�������\]]]\\���L�
ꨬ�����������S�L�{=�(�7nDEE�,Ë/V�\)v
-K�g@�Z�^��;&v
-��WTT���)v
-#
-�رcXX���/f�
�emm��g����
:����db
 �T����	Цַo_[[ۣG���L@�1a��������{��
���B���3L@��`Z			���x
-����D�Tb��"6l�����]���]QQ!�`$�����mbbbjj��A���4&��1nܸs��������"ggg{{{��@Ä	hq���DDDl߾]� Ш���xzz��,L@�歷�ںu�B�;4^2����E��`aZ4�G�.,,<q��A��*//wtt;4X�����oBB�ҥK��Wyy�����)�����f̘q���?��C� �HUTT`Z������l޼������s�v풒�~��WU������䨨(ggggg���ȹs�>�\�*�D"�HfΜ�u�
%%<���ՠQ�Zc�Z��K�����ogg8~��s��qk����4������ңG����!�HP�K����M�6iҤ��J�6�N�������
Z�n]YY�N��o�$�w�}�]��ﾓH$;vԺi����s�N���Cs���$�I@�w����*((H"�dff���={V��Ν;�噙��$88Xk�������0 ����1cƈ��w�y'11�ںu����	6d
-
-
-bbb��Ͳ����������gee���.�J��n��.7��΋F��u]~�O1�$�h5���t++-�bpk�K"i,�ZÁh��L�<y�Сu�$44��o���<��ܗX�o;OMM�������o����"��v�ZBȀ
�y���OY�n��Mضm���
-t��q�ד|�4�jd��g
:OV&L ��X�B�d�…��TJIIIQ-_�b!�������E4�Wݛl�JKK	!/^;�E��"�1cƮ]�<x vh�***�h���<x�K�|}}ׯ_���+����˳��RRR�t�B���2dH^^^TT��Çe2YYYّ#G������RQQ��vڴi�
hJr���k]Q�BuFm5ל9s�Je���333+++�<y�{��W^y��+k�N����			��E��:���׳?lذA��^'������ܭ[������������l
��wԨQ���G����W��������F�Һi�#�]XPP0f�BȲe�t6Gk
|�_O�$���dիW/B�ɓ'UKN�:E?~���{�ֺ!�-���:���qGt0%�R��'������I�&�`C�Z%%%����c�2+W�$��m�V&��/��d�����U�V��Wt$��߿_c���%�/i�k�Pc��Z���Ύ���#��U����>~�����@���w@3��Xz��MBH�Ν���!ׯ_�[˰BYYYdd$!$99�]B����,P/6�|B����i��W�ɓ'�;;;�U�k�w4=)�V��\:OV��B�0�\.wtt����w����7[L�PxxxhT�׹���_�&�'�

P�Zd���?\�n݋/���Nmm�����)�]�vB�ϟ����W&==�2o�<ggg��������SP�|�r��ӧ�=�Հ��7�Q[��>5%%������f��Ww„	IIID�&h�"'''��<|�0����}��w	![�ne�f$�nݪz��4�}O�Γ���whh�g���@���o���


:t(,,���&�\�v�ٳg���/���aI�w����{��76m�$vht
-�����)��W�B���'P�ƍ����x�K={�TP:y�����/��R8eI��=E��0Fm5;)6w��f͚�j�j�ȑ;v쨩����
-�)((`����d
-�N�YYY�m�6GGǑ#G&$$xzz�����>��e�AԽ{wBȟ���J�v��%,,��ݻ�O�f��:u꯿�
-����ѣG}�!�}��
�ǝ^=)�.�����S8��l������ْ����o�3'�3L@������O?]�`��g�����6=�3����e��E5i҄��"[��y��yzz.^�8//O8}I.���1v�5$&&�8qb���NNNw��ݽ{�[o�#�
��4���{��Y�Dj���ϟ?>|��������q�JKKw���Wް��}��L&c���e�t޼y3�+��;�C�uu�Q������;..���=j�w����М���:�S���>�4��i��
&��BRR����������6=777B�꛻�ruu%����p_b��h���?~EE{�������7��[���?���޼ys͚5�������g��(�������J��B�W�[����u�v���!C��-ht���M�0�����ޓH$ώ0� b�J��%z�cƌ���۷oߋ/JKK���mmmǎ�uC������ٳ
~:��ӷ'��4��dճgO++�3g�TWW�;w��ںG����ݻ��؜:uJ�P���/���Z�j��^��:6L@�;;�9s�X������Ц�~���ѣe"""��Y��.dpM�4)""b�޽'N��A_RM~Ø��ZY[[�������?��!����s7V?}��h�Rg�i���Μ93hР�M��իW/^�H���go�mӦ
�0/^d����
љ3g!mڴa������6lXee�Ν;w��YYY9t�P��e���*--���f�СW�\1��qgXO��ɪI�&QQQ���7n,++k߾={zqqq�СCQQю;�={֡Cwww���
&������w??�ŋ�<���F�I�7o;�հa�!���///W_^^^�`�U
.kk�+WB>����%
�o�Z;_S�w���B222��38�K�H��\���=����?��sB����%����p��ߨ����ٽ��,�����~��lkXO��֓�pg��I��q�O�`߅�<���
��1 ��;w���ݿ_� �X���{֬Y&��֭[}||L�!�W]]ݾ}{B���߆
�ݻ'��+**���SRR�t��0LYYY�V�!:t8r�HYYYyyyFFF�!�[�.//WUȽ�Sn��rʒ—�4�5�U���H���v����쪪*�Lv��y��aaa�]A�F�a�y�f͚�޽������h�HfiV IDAT�]M�6%��Z�ʀm5N�'O:th+	

��o�%�(tJ2�������*//O�@^^������kYY�@m:O������KMM


%�xyy�/�u�2�T*����`�RI�^�r��m۶������E�	�zR�*}�sќ��9t����駟T��o�>z�(}�K����7�<����x��A,�
�R�l߾��o�-vh,0
-�����;l���,???�~~~YYY�q���}����-w9eI�`����˷���5����޽{�Bg�����ҥ���]���r���4�0�RJJ
-!d��
�2���'�lܸQ�6�N����/_V_���e�>����K�� �	�G
���
-
-
-�֩u��z��pU�4��Ԡq�bF&��_�`cc#��T�_�x�.����������%��ݛl�0

Px��H$���۶m���;���υ�l�ү_?///''�������.�eڶm{�ڵ�s�k�������1""bΜ9׮]co�ЪU�iӦ�$�/�o~Ø�լ˗/O�6-22���A*����>����Ç�K�lmm�;�`����{{{����dddH����4r�!T_������&��V=>:"__�W_}u�ڵ7o��ԩ������Ǐ�J�����Ǐ�h�>}�>���t���u���=Y�(OV���111���;:;;������SƱ��uc��?4l_Gkf
TYYy��q��@�קO����E�{C������?���!h��L�RPP���^�Jڶm;y��)S��W*h<^�x���v��Ev��;��ΪU�Ν;�o�>���	&��N˖-�M�6}�t���J~bGS�������L@��ٳg+��K���p��6G...�-Z�tinn��Y,��wp�
L�RN���.0
m�ƌ�駟��@��6SVVV�W�޷o��?�,vC`�|���N�>}„	ϟ?;��0
m��ϟ���4k�,���
�f���a�ƍ7n��_���L@���={�?��w߭��;�0
m
�-[V^^�`����
����mٲe˖-�~���Yha�2$&&��oKLLă8�R`�b�^����b֬Yb
��	h����}��5k�>|X�,�aڒt��m�����Nqq��Yt�;�g��G��8q�}��������cǎ��,҃����^ONNND`���
-�#X0L@[;;�o��6666--mԨQb�
�UTTԷo_�S��:th�+Y�z��ի�^Г0#v��…�,Y��o������,X�>}bbb-Z$v���������#vh8�͛�aÆ{����ۋ����3�-�g�}֭[�aÆ�s@�0YYYݽ{W� �pܻwo�ҥ.��3��0
m�����m�VZZ:u�T���{{�-ZܹsG� �p|��g���&L;@��g@[�f͚�����ݻgϞo����q�e˖���ٳgw��u��q++�w &���G����III999bg
�+L@@}afƌ����;@c�	h��駟v��iܸq555bg
�L@@}ٵk���|�r��&�-���uZZڃ>��C���Ipp0&�
��***>��㤤��-[��0
m�������͛7oܸQ�,�~��������m�ʕ������;�	膡}��6l�<y�s�ԗ�:u��ӧb��Khh�D"���;X����/��bΜ9bg
B0
�`�3f„				���쒍7���755U�`�\]][�ly������;wn�-��}�����t���7ߴl�2!!���꣏>�4iRmm������@+**��իb�Ku�ʕ-[�|��R�T�,��0
�pH���۷������~����B���/��r�������L�S���1cF�޽_�u���a�Aa���-;;����]"�J7o�,n*J���ׯ_���;X�����/_~���A�`��8{�lttt^^�\.W-���;w��d"�U]]���#v�05553g�?~|TT��Y�`��8x�`߾}e2��!�B���ߋ�
-@/������x
-�kݺu����-;h�tC�T*ϝ;W[[kmm�}U�Plذ�����!�'''���^^^bg
M��n���/^���;b��D�1
�T*ϟ?��-��
Ћ���v��)��,\�������>;h�	����7--����-[��J��/���m۶M�`�bcc��W�B!v����5k-Zdoo/v��
M||�͛7���KGGG[[[vauu�ƍ����ݻ�x���͛b
������ļ��b
�0
����L�6-//��wߕH$666��gϞ����bG���������ٳb
�����?|��W�D�,�&�,OO�իW�<y�u�ֶ��J�r���b�Эk׮�Ν;�;�B1s�������X��/�_8p������4(33�����6m����؉�!�߿||��)�����-_�\�`�n�z�������tFF�w�})V0����;w�9r���O�,�`]�t����PG�{��:u��۷[�n-v0S/^���?�9m�4��`�l4~�ڵkzz�(Q��<y���%v
-h�:w�,vh���|}}�;�	h�t�R++��>�L� ��
ݸ`�,B�^��?.v
-0S���_�l�����,v�
�`vz��u��)�R)v0G�}�Y�6m&L� v�
�`v���WRRr��%����9w��Ν;W�Xamm-v�
�`v���cbb���/v0/�̘1��^�ի��Y�
-&�
�
4����b��gϞ������;��4��A�eeeݾ}[� `.���>�����{/$$D�,@�`����|||~��'����X�r�L&�����z�4�#�D2r�ȴ�4���Y(,,\�h�?��O���0

f��7߼t���
����doo�)S���	h0S;vlӦ͞={�"�v���͛�,Y"�J����4���#G�رC� ��ӧ��ǿ��b
�a����������ׯ�Ds�СӧO��Wb
C4�	������ԁ6o������ٹ]�vIII����z������䨨(ggggg���ȹs�>�\�6�D"�HfΜ�u�aŸ��W�6n���da�y���cccw��)P��7���U�(�!�6���4hݺueee�����𸸸��׋���{%�W�P_��V�_�ї�p�ҥ!C��������?�ܹs��^V�{m�ݺ����K�=~��G��z�p��7oV_~��Q�F���N�ٽ•p�2ƥoMM�G}4nܸ���z�P+���[�/^kee%���hv����M�6iҤ���o]�oߦ
noPP�D"���T-9{��j�w��Q-��̔H$���Z7M�
-Bq��R����??�s''�v��͞=����>��r�~���V+�Oŀw�Ν;�����/��44R��ɓ':�i�
-
-
-bbbt�CVV���?����VV�z��r�Tz��-�rÊ	�A�M��u���daZ�m۶Mg�M�-X�~;P`C|�����7ʎ�D111��׿�N
z�ݻ��Y��N
�Ö-[��������0u���(Cyi��f-c\�їT���ne��~�}Ŗ�{�[_��Zk8p�_~��;\���ɩ{��������
��p�}K߽•WU_��_�����G��^�U�j�v��.�}�vvyjj��u�������	&BV�X�Z�p�BB���+VB�~�m���ĺfXK�2���'�a���s��5�H˅7��=�[]ka.��e�;r�֭-ZH$����Z`��h5�	h�\ޱcGB�������sss�ryyyyVVVJJJ�.]�b���[�&�DEE>|X&����9r$::�Һuk��|T������o�o`�)V�&�T���1�,L�pAA��1cح�[!���ZF�@����rss�n�J���***n���4���4X���
-ww��[���a����ZF�����tig�E`xx8�Jfffee�'Ov����+���@Y��%��������BH�Ν��X���0f��Dr��]v�ӧOmmmǎ�o`��3�]�J�z�[TT���1���T�;6o޼7n����rݺuc���ܪ겜������믿�ZҧOBȻ�Ky��7UˇBIKK�ٴ֗(χ����S�0|��Mm8�>I�.�πw��͛͛7���ڲe}hT�tJJ
-;6<~�X��ʕ+	!m۶��d��e2{	�j�*�B��;p�@B����5�V��M��P�%c4Y�`O�<!����Q�(#���:��@YYYdd$!$99�&�%�4���4X�w�}�G�u���+**�L����emm�0Lbb"!$""B�T�ŔJeDD!dԨQ��~��������~-#]�vhggG�q��2Ҁk3���ǏB��X���p��qB�ܹsم˗/'��8qB��½W�Kt�*1�����***���~hp\��[4�$��y�&!�s��qqq���ׯ�Q��8��-(( �xxx(
-�a�r������ս{��������b
-����C�*}U�����F
���y�/]�Ԁ�u|��+&�����\�z�Y�fR�t��ݔ
�j,нz�"��p��у�k�.�K샢��ˑ=�fgg���UVV�/7�Xݛ@S��K�h�^��+OOO��e��2R�U`߾}D�FK�	h��	h�W�^�H$W�\1�vt>|8��a���[�h�~-�^�<�\�կ4W2�2�^�Яe�K;�.۶mK�?�ӧO���_Fpm&|��s��;\�A�T����3����


J�R��½W�Kt�*1ޥoNN�T*ݾ}�έ���4���i��|�N�Jٰaöm�!S�L�w���q4�e�V��w�aΟ?O���f��_&������?!��ᔛ������]T��
~�<̻v�j@Ժ�G�M� �����\�r�����������[�Ʃ�L@{zz��?lҤ	!D��jT�S��i�رAc�
Ÿ�mw��/����
-��@i܌��7�nTx�z�@�x|벗;�,&�
,&�������ȑ�Ύ�>>>�R�����Ä���P�BQ[[bee��/����,|%#PF�����tig�E�]�T�I-[�LLLܾ}�\.��,|էs[�������Ñ#G���z�p��g�&��<y��ڛ3g�
�����o����oݺ_����]�tQ��,�\�������W5�H�_�d.���XZZZYY���)�{}� �4�}���	!_}��0�-"�L�>�a��H׬Y���
�|�
e�h}��|hXK}N�|��<�5vr�7�r�z��ҹ�������;99;v�f�И5�	hBHMM����r���w�qQ\m��.��VP@D���� ���P,�PQc��hb�Q�c�Xb,����#�
-vA�$A���Ho;�y��f���R�r�?���33�9;;;{;�B�d�����cbb������B)?qdӌᣔe��<�&��&�4��s���p��KU�2�S�lyy�̐60(@�;(@C=&^�z������3g�g͛7�t��aBȊ+T�G�3�6Ꞗ�_��N�ط�q�ڵ#FH�Gqqq���O�i�|����ɐ����jp�Hϟ?'�L�6�~�[RR���ǟ��2���J�-[�S߫W��x���H�f�����j��)����t��<x� !dʔ)���|�
!D�-t�}�T�T�_���ÇS5x�`B����)�
-

%��;����2o"uw3��C�{*�Xݯ�*��,o�!3]e_����r�S����iѢE||<�M@c�X
-�U��͛7D�5#E�޽���1��sE�fU��JϪ�.�	&!�BCCهghüT

�Z
�?�366f���A
��A
��Xlgg�t�R��?�srr�g������%f�:g2m8��*�vU<	������߽{w�6m!s��Q�ff-y<!��Y�Dee%!���ɬ�f``ЫW/���
�酧�����H$�ի��>��<z�ǖ�1���ĩoee�������U�T��V�}-����l��ژ_AwwwB�����_�={���]���T�������|���QII�H$��Ңo`���G�@`jjZQQѬY3--���\��V8K��m5�)�7
�~�|����HOT�Đ��f�d�6�Ŏ��+r��ymm��͛?z���
��j,h///R3��������kA?Q�ȝ8�լ*]`�B�Y5�e��JJJ�;���#
-雋�	�Іy�@��:u�ңG���
���~	�Do߾�`Y������f͚YZZ���1�pS�3em�=-a�T
��U�I EQ			�KKK�kf����Ȉȕ���PӦM5���\&C`` �����&������lkvZN�ʩ�tuu���U�T�u������U�[T�eLLQ"&&������IS��.]�Bv��E�ڵ�dz���	!���ݺuc�i��X5��_?{����69r���:"1����f�S�9y򤖖����̨Hk,hB���
�7�����
-
-���K~
�����Y3���f�ҳj��jۼy3!���]��nlV(߆y�@�
-
-
-���!k֬a�>B
��A
��^��}H����M���Ç����B>����as&#�F���K�Щ]��R���N
-���̀����!D�Qu�õz����h�>�2���������?~��0�f��g�X��r�j��?~lѢŲe��4V�P���<�}U��jI�!D�y��_UU^8i
-��h�"BH�֭	!K�,�L_�t)!��֖"�21lZ�,��C�{*�@��������.\��^CG$�}�����x�"G����M�6�w��
@��X
-Х�����ZZZ����z�������(111  @�1PPP@����^�|��������ի��������Kߛ_�O���L׸�f]`�B�Y5�ef2�����'��۷�Mx�6�K���lPZZ��իÇ��633{��s��/�
����	
-
-���MKKSwAe�ǎ#�8::VVV[YYBN�:�r=l�d�ۨ{Z�~�:���$�{��{��ILL,))��Ϗ����vpp`X�2-�*p���O�8��ݻw��?~��Ԕ0�U��
W�A�/j�����ꞖW˩�U����%uy
����f��2o�}6�����


�|~jj�����T>�ohh(S�dX�f/��ҷ{�]�xQ2��ŋ��W�\a�i��X5�Eeh������m۶���G��yNf����'ٌ�z���	��xM�4�}�6sh�K
�����4777���YBB����|KK˄����?.
-e��Ռ!�.(ۮ�Y��ef�^�J122���`?ʦ0,U�Ȱe
������O�U�
P�
�NEE�����_~��
-?ٳ��袀�Ƭ�����?ؗ_��3�6j��H�Y�&N�ط�_J�ϗ��
�m������S~%����w�eN�P���2sUf�~l��f%��hvꛒ����']d&�G�����U�l���BȐ!C�gя�d�*u�3�E��E����ϣ������m�	!B���������b�FӬ�
-h���������2&M�$�L��G$��ʐ�؏�Ύ��+B߭����ڵk�I�jDh�����80h� 333�@```���8o޼�-�� IDAT�(�f����W�vrr��&���qժU2�V���,Y"3]�f���vA�v�ͪ�.3S���Ϗ"��T�Fii)���#6cX�Ȱ!�zzzC�ݳg��y[��4@��4�GG����{��ZK)�d;v,!���S2E,w�֍2n�8��Qx&�܆R�D�����N���?��s���;w������nݺ������ql��2H�[����QWWWOO���qݺu2�1�5(S��2��SJ�ḷ�~l��f%�ӫ~�;y�d''���
-����h��}�!�.텄���
-		!�����\���il�K���F�dקO�6�0K�M��*k���O��rrrV�\��訯�O�e���#�����X��控�+�e��8 i<4r<J����_ddd�9sF١��x��������UJJ
-�Y����}}}W�X�u`��ۻ{��7n�:�(��ׯ_ӦM��w��@uz��A�=�������u�"""�RQQ������?\�
��\P�X,~���7�|CQ��Mа�x�;v������q��
EQ.���A��
�ٳ�2o޼������@C���͢���{ZZZ�����s�
���ҥˬY����
hkks���S�>|�u�f͚5k�,�S���&M������ի]�v�:pc͚5����w��:T����e˖͙3��Ύ�,P�p4T�j�̙��@�`ff�~���K�:�C�\�
�*ٹsg^^ޚ5k��W@@�4��~��}�����\g
ͽy�fÆ
+V�066�:T?�
�^��x����^�ںu+�Y@sk֬177���/�5h��Z�j�u��u�����q�4��?
-�B��@�@
��>�l���~~~yyy\g
�-\��_�~�G��:��
�~;r�P(�8q�X,�:���ŋ7n��]t6�
�~�DgϞ�{��
��l���/Z�h�ԩ...\g
�$�:@U�o�>00p�ĉ]�t>|8�q@����ׯ_GDDpj
-���7�ѣG�Ǐ�z����'�q�INN��ի�.]ڪU+��@�B
����:���뮮�\�
�6n�(��,Y�u�q�44[�n�ׯ����W����=�|׮]�ׯ����:�8�
��Ǐ����ݻwbb"�q@��˗���L�<�� PP��EOO����={�����:��͛7Ϟ=�c���u�
(@@C#
-����c�4����\�
��'�.\�������u�%�!<{�,�#4����uB������cƌ9p��'�|�u" G�y��ə3g���_�K�~��g\E
Ph۶m�N�Z�`�����#u_�֭�����|��={�L�r��ݭ[�
-�B�C
4^���+V��ꫯlll����_h++++++��(<x�����GGG��	��x�/���K�.�ƍ{��Appp�v���HmٲE,�\��� P�ph��N�����丸��?��8P����+::Z[[�s��;v���\'htRSS7o޼z��&M�p�j
-�P?���߹sgԨQ�F�Z�xqYY׉�>iժ�͛77nܸr��޽{'&&r��qY�j�����ٳ��
h�7CBB���߻w�
@}���,XۤIgg����r
-�Q���?�9�}�v---��@mC
꙱c�>~�X 899���pꙶmۆ���<y�����۷߳gOEEס2��,X0dȐ
p�8�4�?7oޜ?��	�̙��q��|}}��ꫥK����UVVr
-�a:}��Ç��'��7P��zI lڴ��ٳ!!!������\'�zFWWw���/_�����7o����ѣGQ��^���K�.�5k���=�Y�(@C=���{�����BOO���h��@�cff�u��/^:t���;vܽ{waa!׹������_������5k�p	��4�o<����ݻ��#G����������SRR�L��v�Zkk�U�Veeeq���	�߿���ß={����nݺ����Ԕ�\�EQ\g�����f͚2eʮ]��B!�q�oo��ݻoܸ�� uHqqqPPжm�^�z5f̘�s���ۗ�P�CII����X,E9::���<{�LWW��h�\


ĤI�"""���~��eddp�+==�9s�<~���ѣo߾���rpp�o#�u4������b��RQQQYY�������iӦ��b��
gP��������Çb��k׮QQQ\�
�zL[[{ܸq���>>>k֬iժ����CCC+**�NPG=~�X��������֯_oggw��9�
�P���U�V׮]�ݻ��
�?�u��:v���O?edd=z���d��і���-���P�����O���|����ѣO�>]���s(@CC������e˖M�4iӦM\�
��@GG�������iii˖-�qㆫ�k�V�\����8=x𠬬Lf"��!!!~~~��n�!��`�9sfʔ)Ç?|�0{�B���ϟ���������������2�o߾:::\G�����Ǐ��]]����{yyq�
-��+���3f̵k�n޼9t��>p������w�=JLL���Ooݺ5d�SSS??��feeq��edd�T��Ba����ݻ��3@c�44d���QQQYYY����^��:4@vvv�W�~���w�8`jj��wߙ���k�n�����xh!4���|���`
-�B;;����N�:q�
-8�44p666�n�266�ݻ��G���
����q����SRR"""F�}�ʕ����̝;�…\g�A���B���Y[[���+22�e˖ܦΡ

���Ixxx�=���w��m��@���ݿ��[�&&&�x�bٲe)))�Ǐ766���\�rexxxQQ�1
�٣G��'jii͘1#44�����P�=��Q���			�9s�����'���E۶m���K�.���GEE�?�ٳgcǎ544�ڵ�N�<��U@�-��|���~�w�^---�
@� �:@-��x[�l155�4iRnn�ܹs�N����������ۂ���"##oܸq���={�hkk{xx��������ѱiӦ�����ۥ����Qh`***����|�…����u"�U����Q�u�Zu�СY�f-Z�hӦM\g
����w���7n��u�ƫ���Ν;ׯ_�q�}
������{�=z�����X��HSRR�����XXX���We+��%$$���s��(\

����ӵ��?��3��6m����N��H$2dȐ!C!���<�������U����E"Q׮]�b���������?~^^�Ν;����:thڴi�w��ׯ7mڴK�.\�ږ��naa�u
-��P���hҤI���cǎ��������@!M�40`��
�_����߿�޽����~������������ݽ{��;w�D*����٭[�q��m޼Y��������:�Q(@C#���s�������۷�:h�klmmmmm'M�D)..�믿�z��m�^�~���mmm]\\�t�������"}t~~~ff&}Ͻ�gϞ>}z���6lhѢ�
�F	hh�<==/]����CA
�2===OOOOOO�����gϞ���GGG_�pa�ڵ��ņ��NNN�:urpppss�ڵ�'O$O|)//'�9r$88xٲe˖-����?�h�
�j�P5i�������m�ԩ��������������;&&��ѣEEE"��S�NB����L� ��ƍ��ٳ~�����?U|�!3���C
�;}}}wwwwww�����gϞ���+l_^^������oݺu�����>�
����y������o����,U���eoo�駟���I_�,���"))i����߿��Mm&��hB0`����w�رf���T���8�ӵ��������(�222���܂��
0���ӣG�600X�x1�q���� ++�"���JKK���������]]]�afffaa1iҤV�Zq �
�gذa�:u����3������D�Pضm�.]�8;;;::v����ښ�\и�
�/�&M�����ٳ�6m:f���h�S�N������\
�F
hY��yzz��ɓ�������uM���s
!PdÆ
cǎ3fLBB�Y�+�
��x��������B
@1�@p���6m�:�����8�����Ç�������B�H���4o޼{��I����������"�H$u��y���>|�_����xK�,Q8]�f��wA�d��fC��E"����������[PP�~�Yv��r�e������~S���_��~��e�ZZZjjjjll\RR���JO�:u*���֭[ee������nݺ�x��S�*[@ƣ(��uWVVV�n�z��q��	��O�z��ۻ{��7n�:p���bÆ
ӦM�:H����5jԃΥ�
%&&2$55Uf���UXX�����D��P[[;..�cǎ2�%_��j�,�.�AQ�
)kceeu��7776�b�q�ΰ+4e��6����nݒL?~�ŋe�N	�<y2!����
-K������>�|˖-�/�L߲e�ҥK;t�-����JOO���HHH�y�H�
-h&-Z�8��ŋ��G���z���G�����}��%''���&$$��ٓRTT��뛚����|�ҥ������˗/���������*�c�����	��%�}.�lm�iSRR���|��!;;���ԡC���^eG�w\�a��edd�u�~�I~�cƌ�s��˗/�_߽{������)̰o�>��]c ��?.
-W�^���zbRR������s���W}`E�d�>}ZKK����:@50`���~�u
-�X�֭:�u�@iӦMVV��6;v� �������KO��Ϸ��#��ܹSz:�5��LJr��9��5�b�㱟��MAAA�Ν	!?���*;�ְ�,���[B�����v#""!�W��'n۶�r��5�����B���=<<!qqq,D�\�k^^^b�X,���O~/jH���!			\
��W@�6f̘+VL�4)..��,�����	!k׮533S��̙3����^��T�H����K�ضm�@ ��믕�>X�fU�B�200���ҥK�R�q͆]���D///++��� ��!������5]�A_�<cƌy�����`��#F\�~=000  �ƍ#G��ꫯ�k��
-���������������:����#BȠA��<~�����%?�.\�
d���}������[�laX9�f�d���B�L�޽	!Ϟ=c�!��l�	!o޼Y�h!d����s���z���͛QQQ����
e����O�0aܸq&&&G����<x���bɒ%K�.���8x�`u��>B
�>���1>�?k�,��+��&&&m>~�H166��E/���������dӦM��Ӡ�2l�PӚ5kF���Wk)�k0�tże˖G����ؾ}���ҏ�<t�����%��8q�ć���

uuu�M����w��	�:����$88��Ǐ?~<v��n4(@�դI�3g΄���ܹ��,����!���y��������Y�Dz%�5k�v�ڢ�"��\e�4��U�Z]`�aC�q��=�k<��H�r�Je�$������<u�THHH�^�ڵk'߆~���3�_�Ν����.��>}��?�׏4f(@����a׮]K�,�w��Y@��yW�\ah���H�~���,z"�@�9s�8::�:uJ򘻪4S�Mj��۷	!:tPwA��k0�E���;v���|��������N�>������`����s=zt��}B���}Uu�(���>}��^(@�gƌ&L�<y2n
P�M�0�����ggg+k3f�B�ڵk���[�N�@!--�;vB���K�,�)Ħ5���p͚5�u�e�fî���駟�[����l���ʮ�?~������������2\�\�A
h��ݻW[[{�̙\
&ӧO�ҥKrr���[@@@JJJyyyqq�'O===	!3gδ��MHH�ӧϕ+W
-��������铐�о}{泾
���&$$0'a�L�.Ԅ����������]���ř��}����GYǫ2�.�����~@@�����������M�4��UPP���SSS�oE�����󃃃e
-�Pu<���i>���ܻw���q����w���7n��u����ņ
>��
HOO������V8��6���8x��ׯ_�̵���|������D�'Y����ԩS���2��j5S�}�ߐ�6VVV�O��ڵ�¹
-7���D�a�_gxx������[�l����T����g�2dȥK�d�2���ˁ����7�R�H
Fzz���EBB��;@W@h�k׮7n�ꫯ^�|�uP�u��QQQ4h����@ 000ptt�7o^TT����>66v���NNN��W�Z˦�fkk�`���j�Y��������СC���ϲ�����Weؽ��������Խ.��Ɇ‹H�����O�W@hH,{yy���߹s�����@��+�
�4�+�
�F�
-hP	U3
���C�����*	�p�m��	h���ج]�v��婩�\g
�q<帎u�۷oCBB�̙ӦM��~���8�

�
귅�={v�ܹ/^�:�>|�p�֭�W����&''�柦��\G�
P%|>���...AAAS�N�:@
�3�@��������W�^�x1==][[�����
-B��������1
�(@TUǎ����ŋ6��Ą�8���Ç��1c�<���(--���rB�������͛s��{@T�o�����x͚5\
�=tM999Y,��b��������~���͛			�߿����1\

P
����o�>bĈٳg;::r�6X[[B�޽�i�&��압�
-�9s���?77��U(6o޼E����fff���-Z�033kٲ��������hP��>>>���K�.��
�Q��ן={�̙3CCCׯ_����PXVV&�FKK+11���B���333322rss�233?~|�����̴�4ɲ����Z�jٲe�f�����jҤ	u�
Pm�m����|�����s��V���#F�1"::z۶m'N���Ғ���4iBW�	!zzzm۶m۶������egg�y��͛7��ٙ��YYY���ϟ?�{��۷o������y��fff�Z�j޼���y�֭[�jժU+sss�PXf(@T�3f|��7�=�������-88xժU۷o?|�0!�����ۅBa�֭[�n��AyyyvvvVVVff�t���?�<���ׯ�-Z�hٲ%]���M�hѢ�=6P#�N�֭k߾��fϞ�u��������_�~�޽;w�lٲeu�Y[[�.%w��Ea����w��In�A��������/^|���n֬Y��-[�7���۶mۖ-[���K���*B
�:���}��7k֬�8q�H$�:��7o�z��e˖�����F�B!]�vss��EQTVVVFFFFFFzz:�offfLL}5���'�� IDAT�P��i+++\:
�.�
���ŋ��ݻk׮o����,�����ڵ+�)!��㙛���������---��MGFF�y�&--�������kmmmeeeeeeii٦M�ϸ�4�B(@T3�e˖�_���/���
��(��u����������¹�߿OKKKMMMMMMKK{��uxxxZZZzzzyy9��kٲ��6mmmmccӦM==���@݂4@��7o�֭[��۷d���(���{�ƍk׮EDD���r�011111qvv��.�߼y��������������ŋ���W�^���B���%�h�VVV��ڵ��ڇ4@�������/w����W_���p�B����ܹC����/�Pػw�3flٲ��h��ϧ�-?+//�իW�����qqq�ϟ��UAA���V�֭�b���m�v�ڵkgkkkll\�]�Q<��@M��˳����矧O��u�����w�q�F��@
z��ͅN�<y������.]�x{{8���SWW�baa���mbb�uR�\aa������̸��H7m�T h\�y������&$$���s��>��ΖT�����?������k���5kFW�%%�v��)�n�(@Ԕŋ�������x<��(�4@s�…?����Ç���Æ
2dH���MMMeZ�ٳ'??���PE������������7k��믿�3иZZZjkk۹s�N�:����H̜9��Uu%%%IIIt1��7)))--��(}}}�ݡC�:t�رcǎ��s��	h�����bkk{��%ooo��(�4@SRRr������_�p!55���i���#G��޽;���:T���ݻw�ĉcǎegg���
-�޿��5jb�822��ɓ!!!���=z�7nܧ�~��ҡ*������O�>}��Ivv6!��ظcǎvvv�����-n	u
-�5���O,�={�� ��
�0TTT\�z�����Ν+))�۷�#F�ѦM��A�)//;q�����AYY=K(Μ9s����&���ʨ���'O?~����t%z�ĉ͛7�:4���Ϟ={���ӧO�����DKK��ںC�NNN�:urtttpp����:/4v(@Ԡ�W����$''[ZZr�@
�
�5���޽��o��<y277w���&L5j���!�Ѡ�TVV޽{�ĉǏ�����Ҫ���n�����̞>}�׽�T������//�)S��M
-5A,����U�'O����������m�ҷ�qtttrr���mlw*Ρ
P�(�j߾����W�\�uP����={���'N���yzzN�0aܸq���AJKKsvv���X,V؀��]�pa�С��RTT���5r��iӦy{{��8P�������ccc�ztBBBqq������C�N�������\]]����N
-

-�5k���HJJ��%�A(@�/���.\طoߕ+W:w�<q��O>���ʊ�\P�nܸ1`��h�P8q�ă�~*�LAA��K�Μ9s��9SS�ɓ'O�6��Ύ�\�(���/_J������/!���n�@=j
-�5+%%����֭[�z��:�,�
ꋗ/_<x���b֬Y�}�Yǎ��g�ƍ�W���������7o���3T�����.DDD���O�:uڴi���\����Ǐ111�������_=y򤲲��������ͭk׮ݺu�D\��zh�׻wogg�_~��� �P���(�
-�������;t�0w�ܩS����Q���}��Ƀ	!|>����Æ
�0T��ׯ�;���B�$z�ر���\�ƨ��8..NR�������ttt����ѣ���{ǎy<�1
��A
�����/�ׯOOO����:���
Pg���S�Nmܸ111���o�ܹ}���:pC,�]�vÆ
&&&�޽���
-��F�:q���z������#G�;vL �?~ʔ)���(�
�JJJ>|u��ݨ���o�ӕh�_��(��4@���Ȱ���~�:�7@]�4@TRR���}��>,\����?������	&<~�8((��¢{���E�͚5{�����	�
�����رc��믿\]]�Ν;e�]]]�s
��ϟGEEEFFFFF����x<WWׁ8�gϞB���Pw�
P������m�6���
-�uJQQѮ]��o�^VV��W_}��(/6r'N���			��6�k׮����r���I�&qjPll����9BQԴi��̙�;�Cݑ��w��݈�������X}}�~����h��
@��4@m�駟���C?b��@
��p�’%K222��⋯����Ԕ�D�%��6o޼r�����o޼YGGG2kܸq�.]�0Ԛ��ʋ/��������gϞ4i���
׹���۷׮]�����ɭ[����>|����U��
P�>}ڡC���
-�u����x��;w�̟?ժU���\'�}��aڴi��''O�,3���0??��ܜ�l�����}��=zTOOoƌs�Υ/��S^�|~�ʕ�����ʁ�5j�ȑ�_U�F��u�F������:,,�� P����/\��[�nFFF���۷oG�bcc�w�)_}&����999�޽;==}ݺu����ڵ7n��۷���/m۶�={��S�����?nbb�t�Rsss//��;w�z����
�
jɀ
�]��u
-�+�]����p�ܹs�Ν9s��֖�D��_�������9::��ٙ�8P�D�Y�f=z��޽{zzz����С�Ν;���/zzz�����ʺz�j�Ν�m�ֶm����;v�����P�P��%����u�X,�:p���l���
3fL||���ùN�+..�:u�y�6m�bhh�u"����܂��?~����bŊ�mۮ^���۷\�����%�����۶�����oݺ���>}�u:�%(@Ԓ>}�������s����ԣG�����/�ܹhBHrrr�^�������,X���N�Cǎ������믿�z���mڴ���/q���x<���g@@@ff�;"##���x��-��
@�C
��X[[[ZZ޽{�� ��+W����������4��8P'\�t�[�n͚5����ӧ�q��166^�|yZZډ'<xЮ]�#Fܿ��\����M�2��?��u�H$����ݻ��+W��5h���������S7~���aÆ͙3',,��Ԕ�8������˗>|�̙aaafff\'�z���1"**��ٳ���#G�����:�R�z�:{�llll�6m�:z��/_r
-j
-�����9&&�����k�.Z���_ݸq����q�{YYY���?{��M�
׉�!���#G��s�Ν;w�|~�^�
��„��S�NG��������ԩӎ;(��:T3�
jO�.]�����ʸ�j���7n<q��ԩS��uBTTT׮]߿�����#Gr��={�;w.))��Ʀo߾�����ס�rvv�y��]�V�X��㓓��u"�N(@ԞΝ;����Q�����۷m�v�̙1c�p����O�>���~�����
Y۶m������ڵk7z�h�����9s�������������h��cii٤I��ϟsjIhh��ŋ���?t�P���JKKg͚�jժ-[��߿_WW��D�(���=|��y�澾�Æ
�51Pg9::޾}���4�����8P=P��U666/^��:Ԇ���ɓ'�\�w�BHff������~��Յr�s��=z�������iѢEyyy\�P���,""��Ǐ3f��:T�
jU�v�P�h�x<���:�����Qk���&L�������������=�ĵk�:w�LQTLLL߾}��������˗O�>��t��!  �����P5(//o�ܹ���|>�>���J���mcc�'N�;wn���\e�j�4@�j۶mrr2�)�WQQq��asss�P(�����͛w��=���V;_�xRD"����������[PPPӛVK����^-�ްaCRRҁ�|�r�K=�g�����C�4hеk�Z�jU�+6l�Ǔy����y<�رc�_�߿?gΜv�����XYY�=��?�T�fe����yyy?������H$�D�;w^�z���l�֤I�>}�\�p���H$�ѣ�o����F�Zb�'����RSSScc㒒6�ļ��j
BȈ#?~�x��E�������ת��Z�d���ZZEQ\g�条�mW3ݻw߰a��ŋ�}�꾕��!��ӲY��q�N�d����m&��8�9��~�Y�Q�9y<ޯ��*=�ʕ+
-�H'T�i������ʴT9b����B
@-ڶm����)�߀
������nFFF������I��T6>VVV>�`U5���V^sj:��/�B����km�����F�9b�xժU�`۶m5��gϞ	�BBHXX=%  �bll���z������>}�y��^)��			VVV
-�W			*7!���W�&((He�l6�2�d�G��=|�0�Q���f.���;�^�zէOCCãG�*�z��/��/VTTp���w���]�������{{{W��5~+ɴ�윖�R쏫�tmm�'O��OW��fc�����9�5�`2j"���A�޽���7����eZ�O+��̱�͕iɼ��_R�ӡ�
8r䈹�9�)�'貲2777B���ž}�������
-z��Y�y4�|�W[)))INN>t萝�!����ݻw������hT���=v�X//��ܢ2u����jHqq������QDDD�nh���;;����ׯ_B�9"iгgσ����������={���3�V�+%3����}���gg�K�.���\�|��ŅҾ}���B6�HKK7n!���]Y����)S���bU�
�쩌^�z�
~r�/˼6��]-�!���l���ZZZ���+))a�`�@_�'���/�D`/>>^ ���"u��VR�F�sZ6K�u\���G�,?�f�����p�k6���S�L��x/^��'fgg�B�B��U�i��G�Z���%�I�g���.,,L[[���
@�%)@ӧ���ӧO744477߱cEQ�߿�4iRӦMMLLV�X!9|]�reذaFFFzzz���u~��'�GGGIc�X���H�8q"�ϥymڴ���b�VZZ�i�&ggg======gg�͛7���IЙg̘ahhhbb�l�2���E9r�o߾FFFB��]�vK�,���dnyy��;���������{��y"Gf�,��2�̰t�ܙ��?��b�̪��|O�>������2'����|>_�J��_�h���1����!Ue�jq���w��}��;$�;��^�|���k```bb2w����B�*���l--���L����I�V�nVTT��_���iii)e��lq�6III#F��{7g��ޱi���g�����ڼys�=�ys*�ʶE_�u�VBȰa���|��"�����!3}ǎ�{{���|�T��ѝ;w��DVV!DOO���۷o	!:::l���!�KI���'����{xxB���T.���hW�h(t�ƍ�͛���777W�e�.�>�����ɀ��F��C�:n�|����x�F��*�H(|i�+��J��yP6���S�J
-p
-[jp���$߆�9�6K�u\�s��s��)�ϲ�<6c�r=\��Mk!gDD!d�����m۶B�]��2���sw�ꬲ���4�/)���XP-������p���
-УG�&R~��w�?@����7mmm��[�����Hn>@�'��ښ��ѿ���������Ӈ������%��)m׮]��07��'N��D�N����(�*++4h�|y2[d���������ߗB��œ�/}����륷�y�fBȨQ��ð
J�}��G�w��*cW�
���*+�W\>��K�f
�޽�����;f�I��m„	���D�߿��x�b��n����<��_�⒟���[�l��w*��Ͼl����������ٳg��(ܜ�C�2�����@@122��x�]>000`A��N�W�7������ۗ�&��MLL�DUkC*����W_B������!_|��e�C��j
e���\\\ڵkǰߪ$�ck��[œ
��ы�<������JO��>�+#��H(|i�+���r��	G�믿�����)�6o%�6l�i�YJ��*�311Q ���+�ϲ�<6c�r=\�Ze���)����ڴiC�I�N�����b�ʴ��M)���X��j���B��ׯ�@Qrh�G����͟?�bdd$3��ӓ^p�ر���%%%/^��K�&L���ҥK�;;���ʊ���;���[�n�sMLL!�;�*�i�&BHӦM8���۷o������o޼�nCgvuu��������ٳ	!]�v����A`` !���"$$$;;���(22�[�n��e˖Q�u�VB�H$ڹs��ׯKJJ"##�",��5�]`�_~+�y�f�$ST�EfU/_tt4!�e˖�������rKKKBHdd����ɫZ�s���*�(�Q��ƒ�'�`x�)U�,�kX�t)!����ƍ���ׯ_�ܠ�R�OҗḺ�J��ڵ+!$11�b���n�:44T� �C�p���Ƌ/&��iӆ�ݍ7����W��@e~���,55��ήK�.���)��!�A�޽�u2�\�l!�O�>��#I3cccB���fffEu
-�M�?������p���L���e�jT�͆X�EQEEEM�6������+..611122��ӈ�~�p�W9��#�������ݻu�֏=b�^Y`�[��j<�OH������u��/���\���?W�D�y�̯�Z�r��	���h�"���9ٿ�ڰ9���f)�����, ��]�V>?�f�،����U��S���r�\��r�����HBȪU���?+��b���*(l��J�-(�%�_�UjBrr2!����\
�(�tTT==##C�333��Ч�����͛G	
-
-:|�0!dŊ�Y�z�����?�:x��D�bL�W:�{��_���ɿ/�cn���N�}���&^�xAi߾=EQ��΄����x̧k,��2��V���ɿ�v^e_N=�_���K'?~�8!�W�^
-gX��SU��s���*�(�TU̞=[�p�|�eȿ4*�@��'�w봳g�Jz�r��J�C�o���,w�3gΨ �����;v$�����Y�[�п27P�_�.0x�왵������6����
F�S�M?h���<O Ȍ����H�1�����>�Y���������2$�
��GQ���	!S�L��}��7���/�<��\��`4�����9���T�4�-�[��j<�OH������u��<e�s���ӫ~"��~��2�`?P*��� �֭srrbn�֑S���L6���,��qU2�999&&&���)))��}Ue3yl�Ja3�5s�ke�4�PŜϟ?'�L�6mƌ����$�i��2��UP�X��([P�KʿV�,4�����Ǐ�@Qrhɣ�$&3���QUQQ�e�}}}��P(�^saaa����H߮�͕�������l���7�ߠ)�,i��@:�mmm�����!o߾���|�Ʋ,��o��[<ccc��}�^�ʗ�ƍ��Ν;ӿ��у�����h0�W�>��#����<�:����}}���`�Y*_q�/��5���B��ߚ��#i�r��{�|��w�,�b����ӿ�����gL��+[\Ҙ�w*�̯V����iѢŘ1c�<ɍas�Pe�A�z���>����ZZZ<��ѣ,���p-؛7o�+�i�z���aɷ!��D���P�Q�ڐʞJ�մ�ׯӿ>{����1\��&$�����J鉕����|G4
�***�M�fdd$)n�'�ck��[�'�	�UXT�����Xϕ����;������@�ƪ�ܺu������3�T��)���І�+��Ѕ�� IDAT���C�{�nB�رc)%���f�،���p�k6������"�Hr����4��V��Q�����%��I��R,c
@�x��=!D�~��)@K�b����_E�gff6k����������L�듗�Quo��0JO���*C�V
Z���S�NBz��!���/ҫb����ٓr��ը�(B����ʇ������S�{�~���.))a9�U�o�>SSS��G�#��Q��*�߾}+
-mll�b�ǏE"�H$�\ƫ�n�LaKe�K�W��2�Z]P��ݻM�6�1cFEE���c8�*kO^�n]�f�!��o���y<���U�L��{@3�)))9v옎��P(���Vk=���
-����Q�#���0,˜��Ȉ�U4�ZFӦM�WR��`���|�ĉ&&&���Z�o]��Z8`Y�V��D������H0�_�t��r��	B��~����j9%�a�VRֆ�9�<6Kip�a�犊
-���S��u��+JՋ�U�U�͜��h����k����Z�U�X��_R���XP-��򈪿��5���2��Ç߿_QQA�ךLc___����_B�'�|"����O���QXۥ�v*S@9p���=���7�}����...DɭT����kL��W�
�SUPP���DY�f�d�ʾH������B�2~�x"�w����JOa�����Ԕ"y]I�ޜ��U4hР���+��rT�4*�����F��o�޻w/!dƌ��j�f����%���ě�Q%K17P�_�.Ȼx񢑑ѬY���T�c8�*4j�(BH߾}�b�/��Biٲ�Ǐ��l߾�������Sń2�w��Aqpp(((�nVPP���@ٹs���`hC_����.�c*ףً�p)����7oò�<<<!2W���K�#��F����
-
j��[���NTXT~�(m����9����#[~"�@��j����


eh�֑S���|6���,��qU&gxx8�,󾪬�<6c%߬��Ze��̙��������/��� -s�:���f~I��R,c
@�@
��
-���ugϞ��#y���c�!����������c�N�:E�---�ҥ!�������իWeeeEEE���


��l��;͚5;|�pvvvvv����6mJ���9�)�W8ss������䢢�����O�xxxP��O?B�4i��/�������DEE�!��:/,,L�o��������j>~6�EH����DB��{���(�MQi"��"%�� (��D���
�˦��b��>{o��M�6�}_�!gΜs�3�3�+�3��[�M񧦦޹s',,L�0���GGG�kZ�aSV7�N���̬V��F�qvv.Q�����f)�
%�5,����CJ億����^�t�V�ZF�Y
-;;������-}���X�4V[P�B�y�~		��AǏ�7n�n&���[Z]_>q�D!D�2e��㏄��?���L�2�k�W��MC0���2a���
-�͈�!�R}�-#���R��?����Μ9s��f�ʕُШ<!!�|��B�Z�j���			��������B�
-Fo�S҅L�V[�re!��X�����k�V||������STT�ayTT�������>��gH�h+Vl�֭������[�l���29��͆r�����Y��g���V,V�&fg���<w.$L)<e�:QV�1G� ^^^?������9��Q2���֔��l:��Ή����������2���0j���~��ٺ9lZ���M1����?k)@� 

॒�t߾}�
��;}�ǏK�0��p7n�.G�߅�w�^�ڵ�:�.%%�q�Ʀ������P�1[�0n�8��Zm����.�޽�Q�i�V��0~S�J�:s�Ѧ��a��OO�j���|K�̆���ȌH��f��E���[
-;;~���
-XʵY�
���j���%K�4l�k׮�:J�-33�|��җ�+U�d4廙<��oiu}��Ǐ_}�U��_5�ﺱZA>~���������;;;��W6�h�;%�P��-Z�/������v��uþL)�������Ȁ���������:���B__��Ц��t*�hӦ�ie�
���xMו255Uz���F�>�6Gf�&Z��S�NE����L����ps�b��q�����x��s�B”�S��euu�>�$%%	!�;f���GN�=Z�(�ױzMk����WM��q㆛��Q��jY�+��#�*�6[S���_�psX
-L~���6b���_R��Z2���H@x�d-
��ٳ~�����*ThȐ!��Hդ�m5j�_133�nݺB�=z��Z�ڵk[�j���������8z��'OJRRR�ϟ_�z�
-xxxT�^���?7��j�Ju����ݻ�(Q�����ãjժ&L�?�S��.\�P����+88Xz������u����'}��R��CP���ãdɒ�ڵ[�|����Fd�bز��ӻ~�����766�lwz
-gæ}�ꈬ�����'O.R�H�����`Ը���cԨQ-Z�����x�n%s��?����;^^^~~~#F�HLL4�cu�t���NX�ۃ��L��ɷ��a����۷o������7r����H!D�b����V���+�$..�gϞ���?�����MO�!Ԩ~�z���g�ݻ��]�v�}�ʩ�N�{��Ō3�U�&}�800p���τ���u�<`�.]�hSGJ���۶m3��m�6!D�ڵ-�k5Ȥ��ٳgJ�����ٳg'%%��l�*==}�ȑ���f�<f�R_Y;���ŀ�q�����x��s�B”�~�0QV���A����W�^5[��#���~����\Ӛ�d-��U�qN�4IɾjZ͔�yPr���Q[�)��q�,U�9,ͳ��`�/��*�%E��i@����������
-
-R;-Z�
-
-�7o�ځॳf͚�Ç��.T;�Q�f͞={N�6M�@�e˖�7.88�СCY��={����ٱc���S ��t����U�6l�УG�ñ#�7�����i<x�`۶m_�x���#
�eNj��ˋ/��x2D�XFrr��˗��,�N:w�|��Ѹ����^����>߈WR!GH/�k֬Y�ڵ�;F���F�Y�t����{��=y�䌌�#�1�s���'���x������}w@��;�
�T�����
-!ڵk��<�����_�~tt��'؃~�ԫ]���'��|�Z!��]�6lذs��͛7oܸq�=y��Ç{��]�|�m۶���kj��rḑ7�O����N�:�۷���Os�5��;�
�?
-(ЦM�իW��#9{�l�R��>��޽{[�n]�xq77�r��M�4���7�nX��Z�vʔ)ժU+Z��7�{�=��ȇ����?���P�^������
v=n�%�e�i�z����ݮ]�i
�*��U�

���@N?~��[�~��g��]9rd„	7o�\�`�ȑ#I=#�KJJ
-		ٲe�ĉ?���#B^6dȐ7n;vL�@dw@�����.]Z�(��_�ޥK�f͚լY��ի!!!d�
OO�
6�޽{˖-�˗߹s��!�z����͛?���
�-$�
��{�n@@��Q '={�l��񁁁Ϟ=;}���5k�/�vP�K�]�v�Ν�СC�=
���3�#B4u��r��u��Y�@d	h �H@�%���ӦM+S�̞={����#G�Ԯ][����Q�B�V�Zu��ለ�
-*,Z�H�ժ����
6|��w���j� [H@٢�j���_{�5�Avݿ?$$�D��v�Z�fͭ[�z���37y�7�x�����.\X�l���Ќ�����KNN~��
����<�4�-			:����W�@�u���		)[��ѣG����˗/����ɉ_�E\]]G�y���q��M�81((�СCj�6jԨ�������-			Booo�AVܿ„	�*U����V�\y��yR�@�x{{O�<��իu��iٲe˖-/^��vPpH.�����[�H�c
����%11Q���v ��͛7G�Q�\����+W^�zuȐ!���j�8�%J�Z���ɓiiiu�֝8qbtt��A�������G+W��Q��ڱ�$�
�l!
�pN�:ձcNJ+>z�����/^�߿�����q
yGݺu>�cǎ�~��lٲӧO���Q;(8�?���s�Γ&M�߿�ڱ�1$�
�l�^����v �B��<x�}��
6LII	�駟�z�-���:�;wn�Ν���+Y��)S^�x�vPxy9r�m۶���ܹsՎ@N"

d�t�lzz�ځ�����իWW�^�]�v>>>���͚5S;. _hѢř3g6o޼��ҥKO�2%66V����9t�P�Ν���3o�<�c
��H@�B�ev�ڵ���W^ye֬Y�������͛�֭�v\@���h:v�x�̙E�m޼�r��_����"@�u�ֶm�<844T�Ѩ�F�:�N'}�|Ϟ=K�.�8qb�^�/^�v\'N��۷o�jՎ?�hѢ�ׯO�<�X�bj��_���#F��~��ԩS?��R�J}��ϟ?W;.�l�������;w��ŋ���S
y��l����޽;**����ҽ�!!!nnn:�.55�iӦj�%''o޼��o���ￛ4i�{��6m�p?��pww7n����/_�dɒE��=z„	���ڡ!�i��>�`���6l�ӧ������جt��'O���������))):��Q�Fꆗ?]�tIz�Ɣ)S:v�x���C��mۖ�3�����:u�ݻw�-[�gϞ����^�vM���{n߾]�^���СCd����4`��={�/_�lf�`������R�����f͚ƍרQ��?����/o߾=s��%J�+���x���~���իU�T�ر�_�%�VRRR��ٿ�
���N�:�_m�<�4`3''��ӧ;;;�k4�z��q�m�8q�İaÊ/>q�ĪU��<y��ٳÇ���R;46prr�ر�S��o����㠠�>}��={�l����ڵk<x0��DNINN;vl����w�����#

dE߾}M�X���ޤIU��?n߾=eʔ���&M����oڴ�ɓ'+W�
-
-R;4Y���Եk�ӧO�ڵ����S�N�f�~���NgXm׮]׮]k۶�֭[�
-Yv�ر*U�8p��ѣ˖-swwW;"��4�...�������;55���Irr����[�lY�|�_~���?���ڶm[ǎ���Ԏ@��ر�'Ν;W�B�nݺ�+Wn�ҥ�����h4����~��͜9S�Ha�V;{���͛7h�����
6T;"�Gc��Dv����:^-Z�
-
-�7o�ځ�*555  ��ӧ�''���8
��Ν;�bŊm۶edd���g�ȑ�k�V;(�����+V�X�lYzz��A�Z�nݾ}{�Rgg�ѣG/]��ɉ��^jG�
		y����ŋ���v8r�h ���ݧL����/�\�2����ѣ�˗תU믿��;wnTTԪU��>��+��2s��[�n}��G�v�>|��7222BCC����b������#G׭[�ʕ+d����4�u!!!�������ܚ7o�n<y��/֬YӢE��%KΙ3��7�<���3gƌS�P!���__�I�&�8q��ӧZ��p�V�ݹsg�V�����
-f���/_���7�?p�@XXXѢE�
-�:H@Y�����J7Agdd�P�,���^�t�[o�U�h��ӧשS����<X�xq�j�Ԏ��֯_���lZ���z�ĉƍGGG�~T0맟~�R��ԩS�O�~��u�:�s$�
�l7n���������zK�pLBB����;v�X�dɹs�֮]�ȑ#��ݛ?~ժUՎ��"--m��ũ��f�j��+W�ԯ_?***����7ov���wީY��Əo��*�	h [|}}nj#�(V�X�%��1h���۷w�������w�-\������޽+����ٻw��
�Z���ݻ�5�y�f�ECϟ?����V���ѣcǎm۶�t��jॠ��tj��#qqq���AAAj��E�AAA���S;Gu���u�֩^
-III�6m*]�t˖-Վ�
ܽ{�ȑ#���%J�(W�\�2e�*��ԬYs���jG��v�ܹ+V����u��Ç���SRRRSSSSS������Ls
-h׮��e���۶m���
-
-z����'�T��|�v�R.jਮ_��aÆ:�^
-e˖���~��ځ8�FS�bŒ%K(P@�������vP*��￟>}J:�}��ڵk�t�v �������ϴ<===--M���{��M�F�w)rYPP�+����h8��ŋoݺE�4@����m۶M�(�R�{�nLL�˃r���Ԏ������
 k�M�v��i��l@�






jG
�\�B
-�.H@�4�.H@�4�.H@�4�.H@�4�.H@�4(��h4��QX�J�13 �����
oo����o޼9w�NOOk۶����������]�Z�ѣG�:u*w��8�aX
�T�R:tX�bEBBB�)�s͎3���KF����E����KII��ʤI��6e�A/66v�̙5j��������^���3bbb�jժ��h�o�n�����5M�ڵM�5$[��-,X�������m���P�v$�m2%�5ێ� �6�\(ج�](٩Rx���D������(�x�s���
�
M>6�q&%%}��W���E�uuu���}��7Ǎ!ߗ�r%(�$��trQll�""""��6{X�~���}��APP��pRk̆�0<!D�R�����췟S���1��͛O�:U�(غu�J�(�v�%\2*�����0K����^�zU�)�����R�J��)�Y�|��M�6�!�n�Z�b�
-�~��f���l�wﶩ�,�jؑN�&S2X��X
-�(`�ȕlV�.��T�h�ر]�tQ;
-�`�Ν�_�
-��s��hS5���A	�~�1dyf���^�����{4��ƍ�+*�i��r��p���tS�Nm޼���r��_�
�E����0@Q�F
�v��j���J�,�r��۷ok����������І
ڵw#�̀|��SRRn߾�nݺJ�*	!��������~N�w����1��ٔ�o���Tn���
�u���M)<�%&&V�PA:\�۷/>>>!!��_�Y���B�
-���:�.&&��������ݻ��DEE999yzz�����RlY;_�p�޽=z!�իgS��j�#��M�d�����lT�p���d�rD$��-�&�^���hS���j��|r�h�d6�44��L�W�>����ׯ�{��V�MHH�t������ׯ��e�]���!�p8�8��tN���<x���ϫ���d��N��ٳ~��*T�H�"ӦM��̔�=p�@���}}}=<<4hp��A}��z�B�+gff
-!���+���<y"�pww7oÆ
M�4���uss+W�ܤI�bbb�EiiiK�,�]�������G�&M������Swwwgg�������������7�!^��Ǐ��Ljj����kԨ������Q�F�h�Z������S�H�ɓ'���B�g����fgL��Ը~&�W�.��9s��8�ڑ�m�]�&�e���/^����rrr2�3����(~�cQ�o[�L%��i��1CB:��[����B�z��5h�@q��E���m�V��?�4��d�!D�ʕ���
k���K��K�J%�B̞=۰ڬY����:X��̞/lj����B���B��)�d�(iG>f�r�Ug�N�H@�[vM@���
-W���$�T-�C�ڠ��9�+�
;
M>6��K�.�b���W��M�I��p8�8�t�.]��ݻw}�J�
#�\]]�_R~���k��&�زe�T"=�t�Җ��ɻH�"ҏ���}��&�V���j[�je�T�����[����o IDAT�_��o�B|��͚5
-��������o��ߴiS)�(�ؽ{wå_�����9F-X�li��Ρ���~��ap;�ծ�6�g���t:�^�9s���`�!D�ΝM����N��VG�p����-�		�l�o	���{O�jժ���!�}�]��\�r��ťL�2��ɖ��ԩ�AO����n��3]�&M��?.�(W����b˖-+�8~���~eb3:_(aԂ��QYմ#��L>%���lT�|��l٩	�|ˮ	h�W���$�T-�C�ڠ��9�+�
;
M>6�ӻu�V�8��,��p��#

���m�c1M@׬Y���󱱱cƌB����4j�HZ�{��gϞMII�u떔��ݻ���}��	!*U�������^�bE''�?��C_�����C��K���W�^-�(Y��m۞>}���t�ĉ�u�
-!&O���_!����.]z��ݔ��'NH	���]Q�V-�a֩SG:
)RD���#�i�?��P�Bk׮}��ɓ'O֬Y���#�X�`�>�Z�j]�x1&&f�ȑB�:u��N�B6g����efL�u��t�U�pa�q�#�ۜ={VQ�x���T�$---  @q��	��l�f���VG�p�����t6��%�jIII�
-�g���\�H___�o��>n�ǏB̚5˨ܴ���������=_>��[h�*U���~��PU�TQ2XK���/�0l�����k-=��R��jڑM�L&%혶&Sn�fU�S9"���]�
-����I�����M�L��/���O��̆��&���}�䉥�-͌L��	̟')�p8�8��ɓ'�E<0[���oڎ��y@@�a��ѣ��ׯBL�6�p��C�
���z��	!�=j�ʭ[��*T�Q��"44�젤'd��� �4�go���!����E���w�}gX(�F]�fM}�N��ݿ_���e4:�
-ٜ
��T��1��=ziiiB�q�\��m��s�'˖-B���z�l��7{��p߶:"����x,�(�#
�M�*
��w�	! �8a�!�ڵkM���tϟ?/R��������S�9�3:�ɜG�Z�aM�N�x�b!D�������'L��cu�f��/�0ۅ�7s��Z��)�d�(iǰ5��6mV��Vw*GD:߲kZ��=>�6U�9�)�i����Qr�ٰ͑��������e�\��ϓ	h8��h�i:%%EZ���i�D���t����֬Y���S�uss3l<11��լYS��\�љ���{�޽����quu������lC�>��#�G���o��V���
-!�>}jX(eK��[�+���T������̌�&_.}����Oa���(�m>,��^���c����{��1�D&N����muD
-w��XQ>G:��R�j���"���ׯ_�h4F�3\Ez
@����v��'sңG���ޅ������������f��{%�c���B	�ս���z뭟~���.l
մ#�L>%���lTn�fU�S9"���K~t�?�Y���!XmP��O���ytv�&���…��vK�h4!DFF�aaFF�����+r�2E��/��b��6\*S��s+?|��p��


>>>���F�~}����M�6�������={VZ*%L-�O@?y���ͭL�2���qqq��������6m*<��F��,̀QV+�`zǎB�k��vm؎��F��5l�P~��I!D�*U���h5N�B�:2%VG�p��ǜ��b5葀Φ���>w��s�̮���.����~SrX��lz�N��ӧ�b�ʕ+V�B���K�`��1{�P�j/J��)TS�n2K�(lG>��,<^S���N�H@�[vM@+���'1ղ3�
�~�ɑ���ٰ���c3ZڨQ#!��ݻ����t����$�+�w*d�"')#$��p��
p,YN@K�
{��Yzz��g�L+w��I���g�	�ߺ��K�-׫WOJ�IOm>}��ٰk֬)�X�z��q���Sq��Q���C�J�V�B�)S�R�Z"=c!,,̰p�ڵ"�X�Zb��`��̌I�OOO�Ը����jժ	!>��S��j׆�(�mt:�O?�$�hӦ���~aM>��l�#��{-ZTq��=i��F7��ҜCG:��OZzʓY�G�������ң��t�zқ�T����`TSj��M���>��nݺұ����
-+S��|���^�t��P
em��F���x��mڬ�w*GD:߲kZ��=>�Y���!XmP��O��̆��&��҅
-!������k��
!���{�B��ҳͮ�IJ�4��_�
�%�	h�M�v��&׭[7�ʛ6mBfdd$''�*UJ�c�K�k��ʕ+!V�\��o:��W_]�z��۷���RRR�]�ڠA�E�	!
-,�lٲ{���<yRz��D:ц��H���ǏK婩�o���"  `ժUw���j�IIIW�\	

�_[Ho�+\�pXX�ӧO�>}��w�*THd�-sVKl�
��V��1�;t���7�ƙax���w��	�T�����_�r�]�cu��dffV�VM��8;;�(QB�BB��Ɵ��auDVw��5$$$66�ҥK�j�2��ҜCG:��I:>>������)**ʰBTT��������74Ӧ�?��dz			�˗BԪU��_MHHHLL�>�*T0z�Pff�T_Q�lYӔ�����1:_(a�%]d!T�,o2�H��#�Q�M�U�N�H@�[vM@+���'1�ղ6�
�~�ɑ���ٰ���c3ZW�ti!D�
�����ŋ���۷oK�\�v��bŊmݺ5:::::z˖-�m%2�]NRz$��p��
p,YN@���W�ܹ�a�ǏKgk��7n�(�0|�i����B__��t�q��	�Zm���M��MI�𻻻!*U�d�˽{�j׮m�e�NJJJ�ƍM�K�P�se�dfaL[��,3cݻw7mY߸�R�J�9s�0l��
���mI;��oJW���͎E�����c͚5��yvKs	�l�'	���P!D�6mL�H/2��ô�7n���Y:�2=�EFF��п�֐�W+!�ܹs-
���FfB��VY=�(�"k�J���#Qގ|<���7�麖v*GD:߲kZ��
-\g�O�M��o
-�`�_K�|�1������ٰ���k��…fcpuu]�b�a���T�1�F5jdx����	h8��hK��Ϟ=�ׯ���_�B��oXYʯ5j�H�bfffݺu�=z��ԸN��Ru��|<ؽ{�%JH/�Z��	��gi�څV�^�@�^^^���F����o���j�k׮mժ���������W``��ѣO�<�����2�|�}��ի����[q�ΕM���0mA�����~�n������B�'���(Y�d�v�/_.=MۈL׆A��6��_�.]���ƚ.5d6��o�ɔ�=233'O�\�H��80!!��qKs	�l�'	h��m۶��ٶm��v��2MM�4��A@�A�ŋ3f̨V�������g``����_�xav8�=ruuuvv����A��:!F�y��Ԧ.��.ۛL��v��1[�p�*ߩ	�|��	h��+p]Nm�&|S>K�Z*�̓ON�u�f#LJ&?X�Kcbb�̙S�N�EA!!!ׯ_7]=))i��ف���~``��ٳ����v�IJGH��|������|}}#""���Ԏ����-T�P����Վ%�Y�f���~����6�-Z�
-
-�7o�ځ8�����>��޽{j�!���<عs�ځ ��ڵkРAqqqj�!M�6����ғ0
��v����V�\)�(W��ڱ�/^H/t2d�ڱ�<�E��
xyyI��ӧ����8�B�v������D�4�7
 _�
-��뜝�˔)ӿ�)S��K�+P�@pp��ի��5$�
����t�C����p�H8#�B<`$�
vA`$�
vA`$�
vA`$�
vA`$�
vA`$�
v�v,==���Q;
-)66V�����LN��ŋj�؆4@�=~��\�rjG
�Qu��E�����DN��y��j�؀4@u�ڵq��jG
uddd4o޼]�v���Ԏ���K���V�ZݺuK�(80�Cl@ �
-,X�`A���:֭[��ٳY�f�������U�lY�� ��B�6������6l�g@	h�6;w�}���I��xّ�l����̙ӿ����c
^v<�����/]���?�����g�}ֽ{�r�ʩ��P��ѣǎ����p�

(5o޼v��ըQC�@����"������O�:�v ���h@��?�<88�^�zj8���|��Ν;��߯v �#�h���֫W�e˖j8���s�ΦM��mۦv ���h��/���bŊ�:uR;��p4 ��Çk֬Y�z�F�Q;��p4 gɒ%


}��Q;��,z��Ŋ+&N����v,��!

X���_���<X�@�D0/!!a�ҥ&LpwwW;�!���

uvv		Q;�Q���HIIY�p�q㼼�ԎpT$�
3��’���{�=�
	h�Xzz��F����v,�#

ۺu�Ç'L��v �c#

����̹s�6���?��l߾�F�y�w[�l��h�w�.�R�\9ww�R�Ju���̙3V[�h4�Fayll�̙3kԨ������]�z�3f���(�E���]�~�͛7��1d)//�jժ}���ϟ?��vz���N�:�*U������_<x�����׵����ԢE������������ֶm�W_}�����ۻZ�j�G�>uꔥݼy�T�R���>���!ht:��1�H\\���oDDDPP�ڱ�hѢEPPмy��x���㏽z��y�f@@@N�y�ƍ��@�V���֭[!V�^=r�H??����W^yEa��trrھ}{׮]eZ��2��7-�r�J�6m����j�*Uj����+W�ڋ����0@��a�(Q�ľ}��U���A�w�k׮�ݻgff�]j5�l6C7n�߿�",,l���FK>|عs�ӧO˴l4�k׮5k���ÇK�.7n���^~�

��y�����/��B�
-*H�x�������ݻ��
-!�.]*e��
6���RRR����
fff~��G9@RRR�N����jԨ�o߾������_��f͚QQQ�:uJJJ�ڈN���t<��΋-�Tǐ��߿��;����gyt�:�>}zfff�֭ϝ;�����ɓ�[�6i���Z2���\�R�ϪU�����u������%K�\�r��۷�ZmbbbdddhhhÆ
M[���~��њ5k�>����Z
�����
-!"""�t:��y��S�NU;
-�����t��U�G�9))��w����wvv��t�z�BfffJ�233�}����r||�k��&���/ڶm+�h߾�L$������E>`KW�F�K�,BT�\9>>�(�J�*	!�.]���'O�!��ݕD�0��:(�����!=zdydJ�2u��e!D�z�4h ��x�����P!�믿���c%��?�X�b���[�nU�ˏ;�
��o޼yݺu�X��a�
�-[��ɓ��!����_{��K�.m۶M��u��K�.�.]z���Z���^�p�bʔ)������5�m֨�BJ�f�Ν;��|�Ԭa/�|򉾂M���f�w�5�ʖ-+�

�����ƥ�7t��ѣG����l�"��5k��'�����͚5���۹sgϞ=s<T�������>l�ԋS�N�ݻW�uW���f�!�̙3333322fΜ���a�___�����۸q���t!�_|Q�D	���.j׮�$r�oϻt��iӦ���+(��ѣ�'
-!��Y+��j���
-Pީ�ڞ1cF�b�ʗ/߻w�7���e�#�������{zz��ݻG�E�ٰa��cLΟ?/�hժ��֚5k����w��:d?6��
-	h��|���m۶�Q��Q��_ݮ];�[w۴i3z��W�nܸq�ƍ׮]�2eJ�ƍ�v���#��z��2�6mڴ`���s��>3���~~~���)"��&O��/^|Æ

4X�xq��!Զ�ի���ޱcG//�[�nmݺ���AAAٿ!z�֭111ݺu���)P���A�bcc�nݪ� ͧ44��������/�ͨ^B$�
!��믿~����ӧ�.�n�5��_�+W��O?�5kV͚5gΜi��
6�ݻW�����u�q�iӦ�
-!֭[��[o)	��Y{F������Mו
-���6�������}���H� = ["�œ��iXM����n�N�M�6ݳgOll��˗����_�ܹs�����%�~p�Сҏ�F��h4�O���ٳgJZ۾}���σ��/\����^6$�
!�X�p��o�]�~}�E�6-���{���V�}�����A��ѣ��_1{��…�:ujÆ
��V�^=`����̕+W���/KC1CzG�C�LI�Ry:�.%%eӦMiii]�t�믿�P�jU��U��/���F�)?}�Tؘ(�svv�R�ʘ1c~��!��o��?>""BѴiS��7�xC��EDDHO�������J�ر�M��?޴iS�f��Gׯ_߾}��iӔ�2jԨ/^̙3g�ԩO�<y��w��=����M�4�裏fϞ-��2eJ||�a�%K��9R��}��7#G���@,�ڵ�b֬Y����剉�R0R�������3{�l�V;f�K7qg!��V�REnXSJ�J��L�_?~�8;�ȼ=R��w��B�O>�Dʛ[ս{��������͛K�m�<���j�G�7*""B�@@���7o>u�T��^
-Ç�[��i��k�M�6	!322���K�*%�رc�����7n���t���������u�̙#��h4+W�T����ʗ//��U�֯��������^�V-!D�
-����j+W�,�0U�������e�Z
-�K�.�����K�,B+Vl�֭������[�l)Z��b�ҥJ�/	
-
-Z�|��+WRRR���O�8���o!�T�bu��������899EEE�GEE999���$$$�t����7�|S�jժ;w�h�ڤ��+W����6l��l��W��h4<z���H	h W���R!

H���_WWם;w�.2��|�����駟���7
-!����>}jڈ���E��B���]�~ݰ/Sf۔��lyddd@@�i�


���2]�mM�=���������W�t�R�%L+����(����ڰaCӚ�5�j���Y���"'''�*�4�FBCC�mڴ1]Ժuk!��ի��ݻW�vm%6���_!���~��w����x�/���bŊ�;wVX�ر��э5�С�TҧO��u�>y�d̘1��׫WOz��I�&�{��j���vU�r�.̘1�Z�j���������ӧO�p�t;�MZ�hѭ[���رc�*\�jժ/^���===��^�z}����%nnn�={v```�<<<gϞ���<�3gΌ?�z�����%J��֭ۑ#G�u림#�C6��44l�0���
-!J�(q��ɵk׶j����������+00p���'O�����ﾻp��������=��it��� ����|}}#""���ԎD�-����͛�v ���<yR�L��+W0@�X��~��M�6����~����@����׾���^{�o߾j��4o�|���B�ѣG���oj�� 

��+&&�믿�8q����ڱ�G#F���tZ��y��j�� 

��kŊ��
,� IDAT�C�Q; o"

�|*11qѢE&LpwwW; o"

�|j͚5�fԨQj�Y$�
�i�څ�7���K�X�<�4���>>>~���j�e$�
��ddd̛7/$$���W�X���4�;v<x�`„	j�q$�
���t��>�l�С���ڱy���
��_~�r��O?��v @����_fϞݷo߀��
�>�@>r���3g΄����/p4��>��k׮+VT; _�h�Y/^8p�����̙3�������q
�w@ �:���#J�,�t�Ҥ���>��M�65j�P;. � 

�<�޽{nnnO�>����/~�Ν�cǪ����@����.�HOO�������ܹ�ȑ#�޽�vh@�@y��۷333�?�������[��\�rcǎ}�����
�
/!@�e�N紴4''���X__��	�W�y�ÇM]\\F��a�gg��	�WH@ o���MII1*tqq2dȊ+4�*Q
�
-	h�M���3*qqq<x�U��>��4�{��&�]\\z��E��M$�
�7ݻw���M����KϞ=��œ��r��ț�w@������c����u�e.j�����SSS]]]۴iF��}�

������t]�vݵk�������w@��Ԁ
��ݫvp`qqq���(V��ڱ@˗/�ݻ��Q�k$�
�K*111((hذajG�f͚!C����|kԨQ���jG
�ߑ�/�������C�(�:u����vP�|�v��ȣ�>�#

��� 

��� 

��� 

��� 

��� 

��/;�F��h����-Z���/%%��*�&M�ڔƀ��w�R�:t�bŊ���fcccgΜY�F
ooooo��իϘ1#&&F_�V�Z�f�����n߾]��Ԯ]۴_C2�կ_��ͦ-˰4��c������v�d%%%}��W���E�uuu���}��7Ǎam�@�!

���ر�ٳg/^�ضm��:K�.�v��6�޽�w��1c�T�Z��ٳ�K�\�R�z�O?��…������/^�={v�5�\�"�1b�b�ڵ���Y�F_!#""����aÆ���e��:�����n޼Y�V����9r�ٳg���qqq�Ν[�lY���m	`7$�
�+WJ�Y�j��:iii�ǏWҚN���t)))�o�^�n]�J����ڵk���3�BRRR�N����jԨ�o߾������_��f͚QQQ�:uJJJB������������3l��ݻ��ឞ�}��5�א��<x0`�!ĢE���H9�1X�j[kJ~%%%u���ڵko�������޽��j.]��|�r�x����;"##�;V�^�
�8q�ҥKf��m���_ݽ{��f���_��A����իW��ɲeˤE�W��q�F�ʕ�;֦Mooo//�V�Z=z�R�J7n����o����={����\�n�a��֭����ٳ���Oֆ\�xq)�|��լ��52S����o�o���ڵk�+W>s�̀
J�,������U�j�ѣG�<y2ۃr	h��C�w�С�G��o����/]\\>���ω������'�!���'��ܹS��'�x{{�����jJ��;�n�:���:�NJ�f��F=f���:����@?���b�̙Y����4�c��N�������{zz��ݻG�E�ٰa��#�*U;v��۷.\hk�7B\�~]�Q��iӦ�5�����
6�R�ʭ[��9"�>|����R�JÆ
m�ޣG�&N�(�hݺ��c�'�թ�i���7��+�+ ����#�n�ӭ[7�
-4(66v�֭f+��'E��?~TT�M�.\X/�'����3�Y�H!Dll��D��Wz��?Ç�)=)�Z�x�
64h�`���Yk'�Lu6+���9�6�#

��o�Сҏ�F��h4���Q�p�Y�f%%%I�+���s!�����B�5}}}�%pww�����bccw�����6p��,֐�������o�@���A�T+�Y2�`��B����Pm%`_$��\%}+��
9����B��M�J����:�.""����fW				ܱc�������G�
-!�x�
����@!ġC�LkJ�RI�"E�v횜��y��͛7'''w��E�Q:t:]JJʦM���Һt���_e�[)������R���ĉ94 ��H@����Ca�q�d��;�e9;;/Y�D1n�8��$&&~��B��m�J%]�vB̚5+11Ѩ��ٳ�����I���������g���Z�v̘1��'^�S���Z�@�;wB̝;7--ͦ
��G�U...nnn$�
9+!!a�ƍNNNQQQ������rrrڸq�QvX�y��:u����o_������ׯ�S��ŋ���ǎ+->|x���###�~��$&&&%%<x���ߎ���P���S����˗/�̙?���lٲ͚5������ʕ+GDD���f�5y6Mu�kv����.]����M�4ٿLL�V��s��ҥKs`�@�"

�"E�<{�L�(y��͛���Z�j`Xвe˸��͛7[Z��/�pss��TzĄ���믿>hР�W��*Uj�޽�GIxyy�ٳ'  ௿�jݺ������W˖-��므��ݻw{zz5�OI6Lz8��~
��������BL�<��Ç25m���R��Z�`�n�����O


'O�l۶m�…���˔)���ﻺ��X�"�vB�me˖��Ԏ��HO~п�аa��_�gV���Ǐ/߾��Gɒ%۵k�|��˗/שS�pi�ʕ/\�0cƌjժyzzzzzN�>�…�+W6mm��������΃V08EZ�hѭ[���X���vb�Tg�f7P�j�.^�8gΜ:u��������)S&$$���ˣF��ZG�=hx���������v  Z�h4o�<�1�k׮���ڲe���C*Y��ܹs
�v �w@��f͚gϞU;
-��H@�-((�ʕ+qqqj@�d��f%�`$���V�vm��G��`_$������ݴi�={��y��2�C�Ѐ
-:t���/�dff�`G$�
����������W;��H@*���oӦMXX�ځvDPLj#v��}��}�
�4��:T�Zu���j�	h@�f„	k׮}���ڱvAPM�>}*W�<m�4�
�4�''��s熅�]�pA�X��GPS�֭�y��Çgdd���H@*

�s��…��a$�
�-Zt����~��s�Ԏ�I$�
�
:�g����}�5u6lB�	{ɦL�����*Pki�V[\�Ž���J���j�Z�=�n+�
-Vъ 6"��HH����͛$FE����ur�ɓ�{U�yx�쐐���F���E�!����Ϟ��K�,9t��Y�����7ҝ�K$)(`�MMMtG�}����ѣGnj��w߭Z���8}���MIIɉ'��"***�������q����NOO���
-h�����k���o�����}HH�q����=ڰa�޽{�����ٳgc4�	4@2k֬�����0�1c�������������#F�8{�l`` ݉��������/�����N����Nw���҂��<==[[[����>�@

��DGGϘ1cܸq���tg
�A�֭[�Ǐ���&�\�v->>��Ϗ�P�_���sƞ={�}�ݱc�^�z��80X\�r���o�ȑ���IIIqqq��
�%���FLLLhhhPPП�Iwਮyܸq&&&qqq�F��;(�
�(��۷GDD���DGG�&�z�1c�����{��?���Fw(8P@�]
-
-
-�7o޵k׊+�͛���Fw" �b�'��݃���������\0�(��a�ܹ!!!%%%'O���֦;�c"��СC�7o���y���O�>��k��
-,̀�^���W�������=�;�Kpss[�`A@@@AA��;�>�+��pssKII���vww?}�4�q�?ioo���uppX�p�믿���ciiIw.�P@�&&&�/_^�f��o����Bw"��ALL�����<s����☘sss�s
�`��?a0���7n�HJJ���{�.݉��jmm���qppX�fMxx��G�6l�`hhHw.\P@�?^^^���666~~~���;�-|>�ƍVVV_��ܹs����������"�
�E������m޼��?<~����������ɓ���_moo_�|��ŋ544��f@�W��>���immuppظqcGGݡ����QQQ666�������G�V�X��h�����IHH���^�~�����۷�N�������w����_DFF��l�s
�``0zzz~~~�ׯ
-�t��W���*22���rϞ=�ׯ��add$�Ţ;��� ������n���p����N�JEEEdd�����l�������eee�s
t�`�`0���+..

}뭷F�q��M�C
@O*++�����k�֭YYY��᨞
��B

0Ш��GEE���;88���͞=�����P�JKK,X@��˾}������Õ���� 
-h���������.]���uss[�~}SSݡ�E������ܾ}��ɓ����f�RP�wq���.ٸq�222��[�Z[[oڴ����
-䕗���윛�{�ԩ��Ԡ� T�Џ�0��\�paqq��~cnn�q�F��}\vv��ٳ���
-
-
-Ο?�֭�� �Aw.��`PPRR���(,,\�~}LL���}LL�@ �;tv����� ������ě7o�
-���D���#""rss?���5k�6��_mmm�;B5���ۛ���������׳1e��1u�T��Ǐg03gΤ^���,X����FEE���bƌ������`<u�v���n����}����&M2d���2��vqqY�hQrr����ƨ�(7776��f�]]]��꫆���"����_wQ��)�<���.�guw6�=r���~�M�9�
(�#��"���uuu����֭[ӦM���PQQ����;w�7^���?b��b�3
���ׯ_�믿jhh,[�lѢE���t���8|������d�KNN^�z��˗�L���矏5�}PAA
��
-�/^�0a!d�Ν������FFF�������‰'���e�L���7���wW)������b���nݒ�Ɯ���'���t:jaaq��EGGǮ�����߿����5�<���Ӥ��7\����o<p�@XX��s:
����#B>���B��������}�̙"��1��A�a4� �����?TTT�\�r˖-&&&������t�\�i�>>>:::qqq��}&����}��'��e˖���=~����>#����P�3!���g�޽%%%���>>>"��/����.�;���-((�֭[fff۷o/**
-�---��ٱ��>>>��7mڴ��77�.455577���_Æ
+))�6m��{�ȑ���ē������\��]���r�w޼y���mٟ"c��۷S;v����իW�D�	&ܹs���s��cǎ�������u�>�@��~'''%%������l�
@/7nܪU��N1H�9s��ח�d���ݻwO��Էm<>244d2�o��!���D"��H��p!���2�jjj211!�lڴiҤI��)S��8��Ç�EEEy>s��~�K����������hB���cSS�������C�Bbbb�F����?�x�Kx�ky�.���t&��%����<�h�ϑg���,BȈ#���ܿ��	***������
�f@QVV�w�ށ���\]]gϞ���Hw.�
H,������[[[S��uqq��aaa[�l�r�۶m311���<~�8u�رc������۶m�1����!+W��p႖��Sg�J�O�:��w��QB�ڵk


�;���ӄ�5k�PQ%�l��5k$'t��?***~��ǯ�Y�{�_�^��2P�3o޼E���M����&��������~<�
-h�&�9gΜ۷o��Nj����@WW�;v����
` ��'N�pwwvqq���?p������#$''�;w��竫��{�nBHTT�H$��舊�RPP8x𠖖��qBCCG����Nٴi�������U<==���L�?k��ݻ��7�xC�h������c�v= 9���C�.Y�����j�_�<��\7�TVV~�駄j��H(���|������̙3k�,==��vZ��1�W_}e```kk;gΜÇ�����������N�8QVV��;�|��w������T/���������������;v�x��מw�_~�e��ɒY�'N\�hQnn��Ç>����r��ѣG�3�������2N;r�����������>o����H��ӓqΓ'O!���]Qo��j͚5zzz6l����'�
^TKkll|���Q�F���O=8�<�;�����������{�566;vL����z���
-
-b�X���ǎ{��w��	��
-hx:CC�+V����޽������'N���?�	\ ���v�z^�p�믿���cee�b�Q�y�mڴ����믿^�v��aâ��������Ν��###��<��ȑ#��ᄐ}���������*��wR/��c��*\w�R��kkke|4�����u=D��nJ����ڵky<5}���s-r���f����˧.T"����Λ7�z�p�B��u��cǞ9s���1++k�֭VVVw�����/{<*�A(�
@ee���Ф����4SS�w�y���|ŊyyytG�����bcc���-ZT\\caa�2c���t���ɓ��:�PX]]]^^��T_i���˖-#�|��7:::����z�Ν;���D"�����y�gK����VWW���_yP�/]�$��ыW�\�z��I��T,�p8'O����_8�lr��#�[[[�9���6cƌ����Yw��MII!��;���moo/�SRR���SL&���i����ϟ'�P_
`�C

r���ؽ{wMM��?����������q�F��,@'���111vvv˗//..ްa��g轌���ׯ[�nժU\.���>z�[-ZTWW�����_|��7���+W655I�!��n�!Oj1���x�Tq�\�\w2g�BȚ5k�.�����	!k׮��Ђ�������dFGGB�.]��!e�熿���~��o�
-��/��Y�2��(�A���$���z>�A]�
��222�,Y������1��7nН^ĸq�V�ZEw�����EGG���kkk�Y������F~�mG�!�p8���>�OM�>y�q����������vj�����%�[���`0�o+
-d IDAT�.B��5008v�XMMMMM�ѣG���	!111�/D�@���N177߱cGqq�P(��x999���>>>b������֖�����_577������{xxB���ZZZ���aڴi2�7~������;�S�
-������?5yF�}���MMM���
-
-
-%%%��KJJ455����=Ç߶m[NNNkkkSSSRRҘ1c!NNN��)|�/���8p`̘1�o�FEE����
-�
-����BMs���ݰaÓ'Ozv���\UUU����Q{>L144���~� ��l޼Y���ի�eee�������ݰ�@�����]���B��Ӆt%c�Ǐ{zz�~cvv���yף������ϼ�����%��_Ƶ�y���,yΤ��kii���˙���8K�8qb�l&L ��ܹS� 
-
-
-�?,�'*�SX�^���ZXXXbbb^^^hh�#G���]QQAw:�����eii���?z�hŊ��s�,YRSS�����oR{�~�mooo.��x�bo1b�$1���Μ9B�Pz�PVVNHH��o8����������o��㕔�^fdSSӛ7o�ٳ�7�044TTTd�XgѢE7oޤ�qtt�w��W_}��⢮������pV�^}��=j^�l������/�^�
�*000$$���qɒ%=;�SQ�lH?(m������BRSS###]]]��Ԕ��LMMCBBCBBz!'Ў!�ӥ
��dgg?~����<����3g���ݹ����~�z���K���111[�lQQQY�|�|�b��з`4�$''������܄�WW�5k�XYY͜9�رc��
���խ\����r����ׯ/**���D��
-h�yL&sܸq{�쩬�<|��������
�D@WQQiiiy�ԩ-[�FDDH��NP@�+���|������K�.���.]�TKK���/&&������*++�������x��֭[������Q=Ȇz�ɤJ�G�;v�����/����		9r�H}}=�

�UZZ�`�kk�����{���䄇����	�Ы���BBB�=��r:����d�##����_~��ѣGt�������p[[۴���'OfffΚ5KA
�>
���z���9r�����͛~~~۷o���������LHHhoo�;#^yyy�����ι��'O�LKK
-
-B����(�������gTTTVVVzzzXX����Ǐocc��G]�x���ӝ����ٳg;99�?�֭[AAA��\�
-h�C��ݣ����Ӌ��?������ӧ���M�<y˖-���t������AAA���.11��͛���t���P@@_dii�t��K�.577_�t���u߾}���C�	?q�Dcc#�
`�HMM
-
-���&�$&&&$$����
-` P�;�,���~~~T���s���.���1�̱c�N�0!00��ё��_%''�^�����S�L��|||�N0�`4�����~�iBBBMM͑#G��ͣ���������Ν{�С��
-�3@�q��e???������8��=4�?l6{ڴi���kaaaee�O?�����b�
-��8q������G������M�0�����ݻǏwss�;���%8�322�5k֬Y����SRR���/]��{�n�#F����cǎ9r���*�I
�fb���ٳ6l�u���o��c�ggg�C
p�XLw�������_�|9111;;[UUu�ȑcǎ;v�#�����W>|���ty��b�ɓ'���۬��y��X���ښ�P�
-hફ��^����������K�ў�����E�|
���q���M�6DDD|���VVVt�DP@� RSSs��5�����TWW9r�������ȑ#555���ݺukӦM�/���${�o߮��KG����~�ȑ�7}�ᇟ~����ݡ�0H���ݸq#))�ƍiiiB��������5�����Ғ��DCC���A{{�S�:88����r���޾gϞ�7VVV.]���O>144�;� ��ttt���޾}�ƍ���Ovv�������}}}���|}}������cf̘q��ٮ����u�������T=���uǎ������˖-[�d���
ݡ5��UTT���QetZZZGG���������g@@~���ӧOϞ=�����~����#sssZR�$>���?>y�$22r�ҥzzzt��2�x���t���y�fmm���15-������]AA���G ��鵴�H�d0#G�LJJ�+�mmmJJJ���x���ˏ?���޾|��ŋkhh�f<�
4�����222�e������ˍ������������������_�����nkk��QVV���,X@c���믿v��q��鮇��m۶1�̕+WΟ?��f�~B�
4�***JIIIMMMKKKOOonn�����������&�
�.!!a„	"�H�GQQ������И�����ɓ'���ݾ}���C����!::z˖-***˗/���X,�9
�;(�
zFyy��ݸq��������_������tg��HdddTSSC�d2��Ǐ�p���:9{�����;::�xuuu����m۴��V�^��{難�Н����utt���ޖ���*Y<�������	�Zdd���ۅB!!DQQq������t���s��M�>����z�`0.\�p���={�2d���s��QVV�7$<
-h�W���9===---55555���P]]��ݝZ<�����ޞ�d������#GR۪���������F��|��I����VRRb��l6�ZpCUU��x ?������j������������Ԝ���
��������ꪥ�EwL�,--KJJ�������=Jw�����'M�DM��$--��ӳ�#
�C

@���������,j��;w����899Q�u8;;s8,t=�/�ؼys{{��S��M�FwB�r��ĉ��ں~���<u��'N�^
-h�>G�<���쬬���EEE;;;��vrr9r���
�1�����utt��Ԭ��QRR�;�z��	��>Sƽ{�8N/����{���ݻw�ݻw�Ν�w�>x��bgg���F�����jjjJwL�mb��������[[[�{)���	�=k֬���	���b�:=ߏ�djjjB�l�����%u���˸}����?���D2N{���������4@?����߿�_���kjj����G;;;;;;ӝ�� �����������������hnn�v677K�;��O����i���Z���544������I�lii�s{{{SS�3?��b�X,6�����f�%��~


---����������Cm��쌌�ѣG���B���TUU;::Z[[�2��b������X[[���-]���`<3�(�
�7�X\TT���E�ב��������ttt��h'''Tҽ��������������(//o�_����o��Y6���ޖ�bijjR�T�LU̒Z��KyTTT2�L9�onnnkk���]_J�s�m�&��*]�3�L�H$���Դ�����LLL,,,����hmmmll�f��	}
-h�
���^���w���UVV������NNN���
-
-
-t���jkk���KJJ������JKK�\neeeeeeuu�d���ΐ!C����i��_�����{�ϗ���@QQ����뫫��\nUUUee%5-����ndd4d�CCC��655�6X,�WO�`��D�Yҙ��999999|>_WW���P}����������a��������������Ǐ�����������|B���Ґ!C���MMM����z������������@EE��+��ZZZ*++����\nEE���r��?�J���J�4mmmSSS�O������������NWW����
-h�����������|>��f������;88888P�j�������P�3��������k��Fͺ��:����t
-�����?������Btuu�2���^�Jkkk�`�@

�Q__���C���6���:::ttt�����������֎�����= %%�����ʪ�G�ΣG�rss���rrr������������l������+C_���X���ǏE"���	�
����Y__��
-h�V[[[ii�t%}���'O�B����2ZRL[YY��D����m۶���{�W����졋�����;w����gff���655)++:��������ɉ��XYY��P>�_A~~>�_rvv�������D"���>��qvv������rtt�=4<���������������������.�K��׷���4qxȐ!�>iҤ�/***������(��I���v��������Դ�������6WWW�p���WTT|�O�~������dfffeeedd�����ձX,www///ooo///;;;�AwR�~	4����������\��xY,���������O�|mmm�mEEŎ��3f|��w������x��ɉ��W�^MII������Xl
d+..N�RUU���=z�hwwwL��
-hx%�B��Ǐ�����G��+-������@ �D�������?�������n�"�x{{�3f���x�������7o^�v�ʕ+YYYT=f�///�������#���
-<x �+]TT$
-�n�J���6l������r�qqqqqq���Ç���5jԫxF"@MM���ׯ^����x��}==�7�|3((�7�`�Xt��P@�D"Qii�s�,Y"�4jՎ���ϙ3'99�̙3)))h�.�?��D���S�N
-
-z�u�
<��';v,,,���������B!�mff:u�ԑ#Gb
���OHH8s�̹s窫�'M�4w��7�|SYY��h�{�3�z_QQ�ɔ.�UTT[ZZ�L���FSS����̙3?��S'''�HSSS
-
-
-
-
-�������ݻ������BCC.\��V
`�S�;!�P+A��l�acc3{��y��
6L,����8q���f���h�z��`0t�x�z���ѣ���W^^����޼y�����w����{�
�g���>���uʔ)_|�E|||}}��]�JJJ�n�joo�޽�g�Θ1CII��=�U����ȴ�;���,X���z����:;;������ӝ�X����ʅ����Y����Н��QEm����c�T�WqQ=��l/^���JKK���O���kUUUZb�4�!�Ν���ػw���;�q^н�/d;u�Ԓ%Kttt~����C�Ҙ�7a	�+bcc�M�6����T��������///6����G
-�7n6l��������a�~������(x<���󵴴���W�\)]}J֩`�Kr�СC


���***���˗/oll�͙3��`���H���...�wޑ1f'EEEӧOg������-��x]��.���ꫯ��b����Ə��Y�Em����K�)**ʾ����L&��b���JGjhh`��L&S����{%�5�������,++�#Fܼy��8�E����oL&s�Νt��b�P��o<�/����1c�t=4v�X�P(���9s���_~�E2�S��D���]9;;766�����ZB�ѣG�q~��7B���eCC�����Ԙ��I�,}����^w${HH��~��p֬Y��u��I'����	!ӧOf�g^#����#""����߿Ow���'�1�\yy���ַ�~Kw��شi!��f��Ĕ�����&%%Q��
!���{���r�\.w��ݚ������^�o����q��������B������]�Н;wB��̎?^]]��񒒒���	!+V��ιp�!d�С���
-
-
-׮]�n̮�/_N����z�jSSӕ+W,,,��(;���6!d���uuu� %%%88X�EIv����;w�����)�޾}�bll,��������	!III���k�]GG��ɓ=<<����������
�`�r�Jgg玎������!$66��!WWWB�޽{�w�ڵ�2l�0�krr2u�����b����ڇ�1�r��u靅���;;;ɞE�B8��~B��.c̮���Ϝ9#����K�Qv;;;BȔ)S���;�y�(�O�>-���p„	�'=z����'O�g^c_���c�?���� �B�sss

]�b�A�C]]���s�\�N����Z[[������%;���


���x<��qkk���
-!D,+((��}^�g�X��*VRR
-��6�ǣ�[B���ƭ[������+UUU�@P__O�e&�������J�(;ƅBCC�\.������ɓTY�]jg]]����d�3�abbb@@����ݻw	!�F�JNN>s�LPP�3C*((Ⱦ�>bƌ���t
x��B�_UUU�u{�;�}&RO�MF7*y�!!�ɓ'uuuB�������\�ؽ�";Ƹq㊋�ϝ;�l�2�,]�T�a��gy������ܻw/!!!99999�����7ߔ'�s}�LMM����N
�ʡ��YXX���ҝ�!��g�C��������K�<{���]�Z鎎�gggBȭ[����J��.\X__�nݺU�Vq�܏>�HƘ]���k���ׯK�$&&J���jjj�'O�駟���!�z����sW�ZEټy�O?�D���$U��ϼ�>"77��Ғ��
-h��̙3������Lw��#�|��'[�n-++���3f� ����B�-[v���������}��}��'�C�V�HHH�DԞŋB�N��k׮��b>�/���w�����C���o������w�]�l���űc�N�:�ݘ]M�:��t��������W�FFFJ� ;ƤI����[ZZ������B��g��"�=�2e����_�u��)SS�w�yGΐϼƾ ++�ʕ+�f͢;���rKH􀆆���p�HDw�X,
-��ƍ{�_�����G��z(  @ ���,��{fΜ���b�Y��⪪*j�丸8��ÇB

���������NK�w:_�U5(����/�a�y�/�����wAFHy��^MMMnnn'N�;@o�+��A.))I]]}�ҥ}����\]]UUUY,V@@��3g�C���6l�������nܸQҜv�:��)++		��Օ<�����0s�LSSS%%%555gg�O>��Ν;��]___��"���ۛ2k�,cv���éS��X,]]�?�����k��b\�r%$$DOOOMM���a�ڵ<O�Eu��ʾ����|B���Vccc�d�+y��.MMM���666���tg
�
q_z"<f���g�5j�������4۽{�|��g����tg����ԲgϞ����;@o���W�?>%%�ѣGNNN�ƏH�����~������ӝ����(///;;�����0x���>�������,x�������������`���^�|y���NNNt�y)�`۶m���[�lٹs�����Iw(�ރ�UUյk���溺�>��ٳt��ަ��:q�ĝ;w���	���۷���}��������AXX�@6���5�
��*,,\�nݡC�lll�ΝfjjJw(�g���޽{�9���###?��c�!�M:�IDATC
�4�u���߳g�ÇǏ?w��iӦ���ҝ����9rd߾}��龾���ϟ5k�ͦ;�P@@� ��]��k׮S�N1�����O�<yʔ)���tG�A-;;�ܹs�Ν�qㆮ�nXX�������'���~�ɓ'/^<s�̅���=<<�L�2e�OOO&�Iw:x<���ש���ÇVVVS�N�:u�1c����NЇ�����������qqqgΜ),,���������������TTT�; (---III���W�^MMMmkk����6mZPP������(�0&&&R�`II	�����3f�ȑ#===555��REEEZZZRRҵk�RSS���9N@@�����1c��ס�������j�oܸ����agg������������NwF�jkk�����ZVV�����pƌC��zzztg�OP@�@��ؘ�������|B����������СC9���5����|~nnnNNNVVVnnnFFFQQ���������������������
-�I
�+�0�477߽{7###333333++���AYY������������������FCC���ê����򲳳srr������D"���1�_���x� @OA

�Ziiivv�������233srrZZZ!���6]ѝ�������Dž]<y������p$��9���.ݑ
,������kwY[[Ka�X��������433377���PUU�;�����XZZ��ѣǏ������������>~�X(2��?E@�ЛP@<[CCCaaaqq1�u���SEgyy�P($����2���������H__���������P__
��jnn�r�\.�����������_ԟ5�Y]]��������������������������v(�
^JeeeYYYYYYii)�˭������������������iC���������ՕlH�6�#�ZZZ�����ꨯ�
����ښ����jɭ���466�j�!C�������P����6�W2��x�����&���������U�%%%6�����b�X,����������ImSs{utt!jjj2^J��������-������D]N[[���---T�,�Mm477744H��f����������b"3@���~<ORFS�m�ޖڐl�X���@�����uob�X���L&SSS�z�b�����fK�;5钮YYY����kP@]�����N��x<�@�̡�ZYz��bf��JJJ������WB��00���W4���h%���՚IEND�B`�
\ No newline at end of file
+
IHDR(�{l�QbKGD������� IDATx���g\���g�e�H�"��AQ4 *Ɔ�Q���HD����%Jω���1&*�bC���b#��5TD�HQa)�����0�컁e,����f�y�qfvn�1�B!
P%
���C�
*��T����
����


UUUuuu������\.���������Pm�BaEE��љL������N�:1�LCCC===�ell�d2���ttttuu�b~�}C�
��޽{WPPPTTT\\\RRRVVV^^^VV&�������IW[[[___������f\.���F�+��n.�������������9�������������-��Tv^
�c`�q�WiiinnnNNNnnn~~~qqqaaaaaaUU�@WW���Zt�off&����T[[��ؘ�b���hkkw��I�0


�޽�p8���


��յ������۷e�S^^^RR���	!��������ήs��NNN���]�vuvv������c�r�YYY������Ϟ=�����ͭ��&�hii988899���;88��ۋ~033�;x�x<^II����Caaannnii)���������ٹG��z��ի���#��
@9(<�)6�}�֭{��=x� 333++�����d���u��MtN������Q�.U����N���deeB:u����ѫW/OO�>}��ټ�+�E}}��{�n�ϳg����s�^����{��ٳgOWW���8����ѣG>|���G�233KKKutt���������ݿ�c�d(<����p�ƍ.\�x��͛\.��Ʀ�����>>>~����!�ۯ���7nܸq��͛w���p8���C�1bĈ#�u�Fw@�(<h���u�̙�/^�r�ݻwݺu���6l��������:$��������K�.������Ν;�1��������Ԕ��;mD ܼy3))))));;��Ғ:,����ܹ3���
+�Ͽs�u)==���2d���AAA����@�nݺ�{���Ǐ�z��k׮'N�0aB���544莦�޽{w�̙cǎ�>}����_�~S�N


����;��������}�����>x���>�0aB�^���������t�ұcǎ9RSS3nܸ9s�=ZSS��h������6lHLL����5k���ݡ����;�k׮��T[[�/��r޼y�	@�Px��K�.�]��ܹs}��]�`��ɓ���������������uuu����E�p���hW�\��onݺ5t����nԨQt'�����رcÆ
�_�

]�z5n�P���R%%%���C�522�v�Zjj*��D__�…999[�n=s挛�ۯ��������np��E�m�i``�aÆ��`��@�TWW�\�r���={�����ӧ݉��x(������>�ꫯ��²��Pu�
CC�
6����zzz�
ڷo݉��x(�ŋ'N|��E||��Lw����`BT�������x�}�݆
���ׯ_�����)�=
+���:t���Mbb���#�q�5(<(III�}��������Q{�
+Ŕ��{yyY[[�={��А�8�������ѣG��[�nm���%��
��Y�f	�'N�A��`0���駟�t��b�z��'ކ��FEE���GOOOOO�O�>�֭khh��-�Nj�����
������"go2#Q���%E��}��کS'����lٲ��J�ɓ'3��={
+j�@ �ٳ'���޳�0`���۶mKHHP��Ԝ�v��q

��W������Y���>L5����裏��ۇ
��r%���r%>�W��dFj�F ���4���ݽ��R(���P������ڳg!��Ҳ��TJ�m <<��ʊ�	�A�
�oo�iӦ���ck������ʂ����@B���/�`͚5��N�:�ڵ�͛7o޼ٹs���!d�ڵ�\�~=!��� &&�������ڵk�Ǐ��7��DmMwǎ�;;�Ç���r8�k׮yyyB"##�6{��%�899q�\.����D9v����@EE����ƍ�~�j���rrr!�/_n�)R���Ν
���%�R�zxxB����NJ��%����Gb��{�&�l߾��G��&3��������+W���i�n�DCƎK���߶l�B			i�@$Η�͛7��ۛ�I��\ �̚5�����d���{jkkutt�!B�PCC���k]]ݺ����Rsss�X����������i�zzz���o޼���h��<�ɌD��\__���hjj�>���!L&���R͊�����uuu�~>|H]%�綑��8}�t������SP��@^�_�677o��CDt�O�n�����j�����|�@ D����릦����L&���XXX�jp���������R��tT(<�e``���;�S����+!�����O�<I�޽��Q����ɭқDT)�������Bn޼)����Ydd�g�~���������׿d��6���	!x�2��PxȫW�^���Ϟ=�;�����p������o߾}�v��݋/}�Ԍ3!�/���ߊ�����_�>a��z����+11���N4𫯾"�������������?}�tǎ��\�pa˖-={����O.\عs�
6���_�{n�o�vtt�n�e��.u���`mm�bŊ6�����������7ݷ:���^b�\.wĈ���Mf$�P8s�L��5,��eT^^nggGIII���߿�ҹsg6�-�gUnnn���o��
�%
+���MMM_�~�6���(���n͚5:::���QQQ�U.��n�:j}}��C��8qB���TQQ1o�<GGG��0��.\�0y�d;;;&�������x��{��	��iӦB
$j,���N�>]f�*�������6�PKx��8NϞ=���s���vr�7�Zaaa�~�BBB�����Ё��P���ׇ�dɒ����,�rl6{ĈB�0==]OO��8��
:���ؙ3gr8����kiaG��
+�l��+WPu��j��3f�ݻw۶m�G�Ƌ�Ujjj�~����SSS����PFHHHZZ������뗞�NwhM|>�ڵ�F�4hЍ7����N�Px(��?�}�v���<{��o�ҝZAFFƇ~�|��+W;v/�h-(<�gaaq�ܹ={��:u�{��۶m����*^�~={��A�ݽ{w���xp@+B�
�"cƌO�<��O����nݺmݺ�����\��������������������WϞ=��n�8]�V����
6�ٳ���h�…_|񅉉	ݡ@����u��%$$���-^�x֬Y���t�PO(<Zٛ7o6o�L��?~��Y�F����3��HeeeBB®]�n޼ٻw�K����*��@%8Α#Gbcc���gΜܣG�s��RSS���w��QB�ԩSgϞ���Kw.��
+����޹sg||��ׯ���Ə?q��?�7.��s��٤���'O��l//�Y�f�����Um	�@[���׮]KJJJJJ���upp7n���ÇbaaAw:��������.�;w���~РAAAA&Lprr�;���@[{��ARRҙ3gn߾���{��9|��aÆ
<��Ԕ�t�ӧO�����Կ��������xذa�ƍD�@/����MOO�p��իWoܸ���lll���ׯ_?__߁���ѝ�����KKK�s�Ν;w�߿���;cc�Q�F���������
+�v�իWiii7o޼y����]SS���������ٻwo��={��~��ř���������۷�={&
+mll�����������㣫�KwLh�@����=zt�ƍ[�nݼy����<OCC��ٙ*B\]]����v�jffFwX�������������=z���������!������������vpp�;,Ȁg��;ZZZ�{���־v�ZVV������o[[����gff�޽�ŋ��bllLU ���NNN������� ��x%%%EEE�J#''�ŋ\.����ӣG�^�z�3�*�����N
���v'%%%***==�{������iӴ���p���������������ϯ������R��������������������&��6�SSSSVVV^^���۲�)///((x��UAAAII	��'�0kkk'''gggQA���lkk�6Q
@uPx�|>������w���������=v�X�^y^]]]XXXXX���K�BqqqII	u����;�Ɔ��������,KOO���@[[�S�N�������f&&&���rkjjD���솆�w��q8���������������ں�:�E�Onn����'�|":Qckkۨ�����~�����ǖ-[�?>nܸ��HU�N�����@D�644TUU������VWWs�������z�C�"
++**$��d2�ov�ԩ��444���c�X���L&���HGGGt���W���'NL�6m�ȑ			�@������ٱc�ƍ���CBB.\طo_�C��+W����'99��ؘ�8�B(<�Q^^�y���~����2,,l�ҥ...t����G�������Ϟ=kooOwPm���hݺu�v�s��Y�x���#ݡ蔟����___����ݻ�T�@�y����?�|��!�̟?��ܜ�P�Byy��q㲳�O�:���Cwh}
+<,�v�ƍ��ww���Եk׾x�b�ʕ�:DLMMϟ?������w��Y��@�C�
�Z)))���>>>999qqq999�σ���~rrr@@@PPPBB�q����P	>�߷o���@�w�ĉ�����=Rhkk8p`��!!!6l�;�&-������m۶���999�ƍۼy�*^ʡ�����-,,�.]ZZZ��/����

+�VSYY�iӦm۶������9r�O�>t��"##����̙SRR���o+��r�VPVV�믿nٲ���f�ܹ���]�v�;T���g����L�6��f���j��h��������ܹSKKk�…��ͳ���;���~���q�u�v��I333����Px()++�_~IHH033���o��Œ������js���Z
(����


={��|��u�?��CE��ݯ^�������MwP
+y	�B���͍���J}}}���9GG�k׮���80##��8�����C �^��d2�����|�ȑx�9@G��@������WWי3g��ۧ��]�v-  /�h{ԫ����<HwP� �R�?�����l���ǎ�ݻ7ݡ�w�����ﷳ���O�������
��Px4��ի5k��޽������?_�p���ݡ�ƺu����-ZTXX��O
+��WPP�z��={����.Z�諯�����;Habb2{�슊
+�%*t'�� ��Ǐ�Y�&!!���"**j֬Y���t�iBCCMLL����l��C��js�v/��]FF��?�|��)���_���,��P /�����S��=%z)���_�z�����ɓ��PT�����˗���>�裢�"��@�Px�{������{zzBΟ?��퀀

�;$���|>����6h��-���Z�K9��Ү^����Gw.h)��涶�x�9@��{<�PQQ��ￗ��O�>}�ҥ�z��;�����)S�\�r%11q̘1t�
�@�
jN�R�7gΜE�u�҅�P�*\.7,,�ȑ#qqq!!!t�
�������z��٪U�>����hѢ�����‚�P�Z������������O_�|�W�����УG��N����v�ҥ���/^�\�����!FKK���:((�ʕ+8��`��߿�C�
��v��M�6-[�,""B�N�1��cNJ
+�Çg0ӦM��ܻwoٲe���300`�X..._�uaa�����S��DֺJ�������w(�����XZZ���,X����v�Babb�رc���������>���C������ۗ�`<xPbd0}��m��!en��͝����t�---���8�fk;�!!�IOO7n���޽��={����N��$�544N�:ը��ǏE
>|HKZ5�g�&���r���j^�x���O9z��h`tt4!��ں���"qe311������;6hn��uU�ill�����?��f�7������%63fLuu5�l˖-�???�3;b�BȖ-[d�R�V��r�>�<�̻��_ee��$4B�
�@ �8qbРA�//�'N��|�C5&~�P__���9z�h*p��K�,!�PoY�hQ�'U'N��������;K�Y�v-!��ޞ:���ʢ�ڞ��"j���~���w����TVV�<y��ɉ2l�0�7:ƕ9\�*:&�ҥ�xشC�!<�����իK�,��ѡ�Q�I�&B:u�]PP��rcbbLLL!�&M����l�����(X^^ujET�47�ͅ��+7�<����q㤏@#б544�ٳ��Ã��MKK�;Q��RBttt�r�\KKKB���N177oW�m:��ׯ��������۷tgi


�3ٖ,Y������E�5k���nܸA��Օ�L��C�u���ݝ��H鰹I߽{��Ȉ���H
9�<!D__?33�Q���L�Ѕ�!�3V�XѨ�?�@			�@zH�[��#�� ϼ�>}Zz��������DGG;99ijjΘ1�Ν;��
+u��p�ϟoii���)��_���E�U�|>uh5u�T�]���<����=z�һwo�PHT��-PΣG�>������24]��[�(׮]�n�1c!���Q�6��Մkkkyr�9\�u�1!!����PWW�\�R��W�^M�8q"�+UK�\�Rb�+WB>���׋/R�H�,(���ܹ3!��ŋ���F�V��23�3�2���������|Ŋ���L&sƌ*��:��E�%%%�������x�ٞ={!������һ�~��bƌ�ͨ��7o�,
+cbb!�������F~~������cVV-
��HʭE"��9����t��������1c�ȓS���Ԉ|>�G���_����sSw�888P�RO�nn����$�8;;S�
+�2�s�Ή���矄'''�˷-<�l�J�(3�<����(=]Px@GR\\nhh�������VG��ٝ:uJtǪP(ܻw/u���r�\.uds��1�]52t�P�K����455Y,u�pYY����Р�O�j���l���������m?u�+�k��˗/544!���2?|���ؘ�`ȼQ�Z*"�R�uU4�!������B���Z"v�u��OS���U�V5ZPS�N%����rλ�6��b��Qfy�]�u_tA�
Cvv��3X,����+���p����%R�4���ߨ'�_,.�+q����m�#�iӦ��7=B�{�n̘1���m|s+��k���%&&&o޼����Ç666����NΜ2���r����|���!dӦMB���҂�C�I��˳K$�23�3�&&&2����w�n�7n������}tt��i�6@}嗗�7����������������F�$S�]Q?�|�2<<�bjj���Kj�@ pvv&��&�ܹs�ggg�kB@i


�f����ڹsg[N��Iѵ�r��


MMM�Ί����Z^�v���k�ܹ�B��7.��*>�}�!VVVT!!����#BH�Ν�_�Ԋ"�Ua���F�V��ef�g�=<<��
�
+h�Ο?O=!��͍��rH9�p8ݺuspp022����iW�_���¨_��`�#~,��@ X�t)���6�hs+��о IDAT��k�P(�����������l�Q���WӖ'O����#�|��r�r��#�x<WWWB�D`���r�Cr�O�N���#�q���)�}�}��
+��{�&��/�O)mm�-Qf��r��>�|�a����r��ߟޗrH9X�`
!dϞ=���!d�ҥ�v������������-��!Es���`0�����TRs+��k������ݛ�R���~���ޓ���E�ꫯ�G9���F#���B����/<�ݻG=N�ȑ#���py�K�r���m۶�O���p$�i��pD���J���G�
+hG��rP�(h'/�h�8�����gϞ|>����s������v5w�\B��ɓEo:���kԦ��@CCC�Mg�*��������%��+��>}����-zymm���!d͚5�f�S
+���-��h�B�j�y<�Vz������˯^���7�H|�`PP!���$&&������m޼������C%��h+n���d�8q��yo������555���]�t�^�q��]�������r;;;"������B:w�,�6��Uqq���.���9s&!���O�#G�$�lٲ��������7Nկ6o����ZTVVF�&���?���
+���'z�i��3�SxP��˹�6�p���R
+����-���*�q�M���K��z&/E�=RH_>���֭[���#ʓ�����߿i���,����E��R�����ϟӝ�$~mO�6�2h� ��@@�@z���
+u%
+###E��8.�(ROOO�f���\��Jk����ZD=6��LJ��5���-00P|r�������]m�aCCC׮]����mnn������_7��c�@������oaa���eaa��� 庲
B����̻�~�[qsŘ�#ʓ�ѼSOU&����/�:����--��R
�1�Pֳ�T���x�ڵqqq.���/�����Ǐ����={�����8�Y�~�ҥK�LfRR��.Jzz����eˢ��h� ��h����z��C�.]�t޼y�ͣty�򥿿YY�ٳg���:���_�W�������?L
\�l١C�?~L�t@;Цnݺ��?�>}���~���s���7"�l6{ܸqO�<III8p �qZ�{���֭�;����6��������DFFN�>��d�
+�jjj�N�z���Ç�_�-�AwPsB�011�_�~����:>|���!}}������ࠠ�]�v�@�h��VCC���׭[��ѣ�c��������
+@--���Xss�9s�}�vٲet'P(<��q8�;vlڴ���x�������ݻ7ݡ��`0���lmm/^\\\�i�&�K
@i(<�5���o޼���~�������#""��������SS�ٳg���;w��@�B�
����hݺu�v���Ҋ���ꫯ,--��"3f�011	f�ه��ӣ;@��Z
@K=y���>t萙�YdddXX^�
���͛cǎuvv>uꔹ�9�q:*\�
+ʻy�f@@�������w�ؑ������0�ђ�*����\���ի�>������8�l������r�o�Z��ཅ��������ۿ�W�^%%%=y�$44��bѝ@%z��q��u---���L�㴚�����B�͛7=zDK���CP���(���������700P(�8q�֭[


x��=[[�˗/;99
2$==��8�c�Ν��O��m@(�2o���@.���111nnn3gδ��KKKKOO����abbr�ܹ��5����t�i�����{�B���	!{���r�t�u��d������quu��op��}�:+�s)��Ђ��|����憆�&L���oԠ��v��VVVZZ���}��
:�S�N,���eٲe����O�^�:c�{{{&�iff6jԨs��5���w���Œ��mllbbb!���~����������˛�%XJڦ�������KNN�>}zPPP��"P����7o������/����x���'����?~��������y�8N�J����;�� ����2��6|�y��v /!@3���V�Xann������Gw����{'N�
��ۗ���7�4i��NR ���4����WVV��(��`$%%5��	��$''{{{����W4-��<!�����H��f���(��?&�l޼Y(RՂ���x��o���ۋ�N��Q�F�[��F�,����J��s�
�QT����
(�HPPPn```bb�bŊׯ_ӝ�uP������Wuuujjj�Ν	!˖-o`ggw�ԩ��jj��;���.--�p8׮]���"�DFFRmƌs�̙��
+.�[TT�i�&B���W�I����������_}�!��ظѐA�)�V��к���544����|>�YVTT����b��:�����bihh��,[�L�H�J����*��������h�o�=�;����x���3�����좣�����NԚ�#�'N��?~�ңG�ǎ�z��+W����B�u�F�z�…��kkk�tttM:##����˗�XZZ*�V��������d2?��S.�KwŬZ��2m�4ѐ��`Bȏ?�(���&q
lZ6(�b7��JI/<m�͵�v�4�@��ƍ?����ӧ]\\�/_>m�4mmm�C�2��l6�ݩS'j��655��ѩ��5(//711������p455	!�>�ځB�L&��=t�����%�NE�����'	�B�Q`��0�@�PZj2C��R��p��ĉ�����1CCC���E(������;wn�ȑ����Ϗ5�������Ԫ���S__�t
$��b7�m�F����
���������
�/����y��uRRRVVVhh��U�kt�AF��|>�/��@�������_~�evvvmm�P(|��ĞE�:ݜ�h�҇_2C�����]�p�޽{~~~o߾�;�\RSSsss	!�F��f=j�(BHnnnjj���n�ǐCK�o��Iᩚ_��BPx����rxzz������Qo"W��r����~�|�2!���IJ{wwwB�͛7%�8&�PWV�Y����UGG�r���6N+3$��j󒒒�>������8�I��SjMk��.�����z�-����!D�Qr�K�`�P��k�@
���FGGw�ڕ�`L�2�Ν;t'j#�~O�۵Ev��E���ޱcG^^�é�����޾}��
�B���!���/++c�ه��W���eQ(�̐�j��������ߧ;�4l6[GG��`4}N]AA��������*rs�x'r�آ_---	!���Ts�j�h��ᄐ����������'O:88`�P
+��KEEŊ+����L�3233�NԦ�#�F��l�
��,X ��7k׮m4044�����O+=$�����A����\�z��,�ڲe!���O��-[�l*�8]��\�E�Μ9��V����t��&r֬Y������}������H###==������|�р:x����ٳMLL������rss5�8�&O�lgg�d2uuu���/^|��=�P���֭[׭[7��������Gty����<>S(����6jjjƎ���w��I��H���I9p���O8@����~���
���755����kjjZ�𨨨�7o���#��T��zsӒ2�]�v���1�L����?�˴��`���j��
+ׯ_�s�N��`����盛���m��xo���/��2..n۶m�gϦ;@{�%�	tX�?^�fMBB�����իgϞm``@w(5����}�v33��?��:�Hw"�v
��z�~���իO�>�����/�h�ƚ5klll/^����M�6����dB�
�V�B�ɓ'�����ӽ�����Ǝ�#ZDDD���͚5���|׮]��
+�O8
PM_�q�ƍ��
+�nn�;�G>���ӧO'''������t�
��H:������WW�Y�fyxx����ԛ�������w������1�����8��S�:����M�6������s��
�ڵ+ݡ@���,}}��gϊ^��^A�
�!�z�j͚5�w�f0.���/����Ҽz���߿����ٳt�
hk(<:����իW�ٳ���`���,033�;ȅ�f>z��ĉ��7(<:�G�EEE%$$X[[/Y�dΜ9���t��p8��S����>|x�رt�
h;�������իם;wbccsrr"""PutDzzz���!!!AAA���t�
h;x�@�%�R���d��@
P�6����;wnQQ�ʕ+�N�Px�G<���6l���;vlZZ.P'c�ʕ����-b��x�9�Px�/���۷o���)((		����ݻ7ݡ@%����������������jsPo�������������߫���Ν���Lw(P��/N�0������ㆆ�t�
P��^����1o�<+++�C
@۹u��رc�t�r��)���
+:={�lժU�655���322�;��ɓ'�G�������?�jsPK��
�w��	pss�~��������"""Pu����
������~�O���222h	�ZPx��k׮xyy���%$$<y�$44��bѝhfcc���ڵk�aÆ]�zU4�͛7Ç�7o.R�
�@���”�__�A����'''gffN�2���.>�����ѣ�����#F>x�����tP�xZ����G���#y<�Tܠ� ����������9
��c�X�
+


޲eˈ#����|>!d������tPn.h�;w�>����ҥKÆ
�H�R�����ӧ��7t��D DDD����x<�G
���\�nݢE������h�7n:���FSS�~
g��+W��ҥ�w�}������xT '��f�DU!���X������`JC�
���/2�����|>��ҥ����/_FDD8::n޼y޼y���111NNNt������?x� u����������	��p���Ο?��� ����d���#77W[[{���,077�7$tD����W_}�ܧ,+??��ں-#
�
+e�8qb���|>��ì�.]��?�:���B//�7o�B$~G3�̰��m۶�y4���V
+KJJ�4i�ĪC[[���ר:@i/_�LNN<x0!DKK�Q�������G�ё@y8�
��cǎ��^ܡ�����������@�ܻwo�֭���<O�~--�Q�F�:u��l���8q"88X���믿�e*PW}��پ}��ׯ7l�`ggG���$��x�ӧO����@
8�
 /)�:��$��x<�@```���SSS:b�z�r������ѷo�f�X\.���t����7n�~Z�����͛B������FKK��b���������������������X,
����
/^Lw
+h�2226n�Hw
+5�f��={VTT$
dccCw"�Mbb"����5����q��u��@VUUURRҭ[7���K]��>�~�:���*,,<r���ɓ��nLLL���=<<���?nmm�`0�m���{`�pԿ� �����O�0e��#@{�ݯJQ�b�Xt��v�����`�S(�(<�uw@��^\��B�
*��T��
+P9�r(<@�Px�ʡ��C�
*��T��
+�0��t����Ǔ�����5׏���F���匪�$ZZZ���AAAW�\Q:�������cii���`�����=����ıc�ZYYikk[YY}��LJ
+���Θ1cć�3��W���=z4((���F[[����W�^��ͻ~����d�*�����/���k׮,KOO�W�^�n���<m�^s[}w�t������`0<(���2��}�6
���D����H\��Q�W�q	!<o׮]#G����`2���ƞ��,�q��sR	���ɓ'O���N�.+������e��d��4�����cQˇ�U�9mDCC�ԩS�%�I4~�x6�-޸����?��x̘1���M{���b2�eee���o�RC�[V2g�����߿�9R����C5�{������N�i��Vپ@]:t���X�jn�onx;��mٲ����'qfG�Aٲe���CJ�
+���+�ߖ����Ut���R����h���L�ʪ���ҥ�˕�R�ne~�d�B��"�,Z�H�>�!>z}}}ff��ѣ	!^^^�%Qt�x�����W�.Y�DGG�2l�0�@ j<i�$BH�N����
+
+�\naaaLL���	!dҤIM{���w��A
ܾ};�m�ܲ�9ぁ������?{�����������۷o8p���d�>|8!�����?�,++��������������i� E;<0jn�j�.�������a0��������Q�VD%�<{<����D��in��|��9.��6l!�����?�����r��޽{���֭[}||��6��/���Ui����N��?d���[�q�\KKKB���N177�����Oy4��������\��,��w�B�!�ϟ'����gff6j������O�p�B���������޽[�e%s�Ϝ9C166��ʒҏ�̈́r�����B�>}��6�A�
R����6��ri�х��BV�XѨ�?�@			�@zH�_

+u��~�i��-d9�=v�!��ʪ��H�9�W;ܾdR�UV��GBB!������NzK9����ѣG	!�{�
+��_T��)��u��͕K��E�z�jB�ĉ�_��ؕ+WJl�r�JB�'�|Ҩg6�����������ׯ_kjjjkkWTT(��d���i�!?����~�l&��?��֖r����Q
+��5�A�p�K���ŋ�GGG>�/j���;w�L�x�<
�����P'����v��B�s\�LLL���I�v�}
Ȥ���J>�ߣGBȯ��*����J���Fv���B�0&&����/��]�<��3�K��ED]`���@�ڥK�̕�B�033����ܴ瀀B�֭[��7BH``���6G�;::Bd�ǐ��<!�͛G100۽{��x<�m����h�F�mP-��Ҹ�NNN��s�Ή���矄'''�˷����� '�ΎĜ-Y�r�K�i�8-�:�p��I�WY�B�����[[���Z�-��V�GEEE���,��I�����bihh�٧<�$C�}����IZ��jkk	!���ԯ���T?Mq8���=�۷���!C�B���/}��3��*�L����x���ꠠ ��FFF3g����u"O��)�ၑ�
���\wt�V�"���L�:���?�9���4�
+��Q�J﷛Qb!�9.Rt>D�Ґ	��v�}
Ȅ��Tpp����˗/����N(..���O�0��Ԕbjj:~�x�@ �WAE�����333���d	e��C``���Ε+W���tuu��E��tIII>\�f�ĉ�t�RUU�{�nOOO�O�r�
qhG������T^^N)//ONN��И9sfK��4�
+�QK�<�
+e���RtW>*��3���5��ʪ��FzK��6��@ pvv&�<�~��9B�����'ӥ��˗���SSӗ/_�$�ҋ�ѣG��Ν;S����ĉ�_EOPQhY�9�m�US���~~~D�e!
+���x���/��mP��˥kG'l�qe~ȣфZ�R+�gE���R��'O��3G�D;ܾd��V0m�4WW�ׯ_S��Bjjjnn.!dԨQ��;�5���������������Č;���|���-I��"JJJ"�xyyQ�0�B���5�j�Tppp�"�SS�bK!g3帺��ݻ����֒6����={6!d׮]�=" IDAT]��!-!�+@	-�o7Ւ/\)�R
RRR�Cw�rmp�C(���B���e�T�#� �Q�R4=;;[KKKKK+;;�%I�XD��ݣ�2y��juǤ����e��������ׯ���>]��q�9��:u�Ws�l�hH�^U==���	g<@�v���6����Ҳ�
+�\.��‚�m�6҂��7m��+@�:i�~[�����R�d33����s�N���@&�_eۦ���x...��%��*���QMo.((���P�QRH}�ܹ��ɓ'�$�����㕗�_�z��o���^-�&i������B.�[TT�y�f9_D%����q�SSӍ7���p�\����%��2��ٻw�_~�%##�������͛7Ǐwss���m����h�F�mP��˥eGGi���J�
+�>��NZ��n����R�dss�7>}�������*+++**��_�*��/���m��C(��q(���mٲ�������#GB�l�">�Dr̨�H��ź����UQ�$�
�/"����D_𔪪*��M���WWW˜9?��AUU��t��r6��p�7�ԩ���-��)��Qs[��p%v��
�~GG��aR$�P!%���#�
+�u��e"qBJ�Ns�N|��_��[UU5v�X�!���w��-ϼ��v�}
Ȥ��l�


]�v����yzzB8 �%��@OOO�%�cF��)�G�$�
�/"�����������_���.qB� !!������BKK������?!!A���gG�O�)�_@%LLL����������ٳ�y�222͈�f2�C�ݻ�|��A����jjj������kѢE�����rPx����������\�m���nT����2�ҿ�4W��k�x\Eg��E'>D�/\�ǥ�8qbҤI���,������s���%%%2g�����@&�P�7e�BHbb"�A��/�������%�m����ׯ_׮]�?Nw5��:"-�@�'�>}�h�"B���/�q�=B��a0R>}��j�� ��]%��bQw�4��x@+0229rdjjj�^�����x�G�g{)�pd®Zg<@�Px�ʡ��C�
*��T��
+P9�r(<@�PxtH���tGP
+���ɩG��/>w�\]]�qd@�
�!ݾ}{�̙7o�3f������oTTԝ;w�B!��$@�
�!���/22��ի�_�>p����sTTԇ~hcc���XQQAwF���Ew��p���)S�Н�AII�����V�X��@Cj{QXXhkk���Iw���~�����)�]k?�_uRTT$������)S�L�R__���ӧO�>}z�޽:::C�?~��	����J@a��ɸ�7fddН�B***^�xQPP������kiiIw"��|��k����{��Aw ��?�d�X|����#���;!�0`���t���(##c�ƍt�y��켼��}�����(���ϟ�>}��ɓ���@ ����4i�ĉ����,!�8�/<h����gϞ�>}�tРA���������t璭��z̘1999�.]B��N�z�jժU���������K@@݉@M>|888Gj����…������UUU|���)S�����m�������߿?>>>##���<,,��>�@[8Uu���]�x��͍�8�EEE�V�ڵk����ƍ}}}�N
+��A]]����O�<�������	�ׯ��ཀ£�=~�x۶m(//6lXXX�ĉuuu�Υ����1c����_�t�{��t�
�n߾~�ƍ�3g���O666t'���{�����?�<v�XJJJEEE߾}'O����Hw4Pg(<Z
��KJJںukjjj�Ν���fΜ٥K�s)��:
+
+
+.^����Jw�F(�۷��o����Z�|��%K�L&ݡ�CB��~�r��.]:v��������:y�d###����ӊZA^^^DD�������������^�x�r�ʎXup��I�&���;wUG��`0f̘��ɓ�����~���u�ݡ��������߾}��ׯ/_�ܽ{������92>>�����
+
+������đ#G���<x0""�ŋ�������;w�?�ݎ���k֬��ʲ���߿hhhyy9ݡ�#������ݶmۛ7o<���3g�;;����.�T�
+�(++���rss�:u*!$!!���p�ʕ���tGk���������dwww���ºv�z�ԩ����g�����ҥKt'��GGGgʔ))))%%%QQQ���#G��ҥ˷�~���3��Adž�C1���˖-�ڵ����~��]�|����S�La�XtGk�����[��۷o���tg
%1��>��ɓ'���~~~��ϯ���;tH���s�νz����=iҤ��x77�ѣG9r�����t�!���ÇgΜ�����ŋ����>���\���ɓ�/ްaäI���-ejj�w��3g�?~�[�n)))t'��zt{aa��ӧ���?�����.''��h����A(����������Ν;;v�(..�����ѥϟ?���BBB.\Hwh5�G��u떇�����/_����N�����ѣ>\PP�p����DWWב#G9r���ѝ:ͪ������޽{PP���IZZZfffhh���6��ZS}}��)S\\\v��Awhe���gΜٸq�
���JJJ�N���շ�~���ӳg�v��)$$�����.--�;�w(<$`����p�.]���s��]�ݹT"<<�����ѣ:::tg���`0"""�޽[^^޳g�3g�Нԁ���ȑ#����ϟ�m�6����.�
�/�PSS�v�ZWW�u��M�8�ѣG���{��;��?~|ǎ۶m����;�P�=�^�����~�z����������|���Ν;_�z5r�H__��Ǐ��A����jjj֯_���jժ�?��ŋ[�n�֭ݹT����s������c�>㢸���m��"�"DM0�D��(EA�L�EQ�ƐhI��((��I�k���XcC���P�.����y�}6[fg�ݝ���?�sg��9�rgf�N�>b��cAzggg�k׮����N�0�����B�KK�	&\�|����#G�
+
+�����
���7¼z�j�ʕ7nd�X����3������r����ׯ[YY�2�.>����ȑ#���t��2���3f~+@:q�����>++���.))iƌ�Z��;(D�}�����)))m۶���\�hQEEErrr�:v��u�ر�[�b��Ҽ���Ν���}���v��� �2C����6mz���…333���Ə���E-4�����fͺw�^�I9�����O?�4iR�~��� 00����cǎ��������!��y����3gNYY٪U���㏐��9s�TUU��M�K<�Bafff�N�V�Z5nܸ��Ҕ�ggg��2�ŋ��b�ɸ%stt���=z�����I�!������O>��~ZZZnnn``����<x@w\�-+�����ڵkRRRll�ݻw�����=�ݸq#==}�ҥNNNtǂ��b�233�O����Jw8!�̙���ԩSoݺ��?���w��!11�~�4-%�(,,�ٳgTTT����ݻ�q�Fooo�����_ݩS�)S�����ܰa�7�|3w��U�V�B!3�f�ǍW\\���{�…�����E1������G��ݻ7�ùp�Ž;ڴiCwP��t�ҡC�V�Z�b���/��r˖-.\�d	ݱ �jx�ҥ���ӧO���|��/_��;(�w�x���}���;w�z��#GΞ=ۣG���ْ%K���"""���S�fff���,_���XB�l6{�ԩw��Y�tiVVV``��ի���<�H�e˖�;fff._����t�СtE����_�599��@�1���SSS����M�6�B�����Λ7��Ç_|�Ųe�ڶm�e��HDw\H/�0�r�J�>}f̘]RR2g��CwPFaݺu:t>|8݁ #5k֬�k�Κ5�СCtǂB����NNN�y��A����SPP@wPH��*񨩩ILL�ѣ����իW�n��Z��ӧOw��=o�<&Ӭ��H�>��/��b�ر�~�Bֺu�~������ǧO�>C�}��!�A!]2��|>ժU


yyy����?�t�BwP�e˖-���~�!݁ c���ߎ1b�رw�ޥ;�B-N������/����������	�B��B�a�Ǎ7�{�/��r���ׯ_��9	�­[�N�2���J�53d��l���سg�jWL"�8p 66���������6$$$11�…�aP\P"����DGG���[XX���GEEeggK$�
����ڕT�E��!i���[DDĞ={[�6��۷w��qذa���F��	3�f����ר6^z;�<<EC��u��7�|��W_?~��<2
S���RRR,,,�y睿����p�ב#G�L�t^��A�d2sss5-VWWG�-�(.X__��Lddd}}�Ҁ�mۦ8]����=�8p��ׯ�#Q��ٳ֭[:T$i���5��p�5����N�a��Jvv��ᤩ�?�x��{r�I'�Z/�;w�DFF2��'VWWS\
+'N<��㏶m����eff��b��1jQQQQQQ��Yv���񊋋aaa����
''�5k�ܹs���y󦤤d˖-�z�"���qqq��蘚�ZQQ���+++��҈7����)~~~|>_iC4-���S��uC�!_\��g�r8��+Wj��n�03�a��������Ҹ�C'�G�ց�����݉�/�D�d������g��X��}�޾}��p�݃�L��Q����ѣG��r5*F�Bupp(--�(��<ylll����f�����S���ܹ3l޼��!�K*Һ��hݱc�ȃQ���g��Z,�C8��{�!#��ă�����t��I'����7o�$''�X�~�����5�Bdx��x\�|�s�ζ�����x���e˖���455I��������$777�%����;w�^Z#����ѣUU�j����Q��c�����5m����
 %%E�ܔ�7n�\�{��i�ڟR)�H��Ӣu$Dr����[�����H�a��-i��9���I'�������w�����~����=��R����4{�l&����c��1!!!3gΔ�B����tw���SgggرcQ,++���^�x��rٽ����>�H�b�����OY�����7n(�[\\


r
�D��� ذa�bC4-�H��Ӻu���������OOϑ#Gj���H�a��-���R���I'��]#<�o��p8�����д�L�QRR��[o��ج_�\�n޼	gϞ��H����ssse�۹s'�����|>����$��	��FŸ\.466j�@��khh+++��%ɞ={��ˋX�d�������l�TZ'wj^#���+��8t萦*i8����0C�A.��c��yo����5�͛7�w�noo�����ڐa�F�e�kk�>}�ܽ{��XLLJJ����܃��m^��"::222���
 >>��~�]���Kaa��Ō��"�:v��֭��TԖT�u��������ɉ<r������\�i8�d��0C�A.��c��yo����5��_�x1��1bə7d<�=�x��ɠA�,,,RSS�D����害��wPSS�X���������������S�M����ǏgϞ
���r�>�3�����w�����o޼!9��-�H��Ӻu]�t!�ܫW����&O���R�F3ŀq�!��%x��2��ר:A~��7oo�6m�����o-H'�:����sww�x�"ݱ����8}���t�]@CCC�v�|||����t�����W�X�{ؤI�4*F���b�
+
+���~����7�(���9��B��}���z�j��)yIEZ���@��%%%��VVV��<w��ETE��L1`f�vr���2��*l��Qu��TWW��İ��+W�����H�X�f�6���δ�d�OOO����f͚YYY+V����B����26��f�eu���?GGGM�Gq�'N����FO	�~ܱc����ݟ��T�u������ԶNq���bq����w�N����"�a�4`f�^T�x�l���u��deeYYY���?z���CZ0�ģ��nԨQl6{��՘�6G�.]�O��8]�.��ɓ#88X$566�iӆ�d*�0Q[UBB�>�J1��F���k׮�w���ohh(--��r(�������SZZZee%�ϯ��Z�~=�{���Ba`` ��v%5���1��u�/&_�����#��vrJ#�a�*`f�^j�xUl��Qu�^���z{{�9s�0kD1���ҥKmڴ���t�ݱ���w���'g)����x{{�ѣG�)�w��6m���֪Z�Ҫ=zdee�`0�D*����"""@��R\����x�����'�(
x������J*Ҩ��[W__��,--ϛS�M��s纺��z��Ja��0#o3D#��7^�v��kl��W���C��p87n4�JE�uTؿ���]߾}��͗��������g)�׀���[:E,���
�|�j-��&���0p�@����✜��C�zxx��l������DŇxȡ��X,޻woDD���+��vuu���ػw��5ŀA۶m��OU�T�Q�-�Z�d2����D"`��䱩R]]ݪU�����Ja� q�����y�/y�Lb�5�N0���T���444xՈ��$b�8%%��`̟?_ ��92d������������+;������g�i]�u�lll�<y������0C�'M<2Ǐwtt�ٳ'���$Q6�ׯ_GGG�^�:;;�����L�@ 8s�����A����O-Z$F�y��9��#G��i��믿ֺ��ӧ;99-_�\a"Ӧ�a�B�q���gϞ����ƍt��ғtPVV���t�ȑ�]����(,,�ի׭[�:t�@w,ȸt����#n4�چ
>�쳻w��|#$G'�ؾ}�ƌC���t���zԨQW�^=p�� K;��x���s�ܳg�b֡C������fH��7����������a�B�תU��'O~���޸q#��tt&��Gxxx׮]����j"]����@w�lYZZ~���[�ly��	ݱ �BdX,֦M��-[���4g��XLwD-m�Ƕm�
�믿�����Yz��MAA
�ODz5e�''�����B!�^rrrFFFFF�ԩS�'�!ã'�X�~��i�,X�q�F�EKf���@ 8��@�9�r�3g�ܼys}}=ݱ �B�%&&<xpϞ=������pZ"�o��v�ܹiii+V�`0���={�}�����t��܌3�|~VV݁ �B���Ĝ<y����111���t���4���3f�X�tivvvRR�!Wݢ���_={��;
+d����&N�������"�2}�����+(( ^�Nw8-���X<}���~��СC#G�4�z[�Dr����z��@P����t���cǎ�B!DU�^�~��ע����؆���iA�x���iӦeee������цYi�T^^^[[���oӲ�^�z1�w�y�by�����_��x<^rr���?�á���IPPP�~�233
�j��I�4�Z2�Dr�����XOOO[[ې�����.���ɉ��vww���pww������V|-	�"##e�GFFJg)-�`0�l���רQ��\��X�����ʅ���\.�������Κ5����j����މ'�\�������0����bqBB�����5��Z���l6����`�U���H�Ս7�,��A(W��F�D"Y�h����!�3�����dVVVr��6�if9l����6��VWW��L}}}TT��2�������u��l6�é��m� IDAT��&&�|������)����9sF�ICT5�X�d�\c� /3lذ��Z-�f꯿�������t��"����D"���w��q��QU��CW�\�ԩ�����W��?������@�cìK��?���xt�`�
fooO��~��8�j�>��ü�<''�5k�ܹs���y󦤤d˖-�z���8q�c�SSS+**�|~eeeZZ�������'N��X��������
+�$O�$�MMMW�^
_}����Q�=Lq���T�Q,#
+���ϟ??�|.�{���#F�LV�=���~���I�&�����a���9s�XZZ����{E�0`��I�&~�|>���
6m�...��qr:����I�b���"�ϐ�N�کS'��N��f�#�\�
26�v��������PZZJR��ɓ`ccS\\,7������N�:%�HlP?��8��H��j��튛����J���&)#G����0�zT�)**����������������̙3����w�|�r&��k�.��I�D"���tï���*�H�t�t�v�����X�V�ZM�>�͛7r�G�c}}�ĉ���=<<RSS%Iuu��q�[�j�p�B����5,�V��s��}�����l6�������?q����AFFƻ������p<==���N�<)-�s��~��988XXX�m�v���^��Gs��ܹsp��eìN�`3��F�.��


IIInnn,K1T��Lh�!�0��c�ر�|�r�b�������tnJJ
+�7N:��jkk-,,X,ֳgϞ={�b�,,,^�z���(N1��C"�,[���HΞ={�L��������q��?2�m۶�oHΝ;w�����&��#�ش�4����-����֭[�~y1b�ү�Ç�-v�ȑ=z�Nٱc��"��W�M����YV�t�q��a��N�<YU=b��8���ܹ��ׯ5���X,n۶��ٳ
�:��fN#�|]�����NWZ��`�0�-����������T��U\\


�)�ma�С�q�ƌ�����(�|d��x�k׮
0������RjP,L��2��q>>>#ii�n��d2:Dw �L_��C��X�+V�~�����?��c��VUU�X,KKK�F���jKKK&�YQQ!-��g�
�����Y__���6m�����]�v�~���ׯg̘
rSz��-����$�~��C��)���Ǐ���ϯ��Z�n���)]���RRR����|~uu�ѣG
$�H�n�
+������{��ECCCAAAXX$''Si�ᥤ��jՊ��uͤv����&;���;77W��Y��e'��C`l��������#��jee%�"�v���������ݻwKT'rt{s���Z�C�8�<��@rfϞmee��_�����.������jƌ���X�bE�6m��%K��رc�Sƌ�~��tJǎ
��_~�N9t���eaa!�����J�����-��^)��ԩSC����`��҃
��U��!�
��O�m�v��i1��gϞ���޽{Ю];}�I{���r�w�D�`k	#Mv�������h�@KK<���\.��d2�VVVD�����~�g�Xqqq�.]R,C$�������,N\w��	�H���)��)�!��b***���`��>��I�&Io�3�X����t�o��


ҫ��>ȯ��F��IZ��)CnU�Jn]{��U�w�����WHEDD<{�L�ߓ!,��bEi��0��B�^������
+*���G�����*�e'��C�fl���/��H$��0���窚�Hm��$���͛7
��(MHmmmPPл�+=" ���tbcc8`aa��ʑZ�o��С��Wz��������A��/-4hܿ���ӚVH|q�!�)]<
+���("~q�>}zYY���?��CR�W�^w�����_�z�ȑ#mmm����̙�m�H$�Db���>M,%�m�ލ9277W��a��`3ё&���Iq������+�Lt����gϞp��a*ňgN("�e�Ke�cވ�$��D�8::=z�֭[��ͣ;s��$F$��ƺ��>|�P��"�\]]����һT��?�S�F�r�S�>_�����[�\�;��s��9���Rą.�����x��ŋն¨M�}0��Ql�7�T�Kղp��}�'N�6�
�����x��utt,++#)Fo[[[��K��͛7666666o޼Q��j�"�e�TB�ps��v��8����S��%;v����������r�x�b6�����ND]uu5;v̐+����r����\nVEE���r��E/�o���Dӯ�����٣����[u`` ,\�������v߾}���$Ѿ��{;w�ϟ?_�j����?��#xxxlݺ������������l˖-={��w��#88X϶�8��o��Z����#wbbb***���~��W�¦;��^[�!�Hbbb���y�ڵ������


������bcc
���)--����x�������˨����,�
+�555�ϟ���O��a�����Z��?����^�z��@̊�v1���cݺu��i�…p��=C�4==d��$�����"�r*[��_�P��f*%W��ի�V=~�x�hA���b�Y���k��oѢE���z���`3���j]��{��1���g7K˘�Cze��G]]]DD�ڱZWW7x�`�e"""d��&�g�A���H��2������!r��o߾�����#��.������q��јF�hǎ\.W$r�ݺu�={�(��g��֭�����111666���S�NU�Z7��N����ի��D___�C���	���B�w�}׮];KKˀ��o��Fz���E
+�L������p\\\z�ꕙ�)
+��O�:5r�Hooo�ceeչs�y��]�vM-j��/�����Q9��ff#MպH���?v�ؑ�����|��7B�P��)0�WF�xH$�X���#}`���Mpppbb��t�b{��puue�ٮ��{��U�ZB��R�9�ZJ)�(��J=�-,,\\\���fΜ���O�
+���Ç�Z��<y2݁����wO
+��~���|��ʕ+���ͬ
im������+--�;�rI$�6m�$$$|��Wtǂ�̾}�ƌ��o���G�����߿_�m�Hk:x�՗_~YTTt��A�:�UYYI<|!�0���H�K}B!S4t�����'&&>���X�As�S�N}��w�V��ܹ�NBZ{�䉗��Q��.::��ŋ���t�B�����\�i���4+�x����ɓ�����$]�����cOOO��@-]xx8�����-!��rpp���8|�������5+�X�`ACC���ۛ�,��x c���Э[7L<B���C�N�0a֬Y���t�bڴO<���mۖ��N��
+ы��UWW�V�����B�dݺu��믿�;Ӧe�Q__?mڴaÆ�;V�
!�<}�T"�`⁌A�~�JJJ�={Fw !��n899-_�<==����;�e�hѢ����7�6��'O�^j��A߾}Y,֙3g�!�ҙɓ'���%%%�S���M����oܸqɒ%�5�x<~���`�_;;��ݻ��V!��	��\�n]~~��Ç��Ti�xH$���ķ�~{ƌ�i����NNNt�@߾}ϝ;Gw!��.���;&L���υB!ݱ�$�����_�p!##�deT^�z���Hw��>}�����z���@B!]Z�lYee�?�@w &I�ģ��)99���>z뭷����ׯ���ףG�Dr���A!�t���s����~�mcc#ݱ�������ϟ/]�TO� ����a⁌��������K��!�ұ����gff���� 񨫫[�r�Z�n����v^�~mooOw�O�=0�@!d~\\\f͚�|�r|���4H<֮]�d2�ϟ��h���R+dl���0�@!d��Ν��ظc��11T�������y������5 ���
+������ʧO��B!�c...S�LY�f�H$�;S¦X.55���r֬Yz�i
/�B�&,,��d�޽��ٹ����������ѣ;v�;4��@ ���߼y����)����*s��IOO?|�p\\ݱ���/������͟?ѢE�	i���?11��>�;Ԣ�?�ҥK%%%EEEw��}��50�L�!�,,,޼y�fS��!�WO�<���!��6<<����Ç�x�����tb2(}ؾ}�P(LJJ�w4Hk


���tG�Z�˗/ϛ7��d��b�D��;t�YB���ӳo߾gΜ��`e}��	!���'����_�p��wߥ;Ӡ��H�v��)S��-�L p8��@-�̙3}}}���p8�_F��L�0A�,�3z�hC����ׯ_HH��͛��d�O<~�����J<�a�0�@ƀ��,Y�D���$44��!!�H>\�yH6��7x �VBBBNN>W�"��GZZZttt۶m

ҚP(ċX�17n\�N�X,��t�PصkWZBB�boo?d��ÇH$���i		!�/����Ow �AM�q�֭?��sƌ��i
�x #�d2W�X�x�*���3�q��)n����111�ă�iqvv����zP�&��駟���l�h�v�b�H$����C����[�7T|BF(**���Fv
+��>|8�˥+$�L����Ϝ9S^^Nw &�,��D�v튏�g0iA(^j���ʕ+�aI`�Xaaa4ƃR��������t%���i	!���蘝�Mw &�,�8s�̓'OƏo�h�v�oxx��>}�DDDH�$���<2Z����@�������ߧ1�L�������:Dw &�,�عsgXXX�v�
�q��3Ȩ�^�Zz҃��c⁐����ӪU+��g�رx@AH#111�.]z��1݁;����;t��l5	L&���!�			3f���&-�Ol������hii���Gw �Ne�q��麺�Q�F2��)���o���x#���}�֭�!���ѣ�����G�^��!cccӿ���\�1v*������P///CF��C$���"dڷo���ݻw�;��޽{�����	���!�DGG�<y�����QSygnn.^ge*Z`�QXX�v�Z��@�5662��Ǐ��S������p;5-���p���ZMH�S�+���III�������;��W���������hG���`0X,V��Ԫ���j���ڷo���Hw HUUU:پp;5-���������
+]m�HW���Μ9Cw FM����<gg�=z8�5�Ӣ�x��PSSS[[۶m[�AT�۷o̘1��
�Sr�����8��@��v;E:ѫW�����0j��x������g�X�i��f����ggg�:2	�u �={�,,,�Dtb��$�$??�O�>��i
�B!��ի�������@���ģ�������gZ,,,�A
+!�Bt	

���ë�H(I<��󭭭�u�f�h��lll�����@!�j�X,V���/_�Lw �KI�QPP���oK�7�L���&!�B4
+		�y�&�Q/%�GQQ��o�m�PPs�������B!�P�TZZJw�K>��D�������D����B!�����^�z���S�1R��������h�i
/�B!��W�N�Oz�"�x=ձcG:�A��3!�B�rwwwvv�u�݁)%�������#-� �a�B!D�v��ݽ{��(��|�q��m<�a�lmm�R+�B!zy{{?~���(��|���ѣ6m��
+j''���Z��@!�j�<<<��rU��'O�xzz�
+j�/^�B!�P����*��ӧO=<<h	5���Kcc�7o����H$������������
		ILL�p�\������hwwwww������l�D"W!��`0���B�PqzsJ*E�-$��զX��z�܃�M�ֶm[KKKkk됐�9s�\�t�z�4��J��.�f����F�u����j	���T�^��;�CR����uss{��wg͚UXX��f��{����V���?��`0�w﮸v�#
����Gll�ٳg�֯
+�q��c��i�S�9���3�k׮�.A�����Ӌ�������x�����_W=�L�� #�!
+Y,�޽{%��;����dggˍ^���EDD�����룢�����������S:k۶m�ӛY�$H�m!�D�6���$���ț��g��d���̙3��W�ھ�Y��$���H;�ƍ���m,Æ
����-Le`���������?������];y�L&377W�*�RZ��8Tձ$q�,<Iϓ��9O�4	֭['�"lmm
��`p�ܦ�&���&O��4������I�1�� �u��hhh�;c��!K�gFr�C!��p��e�1���������Ӛ5k�ܹ���޼ySRR�e˖^�zI����
���cjjjEE�ϯ��LKKsrr���8�:��-???>�/7�9%u�*u*��S�0`t���ĉ���<���,###,,�b+��K�,�ESS�իW���
�o߾��+M<�ϟ���0w�\Uj����������ϟ?���@����b��0��][[��r���C����wbi>Ce@ʖ��x��Ń��M��q��cՆ��R)*��; &&F:��U�]�vě�Ϟ=+�5d�عsgs�@q����cT�A$�85���C�1F��7o���7o�
���ׯ
����tb Ƴ�=~�8888����;y�$�����*..���
�S�NI'G�Ν;��͛��.�i�淅b�r���$�������Z�B��Կ[(N���kkk�a�)&|>���
6m�...<O���X������
 ''��B}`�����ŋ�}����v��>z��\.���(�C*�6l����Pٜ��E"1eժU0u�Ԥ�$X�d	1](�G�i���L���9"9���PRRBw ��_�x466�-@���������˗t��dee
@rr2�s���'X�`
񫛬���H���ꫯ`ٲe<�<�%IPl�v��J?9{6dގ=��������ӧw����˗���Ғ�T]�vMNN�����)S`���b�XZF,o߾]:���ˊt�z���͹u�ց���^�***"����ޯ_?8s�1�ʕ+uuu�۷����:$��3��"�H755��1�W�A�&&����#Ψ>��XAA
�9R�\�R
��VG�TYY�u�V����$A�-��w(�{��<yrVVVqq�H$Ң����ׯ_�0a����t�c�~�����w�_b��f*b���L}`��������Ç�������S�***�����{��Ͽq���ɓ
 22R�J��C��o7g�'O�>
"�(??�������@Z��|Kkz�g"Ӆ����N���/_�u�5G�.]�����0�9�L�_�S���
����S���={��ˋXVq�մ$�~�b[��]�,�����z�ˊ����ĉ���CU��Դ�$ӕ�o.�C�w�������bYZZVWWK$���jKKK&�YQQ�X�D��J�t�j4��,Ycƌ�=z4|���N^&<<\�#��qH�cek��"�J7g�%�H.^��ڵ#f
@AA�D"4hO�������:�
9�sDr�����tb�����hݺuUU�Q 3fLǎ?~�y�f]�4-�i�����Çoܸ�r��#F������m߾�[�n�5�ƀ�byxx���?�"M���O"�h���������<l�0�UL��3�d/��ԤI�X,��Çkjj����ȑ#L&s�ĉZ�)���bŊV�Zi���q�i���͙8�q��9�PH\XE�1ҫ�A~~>����BH����,��� 
+�J�Ps$$$0��(�x~�����w�����G|J�{#Z@@�t���k�.���� IDATpww���EvY�J6�-딛���HYY���
 ""�J+�f�� d'��|`��+1Fu�C�t�X����t�o��F�(��O�dc!��ҦM⣦�x�����%IZZ��PT�v�e?~<{�lpvv~��1���WD�c��F�O�)����g6.\�@<�j׮]�t�Μ������@ppp3�@}���0�� �C\�w��A�1F�:�A�S��b
2A���x���z��	��R���Ӊ2�Ǝ۾}�gϞedd���zI� նE;��
�ڷo�s�N8w�\3�RD�*L<\H������H�ӧO߿
$}�q!�����K�i=��
$,,�����&n������6��rOOϴ����蚚�E�5�6)�:֐Tm��I�S�Nӥ�5������"k�}5��3���Ew FI6��٤m۶��Ɔ�(�x�*�8EGGDz�2�b'N�[[[�&+�H<����Eq�պ��m�X��,��������>0T�:I
+�����i�&ى6l�A�Q�����1���<�V���ڵk�3X���OL�t`��|WWW������j�9eeel6��f�d��hұjk���Ԃ��,�Hrrr���eg�o��:t��M����G�q)�;�
󑗗r��5WF5V�H9;;�]��޽{|>������T�R�m�NNNiii���|>���j���$�ϓ~
+�����C�NJ6�-T�T��� �bŊ��š��@����C���߿?�Vh�d��w{{�����ϟ?�|���vvv���E�c`B����|rwK$���
+&�I�b>��P(���9����~���
l	�j�9			0r�H�e��H��U[�N�vSܜ%ɋ/Q��,;k�ԩ�t&�YSSC=U�(�3u�r��8��&*`�a>nܸ
����%��uuu��l1��Š"""���e�T<���ٜ�j��������S�P�GGǫW�j�3T�,���^dd������L(�HOO��*��8�����B-6���X�/�
l��'(�9�ʀT�9�=���b0�.]R�!JW�t�F��6*J��*�ۜ	!!!�\�
���޽�F�Eq����cT�A$0�P
�Q[[yyytb�6V�bqNN�СC=<<�l���Mpppbbbaa�\��{�FDD�����lWW׈���{�R�MS �m�Vq��%ɏ��ۢj����$�]��hѢ޽{;;;�X,�����s�*}ʪڞQ�d�D���V�^jeeeee�z�j>��Q%�3�ģ[�n�g��5OV�֭��
+�l,...aaa3g����W�"��@�УG���HU�C��PU tEJgiԱjk�nk�Cqs&w�@UU��t���0�|��!�Ee����cl�A$0�P�!����۷�x�8�^3[[۴�4]�
ט�XEHt�}�v�����e�Fvv6�$���2


�CHB!�2*l�@���jQ���*�?�����!�<�aV0�@!�B�	���j9��`�;:��dr[����&f%  ��˗uuut�B!�п`�aV�����@B!��L<̊�������B!�����ìXYYyzzb�B!��
&�&((�����(B!��L<�MǎoݺEw!�B�&�C��x �B!c����	
+
+���~��%݁ �B!�?�x���;��@!�BFs���mgg��B!�2*�x��Ѯ]�۷o�B!�B����
+

�~�:�Q �B!�?�x����Т�"��@!�B��t�t/44�ŋ�?���;�5j�! d����tXn��n�S��x���]�2�k׮������9��(���Ԝ>}Z$���֭[�d����H��痗���1]m���0C���mڴ�~�zTTݱ�KϞ=srr����'O|}}ccc'L�@w,H�p;5;v�8t��ѣG�z�-�cA�tx��<u���/G&���s�С���t��z���y�fΜ�YB�`�a��v�jޗZ!s2mڴ��B|"B:�h�".��t�R�A!L<�Uhh�;w����AH����]�v[�n�;��JAA��m�֭[gggGw,!����
+

��7nܠ;��c0S�Nݹsg]]ݱ d&���ӣ���b!ぉ�y���wpp������<y�P(ܻw/݁ d&6l�p�����t�A�����<1�.]�����T�j�*..n�ƍt��9x���W_}�p�B___�cA�����l���ȴL�6����/^�;�L^rrr�֭�ϟOw !�/����?�x��������ܹs


���tDž�r��^pppfff�=�!v�С�������Ғ�XB�_0�0C/^��p��ٳgy<����@ `�X"�Ȍ�'��CBBBrr�5k����!����󄄄�������B��K�̇X,NJJ���uss�����矅B�@ �Hdaa���Gw��?~<��ܹs'݁ d�fϞ���r�J�A!%0�0L&300���$	�rH1�BC���c�n޼Y"��B�������۲e���5ݱ ���x��ٳg���q8�Y|>�M�6�	!�L�6�������t���y��Ebb�I�@w,!�&f��d���b�Xq�D"��������z+33��@21��ͳ��\�v-݁ ��J�x���������J��2	ӦM���y��9݁ d2>�k׮M�6988�B����JII���d�X��L���]!!D�رc---w��Ew �����3f�3fȐ!tǂBd0�0CVVV[�n�D�]]]��A����ٍ?>==]n#������y<^jj*݁ ���x�����=Z�.s��
+��O?��������t���;z��֭[SSS=<<�!�����l�_�����g2�


�ƃu~~~C�MKK�;��ZEE����?�裏>���XBH=L<̖����5k�L&p8___�#BHs����Ͽx�"݁ d��b����]]]322�!�(��Ü}���ݺu�p8b��u��t�����ûv��a��A�H�[����`��ݶ��tǂB�`�aΘL��ݻ����dr�̙���]UUEw �k׮-Z���/��;���!�H����7f��)��{��SqqqYY����5KNN�!�������㏗,YBw,������~����?� ��E����=z�h�1::�aUVV�߿_W�!�ܹ������5݁ �UUU������rڴi�7onll�;���g�}���ӝ;wbց2-:~�CK�E�T�>}���tG��G���;
+$$$�X�";;{�ĉtǂ�Q8z��ƍw�����Cw,!����E���(//��c�~����]���y���)S���ǍGw,!�1L<BFm�…%%%���݁(���f�=<<bccϞ=�]1�Dr�����XOOO[[ې�����.��AqA�D������naa����������
+�B��ڕT����iӦ�m�������:$$dΜ9�.]R�G)��H�Q�"����kԨQW�\!o�aH$���.��O{C�*����l�)�5gY���}�����ݛ�(�P�Se2���������������Cq������(�e"##����m�6��ڕ�STT��࠶���E#�+W��x(����9s��9��x�bKKˋ/�BH
 ~�Ar��B��-X� ??�����@�#v�<���x���b�8%%E�b~�a^^���Ӛ5k�ܹ���޼ySRR�e˖^�z����'N<v옣�cjjjEE�ϯ��LKKsrr:~���[h�.]*�t������~��K�.'N������xeeeJ���8]ia�!)������ի����૯�Ү*]9~���%K���{|~.BȄ���B�	��޽{6��(�)�E=z\.W�bǏ���R����ɓ'
��Ʀ��XnVqq���
�:uJ.�Ν;��͛IB��+++�}�6y��C���Y�Z$;������)�����wvv?~<�1 ��<���@��9r�����U��766Κ5��ݝ�f�ȑ#Fpp�X,&������`�����(�IZZ,++���;v�ъ(.��O?
������f/X�@ZF���e�x<y�KJ999
>(�
+�7v�XOOύ7�B5&!�n�:]U��G���?�\$
@FF����͛7w��Mصk�͛7���222�T���oܸ1y�d���ԨXaa!>\�VP\��Jm�ȑJ����I��5jԨ�����ʭ[���O��Tll,���{���YYY����¨����ׯO�0
�~�m�˜7oޭ[�<H��B!&{�/�B�8��%�H�m�fii����f�C�����ssseo�޹s'�����|>����T[�����/_jT���@cc��m�� y�������X"��ٳ����e��Kʩ��'r){{��'���+֯��%�Y�Z$�ƛˉ�Z{��e�!�^j���@��q��9::nڴI'�mذ!**J���?�0::���|�֭[�l)//�����,���ˊ+Z�j��b�3fLǎ?~�y�f]�$���>|�ƍ+W�1b���_]]���ۻu�V\\���u��byxx��������
ܼysƌIII-���!3$�����n_��˗;99�~��9������YUUU������T�"�����ٳg�����i��|}}
@�;˩/���7n�P:����4�]�v
�����7o��K�UVV6p�@���PZ�Z$��;y��D>�l6�b%���������ݛ���BH3�g<T�3!�1{�l6���;=����8;;���q8���WWW���<==��Ң��kjj-Z�Q��={��Ç5l��bP:��N�Q4v�����?{�L��.�K*վ}{�j�s��i�89ggg &&E|4��N3g�|���Ν;9ݱ ��n`�2666s��Y�nݫW��Qrr�;w�.]��_����_~���5�]���f�ܹ����ԋ�/�Z��|)E$^���w�ݸqCn֍7���;�4i��eY,��W�&�zIUjkk��
5
+�Ӈ�~��W�,c�v��={�dee�!����=���Z!d�p��z������ҥK��Aq�G8y�$�D]�H���ئM&�y��iM�JHH��#GjT,&&���׮]{��=>����PZZJ��$�wr;99���UVV���������g~���H�%
+�5����bŊ��š��@����C��߿?yשBRx���`oo��������ϟo߾������(Vb0�����￧7���/�R�d�X������ccc<}����B�b��틊�"��pss���ܻw�X,���8��m�V�_UGV�%�&x�m!�D�6�H}�9��X,���{LL��`�t��t)� 	��������NRRRAA
�N�&�/^ܪU���:�W?��������=JL!��ۦM���Z��z�葕����t��buuuTF�����
<Xi���٧{)
���8�zI�]������իj�)��d�"�Hi/EFF���F�oׯ_���MHH0�J���,,,������gϞ}��E�2���+V�x�w�.��m����9r��˗/+�$.��ѣ����G���z󉻤���d��nP���ӯ^�
+~~~Jc��"*_{��j�?Ms��������޽{��wJǀ�*���?��w�}G=�fL<T0�ă⑵��>**Ji���H�GVضm���f�$	Rm[H*��M1=�9��c2�����v�⪩,��.��RÆ
#����x�z�ꕣ��U��[\�J;v,���[:E,���
�|�QU�$99�Q1�X���3t�P6�MV�~^QDqA�X�w�ވ�WWW6����A���@жm[���Kʹv�ڢE�z������b�lllBBB�Ν[QQ�X?�&I�,��z����P+++++����իW+޷�6r�z�왯�o���
yCyQQ�����NV��J)�V���%%%ҹ�OA r�h7*(6��qݺu�)�����`p�ܦ�&���&O��4�-���G�V��D�c7�w��R|��1@ЮC�B�)S��f˝��7��C�H<�k	���֬Ys�����͛���k	��`9::���VTT�����ʴ�4�k	���Ov���jZR'm�R��,=�9��<�����(,,�bCH��ޥ�e�Bauu�����ϟO�*�����C&r.\���"�K#d��|��
|||�<yb��0�t�r�ĉ��j�WVV���!��ԩ��ŋ��	Q�\�pSS�իW���
�o߾���ϟ���0w�\*�Q��6Z*�߱c���H�\�p
ڵkgϞ��2d�ܹ�9aS<�i�j�N����=�B�8�|h�!���Æ
kkk�l�L � ntpp d�ɓ'
��Ʀ��XnVqq1���S�NI'��s���y�f�鲋kZ��m�X��,����ϊ�r�BR��.ըLQQ���=���P��:L<�|����/�GfC,O�8���V�z����۷oS,��1B�pee%�]P:��绹�
���骵�
+N��D̎��"����j�*�:ujRR,Y���.
+���G����qM�V+-�ݱ��w�cǎ�C>��W�^�������z!4I$�x(e�q	����ɋ���@JJ�ҹ)))0n�8�bt�ݻ|||��IU}��^��m�X��,����;/�
!)Co�jZfٲe0b���P����O?���ã����@ҁ/����Ғ�a���QCCCRR�����"~{�ܹ��+�H$"~`=z��J��������T�Š��@���P�DҥKP��{o��Rl>����)����{���`������7'l��5�[���v�n*�=T�=)�1�i�<y�k׮кu�7o�]JL ����D"QPPlذAv�첚�l~[(�)7K=@=B�ӵ}�ņ����K5-C\����C=�0�P���#.����Nw 5Wzz:�����5]�����ӧ�KKv��A����77�/^(�$11lmm'M��}�����[(�]�F���x׮]#.m��Ԋ�=`����$--
��I��V5Km��?u�T �N�=����3���&�X^�r%L�>�9aS?�i�j���T�{����C>4퐀��ر�Ç�.�'���
+&�x��7666�XCCXYYI�H��={�����,�w_�%�Ҩ-J׮v��z�J�r���_�|���ܺ��K5
R���Q��u�,X�����2G�a�X�ku4B쎼��sss��<�a������|>�x���UUR__O<mY���~�ĉ���$+�(B9�7�WUU�X,��c�㚸��?	IX��!��r������GuWk�ֶZ�bݻhED�ZE�VEqa��*VE� 
+h
Q�
+������}�_�q���%�y��K�>��s�K��g��WVV
+����J}}}&�)1̀�M�|{�GKq������P(����N�:����<#G��;N�aK,�~]Sy��V�k7�{��[�*}}}��P��>

!��'�'����*[R�ϧL$_���P�P�����8<
+��M�rH�
R������G3���055U�
!M���ٲe˙3g�6(�u$�T�=8ӦMSXUVV�֭[ǏO��
fff>��Q�"$������M�0A4ҴP(

�)S���L�<6nܨԦI���D�p�_�|	&&&<��ss���ĪE�
��-[�\���1��(--U*l��t%�]���{����D��P���n�F�!>�X3L<�ЂģI�Z�?y�$���7� '�P�dc��b����P����d���`aaQRRBqGH��{H�-���@۶m�C&򄄄�l�R�':��“'OlmmG�)�/�B��QUU������-[���������?$S���;|�p���I�kya�@@���~��h���׉�����R����b� IDAT&���ē���tbܪ�'O�O�>MNNN�F���M�s��r����&��T�
eHnn���4����`�!41�����#�'I#�e�M�2��ٹ������[�^�$H�����9�������7z�說��k�6�*����*����
5�U�V���?@"�E�={���ӹs����s8��TEZ*��‚�ǭ����ښ�q�:ggg����۷�B���0r�Hƿ��J���M�uy�����$$$ˉq�E�III!�w"�5F�_�s��߿?(��<x���S9�= ���			���qqq3f����J�jZ�Y�f>� �Q333���%)v��5hѢ�R�Ɋ�$F鶲��>,*�Ty_(�)��鎀����X,�%��T�մC�T���L���ٳg)FB>� �s�NCCâ�"�A����''��={R�[My_G˖-��ǏoٲV�^�l��P�cO)ܨR�
��n!�·��W4���'�rpp��;��rvvb@��~���aS��5f��u�&�N��{H��r�v@�޽KL
9k֬��_Ka$��C&-H<��Ncaa�{����|.�[[[���#1q�?���|߾}EEE\.���x���$���lhh ˓���\�1�B�N�UMt��,�`���#$eh?��e���������K�@�.>|hݺ��%K�!J޾}ۻwoGG����FV%�+�ƍ��Ņ����m۶L&�d�^ww�-[����UUU�x�����~�������Cq�JEHx�����
�����^XX�d2
^�~M�6y�FK}����Q᧟~*���
+�L�t�7¦x]Sy��Q��=~�x�{���^�������4�q��8c�0�C;���j___�C�1�4___�I��?Kǎ��S��
+���/$['Y�DG����/^�044d0�N�T��R*A�4v�X�ˤ�`�A~b��yyyt"�@ 8{�l``�����666vqqY�h�DWN�@���O�������󋎎�������d�==={{���`Ѥ�eH���B�V"$�$����[[[�����>�e.05z��ݠA�lmm�O�GB�-���"~����#����/жm[y�N��33�{��),�l�"D�w�F�
�e��&o�� )�>��ՕX+��A �I@Ϟ=��A�*��5��Z^ծ�5552����߰aI��
�ȭ[��9"�gCoR���ڑx�B�@`gg�b�����ŋ�/���Ѿ�����,�����ח�-����999I/W�$�������:���8��_�f���ƒ#=��W��Z���|s�9���U�>}�.]���B��)r\.���Ib�y�A�YSSCf/���O�,��f��WTTK�Or�Պ�j*l�-4q�!!((��2��VSSӿ{{{�MC�I�e�Tk-Ddz�S�ʬ$33s�ڵ������366vuu��/$F#U��Q�P�G�p��)�k��k{��A�6y�Iq�	Dl�xZE̊�V�R*�UT�k*�5Ie�ݢhE�L���oٲ�<��
�ȵk����
��o�%�G�9�&�@:��ݻ���Dw �?_
+EEE���egg��D#
ss�;w>}�������������i�������[XX��r������G�T��g"""���bNe��x�����w��#V|7�7+T�f�V��������299yժUMڦ�I�{�n���vvv�?�;��1��;|�2ݱ�y0�@����999Ĩ�|�	��h"�|)���н{�ѣG��$�[d˖-�ǂ$��166Vjp���(��&�
�6��H/!~��>���������8���R�D|��aĈVVV2g�@H��c&%%�
0�G��E4b�R�V����v횔�����j�*uU�>*zzz?����˗�����?�?k֬!���C��W�vqq�X���z�jQqAAA'11�������֭['((H�;�a<<<�� ��	Z���N�6-##���ˢN�M�6	�����A��� �x �`jj:bĈ��D�*#�����Z�������KKK�q�ƑKMM���`�k�VXDU����F����ϝ;w��Y>����K� I���>x���O>
�޽{S�
B�;w��%�߿LLL�z�j߾}�!��Ģ;�ф�:�j�V��`׮]ݺu�����JKK
��ܗīW�@4��b�˗/�WM�<9...&&��M�<�d+*�lvhh(y`
++!��)V�����@EE��[l~���~~~�^�JMM%�F��>�@�:|��g�ׯ����;�fh``���t��mCCC�#;9===;;�	&�����(��
�!PR\\<x��o�&''cցB��BHǬ_�������t�?������s�bvvv���/s-����^z�������@ ����lY�}�^�|y��Y��Y��/؜����Z��6���g�С


7n�P��!�>�x �t����������c
�������S)v��9�k��Di��U���tq0��)4�������n߾�YB�`��5,�ҥ�W_}Ew D�m۶�'B�g��;vdeeI����"ş3g��׎3������x���j�Y�=x�`۶m0u�T�c�-66���=z�HMM%d!�"`��5zzz[�l�p���۷�|}}߼y���gϞ�����ÇǏGDD0�(6r�ȱcǾ{�n������/..��x/^��������	&�tH322z��ݻw��qϚ����uJJ��ի===���}||ƏOw\28p`�ԩ3gμp�y�7���7��	�L��R�������ǣ;auu51�8��puu��Q�d��������S��|-yy�2$AR��(�"�zHʌ;������������`0V�\����!D'�	��'!�^PP�}�v�
������؀�;;;�ell���x�b�9LLL�\����kmm�b����}}}������?��9���U�>}�.]���r��y333�������iӦ����޽{׮]L&^[BH��!��ڶm��w߅��L�<Y��͆�`˛P���ɓ��*zn�Ty�e�TB��Z��AAA�^����߇Bw8!���W���Z�r����%K�鬄��>}��´�4�:B�&!��b�����N2�WDD��ѣ===o߾M�S5��|�x �tY�~��͛�bŊ7o���5553f�X�p�ʕ+���4��	Bi&L<B:n۶m�`�ڵt�t��۷�w�����e��J�B��%BHǙ���ܹ�СC�CH!�>������⒙�9t�P�#B!m��Q�&N���
+BP\\Lw�mƌ˗/OKKc�p4?�����O?�4!!aݺu�}�����!���Q��6m�()5��O�fff�R�֭[��1ơC����6o�Lw,H���Ç������޼y3$$��R��~���򊍍UWm�1Aǎ���Kw,i�nݺ�ڵkٲe��ރ�;�5rrr�͛��_}���_����
�!����>:�ƍϟ?_�h݁ �Y/^���7{�욚�cAZ��冄���ٓ��޹s'$$��jL<tPxx��A��t�Bw i�q�����߯Z���X���{�n�>}�n�������NwD!��0��5/^����[�p!݁ ��lll��Ï9r��E�cA���n޼y���,+==}͚58 
B�&���ѣ�!y���f͚�駟�z���X�Ɖ��wuu��BBB���O�#B!݁��N����|�	�á;�4מ={���/^,
+�i�G����x{{�����R;L<t�իW_�x���"gnn��/�\�ti׮]tǂ�WQQ�p�B�yFFFxx���=�A!����C�������899�B�n���;v�X�f�����ц���۷�s��W�\9u�Trrr�^��
+!�t&����|�2>�@��+VL�0a�̙/^�_�����ϟ�j>iiiC����/g̘�����'2��B!]����8z����ݸq��!�q��QKK���`.�K,IOO�ӧ�O?�Do`�Ieff��߿E�������377�;(��}�x��1{�l�
�u-Z����y����_
111C���������xtG���޽{#F��ѣG]]ݟ�y����ݻ�B},0��ׯ_���ܹs�!-���gϞ�{�N�<���
+�ª����8�CCꔛ�;iҤ޽{s��۷o߸q�o߾t�BL<tDdd�СC�[9B*�1cF׮]/_�,Z�d2>LcH����쌌�%%%K�.uss���<u�Tbb����-<�B"�x����˗/��'t���)--4h�ӧO�h!�Ͽ~�zQQ��!*RRR����m�&s���=k�,GG�7n�<y����S�La2�‡B���_]p��i}}�	&�BZ&33�����Ç�=:X,։'h�
+Qt����C����\�p���D|Uff�ԩS���SRR������É'bʁB��oa]p�����`###�AH�<�|ذaeee


�ky<^dd$Nm���o�>~�x�O��<t��¸�����ѣ����~���[�x���
��"���C�=|��޽{��
+!e9::^�p���UOOOOOO���gϒ���?0DN ,_�|͚5�����<x0**���c�ر���o�NII	��9BHs`��N�8���4x�`�AH�8033����666l6[b-��&~GG����n„	�X^UU5o޼�;���=h	!�	L<���;y��3�W=�T�`0&N�����o�����p8�*�w���ׯ_�����Q�F��ʼn�@`2�}��9w���B�v������ٳg�B����8$$$;;{̘1 �����GGG���/^xzz�����|�|>?##���n��BQ���v;~���A��!]���t�ܹ��'''"����tDž 77�o߾yyy2G p8�}!�4&Z����…ح!�6lXff�
���<x�����������/--%�:���FEE}���C!��
 ՝9s��b����ݻ����B�
6��ÇEEE�ƍsww�;��TYYYjjjCC���l��b�X,6���p������Բi//��+W��*�B���V;~�����MMM��#---==��ӓ�@t���a�~�:w����e���T]]�˗/;v��f���B�/��!��D����7E�!�1��C[eeeedd���t�����Kw�O �x<}}}�A�g�ĉt��B��xh�ӧO�j���LJ�@�}L&��B��0��VgΜ�:u*��@!�BZ
�������?u�T�A!�B�L<�RLLLǎ{��Ew !�BQ����
+�111��!�BiL<�OZZZQQѤI��!�B!�0��>���]�v���;�B!����C��3g��l�!�BH�`�eRRR^�|���B!��v��C����v����Ņ�@B!�R&ڄ��������B!�u0��&�o�~��Ք)S�!�B!�`�Mbbb\]];w�Lw !�B)����p��Ylg���P(<w��رc���9N�-\]]/^���.Q,66v��Ѷ���������̙3B�P�B��`0:v���� ��1%e��/$�H�Fes�
lll<==�-[������W�8��o��b��ٍ;6))I^1???��~~~2�H���F�~�HvJ�^K,�<y2��������@0d���ρBH;Ŝ9sFb	�			���Gw HS7E���վ��
+�4jjj���e���󫩩�S��ȑ#��Y�$H��BR�DmT6GR&((���������qL&������X,�ͮ��$VTTK�c dgg����ʒ�S
+�ZbaEE����޽[|��]����^�5��!�����I�'Z#&&�G�NNNt�tߌ3�^�jnn�s�ΧO���׿�>;;��������={v||����޽{�\nQQѾ}���ͯ\�2{�l��oڴ���Q	�bI�_m��E��զps�e*++���W�Ze``p������Kn�qP� "�����ѨQ�AHH�t��Ç�x�_�����_mhh>|��H"##
@___���������o�������œ���k���#G,,,Ե-�BMH�ډO<4�Ϸ��ݴi݁ 
�D��^�rZ�l���CR�ƍ`ll���#�U�=266����B��{��p��!���/W�d���b�
+7GR��������T$
+��jo�x�/^�����֣��`�����aÆ
��c�d�&�˵��
��~�	������e�½��j�ܹзo߆��קO�7oIm��O<B*|�!>��)))���&L�;���?k֬�ҥI1�t���ҳʸ���^�ZTF�w�}?��C}}=y�K���/����c͚5p��i�^��8��FHkѢ�� � ����XVVVVVv��-�$�������2ww�E����UTT\�xQ�v�۳gO�v�222�lٲe˖;w�8::�ٳG��@!Ԥ0��/^tvv���	}�n��ƍ#/���
+���2�I�t��'v�ڵ���h9C�zI��yaܹsG�W)<��.����E<I��DN0335j��?w��ٳg�|���o˖-e�F���7o��_5��SSӨ�(��q����P�ebb��M �jR�xh������(������#y�W�^
��NG��/_J,g2��O�[�l���#��zI�a�(�R�G�"Ѿ}{���Pjs
+��jo�������k׼���=:�<y2�����Ĉ����ŋk׮���O�>f̘��������"j;J���ϲe�x<��[�|����+G!��0��999yyy�x �0y��.]����:tH]%��@ P�M}����l�bii)sm``���ARR��۷


�}EEE���q����-,,�����C��lݺ��ϖ-[�[3B������pႵ���hB5[[[x��9y1bx���|�k�����ҫ�L�u�`�֭���$��XRf�5��E)$�#G�amm��ɏ�jovII����+**F�-�T�`bb���/����̮ B���FB��"���;F��Pdhh(��B�-p���ѣG�����(xyy
����;w�̵�r���)S�8;;���8p�|+�K��p_�1��H�Cc�{{�}���=�����V&Q�*y��
+
+`�ȑ��g#G�������D�C!�������@/_�d2����+݁ �Ӥ�隙�����v��h�B�Q\O�8
VVV�_D*�Ty_(֩ps$e233��tϞ=�Z$�C#��P����b�X,��Q/���{ccccc����ˬdڴi$W�iӦ)<>�P,�x8�.BHe���ʁ���;z����~uu5݁ ��t7FD;~�ݻw���s����ڜ�b�=Q��c������}�����\nqq�������
`„	�uJ�,644t��Q�/ *�l̾P�S�{ↆ�������/�����|||
y
�6Gr�F,X��Ί�}�����
��x��D���B&�i`` �����y0��t���#G��;
+����ƨ�����W����F�%����oMM�x��7��ݎSRa�T��d�Jm���رcE��TP?�|#�B�/

Ɲ;w��aaa 6ɠ�#F@XX��I�!��,/6u��!�2��C���x<����njCw ��bbb`gg�b����]\\/^,>#���ɕ+W���}}}���Y,������ottt||��^��O�.oX�K��/M���XYY���g�ҥ)))�ϟ733kL��C#�hժ���˅B�7�|�lT�d����͙3�=�B!-����3y�d!�oN�9������O�>ob�a�ĉKw � �|!�T�`0Μ93i�$��8��C�]�z�cǎ�u �B!mǢ;D�ʕ+~~~tG�R3����3B!��O<4׋|1�< IDAT/>|��B!��
��Cs]�v�����ۛ�@Bj��4B}�����z�����


�!�B����CC	���}�ȑt�B!��`⡡�޽[YY��B!��
��CCݼy��޾[�nt�B����Ç�k׮]�v���tG�B�

u��M�17B5�W�^���������m'��ё����)ݑ"��v��C}��!999,,��@B��5d�b��ׯ_�y��qbb��Ǐ߿���:t���oժU��k�NOO��@!
���&JOO���>|8݁ �ss�^�z���K|!��-**z���?����_�n�*))���`ll,z*"ҡC[[[��!�h���&�y�&�k݁ �����899999I�BRRR���ˌ�����w��
��nӦM���ܹs�-�}'B�Ya⡉n޼9l�0��@!�
+�OHx<^QQѳg������ݻ111o޼
6�M<q�/###�v!������ۿ��kŊt�BHm�l6�pC�w����/^��!���u 100�СC�����`������C㤦�6442��@B59}}}"�_��r��矂��㑫W������LMMş�8;;w���� �4&'))�s��vvvt�B��S�N�:u�X^VV&������8q��˗вe�Ν;I��

�!�d��C�$''8��(�
+�8Ӌ4�@�d2�B��1�666666������#��wvvvAA��+W�o�^]]
�����nݺ���u��B�.�xh����;w�̛7��@��
+�)))�.]���+..655�8q"�Ai����gϞ��شmۖ�X4KIIIaaa۶m���0�(==]��^c�z��#k������M�6��|�նm[�l�}���+B�`�Y�ܹS__�O<�>�������kmm���߷o_���G����h
���;333����j�*///55��f�m۶m۶���t��<==����Bu�#k�y��ɓ'�?~���'ORRR�;��r
��Ɔh�չsgWW׮]�b��j
+�xh���d{{��;�����W�^=w�\|||eee�.]Ǝ���c�����W�������2�K�.
0���4�ӧO]\\�.�����Z��7o����;w�Lwh�������۷o߾�%|>���繹�999O�<���=�|EE�lْx"ҪU+�bG��P(�3y�d�%���=���(66��@��\����cbb.^�XSS3`���cǎ;3Rƒ<x�ԩ��Z&����l6{�ԩǏ�;:͵y������j���r�;v�>}��Y�$FUB���������쬬�������~��5������������{˖-�!
�`0Μ93i�$��8�xh>�oii�aÆ�?���X
޿�ܹ��؛7o�x<__߉'�3��‚��4BMM��ӧ8���C}}���z�������8�(	.����RPP �=��`�X�����}�N�:u���VVV4�4PII���"r��z��������ãC��Q!&�`S+
������[���z��Qdd�ɓ'+++���q��I�&ak����GDD�8q�Ç�/#Y����ڵk1� ��p<8b��B����
�ݻw�ܹ��7ߌ?�������4��4N�V�Z�j%:s�B�g�233>|�������ٳg`bb���������ޣGwww}}}ZGiL<4ȟ�idd���Nw ��TWWGGGGFFfdd899�X�bڴi��E�@ 

�����`2�+W�lΨ����çL��믿]��-�>|�`cc�Y"�`0�A�ƏO,��xO�<�{�nvv���}�����r����ի���УGcccZG�
����ݛ��7E����DFF�����	&l۶mȐ!�JA&&�y�ԩ��߿��9� �9���Rv��U�'ݪ��b
6l�Ν�����&����������믿��{�nHHH]]������[�^�z��ݻw��ݻ����~�5ȝ;wF�Ew�	���FDD������6,***  �����4���A|||�޽_�x!�{����ÇK4B$,--�m۶h�"��,�}��1118�j$===�ٳgKJJJ���̙3�_�f�X����Ð^�zu��
yA�c����x��]vv��u��5������𰰰����ӧ��믮��t�M���������+
+��F��?�HWTZ��O?=z��{����d2�L�M���j
+D/b~C.�����?��3==���?|�0�k���˫_�~���=z����*L<4Ž{��|~�>}���ӧO���{��q��.[���ΎRTT���I]]�h	��Z�j����Qi#&�y����P���6w�\33��#G��y�hm�t�R(//'�����������������w�С>>>����� �K𑺦�s玍�M�����̓:w�t������~�
��|��{���駟��É%L&���b�ڵ���\\\V�XA4�g06lHOO�:u���dd$�ѡ������1c6m�t���ׯ_?|�p���m۶������677>|��͛���dv�Bi|�)�ܹӻwo��@�Q\\աC�S�NM�4	��7FHH�����;���[�liѢ��i��������eee���k׮e2����l6{��<O�BMMOO������u������[�n���X�v���ɠA�F�������Lw�!U`�)222f͚Ew���={����GGGw���ܹscƌ���t�ر
6�ܹs�̙Ē}�����UVV���"�������ׯ?u��3�̃���-Y�D(.^����G�S�N�:u�?><y��?��u��?���_899������{{{��iL<4BYYٳg����Kw Hu|>?,,lݺufff?���ܹs�l6�Ai����E�}���V�-d�X���������&M�4x�`��7o���X�tiCCòe��
!q����������/_���344:t�����1cڴiCw�!0��<��={�Rу�ϟ��ѣu�֭Z�
+�S����������]�vI�255uqq�%*#��ї_~)>��s&�I�FHC0�LOOOOO���Ъ���7o&$$���.Y��[�n'N�6m6�BHc����Ç�����X���,\��gϞ���999k׮ŬC-jkk'M������՚�W_}��W_-_���ɓtǂ�l'N����K�z��gϞ�]�<8,,��˗t�����Fx�葛��Q �������366������񎎎tG�;V�\YXXx��E�c�Hmݺ���?�;w�k��!2g���'N�(--=w���_ݺuk??�˗/�D�&
����CBB���⒓�3o�<�U^����>|��I���k׮Y�f�7.55��XR��� ((����eee���K}}}@@@�N�v��YUUEwt!L<4@CCCvv6�c�E޾}���u��={���믶��tG�S
+/^�h�"___�c��1����Q�F>~���p����hʔ)���{VV���_hhh�֭?��ӂ��CC裆��������0�����π
�������-[�:�n��VVV۷o�;���w�ĉv���o�H�t��-,,���x׮]���]�v]�lYyy9�q!���ă~�=b�Xݺu�;��ӧO
���8�qS����q�Ɖ'pf@�abbr��庺��ӧcsy��LLL/^�����O?]�x�����ĩ�j~�x��ѣG�:u¡�4_nn������MRRR�v��G�y�fŊ�-���;�vvv�.]�}���_Mw,���b͝;7//�믿�ꫯ��뗟�OwP}\0�ߣG�����+//���oժUBB������
6��M�6������ĉ�v튉��;�T�f�׬Y������//���L�#B�#���rrr�w�Nw���7n\CCC\\��������܃��������m���˖-�?��'O��F�ٳ�_�եK��Çggg�BL<h������;w�Lw ��ڵk�ݻw��E���]��{��~�)݁ 2;w�tss�>}:�ǣ;������ի]�t	
+
+z��
�� �Q�ăfϟ?ohh�ԩ݁ �.\��s�΃������JKK;w���͛�L�R�h,����������##��/�����`�k�P3�k<͈�xh����9s�̜9s���tǢ�6n����wh�֭[�ڵk�޽iiitǂPcYXX�:u*99��F�`�A��O���ٙ�������Ϙ1�������tǢ��޽{���
6��jΜ9cƌ�={v]]ݱ �X���۵k�����4R;�A�|_4n�&4{��)>��X{�������矍���E�mݺ�_�~#G��;��={��ٳ��@R�%K�x{{ϙ3�����X�e�x��UPP�~�������Ջ�XtY^^�o���b�
+�A��Сúu�6o����K�cA��Ʊc�^�|��y#Ԥ0�ٓ'O0��@B�pΜ9]�v]�f
ݱ�C��j�j„	t���j�*{{{�e�t���öm�v������cAHga�A������"L<4Б#G��Ҏ=���Gw,��������K�,a��tǂ���pBCCO�<���Cw,�������ݿ��K�A����oڴ���Q__�k׮QQQ�k���gΜٺuk6�mii9r���ׯ� zk�W��ٳ���-ZXYY-^�X�� ��ݶm������������ǎ;D�{xx0��acbb����h�ɓ'���������;v���W_�}�V"�>,[���֖�b�8B1gΜ�X��q���>݁��(--���\�b݁���H}}���r�A��ի��ɓ�!���? !!��@�v�3g��
��s�J�~��Ĉ��`0Ο?/Q������֭[��?~��}~]]�����7�����r�B��ݻ
   @|/ƌ{��
+��`ڴi�5t����۷�q�7a�qd���ģ�]�v
�����ǂڶm���;��}^^^�&M�;
+�(���zzzyyyt��z�=�W�^���@��H<ڴi���������@8p�����ߕ+W޼y��rE�v���G�6�J���+h׮ݭ[�jjj۶m+~�u�V033;z�hYYYYYYdd���)l߾](����X,6�]QQA������f��첲2�P
111��嵵����}��
�5kֈ����p��嚚�GF�L<�Ydd����Q���w���<u�݁辧O�2��W��j����v��}���t��zddd��+W�i1������U`bb"Z���`gg'�6���@�6�J�t�/^�����777����ȑ#���A� ����@��~��
@RR�x
���ЩS'�8��W�##�&�l�ƍ���tG����ϯw���[W3����|>݁��
+

���!��#�F����MwH�I$>|��)Att���6�k#�D__^�~-*PUU%^���$6���
���!��s���ˋ����S<�022======&��d2Ea��l�8��`�r:�x�B�M�׍7�\��s�N
�sG�DGG�?���o!�7gΜ��ʋ/�B�bŊ[�nݿ��@�� ��	77n
+��-���%R�w��)[�Z�3���2--��� ???==���r����Z"����|>_ ���D=�	���$[�K>����������#F2��@tߣG��>}:y�d�Aj������Iw �ǨQ��v���O?��}Dk��[�:;;��͛7���}��p��m�b�ggg���_x��%�ܹ3�'�Ù:u*�<y��ɓ0m�4�C��޽;ddd�{�C&t*..�'�#%%%55uÆ
t�Q�t钍����݁ ��={����KKK�!5`0.<u�TMM
ݱ צMؾ}{UU՛7obcc,X�l%D_�e˖����޽�u���.^��jŊ'N�������8v��ʕ+E��g��_~��_~�IX�d	��#G�<��Ç���O�<����߿����+:��Cz��eiiFw�&N�د_?��h<�4�n�A�͜9���B|����/>>> �����W��ٳ���1��qrrZ�dIaa����#2����6�mcc���M�C���������}pp�_�ER���600��?� �J����$|�����(22R�4)I1�P(Ξ=hgg�f����]\\-Z���F	�R?+�h���x<��r�JJS�Y�	�<<r����رc�_B�7o�,\��u��D���\,�"H���xH�-ܾ}��Y:k�,�W)���p��
��Dx{{��׋W���B�ruu���e��?YT�S�L<���F�嵵��4#���>}ZaI�"�:����ROO�������
�ܹs��{��;;���Jb�̯Qss���O��������_�����
;(Q�6�-~G(��ɼ|��ª$��9i~~~��ܘ� ]������W��F�J��UG��^�ZI�@��5� ��.���~~~J����ϗ�Gv���F��T;��x444�ر�S�N���:tذa��˄���X̟?�������n����f```hh���m�6��C(�ر�x�Ν;��+!!!88�����fv��}�ʕ���$qJ�-���'�h�'��jf�|�M�V��?��h<���Ħ"::��b5�6ďI�[�&�`rrr


 ..NT�G�;w������߾}{��%�����y��/�ĄJfff{��-,,�r�EEE���#:�M�0�������ݻ���
��Y����ѣG�F���O����F�NCCy�MJ��@R�xbfnn�s�ΧO���׿�>;;�������'	���:+D�������I���K��j�A �P��'O��l͟k�U�VO�O��r)�M<�L<h���ϟ?�;$����[�^�~=�˜x4�'�|2`������suu�U�V�x<b���s璿��?��A塘xܸq���=z$Q�ѣG�3򙒥7TTT�
I�y���w0x���ݜ���\HMM%��I�|��]�rZ�l����T_��YA�L��<t�ɾP/)M]g���MSQUU�f��<	���JcG�י+�R0�Gv�������۫W/cccCC�!C��&%���ߺu���������������ۥxhhh

m׮���ҥ�ѣG��U
+e�B��?�<dȐ�-[��W�^����ZyA�,��ՠ�}Q�\]]���Pcܺurss��rVܾ}{ƌ,���bĈ׮]S������c�Z.Z�H��)�	���.��G|����EK�?e�kkk?��3===*���@ ���

�W@�F��E�w�.������
+�����2�5s�Lh׮�۷o�_B�(���#/&�*���"�����>}�R��xXYYQ�Y���ԦM��[���!٢����;��A�.6e�ؼy���B�ʞD����ЦM���:y�B��4u�ErȷN���Ϝ9s$���JT�vE��� %�$///  ���,\�P�j"�p�,#����;��$���L�9d$\.w�ȑ2O������K�����Ē�s�J�������**#�{ًt�ޝ�c 	��Y��}Q٩S��l���D�QY�t���89�g�8��<
++��Q��޽{7�?f�سg��§L'q(���x��1����a���z����N�8A;~�8���Ḧ$��
4�������'�sUؼ[�1�X���YYY2+y��t�Ё����333�
+ԚZIt��>RٜL�ƍS�������;��A�W�]�v����/T�� b���]�v��Qz_�-)M]g���S�iӦ6m�HT+~�6�v���!ү�؄P(,//���_.q5�w�d���HoW�zG���i�%S;��C��Ν;
�E����+**���KMM
+
+
+�[�n33��G������;T IDAT��EFF��������W#�i�&..��۷���DCρ��V����������������T��Ě5k�B!I�Bjw������Y[[7��H


���?����T�
+??�+W��y����ٳ��HZa%_}��k��֭[555���m۶U�.--e�Xl6����xIyy9��f��eeeB
+�2Q��/_V�
���Ǐ���t���џ�ڷo��r�\.�
C4�*���b�B�HV$���Z�l�`0n߾M^R�5UDT��]|�Yq�����Y����t.����
+cVjs2���8;;��!�A�7]�w�1A���F���=+D�ѩS��U�V�k%�;�JJk�
�_C��ؔ����Պ����]Q�=�������/
��ё��ܺu�HA��C�����N�؊/���L�9d$D�ÇK�vss���(��O����_�.*PPP&&&��UEe���III�"zcw��I�o3�A
+���������v�ܹ���F"Z�gggS,O�HHH���c�X�k�x#i��t��D��B�o����	 ����@�O��2Q�o�)������KR�d��� �eڴi7J\z
��ܜȻ����"~��oV�D�ԛx������M�0�Ν;��XYYI��J%`*������L&S�Uޛ��;��A�.�����'��G��R%���,Ґ� 36����q8�|D=�'jcnW�{O%�������ćӸx��Kd�e�?��wһ/���[2�L<䐑xC�ȼ6������Ŀ�3C�{D �<}I�
��������d2�����l�P($	RH�,W׾�l�ʕ�����5Ҏ;�����WxVDGG�NW	�+����ׯ_�
+TUU){�;w����?===�/
+?e�8�;�K߾}�.]JR�d����-[������������K.))��d���׶Y�f�+���J4�Y�`
��5.WoS+*eJJJ�/_%%%��J)Ϟ=�s\�ۢ����;��A�WL3�Z�'&����n��TIi�:�4� 4R�޽����j�O��ܮ���J��%
+�&2k�^(�CJ�z'����i�%S;��C�����8��NJ�2B��|>����J4�q���/*���"nq�RRRT�?��ظq�P(\�hQnn.����;e+Q�1c�XZZ�����秧�[ZZ?!�2�2b\K������
���̍ZXXS����Z[[�h�Ba=�޽�={�@ X�fMll�����'���钗/_>|xUU�…:��w�8��<P�(?T�����~߾}�G����Z�v�k&׮];CC�'O���r�7]�w\��A�W�xGΟ?��NP}acΊ)S�8;;���8p�|+�KJk�Y�Q��z��y��=�%�'j�ܮ4��Bb�A���̒R��;ui�C���xB<��������4���������=
+R��$^(�Pa�޽{�$A
+�ZNbfS�M�k_T6v�X�qlP3VVV2gɑG�YA��$>�Ʌ��PljE~���>�6l�@��l�2�*��2yq6Ɲ;w@Q�6��Ӧ?~|˖-�z�j�[$������J֯_ݺu,E(FEE��,YB}�y�J,�v��h�B���R)����b�X,���m�UE]�Ν7lؠ��mQ�w\� ]�x��̌�xw"_��Y!�'���Jz_������H�Bc��������1�+MwO%�D��U\\��K���@�+��߷�|+Bj�;��%S;�'r�H<v��&&&aaa���uuuiii����͏?^^^^^^effR�$7C��_H�mvvvϞ=���������=|�0�n�$H�Phcc�N��h9*�	u����g�5��DK���d�/QxVt���������ׯ_������*��ع��
+���8;;w��	�޽+Z��S&/��8p�����h�T��m�ƍ��Ņ����m۶L&311�����x�p8�9�?|�@�A⣾����˕�y�J/;v,�~L�^����WaA��,X����_E#G�T8M
+�-���7� H#��ZXX�޽;??���������P�@P��:+$bnhh �d�}�^R��"�:�q��u ��KWۘە���_�j�*h߾}RRһw��q�_B[XXXX]]}�ҥ6m�(܊���N+n��0�CF���r�
R�Ba]]ݠA��Wy{{�ƨQ�C"����K&�PH�P(�={�����W׾��w��_�u��A�q��UP��³Bt+2k�,e?T��Ux\\\�U���[$��ɋ�1/^�p����rpp���~��h۶�x�eq���D7q����###����H�9�������İ��|}}�Ʀ�F�,���CCC�!�N��JmN����:T�WIoQ�w\f=B�Aa���j___��K�*uVHo�رc2��^R�RP��i�AP�������eV���J��S�/)--%h�����'~�'��d+Bj�;��%S;P2�PvGT�q
9V2�P��rw�����f```ll���-j�QWW�u�Vb������۶m��otT���\�������f�


�w�r����Lb-I�o޼Y�xq�v��l���\]��2WWW�Se��s��!333�^��hhhرcG�N����;t�a�QK_��‚����@ccc����Kw�Txv��A�Pf�2�O�ڿ��>o�<�227J�G&>߹@  ��L�:Uf=�'OOOφ�������ډ�+� ���������f�X��־����э��N�̚5k`�����dRjs�lܸQ�u����;.��̃������XѠ=���...�/V؁�����1�x<'''���KJS�Y�iAe<��d�={��Z�oW��Jbɓ'OF�mdddaa�`����l����ѣ]�ta��mڴٰaCCC��*�;��%S;��C�P�$&&���;�K�.]f̘�n�:���}���W�\��>݁|,.\��7��j*�Z�vmee%݁ �6����7o^�p!݁�GXXزe˼���Eg1�3g�L�4��@4NS�j��r���(>v���h*%����ꊊ���&HWYXX�y�F4�%B:��ʪ����(Tt������/_FDDc���A�P��ă6�xh���*KKK���X<{�L �wE����B �y��@R++���
+��P݅ܲe�V�Z-X�����W�^Ę
HC0�с�\�m�<<<������<<<v��!>@�Dy�O>��i�&GGG}}��]�FEE�l��K���[�haee�hѢ��Z�JT�R\5
L<4
���:EM-//��``�ۈL�)B�D��˗/�߿��Ç���mڴ?~��u��Dc��׏92))I����<�r�ʵk�HnZ,X@��?�;wn�-&N�H�-��TTT4��˗������p�<��'���C`�ќ���lmm��i"��>H�h{S+��W����������m߾��Ԕ\{��MJJ233;z�hYYYYYYdd���ibb�޽{I^x�ƍ����o��Y�߿�|[$/ٶm�˗/�a�oݺu�����&���Cp�\L<�����E��#]%z�Aw ��������R�S�N
��={�̙cmmmmm=w��ݻw�V�9f̘�c��㚸���?��]6��ZQ�+����TъK�Z�j�^��.mm��UA�����պ��..�X����Z
@������d2�$����_r��9�d�̓3���cÆ
������}q�¾hr�ʕ�{�vpp�ݻ�ʕ+k�tH<����D"<��`rrr�'�������
+���a,,p�r��="z��w�ሻw�r̨�.�ƍQaa!w_��o��ѣ������
;�`*++q ����	1���<777���suuE�
�a��P`666����b�1K
��j5S�eд��溻��03�Cjٲ%)�N����D��[o,v�ܹs����׼Y�HP�խ[���`ģ��[�.���d2�x���3��fΜ�u�ּ�����͛7GEE�'{�׌3Ξ=[TTt���3fԼY}%5�/�
������Em�_���a�C��b�nݺ�D��]�r��]�g��vXb����+,,L�܋`$[�I'��޽;,,�^�zVVVm۶���LOOW�������iee���9hР��Ī���WMHH�byHH�ʵ��
ԯ_ĈJ�Ѹ�����J!���mll<<<����O�~��E���3��9@�͜9�gϞ�^����ٛ�'L��������O?��`a̙3�����Ç�z�rpp�ի�����5{� 11Q�D���p�
�$"�[
+�w�^�HTPP��f�ݮLe����|":r�Ё�}�����۷�7o�T�w	����Qbaa����g�d+�8q������:
+
+
+���5~�����
RY'$$���P�M�\,K$�/^��yyyl	�m@"��>}Z�ǂpo!S�Vc�:C�}��U5W�1���

�k�뺆�AOH�s<�WZZ���gccckk���SVV������]��,���

���suu�2e
+���������W��F�M�6���h
+�6�/�O�����GC��
6��������VVVv�ƍ��d����n)���j�#cǎ=r䈋������߿_VVVTTt���u��u��M^-""�СC���qqq�?�J�YYY���...������rPPPyy��={�?���SQQ�.vm�������������|󍶋�nQ��plH|�4�����ŋ�Ν����mll�����{��fY&t����?��9�������Ν{����������ׯϙ3G�Q�J+�c���,-Z�8x�`QQы/֮]{��	"�������k��T?a��TVV:88$$$�YS�/��֭[Dt��-�Ѱv�R����^������dR�w���i�ɓ'Ddccÿ;����^^^BG��Ç���ӝ;w8�?~�����oܸ�4�ƍ���D���*/dW֦M��(((�-�ׯm޼��6���EDvvvu�h��pT�ӎ�:׮]c�R����3�յk�Y�f	ҵ����s������h"����wT�b��������u��=z�ʕ5i�F#*/U,Q�)�޼y3a�''�z������˗/ǎ������6o�<�s��۷:;;[[[7o�|Μ9lRȒJ�111�۷������k߾��e���˕:��b���Z�������fωuE�~QRR2}�tOOO���J�^ff�!C��ܦN�Z\\�mҴ���D���������999�ڵ�:u���_^^������L�u�5z��9��MȖ-[�h�ܹ�Z��Ʀ�g�nӦ�Ҥ6m�̞=[^G�СC���������:u���j�С�\#Ӿ}��s��/��"t,5���+�h-�Mj{{�/������}�cQ�o߾^�z999կ_ʔ)�:u�2eJ�U�B���hP�q��aÆ)-�;ＣX�u�V��L&Sy羯�o~~>�0����z��Z�O�>R�TeU5~ zE�0ӦM�ҥ�Ը_>�c��ͭW������V4�>��{���Ǐ�ݑF���^��b�
+�a��G���5��ݦ�����/�"�q����Np�/_&���L�ю��qw0�>bR��?�ܸq���6m*/�������?���O?ѐ!C�@FFF߾}��W�^*먤��Q�O;uثX6l�3�U�N�����ߪ�q·�� ��x���͛7_�`AEE����VJJ����'m4k�l�����^m�����}��ׯ_��ϟ6m999)�t�ޝ����@D���III������.\�ҥ͝;�avX���y�ƍ�H6l`ǀ�.]�����Zd]�Q�^�ݻ���"77W�mr����)))�w�*֟5k5n��ԩS����N�bχ�Wи�pD�?�O�&��ϟ�/nU�D�]vv������5{��/���-,,����H��8�.������<��<�)y��)�:uJ�@��^`]RRR�j���Ddkk+/����۷�k�w��D�c���6�ۛ�UV�v;����(}���������+H��k�v~���9�M<.^����~-U-���`�d�by���6333��E�ð��ڴi�b����Q���9b���7l�F����b�8))I�mr�{���Ͼ�����K}xVи�pD�?ǎ#"cx�
�Y���OD�G��W5j}��wU[�.�3U];������I�E�h�D&�թSg�ڵB�}'666����)�6`ii���5|��+W�T���V[Gk|�ᘽ���L?�x��1�;wN�޹�Z��61	�s<5�x�����d2�%"�����Ύ=�ZZZ��i������_�Wj���c����1�
���ڵ��������/_r�g�P<A���g��G$�s��
"***2X��[;2��iӦDt��1y!�/5m�T&�q��}$a/z.//W,�J�D$�յ���S�mM���O�>�ߝ1�ѣGdd��QhGߗZ1#��e���U��+�Jc����5��}�Q�F<#1N'O�$�gϞ	�;�ML�O
��G~_�|�U*a�"��������d�W>;I��qnJm;���_�~G�U�T����E����}��"�<[�i��&--���D4`��}� ����U�eWWW"b�O%���q�*����З/_Λ7�ڽ�]�v����Qh'  �����˧��ݻUNe��:U�h��1o��^�c��ݻ������%t *��o0i5M<ؓ���
+]�؇_�|Ye�DD-[�$�C�)�u��A"b����ӓ�=z$�p��Y���e�ر�=:w��v�������絪�q�
��_�Q�z�k׎�ا�ʱ�+v���X�X�m۶{��U;�c���>��C"��������t,[���͛J�n޼�l�2"�0a��y�}�]{{{{{���P��l̮_�CF���ܿ�E�B��o07��P5.�bx�s�N�^���w�ƍ����+!!��Ç��ť��w��]�n]@@�ߛ�]\\�lْ������i�&gggR���}Ȑ!C?~\PPp����
*��.~ ���m�N�6MW���/T����DԤI�3gμy��̙3M�4Ѫ��݇#�1�K�^�zecc#�>|�4����666�����kpttܲe�0�͛7שS���l٢��م���<�3W�\!�۷o�v�BD���������R�����Ν;�������/������,�T����b�
+�G_�eT,��ij�V[Gem����x���s�f͚�^ݧO��M����?���zǷ���9�:5M<��������"�c�R����I
�aJKK{��YuR``��m_J�!D4q�D�^��o�(���ŋ��ݕ�¯6����b���ϕ��ٳ��+0�v�H���ѣD���kCv���e_�j)��MI����hժU�ZP�i��*++����N
+		Q:'Sۓ'OlmmE"��c��Aee������˅D;*ה�g[PP�>渪��`��p�u�w�7������Q',,��'QCo��ւ���&&��u�W>̚&�_�������H$bՏ�OIjjjxx����D"������������`����FGG���������������(�cx�ƍ�Z��H$
6\�p�|�Rc�P���䯿��D�5�s��S*�w�^hh�������)S�gỻ���h�}tc����1d�*�\�:�Ν;Uβs�N"�С���}1˫���-]��]�v�������ڵ[�t���Cܱ1þ�M�i�������9c&�ɒ�����%����۴i��l1�L�k׮��`www�X����k׮���s�>_�������B8z�ӎb������[�.]>�����s/�I������b�},|��(�<ǫ��hTjgM�6��W�^Æ
:
+V�\ID���ծ`�K�����d���VVVx�?�4�1eׯ_:�0�o�P���T�$~�>�
+��͜9s߾}�s��5t�гg�<{�,!!�}���{a5V0B���g[AmT^^���*t ՗�������cm����L�b�C"�x���^?�M IDAT�&M�̚5K�@T\�ЩS'��5V0Bׯ_'����?B�ӿ�������)S����S�(��,�ML�9�ٸҙ9�gaaaDD������W\\�0/^��������֭��W_)]�m۶޽{;99YYY5k�l��يwW���EGGs\�[5;P*ԘMh�d�@�aHH<�Ptt����7o�
#%%e�����Փ5���`��G�^�vM�@�p~��W��
+0:t���:��3�o����cذa�5�����;�(�lݺ��/��ƌS�q___v������իj�>}��s$f��z�������ի������ɓ'���������o�:��(..�H$���Ё���>�Sw��2�h߾�������M�FDNNNJ%ݻwg�'$$���wRRRnnnqq��7xΝ;���(���7n��>�}Æ
�����.
+��G�|���������/Z����L�X̍���H$z��Ё����?�p���J/90	�����u0u�W����stt��믉(??_�����l�����/��2b�777[[ۀ��]�vў={��}B�?�8a�wwwww��'����'��1w�ܼ�<��I�Cb��������B����e��
�Zzz���kӦM�j5�i�D$�RInn.�'��>}���bKKKKKK�f͚ѣG�������w�Ul�}q�ݻw��$D��@I�z�"""�,Y��/霋�F<j�
L�2�~�("���Ǐ���O$	�j����䛢R��ODTYYYYY)��؛��I�����$����.�"$�f͚��ٳ;v��qqq��G-��_�|���0R��̙3���:0C�ɽ��ֺ�>������n,iٲ%:tHq���[o������I�!a�={V��#�P֬Y�>�`��������#��������-Z���%t,|]�|����胻�;%''����Y�^�!C��_��ѣG%%%eee���KHH�֭�ϼ�9s�֭[������6o�%�DD�[�f�dee���L�4I��+&Cx��!�jeĞ<yboo��w�	�Y6l���/t �T������y��p��ƍ�*�s����g�Jg�UO�5�L�>�ㄿ���gϞU'�_ޢ4BD'NT�E]�|`�@����GEE-]��ٳgB�b>�������� �Hv�ؑ����O?	/'O��۷��Q�y���������H$�myŊ����������������7***##������?���gccckk���s��Q+++������7�j�J"�4l�p�…�֭�a�"F������Q�F1j^�%�G�)t �ڛ7oZ�l9x��k�
+�����NHH���:�_|�jժ���6m����"77�����c�
+�$�㩃���꫍7޹sG�X̄���ӧO��F���?t����w�e�&	`�>\QQ1h� �
07H<����[�h1c��1��ޥ��/^�:�X,ޱcGiiiDDDee�����o߾=z���
+��A�
��D"IHH8q����ۅ��x{{ѓ'O������o��<yr�̙B��Zyy�����„�!��ҽ{����Y�f�5���(  `�Ν�W����:Μ9����aÆ	�B�
���e�*++,X t &������	/s��C�����_~��e˄�@پ}�ڵk���#t f��u�֝?��?�|��M�c1y͚5�믿���7eʔ���9s�,^�X�X��0x��w��<!��,22�C�B�bښ7o��X3f��������_O�>]&�	ѥK�=z.t �	��f�������ݻw.\(t,�
�(���ڵk����G�QRR"t8�m۶�m۶o�^�@�^�6m�x�����˗/�	k޼yff&~���#G�<y��ٳ���xg���<))i̘1B`��x���'����O�4���L�XLU���KJJ�>}*t `Dnݺ���աC���x�b�r�ر/^ ��$|YXXl޼��ÇQQQB�b��7oND��
+�������|�駟}���������#��hǎݻwoԨ�Ё�-$Zh֬�
+�
6�I��򲷷G�
U��☘����+W����n۶M舠v)..>p���Q����!������gϞ������:�#�ڴi��
+����[�n�5*"""44�ѣGBG�ERR�T*E�
�WH<���?t��q̘1���B�bzڶm{��
���������?�:u��Ç�[��?~qq��A��[�z������݅��!�КD"IJJ���5jTyy��ᘘ6m��U��QϞ=o޼�f͚5k�4o�|ݺux�ϵk�._�<y�d�
0sH<�����СC�ϟ?~<£�6m������a����b���7o�2dȴi�z�왖�&tP`�֯_߲e���@�
0sH<��cǎIII����7�|#t,��m۶D����'ww�5k�\�v��յo߾AAA���Bf���hǎ}��H$:3����BBBbcc/^�e��c1����
+�Ҷm��?���<  `����.]:(0�w�...?~�Ё�?$52}�����I�&%''��������:
+0=ݺu;}���C�rrr������N�<)tP`�V�Z���%t ��@M-_�<**����߾}�б��w�y����BG
�*$$�ҥK���Dԯ_���������s���g�^�r��0$:�s�N�c1
�:u�w�^AA�Ё�	�ׯ_jj�K�����
ֲe��O�m���w��5  @�@j$: ����Ǎ7a„�{�
+���ҥ�L&��?�L�;���o�egg�;vɒ%���#G������Ç���;c��
�-�x膅�ņ
ƌ�a���1j�5���z��Ё���W�ނ����mۖ��йs�[��5;�m͚5���1b�Ё�H<t���bӦM�-�4i�_|��{p�ܹ3�-kk�#F\�p��ի�[��4iR�F�,X���+th`����7n�8y�d�D"t,��;wntt�ҥKgΜ�^��ر#ГN�:mݺ��ݻ�ƍ[�reӦM�L�r��E���aÆ�����H�
�E�x��ܹs�o߾z��A��~�Z�p�Q���333�>}*t `��4i�t�Ҭ������ׯw�����ߎ���VD$�J�.]:y�dwww�c
�E�x�Ř1c����ҥ>}�dee	���֭�������̜����ɓ/]����㈈�5k�x{{w��yݺuo޼::0�S�N)A�ر#''g֬Y�P!�З���������}��iiiB�c\۴i���aÆs�����<~�x�֭?��3��#G����v��`Ȑ!~~~$"�L3z��
@��@��6mz�̙Ν;4��RңG$``AAA[�n���\�p�͛7���������3��}���),,�}������t�hѢ�����B�P� ��/������_�'O?~|QQ��j���Lpݻw�����. //�ٳg߾}�֭[���������������y���с�ݻw��ء����o��������:.�Z��މ��e˖�8q"55�������JJJJ�v횑�!HxB�֭[EEE�O��Z�n���'%%����.lܸqpp�M��d���_YZZ����� �gϞ��۷O�>x��!!�0�>}�\�|�aÆ}��]�~�⤥K�޼y3$$�V]����Ӽy��Ǐ��ڎ1��_}��՞={<<<>��Ӻu����#>>>''G��F���/�X�X¦�ϟ�w"""�?
@ߐxN�
���fΜ9u����P6�x����ŋ��ŋ���%%%B�i8���OMM:
+��cmm=x��[�>�|�޽M�6�7o^���{��nݺ��|���������d2�X<x�`�����H$�DBGat�b�?�p�ڵ'O��j�jݺu�|�	{�qyy�͛7�{���J��4�������yyyB���֖�@����իW���L�6�A�#F�ؾ}��W���p�֭��s��666���Ç$*�Z���jh۶����nj3u��C���+//?v��W_}%lxӧO<k�Yݺu'O������ɓe˖~��GAAA+W���ￅ4`���J���N�:�O��ի� Q
�NH<@_����9������yzz�oyd�d��K��[�N����ٹs�θ�
+L����ԩS�9�����a__�%K�4nܸY�f�~��s��������J��J$WW����w��I��j'$�������Uyaմi�N�<i���y�ɱ��	
+
+�����ξz��q�?޳gOOO����8p���L���ܿ_�O++���맧�����B�Pk!�^EEE|||�Ν���8�N�J�111�۷������k߾��e��c/s�����7nlmm���ooڴI�}>u�h��큁�������͛7�3g��m�ꂔ_d%R�X"oA'�bN�>}�`�u�s03t�P��K������B?�N�:-X��֭[W�\�:ujFFƐ!C���Ǎ�k�.�
+b��+�H�7o���޸qcA������J%�?D���(�J�r��������O�>R�T�M�8Q�NRR�bG�ud2٘1c�v��뛟��0G����u�,���?T���I$���z�]f������a͚5B�����������������ٳgtt���)t\�ח_~iee�T;w����K�#�GD���BGa�0�!�+V;v���!>>>++����…C�%����3g�8;;oܸ1'''''gÆ
���iiiqqq��?~�������?2d۬RGu6lذs�Noo襤�������.t���֭[�c^9�d�7�`U]L�.�(--uqq������!"�Dboo�t�~yyyfffxx�y?���ʪw�޸�
+�FӦM?��������#G�t��m���~~~���#G�ܺu+�Kh`�t���:t�p��1�#���1�aHD���خ];"Z�n]�
+~~~D�i�&�B��s�۷�7BDǎ�W`/Y�S��bG�u�v�JDgΜQ�(33��Z�h�0G���ģj�����TTTܼys˖-3f�P�C����_�:L����suu���:}��̌��
+
+b�A�w�}��U���{9���JKK��jˆ�"F��餤�Q�F1x�A�D���Ĉ�������www�
+���������nnn����\[[���b��-%%%�	+1caaA
+c�������l	�q�D"�J�vvvꂔ�_u�Q,�ղ�\ll�ŋu՚�1SXX��իW�^�|�2??���رcӦM��N_�����҂����j*   **J�_�x166V��[YY�?����ٳ�ϟ����hт�e�g�޽����
+����d�CP�=�9r�Ё������I�no�u��z���|ի^�Y���x�bzz�����[�	�H���������C
+yH~~~II�����
ꅓ�SXX�c�����EVV֯�������������LJa���<�0[�JKK7nܾ}{�
]���6���
�<����[���4i�Ҥ�-[��矇?~�������\:������ի�/_�ҥ��A�H$b������`�‡���1�L`�F�a���O�(:~�03�:BG
ՁaG��7�����~��'O�������6���'M͜9s�֭yyyyyy�7of�aP��j�6m
2d����=*)))++�w�^BBB�nݸ�$"��������Ru]lY�lmm�u�>ps�!��ۯ_?�르��gϞU'������ʔ
+�ԙ>}:��$�0*����e�������p6rؿ�=� �\�F<&�H>�l�2???{{�������������ǣ���I���~~~111G�eI�C+V�HMM
����H$������QQQ�AQ\\\dd����D"Q׾!���j%<�@�5�@@��{
+��8�s<u0�
z������;$�wH<@�x��!��C�
z�����D"�H$tʌ3*>�EαDݺu�D]�v�h�y���
����xxx���O�>��ŋ*[f&99944���������sРA����v��Q$���/*g��_D"Qǎ���De�b����+,,�̙3*�WG�����1���稣��jĬ�;���s�U6��R�J��Ҹ��:�ə:�av��V�^=+++��m�FFF���+U��G�mM�T㲘�ƣX
wa��^Scx*?�����7������]"�899u��a���.]R���)� � 11Q�����j�gSZ	�I�"WW~��m��v��Mu3�����ؑ����+�ʅ���
RY9$$����a�U�VQPP��%�ׯ�Z�Jc��ZXX�����B%��H$�ӧOk�Q�cV��f=j\vuMqD���"0�VwՎ4nrڪ����既����`�O���GW��Aj\�F�Z�� ��ɊV�o�Yrss���5������\A��J�:�39H<c�%���!�Ҋ���?���������>S7#5n�X*�r4�XRQQ��ŋs��}���666DԧO�L&�<|�p"rvv���{���T*��ʊ��wqq!��Ç3���+�H���#��>|(�lll���U�X����ƍ$�.]�pϨ�����?��#00��z��mG�Ƭ�;��z����|�I|V���|69mU�1d�"rqqY�|������ʊ��n߾�nݺnݺɫ�飫�~]�e�Ӧ�l<:܅�aE�\R�a*++���CD���_�fͣG��R�7on޼���?���s��3�?��*��9�a ��)n�5?/�GSZ1p�!�J=<<�h���D���VVV�rF___"Z�f
G�꺾v횣�#%''�%Ǐ'"{{�7n(U�qㆽ�=���23f�"�?�R�o����ƌ��w��<yBD666�3r7���EDvvv�vT���v�=j�OS�W��u+��g�Ӗ�$�&"''�;w�pT��GW��Z�e�٦�l<�څ�dEst�TaϞ=D��陝��1����DbƇ �?_%<�3$��v�dw������_����I۶m�ݻ������U�f�fϞ���k���_^^שS'{{{[[�޽{�߿_ގ�m>x� ,,��޾nݺS�N-**��[JW�x�޽��ڵk�0���)�J3�ڵ��6lXZZ��A�mѢED��{���ĂTV^�`
}��Ü8q��|||*++�*++5jDD'N���;G����͍{F�F�'JU/���_�C�Ӕ���&�_݊����e<���ѣ�h���������d��jYx�i$��va#Y�]+U`G�����>�H��d�竄�C
$��v�dwH��%�9e2��+������W������R�t��
U+�۩Z��ͼ��
(Nz���_t���{��+����'���`�3VVV����D�r�Ju
r|h�5�
6d�lܸ1���a�7nQӦM���dM�4!�cǎ�+=z���4i�x��U�XGq�ܸq�3r4���ѷo_�w��RGՈYew�ףƐ�4�1x�I�W���|69mO����CD�����d��jYx�i$��va#Y�]+U`ӹw�w�����A��JH<�@�!m7Jv����NII�ߧ����&%%���_�p�K�.D4w�\�y�_�|9988���gee���^�pa�СU�����9s�����ԩS���iii�W��MW��:�5���---���_�x�0̋/���-,,?~\�A�av��ID���/))a���+))!"[[[�O��������+���D4j�(y��#G�w�}�s������q|�JT6����U;f��Z��!�lJ�A��H��V���f�Ӗ�$ܟ	�j5�购ɱ��\��k�$���gQW���W��ؔ�R�D���F8f�(���!���W
ٝ IDAT	��H<��F��{��Q,d��w������L"jѢ��<�k׎�֭[��R��6[�jED��Z��~����E��x�'��G����5�Ԝ�3SYY�~V?��#�y*S{�Z����X+�Tu����ŋ9>Ϫg������>|��+W��Qّ�1��N���Ϧ����V�[_�&��ړx��[y���J�3����gQY�z��W��ؔ�∄���|>R�9��*!�P��`��(���˗��vvvDdiiiiiiaaaaa!�D"Q��g}[[["����A�Pc��3����K���2إV2��iӦ���0;v���6m����۷������`8>�[�nQ�F��?����R"u�<}�tƌD������S��ԑ�MUU���2$�MiLiR��s`�Ͻ�i�x�^������Z��Z�e�٦�l<�څ�jE��T�
�?����È�b"*//W,�J�D$���k�� �?_%$j��&�}2��0DTYYYYY)���;���������Cm�����р
�^b�y��AZZ�ʹF�ݲe��ϟ���OZu�w�^"b�p#���"bo"��-g�>��#"ڸq��_��&�ի����y��հ5�:��zTR���C�խ�ڛ��c���/4V��GW���T�1l<5م�jE���r��
��]]]���M\���nݺ���!��bb��9�j�x(v�ܙ�._��sF��۷oOD			*��CJ?�hl�,/��X��{9���nݺ����ܪv��댌�q����+[��������R���ݝ�֮]K���ù{��X,��w���WU�)E�^�UC�ߔ���&i���or�2��)�������>�����.�6�d�Ѹ�h\���誔*�
׭[733Sce�a���OD�W�V,\�r%
0�{^3>��*a�C
$��v�T�C�?N{yy%$$<|���������ݻ�֭�:���������N�:�V����.--�x���r���;w�T��Sc�fys9w���|>T����c��UTT4o�\�e�������/_�;wn֬Y*_ FD...�s�Rivv��+T�Ή��yZ}8S�L!"��;�vS���G���jJc`U'i���or�2�ă��{�\]]ccc333�Riqq�;w��+�����5k�,|�4��G���Q�h>K����{�޽��҂��;w����T��y�f"rttܲeKNNNNN��͛�ԩCD[�l������|��x���C0�n��v��ӧ�*g�/�J��맮������m����Z������T�����j�*u
��4U��}�D���QPP�>K����`������T^���;�����[[[�H�t��:|�
�U;fV
ףbH�ó)��U����:��MN[F�xk����i[Sc�|���w�I�l<*�Wo6��qI
+
+BCCUFboo�y�f�ʕ��*�.$$D����A��JH<�@�!m7J�2555<<���["�������FEEedd�����T*]�l���������}``��*�ׯ_GFF���H$�f��|����!C���]]]'O�l�/�С�ܹSe�;t蠮����f͚���cYYY���u���O>9��ʎd2ٮ]��������b���{pp�]���D�b��}�w8\%��ܹs9��TvT�:J�$f���Q1$Ϧ4�r����ӖQ%��d������{yy��b{{�6m�DFF*=�G]��ku[)�eQ�;�$�o<:܅#[�<�t���ÇoР���u�:u:t�0o޼���jͲ���K��k������ֶ]�vK�.�J�<;2�C��5D�Ž����>˟cW]�D�����'??�����Ɔ}��1�������`����q�0�x�O�2g���k֬!"�	���(	"z������%NjJ�������A�a�,--�4i2v��/��B�X�VC�a�***�
���N�����=�wH<@�x��!��C�
z����D"����)1�����j�{<�
�F#�wH<L��"%��Ś"��͛7&Lprr�W�^||<�|�r�ر...nnn���S'پ}{``������u����̙���/�*�Jcbbڷooggggg׾}�e˖���+uZ5f� ��f�Z��������oDTPP0s��&M�,Z�������ŋ�j�jܸqD�0�رcw��)�733sٲe��pႣ�cYYـ
Μ9#�p����ׯ>|��ѣ�İK�#&C>@�(������ׯ���O�6��Ə/�JK֮]��ܰa�Ν;������rss���/\�ХK�[�n-^������Μ9���q�Ɯ�����
68::�������)~0'H<���ի������k"���W*��>[s���D��/��1������6  `׮]D�g�"bC~���	&������O�8166V>	�.�2[:t`���奲$77���ƍDԧO�︄|8�ѣGDt��="z��w�2dݽ{W�ˡ{���#F�:
+ �ap���IOO���7@G؅
j���l�C�jB�a���������J�}"���ʪ�(�>�M$�銼����j��O


B�DDo޼9s�LϞ=�ԩ#t,�3������6l��.��5h��
��Ô�'�b�.W����իW/_�ܥK�Z�l��:th����ƒ�[o��������?�<z��I�&l�ٳg
�V�����}��͚5;t萅.�-$''T��M���;%''����Y�^�!C��_��ѣG%%%eee���KHH�֭�3��fΜ�u�ּ�����͛7�g��$"jݺ5['++���0%%eҤI��LΝ;w���kd��H��BIII�F�³�C$%&&�9��,&Lؼy�b	���.�R��OɌ3V�\��S�a������_u#00��ѣVVVDt���A�)N�8q�ƍ{Q?�6�G��s�NFF���S�s�Z?7�������H��:cŊ����������������7***##������?���gccckk���#�:�($$d�ƍ�Z��H$
6\�p�u�?��?��399��o�A�
P�`�C0Ȇ�v9r�{��]����������`8ׯ_���_w�ލ�����V`8�}�]�N��*t `h��������~��7w�B�Y�pa�Ν��„�0�+W��۷o���B������ߥK�w�}W�@@���|��RRR��л�����_���P�`���ҥK)))G�:F<@�,Xгgρ
+	#�G�Ν;r�ȱcDŽ�У���W�^���:F<@_Μ9s�ر'N#�/�}�]�޽���+t  <�x�^�>}�ĉgϞ:0
+��X�pa�>}z��!t `0�
�w�ԩ���s��	�x��}�������޽�Ё������ɓ'ϟ?��y�
#�бo��f��
ݺu:0"�]:~���.^�(t `\0�
�4�����
�Й�G����_�rE�@��`�t�a����zРA�:u:0:��8|����~��U�
c��
�a������w��Q�X�a�t %%�?�HHH:0R���bf���aaa:t:0R���ڿFFƖ-[��F<�F�Y�`��a�ڴi#t,`�0�
5�w��?��s���BF
#P}2���o�>|����б�QÈTߞ={n߾���(t `�0�
�$��,X0r��֭[�Ͱ�0�H�X�0L߾}E"��ѣْ���9s�t�������ںy��|�IVV���E"�H$�Y�0Lrrrhh����������A����K,{yy����9s����H<<<���w���'�nݺ�D��]����0��ݻ����իgee���жm������t���f���/E"�������������ْ
� "��D%&&ZZZ޽{W�m�������D�{�nya\\yyy�x�-Qy4sqq�~�:w�U�{��
��������B>)���HII�XM)�H������#aݾ}[>�͛7�V(((��ҟ}����-[����������T�L&[�p�Q�Z�l��f5j4�|"���O߼yCD������K"JHHpuue�u��a���׮]+**���?x�`�&M^�z5s�L]Eq��!gg縸�ǏK�Ҭ����x�ÇGDD�i�=Ζ��ݸqc������jJ�D�������dÆ
Ddmm-����c�9r���e������/+++**�}���u�u릲�������
6����۷o���|"
��K�{#�DȆ���ܹS,߻wO�-����mۖ�>������.]��ĉ��t����rW�z�SY~��q"����q�R�7n�c2���Zu���"�����V�:t���a�R����^���������+>|������ܹ�ݔ<�ׯ_��ݛ�\]]/\��=@��s<u0�
Z����?���ߢE�������d��鞞�b�8<<\$�i�F&��ud2Y�6mD"ѨQ�8��k׮�D���'N�r劏�Ϗ?��{�����.��6m�DD�gϮ�r�6m�̞=[^G[:�d���܍8p ''�]�vS�N������ۿ�b��s��mժ��������ӧO7h���ٳ


�j/$��]�v=|���o�U*7nܪU�rrr*++��'WW�[�n�ر���}��[�nyxx���O��L�4���b۶m"�hӦM���ܳ��:t��2��.Qxx�ʩÇ'��/�lM*�޼ys�ĉD��H���U���JW[��2l�0�Qu��=##�U�V�ϟ����)�R+C"Ái*//o޼��~�X�O���SRR�7^o۶���4i"�J�Ri�&M�hϞ=|zy������5Jc�7o:99�D��g�r��y<���!�������˺T�����3��(]��$;;�����ښ�5�ŋ����?湼*���Vl
�p��F<@;;w�|���7�|Su�ʕ+
$��h�ر���>LHHX�n�Çnj��g���X��cǎ���rԼu�V��������=zh�@���dɒ�u��e[[[���6m���6l{k����СCe2���84hР��죏>*++�v#P� �-TTT|��w�Ǐo֬Yթ���J%k׮urr������z��\��O/gϞ���������{��լY��ռx�b�^��={6eʔE��\����(U���"���L����������ӧOg̘������3>��C�IÆ
9`�a/�b�W[m޼Yދ��'=z�H��N�8���u���#F����j9$��m۶eeeU������T������!�H��������Z��͛���L6w����dkk�[��>}�j͔������/_~���k֬Q�f��a�޽{�ʩl9�;��ի����y��i	�([�Hz��n����р
�&0`=x� --���.�޽{yFղe���Ժu�8p`�ر���Z,�Z�?��C"\��������gҤIU'U=���O�ND[�lY�d	͞=[c/�'O&�v�ڱ�|e��֭[K�R�j�6m��D4m�4�L�s�ũT~��Q"rpp���t�޽+��b��+��#w��1��T�$7f�����1c�j��t���5�R1����}���������s<u�x%�����[YY����U'�<�>~�8�D���ʒ��F�YXX���qtq��!"����������y��D-��t�R��3fh�<�a��ˆ���%>>>++K*�fgg�X���>|x5:�2e
+���k�G�{�����������+�H���C�I�?������y��[2d�"ruu�����̔J����w��a_ �.��/��XS�N�^
+���x� �6J0-�p���rj��/_z{{с�����5���*y��{���ŋ��_����=z�؝J���K�?�(((8p��.����O�Ҫ�'O���ڊD�+W�h\�\������U+X[[/\��#�U�VQPP�ʩ���'�U�VɗWe/J�T]�S�N�w���gܟ	@-A8�S��`�Q�iY�v-�T����=���w�./��d�k���}���/������P�Ķ6d���T�U���k׮��`www�X����k�.>���h�ܹ����C)�)�D�d��ط��ܹS�ԝ;wQ�{INN<x����X,���oӦMdd�ŋ����ѣ���D��W_q�P�O��͗���>2��tE$%&&�9R�@4+++kٲehh��?�,t,@˗/�={�D"ٻw�A�������S�@�M�6���~���BDD�f͚7o^yyyxx�ٳg��$�AYY��ŋ?������?���0���={�:^�x��ׯ����ꫯ�L�RRR�hѢɓ'�yQ7�:H<����������K�
ӆ��*))Y�d�����%t,`ڐx�Zk׮���g_=
PH<@���☘���HOOO�c
���T[�fMQQ�_|!t `�x�
+o޼Y�dIdd����б�9@�
*�^����lΜ9Bf�(+,,\�t�'�|R�n]�c
3�������R�t֬YB�������e˖M�>��CH<j5�L�T�r����Jw�n!��Վ9ү_���ϳ�����1c������
��A�
P�=x���ɓ=z��ׯ_zz��+����:.07b�!=x���ں���ܹs


666���NNNB��#��_�%�J������r���


iiiB�f�@�v��}�a�����իW���7x�����B����V��￫VTTѱcǞ?n���<���+77����j������݉'�t�b���,!���<xP���������ɓ;v4|H`��x�^<���P|��X,vvv>}�t�֭�����>|(�H���bWW׳g�"��È@����C�p�X,���:s�L�&M��
+����޽{��s�bq���Ϟ=ۨQ#���K�j���L"��M�6�t���$�TEE�?��CD>>>'N����:"0g��
+x�x�bll��Q�.UVV֩S������τ(99Y��#�KVV֯��*t�KEEEu���۷����б�v���ؿ��a���_d����ެY3ggg�
JJJ5j��Q��Z�S�NB������k�����"썀,AQ�-��ي�{kբ��Iq�nk��:�B�{/ԺpT\�8QY2d*;lB���k�i!@������99�uo�w��*<�
+!�B!$wXx �B!���B!���a�B!��;,<B!�Br��B!�BH��@!�B�!�B!���!�B!$wXx �B!���B!���a�B!��;,<P+C�P(���
�O�>
+�gϞ:�ԩ�Ñ�!E���j�v�z�����K�=������aÆ���:�ҥK|>_Ц[�n
+�…b{�p��B�֭[�"Ć���&&&�F�
+�}$lL����MX뺣K�
��9~������������qss|����D!����\�tId	� �A[���٨����<>>^�i�����p��Q�J�==ztqq�p㲲��C��m���[VVF4ۻw/<X��~����w��HI�RCCC�!V}S�M!�R��o�Z����,??�W�^RF%Q���B!�|Ъ��	�x�6�رc�d2?�gӦM��|�w IDAT�
vH��p8�����ϟ���/���ׯ_;v,_h�xƌw�����ݳgOFF�����
+
+��ӻ{��3�fS�NUUU}���/_DJOO�葪��ԩS�!6dMMMLL���7��[�~}���X�$�����bI~�x<�ĉ_�zվ}�����������������K(HB!$�{���"A���[�g���V�r6�ݮ];8p���Ԉ}���<xPB��
���
!!!Ē���FLL�H㘘


#�L�2֭['���~�)S�4@r���lPUU��Bɝ4�
A��o�ZK��]�v
�������J�����B��Z�>�"�Ԗݺu+//���e޼y���7o��r�ڵ�y�暚�Ǝ���b�
+\�p��	X�l����HcGG�e˖	���Y���ɓ<OЌ��<yR�l�ijjʤ�F������
�e�Ν�իW���5wMB!�lXx���8��؋%���l�	&���gff9r�	�3"##��0~�x��Ǎ�K�
dmm��˗�
+ڄ��eddX[[4�	yl6;66v�̙�����~�L��o�Z7��o)+�B����@��4�)egg߿��dWL�6��d���?���uS�T��-[�TWW76���5�~�
+;vۘX���+X�6.������뮚4sI�L��������{��ƮT�$'�����u5�����
������MZo�B5��:q���3f���>���=Zp2O]�&M������9x�`c�>_�	���i4���׋������ƍT*Up
zsnٲ�����]5J�ۿ�k-�[Ɨ8B!��*ս\�n�"
+�ku���;�T*��_��[�VVV6*Ozz:MLL %%Elcb����`������wMM
qY�ٳgkjj�baaQ��b���&''g�…Æ
`�!	I����Zk�$�e��� 2qV}[!�B���ƒN���%)�r�R���#?�?NMM�!C�Ϋ2d���>~�X�&O�ܹs�o߾�۷�Q�]�~<<<���{���W��mL,'�;�Ǐ�����MMM����
VTT�f͚f��(Rn�毵����·n�j�� �BR#v�i4�AZ$�*CCC
����ѓc��SQQ9s��)��r����������>fk=}�4����߿OL�{��b����
@SSS��t	l6�8`r��!�8󯄍#�Mbb"�N��鉉��_+�@
6�r�7m��|��޽)))MXEj9�_!������ƍdi��s�CUU�pe-j�!���P���\�v�B�����|�322�T�k�JJJľvʔ)�:u\&^.�[\\��ŋe˖��ի��tРAcǎ%�2dȨQ����������U[[�����_��߿��bܸq������,\�~��Gl�Ν;Ϝ9���(젇��_&k]�[���3r����ž={�޽;99�������ӧO۷o�Ŋ"�B���;�Av�Ix��ŋ��o��6���:t���j9������]�w�^<x�����`�޽�u(|�y�!�5jTqq�p���Rooo��}||������������o%�"��>���jjj
+%22R�6i�@�4j�K�֒�������6LlN


�j�����~!�j&bƔ��%�#��#�C��*|Y�0���0u���f�PQQ144���x������uuu�hiiݽ{��ŋ>>>FFFt:��������ŋw��{;?{{{Ⲅ=z�喕���/\����Z�J��֧Q�_&k]�[���u���7o�7��ܜ�djii����Y�&%%e���M!������2!!�k׮������AbY[[ϛ7���u�w���I�&��jx���B�����677��E�>}�����爇��:4v"Q�4���eeed�@!�B2�G<$�? ��'n���MGG�����H�H�]7~�B5��,<�!z�����<n4���#!�BmLEES�#t��&&&x�C1���Y,�)���c!���{w:::di��"�MMM�b����!�BHf��@���#
+Ӯ];��!�Bm	��b2�L&�� -�h�all�G<�x �B�1���x��>��G�N�I��l���+**�+�B!�P�b���h�aoo_RR��)���	���!�B��)< !!��0���������B!�d���XWW��-��Y������P}}}--�/_��!�B�Fnnn����N�B�`gg���bXZZb�B!�f���`�Q1�G�.]>}���(J���
+�B�6#77��Ԕ�-������5**
+oo����8�B!�P���p���𨏘£o߾���qqq�O�lcccy<�AB!�Ps}������V�Sx���hjjFDD(>��qtt���LKK#;B!�j.�6�Xx�GL�A��=<<^�|��4���ёB���ƒ!�B5Wvv6�B�S��C��O�>W�\Qp%���iee7j�(��He„	dGh���*����Mv�ꕕ�Ev�B2���dnn���Jv�J��իWRRRaa���(!GG�Vq9��������N�'==�ѣGaaa���d�Q�ׯ_GGG��I��ܼu�~!�+99�s��d�h��������h�=j��p�.���w��!;E�z��Bv
+����>|�޽{t:}ʔ)s��qww';��������s�ΝdA!��Hrr����)Z.�G<���<==o߾��4J����ӧO���di��l�����������e˖���C�)a�
d�@!��KRR���-�)Z.����޽{gz�7GGG6����Lv�V,//oӦM:t����ԩӋ/���/^��{����d�@!��Hyyynn.�j%A���СC��󣢢�F	���1�>��U
+1b����#GV�X���w���>}����d���,K��.�BH�>������NNNVVVw��Ud%���������3���2���4h���Wvv��cǒ��-Z���Cv���������BH�TTT�����r�[x���׽{�Eiyzz�x�����		qww���UWW��ɻw�f̘�d2Ɏւ!��"�}����IEE�� -���c��ѯ_����PX�����b��ҢUVV���L�:�{����ɡ�� ;WK��B!�xQQQ�9���$���FFFgΜQX�������^�zEv����;v���~�����}ll�C�:v�Hv������B����!�R</::��͍� -��ƒN�O�4��ٳ
+K��ڵkG��Dv����_�r���i�������?>v�NѠ��]]]:]�]zB!$s)))���x�C2I�L�:�ӧO�޽SL���y����!!!?��C���SSS<haaAv��
��E!�,**��`8;;��Ek���ѣG�.]Ν;��4J��������� -Brr����I��t�}��!sss�C�&���X�!�B����;{{{��F�
+�8q�K�p�X�<==+**�nUUU������S~~~DD������Hv��'##��Ғ�!��y��I�~��N��5\x̞=�۷o׮]S@�egg�����g[�>}�S�N8|��۷o{��Ev��
+�BH�JJJ޽{7p�@���t
Ç߻w��(-*����u��������p„	ӧO�ׯ߇���(
+١Z1<�
+!�R�/^�x<��A
���3��\�|}}�>}ZYYIvE{�����sDD�ݻw/^�ؾ}{��n���eeex�!�R��O�:::�������������8 �4���ǧ���ѣGdQ���r??�!C�><!!��LJ�DmAff&`�B)̓'O�<+iHUxP(��;w���Pށ��������ݻw�� ���}���~�����:���Mv�6"##�T+�BH1JKK������Ov�V@��~��G*�z��Q��QrC�U��#>>�O�>555������d�iS222444��B)���P�b]����������;v�(++�k e��뛖����'�������{��iggٱcG��5���x�B!�07n�8p����AZ
iX�tiMM͡C��F��������m�mu�޽1c�<���뚚�d�i���@!����:44tԨQdiQx̛7o�ΝUUU���h4���W>��իW�Ǐ�0a•+W���Ȏ�6�M<B!�y��IEERjD�
K�.-++�+=��������d�����Q�F
4�رc4��8mVZZ����)B!�p��
www333����+<������w���f��H�
6���ܾ}�� 2��r��������t��Y������vvvdA!��>.�{���#F���h\�
+W����۷o�<� ##����?�� 2���ׯ_���hii���-KJJ����;w&;B!��ݻw��ׯ~~~di5]x���/_�|Æ
��&M�t��������LZZ�ʕ+׬Y���@v�6.11QEE��ښ� !�P�w�ԩ
t�Ё� �F�X�|������.�4F�
ׯ_';��XYY�\��� m_RR���
�̆B�[AA��7�O�Nv�֤)��������</�@HWW����ҥKd��k׮ݻw����***�
+�B�PH	C�Њ���إK�S �BmߥK��L�����Қ4��??�.]��[�N�iaҤI>,,,$;Hs���K�N�4���dgQ
+�>}��!�R�3gΌ3FCC�� �I:��cǎ+W�<|�P���9��`\�v�� �u�ȑ�_��ڵ�� J���6>>��ٙ� !�P��͛ׯ_ϙ3�� ����7�œ'O~��U\\V{27a„��ⰰ0��4]UUUǎǏ,��8٩9�&#qh���wpp����!��\�7��ׯ/^� ;H+��#�={��X�-[��*
?~�ӧO�����tǎc�X�V��,��ݴiS��L�����'��}����?�hnn�`0���?�7 �֐�IZZ��ѣ555


�ϟ_YY)���fo۶���U]]]]]���uǎ���ij���
+�����/�|�2�Bquu,9{����uuu�Lf�N��/_�b�DrVUU�����7�@!������ׯ_�����
+�'((HEE%..��� �����ڻv�";HUVV���.^���S�o�̙"�˗/��F�P�_�.}'����O�;V�3_]]-�ʓA���l>�O�!6b���Ç�ݻw��|�7eʔ�=888�X,��ƍ��o�Ą���!�B|>?  �cǎ�� �Osw��\nϞ=������d	,X��s�έt�;vLUU5;;��S�����ŭ[�X,VFF�ȑ#
�o߾�6���w��-))a��YYY�w��;Y�|9XYY=y򤬬���ǖ��»�[�n]]��Ǐ������;vL[[�o����}�F��FAA
���|��`0����|��#G��������������b�
+�fff���eee���BF�9y�d��B)���"MM�?���� �������R�'N�h~WHXTT�����)\\\����>E����?�%������%X6b��s�TUU��8���͛����p�A\!�=z�(���G�
���#�ݻF�I<�ٳg�7(%%lmm�s^�v���%��֛6mR�@!������_����6�F�͉˗/���HJJ�IoH���m���d�h��ϟ��7o�>K�WUU	��x<���ŋ��mC�N�L&	7PUU���|�lyyy���F<�z�*��ݛxثW/�*B]]h4�F�R�T*U��`�,**j�l�o߾
�����=B!��233���v��Iv�֪Y�lذ�S�NӧO�r�2�f͚u��咒��4΁�w�N�tTb�� Rflذ���ϛ7/11�(-���ۉL>�����˗���)))�^�2006l�,��.���ry<qR��
+u����̳�����P(ݻw��@!���ڲe���a@@�AZ+�L&�ܹs���۶m�I��0m�4
+�r��E��4·o�BBB�ϟ������n�ڹsg��h��b���
�ٳg�%O�>nйsg�s���۷o��|***?���={��ٳ0e��-���;
+icc�����qB!%���r�ȑ�k�
+�E6�888lذaݺu��������3�رcdi�K�.���N�4��=XXX���ۋ��JJJBBB�p��Z�����O����?y�dѢE�
�	�/^|��邂�����'OS�	�U5c�8w�ܹs�	, :z�hzzzUUUMMMRRґ#G���ӄo���H<܁B��ƍ-,,��P������޽{;;;WVVʰ[%���#x���A�շo_???	
�~��n߾]�S���'�;�f:�~�����8p`MM�p�����SNNN"#J�͒�oY}���w�ء��B!%���s
+�r��%���n2;�
t:��ٳ.�a�Jn��
���'O�$;�Trss#""��M���?�ر��֖�d�������M8�c``>r�H


}}�ٳg�9sF�
��|���֭[���UUU��Ԝ���m�v��}��T��ӧ�� 6~�x333����������?������#;;�۷o���!�R5553g�>|�ĉ��ҺQ��>�Ν;#F�8|��Y�d۳�ڲe˶m�233�����ҀC�-[�,//OT��/���khh��!�jk6mڴm۶��8�=�P���a�С+V��駟���e޹r�?>��%nW������>>>Xu(������ܰ�@!�d.11qӦMk׮Ū��d�x<�����/_޾}K�
+5S@@@hhhJJ
+�F#;K����

�?>u�T��(WW�����?�$;B!Ԧ�x�!C�����^�Ll��?�
č�KJJ�iP�-^�833�ƍd�$<<�������D���������ۗ� !�P[�u��gϞ�;w���K�
���.\�t�R��P���z{{�D�Ǐw������� �%""��狝�!�BM��իu��mذ��͍�,m��
+����9�r��˗/�o�hѢ���|��'O�8��J�ŋ]�t144$;B!�v���M�6�_�~˖-#;K�!��f̘1��Y�f}��Q�)�!C�t��u�޽d������� ;��y�����'�)B�6e���yyyG��R廷�T�)���<<<F����/��6
+��p�‹/��撝E�/^�x<<�G����_�z���Mv�B��>q��ѣGmll��ҦȽ���.\��x�&M�����pm�ԩS���>Lv1�����������\?~�&;B!�Fܾ}{ɒ%�7o��ʜ"߾}�ݻw~~~<O
#�U�������믿�����"�������d�P:<�޽����AB�� ..nʔ)S�N]�j�Y� �����|�����йs�*fĶj�ҥ555���#;���?���4�
+�B�P��OKQ�<x0d���?j�(
+�2l�0�|>��ﾣP(�'O&���~������L&�S�N


���
�_�Ư��R?�C����W��5���TEEESS���i����^�i2l�0ccccc�C�^�t��A;u���p��,!�Hli�K�wA����:�nbb2jԨ��p	���Y�@Rv"ЧO
+�ҳgO�]���ϝ;�cǎL&S]]���iѢE"�o4ak ��YAA��	�t�r��A���Q|�u��N_�v�"m{~��gcc���J����E�P�_������T�����������˗/�
ѯ^�*X�g�011),,$���ۢ�������׷��.o����R	7�4+++:t��6���eeeb�=z���Ҋ�.�zI�.H?b}[[�J


m�[ y );!�������y6::ZGG��~��5BJ��b��ޑ�� IDAT������䐝��R����`
+�"�6j���\UUս{����<���Қ��H�СC���555r�����9���������n��qss۹sgtttEE�ź}����54Hr������A66�ȑ#
@OOo�Ν���555����ӧ��ٸq�@WWwϞ=l6;333((�8�mܸqu�@��l�4	���0iޅ&t[�qMMMLL1]���Gc�l����~��`2��d��g���;��XzaaaMMMbb�}���!��|~YYYϞ=���233��Җ��y�ʕ4�8�
5�ܹs-,,��)��G�jhh�x��w�;
+����0a��G���urr�_~�������fΜ)�U�_�555���Zxܽ{ttt$4{��
hhh��Ĉ<CjI����&a��ƾM.<��������>eUx���v��
�����P��Qw%%%53B�������C�������,m9�W�XA��.\�@��m@jj*�N?y�$�A��5k�8::ʤ��;
+gΜ0`������Jǎ�-[VRR"x�ٳgӦM333������^^^���<K\v"R�^�t	\\\ĎH<�p87n���RQQ���;~��p�?1b�������ܹs+**��b�TTTΞ=[�)"Lee�O?�Ԯ];����K}.�K4�r����ĉ%�A����?����Œ����2011��L��q���!�ٔ)S`���b�]�~=L�:U$�ŋ
��¢������/<��|dRx6�OYW�^��:;;@HH�p����@���C!����aÆ���?{���,m9�y<^@@���q�)
ڀiӦ���	v"�5u���Çˤ+��G��ppp�r�}V�j�]�v
��#��>|8�޽��3g������D���|SSS�Ǝ����.����`"�@T�`_�~����ӧO�N�:�ڵ���op�ٳg6�G�l��Q����ܬ��Vwy����H>����;t��" �������H.�koo��W�	��T]ҿ��V���V?��cc�l�����Kn����|~PP���7�?>hjj����<y��Ǐ���!��Vaa�������7o�΢H������͛���"r�"�R||<�J�r�
+�A�|>����~�IW�;
+G�
33�˗/���WVVFDD'��X��h���{��ݒ�6�����{�n:7�۷ot:��`K�������˫;�ࡅ�ŭ[�X,VFFq�@߾}�K�.�:<y򤬬�ɓ'����o&M����%�)"���Yhh����gΜ
kkk6��f���0�]�&�p999ĭ['M��`���X
+���G�-<Ī�sUUU�����Ar���J��9c�Aϟ?�۷'^ۜ�C����]h�R����H��q��$++�F�1�L����B&�I�R322m���F�%�rmm�3f�\i֨͋R6yyynnnfffqqqdgQd���p8'N���z��9�1Z��#G�����ʊf277߱c�L��' ���������֖x6b�:�.إ>7}Ĉ�o�>��޽{
`�ȑbG<��KRSS
@KK�xإK��E�7o�T�LUU���f}a�VĔ����#�Ô)S��(�@OOOP��KZ�jU��ַ��.o���.�kgg�=�����\/�߅F} �mhh����&Dmp\i:ٸq#L�<Y�dҤI�a���bcc�n�:v�X����~���Q�!��Szz�������O��΢DH���f�ǎ���)�)A۪��X*�z��yrc��l�&8����	���
�F��h4*�J�R��3>�������tH�,޻wo�a�^��;�b���wCw�$��)xW����
+�˗/b�%��}*++KGG���������T0�d���T*�F�g������2""�8�kΜ9Ҕ�D�X[[+���f�N��RҤ��V��gϞccc���4�)ҿ��V�qNN�…
@___dBIi�l�M�
x<���
������wA‡*11q����ߓ���@����###gg���'ErB�_d�3c�&�y��M���>ӦM�����S�rrr��ӧ2�MxG����>|>�k׮0o޼��D�T��]�aMM���
���|���g�[xHH�
+�Y�fu�޽�g%�������������vvv�fb���2bGp��Չ����?y�n�۷o��ܹs�<G�\���.�0--�؛�r��C\\�e���~�������>[������s��@Lw+��C�w�Q��ט82�����>�_x<|�P�o�Ç%�677444�!�l�n�J��f̘!�)L������,X����ך7VZZ�����ÇI��a�X�;
+ݻw	�{�_�X߸q���O?�D�Y;������X�a݅uO��u�"�o***�������k !L`` �:uj˖-�lٲ�#.hvqq!���~�
�v�*R�8q�8|�`��O�����/�믿`Ȑ!R�T}��tuuu%4��>hjj6j:]��ӧO����\)߅�v[_���D:�N�Ӆ7�b
+��IH>9��砺�z�2#��GEE�̙3�T�
Z™�J���E�p8���jjj���#;K+3o޼��ۓx#���p��m>�w�?&&&G�IKK������NLL<|�0q�T�N�`��Յ����ŗ/_666������[�ܹ���-DEE�7b݇u�5���///'��V���ŋ�t��S�����
+������r���,--�T��Ǐ%�u��PQQ�[ZUUEl��[�
+�	��_�pa����ɓ���}�ԩ�������'OjiiՑ4+%11�����]�RRR�lveeeBB��
�˔��􂂂233��
+���%�@P���D~����Bc���xΜ90~��F���£��XUU�B�ԽiFF�JUUU%6���lٲ��˗EEE���yyy��7qɍ�m+��@	DGG������
+��D�ׂ�"s��9s�0�LY]-�$rrr������O�\�~du�RdG���^,���������]
GGGb�����ž\x�o�LLL�%v[E�I��#FH��V�*����б�s��
�����ic�
+���En�A�p���.8E���$����r}||����W�(	CH迴�Tl�"/,--%&�����Gxf0���(�$�i�)	��Q�����jjj
+%22RʨҴ�܀��`���bs�Lj9��DWW�ݻw��A)��n�::�������W��(���w�֭
+e۶mdiM�.]jhh��=�������'U7S�}������Ǜ��1555������(��ٱc���-�ɴ������kkk��U�ر�X�s�N�#�}��¤�$�fC���s��!N�022j��7��X�}Įq�����`	��#�&����CL%ԫW��wH zL&a��������l߾���EMMMMM���e���u� j�$��		L}������8�|�Y�x<�ŋ}||����t�������ŋ���;hmmmǎ%�i�)	�%�� ��7^�b�
Ҽ
������
�0�����͍���~͚5������4MCC���iɒ%�S�J�!Զ���{{{�h�u�։��R$
+_�fR�߿?00�~ڽ{71i=��������_~!��V����m۶�:VN{��
8p��Ǐ�=����W�X���W���B���p��ٳ~�z��'O��ۗ�DZ�n���\�r����ӧ��F�޽���P�WWWy+�ѣG?{����477�ȑ#k֬���)\~Ν;7|�p�:B!	������׮]�v�ڄ��:Z��xăp�֭I�&y{{�={w�T^^޹s�ѣG�߿_�Coڴ��ٳ�>}R�$�{�ww��������;ww�Ǐ8P�!�B�TNNί��z�ԩ�={:t��ɉ�D����#�#F<x����� ��$�������>���l��w�[���PoooSSS��;.[��ѣG
+�G�qpp��!�����rӦM]�t����C��?�UGK�r�x���G����s�ƍ=z��E�r�nnn����o�V�+W�#��E�SZZjff�q��ŋ��!�jA8������W��|��%K�7�E-M�=�A033{��iϞ=@Li��C��������E��f��"GTN.\��x3f� ;B!�R���cǎ���͙3g�ر)))k֬����j�hjj^�reƌ~~~�v�";N���w����.[����*lP*����6��:p��ĉuuu��B����z߾}���?���СCSRR���chhHv.$I+(<�N�8p`׮]+V��������N�r���qqq�N�R؈'�����>̚5�� !������Νkll�믿���gee7�E-\�(<.|��IXX����R͡�(����g�^�vmEE�bF��C
v��ѭ[7�
!��2{���q㜝��ݻ�bŊ��������I�5������[��={޼y��8-�o��VZZ���Ұ𐷸��+W�wA!��MRR�ʕ+��͇B���ݻ����z�j###����ie����=|����kܸq{��!;NKdbb�f͚�[����+`8�
+��M3��Ν;���njCv�BHqJKKO�:��w���۟>}z�ԩ111�/_<x0��R���MM͐��u��-]�t�ĉeeed'jq�.]ڱc�y��)`,UU՚��fv�������˹s�~��V�}B!)eee���W__?  �����ӧYYY۶m���#;j��~ɞ={6y�d:�~���={��ey��ـ
�_�>r�H�t�ĉ�������tB�U��O���/Y��ڵk�?�9�B�a���w�ܹy��g�TTT���ƌ3b����-i�G<������{;;�
��e�ׯ�ĉ+++�:���Nee%�Ñ�(ʩ���رc


Xu �j{***nݺ�`�;;�͛7���_�t)??�ƍ3f�����i݅ݾ};  `ɒ%���Ùv����EEE۷o��(:::|>�����=N"�^"ܒB���������蘚�gQQѴi����

׬Y#r���ٳ���e2��:uZ�|9��<�f��m���ꪮ�������c��VĞF%���ʹu�V&�9�|��B���b����Z��8�j̘1���ӧO��շo�Μ93n�8


�c"��W�^���urr���#;KB�&&&�o���HHMMmr>�"�R��e�7n��ѣ��ӧO�y<ޔ)S�v����b��|~uuu����64h�����B9�f������7�+�B�,l6;::�رc,puu��h4���%00�ҥKdD���x�;�ӧOfffݺu۶m�K��d�kk�_~�E~C���@III�{��۹��>--�Ç,k������f���:t�hy�ر��ϛ��]�|9??���2""���#..�?��={�������?~</////�رc��ڏ?�~δ���ƍ-,,3CB!$+���/_�<t�����{�补����x����x__ߛ7o��>88x�ĉx2�rQd��<oϞ=�5I���d�iBCC
����r�8m��ݻ�餾O��r��˗/��999b��k׎xHL9.�gJJ
+�����|ggg8q�p��G������lb�5z��G���nB����bEEE]�xq���cǎ�ر#�J55�=z�<y2..��咝��u�jU����iӦQ��S�N
0��8�:u��Ǐ��2����w�^�&�P߬P"ˉ����L&�XN�uYB�P�C^���4M�	���f���Ԫ�����


����k�NMM��._l6��d��4nܸ��Ԩ�(bB!r���gdddeeeeeeff~��%99999�۷o@�R��������թS'��_��d�������~�ܹ�}��…���555�C�)((���~�ڵ��������$77W=�E� tU����!�r�u;����
+�����'�9޾}���_�z��P�U^^.����fWTT4�C===�555UU�f�CM��p�������������|�������E��s�UUU----,,F�ݩS'[[ێ;
+�/F�>m��}}�����W�Ο?����Ǐ4h١Hchh�u��9s�����{��y����_�~mN��=�á�e��tppx���7o<<<�6�ܹ�Ǐ�ܹ���'Xx��m�ҥ������ׯ������ĒgϞ�/?��[�`A߾}G��̮B***������JKKKJJ�����KKK�\��_��b������KJJ��n5B�Ptuu%,TWW'���.��֦�h������pW����溺�
+�F�ikk+n�e��������������b���uEaaa����Bb���������������ffffffFFF$�j��l�A7n\�~��Ν����Ϟ={׮]J;A�̙3/\�0w�ܨ�(����Դ�G<������BBBƌ#�/�,X0s�̑#Gnܸq������T*�˗/O�>=q�DDDĔ)S>~��x�b:t(ܾ}���tX]�v�����ŋ��ݫ��^w~[�������#ު!T���۷��������|�粲2��b���UZZJ�"/g2����:::T*U�_�fccC��B5ACCCEEE�PEE����?TUUUWW�p�#vaeeeMM��‚�b!Q8��$
+�&�QL&S]]�V��h�v4)T�
��[���V�F�l6[𰤤��f�����b�jkk��^UUU�_...�ς妦��ڵkBN�$k��x�������_�|����ѣG{��Ev"r$'';;;����˗/�mϋ-������hr���'O�^B|2����%.�믿����kjj�����8p������Z�޽K�$3g�<~���(��o���l{{�E�mܸ�	/G�
\.7''�˗/�l{Du���������_PP �ө��ٮ]�v��iii���jkkkjjjii	j�KGGGGGGKKK�`Pr�zAaSVVF��(�8NYY�{���1#�:��F��H��&��&R��tuu���q�F[[��`���Œ�������UQQ���'�'�H��!99y���ϟ?ܴi�r�ظq�-[bbb:v�(�n����l�Ҝ��X,֪U��ܹ���C�A�U�
><x��˗/����t����������������ٳ����III
+���v�ԩ�/���ĉ۷oOII111�����f��*�(��o��'�{�.&&FɯJB����������������!
+��g0����۷755�����ӫ�3��@�"JTxBBB�t�޽{ǎKvE���vuu�ԩq��ܼys�������=Js���>�޽{���dgA�LeeeJJJJJʗeddddd���
444��eiiiii١C+++###�Z!Ԗ(]�
EEE�V�:|�����:Ծ}{�)Txx��A�N�8!|9u3���8;;������˪OeS^^������p��u�� ������ӧO��+;;�x�����Ғ�.�҂(3���F�6L;w�ϟ_ZZ�m۶ٳg+Յ�˖-;|�pLL����L:,++���

�Io�ĉϞ=���#��PkQ]]������K������r)���Y�:��_�P��*++7lذs����:t��ʊ�D
+RSS���nbb���YU\FFF�ׯ�Io���ٳ~~~w�����!;B�^yyy�������޽{��}jj*��%�stt�ڵ���������-^z�Bu)u�A����={vzz�o���t�R%����ׯ===80{�l�tؿ''�}��ɤ7����ܭ[7???�z�4��ّ���޽#�
�)sssggg''��]�����!$
,<*++׭[�g�OO���`ggg�)ªU�������G��;wnrr�G��ߕR���������~��
ީ!ҕ���}�����o޼������f0]�vu�������
�1B�U����DEEDEE͛7oÆ
"wJj{jjj�w�ޮ]�ػ� IDAT����p�{��m۶5���JhÆ
�6mz��E}�VG�Umm�Ǐ�J�͛7���|>��ֶG�=z����pss�!$Xx��u��…KJJV�\�dɒ�}���/_�������3g�lfW������-,,��חI6ep�޽aÆ���+V� ;BJ$55UPi�{������ȨgϞ={�����ѣG���	!�H���UUU۶m۾}����={����+V�8x����ﭭ���OZZ�������===e��mKHH�ٳ���㉛�#��'===<<<*****�Ç��庺�}��uwwwww�޽���)�B���£^YYY�W�>s����Ã����_�bq8�>}���������~�|����o���p�B�k�JKK���8�&B2�f�߿��_III|>��Ҳw��đ�nݺ�UU!�`Xx4���Nj-����…��WMMM��^BB�����U�֮]ۜ~���ڷo��)Yk�jkk�
����W�^u�Ё�8�UUUQB�\���a�^���������⢥�EvL�RjXx4���f��ݛ7o655ݽ{��a��N${�w�^�|��/z����NV�Zu�֭��Xk{�|�����+W?~��#����o߾���|����w�***������G���=<<�d�t�j��VNNΊ+Ν;7p���[�6g���x^^^999QQQ���M��ʕ+�'Of�Xx�P}�|��ŋ�������1��8�&</!!ApL��������B����@��Ɖ��_�~}HH�����o����Fv"����rvv�6mZppp�zHOO�����������̙s�ԩ�/�;��8�����=‰��vw�ؑ8����ѭ[�6y,B�IXx4EDDĊ+"""ƍ�e˖�;��H6�=:w�������oZ���x}�Xı�`ՁP}8NBBq�p��`�X
+��ں[�nnnn���8g7B�RXx4ݭ[�~����t�
6��Hƌ��͛>6�����&&&x}y]K�,ٷoV	+((x��eTTT|||\\\RR��QWW'jB�Ν�3�B���f���=q��������V�^���Mv�fa�Xnnn���w�ޥR��}��5knܸ!�����&''����:f+�~��M�6�<yrڴidgA�L���?~��O�>q�\uuu'''�999�D�!�&a�!%%%۷o
+
+200X�~����[�Ս�������7o^�l�`aNNNttt�3z]�vm�ĉ/_�{��I�.]޾}+��-��%ΰª)!6����GA����FFF......D�ѥK�V�7!��������;v�ٳ������7o��$;T����ׯ�ի<y�d���VVVQQQ��$99�ѣG7n������h<���{{{߻wO��[�5~����ȫW�6���Z��S�ySQQQ���������������еkWgg��~d!�P�`�!c���7n�x񢭭�ڵk'O�܄�H��񼽽��Ң��<�z�j�s���nii)�xٲegΜ����%��<E�ѦM�v��Ifo)222�
VZZz���� ${�
�������>���
���!q@���������AEE��!�ȇ��\|���?�8q�D���W�^=s�L:�Nv�����$�������x�`0��㏥K����r�ʄ	�v�d2.\�}�v��ma޽{7|�����ߺu��Ԕ�8�@mmmbbb\\Qi��Ĥ���x<{{{GGG'''��h߾=�aB�DXx�Q~?~���|ժU���x��հa����jkk�%
+���M��VӦM�|���������͛��*mCjj���M�����ϤI��u�v��U]]]�C�����������DΛRSS�ڵk׮]�Na��BHJXx�]k,?����.]���ϛ
+����fee%Ҿ����ή��@�=�J=~������X�233�u�v�ĉ�Ç�x�͛7����3f�ؿ?�^�Z����������P^^fff��''��]������!�P��������oذ!$$�����_7n\˜ť��z����]�A�����O���}���#�.�s环��lC���f���;::���())IGG�~�:y��o�>|xʔ)dgD�^\.7--��.�c�>}���ccc{{{GGGGGG===��"�j#��P�����7���X[[/]�t����}w�u�V}}�9s�(8aRR҄	bcc��:DP��^�z�x�B�kŞpٽ{w�d%ϬY�N�>��p�ԩSO�81q�Dmm�k׮�}KP�R[[���"|(�ӧO���`ff��_D��7G!$?Xx��˗/�v�:v��F�1cƊ+DN��p8߾}۽{��E����9rd�����e
+%33��̬�Şp��˗�a�jǏ����'�šP(K�.�믿x��Yr�!eF�1E�HMM%~(..&����hccӵkW��[[[<!��"a�A�����{��ݻ���lҤI�W�|S~���ɓ'o��ի7oެ�xiii�f�z��)�������]�v�}U��*++���QQQ�{��ǨT����ܹs7m���NF���NNNNLLLLLLJJ���Sbb"Qf���w����񯖖ّB)5,<HVQQq���]�veee
:t͚5�z�rqq��D�R'O�|��I���l|>�̙3���UUU�]m*�ڻw��ϟ�����ҥKD{555��񶡰����9//���/g0,سgY�P���r?}�D�9����noo/8�accccc�f �j���h���O�<�s�����޽{GDD?K�ӽ���^�Jʡ����y��ݼy�B���
+����]��)X,V�.]����̲���W^x���;�j����$$����"�"�i�a�p��tl;U����cO7�����t�q�8��8u��sdZ+ԥV
�m���(�%!@��$!!���s�d�m��|?pn����w/x���}�{-�+V\�zu��3B��(..^�x���O[[�����3�\.7�LL&344�>`�i�0� xL"f��_���֭[�Z���-��JJJ�x�"}������ݼys__��hd�X|���-[�n�O?����#�̝;������2�ў={�o��u�^���"##+**&��LiV�U�P<z��6W��Ç2��b����DFFΞ=;22�6c
+��`�B�\�ryXXؠ�aPl6{֬Y���S�Tnڴ�…V�5==���p��_~��'O�X����?��
+�OQQ�3�<3쓾!��f��w�}�w����S�V�}��q��ӥ8��M���R0� xL.�������;�dB�����+,,�����VkWWW__�N���������t:������o߾��g����oݺ���E��B�z=}:�V���s��t��-__���h�Ϩ�\���ˠF�@������$!�������A��nnn����r�|�@ �r�\.���s�������s�����B&��b��F#��KMMMKK{��g&��!atuu����������=�P(,����X,""""<<<22���:�j���1��HD��_��b�����e;�!t:]oo�V���tz�~�N藯���<�b�tww��|�PH�~q8����z�L&kmm]�p����t����A����f��l6www�����e�Z�Fc__!���wشF���r�<���������
}���dJII)--�CF������ꚜ�L������c�������6��������=""˾
(�I$;;;++�~��`0,˰�i&�)._������hT*�Z�V�T���j�������E��F��0\�q6�{�����!;��0��\.�G>�G�EEE}��2F&���t:�o���g�8(qutt
+Z|>�����������������͛ׯ_'����.X��?�AZZ�T*�Z��f��R#,,l���<&�����;������������c�C�����s]����B����P(���Cg[���NX�^?(��G>~�X�T�F�����"�(88888X,��b�-�0�j�X,J����.E'JB|||��(�D���p???G0�!xL"���uvd2�\.ojj��'����B�H$���rww���gŊAAA4c�;����ޮR����[[[U*Usssss�L&knnV(�_P@@@HH�X,�5k�m`` ��p��`CFSSScc�L&3��6�J����'�
Lu����QYYY��4
!���FDDDFF��␐���������`|�>9��j�@�ryss�\.���}���Z�&�p8���0۰5<<<:::44idb������(�ʖ�����T� 22�6?*  @$a��S��1l3���Ǐ�=�������V�b^�4c4
+���Oǻ������f��������D�Dm[���$��1.���JKK�ݻWUU%��!111�$::Z"���Ĉ�b&���baBi4���ꪪ������ʚ������.�H�̙#�J�R�D"�ܹa�����&z�6q�)R���!!!aaat;00���<��\N�������⒐�0o�<�1bcc��?��zzzl!������������$$$H����D�T3�&ڙL&�Ri�
+�����n����}8NpppPPPHH����-Y,���ʢ����������V6�=gΜ��Ĥ�$�T�o���ihh(}���L��r���7�,X�੿lN�R8p�����[O���t���:3�~��R����ɓ�Q�iQ�
�HD_%	S��7`6������⢢�7nh4�P�d�:LHHx*���g�ZkkkKJJnܸq�ڵ��jgg礤�������ŋ�����}}�޽{�=j4ׯ_����
+����.�[2�L&�)
+�Ba{e�P(����ݠW����
�ct]]]yyy���:�.666%%��g�]�x1fO�����s�Ε+WnܸQRR2000o޼�+W>���111ߨ��7o���t��Ţ��Y�tiAA����ޯ��~m7��

�ݲ��n����k�T����s��]�r�h4����Y�f����*n��utt\�z��ٳ/^���NLL�����̜3g�G���S�N���.//g���o����|�����V�[ZZ�ryKK}��R�T(���mmmt����@-�������������c0����g����|��...����׬Y�j�*G�0<��XXXx��ټ��������7���?���`0|��G����dL&�l6�G ����҅B��?�J�R��M��r�b�8   ((H$ь ������	����_%%%999�O�������x�嗗/_���]�XY,���ߧN�:}��V����ظq�U�t:�_��?�����j����^ �Pa�e�������<1��	�8s���ݻ������6l���/���;�.�o���????''�/�pvv�X,�����{^^^bb����t��5����b9y���+��֭[�m۶��DG5S0B����s������۷�ƍt-�����l:���Ν;,��
`����;v�ZBBBVVVZZ�ÇO�81]S�����)��T,crZ�jUAA�F�ٹs�@ `�Xqqq�''���5�J�#���o&���_�j�ҥ>>>����;6k�,G0���ܶo���аiӦ���ٳg��'�v�Z�|�@  ��X,6��`0Z[[],LO3.x�������8q����			��`�xyy�۷����b����+			yyy������������niiqt�0=ͬ�ASGGG��۷7o�<I���߿_*����q�������|���hܵk�ܹs�\.�˝;w�={�_�@g�����{/44���%&&&;;�~�=�J������=<<\\\"""�~�m�VK?Z�v-������X,��b����1��~ԞihhX�f������ϖ-[t:��}F(f``�o�ۢE��B����H$Z�v�+WF.�n���W_}��Ϗ�b�zU
+
+F@@�^������?((��`\�zu�j�x��������+V�?��dΙ3g�֭���j���7�tt�0MYg�����}/**J�T:���2�˖-��b0RSS�~�t�R��H�-YYY��9s��C;�X,/���Џ$�V��Z����^^^��'NЮ�?N
+�j�z���joo
+
+����?�����3�m��P�~����G����Ʉ��{�ڟ�|@IJJK����d`6�7l���p�߿��Z`F�D#�����\.��Ç�.��ݻ�����~�\n0nݺ�f��պs�NB���DZc�T*�J�:z�(���{�nz8Ί����|�V+��V�^MIII��/��>|�x���Z���nݺ���Dپ};���ɓ����0��h4���!�~���=���oBBBB���zzz
+�����.�K����P(�FcGGG~~��e�F.���?����6�zU/^�H
+������� �l�>j����$a2�.\H��x�\#��c2�D"ю;]�`t�ɡC��~O��ζo<r�!d�ܹ�?�p���˶���	!|>��2쐗>2������uuu����H[ˊ+!��_8@y����`:::����gk9{�����C{X�l�k��v�ȑ��ڱ�A�퓒ulWU*�Bv��I�����X,c�v��<JKK	!7n�pt!0�͔�xTWW��Ɩ���q����r�z�J����������`P��>>>�F�Z-
+]]]�
��A��s8���je2��nҰo���x:��>M�~D� !l6�h4�ݚ��%���+����t��=��p���;;;�S\	!����z��ܺu��_lll�����q��q�P8B�]��xzz~��z�ܹ5k�x{{766�X���p�R����~���T;��N*QQQ�ׯ��o~��B`�c9��	��h!�c��Ė:��b���/��_����%
+
�V�


uss���~�b���kkk�޽{��ͻw�^�t�ҥK۶m;}����ۧ�1Z�zu|||EE�����|�R����㥛*|||���]L3�V�������jG2��ٳ	!�Ν�QTT!�…�������1�Qd``��Q"�B�޽;�0�n۷o���}��v��QQQ����vԞ���C���m-׮]��ŰX�����z+77����r���oT5���`0虾���tMțo��f��X���;y�L�G�т
��7��5�-Z�(33��U����B�|��
+��`�}����rOO��Ǐ��j�Z���Mg�Z\>��A�t>�?���^ok<v�!�������


:��`0<|��СC�-��|���f�Y��3����‘{j��֣�dɒ�'O��r�ɤR�v��E�r�#�1���U�Z�f�9&&��������~���r��z��q'''�L��B`��t#��s��%����;���a4�y�a��`X�d�Џ��������c	6l6m���#�Q�FH��ϧ��:u����9rσ���#3l��M�F.cؒ�rU)�P/B�{�7������ӵZ�MMM��ޛ7ovt!0#L���x۶m����m$=I��={����s8����n{ ��`عs'����5>>~׮]���a�������l�b�,d��ʕ+k׮
d�ٮ������_�w��j���~FY�x�mg��B�nݺQ{���~���<���뗿�e__���G(���ۿ��/����l���Orr�G}4000r_WҨW��s�!���ۂ����:VsssTT�D"�=h`\͔�ZQ�eӦM999;w�|�7&ɛ�ar������~�7�V��[�n�]���ݽ����������0S�SL&�ȑ#�w�ޱcDze���
+`�������d���Oi�aǎiii��Ͽs�RL��<��_����*�J"����;�����&��R��/_��r���z���Dr�����={�����E
�2�!D*���������#""���?uvv:�i���3IDAT(�D8NFF��Ç]�S`6�sss�ϟ�nݺ������W^y�
`�ͬ5C���]�v:t�j����KYYYt�4�4���r���#G���ׯ\��wޑJ��.
+f��<(�F������ѣ������YYY/���������6L&Ӆ�=z��EWWן������Z\\����
�㿬V�kײ��?�䓁��իW��G?������tti�(..�����?���֖���q�Ƶk��x<G���1�������S�NBRSSW�Z�jժ��pG�0�V��t�R^^�ŋ;;;���򓟬_��0� x�D�ќ?�ܹs_|�Eoo�D"�����������]�\f�����������ׯ_7��.�����̜={����ǘ��W��;w�ʕ+


,K*�.]�t�ҥ�/�r��.�?��RQQQXXXPPP\\��j=<<RSSW�\�z�j???G0�oL�P]�~���������y���.�J�R��[�)���(------)))..�h4���)))iii������NNN��`L<����������⒒���r�^���)}"111$$��5�T��j���J�hhh`2�QQQR�499955566�����������+**������$ILLLllllllLLLPP��+��B�����TVVVWWWVV���466B"""i|�7o�@ pt����x1�L��߿w�^UU�������
+!���=::�����������p����r��Ǐ���jjj������韄@ �������H$s��ILL���pt�O�����ꪬ�|��A�mmm����[���(��P7Dcc��d"������)�H���bcc1fG2�Lr���=|������f�}||D"ѬY�f͚@���������566����ߚR���J��`0B���BBBf=+�HD"��qt���1�L���ƺ�:�L&�˛���B�0������,
+}}}|}}}}}���i���v��i����V�Z�V�[[[U*U{{;�P(Cb�X,�����b���)�j�����B�Z�nkkS�Ttpl6����	//////oooooo�!\]]{R�l6k������V��%���������G/)��L�FPP�����`J@�&�V+����---�'
�{zz��r�^^^\.���.���r===�@ ���<�6B���y<!��͍�f3�LwwwB���c6����	!:��恮�.��j4���!���:����W���t:�N���������gߨ�h�Z�}�...�I��3�A7�-�#���h4���!�N������c�_ ��e'���
+{��ݶ;9#c�X#�'.����<==���9
+���Igg'!�����������
��Bo ��z��Z��Z,�m����庸�j�I��ɉ����Օ.����`0l6��͍���pS`2C��q�tt
0�!x��C��q��
���
����E��qIEND�B`�
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.dia ns-3.19/src/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.dia
--- ns-3.18.1/src/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.dia	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.dia	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,12 @@
+��]�s�8~�_Ay_��<�@��f�<Y�N�f3s������Fq����L^�o?	'�!N��MNN�kl�������ҏ?}���-K� ��;��:�ƱD������w�����������$���gD��tܹβ���wwwfx�zY��apc���^z�������xڀ�e��n���eI0�ɘySv�y㯓$���Nq���qƉq�ǝ��W�p���R;ϴ=�&l�0�ku���6M�X���t�
?$���Rюxr����M�����4�Ɑ���$�z�$�����&,n4)���ۥ��`<ܓ�w7j�����f���,N����.Gq2/*z͒�}?����=7���
+�,�p�W^��d��m{��N��^q���h�.���7E��h�^Q�A�BVv�A�Ik�^N�O'G���kJC�Z�y�)���z�0�	|�n��c*Z��v�鮯��S|�b��.B�%��?<�ic���cx�,�}���ģ��q6�E�E����;�S�NwA����Z�[���q \�]�x!S�t���������h��_�MB6o�6]����&�ew��߷�pGѐE~~�/S���v��Ldzծ��5�r†�:U�U�+���ĭ���J����/�5.!�\���������YW��V���}���q���"�.�
+e8B���#h�A�ͅY�����L��/˕��Q�$�l�)��c�~�^_
��
~u��QY�`���:���}�6����^z�h��8lk�����K��N�0-_0��]l|�B�D�2HZk
+Zr2x8�V�,a+�Xb���KpN��r��T��v��(�*$�v�R	�`!�6%��c*�]���݈0�+�+a�"�pS"�<��ߵ��0����}˞�0�˰-�� 
+e���8v�6!$�{�t���t�l)˙�赕c���<�t�J�����Y�d�������o�O��]��x���"��(+�Z|o\y� �?�L�(Ng،<��%�8�$�I�<U��_�5&ץ�����ᎅ�u�,�Ri�h��i*�g�U�#/&є�?��h�yʸ��|����TXnz_a�oa��ۮ�����%���ɢrb�u8�!�V�*��0K�P!�|X����~ٔ?�$Z���M����hz
��[��
+��H0�H)�`�B���2�C�Тv���~��>��ta����d�-˂���C�o��#�!js�ss/����c�r�L%��Te�.�2�MX��ǣͲ<��J FU�eh��V���!7�9�Ԓ���G�cv��b�}�����E�p������>��S�Tj�XhD�0�ۏGhy	y��%��vY聗LX�-t��������Ы�C�P�@	�
+Q�,%y���:����E'uq��N急����C�����C/�r�����;������/��/�������f���`��v����NH�@%���X��wr��}!��k:�
.��x���y�_�������(�mb�H�v5Ī�XK%�.���S���S`Kq�T��8[��&0%�EGb� ��XLw����=�7.��	Zޢ�[.���N�!�$�%20��M�a�,�b��m��?>���������@���5�jfb@֑�LP��� K/A��������?�#�3A53����2`G���׃��)�k��zHL��^3l]N�S�������
W{��k���vQ
wi��b/��6�A`;�i��9��������3n*���M����ٵ�[<
+� �?ɒ�4����k�U�Bf�c��:��K܉c
-	�@[��F����F�n�o�85�����u3�p��޵���Ļ�@�J2@=�"kih��"�����4�j����QnG�ր@�:]g�fwTP��eͮ�������d��R4@S�v��Ƕ? �$L�PJ@dRDpW,�M@�I��L��8^z�ˋ��wv�KӼ���$."��\�N'Y�q�XƢz*�?6]���tM�%�pK ����i:Y�|��
��\j4�k��iƏ��e�!���/_"��H�Dj]ʗ��q����䣦��)DA�ES��ÒȨ��Xm�_���h�v���Xg�4�>�\d4�j����Q�ZB��a"i(V#¤=��eȱv��s0<���.���h���"��
+MU씐�S�[��E+������6������[H�4j�Ia�tk�
�<�	���=[�'�ů~����A3^�G=����@��m
P��!lu�ʉ�bS���c"A��"�%��_���H�l|m$��f7.S��Ћ�q3�=���7�)GI!�:ӱ�nc1���1��`�=�;`O�����k�3�p�F����w��H1�
+"VB���eTN�
+
��
Ӝ~ss��ݚ�p�"?�����3ܭ͵b<[����R.�UN�"$c9�!]��;t��d��ޡ��t�1����P%����5��%���2���Z�X^$c6<�
�������(w}	��*Ţ��m�䝳8z7{!D��y)�DT�N
o<fij̒x���D���l@OMG��i'�Ўx`[Rb��-�;)*m9�ylǶ1�l�2�sL�`���{
���I��*'2�ªc3�LB\ �3�vY��|eh�!xqyU��C/I�j����0d���ή����nF7�T��R�(�œ��M������u��F���ډ��L�-H=� ��%�ܕQ��������Eȟ�f�gt%�j����՚��ZW���\h��(��6"�OGU*��[mM�Ŗ/D�� Z�좃��7��@�!o�
�@�ƧT�r�>:���(P�
�X[��P�oU9d,Y�v5��r@�l9��Tko��^+��+�Po�v�)*,�
+���W1w�
�X[�J
@+�[U,c9/�V9DZ�Y�F�hʭBϺU��M�UoV9d�u�vM�ý��1W�f��yT���V�����&s��?R��~4D�����[S�;�X	B�tD!���3Z��
������&�����d�v�@k?
Zژ̒M@K��Y/����Mrˆ~���8f����!�M`�DU��s�K�_�S-O��A���v���W�N��6Ƹ�t
D����X�o@����-Sp�mY�<�,9�~�}3
hY�4�ӫ_a7O��v��=�����O�R� Yu� s���l�@�� ����T��Y
���2����B�uL��j��{͋)��AB�(jǎ<j�0ㄅ�q����6�������7eTR"���.�����(��V}��g�S��
`+B[5�����s�ݳ��A���$��������
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.eps ns-3.19/src/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.eps
--- ns-3.18.1/src/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.eps	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.eps	1969-12-31 16:00:00.000000000 -0800
@@ -1,2995 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Title: 
-%%Creator: PScript5.dll Version 5.2.2
-%%CreationDate: 5/22/2012 10:57:55
-%%For: mrequena
-%%BoundingBox: 0 0 420 364
-%%Pages: 1
-%%Orientation: Portrait
-%%PageOrder: Ascend
-%%DocumentNeededResources: (atend)
-%%DocumentSuppliedResources: (atend)
-%%DocumentData: Clean7Bit
-%%TargetDevice: () (52.3) 320
-%%LanguageLevel: 1
-%%EndComments
-
-%%BeginDefaults
-%%PageBoundingBox: 0 0 420 364
-%%ViewingOrientation: 1 0 0 1
-%%EndDefaults
-
-%%BeginProlog
-%%BeginResource: file Pscript_WinNT_VMErrorHandler 5.0 0
-/currentpacking where{pop/oldpack currentpacking def/setpacking where{pop false
-setpacking}if}if/$brkpage 64 dict def $brkpage begin/prnt{dup type/stringtype
-ne{=string cvs}if dup length 6 mul/tx exch def/ty 10 def currentpoint/toy exch
-def/tox exch def 1 setgray newpath tox toy 2 sub moveto 0 ty rlineto tx 0
-rlineto 0 ty neg rlineto closepath fill tox toy moveto 0 setgray show}bind def
-/nl{currentpoint exch pop lmargin exch moveto 0 -10 rmoveto}def/=={/cp 0 def
-typeprint nl}def/typeprint{dup type exec}readonly def/lmargin 72 def/rmargin 72
-def/tprint{dup length cp add rmargin gt{nl/cp 0 def}if dup length cp add/cp
-exch def prnt}readonly def/cvsprint{=string cvs tprint( )tprint}readonly def
-/integertype{cvsprint}readonly def/realtype{cvsprint}readonly def/booleantype
-{cvsprint}readonly def/operatortype{(--)tprint =string cvs tprint(-- )tprint}
-readonly def/marktype{pop(-mark- )tprint}readonly def/dicttype{pop
-(-dictionary- )tprint}readonly def/nulltype{pop(-null- )tprint}readonly def
-/filetype{pop(-filestream- )tprint}readonly def/savetype{pop(-savelevel- )
-tprint}readonly def/fonttype{pop(-fontid- )tprint}readonly def/nametype{dup
-xcheck not{(/)tprint}if cvsprint}readonly def/stringtype{dup rcheck{(\()tprint
-tprint(\))tprint}{pop(-string- )tprint}ifelse}readonly def/arraytype{dup rcheck
-{dup xcheck{({)tprint{typeprint}forall(})tprint}{([)tprint{typeprint}forall(])
-tprint}ifelse}{pop(-array- )tprint}ifelse}readonly def/packedarraytype{dup
-rcheck{dup xcheck{({)tprint{typeprint}forall(})tprint}{([)tprint{typeprint}
-forall(])tprint}ifelse}{pop(-packedarray- )tprint}ifelse}readonly def/courier
-/Courier findfont 10 scalefont def end errordict/handleerror{systemdict begin
-$error begin $brkpage begin newerror{/newerror false store vmstatus pop pop 0
-ne{grestoreall}if initgraphics courier setfont lmargin 720 moveto errorname
-(VMerror)eq{version cvi 2016 ge{userdict/ehsave known{clear userdict/ehsave get
-restore 2 vmreclaim}if vmstatus exch pop exch pop PrtVMMsg}if}if systemdict
-/showpage get exec(%%[ Error: )print errorname =print(; OffendingCommand: )
-print/command load =print( ]%%)= flush}if end end end}dup 0 systemdict put dup
-4 $brkpage put bind readonly put/currentpacking where{pop/setpacking where{pop
-oldpack setpacking}if}if
-%%EndResource
-%%BeginProcSet: Pscript_Res_Emul 5.0 0
-/defineresource where{pop}{userdict begin/defineresource{userdict/Resources 2
-copy known{get begin}{15 dict dup begin put}ifelse exch readonly exch
-currentdict 1 index known not{dup 30 dict def}if load 3 -1 roll 2 index put
-end}bind readonly def/findresource{userdict/Resources get exch get exch get}
-bind readonly def/resourceforall{pop pop pop pop}bind readonly def
-/resourcestatus{userdict/Resources 2 copy known{get exch 2 copy known{get exch
-known{0 -1 true}{false}ifelse}{pop pop pop false}ifelse}{pop pop pop pop false}
-ifelse}bind readonly def end}ifelse
-%%EndProcSet
-userdict /Pscript_WinNT_Incr 230 dict dup begin put
-%%BeginResource: file Pscript_FatalError 5.0 0
-userdict begin/FatalErrorIf{{initgraphics findfont 1 index 0 eq{exch pop}{dup
-length dict begin{1 index/FID ne{def}{pop pop}ifelse}forall/Encoding
-{ISOLatin1Encoding}stopped{StandardEncoding}if def currentdict end
-/ErrFont-Latin1 exch definefont}ifelse exch scalefont setfont counttomark 3 div
-cvi{moveto show}repeat showpage quit}{cleartomark}ifelse}bind def end
-%%EndResource
-userdict begin/PrtVMMsg{vmstatus exch sub exch pop gt{[
-(La impresora no tiene suficiente memoria disponible para este trabajo.)100 500
-(Realice una de las siguientes operaciones e intente imprimir de nuevo:)100 485
-(Escoja "Optimizar para portabilidad" como formato de salida.)115 470
-(En el panel Configuraci�n de dispositivo, compruebe que "Memoria PostScript disponible" tiene el valor correcto.)
-115 455(Reduzca el n�mero de fuentes del documento.)115 440
-(Imprima el documento por partes.)115 425 12/Times-Roman showpage
-(%%[ PrinterError: Low Printer VM ]%%)= true FatalErrorIf}if}bind def end
-version cvi 2016 ge{/VM?{pop}bind def}{/VM? userdict/PrtVMMsg get def}ifelse
-%%BeginResource: file Pscript_Win_Basic 5.0 0
-/d/def load def/,/load load d/~/exch , d/?/ifelse , d/!/pop , d/`/begin , d/^
-/index , d/@/dup , d/+/translate , d/$/roll , d/U/userdict , d/M/moveto , d/-
-/rlineto , d/&/currentdict , d/:/gsave , d/;/grestore , d/F/false , d/T/true ,
-d/N/newpath , d/E/end , d/Ac/arc , d/An/arcn , d/A/ashow , d/D/awidthshow , d/C
-/closepath , d/V/div , d/O/eofill , d/L/fill , d/I/lineto , d/-c/curveto , d/-M
-/rmoveto , d/+S/scale , d/Ji/setfont , d/Lc/setlinecap , d/Lj/setlinejoin , d
-/Lw/setlinewidth , d/Lm/setmiterlimit , d/sd/setdash , d/S/show , d/LH/showpage
-, d/K/stroke , d/W/widthshow , d/R/rotate , d/L2? false/languagelevel where{pop
-languagelevel 2 ge{pop true}if}if d L2?{/xS/xshow , d/yS/yshow , d/zS/xyshow ,
-d}if/b{bind d}bind d/bd{bind d}bind d/xd{~ d}bd/ld{, d}bd/bn/bind ld/lw/Lw ld
-/lc/Lc ld/lj/Lj ld/sg/setgray ld/ADO_mxRot null d/self & d/OrgMx matrix
-currentmatrix d/reinitialize{: OrgMx setmatrix[/TextInit/GraphInit/UtilsInit
-counttomark{@ where{self eq}{F}?{cvx exec}{!}?}repeat cleartomark ;}b
-/initialize{`{/Pscript_Win_Data where{!}{U/Pscript_Win_Data & put}?/ADO_mxRot ~
-d/TextInitialised? F d reinitialize E}{U/Pscript_Win_Data 230 dict @ ` put
-/ADO_mxRot ~ d/TextInitialised? F d reinitialize}?}b/terminate{!{& self eq
-{exit}{E}?}loop E}b/suspend/terminate , d/resume{` Pscript_Win_Data `}b U `
-/lucas 21690 d/featurebegin{countdictstack lucas[}b/featurecleanup{stopped
-{cleartomark @ lucas eq{! exit}if}loop countdictstack ~ sub @ 0 gt{{E}repeat}
-{!}?}b E/snap{transform 0.25 sub round 0.25 add ~ 0.25 sub round 0.25 add ~
-itransform}b/dsnap{dtransform round ~ round ~ idtransform}b/nonzero_round{@ 0.5
-ge{round}{@ -0.5 lt{round}{0 ge{1}{-1}?}?}?}b/nonzero_dsnap{dtransform
-nonzero_round ~ nonzero_round ~ idtransform}b U<04>cvn{}put/rr{1 ^ 0 - 0 ~ -
-neg 0 - C}b/irp{4 -2 $ + +S fx 4 2 $ M 1 ^ 0 - 0 ~ - neg 0 -}b/rp{4 2 $ M 1 ^ 0
-- 0 ~ - neg 0 -}b/solid{[]0 sd}b/g{@ not{U/DefIf_save save put}if U/DefIf_bool
-2 ^ put}b/DefIf_El{if U/DefIf_bool get not @{U/DefIf_save get restore}if}b/e
-{DefIf_El !}b/UDF{L2?{undefinefont}{!}?}b/UDR{L2?{undefineresource}{! !}?}b
-/freeVM{/Courier findfont[40 0 0 -40 0 0]makefont Ji 2 vmreclaim}b/hfRedefFont
-{findfont @ length dict `{1 ^/FID ne{d}{! !}?}forall & E @ ` ~{/CharStrings 1
-dict `/.notdef 0 d & E d}if/Encoding 256 array 0 1 255{1 ^ ~/.notdef put}for d
-E definefont !}bind d/hfMkCIDFont{/CIDFont findresource @ length 2 add dict `{1
-^ @/FID eq ~ @/XUID eq ~/UIDBase eq or or{! !}{d}?}forall/CDevProc ~ d/Metrics2
-16 dict d/CIDFontName 1 ^ d & E 1 ^ ~/CIDFont defineresource ![~]composefont !}
-bind d
-%%EndResource
-%%BeginResource: file Pscript_Win_Utils_L1 5.0 0
-/rf{N rp L}b/fx{1 1 dtransform @ 0 ge{1 sub 1}{1 add -0.25}? 3 -1 $ @ 0 ge{1
-sub 1}{1 add -0.25}? 3 1 $ 4 1 $ idtransform 4 -2 $ idtransform}b/BZ{4 -2 $
-snap + +S fx rf}b/rs{N rp C K}b/rc{N rp clip N}b/UtilsInit{}b/setcolorspace{!}b
-/scol{[/setgray/setrgbcolor/setcolor/setcmykcolor/setcolor/setgray]~ get cvx
-exec}b/colspRefresh{}b/AddFontInfoBegin{/FontInfo 8 dict @ `}bind d/AddFontInfo
-{/GlyphNames2Unicode 16 dict d/GlyphNames2HostCode 16 dict d}bind d
-/AddFontInfoEnd{E d}bind d
-%%EndResource
-end
-%%EndProlog
-
-%%BeginSetup
-[ 1 0 0 1 0 0 ] false Pscript_WinNT_Incr dup /initialize get exec
-1 setlinecap 1 setlinejoin
-/mysetup [ 72 600 V 0 0 -72 600 V 0 364.25198 ] def 
-%%EndSetup
-
-%%Page: 1 1
-%%PageBoundingBox: 0 0 420 364
-%%EndPageComments
-%%BeginPageSetup
-/DeviceRGB dup setcolorspace /colspABC exch def
-mysetup concat colspRefresh
-%%EndPageSetup
-
-Pscript_WinNT_Incr begin
-%%BeginResource: file Pscript_Win_GdiObject 5.0 0
-/SavedCTM null d/CTMsave{/SavedCTM SavedCTM currentmatrix d}b/CTMrestore
-{SavedCTM setmatrix}b/mp null d/ADO_mxRot null d/GDIHMatrix null d
-/GDIHPatternDict 22 dict d GDIHPatternDict `/PatternType 1 d/PaintType 2 d/Reps
-L2?{1}{5}? d/XStep 8 Reps mul d/YStep XStep d/BBox[0 0 XStep YStep]d/TilingType
-1 d/PaintProc{` 1 Lw[]0 sd PaintData , exec E}b/FGnd null d/BGnd null d
-/HS_Horizontal{horiz}b/HS_Vertical{vert}b/HS_FDiagonal{fdiag}b/HS_BDiagonal
-{biag}b/HS_Cross{horiz vert}b/HS_DiagCross{fdiag biag}b/MaxXYStep XStep YStep
-gt{XStep}{YStep}? d/horiz{Reps{0 4 M XStep 0 - 0 8 +}repeat 0 -8 Reps mul + K}b
-/vert{Reps{4 0 M 0 YStep - 8 0 +}repeat 0 -8 Reps mul + K}b/biag{Reps{0 0 M
-MaxXYStep @ - 0 YStep neg M MaxXYStep @ - 0 8 +}repeat 0 -8 Reps mul + 0 YStep
-M 8 8 - K}b/fdiag{Reps{0 0 M MaxXYStep @ neg - 0 YStep M MaxXYStep @ neg - 0 8
-+}repeat 0 -8 Reps mul + MaxXYStep @ M 8 -8 - K}b E/makehatch{4 -2 $/yOrg ~ d
-/xOrg ~ d GDIHPatternDict/PaintData 3 -1 $ put CTMsave GDIHMatrix setmatrix
-GDIHPatternDict matrix xOrg yOrg + mp CTMrestore ~ U ~ 2 ^ put}b/h0{/h0
-/HS_Horizontal makehatch}b/h1{/h1/HS_Vertical makehatch}b/h2{/h2/HS_FDiagonal
-makehatch}b/h3{/h3/HS_BDiagonal makehatch}b/h4{/h4/HS_Cross makehatch}b/h5{/h5
-/HS_DiagCross makehatch}b/GDIBWPatternMx null d/pfprep{save 8 1 $
-/PatternOfTheDay 8 1 $ GDIBWPatternDict `/yOrg ~ d/xOrg ~ d/PaintData ~ d/yExt
-~ d/Width ~ d/BGnd ~ d/FGnd ~ d/Height yExt RepsV mul d/mx[Width 0 0 Height 0
-0]d E build_pattern ~ !}b/pfbf{/fEOFill ~ d pfprep hbf fEOFill{O}{L}? restore}b
-/GraphInit{GDIHMatrix null eq{/SavedCTM matrix d : ADO_mxRot concat 0 0 snap +
-: 0.48 @ GDIHPatternDict ` YStep mul ~ XStep mul ~ nonzero_dsnap YStep V ~
-XStep V ~ E +S/GDIHMatrix matrix currentmatrix readonly d ; : 0.24 -0.24 +S
-GDIBWPatternDict ` Width Height E nonzero_dsnap +S/GDIBWPatternMx matrix
-currentmatrix readonly d ; ;}if}b
-%%EndResource
-%%BeginResource: file Pscript_Win_GdiObject_L1 5.0 0
-/GDIBWPatternDict 25 dict @ `/PatternType 1 d/PaintType 2 d/RepsV 6 d/RepsH 5 d
-/BBox[0 0 RepsH 1]d/TilingType 1 d/XStep 1 d/YStep 1 d/Height 8 RepsV mul d
-/Width 8 d/mx[Width 0 0 Height neg 0 Height]d/FGnd null d/BGnd null d
-/SetBGndFGnd{}b/PaintProc{` SetBGndFGnd RepsH{Width Height F mx PaintData
-imagemask Width 0 +}repeat E}b E d/GDIpattfill{@ ` BGnd null ne PaintType 2 eq
-and{: BGnd aload ! scol fEOFill{O}{L}? ; FGnd aload ! U/iCol 2 ^ put @ 0 eq{!
-2}{@ 1 eq ~ 2 eq or{4}{5}?}? -1 $}if E @ patterncalc : 4 ^/PaintType get 2 eq
-{iCol 0 eq{6 -1 $}if iCol 1 eq iCol 2 eq or{8 -3 $}if iCol 3 eq iCol 4 eq or{9
--4 $}if iCol scol}if fEOFill{eoclip}{clip}? N patternfill ; N}b/hbf
-{GDIpattfill}b/hfMain{/fEOFill ~ d ~/iCol ~ d GDIpattfill}b/hf{: hfMain ;}b
-/mpstr 1 string d/mp{~ @ length 12 add dict copy `/PatternCTM matrix
-currentmatrix d/PatternMatrix ~ d/PatWidth XStep mpstr length mul d/PatHeight
-YStep d/FontType 3 d/Encoding 256 array d 3 string 0 1 255{Encoding ~ @ 3 ^ cvs
-cvn put}for !/FontMatrix matrix d/FontBBox BBox d/BuildChar{! @ ` XStep 0
-FontBBox aload ! setcachedevice/PaintProc , E : exec ;}b & E ~ @ 3 -1 $
-definefont}b/build_pattern{: GDIBWPatternDict ` Width Height E dsnap +S
-/GDIBWPatternMx matrix currentmatrix d ; CTMsave GDIBWPatternMx setmatrix
-GDIBWPatternDict @ ` xOrg yOrg E matrix + mp CTMrestore}b/patterncalc{` :
-PatternCTM setmatrix PatternMatrix concat BBox aload ! ! ! + pathbbox ;
-PatHeight V ceiling 4 1 $ PatWidth V ceiling 4 1 $ PatHeight V floor 4 1 $
-PatWidth V floor 4 1 $ 2 ^ sub cvi abs ~ 3 ^ sub cvi abs ~ 4 2 $ PatHeight mul
-~ PatWidth mul ~ E}b/patternfill{5 -1 $ @ ` Ji PatternCTM setmatrix
-PatternMatrix concat 0 2 ^ 2 ^ M 0 1 mpstr length 1 sub{1 ^ mpstr 3 1 $ put}for
-! 2 ^{currentpoint 5 ^{mpstr S}repeat YStep add M}repeat ! ! ! ! E}b/pbf{: 14
-dict `/fGray ~ d/fEOFill ~ d/yOrg ~ d/xOrg ~ d/PaintData ~ d/OutputBPP ~ d
-/Height ~ d/Width ~ d/mx xOrg yOrg matrix + d fGray{/PaintProc{` Width Height
-OutputBPP mx PaintData image E}b}{/PaintProc{` Width Height 8 mx PaintData F
-OutputBPP 8 idiv colorimage E}b}? pathbbox fEOFill{eoclip}{clip}?/Top ~ d/Right
-~ d/Bottom ~ d/Left ~ d Top Height neg Bottom 1 sub{Left Width Right 1 sub{1 ^
-2 copy + & PaintProc neg ~ neg ~ +}bind for !}bind for E ;}b
-%%EndResource
-end reinitialize
-0 0 0 1 scol N 1212 3023 M 1212 2991 I 1213 2990 I 1214 2989 I 1216 2990 I 1216 2991 I 1216 3023 I 1216 3024 I 1214 3025 I 1213 3024 I 1212 3023 I 1212 3023 I C 
-1212 2969 M 1212 2937 I 1213 2936 I 1214 2935 I 1216 2936 I 1216 2937 I 1216 2969 I 1216 2970 I 1214 2971 I 1213 2970 I 1212 2969 I 1212 2969 I C 
-1212 2915 M 1212 2884 I 1213 2883 I 1214 2882 I 1216 2883 I 1216 2884 I 1216 2915 I 1216 2917 I 1214 2918 I 1213 2917 I 1212 2915 I 1212 2915 I C 
-1212 2861 M 1212 2830 I 1213 2829 I 1214 2828 I 1216 2829 I 1216 2830 I 1216 2861 I 1216 2863 I 1214 2864 I 1213 2863 I 1212 2861 I 1212 2861 I C 
-1212 2807 M 1212 2776 I 1213 2775 I 1214 2774 I 1216 2775 I 1216 2776 I 1216 2807 I 1216 2810 I 1214 2810 I 1213 2810 I 1212 2807 I 1212 2807 I C 
-1212 2754 M 1212 2723 I 1213 2721 I 1214 2721 I 1216 2721 I 1216 2723 I 1216 2754 I 1216 2756 I 1214 2756 I 1213 2756 I 1212 2754 I 1212 2754 I C 
-1212 2700 M 1212 2669 I 1213 2667 I 1214 2667 I 1216 2667 I 1216 2669 I 1216 2700 I 1216 2702 I 1214 2702 I 1213 2702 I 1212 2700 I 1212 2700 I C 
-1212 2647 M 1212 2615 I 1213 2614 I 1214 2613 I 1216 2614 I 1216 2615 I 1216 2647 I 1216 2648 I 1214 2649 I 1213 2648 I 1212 2647 I 1212 2647 I C 
-1212 2593 M 1212 2561 I 1213 2560 I 1214 2559 I 1216 2560 I 1216 2561 I 1216 2593 I 1216 2594 I 1214 2595 I 1213 2594 I 1212 2593 I 1212 2593 I C 
-1212 2539 M 1212 2508 I 1213 2507 I 1214 2506 I 1216 2507 I 1216 2508 I 1216 2539 I 1216 2541 I 1214 2542 I 1213 2541 I 1212 2539 I 1212 2539 I C 
-1212 2486 M 1212 2454 I 1213 2453 I 1214 2452 I 1216 2453 I 1216 2454 I 1216 2486 I 1216 2487 I 1214 2488 I 1213 2487 I 1212 2486 I 1212 2486 I C 
-1212 2432 M 1212 2400 I 1213 2399 I 1214 2398 I 1216 2399 I 1216 2400 I 1216 2432 I 1216 2434 I 1214 2434 I 1213 2434 I 1212 2432 I 1212 2432 I C 
-1212 2378 M 1212 2347 I 1213 2345 I 1214 2345 I 1216 2345 I 1216 2347 I 1216 2378 I 1216 2380 I 1214 2380 I 1213 2380 I 1212 2378 I 1212 2378 I C 
-1212 2324 M 1212 2293 I 1213 2291 I 1214 2291 I 1216 2291 I 1216 2293 I 1216 2324 I 1216 2326 I 1214 2326 I 1213 2326 I 1212 2324 I 1212 2324 I C 
-1212 2271 M 1212 2240 I 1213 2238 I 1214 2237 I 1216 2238 I 1216 2240 I 1216 2271 I 1216 2272 I 1214 2273 I 1213 2272 I 1212 2271 I 1212 2271 I C 
-1212 2217 M 1212 2186 I 1213 2184 I 1214 2183 I 1216 2184 I 1216 2186 I 1216 2217 I 1216 2218 I 1214 2219 I 1213 2218 I 1212 2217 I 1212 2217 I C 
-1212 2163 M 1212 2132 I 1213 2130 I 1214 2129 I 1216 2130 I 1216 2132 I 1216 2163 I 1216 2165 I 1214 2166 I 1213 2165 I 1212 2163 I 1212 2163 I C 
-1212 2110 M 1212 2078 I 1213 2077 I 1214 2076 I 1216 2077 I 1216 2078 I 1216 2110 I 1216 2111 I 1214 2112 I 1213 2111 I 1212 2110 I 1212 2110 I C 
-1212 2056 M 1212 2024 I 1213 2023 I 1214 2022 I 1216 2023 I 1216 2024 I 1216 2056 I 1216 2058 I 1214 2058 I 1213 2058 I 1212 2056 I 1212 2056 I C 
-1212 2002 M 1212 1971 I 1213 1970 I 1214 1969 I 1216 1970 I 1216 1971 I 1216 2002 I 1216 2004 I 1214 2005 I 1213 2004 I 1212 2002 I 1212 2002 I C 
-1212 1948 M 1212 1917 I 1213 1916 I 1214 1915 I 1216 1916 I 1216 1917 I 1216 1948 I 1216 1950 I 1214 1951 I 1213 1950 I 1212 1948 I 1212 1948 I C 
-1212 1895 M 1212 1864 I 1213 1862 I 1214 1862 I 1216 1862 I 1216 1864 I 1216 1895 I 1216 1897 I 1214 1897 I 1213 1897 I 1212 1895 I 1212 1895 I C 
-1212 1841 M 1212 1810 I 1213 1808 I 1214 1808 I 1216 1808 I 1216 1810 I 1216 1841 I 1216 1843 I 1214 1843 I 1213 1843 I 1212 1841 I 1212 1841 I C 
-1212 1787 M 1212 1757 I 1213 1754 I 1214 1754 I 1216 1754 I 1216 1757 I 1216 1787 I 1216 1789 I 1214 1790 I 1213 1789 I 1212 1787 I 1212 1787 I C 
-1212 1734 M 1212 1703 I 1213 1701 I 1214 1700 I 1216 1701 I 1216 1703 I 1216 1734 I 1216 1735 I 1214 1736 I 1213 1735 I 1212 1734 I 1212 1734 I C 
-1212 1680 M 1212 1649 I 1213 1647 I 1214 1646 I 1216 1647 I 1216 1649 I 1216 1680 I 1216 1682 I 1214 1682 I 1213 1682 I 1212 1680 I 1212 1680 I C 
-1212 1627 M 1212 1595 I 1213 1594 I 1214 1593 I 1216 1594 I 1216 1595 I 1216 1627 I 1216 1628 I 1214 1629 I 1213 1628 I 1212 1627 I 1212 1627 I C 
-1212 1573 M 1212 1541 I 1213 1540 I 1214 1539 I 1216 1540 I 1216 1541 I 1216 1573 I 1216 1574 I 1214 1575 I 1213 1574 I 1212 1573 I 1212 1573 I C 
-1212 1519 M 1212 1488 I 1213 1487 I 1214 1486 I 1216 1487 I 1216 1488 I 1216 1519 I 1216 1521 I 1214 1522 I 1213 1521 I 1212 1519 I 1212 1519 I C 
-1212 1465 M 1212 1434 I 1213 1433 I 1214 1432 I 1216 1433 I 1216 1434 I 1216 1465 I 1216 1467 I 1214 1468 I 1213 1467 I 1212 1465 I 1212 1465 I C 
-1212 1411 M 1212 1381 I 1213 1379 I 1214 1378 I 1216 1379 I 1216 1381 I 1216 1411 I 1216 1414 I 1214 1414 I 1213 1414 I 1212 1411 I 1212 1411 I C 
-1212 1358 M 1212 1327 I 1213 1325 I 1214 1325 I 1216 1325 I 1216 1327 I 1216 1358 I 1216 1360 I 1214 1360 I 1213 1360 I 1212 1358 I 1212 1358 I C 
-1212 1304 M 1212 1273 I 1213 1271 I 1214 1271 I 1216 1271 I 1216 1273 I 1216 1304 I 1216 1306 I 1214 1306 I 1213 1306 I 1212 1304 I 1212 1304 I C 
-1212 1251 M 1212 1219 I 1213 1218 I 1214 1217 I 1216 1218 I 1216 1219 I 1216 1251 I 1216 1252 I 1214 1253 I 1213 1252 I 1212 1251 I 1212 1251 I C 
-1212 1197 M 1212 1165 I 1213 1164 I 1214 1163 I 1216 1164 I 1216 1165 I 1216 1197 I 1216 1198 I 1214 1199 I 1213 1198 I 1212 1197 I 1212 1197 I C 
-1212 1144 M 1212 1112 I 1213 1111 I 1214 1110 I 1216 1111 I 1216 1112 I 1216 1144 I 1216 1145 I 1214 1146 I 1213 1145 I 1212 1144 I 1212 1144 I C 
-1212 1090 M 1212 1058 I 1213 1057 I 1214 1056 I 1216 1057 I 1216 1058 I 1216 1090 I 1216 1091 I 1214 1092 I 1213 1091 I 1212 1090 I 1212 1090 I C 
-1212 1036 M 1212 1005 I 1213 1003 I 1214 1002 I 1216 1003 I 1216 1005 I 1216 1036 I 1216 1038 I 1214 1038 I 1213 1038 I 1212 1036 I 1212 1036 I C 
-1212 982 M 1212 951 I 1213 949 I 1214 949 I 1216 949 I 1216 951 I 1216 982 I 1216 984 I 1214 984 I 1213 984 I 1212 982 I 1212 982 I C 
-1212 928 M 1212 897 I 1213 895 I 1214 895 I 1216 895 I 1216 897 I 1216 928 I 1216 930 I 1214 930 I 1213 930 I 1212 928 I 1212 928 I C 
-1212 875 M 1212 844 I 1213 842 I 1214 841 I 1216 842 I 1216 844 I 1216 875 I 1216 876 I 1214 877 I 1213 876 I 1212 875 I 1212 875 I C 
-1212 821 M 1212 790 I 1213 788 I 1214 787 I 1216 788 I 1216 790 I 1216 821 I 1216 822 I 1214 823 I 1213 822 I 1212 821 I 1212 821 I C 
-1212 768 M 1212 736 I 1213 735 I 1214 734 I 1216 735 I 1216 736 I 1216 768 I 1216 769 I 1214 770 I 1213 769 I 1212 768 I 1212 768 I C 
-1212 714 M 1212 682 I 1213 681 I 1214 680 I 1216 681 I 1216 682 I 1216 714 I 1216 715 I 1214 716 I 1213 715 I 1212 714 I 1212 714 I C 
-1212 660 M 1212 629 I 1213 627 I 1214 626 I 1216 627 I 1216 629 I 1216 660 I 1216 662 I 1214 663 I 1213 662 I 1212 660 I 1212 660 I C 
-1212 606 M 1212 575 I 1213 574 I 1214 573 I 1216 574 I 1216 575 I 1216 606 I 1216 608 I 1214 609 I 1213 608 I 1212 606 I 1212 606 I C 
-1212 552 M 1212 521 I 1213 520 I 1214 519 I 1216 520 I 1216 521 I 1216 552 I 1216 554 I 1214 555 I 1213 554 I 1212 552 I 1212 552 I C 
-1212 499 M 1212 468 I 1213 466 I 1214 466 I 1216 466 I 1216 468 I 1216 499 I 1216 501 I 1214 501 I 1213 501 I 1212 499 I 1212 499 I C 
-1212 445 M 1212 414 I 1213 412 I 1214 412 I 1216 412 I 1216 414 I 1216 445 I 1216 447 I 1214 447 I 1213 447 I 1212 445 I 1212 445 I C 
-1212 392 M 1212 361 I 1213 359 I 1214 358 I 1216 359 I 1216 361 I 1216 392 I 1216 393 I 1214 394 I 1213 393 I 1212 392 I 1212 392 I C 
-1212 338 M 1212 307 I 1213 305 I 1214 304 I 1216 305 I 1216 307 I 1216 338 I 1216 339 I 1214 340 I 1213 339 I 1212 338 I 1212 338 I C 
-1212 284 M 1212 253 I 1213 251 I 1214 250 I 1216 251 I 1216 253 I 1216 284 I 1216 286 I 1214 287 I 1213 286 I 1212 284 I 1212 284 I C 
-:  L ; K 
-N 984 13 M 984 248 I 1445 248 I 1445 13 I 984 13 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 1 Lj 1 Lc 6 Lw solid N 984 248 M 1445 248 I 1445 13 I 984 13 I 984 248 I C 
-: 0.668 0.727 +S K 
-; Pscript_WinNT_Incr begin
-%%BeginResource: file Pscript_T3Hdr 5.0 0
-{version cvi 2016 ge{32/FontType resourcestatus{pop pop true}{false}ifelse}
-{false}ifelse}exec/Is2016andT32? exch def/T32DefSBCMap{/CIDInit/ProcSet
-findresource begin 10 dict begin begincmap/CIDSystemInfo 3 dict dup begin
-/Registry(Adobe)def/Ordering(Identity1)def/Supplement 0 def end def/CMapType 0
-def/WMode 0 def 1 begincodespacerange<00><ff>endcodespacerange 1 begincidrange
-<00><ff>0 endcidrange endcmap/DrvSBCMap currentdict/CMap defineresource pop end
-end}bind def Is2016andT32?{T32DefSBCMap}def/T32RsrcBegin{Is2016andT32?{
-/BitmapFontInit/ProcSet findresource begin}if}bind def/T32RsrcEnd{Is2016andT32?
-{end}if}bind def/AddT32Char{6 1 roll 0 get 7 1 roll pop pop 5 1 roll pop
-findfont/TT32R get addglyph}bind def/AddT3Char{findfont dup 5 2 roll 1 index
-length 0 gt{cvx 1 index exch 4 exch put dup(imagemask)cvx cvn 5 exch put cvx}
-{pop cvx}ifelse 3 -1 roll/CharProcs get 3 1 roll put dup/Encoding get 5 -1 roll
-4 index put/Metrics get 3 1 roll put}bind def/AddT3T32Char Is2016andT32?{
-/AddT32Char}{/AddT3Char}ifelse load def/GreNewFontT32{5 dict begin exch
-/FontMatrix exch def exch/FontBBox exch def exch pop exch pop/CIDFontType 4 def
-dup currentdict end/CIDFont defineresource 3 -1 roll dup/DrvSBCMap dup/CMap
-resourcestatus{pop pop}{T32DefSBCMap}ifelse 5 -1 roll[exch]composefont dup
-length dict copy dup/FID undef begin exch/TT32R exch def currentdict end
-definefont/BitmapFontInit/ProcSet findresource begin/TT32R get[14 0 0 0 0 0]<>0
-4 -1 roll addglyph end}bind def/GreNewFontT3{11 dict begin pop/FontType 3 def
-/FontMatrix exch def/FontBBox exch def/Encoding exch def/CharProcs 257 dict def
-CharProcs/.notdef{}put/Metrics 257 dict def Metrics/.notdef 3 -1 roll put
-AddFontInfoBegin AddFontInfo AddFontInfoEnd/BuildChar{userdict begin/char exch
-def dup/charname exch/Encoding get char get def dup/Metrics get charname 2 copy
-known{get aload pop}{pop/.notdef get aload pop}ifelse setcachedevice begin
-Encoding char get CharProcs exch 2 copy known{get}{pop/.notdef get}ifelse end
-exec end}def currentdict end definefont pop}bind def/GreNewFont{Is2016andT32?
-{GreNewFontT32}{GreNewFontT3}ifelse}bind def/UDF3{Is2016andT32?{/BitmapFontInit
-/ProcSet findresource begin dup/CIDFont findresource removeall/CIDFont
-undefineresource undefinefont end}{pop UDF}ifelse}bind def
-%%EndResource
-end reinitialize
-/TT353ADb00
-[74 0 0 0 0 0 ] 
- 256 array 0 1 255 {1 index exch /.notdef put} for 
-[0 0 0 0 ] 
-[1 74 div 0 0 -1 74 div 0 0 ]
-/__TT353ADb00
-GreNewFont
-T32RsrcBegin
-
-1
-/g400 [29 0 3 -35 26 1 ] 
-/g400 [23 36 true [1 0 0 1 -3 35 ]  0 0]
-[<00ff80
-03fff0
-0ffff8
-1ffff8
-1ffff8
-3fc0f8
-3f0018
-7e0000
-7e0000
-7e0000
-7e0000
-7f0000
-7f0000
-3fc000
-3fe000
-1ffc00
-0fff00
-07ffc0
-01fff0
-007ff8
-000ffc
-0003fc
-0001fe
-0000fe
-00007e
-00007e
-00007e
-00007e
-c000fe
-f001fc
-fe03fc
-fffff8
-fffff0
-7fffe0
-1fff80
-03fe00
->
- ]
-/TT353ADb00 AddT3T32Char
-
-2
-/g381 [39 0 3 -35 36 1 ] 
-/g381 [33 36 true [1 0 0 1 -3 35 ]  0 0]
-[<000ffc0000
-007fff8000
-01ffffc000
-03fffff000
-07fffff800
-0ff80ffc00
-1fe003fc00
-1fc000fe00
-3f80007e00
-3f00007f00
-7e00003f00
-7e00003f00
-7e00003f80
-fc00001f80
-fc00001f80
-fc00001f80
-fc00001f80
-fc00001f80
-fc00001f80
-fc00001f80
-fc00001f80
-fc00001f80
-fc00001f80
-fe00003f00
-7e00003f00
-7e00003f00
-7f00007e00
-3f0000fe00
-3f8001fc00
-1fe003fc00
-1ff80ff800
-0ffffff000
-07ffffe000
-01ffffc000
-00ffff0000
-001ff80000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-3
-/g437 [39 0 5 -34 33 1 ] 
-/g437 [28 35 true [1 0 0 1 -5 34 ]  0 0]
-[<fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0007f0
-fe000ff0
-7e001ff0
-7f003ff0
-7f807ff0
-3fc1fdf0
-3ffff9f0
-1ffff1f0
-0fffe1f0
-07ff81f0
-00fe0000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-4
-/g396 [26 0 6 -35 25 0 ] 
-/g396 [19 35 true [1 0 0 1 -6 35 ]  0 0]
-[<000fc0
-f83fe0
-f87fe0
-f8ffe0
-f9ffe0
-fbf060
-fbe000
-ffc000
-ff8000
-ff0000
-fe0000
-fe0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-5
-/g272 [31 0 3 -35 29 1 ] 
-/g272 [26 36 true [1 0 0 1 -3 35 ]  0 0]
-[<001fe000
-00fffc00
-01ffff00
-07ffff80
-0fffffc0
-0ff01fc0
-1fc007c0
-3f8003c0
-3f000080
-7f000000
-7e000000
-7e000000
-7e000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fe000000
-7e000000
-7e000000
-7f000000
-3f0000c0
-3f8001c0
-3fc007c0
-1ff01fc0
-0fffffc0
-07ffff80
-03ffff00
-00fffc00
-003fe000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-6
-/g286 [37 0 3 -35 33 1 ] 
-/g286 [30 36 true [1 0 0 1 -3 35 ]  0 0]
-[<001ff000
-007ffe00
-01ffff00
-03ffffc0
-07ffffe0
-0ff01fe0
-1fc007f0
-3f8003f8
-3f0001f8
-7e0001f8
-7e0000f8
-7c0000fc
-7c0000fc
-fc0000fc
-fffffffc
-fffffffc
-fffffffc
-fffffffc
-fffffff8
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-7e000000
-7e000000
-7f000000
-3f000000
-3f800000
-1fe00038
-1ff803f8
-0ffffff8
-07fffff8
-01fffff8
-00ffffe0
-000ffc00
->
- ]
-/TT353ADb00 AddT3T32Char
-
-7
-/g3 [17 0 0 0 1 1 ] 
-/g3 [1 1 true [1 0 0 1 0 0 ]  0 0]
-[<00
->
- ]
-/TT353ADb00 AddT3T32Char
-
-8
-/g69 [48 0 6 -47 41 0 ] 
-/g69 [35 47 true [1 0 0 1 -6 47 ]  0 0]
-[<7f000007e0
-ff800007e0
-ffc00007e0
-ffe00007e0
-ffe00007e0
-fff00007e0
-fff00007e0
-fff80007e0
-fdf80007e0
-fdfc0007e0
-fcfc0007e0
-fcfe0007e0
-fc7f0007e0
-fc7f0007e0
-fc3f8007e0
-fc3f8007e0
-fc1fc007e0
-fc1fc007e0
-fc0fe007e0
-fc0fe007e0
-fc07f007e0
-fc03f007e0
-fc03f807e0
-fc01f807e0
-fc01fc07e0
-fc00fe07e0
-fc00fe07e0
-fc007f07e0
-fc007f07e0
-fc003f87e0
-fc003f87e0
-fc001fc7e0
-fc001fc7e0
-fc000fe7e0
-fc0007e7e0
-fc0007f7e0
-fc0003f7e0
-fc0003ffe0
-fc0001ffe0
-fc0001ffe0
-fc0000ffe0
-fc0000ffe0
-fc00007fe0
-fc00007fe0
-fc00003fe0
-fc00001fe0
-fc00000fc0
->
- ]
-/TT353ADb00 AddT3T32Char
-
-9
-/g17 [40 0 6 -47 37 0 ] 
-/g17 [31 47 true [1 0 0 1 -6 47 ]  0 0]
-[<7fffe000
-fffffc00
-ffffff00
-ffffff80
-ffffffc0
-fc007fc0
-fc001fe0
-fc000fe0
-fc0007f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0007e0
-fc0007e0
-fc000fe0
-fc001fc0
-fc007f80
-ffffff00
-fffffc00
-ffffff80
-ffffffc0
-ffffffe0
-fc003ff0
-fc000ff8
-fc0003fc
-fc0001fc
-fc0001fc
-fc0000fe
-fc0000fe
-fc0000fe
-fc0000fe
-fc0000fe
-fc0000fe
-fc0000fe
-fc0001fc
-fc0001fc
-fc0003fc
-fc0007f8
-fc001ff0
-fffffff0
-ffffffc0
-ffffff80
-fffffe00
-7ffff000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-Pscript_WinNT_Incr begin
-%%BeginResource: file Pscript_Text 5.0 0
-/TextInit{TextInitialised? not{/Pscript_Windows_Font & d/TextInitialised? T d
-/fM[1 0 0 1 0 0]d/mFM matrix d/iMat[1 0 0.212557 1 0 0]d}if}b/copyfont{1 ^
-length add dict `{1 ^/FID ne{d}{! !}?}forall & E}b/EncodeDict 11 dict d/bullets
-{{/bullet}repeat}b/rF{3 copyfont @ ` ~ EncodeDict ~ get/Encoding ~ 3 ^/0 eq{&
-/CharStrings known{CharStrings/Eth known not{! EncodeDict/ANSIEncodingOld get}
-if}if}if d E}b/mF{@ 7 1 $ findfont ~{@/Encoding get @ StandardEncoding eq{! T}{
-{ISOLatin1Encoding}stopped{! F}{eq}?{T}{@ ` T 32 1 127{Encoding 1 ^ get
-StandardEncoding 3 -1 $ get eq and}for E}?}?}{F}?{1 ^ ~ rF}{0 copyfont}? 6 -2 $
-! ! ~ !/pd_charset @ where{~ get 128 eq{@ FDV 2 copy get @ length array copy
-put pd_CoverFCRange}if}{!}? 2 ^ ~ definefont fM 5 4 -1 $ put fM 4 0 put fM
-makefont Pscript_Windows_Font 3 1 $ put}b/sLT{: Lw -M currentpoint snap M 0 - 0
-Lc K ;}b/xUP null d/yUP null d/uW null d/xSP null d/ySP null d/sW null d/sSU{N
-/uW ~ d/yUP ~ d/xUP ~ d}b/sU{xUP yUP uW sLT}b/sST{N/sW ~ d/ySP ~ d/xSP ~ d}b/sT
-{xSP ySP sW sLT}b/sR{: + R 0 0 M}b/sRxy{: matrix astore concat 0 0 M}b/eR/; , d
-/AddOrigFP{{&/FontInfo known{&/FontInfo get length 6 add}{6}? dict `
-/WinPitchAndFamily ~ d/WinCharSet ~ d/OrigFontType ~ d/OrigFontStyle ~ d
-/OrigFontName ~ d & E/FontInfo ~ d}{! ! ! ! !}?}b/mFS{makefont
-Pscript_Windows_Font 3 1 $ put}b/mF42D{0 copyfont `/FontName ~ d 2 copy ~ sub 1
-add dict `/.notdef 0 d 2 copy 1 ~{@ 3 ^ sub Encoding ~ get ~ d}for & E
-/CharStrings ~ d ! ! & @ E/FontName get ~ definefont}b/mF42{15 dict ` @ 4 1 $
-FontName ~ d/FontType 0 d/FMapType 2 d/FontMatrix[1 0 0 1 0 0]d 1 ^ 254 add 255
-idiv @ array/Encoding ~ d 0 1 3 -1 $ 1 sub{@ Encoding 3 1 $ put}for/FDepVector
-Encoding length array d/CharStrings 2 dict `/.notdef 0 d & E d 0 1 Encoding
-length 1 sub{@ @ 10 lt{! FontName length 1 add string}{100 lt{FontName length 2
-add string}{FontName length 3 add string}?}? @ 0 FontName @ length string cvs
-putinterval @ 3 -1 $ @ 4 1 $ 3 string cvs FontName length ~ putinterval cvn 1 ^
-256 mul @ 255 add 3 -1 $ 4 ^ findfont mF42D FDepVector 3 1 $ put}for & @ E
-/FontName get ~ definefont ! ! ! mF}b/mF_OTF_V{~ ! ~ ! 4 -1 $ ! findfont 2 ^ ~
-definefont fM @ @ 4 6 -1 $ neg put 5 0 put 90 matrix R matrix concatmatrix
-makefont Pscript_Windows_Font 3 1 $ put}b/mF_TTF_V{3{~ !}repeat 3 -1 $ !
-findfont 1 ^ ~ definefont Pscript_Windows_Font 3 1 $ put}b/UmF{L2?
-{Pscript_Windows_Font ~ undef}{!}?}b/UmF42{@ findfont/FDepVector get{/FontName
-get undefinefont}forall undefinefont}b
-%%EndResource
-end reinitialize
-F /F0 0 /0 F /TT353ADb00 mF 
-/F0S4A F0 [74.477 0 0 -74.477 0 0 ] mFS
-F0S4A Ji 
-1055 153 M <01>S 
-1082 153 M <02>S  1118 153 M <03>S  1155 153 M <04>S  1179 153 M <05>S  1208 153 M <06>S  1242 153 M <07>S  1257 153 M <06>S  1292 153 M <08>S  1336 153 M <09>S  
-7 Lw N 1055 161 M 1373 161 I : 0.668 0.727 +S K 
-; 1 Lw solid N 2184 3023 M 2184 2991 I 2185 2990 I 2186 2989 I 2187 2990 I 2188 2991 I 2188 3023 I 2187 3024 I 2186 3025 I 2185 3024 I 2184 3023 I 2184 3023 I C 
-2184 2969 M 2184 2937 I 2185 2936 I 2186 2935 I 2187 2936 I 2188 2937 I 2188 2969 I 2187 2970 I 2186 2971 I 2185 2970 I 2184 2969 I 2184 2969 I C 
-2184 2915 M 2184 2884 I 2185 2883 I 2186 2882 I 2187 2883 I 2188 2884 I 2188 2915 I 2187 2917 I 2186 2918 I 2185 2917 I 2184 2915 I 2184 2915 I C 
-2184 2861 M 2184 2830 I 2185 2829 I 2186 2828 I 2187 2829 I 2188 2830 I 2188 2861 I 2187 2863 I 2186 2864 I 2185 2863 I 2184 2861 I 2184 2861 I C 
-2184 2807 M 2184 2776 I 2185 2775 I 2186 2774 I 2187 2775 I 2188 2776 I 2188 2807 I 2187 2810 I 2186 2810 I 2185 2810 I 2184 2807 I 2184 2807 I C 
-2184 2754 M 2184 2723 I 2185 2721 I 2186 2721 I 2187 2721 I 2188 2723 I 2188 2754 I 2187 2756 I 2186 2756 I 2185 2756 I 2184 2754 I 2184 2754 I C 
-2184 2700 M 2184 2669 I 2185 2667 I 2186 2667 I 2187 2667 I 2188 2669 I 2188 2700 I 2187 2702 I 2186 2702 I 2185 2702 I 2184 2700 I 2184 2700 I C 
-2184 2647 M 2184 2615 I 2185 2614 I 2186 2613 I 2187 2614 I 2188 2615 I 2188 2647 I 2187 2648 I 2186 2649 I 2185 2648 I 2184 2647 I 2184 2647 I C 
-2184 2593 M 2184 2561 I 2185 2560 I 2186 2559 I 2187 2560 I 2188 2561 I 2188 2593 I 2187 2594 I 2186 2595 I 2185 2594 I 2184 2593 I 2184 2593 I C 
-2184 2539 M 2184 2508 I 2185 2507 I 2186 2506 I 2187 2507 I 2188 2508 I 2188 2539 I 2187 2541 I 2186 2542 I 2185 2541 I 2184 2539 I 2184 2539 I C 
-2184 2486 M 2184 2454 I 2185 2453 I 2186 2452 I 2187 2453 I 2188 2454 I 2188 2486 I 2187 2487 I 2186 2488 I 2185 2487 I 2184 2486 I 2184 2486 I C 
-2184 2432 M 2184 2400 I 2185 2399 I 2186 2398 I 2187 2399 I 2188 2400 I 2188 2432 I 2187 2434 I 2186 2434 I 2185 2434 I 2184 2432 I 2184 2432 I C 
-2184 2378 M 2184 2347 I 2185 2345 I 2186 2345 I 2187 2345 I 2188 2347 I 2188 2378 I 2187 2380 I 2186 2380 I 2185 2380 I 2184 2378 I 2184 2378 I C 
-2184 2324 M 2184 2293 I 2185 2291 I 2186 2291 I 2187 2291 I 2188 2293 I 2188 2324 I 2187 2326 I 2186 2326 I 2185 2326 I 2184 2324 I 2184 2324 I C 
-2184 2271 M 2184 2240 I 2185 2238 I 2186 2237 I 2187 2238 I 2188 2240 I 2188 2271 I 2187 2272 I 2186 2273 I 2185 2272 I 2184 2271 I 2184 2271 I C 
-2184 2217 M 2184 2186 I 2185 2184 I 2186 2183 I 2187 2184 I 2188 2186 I 2188 2217 I 2187 2218 I 2186 2219 I 2185 2218 I 2184 2217 I 2184 2217 I C 
-2184 2163 M 2184 2132 I 2185 2130 I 2186 2129 I 2187 2130 I 2188 2132 I 2188 2163 I 2187 2165 I 2186 2166 I 2185 2165 I 2184 2163 I 2184 2163 I C 
-2184 2110 M 2184 2078 I 2185 2077 I 2186 2076 I 2187 2077 I 2188 2078 I 2188 2110 I 2187 2111 I 2186 2112 I 2185 2111 I 2184 2110 I 2184 2110 I C 
-2184 2056 M 2184 2024 I 2185 2023 I 2186 2022 I 2187 2023 I 2188 2024 I 2188 2056 I 2187 2058 I 2186 2058 I 2185 2058 I 2184 2056 I 2184 2056 I C 
-2184 2002 M 2184 1971 I 2185 1970 I 2186 1969 I 2187 1970 I 2188 1971 I 2188 2002 I 2187 2004 I 2186 2005 I 2185 2004 I 2184 2002 I 2184 2002 I C 
-2184 1948 M 2184 1917 I 2185 1916 I 2186 1915 I 2187 1916 I 2188 1917 I 2188 1948 I 2187 1950 I 2186 1951 I 2185 1950 I 2184 1948 I 2184 1948 I C 
-2184 1895 M 2184 1864 I 2185 1862 I 2186 1862 I 2187 1862 I 2188 1864 I 2188 1895 I 2187 1897 I 2186 1897 I 2185 1897 I 2184 1895 I 2184 1895 I C 
-2184 1841 M 2184 1810 I 2185 1808 I 2186 1808 I 2187 1808 I 2188 1810 I 2188 1841 I 2187 1843 I 2186 1843 I 2185 1843 I 2184 1841 I 2184 1841 I C 
-2184 1787 M 2184 1757 I 2185 1754 I 2186 1754 I 2187 1754 I 2188 1757 I 2188 1787 I 2187 1789 I 2186 1790 I 2185 1789 I 2184 1787 I 2184 1787 I C 
-2184 1734 M 2184 1703 I 2185 1701 I 2186 1700 I 2187 1701 I 2188 1703 I 2188 1734 I 2187 1735 I 2186 1736 I 2185 1735 I 2184 1734 I 2184 1734 I C 
-2184 1680 M 2184 1649 I 2185 1647 I 2186 1646 I 2187 1647 I 2188 1649 I 2188 1680 I 2187 1682 I 2186 1682 I 2185 1682 I 2184 1680 I 2184 1680 I C 
-2184 1627 M 2184 1595 I 2185 1594 I 2186 1593 I 2187 1594 I 2188 1595 I 2188 1627 I 2187 1628 I 2186 1629 I 2185 1628 I 2184 1627 I 2184 1627 I C 
-2184 1573 M 2184 1541 I 2185 1540 I 2186 1539 I 2187 1540 I 2188 1541 I 2188 1573 I 2187 1574 I 2186 1575 I 2185 1574 I 2184 1573 I 2184 1573 I C 
-2184 1519 M 2184 1488 I 2185 1487 I 2186 1486 I 2187 1487 I 2188 1488 I 2188 1519 I 2187 1521 I 2186 1522 I 2185 1521 I 2184 1519 I 2184 1519 I C 
-2184 1465 M 2184 1434 I 2185 1433 I 2186 1432 I 2187 1433 I 2188 1434 I 2188 1465 I 2187 1467 I 2186 1468 I 2185 1467 I 2184 1465 I 2184 1465 I C 
-2184 1411 M 2184 1381 I 2185 1379 I 2186 1378 I 2187 1379 I 2188 1381 I 2188 1411 I 2187 1414 I 2186 1414 I 2185 1414 I 2184 1411 I 2184 1411 I C 
-2184 1358 M 2184 1327 I 2185 1325 I 2186 1325 I 2187 1325 I 2188 1327 I 2188 1358 I 2187 1360 I 2186 1360 I 2185 1360 I 2184 1358 I 2184 1358 I C 
-2184 1304 M 2184 1273 I 2185 1271 I 2186 1271 I 2187 1271 I 2188 1273 I 2188 1304 I 2187 1306 I 2186 1306 I 2185 1306 I 2184 1304 I 2184 1304 I C 
-2184 1251 M 2184 1219 I 2185 1218 I 2186 1217 I 2187 1218 I 2188 1219 I 2188 1251 I 2187 1252 I 2186 1253 I 2185 1252 I 2184 1251 I 2184 1251 I C 
-2184 1197 M 2184 1165 I 2185 1164 I 2186 1163 I 2187 1164 I 2188 1165 I 2188 1197 I 2187 1198 I 2186 1199 I 2185 1198 I 2184 1197 I 2184 1197 I C 
-2184 1144 M 2184 1112 I 2185 1111 I 2186 1110 I 2187 1111 I 2188 1112 I 2188 1144 I 2187 1145 I 2186 1146 I 2185 1145 I 2184 1144 I 2184 1144 I C 
-2184 1090 M 2184 1058 I 2185 1057 I 2186 1056 I 2187 1057 I 2188 1058 I 2188 1090 I 2187 1091 I 2186 1092 I 2185 1091 I 2184 1090 I 2184 1090 I C 
-2184 1036 M 2184 1005 I 2185 1003 I 2186 1002 I 2187 1003 I 2188 1005 I 2188 1036 I 2187 1038 I 2186 1038 I 2185 1038 I 2184 1036 I 2184 1036 I C 
-2184 982 M 2184 951 I 2185 949 I 2186 949 I 2187 949 I 2188 951 I 2188 982 I 2187 984 I 2186 984 I 2185 984 I 2184 982 I 2184 982 I C 
-2184 928 M 2184 897 I 2185 895 I 2186 895 I 2187 895 I 2188 897 I 2188 928 I 2187 930 I 2186 930 I 2185 930 I 2184 928 I 2184 928 I C 
-2184 875 M 2184 844 I 2185 842 I 2186 841 I 2187 842 I 2188 844 I 2188 875 I 2187 876 I 2186 877 I 2185 876 I 2184 875 I 2184 875 I C 
-2184 821 M 2184 790 I 2185 788 I 2186 787 I 2187 788 I 2188 790 I 2188 821 I 2187 822 I 2186 823 I 2185 822 I 2184 821 I 2184 821 I C 
-2184 768 M 2184 736 I 2185 735 I 2186 734 I 2187 735 I 2188 736 I 2188 768 I 2187 769 I 2186 770 I 2185 769 I 2184 768 I 2184 768 I C 
-2184 714 M 2184 682 I 2185 681 I 2186 680 I 2187 681 I 2188 682 I 2188 714 I 2187 715 I 2186 716 I 2185 715 I 2184 714 I 2184 714 I C 
-2184 660 M 2184 629 I 2185 627 I 2186 626 I 2187 627 I 2188 629 I 2188 660 I 2187 662 I 2186 663 I 2185 662 I 2184 660 I 2184 660 I C 
-2184 606 M 2184 575 I 2185 574 I 2186 573 I 2187 574 I 2188 575 I 2188 606 I 2187 608 I 2186 609 I 2185 608 I 2184 606 I 2184 606 I C 
-2184 552 M 2184 521 I 2185 520 I 2186 519 I 2187 520 I 2188 521 I 2188 552 I 2187 554 I 2186 555 I 2185 554 I 2184 552 I 2184 552 I C 
-2184 499 M 2184 468 I 2185 466 I 2186 466 I 2187 466 I 2188 468 I 2188 499 I 2187 501 I 2186 501 I 2185 501 I 2184 499 I 2184 499 I C 
-2184 445 M 2184 414 I 2185 412 I 2186 412 I 2187 412 I 2188 414 I 2188 445 I 2187 447 I 2186 447 I 2185 447 I 2184 445 I 2184 445 I C 
-2184 392 M 2184 361 I 2185 359 I 2186 358 I 2187 359 I 2188 361 I 2188 392 I 2187 393 I 2186 394 I 2185 393 I 2184 392 I 2184 392 I C 
-2184 338 M 2184 307 I 2185 305 I 2186 304 I 2187 305 I 2188 307 I 2188 338 I 2187 339 I 2186 340 I 2185 339 I 2184 338 I 2184 338 I C 
-2184 284 M 2184 253 I 2185 251 I 2186 250 I 2187 251 I 2188 253 I 2188 284 I 2187 286 I 2186 287 I 2185 286 I 2184 284 I 2184 284 I C 
-:  L ; K 
-N 1955 13 M 1955 248 I 2417 248 I 2417 13 I 1955 13 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 6 Lw solid N 1955 248 M 2417 248 I 2417 13 I 1955 13 I 1955 248 I C 
-: 0.668 0.727 +S K 
-; T32RsrcBegin
-
-10
-/g410 [25 0 1 -43 23 1 ] 
-/g410 [22 44 true [1 0 0 1 -1 43 ]  0 0]
-[<03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-fffffc
-fffffc
-fffffc
-fffffc
-fffffc
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f800
-03f800
-01fc1c
-01fffc
-00fffc
-00fffc
-003ffc
-000ff0
->
- ]
-/TT353ADb00 AddT3T32Char
-
-11
-/g258 [35 0 3 -35 30 1 ] 
-/g258 [27 36 true [1 0 0 1 -3 35 ]  0 0]
-[<003fe000
-03fffc00
-0ffffe00
-1fffff80
-3fffff80
-3fc07fc0
-3e001fc0
-38000fc0
-00000fe0
-000007e0
-000007e0
-000007e0
-000007e0
-000007e0
-001fffe0
-01ffffe0
-07ffffe0
-0fffffe0
-3fffffe0
-3fe007e0
-7f8007e0
-7e0007e0
-fe0007e0
-fc0007e0
-fc0007e0
-fc0007e0
-fc0007e0
-fc000fe0
-fe003fe0
-7f007fe0
-7f81ffe0
-3ffffbe0
-3ffff3e0
-1fffe3e0
-07ff83e0
-01fe0000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-12
-/g336 [35 0 2 -35 33 14 ] 
-/g336 [31 49 true [1 0 0 1 -2 35 ]  0 0]
-[<001fc000
-00fffffe
-03fffffe
-07fffffe
-0ffffffe
-0ff07ffe
-1fc01f80
-1f800fc0
-3f800fc0
-3f0007e0
-3f0007e0
-3f0007e0
-3f0007e0
-3f0007e0
-3f800fe0
-1f800fc0
-1fc01fc0
-0ff07fc0
-0fffff80
-0fffff00
-1ffffe00
-3ffff800
-3e1fe000
-7c000000
-7c000000
-7c000000
-7e000000
-7f000000
-7ffff800
-3fffff80
-1fffffe0
-0ffffff8
-0ffffff8
-1f8007fc
-3f0001fe
-7e0000fe
-7e00007e
-fc00007e
-fc00007e
-fc00007e
-fc0000fe
-fe0000fc
-ff0003fc
-7fc00ff8
-7ffffff0
-3fffffe0
-0fffffc0
-07ffff00
-007ff000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-2036 153 M <0A>S 
-2058 153 M <0B>S  2091 153 M <04>S  2115 153 M <0C>S  2148 153 M <06>S  2182 153 M <0A>S  2205 153 M <07>S  2220 153 M <06>S  2254 153 M <08>S  2299 153 M <09>S  
-7 Lw N 2036 161 M 2336 161 I : 0.668 0.727 +S K 
-; 6 Lw N 1214 584 M 2118 584 I : 0.668 0.727 +S K 
-; N 2186 584 M 2153 604 I 2153 563 I 2186 584 I C 
-2153 604 M 2186 584 I 2153 604 I C 
- O 10 Lw N 2186 584 M 2153 604 I 2153 563 I 2186 584 I : 0.668 0.727 +S K 
-; N 2153 604 M 2186 584 I : 0.668 0.727 +S K 
-; 6 Lw N 2153 584 M 2099 584 I : 0.668 0.727 +S K 
-; N 1392 440 M 1392 529 I 2009 529 I 2009 440 I 1392 440 I C 
-1 1 1 1 scol  O 0 0 0 1 scol T32RsrcBegin
-
-13
-/g44 [46 0 6 -47 40 0 ] 
-/g44 [34 47 true [1 0 0 1 -6 47 ]  0 0]
-[<fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-ffffffffc0
-ffffffffc0
-ffffffffc0
-ffffffffc0
-ffffffffc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
-fc00000fc0
->
- ]
-/TT353ADb00 AddT3T32Char
-
-14
-/g4 [43 0 1 -47 42 0 ] 
-/g4 [41 47 true [1 0 0 1 -1 47 ]  0 0]
-[<00007f000000
-0000ff800000
-0000ff800000
-0001ff800000
-0001ffc00000
-0001ffc00000
-0003ffc00000
-0003f7e00000
-0003e7e00000
-0007e7f00000
-0007e3f00000
-0007c3f00000
-000fc3f80000
-000fc1f80000
-001f81f80000
-001f81fc0000
-001f80fc0000
-003f00fc0000
-003f00fe0000
-003f007e0000
-007e007f0000
-007e007f0000
-007e003f0000
-00fc003f8000
-00fc003f8000
-01fc001f8000
-01f8001fc000
-01f8001fc000
-03f8000fc000
-03f0000fe000
-03ffffffe000
-07ffffffe000
-07fffffff000
-07fffffff000
-0ffffffff800
-0fc00003f800
-0fc00003f800
-1fc00001fc00
-1f800001fc00
-3f800000fc00
-3f800000fe00
-3f000000fe00
-7f0000007e00
-7e0000007f00
-7e0000007f00
-fe0000003f00
-fc0000003f00
->
- ]
-/TT353ADb00 AddT3T32Char
-
-15
-/g24 [46 0 6 -47 42 0 ] 
-/g24 [36 47 true [1 0 0 1 -6 47 ]  0 0]
-[<7fffe00000
-fffffe0000
-ffffff8000
-ffffffe000
-fffffff000
-fc007ffc00
-fc000ffe00
-fc0003fe00
-fc0000ff00
-fc00007f80
-fc00007f80
-fc00003fc0
-fc00001fc0
-fc00001fe0
-fc00000fe0
-fc00000fe0
-fc00000fe0
-fc00000ff0
-fc000007f0
-fc000007f0
-fc000007f0
-fc000007f0
-fc000007f0
-fc000007f0
-fc000007f0
-fc000007f0
-fc000007f0
-fc000007f0
-fc000007f0
-fc00000fe0
-fc00000fe0
-fc00000fe0
-fc00000fe0
-fc00001fc0
-fc00001fc0
-fc00003fc0
-fc00003f80
-fc00007f80
-fc0000ff00
-fc0003fe00
-fc0007fc00
-fc003ff800
-fffffff000
-ffffffe000
-ffffff8000
-fffffe0000
-7fffe00000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-16
-/g75 [49 0 4 -48 46 1 ] 
-/g75 [42 49 true [1 0 0 1 -4 48 ]  0 0]
-[<0000ffe00000
-0007fffc0000
-001fffff0000
-007fffffc000
-00ffffffe000
-03ff807ff000
-03fe000ff800
-07f80007fc00
-0ff00003fe00
-1fe00001fe00
-1fc00000ff00
-3fc000007f00
-3f8000007f00
-3f8000007f80
-7f0000003f80
-7f0000003f80
-7f0000003f80
-7f0000003fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-ff0000003f80
-7f0000003f80
-7f0000003f80
-7f0000003f80
-7f8000007f00
-3f8000007f00
-3f800000ff00
-3fc00000fe00
-1fe00001fe00
-1fe00003fc00
-0ff80007f800
-07fc001ff000
-03ff807ff000
-01ffffffc000
-00ffffff8000
-003ffffe0000
-000ffff80000
-0001ffc00000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-17
-/g115 [42 0 1 -47 40 0 ] 
-/g115 [39 47 true [1 0 0 1 -1 47 ]  0 0]
-[<fc0000007e
-fe0000007e
-fe0000007e
-7e000000fe
-7f000000fc
-7f000000fc
-3f000001fc
-3f800001f8
-3f800001f8
-1f800003f8
-1fc00003f0
-1fc00003f0
-0fc00007f0
-0fe00007e0
-07e00007e0
-07e0000fc0
-07f0000fc0
-03f0000fc0
-03f8001f80
-03f8001f80
-01f8001f80
-01fc003f00
-01fc003f00
-00fc003f00
-00fe007e00
-00fe007e00
-007e007e00
-007f00fc00
-007f00fc00
-003f00fc00
-003f81f800
-001f81f800
-001f81f000
-001fc3f000
-000fc3f000
-000fc3e000
-000fe7e000
-0007e7e000
-0007e7c000
-0007ffc000
-0003ffc000
-0003ff8000
-0003ff8000
-0001ff8000
-0001ff0000
-0000ff0000
-0000fe0000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-18
-/g28 [36 0 6 -47 32 0 ] 
-/g28 [26 47 true [1 0 0 1 -6 47 ]  0 0]
-[<7fffffc0
-ffffffc0
-ffffffc0
-ffffffc0
-ffffffc0
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fffffe00
-fffffe00
-fffffe00
-fffffe00
-fffffe00
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-ffffffc0
-ffffffc0
-ffffffc0
-ffffffc0
-7fffffc0
->
- ]
-/TT353ADb00 AddT3T32Char
-
-19
-/g90 [40 0 6 -47 37 0 ] 
-/g90 [31 47 true [1 0 0 1 -6 47 ]  0 0]
-[<7fffc000
-fffff800
-fffffe00
-ffffff00
-ffffff80
-fc00ffc0
-fc003fe0
-fc001fe0
-fc000fe0
-fc000ff0
-fc0007f0
-fc0007f0
-fc0007f0
-fc0007f0
-fc0007f0
-fc0007f0
-fc000fe0
-fc000fe0
-fc001fe0
-fc003fc0
-fc00ff80
-ffffff00
-fffffe00
-fffff800
-fffff000
-fffff800
-fc07fc00
-fc01fe00
-fc00ff00
-fc007f00
-fc003f80
-fc003f80
-fc001fc0
-fc001fc0
-fc000fe0
-fc000fe0
-fc0007e0
-fc0007f0
-fc0007f0
-fc0003f8
-fc0003f8
-fc0001f8
-fc0001fc
-fc0001fc
-fc0000fe
-fc0000fe
-fc00007e
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1392 507 M <0D>S 
-1435 507 M <0E>S  1474 507 M <08>S  1518 507 M <0F>S  1561 507 M <10>S  1606 507 M <11>S  1645 507 M <12>S  1679 507 M <13>S  
-T32RsrcBegin
-
-20
-/g890 [37 0 0 9 37 14 ] 
-/g890 [37 5 true [1 0 0 1 0 -9 ]  0 0]
-[<fffffffff8
-fffffffff8
-fffffffff8
-fffffffff8
-fffffffff8
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1716 507 M <14>S 
-T32RsrcBegin
-
-21
-/g89 [50 0 4 -48 52 7 ] 
-/g89 [48 55 true [1 0 0 1 -4 48 ]  0 0]
-[<0000ffe00000
-0007fffc0000
-001fffff0000
-007fffffc000
-00ffffffe000
-03ff807ff000
-03fe000ff800
-07f80007fc00
-0ff00003fc00
-1fe00001fe00
-1fc00000ff00
-3fc000007f00
-3f8000007f00
-3f8000007f80
-7f0000003f80
-7f0000003f80
-7f0000003f80
-7f0000003fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-fe0000001fc0
-ff0000003f80
-7f0000003f80
-7f0000003f80
-7f0000003f80
-7f8000007f00
-3f8000007f00
-3f800000ff00
-3fc00000fe00
-1fe00001fe00
-1fe00003fc00
-0ff80007f800
-07fc001ff000
-03ff807ff800
-01fffffffc00
-00ffffffff00
-007ffffeff80
-000ffff87fe0
-0001ffc03ffc
-000000001ffe
-0000000007ff
-0000000003ff
-0000000000ff
-00000000003f
-000000000007
->
- ]
-/TT353ADb00 AddT3T32Char
-
-22
-/g104 [47 0 6 -47 41 1 ] 
-/g104 [35 48 true [1 0 0 1 -6 47 ]  0 0]
-[<fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fc000007e0
-fe00000fc0
-7e00000fc0
-7f00000fc0
-7f00001f80
-3f80003f80
-3fc0007f00
-1fe000ff00
-0ffc07fe00
-07fffffc00
-03fffff800
-01ffffe000
-007fff8000
-000ffc0000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-23
-/g94 [34 0 3 -48 32 1 ] 
-/g94 [29 49 true [1 0 0 1 -3 48 ]  0 0]
-[<001ff000
-00fffe00
-03ffff80
-07ffffc0
-0fffffc0
-1fe01fc0
-3fc003c0
-3f0000c0
-3f000000
-7e000000
-7e000000
-7e000000
-7e000000
-7e000000
-7f000000
-7f000000
-3f800000
-3fc00000
-3fe00000
-1ff80000
-0ffe0000
-07ffc000
-03fff000
-01fffc00
-007ffe00
-001fff80
-0007ffc0
-0001ffe0
-00007fe0
-00001ff0
-00000ff0
-000007f8
-000007f8
-000003f8
-000003f8
-000003f8
-000003f8
-000003f8
-000003f8
-000007f0
-c00007f0
-f0000fe0
-fc001fe0
-ff80ffc0
-ffffff80
-7fffff00
-3ffffe00
-07fff800
-00ffc000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-24
-/g100 [36 0 1 -47 35 0 ] 
-/g100 [34 47 true [1 0 0 1 -1 47 ]  0 0]
-[<ffffffffc0
-ffffffffc0
-ffffffffc0
-ffffffffc0
-ffffffffc0
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
-0003f00000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1749 507 M <13>S 
-1786 507 M <12>S  1820 507 M <15>S  1866 507 M <16>S  1910 507 M <12>S  1944 507 M <17>S  1975 507 M <18>S  
-N 2186 919 M 1282 919 I : 0.668 0.727 +S K 
-; N 1214 919 M 1247 898 I 1247 940 I 1214 919 I C 
-1247 898 M 1214 919 I 1247 898 I C 
- O 10 Lw N 1214 919 M 1247 898 I 1247 940 I 1214 919 I : 0.668 0.727 +S K 
-; N 1247 898 M 1214 919 I : 0.668 0.727 +S K 
-; 6 Lw N 1247 919 M 1301 919 I : 0.668 0.727 +S K 
-; N 1318 809 M 1318 898 I 2082 898 I 2082 809 I 1318 809 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 1318 876 M <0D>S 
-1361 876 M <0E>S  1401 876 M <08>S  1445 876 M <0F>S  1487 876 M <10>S  1533 876 M <11>S  1572 876 M <12>S  1606 876 M <13>S  
-1643 876 M <14>S 
-1677 876 M <13>S 
-1714 876 M <12>S  1747 876 M <15>S  1793 876 M <16>S  1838 876 M <12>S  1871 876 M <17>S  1903 876 M <18>S  
-1936 876 M <14>S 
-T32RsrcBegin
-
-25
-/g18 [39 0 4 -48 37 1 ] 
-/g18 [33 49 true [1 0 0 1 -4 48 ]  0 0]
-[<0001ff0000
-000fffe000
-003ffff800
-007ffffe00
-00ffffff00
-01ff80ff80
-03fe001f80
-07f8000f80
-0ff0000380
-0fe0000180
-1fc0000000
-1fc0000000
-3f80000000
-3f80000000
-7f80000000
-7f00000000
-7f00000000
-7f00000000
-7f00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-fe00000000
-ff00000000
-7f00000000
-7f00000000
-7f00000000
-7f80000000
-3f80000000
-3fc0000000
-1fc0000000
-1fe0000000
-0ff0000180
-0ff8000780
-07fc001f80
-03ff807f80
-01ffffff80
-00ffffff00
-007ffffc00
-001ffff000
-0001ff0000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-26
-/g60 [38 0 6 -47 36 0 ] 
-/g60 [30 47 true [1 0 0 1 -6 47 ]  0 0]
-[<fc0001f8
-fc0003f8
-fc0007f8
-fc0007f0
-fc000fe0
-fc001fc0
-fc003fc0
-fc007f80
-fc007f00
-fc00fe00
-fc01fc00
-fc03f800
-fc07f800
-fc07f000
-fc0fe000
-fc1fc000
-fc3f8000
-fc7f0000
-fc7f0000
-fcfe0000
-fdfc0000
-fff80000
-fff80000
-fdfc0000
-fdfe0000
-fcfe0000
-fc7f0000
-fc3f8000
-fc3fc000
-fc1fe000
-fc0fe000
-fc07f000
-fc07f800
-fc03fc00
-fc01fc00
-fc00fe00
-fc00ff00
-fc007f80
-fc003f80
-fc001fc0
-fc001fe0
-fc000ff0
-fc0007f0
-fc0007f8
-fc0003fc
-fc0001fc
-fc0000fc
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1970 876 M <0E>S 
-2009 876 M <19>S  2046 876 M <1A>S  
-N 1214 1590 M 2118 1590 I : 0.668 0.727 +S K 
-; N 2186 1590 M 2153 1611 I 2153 1569 I 2186 1590 I C 
-2153 1611 M 2186 1590 I 2153 1611 I C 
- O 10 Lw N 2186 1590 M 2153 1611 I 2153 1569 I 2186 1590 I : 0.668 0.727 +S K 
-; N 2153 1611 M 2186 1590 I : 0.668 0.727 +S K 
-; 6 Lw N 2153 1590 M 2099 1590 I : 0.668 0.727 +S K 
-; N 1377 1446 M 1377 1536 I 2023 1536 I 2023 1446 I 1377 1446 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 1377 1514 M <17>S 
-1409 1514 M <08>S  
-1453 1514 M <14>S 
-1487 1514 M <17>S 
-1518 1514 M <18>S  1552 1514 M <0E>S  1592 1514 M <18>S  1625 1514 M <16>S  1669 1514 M <17>S  
-1701 1514 M <14>S 
-T32RsrcBegin
-
-27
-/g38 [34 0 6 -47 31 0 ] 
-/g38 [25 47 true [1 0 0 1 -6 47 ]  0 0]
-[<7fffff80
-ffffff80
-ffffff80
-ffffff80
-ffffff80
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-ffffff00
-ffffff00
-ffffff00
-ffffff00
-ffffff00
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1734 1514 M <18>S 
-1768 1514 M <13>S  1805 1514 M <0E>S  1844 1514 M <08>S  1889 1514 M <17>S  1920 1514 M <1B>S  1952 1514 M <12>S  1985 1514 M <13>S  
-N 2186 2932 M 1282 2932 I : 0.668 0.727 +S K 
-; N 1214 2932 M 1247 2912 I 1247 2953 I 1214 2932 I C 
-1247 2912 M 1214 2932 I 1247 2912 I C 
- O 10 Lw N 1214 2932 M 1247 2912 I 1247 2953 I 1214 2932 I : 0.668 0.727 +S K 
-; N 1247 2912 M 1214 2932 I : 0.668 0.727 +S K 
-; 6 Lw N 1247 2932 M 1301 2932 I : 0.668 0.727 +S K 
-; N 1377 2823 M 1377 2912 I 2023 2912 I 2023 2823 I 1377 2823 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 1377 2890 M <16>S 
-1422 2890 M <12>S  
-1455 2890 M <14>S 
-T32RsrcBegin
-
-28
-/g121 [38 0 2 -47 37 0 ] 
-/g121 [35 47 true [1 0 0 1 -2 47 ]  0 0]
-[<fe00000fc0
-7f00001fc0
-7f00001f80
-3f80003f80
-3f80007f00
-1fc0007f00
-1fc000fe00
-0fe000fe00
-07f001fc00
-07f001f800
-03f803f800
-03f807f000
-01fc07f000
-01fe0fe000
-00fe0fc000
-007f1fc000
-007f1f8000
-003fbf8000
-003fff0000
-001ffe0000
-000ffe0000
-000ffc0000
-0007fc0000
-0007fc0000
-000ffc0000
-000ffe0000
-001ffe0000
-001fff0000
-003f3f8000
-007f3f8000
-007e1fc000
-00fe1fc000
-00fc0fe000
-01fc07f000
-03f807f000
-03f003f800
-07f003f800
-07e001fc00
-0fe001fc00
-1fc000fe00
-1fc000ff00
-3f80007f00
-3f80003f80
-7f00003f80
-fe00001fc0
-fe00001fc0
-fc00000fc0
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1489 2890 M <19>S 
-1525 2890 M <10>S  1571 2890 M <08>S  1615 2890 M <18>S  1649 2890 M <12>S  1682 2890 M <1C>S  1718 2890 M <18>S  
-1751 2890 M <14>S 
-T32RsrcBegin
-
-29
-/g62 [31 0 6 -47 30 0 ] 
-/g62 [24 47 true [1 0 0 1 -6 47 ]  0 0]
-[<fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-fc0000
-ffffff
-ffffff
-ffffff
-ffffff
-7fffff
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1785 2890 M <13>S 
-1822 2890 M <12>S  1856 2890 M <1D>S  1885 2890 M <12>S  1918 2890 M <0E>S  1958 2890 M <17>S  1989 2890 M <12>S  
-1 Lw solid N 241 3023 M 241 2991 I 242 2990 I 243 2989 I 244 2990 I 245 2991 I 245 3023 I 244 3024 I 243 3025 I 242 3024 I 241 3023 I 241 3023 I C 
-241 2969 M 241 2937 I 242 2936 I 243 2935 I 244 2936 I 245 2937 I 245 2969 I 244 2970 I 243 2971 I 242 2970 I 241 2969 I 241 2969 I C 
-241 2915 M 241 2884 I 242 2883 I 243 2882 I 244 2883 I 245 2884 I 245 2915 I 244 2917 I 243 2918 I 242 2917 I 241 2915 I 241 2915 I C 
-241 2861 M 241 2830 I 242 2829 I 243 2828 I 244 2829 I 245 2830 I 245 2861 I 244 2863 I 243 2864 I 242 2863 I 241 2861 I 241 2861 I C 
-241 2807 M 241 2776 I 242 2775 I 243 2774 I 244 2775 I 245 2776 I 245 2807 I 244 2810 I 243 2810 I 242 2810 I 241 2807 I 241 2807 I C 
-241 2754 M 241 2723 I 242 2721 I 243 2721 I 244 2721 I 245 2723 I 245 2754 I 244 2756 I 243 2756 I 242 2756 I 241 2754 I 241 2754 I C 
-241 2700 M 241 2669 I 242 2667 I 243 2667 I 244 2667 I 245 2669 I 245 2700 I 244 2702 I 243 2702 I 242 2702 I 241 2700 I 241 2700 I C 
-241 2647 M 241 2615 I 242 2614 I 243 2613 I 244 2614 I 245 2615 I 245 2647 I 244 2648 I 243 2649 I 242 2648 I 241 2647 I 241 2647 I C 
-241 2593 M 241 2561 I 242 2560 I 243 2559 I 244 2560 I 245 2561 I 245 2593 I 244 2594 I 243 2595 I 242 2594 I 241 2593 I 241 2593 I C 
-241 2539 M 241 2508 I 242 2507 I 243 2506 I 244 2507 I 245 2508 I 245 2539 I 244 2541 I 243 2542 I 242 2541 I 241 2539 I 241 2539 I C 
-241 2486 M 241 2454 I 242 2453 I 243 2452 I 244 2453 I 245 2454 I 245 2486 I 244 2487 I 243 2488 I 242 2487 I 241 2486 I 241 2486 I C 
-241 2432 M 241 2400 I 242 2399 I 243 2398 I 244 2399 I 245 2400 I 245 2432 I 244 2434 I 243 2434 I 242 2434 I 241 2432 I 241 2432 I C 
-241 2378 M 241 2347 I 242 2345 I 243 2345 I 244 2345 I 245 2347 I 245 2378 I 244 2380 I 243 2380 I 242 2380 I 241 2378 I 241 2378 I C 
-241 2324 M 241 2293 I 242 2291 I 243 2291 I 244 2291 I 245 2293 I 245 2324 I 244 2326 I 243 2326 I 242 2326 I 241 2324 I 241 2324 I C 
-241 2271 M 241 2240 I 242 2238 I 243 2237 I 244 2238 I 245 2240 I 245 2271 I 244 2272 I 243 2273 I 242 2272 I 241 2271 I 241 2271 I C 
-241 2217 M 241 2186 I 242 2184 I 243 2183 I 244 2184 I 245 2186 I 245 2217 I 244 2218 I 243 2219 I 242 2218 I 241 2217 I 241 2217 I C 
-241 2163 M 241 2132 I 242 2130 I 243 2129 I 244 2130 I 245 2132 I 245 2163 I 244 2165 I 243 2166 I 242 2165 I 241 2163 I 241 2163 I C 
-241 2110 M 241 2078 I 242 2077 I 243 2076 I 244 2077 I 245 2078 I 245 2110 I 244 2111 I 243 2112 I 242 2111 I 241 2110 I 241 2110 I C 
-241 2056 M 241 2024 I 242 2023 I 243 2022 I 244 2023 I 245 2024 I 245 2056 I 244 2058 I 243 2058 I 242 2058 I 241 2056 I 241 2056 I C 
-241 2002 M 241 1971 I 242 1970 I 243 1969 I 244 1970 I 245 1971 I 245 2002 I 244 2004 I 243 2005 I 242 2004 I 241 2002 I 241 2002 I C 
-241 1948 M 241 1917 I 242 1916 I 243 1915 I 244 1916 I 245 1917 I 245 1948 I 244 1950 I 243 1951 I 242 1950 I 241 1948 I 241 1948 I C 
-241 1895 M 241 1864 I 242 1862 I 243 1862 I 244 1862 I 245 1864 I 245 1895 I 244 1897 I 243 1897 I 242 1897 I 241 1895 I 241 1895 I C 
-241 1841 M 241 1810 I 242 1808 I 243 1808 I 244 1808 I 245 1810 I 245 1841 I 244 1843 I 243 1843 I 242 1843 I 241 1841 I 241 1841 I C 
-241 1787 M 241 1757 I 242 1754 I 243 1754 I 244 1754 I 245 1757 I 245 1787 I 244 1789 I 243 1790 I 242 1789 I 241 1787 I 241 1787 I C 
-241 1734 M 241 1703 I 242 1701 I 243 1700 I 244 1701 I 245 1703 I 245 1734 I 244 1735 I 243 1736 I 242 1735 I 241 1734 I 241 1734 I C 
-241 1680 M 241 1649 I 242 1647 I 243 1646 I 244 1647 I 245 1649 I 245 1680 I 244 1682 I 243 1682 I 242 1682 I 241 1680 I 241 1680 I C 
-241 1627 M 241 1595 I 242 1594 I 243 1593 I 244 1594 I 245 1595 I 245 1627 I 244 1628 I 243 1629 I 242 1628 I 241 1627 I 241 1627 I C 
-241 1573 M 241 1541 I 242 1540 I 243 1539 I 244 1540 I 245 1541 I 245 1573 I 244 1574 I 243 1575 I 242 1574 I 241 1573 I 241 1573 I C 
-241 1519 M 241 1488 I 242 1487 I 243 1486 I 244 1487 I 245 1488 I 245 1519 I 244 1521 I 243 1522 I 242 1521 I 241 1519 I 241 1519 I C 
-241 1465 M 241 1434 I 242 1433 I 243 1432 I 244 1433 I 245 1434 I 245 1465 I 244 1467 I 243 1468 I 242 1467 I 241 1465 I 241 1465 I C 
-241 1411 M 241 1381 I 242 1379 I 243 1378 I 244 1379 I 245 1381 I 245 1411 I 244 1414 I 243 1414 I 242 1414 I 241 1411 I 241 1411 I C 
-241 1358 M 241 1327 I 242 1325 I 243 1325 I 244 1325 I 245 1327 I 245 1358 I 244 1360 I 243 1360 I 242 1360 I 241 1358 I 241 1358 I C 
-241 1304 M 241 1273 I 242 1271 I 243 1271 I 244 1271 I 245 1273 I 245 1304 I 244 1306 I 243 1306 I 242 1306 I 241 1304 I 241 1304 I C 
-241 1251 M 241 1219 I 242 1218 I 243 1217 I 244 1218 I 245 1219 I 245 1251 I 244 1252 I 243 1253 I 242 1252 I 241 1251 I 241 1251 I C 
-241 1197 M 241 1165 I 242 1164 I 243 1163 I 244 1164 I 245 1165 I 245 1197 I 244 1198 I 243 1199 I 242 1198 I 241 1197 I 241 1197 I C 
-241 1144 M 241 1112 I 242 1111 I 243 1110 I 244 1111 I 245 1112 I 245 1144 I 244 1145 I 243 1146 I 242 1145 I 241 1144 I 241 1144 I C 
-241 1090 M 241 1058 I 242 1057 I 243 1056 I 244 1057 I 245 1058 I 245 1090 I 244 1091 I 243 1092 I 242 1091 I 241 1090 I 241 1090 I C 
-241 1036 M 241 1005 I 242 1003 I 243 1002 I 244 1003 I 245 1005 I 245 1036 I 244 1038 I 243 1038 I 242 1038 I 241 1036 I 241 1036 I C 
-241 982 M 241 951 I 242 949 I 243 949 I 244 949 I 245 951 I 245 982 I 244 984 I 243 984 I 242 984 I 241 982 I 241 982 I C 
-241 928 M 241 897 I 242 895 I 243 895 I 244 895 I 245 897 I 245 928 I 244 930 I 243 930 I 242 930 I 241 928 I 241 928 I C 
-241 875 M 241 844 I 242 842 I 243 841 I 244 842 I 245 844 I 245 875 I 244 876 I 243 877 I 242 876 I 241 875 I 241 875 I C 
-241 821 M 241 790 I 242 788 I 243 787 I 244 788 I 245 790 I 245 821 I 244 822 I 243 823 I 242 822 I 241 821 I 241 821 I C 
-241 768 M 241 736 I 242 735 I 243 734 I 244 735 I 245 736 I 245 768 I 244 769 I 243 770 I 242 769 I 241 768 I 241 768 I C 
-241 714 M 241 682 I 242 681 I 243 680 I 244 681 I 245 682 I 245 714 I 244 715 I 243 716 I 242 715 I 241 714 I 241 714 I C 
-241 660 M 241 629 I 242 627 I 243 626 I 244 627 I 245 629 I 245 660 I 244 662 I 243 663 I 242 662 I 241 660 I 241 660 I C 
-241 606 M 241 575 I 242 574 I 243 573 I 244 574 I 245 575 I 245 606 I 244 608 I 243 609 I 242 608 I 241 606 I 241 606 I C 
-241 552 M 241 521 I 242 520 I 243 519 I 244 520 I 245 521 I 245 552 I 244 554 I 243 555 I 242 554 I 241 552 I 241 552 I C 
-241 499 M 241 468 I 242 466 I 243 466 I 244 466 I 245 468 I 245 499 I 244 501 I 243 501 I 242 501 I 241 499 I 241 499 I C 
-241 445 M 241 414 I 242 412 I 243 412 I 244 412 I 245 414 I 245 445 I 244 447 I 243 447 I 242 447 I 241 445 I 241 445 I C 
-241 392 M 241 361 I 242 359 I 243 358 I 244 359 I 245 361 I 245 392 I 244 393 I 243 394 I 242 393 I 241 392 I 241 392 I C 
-241 338 M 241 307 I 242 305 I 243 304 I 244 305 I 245 307 I 245 338 I 244 339 I 243 340 I 242 339 I 241 338 I 241 338 I C 
-241 284 M 241 253 I 242 251 I 243 250 I 244 251 I 245 253 I 245 284 I 244 286 I 243 287 I 242 286 I 241 284 I 241 284 I C 
-:  L ; K 
-N 11 12 M 11 248 I 473 248 I 473 12 I 11 12 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 6 Lw solid N 11 248 M 473 248 I 473 12 I 11 12 I 11 248 I C 
-: 0.668 0.727 +S K 
-; 204 153 M <16>S 
-248 153 M <12>S  
-7 Lw N 204 161 M 281 161 I : 0.668 0.727 +S K 
-; 1 Lw solid N 3155 3023 M 3155 2991 I 3156 2990 I 3157 2989 I 3160 2990 I 3160 2991 I 3160 3023 I 3160 3024 I 3157 3025 I 3156 3024 I 3155 3023 I 3155 3023 I C 
-3155 2969 M 3155 2937 I 3156 2936 I 3157 2935 I 3160 2936 I 3160 2937 I 3160 2969 I 3160 2970 I 3157 2971 I 3156 2970 I 3155 2969 I 3155 2969 I C 
-3155 2915 M 3155 2884 I 3156 2883 I 3157 2882 I 3160 2883 I 3160 2884 I 3160 2915 I 3160 2917 I 3157 2918 I 3156 2917 I 3155 2915 I 3155 2915 I C 
-3155 2861 M 3155 2830 I 3156 2829 I 3157 2828 I 3160 2829 I 3160 2830 I 3160 2861 I 3160 2863 I 3157 2864 I 3156 2863 I 3155 2861 I 3155 2861 I C 
-3155 2807 M 3155 2776 I 3156 2775 I 3157 2774 I 3160 2775 I 3160 2776 I 3160 2807 I 3160 2810 I 3157 2810 I 3156 2810 I 3155 2807 I 3155 2807 I C 
-3155 2754 M 3155 2723 I 3156 2721 I 3157 2721 I 3160 2721 I 3160 2723 I 3160 2754 I 3160 2756 I 3157 2756 I 3156 2756 I 3155 2754 I 3155 2754 I C 
-3155 2700 M 3155 2669 I 3156 2667 I 3157 2667 I 3160 2667 I 3160 2669 I 3160 2700 I 3160 2702 I 3157 2702 I 3156 2702 I 3155 2700 I 3155 2700 I C 
-3155 2647 M 3155 2615 I 3156 2614 I 3157 2613 I 3160 2614 I 3160 2615 I 3160 2647 I 3160 2648 I 3157 2649 I 3156 2648 I 3155 2647 I 3155 2647 I C 
-3155 2593 M 3155 2561 I 3156 2560 I 3157 2559 I 3160 2560 I 3160 2561 I 3160 2593 I 3160 2594 I 3157 2595 I 3156 2594 I 3155 2593 I 3155 2593 I C 
-3155 2539 M 3155 2508 I 3156 2507 I 3157 2506 I 3160 2507 I 3160 2508 I 3160 2539 I 3160 2541 I 3157 2542 I 3156 2541 I 3155 2539 I 3155 2539 I C 
-3155 2486 M 3155 2454 I 3156 2453 I 3157 2452 I 3160 2453 I 3160 2454 I 3160 2486 I 3160 2487 I 3157 2488 I 3156 2487 I 3155 2486 I 3155 2486 I C 
-3155 2432 M 3155 2400 I 3156 2399 I 3157 2398 I 3160 2399 I 3160 2400 I 3160 2432 I 3160 2434 I 3157 2434 I 3156 2434 I 3155 2432 I 3155 2432 I C 
-3155 2378 M 3155 2347 I 3156 2345 I 3157 2345 I 3160 2345 I 3160 2347 I 3160 2378 I 3160 2380 I 3157 2380 I 3156 2380 I 3155 2378 I 3155 2378 I C 
-3155 2324 M 3155 2293 I 3156 2291 I 3157 2291 I 3160 2291 I 3160 2293 I 3160 2324 I 3160 2326 I 3157 2326 I 3156 2326 I 3155 2324 I 3155 2324 I C 
-3155 2271 M 3155 2240 I 3156 2238 I 3157 2237 I 3160 2238 I 3160 2240 I 3160 2271 I 3160 2272 I 3157 2273 I 3156 2272 I 3155 2271 I 3155 2271 I C 
-3155 2217 M 3155 2186 I 3156 2184 I 3157 2183 I 3160 2184 I 3160 2186 I 3160 2217 I 3160 2218 I 3157 2219 I 3156 2218 I 3155 2217 I 3155 2217 I C 
-3155 2163 M 3155 2132 I 3156 2130 I 3157 2129 I 3160 2130 I 3160 2132 I 3160 2163 I 3160 2165 I 3157 2166 I 3156 2165 I 3155 2163 I 3155 2163 I C 
-3155 2110 M 3155 2078 I 3156 2077 I 3157 2076 I 3160 2077 I 3160 2078 I 3160 2110 I 3160 2111 I 3157 2112 I 3156 2111 I 3155 2110 I 3155 2110 I C 
-3155 2056 M 3155 2024 I 3156 2023 I 3157 2022 I 3160 2023 I 3160 2024 I 3160 2056 I 3160 2058 I 3157 2058 I 3156 2058 I 3155 2056 I 3155 2056 I C 
-3155 2002 M 3155 1971 I 3156 1970 I 3157 1969 I 3160 1970 I 3160 1971 I 3160 2002 I 3160 2004 I 3157 2005 I 3156 2004 I 3155 2002 I 3155 2002 I C 
-3155 1948 M 3155 1917 I 3156 1916 I 3157 1915 I 3160 1916 I 3160 1917 I 3160 1948 I 3160 1950 I 3157 1951 I 3156 1950 I 3155 1948 I 3155 1948 I C 
-3155 1895 M 3155 1864 I 3156 1862 I 3157 1862 I 3160 1862 I 3160 1864 I 3160 1895 I 3160 1897 I 3157 1897 I 3156 1897 I 3155 1895 I 3155 1895 I C 
-3155 1841 M 3155 1810 I 3156 1808 I 3157 1808 I 3160 1808 I 3160 1810 I 3160 1841 I 3160 1843 I 3157 1843 I 3156 1843 I 3155 1841 I 3155 1841 I C 
-3155 1787 M 3155 1757 I 3156 1754 I 3157 1754 I 3160 1754 I 3160 1757 I 3160 1787 I 3160 1789 I 3157 1790 I 3156 1789 I 3155 1787 I 3155 1787 I C 
-3155 1734 M 3155 1703 I 3156 1701 I 3157 1700 I 3160 1701 I 3160 1703 I 3160 1734 I 3160 1735 I 3157 1736 I 3156 1735 I 3155 1734 I 3155 1734 I C 
-3155 1680 M 3155 1649 I 3156 1647 I 3157 1646 I 3160 1647 I 3160 1649 I 3160 1680 I 3160 1682 I 3157 1682 I 3156 1682 I 3155 1680 I 3155 1680 I C 
-3155 1627 M 3155 1595 I 3156 1594 I 3157 1593 I 3160 1594 I 3160 1595 I 3160 1627 I 3160 1628 I 3157 1629 I 3156 1628 I 3155 1627 I 3155 1627 I C 
-3155 1573 M 3155 1541 I 3156 1540 I 3157 1539 I 3160 1540 I 3160 1541 I 3160 1573 I 3160 1574 I 3157 1575 I 3156 1574 I 3155 1573 I 3155 1573 I C 
-3155 1519 M 3155 1488 I 3156 1487 I 3157 1486 I 3160 1487 I 3160 1488 I 3160 1519 I 3160 1521 I 3157 1522 I 3156 1521 I 3155 1519 I 3155 1519 I C 
-3155 1465 M 3155 1434 I 3156 1433 I 3157 1432 I 3160 1433 I 3160 1434 I 3160 1465 I 3160 1467 I 3157 1468 I 3156 1467 I 3155 1465 I 3155 1465 I C 
-3155 1411 M 3155 1381 I 3156 1379 I 3157 1378 I 3160 1379 I 3160 1381 I 3160 1411 I 3160 1414 I 3157 1414 I 3156 1414 I 3155 1411 I 3155 1411 I C 
-3155 1358 M 3155 1327 I 3156 1325 I 3157 1325 I 3160 1325 I 3160 1327 I 3160 1358 I 3160 1360 I 3157 1360 I 3156 1360 I 3155 1358 I 3155 1358 I C 
-3155 1304 M 3155 1273 I 3156 1271 I 3157 1271 I 3160 1271 I 3160 1273 I 3160 1304 I 3160 1306 I 3157 1306 I 3156 1306 I 3155 1304 I 3155 1304 I C 
-3155 1251 M 3155 1219 I 3156 1218 I 3157 1217 I 3160 1218 I 3160 1219 I 3160 1251 I 3160 1252 I 3157 1253 I 3156 1252 I 3155 1251 I 3155 1251 I C 
-3155 1197 M 3155 1165 I 3156 1164 I 3157 1163 I 3160 1164 I 3160 1165 I 3160 1197 I 3160 1198 I 3157 1199 I 3156 1198 I 3155 1197 I 3155 1197 I C 
-3155 1144 M 3155 1112 I 3156 1111 I 3157 1110 I 3160 1111 I 3160 1112 I 3160 1144 I 3160 1145 I 3157 1146 I 3156 1145 I 3155 1144 I 3155 1144 I C 
-3155 1090 M 3155 1058 I 3156 1057 I 3157 1056 I 3160 1057 I 3160 1058 I 3160 1090 I 3160 1091 I 3157 1092 I 3156 1091 I 3155 1090 I 3155 1090 I C 
-3155 1036 M 3155 1005 I 3156 1003 I 3157 1002 I 3160 1003 I 3160 1005 I 3160 1036 I 3160 1038 I 3157 1038 I 3156 1038 I 3155 1036 I 3155 1036 I C 
-3155 982 M 3155 951 I 3156 949 I 3157 949 I 3160 949 I 3160 951 I 3160 982 I 3160 984 I 3157 984 I 3156 984 I 3155 982 I 3155 982 I C 
-3155 928 M 3155 897 I 3156 895 I 3157 895 I 3160 895 I 3160 897 I 3160 928 I 3160 930 I 3157 930 I 3156 930 I 3155 928 I 3155 928 I C 
-3155 875 M 3155 844 I 3156 842 I 3157 841 I 3160 842 I 3160 844 I 3160 875 I 3160 876 I 3157 877 I 3156 876 I 3155 875 I 3155 875 I C 
-3155 821 M 3155 790 I 3156 788 I 3157 787 I 3160 788 I 3160 790 I 3160 821 I 3160 822 I 3157 823 I 3156 822 I 3155 821 I 3155 821 I C 
-3155 768 M 3155 736 I 3156 735 I 3157 734 I 3160 735 I 3160 736 I 3160 768 I 3160 769 I 3157 770 I 3156 769 I 3155 768 I 3155 768 I C 
-3155 714 M 3155 682 I 3156 681 I 3157 680 I 3160 681 I 3160 682 I 3160 714 I 3160 715 I 3157 716 I 3156 715 I 3155 714 I 3155 714 I C 
-3155 660 M 3155 629 I 3156 627 I 3157 626 I 3160 627 I 3160 629 I 3160 660 I 3160 662 I 3157 663 I 3156 662 I 3155 660 I 3155 660 I C 
-3155 606 M 3155 575 I 3156 574 I 3157 573 I 3160 574 I 3160 575 I 3160 606 I 3160 608 I 3157 609 I 3156 608 I 3155 606 I 3155 606 I C 
-3155 552 M 3155 521 I 3156 520 I 3157 519 I 3160 520 I 3160 521 I 3160 552 I 3160 554 I 3157 555 I 3156 554 I 3155 552 I 3155 552 I C 
-3155 499 M 3155 468 I 3156 466 I 3157 466 I 3160 466 I 3160 468 I 3160 499 I 3160 501 I 3157 501 I 3156 501 I 3155 499 I 3155 499 I C 
-3155 445 M 3155 414 I 3156 412 I 3157 412 I 3160 412 I 3160 414 I 3160 445 I 3160 447 I 3157 447 I 3156 447 I 3155 445 I 3155 445 I C 
-3155 392 M 3155 361 I 3156 359 I 3157 358 I 3160 359 I 3160 361 I 3160 392 I 3160 393 I 3157 394 I 3156 393 I 3155 392 I 3155 392 I C 
-3155 338 M 3155 307 I 3156 305 I 3157 304 I 3160 305 I 3160 307 I 3160 338 I 3160 339 I 3157 340 I 3156 339 I 3155 338 I 3155 338 I C 
-3155 284 M 3155 253 I 3156 251 I 3157 250 I 3160 251 I 3160 253 I 3160 284 I 3160 286 I 3157 287 I 3156 286 I 3155 284 I 3155 284 I C 
-:  L ; K 
-N 2927 13 M 2927 248 I 3388 248 I 3388 13 I 2927 13 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 6 Lw solid N 2927 248 M 3388 248 I 3388 13 I 2927 13 I 2927 248 I C 
-: 0.668 0.727 +S K 
-; T32RsrcBegin
-
-30
-/g39 [47 0 3 -48 41 1 ] 
-/g39 [38 49 true [1 0 0 1 -3 48 ]  0 0]
-[<00003ff800
-0003ffff80
-000fffffe0
-003ffffff8
-007ffffffc
-00ffe00ffc
-01ff0000fc
-03fe00003c
-07f800000c
-0ff0000000
-0fe0000000
-1fe0000000
-1fc0000000
-3f80000000
-3f80000000
-7f80000000
-7f00000000
-7f00000000
-7f00000000
-fe00000000
-fe00000000
-fe00000000
-fe000ffff8
-fe000ffffc
-fe000ffffc
-fe000ffffc
-fe000ffffc
-fe000000fc
-fe000000fc
-fe000000fc
-ff000000fc
-7f000000fc
-7f000000fc
-7f000000fc
-7f800000fc
-3f800000fc
-3fc00000fc
-1fe00000fc
-1fe00000fc
-0ff00000fc
-0ff80000fc
-07fe0000fc
-03ff0001fc
-01ffe00ffc
-00fffffffc
-003ffffff8
-000fffffe0
-0003ffff00
-00007ff000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-31
-/g116 [66 0 2 -47 64 0 ] 
-/g116 [62 47 true [1 0 0 1 -2 47 ]  0 0]
-[<fc00000fc00000f8
-fe00001fc00001fc
-fe00001fe00001f8
-7e00001fe00001f8
-7f00003fe00001f8
-7f00003fe00003f0
-3f00003ff00003f0
-3f00003ff00003f0
-3f80007ff00007f0
-3f80007ff00007e0
-1f80007df80007e0
-1fc0007df80007e0
-1fc000fdf8000fc0
-0fc000fdfc000fc0
-0fc000f8fc000fc0
-0fe000f8fc000fc0
-07e001f8fc001f80
-07e001f87e001f80
-07e001f07e001f80
-07f001f07e001f00
-03f003f07f003f00
-03f003f03f003f00
-03f003e03f003f00
-01f803e03f007e00
-01f807e01f807e00
-01f807e01f807e00
-01fc07c01f807c00
-00fc07c01f80fc00
-00fc0fc00fc0fc00
-00fc0fc00fc0fc00
-007e0f800fc0f800
-007e0f800fe1f800
-007e1f8007e1f800
-007e1f8007e1f000
-003f1f0007e1f000
-003f1f0003f3f000
-003f3f0003f3f000
-001fbe0003f3e000
-001fbe0003f3e000
-001fbe0001ffe000
-001ffe0001ffc000
-000ffc0001ffc000
-000ffc0000ffc000
-000ffc0000ffc000
-0007fc0000ff8000
-0007f80000ff8000
-0003f800007f0000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-3007 153 M <17>S 
-3038 153 M <1E>S  3081 153 M <1F>S  
-T32RsrcBegin
-
-32
-/g876 [29 0 0 -53 28 10 ] 
-/g876 [28 63 true [1 0 0 1 0 53 ]  0 0]
-[<000001f0
-000003f0
-000003f0
-000007e0
-000007e0
-000007e0
-00000fc0
-00000fc0
-00000fc0
-00001f80
-00001f80
-00003f00
-00003f00
-00003f00
-00007e00
-00007e00
-00007e00
-0000fc00
-0000fc00
-0001f800
-0001f800
-0001f800
-0003f000
-0003f000
-0003f000
-0007e000
-0007e000
-0007e000
-000fc000
-000fc000
-001f8000
-001f8000
-001f8000
-003f0000
-003f0000
-003f0000
-007e0000
-007e0000
-007e0000
-00fc0000
-00fc0000
-01f80000
-01f80000
-01f80000
-03f00000
-03f00000
-03f00000
-07e00000
-07e00000
-07c00000
-0fc00000
-0fc00000
-1f800000
-1f800000
-1f800000
-3f000000
-3f000000
-3f000000
-7e000000
-7e000000
-fc000000
-fc000000
-f8000000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-3143 153 M ( )S 
-T32RsrcBegin
-
-33
-/g87 [38 0 6 -47 35 0 ] 
-/g87 [29 47 true [1 0 0 1 -6 47 ]  0 0]
-[<7fffc000
-fffff800
-fffffe00
-ffffff80
-ffffffc0
-fc00ffe0
-fc003fe0
-fc000ff0
-fc000ff0
-fc0007f0
-fc0007f8
-fc0003f8
-fc0003f8
-fc0003f8
-fc0003f8
-fc0003f8
-fc0003f8
-fc0003f8
-fc0007f0
-fc0007f0
-fc000ff0
-fc001fe0
-fc003fc0
-fc00ffc0
-ffffff80
-ffffff00
-fffffc00
-fffff000
-ffff8000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-3169 153 M (!)S 
-3204 153 M <1E>S  3247 153 M <1F>S  
-7 Lw N 3007 161 M 3308 161 I : 0.668 0.727 +S K 
-; 6 Lw N 1214 1254 M 310 1254 I : 0.668 0.727 +S K 
-; N 242 1254 M 276 1233 I 276 1276 I 242 1254 I C 
-276 1233 M 242 1254 I 276 1233 I C 
- O 10 Lw N 242 1254 M 276 1233 I 276 1276 I 242 1254 I : 0.668 0.727 +S K 
-; N 276 1233 M 242 1254 I : 0.668 0.727 +S K 
-; 6 Lw N 276 1254 M 329 1254 I : 0.668 0.727 +S K 
-; N 470 1144 M 470 1234 I 987 1234 I 987 1144 I 470 1144 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 470 1211 M <13>S 
-507 1211 M <13>S  544 1211 M <19>S  
-580 1211 M <14>S 
-T32RsrcBegin
-
-34
-/g374 [39 0 6 -35 34 0 ] 
-/g374 [28 35 true [1 0 0 1 -6 35 ]  0 0]
-[<0007f000
-f81ffe00
-f87fff00
-f8ffff80
-f9ffffc0
-fbf83fc0
-ffe01fe0
-ffc00fe0
-ff0007e0
-fe0007f0
-fe0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-615 1211 M <19>S 
-651 1211 M <02>S  687 1211 M (")S  723 1211 M (")S  
-760 1211 M <14>S 
-T32RsrcBegin
-
-35
-/g296 [23 0 1 -51 23 0 ] 
-/g296 [22 51 true [1 0 0 1 -1 51 ]  0 0]
-[<0007f0
-003ffc
-007ffc
-00fffc
-00fffc
-01fc0c
-01f800
-01f800
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-fffff0
-fffff0
-fffff0
-fffff0
-fffff0
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
-03f000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-794 1211 M <13>S 
-831 1211 M <06>S  865 1211 M <05>S  894 1211 M <02>S  930 1211 M (")S  966 1211 M (#)S  
-N 2186 2262 M 3090 2262 I : 0.668 0.727 +S K 
-; N 3157 2262 M 3125 2283 I 3125 2240 I 3157 2262 I C 
-3125 2283 M 3157 2262 I 3125 2283 I C 
- O 10 Lw N 3157 2262 M 3125 2283 I 3125 2240 I 3157 2262 I : 0.668 0.727 +S K 
-; N 3125 2283 M 3157 2262 I : 0.668 0.727 +S K 
-; 6 Lw N 3125 2262 M 3071 2262 I : 0.668 0.727 +S K 
-; N 1937 2118 M 1937 2208 I 3406 2208 I 3406 2118 I 1937 2118 I C 
-1 1 1 1 scol  O 0 0 0 1 scol T32RsrcBegin
-
-36
-/g346 [39 0 6 -50 34 0 ] 
-/g346 [28 50 true [1 0 0 1 -6 50 ]  0 0]
-[<fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc07f000
-fc1ffe00
-fc7fff00
-fcffff80
-fdffffc0
-fff83fc0
-ffe01fe0
-ffc00fe0
-ff0007e0
-fe0007f0
-fe0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
-fc0003f0
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1937 2185 M (!)S 
-1973 2185 M <0B>S  2005 2185 M <0A>S  2028 2185 M ($)S  
-2065 2185 M <14>S 
-T32RsrcBegin
-
-37
-/g449 [53 0 2 -34 51 0 ] 
-/g449 [49 34 true [1 0 0 1 -2 34 ]  0 0]
-[<fc0007e0001f80
-fc0007e0001f80
-fc0007f0003f00
-fe0007f0003f00
-7e000ff0003f00
-7e000ff0007e00
-7f000ff8007e00
-3f001ff8007e00
-3f001ff8007e00
-3f001ffc00fc00
-1f801ffc00fc00
-1f803ffc00fc00
-1f803e7c01f800
-1fc03e7e01f800
-0fc03e7e01f800
-0fc07c3e01f000
-0fe07c3f03f000
-07e07c3f03f000
-07e0fc3f03e000
-07e0f81f87e000
-03f0f81f87e000
-03f0f81f87c000
-03f1f00f87c000
-01f9f00fcfc000
-01f9f00fcf8000
-01f9f007cf8000
-00fbe007ff8000
-00ffe007ff8000
-00ffe003ff0000
-007fe003ff0000
-007fc003ff0000
-007fc003fe0000
-007fc001fe0000
-003f8001fc0000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-38
-/g349 [17 0 5 -47 12 0 ] 
-/g349 [7 47 true [1 0 0 1 -5 47 ]  0 0]
-[<7c
-fe
-fe
-fe
-fe
-fe
-7c
-00
-00
-00
-00
-00
-00
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
-7e
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-2099 2185 M <17>S 
-2130 2185 M (%)S  2179 2185 M (&)S  2195 2185 M <0A>S  2217 2185 M <05>S  2246 2185 M ($)S  
-2283 2185 M <14>S 
-T32RsrcBegin
-
-39
-/g395 [39 0 3 -35 33 14 ] 
-/g395 [30 49 true [1 0 0 1 -3 35 ]  0 0]
-[<003f8000
-00fff07c
-03fff87c
-07fffc7c
-0fffff7c
-1ff07ffc
-1fc01ffc
-3f800ffc
-3f0007fc
-7f0003fc
-7e0001fc
-7e0000fc
-7e0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fe0000fc
-7e0000fc
-7e0001fc
-7f0003fc
-7f0007fc
-3f800ffc
-3fc01ffc
-1fe07ffc
-0ffffefc
-0ffffcfc
-07fff8fc
-01ffe0fc
-007f80fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-2317 2185 M <13>S 
-2354 2185 M <06>S  2388 2185 M (')S  2424 2185 M <03>S  2460 2185 M <06>S  2495 2185 M <01>S  2521 2185 M <0A>S  2544 2185 M <07>S  
-T32RsrcBegin
-
-40
-/g1085 [37 0 3 -37 34 -4 ] 
-/g1085 [31 33 true [1 0 0 1 -3 37 ]  0 0]
-[<0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-fffffffe
-fffffffe
-fffffffe
-fffffffe
-fffffffe
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
-0007c000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-2560 2185 M (\()S 
-2594 2185 M <07>S  
-2609 2185 M <16>S 
-2654 2185 M <01>S  2680 2185 M <06>S  2715 2185 M <04>S  
-2738 2185 M <14>S 
-T32RsrcBegin
-
-41
-/g367 [17 0 6 -50 12 0 ] 
-/g367 [6 50 true [1 0 0 1 -6 50 ]  0 0]
-[<fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
-fc
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-2772 2185 M (!)S 
-2808 2185 M (\))S  2823 2185 M <0B>S  2856 2185 M (")S  2892 2185 M <06>S  
-2926 2185 M <14>S 
-T32RsrcBegin
-
-42
-/g393 [39 0 6 -35 36 14 ] 
-/g393 [30 49 true [1 0 0 1 -6 35 ]  0 0]
-[<0007f800
-f81ffe00
-f87fff80
-f8ffffc0
-f9ffffe0
-fbf81fe0
-ffe00ff0
-ffc007f0
-ff8003f8
-ff0001f8
-fe0001f8
-fc0001f8
-fc0001fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0001f8
-fc0001f8
-fe0001f8
-ff0003f8
-ff8003f0
-ffc007f0
-ffe00fe0
-fff83fe0
-fdffffc0
-fcffff80
-fc7fff00
-fc3ffc00
-fc0ff000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
->
- ]
-/TT353ADb00 AddT3T32Char
-
-43
-/g282 [39 0 3 -50 33 1 ] 
-/g282 [30 51 true [1 0 0 1 -3 50 ]  0 0]
-[<000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-000000fc
-003f80fc
-00fff0fc
-03fff8fc
-07fffcfc
-0ffffffc
-1ff07ffc
-1fc01ffc
-3f800ffc
-3f0007fc
-7f0003fc
-7e0001fc
-7e0000fc
-7e0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fc0000fc
-fe0000fc
-7e0000fc
-7e0001fc
-7f0003fc
-7f0007fc
-3f800ffc
-3fc01ffc
-1fe07f7c
-0ffffe7c
-0ffffc7c
-07fff87c
-01ffe07c
-007f8000
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-2960 2185 M <03>S 
-2996 2185 M (*)S  3033 2185 M (+)S  3069 2185 M <0B>S  3102 2185 M <0A>S  3125 2185 M <06>S  
-3158 2185 M <14>S 
-3192 2185 M <04>S 
-3217 2185 M <06>S  3251 2185 M (')S  3287 2185 M <03>S  3323 2185 M <06>S  3357 2185 M <01>S  3384 2185 M <0A>S  
-N 3157 2597 M 2254 2597 I : 0.668 0.727 +S K 
-; N 2186 2597 M 2219 2576 I 2219 2618 I 2186 2597 I C 
-2219 2576 M 2186 2597 I 2219 2576 I C 
- O 10 Lw N 2186 2597 M 2219 2576 I 2219 2618 I 2186 2597 I : 0.668 0.727 +S K 
-; N 2219 2576 M 2186 2597 I : 0.668 0.727 +S K 
-; 6 Lw N 2219 2597 M 2273 2597 I : 0.668 0.727 +S K 
-; N 1850 2487 M 1850 2576 I 3494 2576 I 3494 2487 I 1850 2487 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 1850 2554 M (!)S 
-1885 2554 M <0B>S  1918 2554 M <0A>S  1941 2554 M ($)S  
-1977 2554 M <14>S 
-2012 2554 M <17>S 
-2043 2554 M (%)S  2092 2554 M (&)S  2107 2554 M <0A>S  2130 2554 M <05>S  2159 2554 M ($)S  
-2195 2554 M <14>S 
-2230 2554 M <13>S 
-2266 2554 M <06>S  2301 2554 M (')S  2337 2554 M <03>S  2373 2554 M <06>S  2407 2554 M <01>S  2434 2554 M <0A>S  
-2457 2554 M <14>S 
-T32RsrcBegin
-
-44
-/g364 [34 0 6 -50 33 0 ] 
-/g364 [27 50 true [1 0 0 1 -6 50 ]  0 0]
-[<fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000000
-fc000fc0
-fc003fc0
-fc007f80
-fc00ff00
-fc00fe00
-fc01fc00
-fc03f800
-fc07f000
-fc0fe000
-fc1fc000
-fc3f8000
-fc7f0000
-fcfe0000
-fdfc0000
-fff80000
-fffc0000
-fdfe0000
-fcfe0000
-fc7f0000
-fc7f8000
-fc3fc000
-fc1fe000
-fc0fe000
-fc07f000
-fc07f800
-fc03fc00
-fc01fc00
-fc00fe00
-fc00ff00
-fc007f80
-fc003fc0
-fc001fc0
-fc000fe0
-fc0007e0
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-2491 2554 M <0E>S 
-2531 2554 M <05>S  2560 2554 M (,)S  2591 2554 M <07>S  
-2607 2554 M (\()S 
-2641 2554 M <07>S  
-2656 2554 M <16>S 
-2701 2554 M <01>S  2727 2554 M <06>S  2762 2554 M <04>S  
-2785 2554 M <14>S 
-2819 2554 M (!)S 
-2855 2554 M (\))S  2870 2554 M <0B>S  2903 2554 M (")S  2939 2554 M <06>S  
-2973 2554 M <14>S 
-3007 2554 M <03>S 
-3043 2554 M (*)S  3080 2554 M (+)S  3116 2554 M <0B>S  3149 2554 M <0A>S  3172 2554 M <06>S  
-3205 2554 M <14>S 
-3239 2554 M <04>S 
-3263 2554 M <06>S  3298 2554 M <01>S  3325 2554 M (*)S  3361 2554 M <02>S  3397 2554 M (")S  3433 2554 M <01>S  3460 2554 M <06>S  
-N 243 1926 M 2118 1926 I : 0.668 0.727 +S K 
-; N 2186 1926 M 2153 1947 I 2153 1905 I 2186 1926 I C 
-2153 1947 M 2186 1926 I 2153 1947 I C 
- O 10 Lw N 2186 1926 M 2153 1947 I 2153 1905 I 2186 1926 I : 0.668 0.727 +S K 
-; N 2153 1947 M 2186 1926 I : 0.668 0.727 +S K 
-; 6 Lw N 2153 1926 M 2099 1926 I : 0.668 0.727 +S K 
-; N 813 1782 M 813 1872 I 1616 1872 I 1616 1782 I 813 1782 I C 
-1 1 1 1 scol  O 0 0 0 1 scol 813 1849 M <13>S 
-849 1849 M <13>S  886 1849 M <19>S  
-923 1849 M <14>S 
-957 1849 M <19>S 
-994 1849 M <02>S  1030 1849 M (")S  1066 1849 M (")S  
-1102 1849 M <14>S 
-T32RsrcBegin
-
-45
-/g373 [59 0 6 -35 54 0 ] 
-/g373 [48 35 true [1 0 0 1 -6 35 ]  0 0]
-[<0007f0003f80
-f81ffc00ffe0
-f87ffe03fff0
-f8ffff07fff8
-f9ffff8ffffc
-fbf07f9f83fc
-ffe01fff00fe
-ff801ffc00fe
-ff000ff8007e
-fe000ff0007f
-fe0007f0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
-fc0007e0003f
->
- ]
-/TT353ADb00 AddT3T32Char
-T32RsrcEnd
-1137 1849 M <13>S 
-1173 1849 M <06>S  1208 1849 M <05>S  1237 1849 M <02>S  1273 1849 M (")S  1309 1849 M (#)S  1330 1849 M <07>S  1345 1849 M <19>S  1381 1849 M <02>S  1418 1849 M (-)S  1473 1849 M (*)S  1509 1849 M (\))S  1524 1849 M <06>S  1559 1849 M <0A>S  1581 1849 M <06>S  
-LH
-%%PageTrailer
-
-%%Trailer
-%%DocumentNeededResources: 
-%%DocumentSuppliedResources: 
-%%+ procset Pscript_WinNT_VMErrorHandler 5.0 0
-%%+ procset Pscript_FatalError 5.0 0
-%%+ procset Pscript_Win_Basic 5.0 0
-%%+ procset Pscript_Win_Utils_L1 5.0 0
-%%+ procset Pscript_Win_GdiObject 5.0 0
-%%+ procset Pscript_Win_GdiObject_L1 5.0 0
-%%+ procset Pscript_T3Hdr 5.0 0
-%%+ procset Pscript_Text 5.0 0
-Pscript_WinNT_Incr dup /terminate get exec
-%%EOF
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-handover-algorithm.dot ns-3.19/src/lte/doc/source/figures/lte-handover-algorithm.dot
--- ns-3.18.1/src/lte/doc/source/figures/lte-handover-algorithm.dot	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-handover-algorithm.dot	1969-12-31 16:00:00.000000000 -0800
@@ -1,21 +0,0 @@
-digraph LteHandoverAlgorithm {
-
-size = "30,30"
-
-GET_MEASUREMENTS [shape = box,
-                  label = "Get measurements from UE\n(The eNB receives events A2 and A4 with UE measurements)"]
-CHECK_SERVING_RSRQ [shape = diamond, fixedsize = true, width = 8, height = 1.0,
-                    label = "serving cell RSRQ <= servingHandoverThreshold"]
-LOOK_BEST_NEIGHBOUR [shape = box,
-                     label = "Look for the neighbour cell with the best RSRQ"]
-CHECK_BEST_NEIGHBOUR [shape = diamond, fixedsize = true, width = 9, height = 1.0,
-                      label = "best neighbour RSRQ - serving cell RSRQ >= neighbourHandoverOffset"]
-TRIGGER_HANDOVER [shape = box,
-                  label = "Trigger Handover procedure for this UE"]
-
-GET_MEASUREMENTS -> CHECK_SERVING_RSRQ
-CHECK_SERVING_RSRQ -> LOOK_BEST_NEIGHBOUR
-LOOK_BEST_NEIGHBOUR -> CHECK_BEST_NEIGHBOUR
-CHECK_BEST_NEIGHBOUR -> TRIGGER_HANDOVER
-
-}
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-handover-campaign-rem.pdf ns-3.19/src/lte/doc/source/figures/lte-handover-campaign-rem.pdf
--- ns-3.18.1/src/lte/doc/source/figures/lte-handover-campaign-rem.pdf	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-handover-campaign-rem.pdf	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,1218 @@
+%PDF-1.5
+%����
+3 0 obj
+<< /Length 4 0 R
+   /Filter /FlateDecode
+>>
+stream
+x�+�*��O4PH/VЯ0Up��
+B@@
+endstream
+endobj
+4 0 obj
+   28
+endobj
+2 0 obj
+<<
+   /ExtGState <<
+      /a0 << /CA 1 /ca 1 >>
+   >>
+   /XObject << /x5 5 0 R >>
+>>
+endobj
+6 0 obj
+<< /Type /Page
+   /Parent 1 0 R
+   /MediaBox [ 0 0 609 363 ]
+   /Contents 3 0 R
+   /Group <<
+      /Type /Group
+      /S /Transparency
+      /I true
+      /CS /DeviceRGB
+   >>
+   /Resources 2 0 R
+>>
+endobj
+5 0 obj
+<< /Length 8 0 R
+   /Filter /FlateDecode
+   /Type /XObject
+   /Subtype /Form
+   /BBox [ 0 0 609 363 ]
+   /Group <<
+      /Type /Group
+      /S /Transparency
+      /I true
+      /CS /DeviceRGB
+   >>
+   /Resources 7 0 R
+>>
+stream
+x�+�*�23�T0Bc3c0��˥�h��^��_a������S�
+endstream
+endobj
+8 0 obj
+   42
+endobj
+7 0 obj
+<<
+   /ExtGState <<
+      /a0 << /CA 1 /ca 1 >>
+   >>
+   /XObject << /x9 9 0 R >>
+>>
+endobj
+9 0 obj
+<< /Length 10 0 R
+   /Filter /FlateDecode
+   /Type /XObject
+   /Subtype /Image
+   /Width 609
+   /Height 363
+   /ColorSpace /DeviceRGB
+   /Interpolate true
+   /BitsPerComponent 8
+>>
+stream
+x��wt�����R�;!	A=����X��`A�PDQTEH!� U��;	�J(�4QQQT����XQ��~s
�7k�x�wޗ�g=����uϞ���{f����_8�w������������?���ѪO������}�����}$懇c���P�7�����wG��K̎��o�t����Ѷ{��9��_
+��/�w���D�ߞ���K�N.�h��~G���gt�'k�>��c�^Y��G��������������c��X{�3G�:��w=k�����������gX�/�2?MO<*��qq/��]?���cb_c{x�-S�&�gf�Sc�^���,˺d��ad�MU�93R�NI�4;�!n='�圌�g��ɼ�$��ʜ�J}bnf���K9rfj��������m�ڌ�������P�ste�?9�+����֥&�vY�勎
+O��:�pBX}v���m�ɡ:����W�ϫ=5i�-<&T�f�N{�,뢚F1��Ą��
��%?7&v-�l���9y<���f<���A�cߘ�P=>~��G�>*v��z��8�ђ����4����h(6h%���C1�>mm�n�y��m�R�PrV��E(e�Y��6��֡����š�U��ၫ�cH�M��h���O����1_!��b~f���}6:F�r��c~}$f��}�����W|�~��9��)�lD�������D��5�G-�;���������)�+���?�HsJ�d�5&���u�}������~L�����Yi]����g&'�B��M+�O(o�/.R��vfj���k8wD����J}�V}���6��<d|�n=#�7�]V�
+���[�&��f�.�3.n�su?�F��Vq�9�
8j
+B'���gJ���1?��}�N8�_:G���o�Z��,C�|�8�/�x��R���MG�-lF��^�(��)n����"t>?���pW�Pqcx�p/�!��)�Y�p}��"�nF��.Zýh代7�w\e|��h��&��
7��4u~��hY��٠#���1��=h.����1?�}���]�)�] y�8��dXݭ������	��C���so��6�:�����B�<��;���u�A���J�=	�����9܈�� Fž]�u)R(I�v�#��	�gy�sٞ�4rfjO�U�:�
Sg�=�:Wd�Z�u1*61����<���{*�O��y�촇�s3�fނ���h�fMN�=%q�ԤQ�=y��0��U%��|#q����4qfj>�j~�^
���˲�S���eY���gNL(��4vZ�<z]�qۥ�w�JX��)��E�Q6"������y(�h�"�8v]���YCSPɎ�� ���h9�My8f'Zh�y��}�S�Q�B��1���qʓ��bU�>L4j����P�A��}��t��}��X{76���x�(&W����{	}����;'�5�����6OK��~�LL�,I����qq+��3S{`�&*x��
�C�*���p����l~^J
�.h����P�u��U����/�(ou����vU�Y��)t����!��^��h��rY4K�zbM�`�u!�,��������a�Ag�Q:^�NJ��e#&%�uk`�ye����-���فa�}���>���n*1���x'�Y�x](h����8��s[�[������5�;��)�F�����&�8x چ��{�>� ܞf�rDpC�N,d����
 &�ؾ7�+�EE�\)�XE�dRg'N�	9"q�>)q6�8K
C1GXѹ�������߃�gLJ����U�]0t+Ϻ�vÇ�`���`籄3Rz�MM
��%�,�B|�4��+�}��� ����l>-y��7��F�“�������G�{�X^^��?�ؽG���QZ�6�g��%�E;n��
+�m����k�S����faR����$B�Ki����A�n
3Z��[.��-CX�G���`���0����
+n����l�ǻ�Gr�C^<���oz0���8�B��I�����l��
d�:N�g҇���(�	���b�$ 2�ew�q���+�~#k��;",� ���)Cj�#���4omD�'3_%y*�d����7��Mԭ*7�NN�J@L�'�䴤�0��.ޥ"��y�����w���J{tzJ?T�D�Q7��Ǎ����R؊��ǃ� #��z }�q�8���,w^�k�<3�ܬ�'y��i<���G����!���VE}���xW(�._*�H̏( ����Jb{e�?�K��|��R���<�1�������b7@[�0�rp�t�o46n59��P�f��~C_8�~�l�/1��c��g�|�b�ͼUB5�t,�w�0!~1�㛚4�V���cl�f6��8uRb��w4n�y+(��������i@'�6?�.���O?�A�:���D��9:?�
��{�4�
V48sZ�P�k�
e+�#]S ���_�#MJ,� �bޱ�0�*��I�,�xȨ0�����}���C�����´!�h�`���W�/G��kB7�tx4�m�
�����B�MaP��l怪��4��W�D��r�^A@'B�e7۰!N�&c�
{
+�2���#��0�H��G�ȑ��oG��$b��C`	� ����w�k��c�h�		��	0ZMr�G�`6�8��0�M7��!;\�S�L�_PӨ���P�����"x��2�HA���\�k�Ź�^��@�ظ5`%4I䭁r�Hy�����tx�
�>�5|���
^����I
s�+ �wexj�$<y�2t�%��u9;\J�CP�[`������p艀`|wG����Z��\%�uiJAd��L.���9X�
�m��+<4DO��^��H�G�9��A�<y�#�q/dě�ќ�th
l��r/W�Ǡ
���R�vh�H�#���8Z�\���3� ��<^�5㷸�H
^���!��
��y��.I�MDf�u�����4�AO�'?3>�*�χq�ph�,`n\�r|Z�#2��9Y�L)�"��E�٧Ud�<#���M������q$WCq���
��>�����x�8Q�5=y 	�Ós�����VN��.D�8H��c�����C�G��+���exz�Kt�^j����;���h#N20�n�#"���Z��r0��f���/V��X�K�1��99����|sjBG��
+X�`����r/�'�W���v�Kő�p�;����a�
&S��ì��8f^�+��n�B<=L%�%І�yQ"Eɺ{˯�"�ZzB��5\�$�#�Ϋ=�X����)� x�u�(��L;&����v��
��@*$�Z l�v�m�nۆdsB��;�)ըط0&� ���g�Fa�zɸ!&�`�;�lG:�;}0�ܕ��c��qg�B�0�E���7���"+�Л���]}A����8ȿ\��Q"Ю2_��5t��˜(��k/�Rt$U,0�9��x�b7���g�o���dk<.�E��
+x;������q2_\a!n�8��<Zfn���3R�b��᱙����H�%��έzb�0q���>`��`&qV��|Y�E%i� �H���b�J3n��b� ���O���U�
��`�A�,��\ɗ3��-h"��~��'z\{(���R�\�ܼC��BPv���!��V������a4�xUx���̭af�0Ѡ\��py|�|�b ��1��NA�b��?u����U�1�t(,����y�
���8�������@�4����Ñ]�P:;:v|��\��qe�9�)�Gvܫ���{��o4���&P��,��y'y����;��F\�^�PX^��A����NE���&�¿E^&����RG�q��#�(���ǃ�lLJ(e'��C�r�/����J�ڀפ#��eY���`�\
-F���芈w�.>r���K���n��4傸v��W�
+G��O'����7ʙ<�`!��9���V��W��tl�>�+z��m�W��h�ȑh+6ӇX9�{���N�P�O�/��>	��&7�@���E�6�5&n��$j�tp�#�_(���>{�/�D��3�/�A?�]d��ͪļfb91�hzT��
��Ck5��D�S���L��~/�R��^0���"o7[�z�mun��m�ʜc!�٧p0�N.��T�EŖg#�`({�l2���+O�1U8)w����_L���3��
+W7L�cx�>tv�e@���h=45.n�C�
���'p�+2��&͛�~0с@����-�<>X]�G�0p�OhwV��Cʝ��n������"�/�A9AXNA�@`w�϶��Ґ]��e\#���6_~�su7�p+��翀K^gbBo�u�dzI�pF:�|�M�7�y@�#"�m�3)͸=+�;M��'%� \
+A``߈�+g�B�A7�7��CCex=ǀ�x�l{k������	��`���'�H�����t�ѱ�
�qq��?t�@^w�CE"�����'��6AY��7�!��q�1��-a<Ȃ@=c�h{�P�??��,L�s��7��}���X�6���?�.����EwGo�����|m;�F�l�rJ�/d��sܛ�-﴿�X,�Ð��C=h����A�E�|`y\�;����K|Z���m�����r������������	)�cb_�>CUm4�Z���j����� P�_h^���(`M^-<8�a�����l�DI7=
߆�C�

M����
�U�q��G�$MF1�z�!	��9���V7L)�hWV�
+\b:$*\��\\�g w|f��Bw�ޘ��̔":	ݛ�xJ8�8ô	���05P׃��}?���a�<�jo���3����i�b7��E��tw��-�����>�2�b��}�B:[d*���b�
rV��q+�Ѝ1��/{��D���ƽD��xڰ�w>h7L
+h���oI7�Q�	U2�����Na�1S}mo�vh�o����'�j�A��������rsP���lT뇮�ҥ���ñĜrY6lp5�9�gMޑ\j��a�)h�5y���$ں�x��^U�
J3ڬ�Ԡ#�N]�*���@X�yԖ#��T��
+����cI�,Z �2ŻxPS���(���
	�&$԰A;���a�-�\���F�_�\�a���������p�5�	�qah���� �;���D�얭M����
�����|B�ɣ��j�\�^
+�z(��$���E��C� &n��|��_� Dā[��T���f��� /�4M���h��xs��-R�Ή5��I��i�	�50>�@��-�#�l}r�\}`)������s�0f�:5i�[W�&t�ѻ
+�
&8jτ��PQ�^/p��G�޼m�o��|s�G��6�#���4�U�+���_��+n����+C��a�a����+ ��L%�x0�+�O��B_piuS�-�FS�ͯh1z���!F㋯���GZnZ,��d-��t�@���R�N�#�t	>��h%������퐎�p��H�����e��B�k��C��AF.U @��-��O���iQ@��Ad�-w�W rB���2�<[č¢#٧=s�S%n�����x6 ;+�I�r�����w�o)OM����=>��a2��A�{��
�	�9�-0��I
+f�|�8������	|���éI���,V'�
=��u�0��:7cV��X�;���0D�?Z
B���5]�ɿ���pt1�(�Ѷ������Cc1��s�(�Oa�w�Ot��Qz8?�RD&�S�5�ej��ޱT��L=�Ћ��ǻ�}���hӴ�O����e��X��:?a	�`�`�tZ����R�ְGcn��ͼ
E@kV�D`��1A��
��U��
E���Ol`W�Ź�7�sΫ�����:�F\� vr
+N���񚔼�
ToZ�N0N�����Ƀ�9�QR��7ZO�`7 5j��-*�7��'B��ׁ8�O.�b?;E�_�6�Z�����B��a*�xK˯ #�u��)�+z�����0�s!���!#�0��`�[�_�D����zn.��nR�}5x·�,0�ץ��]!=w38����
������ۂ@�ƽb���0S����a�,����A���O>^
+M
2��jh�&�#�G@4p��f�Lk������c��&֒��`�$^�MI�>N?��`+y�
|kj�]����mT�w����ط\�8{@%�=��
B�Ѱٸ�F<I�b�0�_qE�E0�u��9��4EPKwT����dQ(��h�|^Bdm�U
+*���?`m��M+�P����T|��#����H�|H"��.M��{��O���5�)z�g�V �Y��e�������_�1
��_~�Ҁ��V�hQI���fj[ P��uzkx����#_ �	o
+a'��� t��cra w�F�b}���a
�����U�Y(nN>�x*��=;�g#i]�/`��X���>��q��j��'?S��|�N���?�<=yO���4�[�[��'�/���
+�!���V�a(֕��
����N
5W|�Gh1؇�`pJ}�����T����h(�����_p�LX�����b��n�3[P%�{[��>#PHOC�D=^���-ECẢ	�
+�x�Y{�Q�Zl �&*�6)����_t��gҟ�ðE�NA��*��l��ƫ[��50;8 �]t�A�%(f;�[�NG��˚�Z
+s5n\V��o�ȥV�n��T�:0
+���9�����\vR�:��xHV��P���?���I�`1 �����{qP�݊h�M��wZ��e��
��で�,LD4��7��-B)@	%��`���]Z_�4�J��|��s�ep,�u��֡B�)%1�7�al+�`V�h
���~�1G����#Y^���_c�<-�d��8��ƙ�p�o����\ݏGž��1ד�q�������W����K�>�C��0gn��g����x�<�4�
+ZL� �8�=�x�Ok+�X�ㄗ%�)ï4�'�@�1weY��o26n�����x6$���Ö�l^�?z
踻��!���V���ړV����_n�EҰ��.	w6���)�EpipfnC� Rk���D�9h����s��H�u���Dʷ4���O �ׇ�|���_���Q,
��1�\֝��-�MJ��k�b|kX�w0���o���9�������
+v`
+h(���
q~�/���1���F,M�B;/�2,�(yHL
=
�B���y��Õ�\I��)�Ӓ�V7L�j�,.I�P���eiz�9-q�8�"�T<(���
�$%��k��i�.Q����9T� դ�xD�.�Ci�dܦI�������~H�OS,Ѓtޚ�rq��"�$������"���~C���U���G����P����l��D�v}�8�h(*�������O<v�6zѧ�{*�M/���2ҋd����Ya�ߢ |0A=6�y��ݰ:_�h|2�����A�;p� �+\5�Xqe7b��2��Ĥ{W48�<�|4E��J
+5�̓�H7�g����g� �OI�=���ަ��	�2�$�{�'��s
45����2]q�E�,?9��(d{@C�X�}:�
��h�:
�S���h(��A��̾��

�|�[+�g/��?hl��
9)�����O��H�0DCv0�B�+Ã'��n����Va�����0�йu�j� V��0�K5�W�Gf����;F[0e�
��m���
+�'��P��e�����0�:;��&��"��LJ�5�&��@?R���mHs�"a��z�R�O�����{�
+��l#�VzhQ��%˃�+���`ؽy���<��hP���4��
�59q�TyP4;���������o��8<lr|��c�^���=1z��q���tB���G.0��mh����־<t�%�G������B
�|_�uA���	8L4�#���׊k�JrG7�"����)���C�����=��U��/<*�UuBr��H�Y��Mi�O_99X�/7�2���\M�q'�����f�K���Dt��Z�yvpA��;Z��+\�XZ���HC:\zl�S���u���\ѰN���Y�Ӣk(#X)�:yNFk�b]�oS���$p����[���:A^%G��4���P5�aRe�1\�m�=�٬�Ǹǃz��%W6Lf��>~Nf�T㫣1j�c�J�,��T�t�E�/<����*ڇ�<���.1;�o�D,�}��F�Ge�}��|(�~$�G<d4�S �E��ڏ��������X�Wè�c�o�}���n���4����aF�{����׽,syʨy������љ���-n'����Y�
+#�m5�1k�7����jz�F���9�R4�-8���Y��!}�g�s�����0�B��L���Y�dUnnUN���K���|��\
+��4}:��l�줘f��D����vFJoԪ�a�AFg���"^j�P��&th��Ic,�T�'�0���ĺ��.p��a޵�>?v�,L�#Z
+ ���p�u!��h�
�i�.!���V�-��c�A:����D6��wG��6�=�Ⱥ�M���O��"����G�4�#�
K����Ȯ@�=�����R�>�����`|C�0����a!''Nk5^ã@��&��y8�t@�&�(�sT�0�:7S�
n��8+�;A�H�ȸ8KCL%�P:�4M7w�x,@��W�p�2*z���|���bS�	z^��ٮ�{R����m`���iI��xi������
��V�.��A�"Z�I�v��ѣ/m��8�)y���n*DpO�'z��2M~�x�J�����+6<v��(0O��4���{)h���ˠ[��Ѹd���~���H���>
+�
+�y��^�
8���4�s^@pt��z��/��C����\��&���N�^�%�B0�Q��7a�$��I��W��O�1�{�>�+��N�
+��Ռ�>�/T�u	��q�d
+�i��	h��2�� �At�I	e�.�"���:J'��}�K�a�M.�{�c@I\2Str�
s%�g1f?�J{��w��w�����C�V+��n��ulG���6b���O���,�u<�Q˚���认J+��-Tʈ��Rއ;�`�O�ٌ���J�G
U��_Q�.1ߡ)��V�����a'QmT#��ĻC_������70Y8��
���X���1�=���w�TP�$�ѫm�1���C=3��DT�s�a��Ug�N/�i��O����l��t#�|4Y�N�����W/
+�uO�W
+�ŭ�k�Xq�a�Ǎ�ϋ�8c�
��o���ʉs3�z;/�돋[yq0S�	m偅>5�Phv�&�7����C+�q�0��������p?&o�?���a���b�E��"�ུ�1ԸC��W0���.~�=� �6?j���Z�)���S�A?��:�%_��G�i�t�2��L\#�;����H�G+�ZX/�3%q*ؤ�?�C��]@
7�����,�'�1�	<\�}����"�
S������iT��|D4�j)Vd���1�K5���Kw�1nXKd���T��+�g������y��cc������?
+�p0�m����V��	��"�OZ�����x#�!~K���]Z��CDrB���D�
]C�r75������YT4��3�	���
+��
+W
+�倠Y�5O���Q"�¹B��<�
+TR��>τ5�_g����V��;���K;�?�*��)�_�R,�>���D���t.X�8Xe噝��T<<�3kX�OxzJ����̒wR��H�x���9h
�0���$���h>z82Fq��5��B�_ĕŧ��Z���4tf3�$��
+�?L����iF.��E���3x�8��Q8W���_N���&�/�D����S�F*�z8�,Dn����y(�hU���yM3��
����]�s�������6;������X�
+j���m#C�xb9yB�*������H,��6����+r�~P��C4��݊SB�K��O��<���b�1'j���ѱo)l5��IGU��h��"�d��Ƀ�B��9-�sӄG�s�9��"�'�沓
��^j����VB�����}�䲯���"�ԫ&�4�@Rv�l;�����vz��%N�C3+�O�@�3x`�57�_Ř�<�'bX�3�(Lw���������&��"�Ń�(wu���F�+�
W�-?3\xAh¯@$8�2��+C�[�L�	@�E��1�Bp�ј�Ac�q���:�v�+�5B�t�'���<��K�8��Q�B��`9{�&�G�$�8�����>b�f�vWzˋpg�w��+��O�iz��s2n����ё�9Q��`�hO��4 �@\�j,��הe�G8�����KO��)�|��b��$����UHG��NJ�^Cx��#0��/=j������>/�AS� �nm��C5��I��Aׅ�}�&p�q��]�O6���	�񓇀z:��\P��j}���=�xݭ�h�h|�jD�ͪ����Wa<cc���w�����ȑ��0*�@��u��2@흀���kb�{4@������‘0��[�d=4�_
���}�C0G쌆�pA/ŀ�T�
�"��
+��LK�W���R��Ub	��pYA+�j�n�J�;LH�
�1�p=,y-<��˳�ǿ����y�<��r�TQD!7���~��l���t常xS�Y�<Ȑ)E3Rz[�dJ?М���ϫ��8f���W�y��������0D�?Z��e]bv��Y��Ӣ}Ї�V�e��B���^c������wz�(�\�A���e3QF/A�!�蓏��5%9��ؠ_����W*U��ݪ�N��M|3~�=Cgg�u��8mj��F�o�x�dUN�&n��8[77��Ҍ;�'�F��V���0aZ����f���yh�q;��|�;��@� � `
+
��fW�6��5��~��
+�4�L��@$�j��
+�)op>��^x;�Y�qgu����B�R�ş\�@�,�U�J~#<=�^#���p��A�?:x=hc��A.wUx��0(�p�k�S��]��-�i�뵡�漪��
<"l���aƭa:T��0���
�-��s�����K���`�AI��zJ��<ƹP1������U4ϦM���ڍY���(:.7�كI0�Ho�&j|`(}�2`� �Xf$�L���Md(�տ
+�|��KL�����hp6��+�d�\��Q-\��
��ޱ���Js;�`�t����P��[F�{��z`��,�@^\�hjro�A+���4���y�P �-���K��+e��
��/|@�Ǵ�9���AY�Gy �.t���r���>\��
+"�0T�힢?i#OK#�m�wsX��PS��=�tET�H���]��@e	�8,P����q�]S!�4�j\R���B�{�
+)�/+�`�'H�x>�7wZ�W��8Ü�S�\��C��@Iq��ĮU��Z���TX�fsfJ*�����hȷ�бi�U_�Zd
zңp��,@
k�2�Mp��Z�L}�T�g�J���5!h�����[�XfS�
+�+�t����›Eyk4�~���<ì�nc�^��4� !����0D�?Z�y��%��
+�#1��~���U+����L�C`*Ǹ��0����1��X��!&U
+���	xI�	b"v��n6��?b����)���W�Y�	�I�@��NJ�vLwT��#��5�o*����u�T��rs�LL�@g������08ŕ�<2
+U�����p���j��������E����9�i�4�c��žt�� ߜ�:�
����Gj�x����;!8�a����+N�S8RYɗh���g��<^ec�a�'�QG�T�Ǟi%��>v�S�Y�a���(ڮ	O\Z_��
+��ׄnp�3��� b*/�y�$iʰ���v�KN��Ռy�Q�6�2.P�0Ke��mC�.}��� }Ë��.��M�
�RU
+��X��G���C΁U)I�s:6n
��:MJ��c��;�c����Xx�„�`�h
���9�K�c9�a8eNFK��1����tWd�>;�Q���ڎ��i��iB-'7�S�Jz�eVq�Ξ{˕��X�b\�

+���jq6��
=yA��L\t�e(��C�Uv�GD��˱��PEA��p
+�F/�'+d���+��]�T�}�4eD�i�;��a�i�q3d��ۚ¶��"#h���F����O�)õ��z��s��-�� �R��J��L��v��p�E��{GyUoq:�fl�bw}=�L��>��
��j��Is�E>�����l�5��o�F(�y��������z�T@
+��f�>����LH
2��H0�ʐ���ŭ�wȈ�u�G�?tNđ�	ᕨ�U[�͐�ugIz��ZiFJ_��kz�
q�*���yBZ���7?�V���&}����Ѫ��W������;Z�/�s��]� +h磶�K����&v��^�L3�_���u�m��>^�
+X)�uk� @C��l�#n��P�|+��Ǣ(�j����P-���Ϗ_�zrM4���b%�#��+��(�A'�����>C���t�d�M�y�*Ϻ@	�=}���
��)vJ���P��^:�P�P�>;�>ˡ����<�4��04����eV���j��g�O�<`~^]��3�f?�hɛw()�P�?N�_@��y�]�Ҵ��R830iƀk�e�si�d�:<��sah�q�Ѵ�V]�i�oi���B!�(o�"e�%�
+�
I�6[؁|�Q���U�|���LD�\�������<ۓ
+)」�R��"����X���~�!n4�M�a$-`Ʀ
еX�)E�$6�_�ajl���&�H��T7L�Vc�����V�,��6�66S�=�D�ϷX�V�c��
 `Un.7�FXW�z��%����
PN�\��Pګ�O�C�40��[��@��0"($�� ܂�t�>E��CP
�{m�BՂ���-�*H�����9R
+Ta�AI�K3�UF�
+�/0>P�g���� �sAR����ҷy�U�xEE�6����Jƍ�[�$�'Y�]���80�Qx�����e��c�^*T.3�[$�Mn�=�h�5����q����`n䁵윜8UU2����i�C}�]������.X�����Y���St�Q.R���_�W�c�&DsQ7l����X���T����J����7̱2�n=����ᤁ��ƥ�wMJ(��;��BO��y������Qm�q�%��$D�������C�G�>���W��0z�#P�;P�֯q�1��3��C��	O
�m�Z�=�7��1��p��;�����S"�\�=>�<1J���������>�CPXpӦ&-{��_�$_�����L����O��g|tf�‰	e8~s3�@!єy����ٌ�T��\�[��\�X��y���E*G��Q-��mw]y�E�:�O�,~��U�%N�1>���������v���4��J$������Z�@l���jx_�
e�����l`UT�s_�̃
�àfa"V�U(�@��COH�3��`��J--q�u�������V���Dos:��4R�m�B�
�\��Om�����g���a���LO�<9�'�}��
J�|R��]5Z7a��N��jT��&M��A����цM|���E�h:�6����v��S�5+�����x,Ӓ� �Wγ�el����%�r.4�y��/zj��N��ú�lXH��$�㜌�
+��mB�"0`��yBώ�$PSxg.��Ѿ���"/N��<��Y��0����
+��%Ұ�_}-���ᚻ�Jq�����]]!��QqB|EY�s���9���E��u?pY�3�$��ް�`�I��N7�J����q��<�*0D�̷
+ux1s_͊K������?H(�"�:���l��(���LO���E|T
��@�1|Z���'%��c�^���K�؇(��1�{��ֻ��z:Fi���pTp�h%�+6:X�]/�
��-�Ey
+k�j��<���iX�%U�[l��w+�����/���8��^>[g���9�s.Ƈg�1����`!����9���V��z�@��dJ�/'�p�.�#�'���6)���W�f/�~-g�=��x~�'��c
<��L9�[�qEVIr;��\�@���xx�q�5�~�Z��,/z\��/UH�=1�jp���Q�ޥߎ�@��)�@C���:'�aUn6h,�^fJũ�
+T��A� ns2[��Q��%�f�RB=���
����5���4b��NV�fq�W���3^���v�
��h�Ra���s���k�s3�7L��CcyTOZlK�̫5Zls"q+������U�O.���	g~�h«�
+7����g(�`���%�mm�xO�jR}ex���5�;|��ࠍ��4_��]��#ARU���+E��Uo�b�5���c��*"��
����Ye<��f�������*��P%v�9��g��_��[a�x�$�h`��PȪ�Fl�f��\�G�+-������z��.�Pyr��Y���1�U9yC/5�)S�FWd��@��
����r:p$���2"�~:�����\��yS���*��2��
+e4 �b�0��0�y�����A@(h���n i/��5��f�Y��>�p�1�ĊF�~
�Q��
+D���L�6T��6��2������J�&��k=w�ZO���Y�S��]�Ηx,��Е/L��F�O#�;U��s�b���'�Y����My�4���+�٨.O��;=2mT��v�Uj�
J�Tb�"K߷xc||˓�h��Qpx�U��~!A`���.�e�P+ L��הX��Si
ԊF�>���\��s2o�M��XTj�@�����=�-&%���X��,�?��
+s�����+���.�v��Y�M"7���a�<�j�[�1����+z��a���Z��%2�T#�.��E U�,�;�ZH�Jj���
_ZW&�c��ξ����?Щ���PU����:J���>U���s��݀>``�{���?���G3Y/�ʎ�[1!���@Iq��H���/c'��f���J����h���bK�&g�=���šDO3�{�_�K,\������r4�^���=�+��#W��]e�:>ʊ�V7L��V[ 7��P��i��yqҲ����Fx<�b��k��	_�j���>�[�޼����+��������Hop��*
��+B'�@!�
=[�Y�����+z
v�c�J(��
+���0>kj�qsW�R��y�ʇ�NU_�iqmXҖ�ZHT��>.���Kט�|%�MC��\�݀=t,�2zւD>ˌ����H���J���yz�3�0���[�JI*�O�8��6n�1�*;����H鴚�#=�Ֆ3Ӭ��CB�.Ԟ���M���>�[��4��s�^�����7����������i�|��Z;����	�	m��������pZI��
+�[�)P�>ZO��U;���Z>c�U����Fd+��N�
�8
,�(�����y���Va�8j��h��qqˡo�����'U��6x�$`�&~e4\��D�@沜EW�9�\K���*x���\}�׋��Ȑ/��*�?�w>@Tl��{X@���,�F-j5m�%Ǎ����0DKJ}\���P[����n��eX��)�τ����D��Ui�)�R��h�f>�*�/�ߗ��5!�x��]����M���3l���[�Iݴ*'wNf�I#-;�HKEI�Is�q�f�vU�=T��w��ˆ��9���VE�U=���/���T�֍|�9����/C��-C�=b��+�ʑ����b���Wzf+�6�Z�>�����~��y1-볯�����=��T���ψZ��l�A�c�)]�+؊�	���U��2�$-&���
+�
C�0�N{�_�u}
+�DA8EX}�!QIzG�2�=c��Ǽ����G��M\ַے�O,����0�ų�B��o5��G�fԺ�r
��e����vUn�-;�@	;6`� ,�A^>Ik	��3]��Ɋ��uҪ[��:�o%�ӗ��]]u��g��32k˔�iƭ}6a������pI��foz��������?�t��M�
+$(
8������T��8��s5�9"����n�񎐾*@W�!A~�8"�%��67j`�
�诚3=%��bh
+p
+���8U���הѾ�����
��[�����E^恾����a$1��Wqy�ь��X|��x�U�M�Td�tž���H��9�X	2�H��s2[(��ix��S�i�Ϡ0�$Xg礄9S'������8��p��YIP�Яu�zH������e*�hȵZܯ]bvz"?�h�j�s5�^lEi�xś�V�h�Ŕƾ�!�J?����u��+��@�
G�
��:M�J��K�@�@R�,��w����K�޼>-/�S�"}�k�@ӗ�s��k����BLh��6Z���ؓ�w��_��d�U����/���ҝ�2 ;l����\��M�fZFjg!Z���K
�Tn��v���6@9���B6L(M������@gz���]�[l�W�S��I�����CO��4N��#4�y)���y#�kj�--Z9?/V�>��XHm�<:��j������*`��4�nU��0+�;;C����/���nzG����#���l� �0�X9̦���|
+���λ�W�ۂ����f�+)���ћ0�6�
+�-��P�{<_��|D�땡&�\��u�)h��?b
���A��L�/���&�,˺��`�G��>;i�TɃl�$[�b�� �_�۳ m�?�T�'�m�YIK�o�t������a��=���%K���+DŮ�gMV�f��䱪- �������G��s�Nr<;A��g�0�C-(�X�Cp[_]o�+����Zs��bs*�lY�����0_eҕ��N�Ŋ�o?Q�*�w��
|�$b��/�xK�4��-�Cq����PX؇?���� ��\���P�E���I��UϾ�ꄟ=��;$��>o*����R-�g���p+V���j��g�bl€s5䂭ú��}#	���X�!��C1`���T���A�s:�����Y��P�|hd!�'�8yy��1z�
�=�2�J��/�q���	�X9�'�YX`�W��ͶztM�.w��$̵����BKk=�\��U����y�:ԯр��x�=-B	nI�0�E�
�D
+h
�tzP7�z�ȟ�u;|X�)[W��m
;z������uZSl�VYd�V/��4+��W	Y�MeWq_�x[�J��Щ/ ���_��^�;��g^�ܲ����T�!������55i� [t��4�+Dv����^;�#yN>�r�*���Ϥ��(���Z�u�S��7]�ÍoneiνJ�ۏ�{q�*��'a�E&��G�Z��Q�)}�EJ��oSaxǠ�<�~�E@� mYն��/xg1���T'y=@	��p������'f"n:��
�Z�c)p	��OTWg(xfJ��z��J�ʯt!�����������C�G���^�ߣ��Ӈ:x! &Q1�+�{{���A#K�!����j��Z	b}*
+�*S�k����#E*�����bE}����
t�G�ܴbgb���=�H��w��#q}K�;(�c'�Yi�xx����2ݎ��k���5�[�D��6�ڠ��h��nU�d_Ly�s��u˞�-����4r�iG�w�P �+
�^��YT���}��W�7����F'AO��Q�
�����H.�5y��ތ�+N�㹂��44�*7��Q�		50lr�c�\RQ�����	�|:���eEo�o��P��%�qN���*<�'�q(�-�\
+���l7��Jd�!�����bE!z{_?�ݦ�1�������/����(���Q��z�e�|�_�"��}�_r�3�d	����3�t�g��'6n�ıx�|��>��������&�Ü���à��̯ȭS�}"��n/�cu�h|��3nlA��MX�/vT�}
+G��Vm���{<ۨ"�Yr_ܫ�'�0\[�!�;kM��-�o�G�`�ia��F�P����u
%=��y�O����Br0n��������ĴR�r�5i����~�8�P�W��J��+�Jʧx��T�՟���s��UU�6
,X��6�^Ҳ�U�%€'�����X���R�ӾD��KZ�
�%{Z+�i��^4	�Sh�^��:%q
+=A���f��I����$)p�C��,^�fyd�h��
�8‹h�$�Y�4x�ʜZ���"�Q�
+	285ile�? ��+:�t�

˟j�����0h5 �YE_�����Gmx��A��4�;�����fA;i��L}ʂ�����=6Tk<�۔ĩ*}��1�k�"����a�<Z�c7����S݀���NZ7����O|�;�ì���L姐�cp�m@����d��׋�b!� s��0Qd�Y�j�N.�4�O�ھ���͝FӇձY�I	sDt}��DU[�!��_C_�Kk}��c7�ijTk�E��m19y�J��W��z��%���@1j����o1��;�hv���1C�P��k<�����ڔ"8��Z�{�m�����6���E��-b��
� �k.80B��E��q̓�bǚ�?>8��@ �$������E���Z�}'��
+���o,3�w����y����e�:tmF�� �28VB�a|�P��H����w�u��1U,҂��
+��sT��R��>�� �\��j�#�>];FX�ߘ�fG���g1`}�f_Be�?���I	��Wz��x��l*�:�6�LiM�<,-�	U�����O��7&m��><���Gt+�$'�sa��s��k�j!�k�7LTt�=����vC�ł�U���Bv=�k�Z��Wl�4�a�P����a	�G�2R�����&��z}}��t˝^�F*����"8#�mF=٩U�����:���Hm壯}��8����Ã��#��X��&;�:��}>"/x�"�B�+&�ȑ��P��Ƿ��^DZ��+��s�UU�;��=2y�J.w3����j�
>F�@��!�}�_�;��{FǾ�0� ��>�	�.FH��q��#9�K�C�T��DGp>}�.�6���$u�`�/�9�X�
@�b���Y�
+
+	kc���W��<
�Po��cCT����;Y��4������
+�Y��ɉ���=��`!r�����C�G���;�	�*��C���
D��A�������ֲ�MD~|{�PUD6�0���s��jO���=�����}2��]�����<(�SE_
+
��4R�����<?k��k�45i���'x\:��!�V��f���W�� �U4�q��A�۪���,!Ρf�
��^�H�/<'sوA��б�j��k��^F`�Ua�������0����7Y���魻�p�=�+�Ӣw���>S���NS���bE\���z�e����ǂ��ɸ}j�xY����hкBڐ�b���5��|�0[�~��EZ���߲ګm;x=�!PD�U�}���9���F�
A�O����Jr������#��5��̦��b[�~�F'���
_S���o��I����`
ns0��z>�(���Ro�J��ض���-��$Z�����` ��
F��kQ�6�|��ʒ�N�Rօ\�!�P\smq�8,'��ظ��QE�/�R�^3��1�
+��tx���7�
������1�R�h���R�Q_��Q{�Y9�;��{��'��
+��Kी����I[iQ�=
+�q,�`|��t�47�&�˼�L5'��~Rb�������Q���
+;<;=yP����-�1ø5�S
[��22BX>X�}X�D:�_ޤ8X�&_�
+��cx*iҌ4��j��0l?������Ž�� %H����I���X�,[���e]į�<�{�ʞ�(
+��k��^JΊ�|!W����:	�.�u���J��0���t����*5���ACг���̛��(���8ۢu'�hpU8�W+op.6���is�.oT�~?�;Or���տ�9���ϗT��S1k^i���@9
+�!z�_�>��)H�ᓵ��J�^�G��6��7�Ek0�}��9��>���9�l�5��_�Yŵ6ʝ�S�^�UV�G����Olc
+��S�`.���~�/gɒ�oOQ�J1;�ѩIcQ%_�2�h����J{p�����F	UKl#��$�Q�
�^���[`β<εR�ĺ����=ጆ��tn���o�C���oզkd��.6�ꖙ�Kt/6�o�I���`%d��
+MD+yS��N�<Y�ˆ��Xc-�<�ЩI	�C� g<�'}�q[�l��#5\���MSx��rbџ�
jt�H��H�z���R�_�w���߱�W��v�����?W���=�
^mij)%+���_a��f{fj�(����1��FYօp
+@��ο��e]Lk������p06J�c�A-1̑���}`H��b��a��(Ӓ�óZtL�J�7c�R0��t�����@Z��+���������7	#�U�O�����>C񟅾A
��GN|
/�G1޾��ƽ��
��Mv�������XSuo+��ȝ���
+�:�[�+�8m�hy2��yf�P�<�)�k-�2
.�R�oO�'k��^'�_f����5�}-1D]�VH�ǘ��V�U����'򨤤����`\֡u��=���a?g�=3������|y79q&'B��n_Њ�D;�$M��b�n�E��?G16��1�>:�)�9�ZvU����dI�Z�(*Ϻ�w�ZmմGU4�ꯪT�m*�S���r��e�q��Q���������k��iT��}9�)�"���hU_\��E=���BIKg�V`���p_�Au;7*�f'۞��aK�F/b1��.�!�O8���.�a���}���m��#���Xo��c��K��
+5�e�ʹ�0���(q���凌a^�� ciƝn}�2�]iF;#yu���Q*0�~��7�M���	6�Z�}XK��
֝�B:'�E�����Z�Y]��
�\޺����Y�+�a�6�z�MS�\��������:SI�'�a٧.��+�O�����V���O���(��^�>��*�{{(���0��"�`�i��B��!��K�NĊ?��^����5��YyV�+" .�����B�l�[�f�xiA_����y�3h�M��G�@wI�PE�T�s'W�aF�U��&��<}�r`�}V屹6'k�R�1>�:�]A��r�VX��e*�p��yFR�tu��6�-�zr�WC2b�Z����ol˖Y�\CDl��G[%���b�1tl�#��}<v����g^�N���~4��F�ny11�=l�J�ؚ,ۜx�d��m-�X|�~-��2��S�y����[�3��P���N
J�4žM�~VUO!�N|���l�>
R�����`���}�:�c'�Ч�'$��� ��qA�Q��ԃk�r@�������*~�cĂ9�Bs
�����ط4i��l�-�b?X	�� ��zIX�L��*��Ҫ�%��]>���1�D�o���e<W�8�VB�ma��
�B���ߍvW�4��wV�)sMt!�ϫ�C9K���ߚ�#�.�8,�Z��O_fkfj!>3L���"ݩ�OO:��V�7aޤ�g�93�;M�.:���ZIa�AB�O����0D�?Z�K��Á�^��rVX,��l��!�9���~b�S���:cXTo|�i��`��eb�Nb?��
+�����K@�Pޟ1~����tŰ{�L�&#�W1.���gz�3�[�KA�3&%��Zp:�x��*����Gf�vR�7�_V��<�`:��Tz�?*��}���/1P�*
�@�lhbC�F/
+[gt�|�#�|�����b��E���˾�0
+�dSl�xN
++*�V�\���Z�Ӱ9x�����
���U�o��e��Y���x�M�~�a
-�k1Q����0�0�ڃ'}�%�s�O���v{�@'�=��]�k�*��kʃگ�Gv�/�b���6��
�����Hٗ �z��(BT|��M�����;<s���V�������9eE���\��d���S��,���g����H-�ظ�("u�5;l���"��ǃ�*I��Ƿ! Pգ�VUϕ�C,-�S��^�7���7�g���j6�����m��yA��|l�U�˵��D�//��r��x,
���K� wŧ�������O�� }��7
�*��U�`��`���
�46n����(�t�Z�'�
D+���EYxY�$1�i^.@��x}9^�k�� �/2�k��JC:o�������*�0PU�����<T��T��7.n9'rMc��q�8�Y�y����Kiނ&�41=�2$J�
+�������״��̦^���8�`���ų�UHD�Y��2�X�u�$���%{���Z᝞L ����T@�.�~�Q|�ÿ<n���ه!���V���0���@%�,�ֺ����V{F��=
܇@�Sg�
1۵��*��爱+�
+���)�3Z�G�����\1�n�{���!�+==��"P+�k���Ӎ}A�aZJ;�GUwf�����@y
�T��!��wA��3R���4
+��:7�4��֌R
�20ZQY�$q���x`<! P��U=�
��b�N��l�l㍆q��[��QvpI0��W�l�i���1/�h��ҶWi�R+�v���s4˩�!Pk����.O�
�݇�|��+� �6ы|-���P�^�b�r�^O��փ�aL;��+9����.���k��}�l}�=>��S�k+�+؀4�d���>�F�fd*�h�S���_U��W_�B�+�����Gd�))���b�&��̫%b��X̱�������z���W�g]`�\��Q��ߒ���ҞPu�A�w�t�Ñ&�S����a�`�y���s�
z7��I��X�V&]������
+�y�q(3]ZYQo�8��y*Q��gk�|�o�D�^������u��-����ġ�����RM&~��<�xEz/��P:-�q)-�;ZD+	8>���տ�*�����qB��V/��eV��x��
+��}�_3��9�I癒8Y)���$�n����?.��nr&K���V�V_�[c��zM�|5��kNk�[I���Y{Z�W���t���Q�]V/����(��j�+�{`�LB0M{L��/f��)�h�#��`7.[�}�>���&����4;���l[5���8't�4�H�l��@�����!�c�[u�����O����0D�?Z]�%��L_�h�W�|ʖ���kH�Ө���d-��&g�%��
���m��9.��	�d���h��7�u���Vj��Cz��.vu�Vt�ڧ$أ�[t��z�5�ϔi�G�9Ǽ���γZ
+���
z�u섹�m��(�w�~[�WkvZg��QXYU6;�!��(���
+���8��r
*��ǂQϲ`H8��Xv�
�k����2CR60�@$��]s����`ӔM�,H�3�\�+��q|M��
v[���K�۫*�P�K=������-R���8'��5^Q�����̈́CV����jF��b�|�|-�����{��2���ؠ������e�<�����;F�x���
+�Ze�h�ޥq�O�t���%#��W��:����ձ�D�|���Q���Z��>�����@���zt4��<ֿ
�W�w���� h�"7"x�U�=Y������������`�IFH��v)����8|Rtr�/i*����
+��o�0���#z��6��&>���Y�� ��y|����Iy�g�z:�F*�J�Dڇ�g����S��$ &���O�U͙'A.���}�����FZ�p�^JBm��?-I�d�Dǽ��$k�_����To3�n�e�]6&v-V�U��_l�6q�
+�|���I
+ã�[��W��b �(��qt?�zR�:.n]a��e�����}H�w�D4�a��!�c���nS��p_L�g��- 9�.�
�����М�t��Ȅ1
+�킺�Q��,��D�-�]Z�J����K1G%a�a�D:����y.'WÏ���h�/�_��$D�^�w?�!�P�Ѫ��to1�o�����ה/<P6�g\b_��
�߽�&:6�B�ӌ�n%�X�U��'x��s.̴�e��݀B_���� -_6�����4�5F����[�t��Z"#����R����ޠ&e����L[��KY�0�*�g���؂��W�[2�ah83�;Y���H�q���=^Y�
`+�v^��
+[�V	:�^j{6�o�T�-�:�D΂��y�
�����feα��4��bc��*Ϻ��,h/a���\�Γ�i1__Ly7���h��?h=7�4,�wm�i���u�u�ɯfRd����.��,�.�Q�|���V'�}E�|��K�N[&Rq�tG/����_�Fы��q���k%y�z�?�jy
���
t�Տ�?B�x�ّ�Փė*:�e��"��y<������g"X~��sp��|��ꆩlx�gq$��m�@`KX����/�~z���8_ԩ��9��[Ӓ�]�
+��"�٘�e����ʆ��c��W��3,9��ۢQ�k���&���e�p(O#)�H�Ū�غ�c&'ζ:�q+u�k��Vy5�Yi���r��:�~:%q
+Љ�����Z<e=�}T��4�g/�Hy��j�m��ZPNQ��
.��--q�
+�@�ᚼ�-������
+��
,��h�dqM�Z�L�=x�e�V���;�6��{DB���V��a�+��%
+��E��?i����܌)}x�M�-�W��ɉ3���v���-�g뽈+-@�:?E���^�V�i͇T�~m���;A�MN�����eY�zqUn���>Ww�a����D��/v�k㪼�o^�\16h����Y��b��x�s�Gq�� �R��V���
������'�&j�B�V]t�ֳ�Z�YZ+�8��7����ʺʘ�ֈͯ�w=>�*6No�i��*I��j�'<��'�V��F�P+��R�}����a�7L��.���t[22�D4hɟ%����<q�v@���>.�i�
M���6hI�g���m��=�԰�r��|����r>����V�T��,Io_�w$O��SDAK��B%}NPQ"o�-�)���2X܇��C=	Q�O}�09��8����1��GT�3򔑽c�*�
��G�֬���S
�א��H���K%(R򈏽w���������;��4�ٚg�:�x���]�]*�x�VE���}UR�HtK��='�vE���4/��S?p�l@ �
�S��->�
+/І4{e�?���Ԟ6�}��@�}�k�k��o�>�ʆ}�n�i��̫=�eY�1�ʪ�%��Pc�=�P��͜�4�������'��2�d�7�n�3���Ud�}�GNG:�k��1�ϔ�X��8�U6g�'��_�XD@P'���g�:)���la�e�s'\M�]�AJ��PU�U��m�����P����D��h���+Y��<m��JvlU=��<�cRb��n��x]����4w�
}Ƌ�h�r5��%%9�)d�d�AZP�=����ڑ�k���6�8-yO5;�Ӵ��o�Բh�s@�iC_xFJ�G
��߆w���{��l��a�C �@H(��c�qƱ�]��hR�+"���J�P�
+R�HMH����{/J�w
u���[�
+���̜?�0s���c��z����w�{?ϳ׽��Y�^|]n���)^�mh�ʫ�OO.V�+m�rX��w4$��Ev����\$P�����rG�+O#��z�Vn��7�_Ͼ��/����U��V�'��Qh5XF{��8��ζ4��ih��@谇����;���
�`+�YlϥVa|n
*Z+HsfQ/4C
+
+c=���zU��H��Q*%�N8,�f���U�%�k��y��d��L⻘�a�������b5�^5��sx
+T1��Y�s�D?��$4dJ�j�R�!�#%�����rwV�0�(�D��D���zbx-k�J�3k3������U���A�����X�+@�G��/�z�;�W���n�t�f^��\$X &��p�-�&E��G`��G]�,�ǛW��Nb~iU	~�P��y����[�#>a���%�`�Trׅb<㦝M�ٔ�Bw�z|
+�d���{=z��Jj\g���
��yq�GQ'��r5e��1�������o�k�
*�ds�9/�4�R�Nt�ٿ�p+�6�Jىr�D\q8>viL�����c��e�vf��P?�h����ᦠ+�FOG�S����	�E�̻����wl�R��+eZ(����mJ�W�ʄ��������T�%���&O4�|�^P`��v�8�}�*�����������.t×�>ϿZ)�a�'��9-�1�&�$�ˋ(���(' .3Jx���%M(4D�i��]`�tu����&�Q��a��]��.�#z�@�N�lx�N�٣[��.��-K�O���s-��"G�,y@��g$J��#�<����x�wɤ�3�c�`0p$��)�
z�h�nಃ/N����	yBq���Ҳ���!h
+:ʍs����X��Oq�\��M]�����t^�Jj�h"o���䢍RK<B[�}���xrTMب��J{�=*��d���ş�2x�p�1i1�����'qӹ�_ ���?Z�מ�ر$��a;^�l�xm�»���T�a7ûnh���R����D�.b���N�����<bG���
+
F��U�p���ōB������
+����m�X~�g�T~�VC��Ό�k�S�76<qp��<h�QdAX��������lh�g�d\���٩%����0��-��v�:�*<Ǣ�k��{f�ܦR^�Γ�Ը�UC:�3����ea��[���mi�Q����l���Y�
�-5,�
^Nȑ<�)���,P�G.�g��e'=>���U5v}?�A;Gq�yB�+�H$��ֳl�n|�]�� ��$V�w%$.Ƃ��b(.�r�^UСփZ�aF��SjHV�.�StY�';ǞO�ih�/Ƿ��9���ɦn�l��[]b��H�β|oX�i@陏V��A�jZ̽86l���Ū�U��e�v�y\�u��ܐ�X��͠n�d������}"��mZ{����=���JG;�,��SylR���]�����a}y�
��1�)�
n��H�?+N}'
ʬiI�%�,b��s1��TV��_F#�Q
�~7�=���|�%Dv�e�8�:������v|D�I���F�h�! �w����N��J8�_�6zh�Ly7)�&�����ڞ-Y�T��_6z�O`�ף�z���,�4<I1��(�g�"iW:�‘!wb��@3�

uZ��&������5Sb���wj�����~
E��ue�"j��Ug�~�0����߳�\�6�d4�˰��OE\,��\�!����Q�2qX	�����n��s�k��dž��[
+*-]�J)V=��Z�n!�Q�%��@��x�9�f_?{����(W�\�B���Ç_�߷o�x _�|��э7>}���~�;w�
+*�߿��s����[�����{�"�����%xJW�й��S�.�K��E��j�!�KNJC0Ąrb�a�
BKى9}ی���y�MB�<8V��GU���
+���B�߉��vK��+b�p��.E���sxZy(x@�g�e��9��V��,٢�
+�X�r�QZ�|�'�u��k�4?aX�$�
��H�N�
+я�+�9�*XT��Jx<k��A!/*Z�$�-vx{]㌻߰�Xm-k�B�z�0�/f���X:ɳ���M���P����8���[hZ��t/�&�2+pb�-�a"�Ji���)ڿQ%��/��"������1����7+k�g?g�k�=��Q��EK7qX�:f��&�,{�ü���!k�������,�9|C˰�\-[���Va�<==���K���	����z�/���`�h
�n~������*�i��������h��� (�q�W��X`��p<�I��Z�$�E�Ϯ��3��1wO��TqN<.��$7S��*ڸ��= ����D���C��}�gY�;��c�i���^�,6i������iQ ɔ�
+���
+���{;,̦vMq��cy�-�����X4��TB����_��ӷN�k�i�,�R���
�3�O�-3��Y�I�L~�{
L�F��
`��8��<��ue�~�.���f���5�yf)L��v���5���9��q�@���2��Vw�a��9�
@�P���F;�i
q'��'�\�=����O-^9=�6ׅ�@��.�#}GZv�y�����,UВ8�x�t|ol�3�o)Z�t��$~qR���P��qH�2P�_,��G0V���oo"/f���g����qqq�O��?�����-�2eJ�2e@=�?~��\�rM�8q����˗���~��?�����R�bZ��Jx���#&��
+4��]�Vl�-���k�h��c]̹Yh.�a�a0��đ���C_	=�7�U���F��Ҿۍ����6a�z
�.��v��,�H~y��哮
+~��C��	7ؓ"?�q���c`�(�GtU���^BkB��|K���HVɨ��+̕���R�q�/��e�<w3��#�&���5C����c-�>%\� r0�yC{���&���]��¯�]̲d��K*ڜG��<{��4�+��I��y'�4�>���O#�Q X<�EO`������%)�L�P@�8G�kԲ���0�+�9��A%�nx���ӿԪ��Y�	��"���#�Vk�dH�����q���������Т�����*�i:�!�Ba';1e89�X���-]y��c3�p_�zm���#���֌�%-R��hjh#��!� &�	��e�&���pI0�Y���U:��U�B�h޵�z�����޹q�|q�rυ�`k��%�
+s����[�Ԭ��~wi�“�/������;	ˌ����^��$z5d�@�d��i>�
+0�!;MyuWRѦ�>B�\��·$�c��L�!<��
 e��dK�|��⇚����#�q�pv>���HC�p\=}��\�S��<����\(o@�s<��)���&�b�p�w3��� ���KF9��g}r^�\�Nƍ����ڒ�i
:�,�/=�#�ׁ3)�t�� �r^��ǧ�q88Έ�m��c�,U'Y�`��
N+��?��%u�{t�4-@�Px_w�sZ�3��ы���ppn"3o����H�[�v��ȿ�KNN��o�*�lѢ��?r�H(�;w�����t@�k�y��p�0v��^��#����E��XE�'�qvk�� \�\jc��;��q�6�����ONU+H
�Yr���ր��Wx޵C�/`����d�5s�b,IS��"Ƴ�~M	^U`���1t�w�����s�ȘV26��[08��2"ﱪ�����.0��+��=]}Ή����d]E�Y��q�A}V����	v62p�����]����7mf|�`�&��n�b�7u��Lq;?C׃��u��
��N��6͋q�"�Չ<�J��籫����c�����!4\�e�u^��gX?�d�X���M�bg��B�B�b�!΂`���b>���p���m4�!-<� �T%�w�(�����;bDaʔ	���Ob01ݰ��R�������xI��JCv����14tվ��ŗk]ؕ|>|}�l}]����v5��-��֚��X�jyY=l^0�����J,��s�>K/�tѴ���y�����d���W�@�f�҇I��ƄY`u�b�ń�P�n_�*�F��2��A�Q�r)�O›��6I*�?�z6��1��s��<%��U�5-���T��R�0q9��.�p�I���޷��<�ig�; ��M�!��b=��rK�O	 ���܎�)@z��乄 ��݂�68���`�E�>���Vc=�CE=�sx����W0���<�ӹ�KӁ����ȏx��B�)HW�9T��¯3�q�51qO��8�3��ȶ�J�L����c�������36>��2Jª$i�/�6�<���76|<������Ր&���n�����x� {�o� D^H���/�_|||xx�O?���w��ȑ#%%��Gw�yg�������s����tfOg�s��N
+��g����e��(oo�:����J��i�H���i�����s�&�
�DOX�Kb3��&�"���x�T��t�>�d@��b�D=<
Ad�x���G��T�U��t\�8l���~���0��-�+�[������b~'}�wL�5�6{�����X`���iCR���������)�5û��a"ۦ�Z� ^�6,r��f�
ǭ����{�#�v�}��*ݘʣ
+��TFv��w�4��y���LR/!��&# �x��])u�9
+�;&��z_U%���yL�м[T�8
�\u8�^��S�{��[0-���Y�_����f����W+��;��
+���^YE���Q���/��d�.{B�'�'�c~�BF��Dza���.�G�Xr��E��"ݟ�.�b0�<ጀ ݱ�1{��FԽ >����Q���3mj/��o�����
c#�c��V���86�XU�7 �9#��`f'm������)�-��#�a�S�U�w��H�"�ᓨ�������bvÁ?��ڪ���6<���6�I��39#AFM����\��J+mD4v�f�W*�$�v�f�p(�_�wȻ�_��\��J�����)�T�r�q�&fn���dR.s*��uY%&`j�>�.�Ն���XI��Op0F�R��$)6,�o+���*>�ǸB�@=J-�W�҆�#��I�̿����-��
��i��"J�N���+4w��g�J�D��,Ϟ�яt=����u��k,Wh����;���H�� �/����/ �믿��;>��c���+K�,���O<��;�������8��c��WLi�슷߂��a�E��̮J��*�S�7�EL%�75����0�p�O��̈E`�[5��&�MuC�x�Z�
+����bG�VJe���Fzp�W-�H`�ǟO]��%�
�F�g��=q^��$"�>��/�m��3�2��N)^�'��W�s'�d�fr�HYe���(�'{�Ep�dd��C7ȃ6���#����kq�O{�6�����]�|�����j�Y��,Vv�mvZ�'��:�L]�)��k�9A㱅�p�z��z�I�NU��:eL�S0{����&Dv� �D?�u���<�Z��Bg�Ҡ<G]��y��*��C��Su�KJG=φ�M~����Kku�8=E�6	m�G�[�\�g���:
�R��ꉙ8i�~�Ʃ0>d�WQP0a���&9�{���T�,P�!�-{��6�Jϸ�}�+��t�w������/�v�E�%�>UFɢXTUL�H.���q�3{2o�ks�n�9��
zp�+��c�!8��^��krT]�d��h:�u[I,�)ޚ([�q�	���XZ��9�M��`�ٰ�L%�N�"�cݪ__/�i8�I=`�ɃX���m|�%V�!���m��������2���s�V��[��,�X�#A��`�KRr��a�����P
+<�T���X�_����g�����*R����j`����T�ւ�V�3�j��$�Nj*��/���F@���(�t=?*٢/u��y��+h(<�q��q�u|N�C��`��V�m��"���.Q[�oOq
+
z?Dm���
+˱3���S��>�qu�)7��_�����˗-[�/��_���O��D3�:]B�_Sv<k��{H���jv�'hk:�U�+�Bk0�F���t8�R�[�h�[+Hy#�YA��<�Zh��b3���(��VPk�t�\�˕\WHS��s���FC.z�+[Y!Q���>?)��c8["YX-0�3ѓ���|ZdPid��i1��#�cc�s�����UU��|:l)�[��53�@P>�i�S[�`q�s�w2s�����n�ke���\X�ͷ�J����̾=H�lk�E���gT��紿Q��b~1D*��%��ۀ ���&i1py��b�ĥ"��՘R�Ť�o��xÛY:7�0��$'�XZͭ���H2�Cs��p�W��e):Z
ߓt"#��
-Z43eI��V?�u�ײu;��Hj`l� ���0�H�(	�r
X	G�-��֦��jDO9��ff{60A���a�2J_��n�Ut\4�f\�7�&z���e��-�|Bi8/�+�
+=Ew�t
+_���ŀ&/L"��<W�{}��nh&��ս%^�'��2�
�z-f����Gж|���x�hO.��N(<0>�ׯu���1w����
�� '���m�/>������)я%G�R�@�
il�Wԧ�J��4�<�D|�������y��^PcJ�j 2��OHU�mOSH��x��*��-�	�q�NM5���kz�U~��q�+*l��A|�%./LK�z	>��[��
JV�V�9Oӧ�i�������9t�E���Z�P�"����x)g�
���q�x��X�,�Wퟓn�S���'Ȼ�}��H����k|�K���*�hb�
<A.�|�L�jG��-3*��6�G�e�ѩ��K4�
B��)7��������?�]�r����D�s���������IRxv�P�
+x�*/l ��?$�-`�g��PvH�����4�C���D�($�V�=0'��r=
�����a�]��F0�j0�nh���!N�2��1�@�*ݛ��Wk�ʿ<Q���v���TZ��;W1���x|�ӡ���UP�<���x:cӦ�,
V��ܑ{���5���XKT���e��I[[��gK� �pg#,;��tߑ����>4|�Ӎ�+��T�e
�3.�3���2�*s0��.�>#��s}U��F��=8�5�2�tM�1�_�K��Ua�t8)��=�~1��fRѦ0b��-�04
+
����W��"l,F.j`y�R];��S��~�-6*f�,ok�'� EU]��j\6=�~/����>'�w�����2�ک�=@�) ���o�5ȍ�����D��V;wa��%�*f.���V���5;8I�#��\��viq�/����l'�k�������E�06�b~ǕӞJ��)VU��,�^��_�w�y���\?߂��q%i���2l�Ŗ��S��ş�y��6s~ത/M7,^2�(5�����20�CW
+m����D:�,s0����Q�	�I������x��,UpL��t����,�&.L6�OnZ�iE����I����Lb�'�vz�)�x��u���A��A+C\�!��qѪ�b5�<:�`��qE�[�&g�Q��:[.�WPQ�66D�D�KZ�3�fR�hv�Y� �hgɓ��J_��'��r���w]LY�U�����)V��p��l���/<ȍ����|����-�ɒ���5�bՕZ��,��<D��g�X�.Jf�S���h%}0�F!2�f_�k!�X�r�~�믿��#�U�:��j\�1��*��A��2��#��_���sU����^��xS� 㼋��4��/�W?
�Zx:P3Hjj5�������
+��&Q�x�Ɠ�KB�<k�v0
^���d50����IU-�~^�����;^��|T���j�)�<ObwS9��]��װIK��]<��i5�
+�-�H�`�
+by0�3�:�c�j�A�<i�c\-T��Tة�M��L˚��-�^,0@	�f��&�om���X����D���be�bP��A5q��}ϾQ�j��1�3t_G�:�x%�V���M-�Pf�<�Dm+f^q-�����MF՝��+~K��$P��[��fd[���R����J��0�x#��y�ׯ�r��][}�i��rm����P�c83�WK׻8�]��r|N(�˳ke'K�}0�%i(e@T����1<��7��~Zliޡl80�k$&��`�hg�ׅ��wSe����ׂ���4q{l)�|v.Ϛ�����
+�d��R�0��A�^��kghJs)��X�jK��@R�����`bJ��3C��	f��\d��o�
+p*O�
+���l�8����{";q���(�r-_���
��t��q}�]��8i��	L�H>��þUc��;֩���k�DŽO��إsy0H�^�����ۼ��ɡ[9��ܬUl̻����10�v���2�i�;]w�G�o�Ѯn
�]O�f�	������g�Whi�3h��"-U�kͨshg�Y�s�s���D�)����h+��j5�}.t�b�������WK�n	�@�(G@�ASk�q*���Pٔ)xhܝt��BG»GX
+d3_�禸;�i��7 �ܤ�}��!����7nLHH�NgϞ���K�~��*U�DGG/\�p�?�k�����
6�/_��{��ۤ������-W��]��<K�V�}�z�`��/c�,���Õ�漏�^�QEfWBU��|����Uv6
+����v��
+A�F�U\1h�j���w���l
B�ꆦcW?�%���uGIpU���W��8r����`|�A�����\~�:J�>�GZʷ��JY�s�T�f`�T��=0O~��6\f+��"���jf��T�fx_4�úB� N!�-�Zˠd�?���Ipbpp��Y�5
dm���E�$��8��6ZR[�- ��H��t���Un�z	��ɂ�sV��d��?�X
my�!2IE����˔b/���5�њN:�C�ĄMVK"|,���C.����,�+��t���������.Z�xM�������u�ݥi.�u��
+:���q�A�����dm�6v4�T�}�z�	G�O�0
շ�����鬅�|�?��q��ޤ�(���`" H�l�d��
4����z�n�R6�4
޻mږfI�쨒ӖV��4��T�m�U�(�
L`l�Uƅ����c�Ye�@�ҹRK<�I�Z��:�8?
̩�IM�&���u��i1�)�J�̬�:�
�—a�
+�ڪ����a@I��i	�0rF���C�>h��6O�I��`
�����!��Ng�t����(���8�R$����4�e�,W���9����^ZK�Il:�6�z�� �_��~UO���� >���0	��Z�>��O��zj6[�_��a|DM�^�ew�wi&$n!?�Os0Ό��s�V�O�1S�F��7��s�Tu��2�$Dt����d<�<ɨ�^���4�ע�)r�x7�
����t.W�z�s��jJ���_ �_���h����X���o���۽{��O�>%J��¿��g����K*�j����(y~��ky1L�+���Ň�T
�����)�;���_��r@�k1��DӔ�������C��z	L�|Q-]3H�l����pFx"Ƴf0��s ����7C��J���'��9����a
��[�w_�����r��e��dv>��S4(V���#e`C3!V��bX@˼(�G���F�p	����ٺ�B"����7�H�.��U9����j6�z���C9~l���t�~� �5�-���V�	C�� �4&�7����0U�>���VK�W���O�0��U��a�(P>������������)�Oq$O��ᑲ����uư��5�L4�k��ٖ�l�S�|��u��)G�^��W�r,�Gp��?C��Nl��q�Z\4�(A�S�u|n��=��ﴻ��U�d��z8�YV�w[HqJ�Y�sιÓ2��-�/�i�U	���N=�Փ;�6���}�%~��=�-G�B`eۉ�����ߵ�\�V��i%c`�ٴ��p����Q楖x�,���%�ҕ=�uJ�*�&[	d�`���cbڴ�R9*����b��c�`(ҳ@?�<��I�`���jp��#��<G˲0̈́�t=���8y�KZ̽\<��o
����ܕ
,/� �g�\Wgt��T~��/���\`����#�}<^��|��]��qr��B�+���m�kZ�{��(׎/4J�AOC~iIi}l����
�|�YE�8=F���mn
l�7��D?)}ԯ\\hrцZB5��|�z�@[yJ���_1L�5�*i@̝��2$�
�W���*0N�cne�
+�تe�*Xυ�n�9F�IJQL$��	�Fv��t��n/(�*�U 8'C�F!r�;~�������l���6�q��9A4����UeF�~��U�[��p�jP�!ʀ��[���7vR��k�9���:�"�/;аZ0�~hq���a������ 2��ZA*�V��ZA
+g`'�������yAg8)W�-x��ng��n�xWM_�L�%O�tחa/P�E\��Unrk�(I,�K���ο'�Z�؋D@0�VF�I#�&����k�`{���C�C�
1�g�G{�al�\l굾͵r���kpQn|��&�f�9@�Z*�{��MϿ��1������������Ll)�an������AO���.@	�E�/�'SebDo���gy�x�4��/�����9p�ĨAd{�Ƥ�[�Yݏ���s�o���N�?�-m^��=ץe]ʔ���R�?M?J���z�*]����}�Q�
�|a�:�\F�TxM��
+Ո\��M���-�ZvX�~߻���:X������83�����)�|х&E��z�`�|W�".��m.�А��Ea42��9M.V�H_p
l`�9 �T>]��/sl	����Y��XpI�5��CBؼ�`�_
+,�����V�����e�Ŗ�3B� �
�Gz
��=G0��
+�
��<J�4���}���}:�Q���y"xRh��:KgtKKy~����@[~|?0�ݥuɃ`��_Hj�\`>�
ȥ�[��9��N�D{��3b�rօ[!�@0g��b���*��I�T����	&@�++���,�����{.O�h�)�$�����!XH�ro����p~焞���k�]0YQ�/��|/�	�qB������-`z�2�3��VE�׏��q��u�yv�;~�����(��D0����b(�3I%���z��%ƒ5�JU��"��(���Mπ�z�y�XTOdO�кA`W74��1��# ۍCk!�U���B9�l�r��yɭa���ciU���k�Af�Sp�K�x����O+��C��\�zz2���e��1���Y:F)%��2!��,�+�hӬ2��|�Y?�����2s���c{y�z�X!�x��I��n�
+\�{�˱>f��M2\f�{v<��e���^�։��aa�#�����O(<�G��:�J��gk鳋0���,Y��N�,+C�͘k6�coǪh>99�T
�Kf���O��U�)?'��i)�O�]`O[�Z�h`ܐ��
W&���c���Hj�}p
�c�0�|x��/��Y1Et(�C�T6��G������0�S����֠�ҡt���0�|6�Sb1�vL�X]��j[T�ɌW�n�߯�SܵW��SD���[��v�n����0Ofg#묝
�_�G=A���M��l9v�E5�JG�x��<w')��i�v�
��M�>
+[w"o�(�4�q�|���e�Xw�ƼkU��=�j��)E^H-��A�����0���F�]���QR�f*>rrT=SVU�ǔb�����r�%I)}�UU��=�`ͨ����qL��%ZͩU���z<�h|�}�����6�A6�0�ීJ�_'�y��9��b�q���f
<�Ĉ�K<·�hF���q�BU�3�4��q
szٺ�%>����~�O(	�u@�����y�.�IcȨ��Q��5���e-�j���]Kk0Ҫh��4ͥ����1�x,�i�t���3X��iܲ�Z3�v;���o��|��r<�ayn"ό���/����U��:�V0�Y��<=� F�W�gt)6�8��tɍX�߃DPEL��
C+�<���ֲA���m�C���C�)�����J0������x�&D��i�P#��4��j0��Z��W
Fy,��a�&��������	����A�H��>���t\���>	�Ø&�M$��G��\:'x��&B�S��@,��~õ5�#�P��;�#PH7�{[��^783�@�r����=͂���G�;�>WO��
O��VŰ�߾`p/�W���}CR��C+S؃I~a�f�Qu���ɯU\�R��4аDB������/�����C%`�J�N-^�g����Z��g���N|D�;.|��%5y�}������q���i�N��Nxi���.aoi:/т_�0�#��@��2���"�s���bT,b��_s��A�vʫ�Q�+���qVX!O��fU�z�k����,Ќ%(�H������Y4��rW5�y��㪶4�1T'�L��&Z5�m���W/��qG~�Ǭ��_M�`Lj�q��l��Q�ŭФ�����.��3�ȴ�[�0����]�����{�O6nJˢͪ�����Y��cpl�B��b{��w`(���rd�Q�\��
+1���R�Y72���Ec��o菪�,���/=K��"ߥ1U��p�Ǚ��v��pV�ԉ�'�x�O�=�|h��l�ԭ�y��h�o�c3�&%�o$>�[�U��d�j�Tm�˭��A��'����"��1�$A��0�IV��ǃ��
+&��)&���+�H�\��
+����j6�€xW�9�f`�W7Pn���{�3�z��Z����0-�$��;�w���j�$�lIȦ��^��"o#�(����Xl�x���B䘛}����?�s��"�^Q]�e������~O��˾^�%����༂!�$N��;J����>g�Ղ/��a$k鵂TxbC��렟������At���z0
N�J0�� V���j��ɻa��J�\ő|�9���6�z�TX�'�{qa�.�a��,�.'4ˏ����bL��Hx��"� $DtP0_�8@�1�3lz��k���/_4�s�0�גӫV�ll��iP��%
�c}�c�
19��'�������Α�3��r�E�T��Y�M�������}q�狥��Yb��D�k�!V�q��2��"0²2+���]fp�g�
+7�ט���/Mj9�1n
��.��j�JIh
����c�H�)���:�Kִ�+�Iﱾo�iߩ�C�r��w��*�m�c���z�o�+����r��|=�(u��t������Ѐl?I�g3��Qf)�q����N��V�jq_��J`��֌��e�ES�VP1�٩Pxh;.�޷mf��a�e�v6�����`ci"qn<�궡1��r�4u�՚�`~���
G?jR���^�L�/W�J�ٴ��U}���؆�K"�?g�G:Ng:���d�����-��	>����Yw�,}�$�z�:
+�}'�T$�Fc䧕,���-��*�+���s�1��O����J�����*&u~
+��2�r�!��^�����_�<�����ó�⨚���}*�t%�*n��Ϗ̿26<��"�:y���m*!������k�4h�y��IW�;@�����O���A�Õ�N$��hj{@$fG��������S�tp1��[�Ҭ[���%U�x���K�1�C���A���lpR��)�؂�<9�>�� WhTJ�E
�˕�i��rX���/���D�?���Ek�<�jZY*.C��k����@�9�ơ���v�p+#��A2��'��t�Ah	h�a�K�	MgO�`Z��1��k�95�W;o��u_�M�~r�j�������/�^uF�`�
ͪZĜ�|����A��}�|�,��v�
��G�X��!�&���"A׫`%��YV����cۓ�T��
��q���>��Ь2��������IE>H*�&vv��Y�7�
t0�7�%B>ePҭ/o����lg�x����=��a�˹DK���*85҂v�t��k�%�nf������~{�hK̟�o�g��d���$͘�fޖ]�iޝf�a+Xԥ�\� ��y�b�*���TZ4/`x��q���� -�n[�,c���
S���Ra��B�-�������KM:
׽����
_�A�va$�b3���|Z�}�;���#�����7�}�4���p�p�$�����$_qm=-5�
���]�J����(��ҋ���
2@O_��hOb�?�|���yN�U����#n��ς�z�.qou����48��z�6���4�J^J�qj�U�}F?�)�h4�G>�o����l��-B�Za5Uĭ|�js����C=U*|�m�
S���͜.:Χm�J�e�R��ԕ]�<Ғ�@�����&���4����\96�oa�]o
0Uէٌj���|�F��.�R�
+�cӌ�қ�Tp�3hj(�Ņ���I������=��pFI���PN�X�]����B}f26<�s]V4i�r��A1Ώ�P�P[C��ʌ7�gqB�\$?���
��ש�;�8�j �͠�J��H�R��o?��Ǚ��8��:U�q��ԯ�t�AZ�?�tC�%o;��ϋ�pi.��Z�2���:�
+��s	w/h��� [F�l�9#z�+��z�yz�;~������������.V��.��6�Lg��~��/V��W?yD��:���`�.�
��
M��n�Ƨ���:���a�,/�nP$�q�5I��wy!�Z�./��L쿤f0�|�
+���_5	\V
F���S������(��^h��J�d|#���M���M@�˃��BOx��ZMj2ߗ^����ٜ��6�)8��ȑ<�IE_�-N.�0�Hs�H*�R`+JZ9�0W�A�00�e�`(��=o�$�q���C��l�r~�Q��)6�w!#81��`���/�ś3`" �ٞ/�4�5q�!��W[�5S�]uYQ,��r�|�
���..쓮����
��)�rS����`W"�A:L=�T���Z�9���o�:ʘ�2� 3�����z���I��
��U��2�v���:��Fh+pIǽ�Z���X"�VS!SP�/���U���im�1�Vs�����+���.`	3�L�3p1�/k�jk�s�����M��m
+Oa���9������м4
�o
-w��W������0�y9����6;�B�7W��۬;�R��'O�~�N�LX�v|u�z�AV�����Ɩ���)�즕��$r$����Ut��l�u��G#yxz#�/�����A3
���'�$H49�5x����k��幂����=F�s^�#�9AwpBM=�
+e_qN[�4���I�|C��ș�4�j�գt<���t���s��ϩ<��F�U�j��E����*�s�,���
+Ï�D��M��l��"�*~�g�>Ͽ2�}�
+�
4u���Aj����Y��
+fk�l��j�e�$�ږ��xS�d”b�p
�\^�]ʬ��0}�9�f_�@��VuM~�O��W\J�k�T�ͦ2t}>�<����zؽ.�{�H�ǹ^�׮R��r��wiV^�L;/P=J�,c�!m�!q��O-
�ފ�;y�ҁ�`K�f���>��j0�f��nع:A&ە��5�xXd�кZAZ��^�w���ͬ��v~��9�A�J��b:��pr�d�<(����B<qo���Q��%8�
+6Q��v����ٌ�5S:��{5dK��2�rSe%E�1��}[�����>1�������dA;�ɯ����R��AF��s>_�ƕ~%���w��37OM�3�#��u�6V
+������.���|���9Ig$}w��W�bM_]�z��a_��ݩ����g�?�8|k�w,��Az��Ŝ#�Q*R��Ź�6�+A�4{��
+�i�8�1��9����b8���)�!̵���Ci�޼�c���_j��;QPȆ�tc�n�l�
+2a�AH�
;�G��jZz�ë"�/Љ�Y
�$u��
X�GQ60�cY!w�!�s�;x�E���ƀ�h/;�4�UǓ�Ypir�#��o�j���УSF�:f[Ǧg�-����w��S��~"��W�K^X>�DƄ��4�[}o���gL=�:�ਞ�
+[[�wgg�h&������0�-�u��E��i@<�h��"-|�8-����bZ>oԫ��
+1n��j'G�4e�b5 ��H�$�R���x#5c$��gd���J	'����is�4":�ȿ�Ăr�K��K�3�9'(��*����LT���@X�$����>���ͩڜC�"Z���xi�Vtc&C(a`���y��>#
�����ی��y���i�q>��s��;�8�����O���]�U�>m|D�gV��(��!�i�CR��xG�t���I4��+sٚ+���~��e�s��.��b/q���3,m�`2��o���7��"�.@d|h��i��>颬����CI���r��]�ĵ�>�2�.�5�t��o+�k$Î{�k��rW'�*R��KPN��rН��{[��fM�򽲃����z0!u��7sl6h�V>x"�['4�Z0���c�`�����A��Ab��}�F��q��K�@����:A��.�vI�&μ:^�
+���y���F�P
<\3�³<A��.I�.��ı���#�/ࡘ[2%�q<����1PpLOQ��-���}Q�jyT�
���w�������R�!"�98;�pF���)�_�3vI�3��U}�k���I'�&��Pu}# ��^���Z]�2�Cg���[��dR{l2����*Wt�'��,_�1����ͭk.�c���K=�"��5���X�kJ���c*'E~O���K]�,�	C=&<�06|B's'�byT��=ƹ��AU���ä]�F�ԗT:�Y��4
+���a�x	��c���a������R5���9 􎃵2�Ԕr_�N7��>8[S��˘�jb�mE�
�6]C���py�Cp!-8��1��-l��
�6$曌�~8�doBd�C���>Uw���o�����0NHć4������Yg2�mkYv]��7;W@�f��d{�++߱����ճ6U/��_�3+�{0�Ջ��6�hƕ�_��k�gy�LO9!M������,+���@�����%vQM9/c�Á4�
1\�\�3 A�4�����*|��hѢ�i3�������_�E~.���d�H�g�j���i�>U���C�b[!���0`���ҷ-DZ�jN{��#zL\p�OKhѲM�Y�dWM�t��V0����7��w���8�|o��q5��k�<7��
�r
+�A���<�5
�
+�M�%%�1EH����}Bd'�F�OL��{jz6�2b
+���q~w����֠��SCo�u����Q�\�B�
+�'�w�}�o���|���9����h
+1�r�N3�q�W��ӵ��L�t뇖�q��V���<��S�Gw��C�)\GӪ���E�_�*�V�aW�fY��������r�&�[>4l\܂!-��k8��r0䅠o��
�d����N�����9'��F�D��#_�6�z�y��0�傖^�|��s�r�&�<t�Kq�M0��j�ӎ�9'��*w~�E�ƅ��O�,3��jO�ru,0�(�H��M�{1x��t�pvd)��"]��r����ř�s.Y\�#y==ژ&�R�~��/���/�H��
oW[�l���V�y:0��m3��mC���Y�\��ɜg�[��-���l���
+
ίȂ�,�7��ya�ܽ�;b���pɌ�(ʚ�
}�D�㘗y����Ҳ4
�k|�Q؇!�S=��4Ș�$U�]L�x��Ϊ�+)�c�<P�
+yh�H�p� 
���Az��i�vw{-4��ÿ�כ�]�T䕅L;e�y�P��n����`����
+GQ�MB�ז�O_xxdaT
,�X�J+ي����I��i6%~n�e��c�y�+�h3�Fst�ݚ��>�<�dڠon�\3?0�i�ݯ^�)��������k���O_[>�AiB�������6��/oZ&9x���6�٬�9Tt�g�(�*����^�Fg�1J9�B.Mʵ-�Ҧ�#;e�����q��6�F�옖�rb�'��=O���9�<��;B����\�P%���/a
+��	L%�0��20�W�݌�"h����K%pȓ�:��])\;(��Ӯx�\l�6|'����xz�=9%S�U�����
+iuE)I���I�Q��G�_䅘=����Ԕ�{.%��29�\W}au?q�>P-�)ŪpmPN.OS�}u�DZ	�7���9��ѝ�L��KK�{����Jw�����pZ�݋�������qqq�{��T��u
�V�����#��FoU�+�9,!^>����j:�����z��[d�y!�F���m����8��͐e�qr�"8�b-��������'�v� ��Ak->.��B@�
��s|2x�B�*e��`"���\�`�oqf�-��!���7�P��Q�{VnR�	򇭴��@��*�хO��rشLM͵�gy�`���
��;��_xov&�P*ǎ���E�;�tw
�����#]�o�K�y��������A�f�ğ?6��^e1엾��ｼ�E���&�S!��9#��vplX�#C|��F��Z���9��.��>M��ջ�+�Ͽ//W8�Lv��e��ܙ�����A�b���yO,��X�E���a4���at{;�48E+a���^5F�M&d�
+����e�}'����9-Îw�b1잞=�Uq��1�8<������l�^/d��gBR�X��"H
Xu+��*0/=�n�ƣ_`�鱿��M�-��Sh+<��Xc���K
+.fٺ��Q����t��Ń��-�s�����F��i��C_�|,DЧtǡ�;�������'{�{�f��m��!�h�=��8�>l�w,���T��s˲f�n�A!�.-���7�=�{W{p��Y:7t��ei'~������nܯ�2t1a�5�@�����
Ȁ0&��ў��U16�H\�0�
+DB9Ra	�&k\p
+'��0(�QE+�
+8<s;:6|�Je�,�	Oo�	��y�����L@-��j�[T�y���p��&3�{V�����V�2���[Vk�P)��=��=�v~��,V������x�J�����<�@6�1�ϧ@��N)^����}��(;q?�>�Z�\%�Ρ�T�Y�
+��]���N����i`�����Z� D�|����D�ߋ��u���������V�P�L��м;T[�<��d���15<Ӑ��Sx�q,[�[�w�:�V�#�m@�>�]���� �=�c��Z�/�$
�Ӡ��4
m�c��{#�l}:hR5�TP�\�/>���-i��dP�B��+��G��\R� �
+�%A�W�d>I�`���`0@�������_���(/����a�*`f����#�Y�g���|�	�x@xl�c3��K<�����<�I�D`$y1�1��ޱ���:��q^� ��lN���F|T���ƒ�,2�x�S�˛g]ޔ|:���O;5����~����Y{[���,e�+�@��;2���H
+@	[�4���O}"eȡ1��?�
+�ʄal�E���vF	�����
M�T�
΀$��L�:�J��>�
�
�0���1r��=s�gƏ��q
U	<��B#��5-��Z�Q����Mz5��z�Ke��yWHe��tƃ��B�!l0�,{.�����[���NZ^f$mb��"�X�J�c4Ŋ�
�L�����D�"9�^g�'����:g�@ĸG�:y~yֲ�����<�²����|��ǎ�B
+�?7g��M���_\�����M:3sđ�M��������8�2����3s�O͌_�D���f�DY���5-V}�}�OD�sR�$��Jn}+�xY՗,kY�%��L�j�=&G��Z�!7@X��n�_
��)�O@�/9����@Tq��5_�Pၘ�ñZ�3�|մڢP��
q@@��e���yY��k�4�Iy1�T�{=��o�G�|�w��Hn�5��rut�����
ݴ�mY' &F��
;�КE�4��R~���۹��aJ��}rZr��p��Gm;�j��������I��P���%,���fb�5�8��h�+y�D�N*򾫣sO�H�~ʹ�ʭ�@n�SB����E�t����Ȃ�Ν�T�R͛7�p���Q~v��(
�#���
�x<&*��S��~tE)���E��1_.`��4��:�/Ei��0�"D���G�LY�Fe�����P+H
�*m9��|�N�8�w9m���g�f/C������Aw`�F�s�����#M��y(���&q*�˯���d��A.ʉ��27��8�	2=c��2C��r8��ů��ԼQe�W���c2ʔ���1L�~F��b~�&~R䇦��{Ӧ���J6��q�hl}����ό�|�9��i(���
Vѫ�@���D�@�q�����.r��]l{���mV�Bg\9
Ӻ�a��M��-CS�+-h�I��[*�K�P%bl�'Jp���i�eT�׊`g|˂Z#z{
_	P��(�=Y�F�%9�����Y�B��ĝ�h�I�
�H���S�fŠ]�`,��<t�J�oZU=PjJ�8=X?�����l.�J�p����P��=�Q�a����7�80���r�#�Ф�N}n��%��ں���)�a���*}<?�ch�m���3������7-����B�*!�6��E�z�.�:����۲�v
cl����v��ߚ�\8/P�J�:V�R��6^����I ���X�;`⺤��Sf��l(&�%��zrr������ �6nf�|ˏ
�Q��F�N:)�a¸��t��k�2&G��`I���}�j�X	�F5掁\� ���^��9��}(�kg�9R}󓞟'��
P�����
�q$)��9�0nw��Ƶ^pd;N8+y��*��Ge�r
\��Hb��\��L�V�>��g�K!MQӦ��2g�	�iR��%Jf�a�m&D���U{k-�eb��PsL���ѸA�<>�f_7	�S�LIJJZ�r�رcccc+U��?A��ݟ��0���jU�=.��"W����8%���8�Uנcxc�m�I+�em����bb�+�wւ&���:g�,���NY��u0�f��`%6��0�s�$��|кj0��x(�/C_	>oZ]#��d=t|.����V��XPㅠ/<�w���q�6P�z����*Ao>�����+�%�XE*/:��:�uC3T��;_8�N�ˠ��,m��s�NiQ�>I�t� ^��65��b5q鱍�J�,��f_����q���5�$�ݎ�l�ة�+)�o$��v<e�ۊ*imVk�]��j�Hoj���Iw��	�Zf���5OY�ΊG�hCNMm�a�sόREb����)��"���Uh�y8�-����pn�w%geL��5���/
+�.�g�KU�͈�rq�������.2D0�ơ��^Э�y���:�.��٨�ɐ���;b�V0�q�R݇�D0s�����w��4��a�bK�����-J{�(�I����t
.t�̸���_��€�X�
nA�q��J9�"���0�y��
+iU�Vy�׎t�yZz
+�-�����R`��6A����/�%#��7
+?-��q.}B�
+zJ�
;LẀ�cL��$榗1�ש�+�p���ݧ�hՙK�A�g�,N�$m���Oқ��Ø��>���Z�-PZn�p0Ŵkr�c�&xz=MhttRbw

)��Q��,U�̒�z��-�1�9�I�廒
���i
+����]A7�����h�N�(�]G�Ha�q\8�"�&�7�2�I;n��xc�&���2�>��-'Q��Y��KҺ��lp4���H�v���
+����V�G��~��~��+�ZtS�X^|ݪ��[��R�.�%�����=��IS���iKʻ�O�on"����������n��������0�|�k׮?����v���̵�g:�Լ���_����ڛ^U
+�8x=eҕ�cl�a^IYl�{�ķ���7g�,�D�]��+TN��0z@��&�#�YE=��L~3��� �j0�q��k��`LP�C�G�������|4x	�
+�|>��{���A=Ln�GB
�JA߭&��J0��㥜l�:OH��X�{�q��i��xM���R]C��d�l~�(��>�;��;��<��g�r�%G�U`nf�����<����	��Na�Z����F:�t����K�K�̀_�)>֐�`;��ͯXL���7ȮLa�����
XW�?|�l��w���ξ�>��Ba<k2!�Cz̝�:l�2���I,�$�:i�����|��	��!���;U��oT*�*f���K����3ْt�6W�!�OJ\mo�IhU�!-�hy5�̧t��G�L����g�7ٮ|�R0G�l�v��
+��A�a�H��k��˼G<��A��e)z�:���8�0$��NV�_A�AɍM���0-�`۠���4&�H��n�9'�u����&�$����|��A�-W���#�N�oP�ՠ�`=N/�,����#]�H@����?�?C7-����y��%f٤uJE&G�
+��̺-𬍌�Q�X�,
���T�j/��Wh���*4xe�
+��T@��M*B?-�s:l(=�.�����P5�~�
��6�]0[���Wz2��=r�v�Բ
+��k#�S��M���}�Sa���S�"�],���+یe�Q`w�*��x�&�Q@�u~N�I��*�q���v��w�h�wE��.���T4-��Kw�`����[�<{��d�x�?�^�\W@I)�&ߠ-���iUՅ�?0�/�u��c�`�qS7�"����_��/_��9s���	���[W����
����MB�-�N`�(=�P���;)�N1�0}����P�O;�oo�r��LM�آb����k{�C
+���v�y� X	�
��GnZ)��vR��@��*A�炏����8����r��O��|"��r�Y� ���-����mp<T���D@FX�(�BM�&rm 5�y�@Y�T�׳
RsU��	o��\��<�s�f@.��<���Q�0�;Z�'�ӊ=�e�x݋hL�Zb�<��MJ�SXE8�>9~8�fy�㗷�9�%���
+1˧��	�3�mϤ`����M#)��=-ւF�=�J��E��C-AI̵�q/�|���z���اŖI�~�
�ji=��4�o
x��'�
1�c���A�++U��"1t�J�.T��n�����
+�?-q	�Ӏ����͵��,���f'h�����?\�:A�HkC*��rA˧��0�?Ua�t7�À��:G��l����_�_��X/����D��s�C+N�O�
N�?�jJ���	h����5f}pf��msX�� �v0/%ˬ���&#��&Z�2�~���J/�EG��ױƇ�n��=��� .>]��-P�'�]�����O���(}��+yH�;1�um=�&�U&�������L*�>��NrJ���$G�
}@R�.i�0Ef���u�MGOa?Ͽ
+8`��;
�����Bzy)l��_8��B���ay5a�3&^����q]R��\`�AȳZ�9���:vU����g=
Y*
a��s1Z��λ��aP�X�l>~:&<id�Z�� ���Q��V:$�9Њ�rBSMϻ�a���G�<��z6��6�?����$�峬�sk�5o�I��\6?4&|������3s�8�mڡ� �����泟�w��3v��9��^u��_`�>.u�!dS�qBF�ߞR�ʹ�5cOGC�8�g�yкݒ=�*�VKg<�q�Z-�Na?R	`���J��G{+�d��MC�Ut��'Q2D_���y��<�?����<XE��A_P4���|�	�|"��PP�J����v��M�`�#A@����A��A��O8s��5���a"�V<7	m�l>���\��
Q�]�Ļ��5��Tn��z@C���8��K��+�^�����I9�&�;�Q%�M��eR��+��gA�+����Of���c��Y6U�yf��sa�ͦz�I��u����1W�T�j
��Y�Ͳ�3�2�����x��GK��v�+�Jܯ�_V���M�
OL�l?�p�)�^�0��.��M���jz\+�g�`�L

+���j/f%:�.u֌=-C��rIs���%t���c���t
�;�}���Ah�*��L�_0�3��e���P�w�j���P�2)�+���Z'-ou��� ��<GFȒ��G�ϡ�����?����x����9��s>�V*��[H��*��~9�˲YMb�5%T��)�����8�$Ԅ���X����@]iك�)sT�t�6�8��S �팒���T�-����i��N~=�TĴ�[�b�� �P����FX�ߒ\��R!>sv��31�^lL0h0�A�G�k��4d�61� ǰrTCmO� ��3yѿ
+z���x^ks;���_‘C����0��0�T���y:Z|�N)?�wHѽm�$��X>��|uy�@�1�L�\%w�I�j,@�'I���I���'c4rm�b8���)�
n�=��S��U�x/g����^U�oa��x>�-�Px���<��=|������V&r9��`�n�@_{5̉�p���\�o�����oܸ1!!��gϞ���K��ߨQ���ԕ+W�7.66��矿Yt�Y�*�|��`	�t��5#��-߻6^����������ð��YՎg�Y�c�k�v(C;s�l���UZ��vAʼp@�E�_H
<� qU��\���T�#�j0!��z����@!�����ǃ���ǂ�O��
�
�����炶��La�Z���A#�-m�
o���������4B��ݩ �C\!L��U���X,W�*
+�.p��x��1�VO!�)E\ք�v<�鱷{2������]����+;��8Ǚ	�}�g�1�yi�I�b~�H4�z����N�G������6
=�u�e��Xc����<>	���,����0�۳�D{�O���&G��^%}S2;�&E��Ys�D�f3�D���8��h����b
+���ɋ�}h�
��8aE$=W�	i^P2�	2��s�~�w͐w(�t��X>x�B�~�`ܳ��5�$�O�j0��k�\!/��`sp�S-Q`2�W}���ms��8n2�p+�s�|%�Z��9�_s~������i�S#��]g��ri�9$t�M�V��0����2m�9��!�F�kf��5OZ����)�:�D%z���F�;؉3#�g�J}�/���V)��U�� �
+�mkR���/�?�^��6�*�c.ݘ9��`q��}hޭV�0|2_��,�J��Y�σ=XMC)��Ѷ)�c=�ɻ[i�V�����5<�ψ�Ъ��wR#�=I��(��図��?������b����t���8|lί�U��,�8���b5Lm5������܃?�U��"���6��c
+��s�ĝcdr�ଯrr�J��zJE��pf�
+؎�i����r�*吥����%3��X�1��8���sr"��!C�
.[�$�&?�Y�=s���u��ϋ�O+�.d�Z�J�(�3g�[o��U�V�D��_ �V)�lDZ��������Ȁ�aq�＄Vg͜x�M���!��B6�伢��3%�x~>ǿjLm�'��V��7��(�1�f|��f�����톡����*�⩠~�ЬǃW�o�
Z<��b0��������v��4!`��A��B����d��Ll,���%ߍ��p�響S'�@0��{�ڒA,q���SZ	F�$�7��J���6
2��LP	��U�Z8�+�;�i<h+�PE�	0��V�aؚ��a��c�<�]3x.�5:��m�$��Y���']7W�60;li����FӖy�P.31�7��k�J�u�@a5�!#%��O,�"9�δ�����Ϫ�־�F�IHB��S���f���DZ��
E�b�(1�*XD����B*vŮ��J�*�R|�ߺ��|�{�������y��\����g?{�˺����u�²��eyar�`(,#� dL���0	����ҴFQ�-�nг�o����S�'�嵬�:�{������׸"	|$(?�֏�rJr/W�K�\t���M�ן�����L?�;�U�+��ş�
+��s�֌�����]5�m��.�l��
+�"��.
�od���"t4���@�5��$.��\.�YW��rIQi��Ǐύ#|�>���ʸ���
+
Ĩ��
Jz?@�~���$��Q�M���VʾɄ�W�<���o���|Ӛ�=�������"@ۦ�1紀3��c�TJso��\v�aͦ�j�����,��%@à&��#�pD�i�� k
+g�R�y3���v��=��/���j�,P��-ޔW�?j8޵�Ҩ
 ���>u�
�fq�,�_�G*����2.��=T�����ٞq\+��EQ>�gm�\�K�X����<��y�Sux�r'N��'�T��*U-Y���*�����[?�}���^��^�Í��2<�S���}_���ֽ?{���ȏ<��w%�V	��u���Nj���a�ɏ'N{�a��SEݨ����ẵA��j�n�uNI��j�q3����#�S�
�`z�OF_^�~��3���'�
ߝ�w1��'�y����X�k��&��	I�N���A̩�`�����̗B��wu���d*~��p\��?:�(��"sm��>h
f
�'�[��=�%��!E�͌:�Y#�H��Me�?���q�GPblE�>�i��8�_���������Z^$O���9C���#'�X����a��ܮ�kb�I��\
S��N���S�%>hZ1�Ń�Cx��V��o��)m����)��T�<��=x��<������a�! �3�ELa�$����*�P=�װZ���s)d��v��ǀ�a?�o��aQW����S��N��(E$�������͎��Z�!}�3CW2T� c�ž�4���f�����p(�����pg2��?K+�b���X�B�o|e� �\�k�_�A�5�;'G���J�����2�A`%פ%�\Q:��+��#0J:���%,g���2����a��v���hy\��ʾor�A�?�(w�q�\x\p�G�t��y_]p���S�G·Na|��,���h�D�)�e)�GW�7C�E�jOm�cuT����C������zD����3Y{���P�&_����Tj�&<(
dkv�Ի��qb��Hi|A)���b�3�f��Hi�K��r���	\r\��r�[\C���{�i��ܭ����Sc��J��5��ݐ�u�O��OW�u��nZ��=,��4#���9�5�KMlq53�O
��]�11�x��*x����9E{!����S�D�U�	��願�����C)�ᰩ$\����E������:^�����u��[4H���|Y��lB��5P��X�(/��Y�cQ|r
�a0�x���rSH�~
�vN�b`�'0�K:��<����S�~��II	��OJz��\
+�rq���@ޥ�=#�.6U�p	�z\r����V�.
��X۬�#���D��fQ���s�f���CO&��Ҥ�9E������x��vJd�{@C0˘ٕ���A��Q�v>�6���L�s��ޮ\�`f�9�°�\s:넰��o�n�����.>��9��l;Pr�?����ճ?���5�]��
C]۶yu�/��t��u�Q�#C�3��4vn�9�3�sчϱ

+c���������.����DƧ�TM�h�*��«s����>�x^2I[��t4]V2p�>�S
+�Q'�����#uй�~��ߌQ�u���f������e-N����U3Oh��/�"��G#�xe?����	��r�� t/T��+;���ȋ�1��~ta���+zy����G|�w�`�_e��n-ϿB9���@���7$
��@����V�!уO��Ԅ.�9�繞���\
5
+�e6L)nƤ��e-.�l�0������Ҕf�M|���	B����Avi��ٱ�<����M(�+-�x�~;L0]J�_+�k;�n�c�˔q8
�
+tVj�r.�r�N���̨˃r���UKF3��B.[�oj1�
ǝ�5\/]��gH}n�/�P|T�DTft��empp�]g�
䚹���n���Y�4�'��Hw�+��ZI��/�۟l����0Y�Q|�7@�Ƌ�"�������C�Ъ@�C]��V��`fp*��+]G=YjOyY0F�"ܖ;�����؀u��z=�=�m�E��v�n��h�r�7�*�:-D��.IZ�Of�sg'#�J��*��8;ylr+�s�Xg��;9M�3:����<��xXlr7	����t���p�10�
������=0̲R�`���㾖�^?)�,��TeUT�����q�0�b�V�my�<,ml2>H���]7&�̿4�氌�Ɔ�g̲��e  ��E8g΅��i�'�>�'�����`�ycMu>��wT��GF�{W\�n}�ur�'L�?�����6?�Q�M�Y�s&7$���Ќ�O6�Av*��o�?i���yi4:Q�cA,�����S�G�^�.���'��Y��S��NJ�C/Kߓ��{�G����t6��ǯM�:�H���N�2G���\���#3�U�<
�T��$pG�X.�;h
+��_��s$'���fP,��8�B:�\�@0wړf�Y��4���=L�� �gG;�|��pI��b�|���^��*�����6?�Z\�2��t����|��[[�8-��S�,NȽ}B�m�I�p@#Ljy
+h�'�TE��1.�ā�La�ϱU�1@$,gZ��J�4&�\ZnqXF-��r|z�Q�k���K��O)4t��FD��U�b5��W�fHh�)"�C�4jk1i;�EU��`7�G}I5�H`���Qw�R2���!�|z���8�v't;v�ߏ�b�T�h���B����s$}0��p?�ϳ�2��Ks�3���D&B�2�x�G
B[w]p2�@S{��/
���o3 ]����"�K�X�Ng5f�X+�g�"
C�);JKWg��"���*�W�N�)�(�:��Ldh��/�x@+V��`)\�>U�]N��U�#���N2��8��dv����xF��i�#�+��M��#�|Q�4�qe�����ގ�U��̫����„��F!�zFa��N~��ϥ@��5V8��3j�gTB1��{T�����j
+�[�
+�$�TB��\ �ϋcˢ+�KTҷ(�p6=�걱�9�5Vt�M��d
Ģ��U$$��g���g�eC��8��N�\�
3%SB	O@_T!	������z�>������Z�*\	����̂�<�˘�{ɚ�>!�.�b<fz�F��9�����d�׮�q_��nѼ�n�{�HqP��/]��\�>�5Jx���9�>j/�U��,��s�����V|u���&*�q㨨�����I�g��K��I���2�/�Fh5��=YpE$���h|�1
+z>;�0D~�f�I�����8(�����G���������=�������S� ��F_X%���j���QM��`�L(!>��%�B�n���y8ִ)�诲�K�G�:	��r�����>y��p�
#st� % |+�Y#������6���*������1�6^�5��t�t�2+{ӿpU��p}�$�UY�	�.�Mޏ�R
M��c/n�ZW
��R�}l�LK��(�4�zG�෌(:f���P�o����k�����c�[ �U�����?�������"Ƥ+�?��=�1���0���n�k�Q��v�W`T3�â ����#h��[�ځ].�������c�u!�Q�=_{!���U�Ǟ�N���8����j�#�<Њ1��b8:%Fcӷ�2D�W��|�VfA�U�G%�9g�KW��.c���`��/��������F>rY�>�9&S�*�+꺁�P^�4}��2���1n�G�Kn�Lx&��f��4����IFq)'���$շ*
+�H	,��#
�
+��VoP�mh����>�p%�:����U��̮l���)�YF�킔Eu���0�0��%�1��b���oL.���ke�`7�R�B,V���Ǻ�:�au�u��}J]rG�����~���|~�j�>��N�?ub�k���X�5�wm��)m�ai�~�����
����ɃUl�ơ<�1���(=�}.Zի
+<�����0^�z�DE�$���wg��.I_���(�c$��'sE��������4�����Wu��&ゎ�c��gwW��[\�U���)�Ni�tJ��g��y��h(���cq�:G�E�Ά�p6@L\�ӶKn�v����2k��7z0$�.P��u*Ft
�����`ԅ;A�w��ӝs�*��jewu�/q]b������Y�3��T�E,kaᔶ���9E��m�܄�;�M��Aa��Ʋ�������E'����e�.�7>�n��ˎm�P,�gL��‡R^��}t�b�mPq�_�	k�t����v�����M^�Xe<�Q�m���2�s������t��b{e�u�-�E��
q	�<c.h����y�<�F7���/q�%J$y�������]!
�THL���&��u�b
]����ˆ�w�O���Ӷ�EZ�]e�ii+J����2
��1_�~�ç��<�x$���M�z4�A?�S�,�����C�Ъt=�?Vb���JgcjUa�H�M�z���`[=��_���<���`
+�
��T��uy:��t�*2ow�k�����.�X��O�C
+n�wL���됾N黪3�����M����5����\�Ns*��ɣp��)�yy����ҹ���!aW�e��n,6˿\Q�-�t�H2�$�T,5�ʙ���QYÁE�Ri��SHj[D1�C��x�aa'ay@������
+�EJc�H3�Pz0�u#c���A@8�0�aLS �񮧶۷<�=D��԰��M�K�uhs-�
����/�_����o��q�#UJso�h������NȽ���?�m
�y�!M_�==+m��2J�E��6��v��t��{#Ja��r�~�w3>�/v��q�X���t�M
֟�T��(�N�ۮ��o��Dg��&��=+���,T(�8ȑ�gb�Ge
�4�gP�uR�&,��_�ᙱ���у�Kn	���IA��x4���A����{l�dlT�V,ߕ矋U,ͽ�{���Fb�QU)���o��z8���N_.†U:9�$4��|I˭�ڤ�3�Z	��k5�m4uWi�
�.����Gd�V�<�,�R�{�t�p	���>H'�d-�������V�<^ə�hn���M�����<@�>pIz����,0���	���#�_��"���Z2�Nƒ+@�e�VK���<r�_���W�)�Iֲ���<����a3�R0���MB�o�@I����t������g�W^6wت5���j�ŕ�E��V;��Eb�uXc����X
��M�aIO�W�x�Q<+s�����m�Bh�8b��\�n�=���"�ZUr��%X��E��'��`�l똕R^"��wU�}��t5S�*��R��3�l-�<�m���]��ޢr"$vOI�[���{�Q[���)�]�b�&�����ә�S���퓲�
+~s&r]�L쐾�e%/Kgt�����|g�;��|`�-Nr��>��:�V+F���Z'R1�B:�	9]*Z?)��I��U�������c���^P�kb	
/g
IJ�q��g���H�8}�Bs)d\py�3����	_:2s��yFg
�<J�H���_ę�!
+���;*_������Yu���׶��V׶mn*4��O`�|
�7���
�M�4{��4�Z
ݚ���o]XA���>%D�ԅD����Xa�b>��7(����v>-y'NJ�'�p��!�x=ޑ6wܬ�-�7}+��uNGb`� ������Q��-p���hH��9�©
a�x,@䪇bS�ծqW>�1���܋C�~��Эn�`�����is`�����
�u��i[��aZ!%��V�.Q����M�[I��՟������G��Ï��
+�
+㭲�Ѱ``:�l,_mT\Ъֿ�2����
+s����+l�������_Ι�s�ӆ5{
+���K�/����#���g��ٻS�I��š����U)'b���3�<w��YO��C��
+�;P�9��bqu&��*�v�V�œ��笐�'��vI\�Z!�[]��Y�bu���އ�Sz_���#N���`yZ�Z=��"ˏ_����䷸2�ǽ�/����H���[9c!��Ҳ[M{�-.i�������B(9�v!�����"�Z��䝐XTP7sdh��L��c��SI��KF�М^�M#��5��00�H[��_(�y�E�����!#�!ͥ�NZ���:]��Wx�v}����
,*o��1�}2��t)���VrF2P'��2�R	�⊊�ϙ�i�WUzv�OC��1>%���p�T�w!�gL��C�=�r	�p*Z�TӦ��6?J0�a�~U��m�l#��}��&�
+�EA1�s;�4?�!�rDPrɭ���9�K>;�  �[�"�f1�h4�@o����ވѮis@(�^G[bWKq ��rXH��N��h�&�����̃Li���#"�k��Oȹ�j���\)�) ���9EX&�d[F>�d���a�\4�ٯ
+~�*�[��E�z��DNPÕQ
-·�=3g�u9=��%u*�&:���d�K�E�'���)��kp���l@�����{k(��^Ӧ-݄
�y��۟.�^Q+9��&�����z�%�\I7�I��2���O�" ��W�eM�����k|N7�wMa+\��`U�V$*]o/����)�R^X@{ֶ�2z҉�mY�K�����/ϻ��Gf����Y6��-�)xR�~��7]3�	5
3*����q�=
�H�h��MR�U�Q��xT��)�m��֗}��UP�7|`�s���%��/1�j�; y�弞h2�T�(�[�+��Gb5�sXU,�h�)�t�h��7}3f�pW���`���(��^�:�~g9Ə��������d�#�j��f�=�aͦ�S�8��ΛÁ���؃����=_�G�z�CT�y�T���D�����K�uF�S�"�lOp؜��չ��_��V�5�~Յ�s5�P|p	�
+�Șw����ff�6�+2�\Iqe_y�u�?�hi�S�()`��6�E���q��.���8}҇����*mAV��إ��� ����yU:���5g�ώ��Y&S1��G �c:���SQ%��;/�ts���&�;���=z���z0�y�k���Zځ)�M��'��O��?]Iyr�?
Ϩ-kq9���F�i�qac��/�&��C�	u�[��x[p��Ίe�Տ�R�gwy
@-���Db�y��^�d��*f��w�＆e����2�8�"����
+Y�#�s� ��\�Tֶ������y;�m&P�tTV:���@��v�qVnb��Ff�����0<�fl��pYTz�\�O�1
�򞾳�
+։��d�{OY�o;w���
+��I���נ��x5�c���Q,�C.re�Iсn�*t�Qybۋ����#�F�;���࣋|�ִ�1 `:$�⽿G�;�HT��ALpY��1!�E�+=�q��ڵ���F�Z�x���
z��������"y{���'w�S�U�<�� >�m88��}�ey�p���
�\gP�U}�[i�͒�9�'A�-�
C��S!��vS�qA'kp�h"�yd�<���%Ƿ��1��/�W%����`h��NE����!γ��xDVM|���Ξ�/�B�)��\)�jI�E��ê��u��@�����0љLmo�0���vS��p�����"�gwQEm.�f�9)'�![�<k��v��ߩO��9�
{i}̋��b�����X�=�$b:ٷ�B����
+��{b���)��9�9���߮�]s*n�5��"�+��^%�86�o�C�d(~��^��!~h���i�Nʫq�-?������al�c��0�/���Ens`�g�K�ڛ����/<2=)�IC���Tt~�?�x�^W�s�%~c!�(̆3;��C01�g'#AF.8J�������I�1�h*�zQ��9�h]!6�4���N��cl�h�,��ӅG�l�wEq����Y�]�ҮɔvM��.ŔEaU��j�GWx�)l��/�橽?��#�UR�s���Y�x�)��$Fx��0�s.����u||��	NJ������wK��m����ނ5L�?
+p-����k@m�v��ʑ�-��Vc��?>�؏+82>�; tϨ,ͽ�;,�:]��t:��-��:���Ѯ�
+���'V�w��}@F �%�:�������g��E�i����C0��1NEBk
J�#\�/���
��'F��+�#g�D�H�7n��b��P
��v��*Ď��#�+�x/ #?*E*;�I4."ytϥw������x��-1
+HKv����Ml�9�1�f1��_����	bXp��_�Q����L= U�p����9���|��9�ei�Mey�4�^�
��lÚM�o	����;��3S֢t���hy�DAr
ӱ��1[�`�cK�K%�@�M�?�!����ȗ��^��(��.�F�G���v��2����2�>b_F�nݕ��T�
+3˰"��].�ݚ]��� �ϝh[��q�^�K�P�X;Ϫ���k�B�u%R��~J���G8��Y��D��R�n�����Ȭ}���#�U��_��bn��t���\+��b�T�#��im��;�2�<i�?�™S~w�U�֖L/-�3��k���H��QJfT��S������B��,2sT"�TЄXX[P"��N�*���^��rdxF���a
+T\�.9�˭8�"Wº�^�ճL)�A.�P��S��H0q#�c�C��������V�u~F{ue�14��d�#��yI��Ɉ3�ǀH��:9�d�X��.7�\���C��+�F=3�E$�������
���.�?gr��� ���P����b�V>m�gFk2.�:v���.���O��
��KF��5�.?Z�
+��7B�m�|����1�#2&�f�Q��(n`\vIU��a]�,�]��/�y�HU�?�m�x
�
�d�H�t\
6=��3�,�(��Y���k�M'�����+�b�3b����Q]`�1�fW%� W��T�%hx]�����%l����h��w��e\�)����+s��*;<O��pc��k���k���Ը
0k����������wHuP�̥���<!6���@O��g!O\�]]p(��X��EZ���`�A.�,�Q�#���4��qٽ�
 �y����rxF5^
��^���m~�9]�������7<�2"��~�O�\2��{�<������.����Z2���)
@�B�k��ς�w�+����z�KJ�_�t�j^�ɪ��[Lv��H�������*���m�0�6�w��8��ڤ�l��S�0\�#��ՒʻO�!�?[��~�:��z+�EZp�!(���Gm���Q�w؃3GR�d�f�����X��|wXH��������.��tv�٫+����G�l�c�
+_1����a^�=��ǧ�4^��O=��ܵ��v4ZB��)D��}_{!��Q^�'a$3��~�%��Q���/�
+\XF`L��Z�Y|�ҥ���OSVHXN+N�"�w.�e
��m[f��/�N
'3��$��rF�B��(�`��cG����K�71��'Ջ�i�����M
6`�
J5N#�_�~'e�r�ӗ���|�t[%�`y�7�?�3��T�1n23�Դ9�"�;~
+g4&Nn����i?����E+p�ºF1���Bt`.�:��^���6r$�˔�tB	��\6��8���[���6�B���yA*A@N�4���#�謩��qn	���sGU�#����2)��/}���k��c��â�N.�e�V6ӭ��0B-#aX�i��X��Ų1$7}{l�����(�� R�ijh#-�qi��&]Lw0@��ɗ�/{=��;)�qN2��t&��	����AE���ص��ʣ�%���̣A���mV��i�)�����,_��)�Ύn��C��iA�IJ�㽣�|FF��|86�wlv_ڧ�"��7"����
�����H
+Cď�#��OF���䄜���QY#h��:��`:(	���9�_�	�&��I?�*Z��T�*+$�=���*���c��� �Eo,�?W	�[@�>R���cG/c�C��т�N��&�!�M�BJ�y���x��Kz�T˻u�k�9犱�!F׃
+_gB�z*�1̵�F�>�[R���,3K:{_ƊО�E"�J�^�o����F-�!�%��]�A�z�/����Z2�H�Ԟ׻\)fDD���]Q�t�w<�G��ԢTe㏟l:]���)7|�N�R����H,4����?)9 @y�u��fpG�#����8%�����B��[��k/D�?��M_c�+'(b�q/qSM��R�v��.�Q�_�l�.���`6�=1C�HDE�Ե�g���{���M�)�����\j6q��Z��e����,\R�t!�u
G�*'_��ūS�6<Ԍ�r)�7��Gtޓ��x
+�A�6�
+�*W�}�_�w���^
+AL�e߇��| V�X��D�2BF���un��#b��3��t���9���eXf��#gJ���a19
0^9���)�af+[�O�O}�1�r0���&���2������i�N;.�|a��1�����alcE��t��S�m�Z�C-]���7XK�P3�����s
��\����1���观	7:���n�*,��Q�c����7J��;����s���	��}R�1}����X�im�80��C�O�� �5͜y��E���	T+�K�5t�K���0��՟��DF
+̯����:i8��NS�{���xY������c{xѡ�AXjdF��F����u��|h�
�I�bHӗ-����J��M��a�xY0��-:C�9t��խ��c����-�����*�]�U>�x��s&��I7q��f�������sK�����#������1�W�.���Guq(���*
+w�D��Q��G[�0AS�"Z'��&���VT�`��Is2r���`
$*������Õ���E�;���3��77ب\�M��u�\ڀ�v�b/c��_ѵ>�'0��b�
f��X��lvW:�I߸2���-�U�����pԲ���2J����
z�0n�E�O����{?�N�u^��Vw��k�O�V=�ᤞ�i�G���T�xjŘ�iI����Z��‴ݺ7@�V�>�?j
�g�(S��SY�+�Vc�?*���v�D��07�WѰZDݥ���t`��C��Cl#/�(S���1}�j�p
+��O�8L@��%�+74X}Y:ry:�C�,l�	XP�i�x��,�0& ����b�A��'����
gnb�Fg
�JfY�m�gG-�V��CM~�S�5��<{`lD�|x��������~|v���:1�cd���e�������ҵ>/�� o�
��Z��ue ��U��a?�y0�{Y�UH&ȅqm�i���1y��;*s���T�a���3C3��0޸f%O�yaoGe�FGg=�LJ5�:Pj!Xl,��/I*g._Ϳ���+��k@��S�--�C�e�@�S U�q���1�67�q��U�?g�We���|���pU:��t�rC�(�|EqX���aB�`J�L7�P�6�g�G���7~E����-��\i88'��'�="a�!wL83�<�2��SL<���\��Y��W.��b8y��:��	����6t`T����*���.VJ��=�́0����M�y�k�@ێ�9!�.�c���������Q�ѢfG������Vѭg�rt������u��=���[�2NjiIP�{���c���
��-�F�rQ���zZ����J�&���h�x�67;B������
+���BY
̳~��V�_U`�,Wg+7@SX�Ƒ6�ʱМ]A�2���3rW8^m(�P�+e�Ŏ	s_����Z,���(���cUI�D��;���F(��=�x�ק��o��s��*v|G�s��v���D�Q΋#��?�ˍ߭�&i�t�Uz�"���}_{!���U�{.�b��P�ޞ��ϙ��%d1�6{ALcʼn!�uگ�B��!M��9za�q��,}����v�����=���+��LI���#���2^��>#y삤��d�#y�߸9�o�T�=
�+��&S]
ّ��Nj2��eC0h����]/}�e���8r��N�/�h�bf	�<�\�Wm�l���gqXPs��R� �.����
|� �8�T�Qe��
1��s��
+$Y��
��R-��Cc�pxF5��{��a�U�r�����w~���K�c��Zt
��	�,XK.�c*��^B��<���p�f/bE�ө�t
v��;֢��ߡMa3�n�|��0*�Q�KH���(_�3�Ub��*�qi�MoA^�.�Z�F�E|�����[W(T#V�y��B<O:*k6
+��-
%0z �4�Vj?U�Ʀ�͘��Gpd�1
��7J�"I�������WJɥ�3r$Ԋ�	��ˤ8B\�ɦ�qAz����߀xg�Z�Œ�N��6�������Rv�N-O�$2Ҡ��S-��M�0��R�S�==����\:���|G���
���`ىR�JF�.M�7�;8~�}cDfِf/k����so\����Ȥ�J����<����n
�qo����@���RE5;�x����"��>���^�xgTi�Y�R�4;��׳�9�
C�J��a�(b�_�Fu_
.�����*�C˫��:��p�A�Fp���	�%�~��m��o��2�qq'�^!kí��ٓW$v�rbUxX=�\�	����V���i��-`%:��=���7}��^��!~�E���g���^mvㄜ.x��W���c��0m��}�)l�����)��ם6��:�M>d䀀�d8aEZ��XlZ]I���p'R�Yƨf�<=��T�@$���ai;��r�r]�\8���k�h���7♼����T�.E�Ŏ̄�;KsoӼ?-
�#W�:�
0����'�܍�Үamaˊ�ǖ�]��#/��-!�yd]�d?,v���X](L��P8��y�u׎a�?/��򊪎�#�	�t�gy�\D�j���Wo҂�[�J����W�e�7X�R�w#�+�'������h{Ha;8�i���&p\(ѰO�
��)?
+i���wG�6�
�fE�f�zz
����o�w���2P�xBRt~R��fOp�y��P	20)���QIRDY�P��z��m��X
S`F��7OlqEU�#
Gh>h�tfbIJ�"��2�~�:\z���
��`��>K�Q��F\u�#�E�.:(�O��)Z���X�A�юU�d.����fў��#�b��}<�9�X�	�j�f��q�|Ũ�ќF��9�Ψe��a�t"]�}VTv���X�Ưv
+��R�{�;w~X����/�������4/�GE�6����S%ך��j�S(�kWW��p�
+��p�t��uK��Ⴁ
+��;�ݧo�Sl�B�8��Pr�K���s�B��
��m���l�֡�@�i��幭�c}g��/I_�{i�cj��yE�A����Jv��hQ,s���}Qܖ7�k�x&�vlc`c��ĥ�̵�ޑjC�`�Y>m��\y��[^�s�<tu�e���}_{!��Q^�m�o��y�}���{ˤܸN���	��$U��ep�8��YK�
+�E(J5\�C�;%ʳPJ��b�p~o�Q3�J������Y�V�(UD��b�#�C���aF5f
+���2��KW��W���=�%X����J�U�N����E�� q�Pcۼߤ�Sq�-�fa*�� הv�x_�{�S�5�Tɢ�Ձz`����2��r��d@p���g�K�����O��\�׫J3w�c-��
+
�����4B�%��Dš��}�Ud�?:Q��6Ge����WyCU��w*��c���7αF��`Q@����Z^��\x0��F�k�X��
��Ip��c]��פ���+ަc�xj]��yQ�4���ي7H��*�ˑ���s��Z�Z�j�v��=~Dh
+7	�����q�me���S ��LY���5�m�5�B���5x��ϣGh��w8"L�
���:���'ęt
Y:��<��56�館a��C�A����%�?�j5�!MC�@��k�4���tؤ��zɡ�-o)��Ize�����xD`bE�FZ��b\vOH==+킈(v�>����V�ȷz��k�����-��u�Ԍs��n�+��[D�s��8���`��]oM˘��ٻ4�w9�X�}T
����19�D9��Mӄ�[��2e�*v�3\�"��
���.Hj4����p�)�[�������r��hx�n�Ǭ/@���x�)
s���t����^Uم��e��T��)ی�>�.>�t7���~˕�U��E
�����R�����m�a���wj56L��{�Q
����B��C��,l��|*����/Lj�"�.���b$���#��g�Z�C�0>%���fS]�s�h�2�f�@{Lvm�/�$
+�����8�0��U1���@`�
+2����LJfyxQ��8Onv��d@��tl$�q�V�y<���Vi�
+�
+c�F�QU�ס��|tE�k�5��mvm�\l/����H.��DXIPſ��u������ή�P/����������S��%����u�X��:G�0m�=�q�I�1�h�
+Wc1UT9����*���*Ж�q��s���v�U�v�j_>oc{�r�moU�Dz9�}7O��ǻ���L,��"�Y.��d���睚<�b��'��_%B��)Tt�b�_���n��w����Ƙsı0�Ӱ��*Й7��Ϟ�1,��2d�
��G��$�o����҇���`o�GH�l�w��rpt���E�vR��#2��2h�X��;x"���#���!ٍ�.PX�RJޟ�$7E"/�9Aa9��������@2�<=��ɓF���Y�T��������|�`삲�����"�k,z���.�ʙ�����S�ƁA]Չ��G}�k����S�m{erDF��ܷڰ���g2�ƙ�k���V�7K%�hrgõ�1��njw^�1�5���w˽?����L&��O��qe�����`�-<>䎖w���fE �����R�g�
֩~�BG��*{w��;��
	Q����Q��w�P��5��i�o���+�U��;sCa����h
+��%=�������Q?����sLVVVH�.[�/���4l���[�dɿ�����w��z�
+9ÚM���7�-cv�*�ǘ�``���.�[�ɟ��dx�d�Vl����x1;�h����L���G�y���Nb��/���Z�Yg�/�1¥���T
��(|8yD[c�:��Y̼���V319ǀ�
+��&��)&�)l-����5���Ъֿ	ѹ�KE�آB$��k�Q
+�>�I��
+�9��4nF
A��Ȭ����J�N���E�Hา����k�攵��&�m�zJ��ixF�}�Y��pc�u�����h2CR�k�����*��J6l��(gm�R�#�M��aeG]�V[�^˼]aS���<\R��Ʊ�צ�/LjA�k҅P��
��U�����9���S�,�Ϸ�ҷ����Q��z��`r~n�HΘ2��ǀ��7��cE���b���)ϻ(��mf���V��*�L�Mi�Z���
+�C�]p8'Q�EE7\M���u�rxt4o0t!�i#x�@M,0����;/��c��z����s�$��{�]R���O�[<ܑ-#2*%ӽsxF��
+M?5��2���b=�q��9Ӂ�sl-_�'j�����
^�����:n��
+A_&��]0�1��DR@��8�N���`(T��%��0 Z^�R�&�%���Q
^hbp��l��"N�k���-��ډ��@��+��zh�e���j��)y��a�z��{�ޝ�:]�kפ��s#ӌ�/bdv��4��8I����Ƙ�wW�s�]\����گ��u�2��AY��AI����a�^v��s��*��q�N���BdH ~��{�,---))y����=z����?v������c�=��v����8���X��	B�b'�f5��"��m�#�I�D�#�c8<���%��9'Ry�Zkz�2-I���s1qư7<�AJ�����c�(Y�(⬰�p���E������GXl~_�L�(���[�o���SXU,?wA���.P�{�j�QK��[\�Yy@�G�Rlѩ��Q-O�j��ʖ���
[���A���Rqq�$�z���P\�S� �y�c���C�+(��}�� xJ�Ɠ��+����&��`|yc�uצKyRX����$���c��^g����ž�ҙ��JFl.&؋Q���*�k�x��G���#�@	��
�b,���Mwp�H!�7���]uN�����@���:���E0���':���YצK�[�2��v3bՔ��M�iX���_1
+Y�{�����͠Ò�7.��iC�>^Jy�y�K��i������c=��/8�f^w��O�u���s,��۩hy�>ׄ�
i�2C]�\1z��+c�}Ο�>t؅�x"'�9�ŋ��o�S��7^�f#S�TH���G���x�#_8�q�y�k�^Ӌ܍��/\mJ�qG��xr�����\3�i����Ɵ#��,��Dh�9�"�Ȅ�^�ﮔ�A��+�E�m�Qo��8���ԡFp��oê\���4��7��iI��P�/�$ڭ��G��Ѕk�����4��ˤ�����ӻY[�F(L/R������qq���9%Qgm.#�O��ɿ�U:%H�>�r3��e��Y���_��O#0�
�v�%�,���I�
+J^��$��^����y������o~s���������4}��������kh�i�PQ(��J&�>�{Y�+�c���37�·�a��/�`O�l���1���_�#`n�(��"�R^t������������PpY����ld�bW
��Ħ�V�,t�'���\���:��k�E�2�=��MJ~ߌA`B����בu������?V��7��5�
I�\p�'!������g�����@J�lvߒ���,��kGğp�Y��q��F����6(���?�e���P
+^�P�]���*��! ��r�&
4�%w^��Ls��<��uL_s���lS籺`
+�]��w��ࣂޏ�8;ƞ���W�x&�rAR[,hv�e�G��
o�5_��-INp��I@��Ap����Ԥ/\d�p	gsO��>;�IF���g��KlCm�g��צ蓼�V

Qr����l��7U>��Ux�/=�X[�bj�����+kT�>���L�?��s�$/G&s��8�[[�/p<�K�����72T�ey-ĭ��_�g'#�K*h���˵���e�1��0JG
+��#�g�I�v�T��x���?,����7ٷq<��v��xX"�5�:"�5�F_x���΍9K�p�+W�M���g�\l��i��}ѳ|���^N�#6�T���\Ns<��ǝ{��"�@mm
+�"C}qFnۛ�ʓ]ƒ��Z��s��_����09j��'/���#�
0��o����S˧_i��ۤH�-�ǩIEQ�}���v= �\���\(�#vZ�
+![�EYi47�H��Td�N�5���~#�QSi����z��[3�=�ȅW}�����m۶}�٧��r�	tP�޽����O_�w��\q�C�C�8��hd�؇��0"��a���Z�t�`f1��<�8��KX�����:v�d|2��W+[�[
߀�Q��2��H6y�������RZ�Y�-���cS����-V�%�^<a�r3Hy蛼b��4�Z�oFZ�;yXE�o�Q>&kਬ���ˤ�3��.�,�i>��i��X�ꯘ��CKs���I�܌蚃�J�bf���~������}��;����P���X��;_��U���T�<	�3)����K��I2:k��W�fF�j���\��}v2}ARs|r�
�C�!cN�i���K��XZ�H)]�.g�:8�H�]��Ƨ��4'��o��7gқ@��3"+&��iv���Ι�``�{PRd5�wBr7T�d��I�S�~�'U��Nq�#8��2�d��*��U��:��u�g�X�MSL�i��HL��Lk�P���x�����G��ֿ��8�	��f�S1��U_�<����e��cb-7Jr�[;�.�l�'�
��D��kʻ��t��<>�yN��:���J<���g�@/��E㍮�5O�ө��vm{}����h�'����l��
+j�,�dP�o<ϕ�8n��5��6,�$Ľ�й�>���B�a�rX"��ya17�0��XN�0#V���V����VK��G�8���Y\'�̛＜K�+=���M!q) sr��NB�
p�\��#oPV���g����\i4T&�Zi��p������C)��;'Ì���d-Wx׆g�|�%�3\A��!k�P��	�o��wL׮���2���e5WRv����=���)D^�}_�wB�+�s���O��_�r�7�[������1>@��ho<W2,�1I��``0AFe�d`���θ�l�AL�*J���
Wܯ]~	nOW&�`
��uazƪ�4�;�Dju�Q�b-�|������v�J�1�L�����
+2<M�L�����}�J���P��vU��oǯ_Ԗz��;2�tt��	9]��0A�Oe�?i�����=���#U��'XT�����R�"�0�0�{�iӏ(��b��ÿ*Z�|�7�5	s�B�<�ˇ���U+�l��"�-O���f����i��O��ދ9#�פ�sr���d*�J��"q1Z�޲7e�@/��`�g��Z�b��+���ay.�I���I��o6r}�,
����d߄�?�IFq�)���m���V�?+�D�,MFG3̰x�<q� ���<,,=�ђQYC��ڨ�������H+�����<���%!�ShP]��g��;t�N˳�j�4�H��@>�u�r�����j��|j\v	����Mޱ�
�J�u)�؋d������0��c��9x�֙y:�H����9�����p��Lo�&"��=�d
+�KLf���z���zmS�šz�T��Β�$���"��~�A,|��m�HÕC���,�@>��HW��gq$��ϩP�J��$��u�J��}�Jv�u[ݭ�BN�k���ZO����]�@��/M���KO2�tK;��^"n�]#)�rI:]m��=���sC$P���̸�v+ߢ�0N…�Z�7�uH��{i>eyf
��ul�s^z���E�m��sē�lrľ��ʸ��~�����y/D�����C�t�B~S��4��,�b���f/ܯ"��:�������
+p}��Ҝ<��T͝P�s9�Ѣ��7���1���(���V��2�L�=Fȷ'�\K���N1b�*�s��C�z]��M4�	�����X�nwV�F�]�^5�tQT�v��E�0�����#2*&�<C������
|����������������T�؎�u�0/Z����0�S��Q���b�m���Xo.�M�"Mns w82s�S�dM_�Z馋ӗG�穏In:-y�q�muY:C�Hu[{�

s�%����:���^�S�v��
+8���A��R�
+�<=yD��>��K���€`gh���%���F�+��<�{����_�1}���Î�t�Z��5#��ӭ.�s~豨�/m���'V��QU�{3�6.���YO*1�X��"��`�jH�m���L���D�럴G��X�e]z.ȿ赊�'[(��1:�	��0�a�8N�i���S��<-y�.83X\��k:q<\`œc�
�\��a��g,E�(֪`�p�)Wp�dH��;g@h�n�7����{}4����˓:�U񜛸�\�.��Z��<�>�����|��r�8c��w�J�bvId�2>��-����p��۸9��bE�GsԜ�o��.���M�mi�b�i��:��۾�H���uZ��V�t�#��ɲ�`��Y׷�B˺�\si��O{0Ԟ�-��Y���J��#������ŵ�O�|�4hXGA�R��e��\q;�����GV)T`�,�枳��}��������
+.i��&�-A*�.J27��
�D����s�*�>����#�Y�5�
+�[!�{����\��������wT�g5<�YT�����la4B��?��Q��#���|%���R�R��h0װ�*����[x������T!ȕ���/?Or
w�h����Ȩ���% ��=PX���խ�c��C�+[�IU��Đ��5�a�����W����i
+q�B�Bz1����2��~�hima�ڶ��b���6cL�3�mӚ�փ����(�-&�iºD��N��$#/H&��T���:>��o����%e`��%ð��}>��RhӇ^n�=�2�[��9h�������.��Xw)Nr'�"p2>6�kC�ԗz��rI�ʉI7�
+����9!�zJro�&S�7n	�Wϗr�.C��&ܡJ�������S>��h�3�����ؑl�"D���xt,r\v/��#z�g�^��WNiפ��I��…�
+��.r-첼�����Ϣ7'��9���2��;�~h�g��7y��:��A����ia~��
S>.��4å	�[q�WZ����t�۬1����<g�K�?6�����^�+V0��\��t�c85��ѡ�b@N\�,�F��
��0��Ջ9t
+>�BR7=��}����g�ρv��y
+�]j�z�屌���fЧ^���Mm~������ �<W�q_֓��.^�
+�[R��k�u������`%7��,�
+t�<����w�	i�bu�dI�b"T���s��JY�M�;��;���"=�O�9��G�����2�d�.	/�OP�ֽ>n/D������<�dvxP��|�3��&X���l�<
+���9��bT�2�Y푆k���ȿ�_C���?
+�|�x�(/���E��٭\��Z����^W�j�+�3���M�e=:�-Ӡ������е>FQ$&����r�5�7+�a�r��A�����1��6��ɦ�K hEi�-�7h/oJso���1Y�e��+_���%�?/��\��yb�+������
�\r�!:`⛿���}+��vY���c�eLu�*-L�qW��C`�9�zz�ةI�c�1�R�?
�	N]��='�#�u'�R�%�o�Yf��n̲l���?�2����+�{�R,�ͷ�ZV]�>�ȕ/Hj8[<1)>?�<+y�#�#��|���n�� ��{��M�n�L����+�:��c��׎Ȝ�
<�*��)�G�vOPՌ��ܺ�Ju�F80�g���҅y c�f�LȽ=z�M�(�\XP����6�OEժ�1�Q��/����c�?��,��z�D�Q��~t����8/)?%���?9鍧q\r]� �{rE���N�➫�a�i:�\��i�+��A�<��h!����;�wև��t��>�����
0���c�@���hOm#��f��i'�h�x�q�����0Y�D�H�����\J6�&�:h��2�;���h��[$Y���L3޼[�Ac��la�JH��	�*��C��žCȷ{}~"�qd@o��i,6J�u�mjF��V�SB�^Xf�l�!_����jsx���C�3��>K��z
+�-t
Ҟ�ύ
�y_^����?VY��b}�/#�V�,H79�{��;}��{����/g͚5~�x���g����͛�G}Ǹq�fΜy��z��2�cϏ��?�h��f�_��!��c��>�+˻�r+0�*��K��ll�~� �ENW=�w'��dE�~����.�9�	����ʪR;Q�\	#;�߱N�};������ˉ%
+c�?)�W����T���S(�D���ƿ��d�Q��V����\�qL�ƂQ�i��D�f�J#2�dx�Q�)����U����0��굅-]"pt֐�ܛa��,ϐ8�.��Y-�:�@u�^�67W��Q��q<XB1�Ϲ�·���{h)��)����O���Q��d(6��d06�=9:錅97{R�stL�n
++
$]���e蔾�
�
*�������1���5��@m�hOL�i�C|D����B�􍳓\Ga9�0Y��[r	�pa�����<��Ы�&�*��a�H���]��9�z34���Ϋ
+SQ��2��ʢx2y�9a�
m6mT�(p�������"Q��E�.i�ڶ9x,QE:�kU�?��{)�k_����C���=q���WN.8�fg$�#c���s��t���u{fA��5-�<�S��y�$X3�}br�q~Ruz��lQwL�b{��i/62h�I�6o���9�]�S�G9oԻ��
��r�h=���j9�xK���z��u�.��r�ST���&�L��,m����=�{��G\�X���G ���B`³���;΍�����9��ދ����:^H�S2Y^_�N��K��/�K�bgJ�r�|[lbnfLzg�=����U&��>�	e()xoK��0�z{���Bs�F��s��P��L?�R$_�W;��E$�F�q�z�C�����Z���";~��{�,--M��?/����կ_�֭[|@޿������&�*���}"ng%s
+��]0p��Qr�GåBC_7V�:m㏼�
+;�s�J���j��q5��l~x�
0S�쿊��]��
+�M+p��V�Ҕߨ��Q(\~�N���sf[^�a/�Ug�#�̎`�ڕ+7)�s��>�;7�%��Fe�T��?
Ϙ7t=YG�Nlљ����*������l*.
����I��pҩ��
+��I�n���w�����0+�a�+Z��ˋT�fB��
�9ݡ��y�^'��i-h[0GU�b�6�_��������K*;�s���7p��O���p,�Y�0ރP�"/�q'�a�I���Ĥ{[
���\8S����&������,B(�	h�>��k�8��ENL����*��u�-
��()���
�B1���j�4Z�QG;H��z@��c�?8.�~���������a(����JČ=:���-l��
�
+2����GN�qZ�#��e�[�6
"'�]���`��g�?:k��o�
+�G�{����������{�Ҙ'%%�'w��qx�ÀS�8^��/&&�R@v�4��XcL��=I�~�i���I�����K��
�G��\����2w�R@Ȧq&�B)����41�z��q��#�>��;���8�՜uȄ2��#<�o������"��m,K�~�s�v��_�BJ:`߅�Erڳ�o2��������o���w�*�=����vȋ���
+��������id�_+?��@د~���F�W�-)`��*�m������K��?q���'�w�ƺ��~���7��������C��w��}�����O~hU�k���	�Dc
�6�Q���a��V���kpさn��je�W/�����%�
+Ĕ�^g%I,���k��-�;���{C(`�r�.6\��7�鼛_R�1��+�o�4Z79\�L�,ƿ�^g��xS�‰*�LZ��4��
�	��C
&U#�A����҉-��#ۮm����;���e�;��
+C�&�Q�怲�����I�u�&�唶MU���/'׶m��(��BciL����gT:�X��s���ϋ?j��\��?O�ı''��6@!�8�xn2�d�"I^UiC�(��>�g�Q�J�����z�g��n3
>���?&�9HJ�U�$c�2�����c�[aL�qBZ1��'��_�'��)P�~�8}������@
+�‰'��z��Mv�A��Y�C��SQ��5{
+��5p��DpXƔ�ֿ1����Z�Zv?:�q�|�	9w�����a���8���P3�G�Mpoo\�����<�\5k����	D�E�\pP$e-G�'yR�(OG����t�3Ѻ�
+m���[P��*[r�ц
+.��z��smY�w�_�+�
+��������s���n�}i6n�ћ�/}�G*Nw�E����2�p\u���%��"��M���=Od��	�Z
�|����-�����]}�Oߜp_�����{�?���C�Y���w��:<�.i�s�����n���X��}������eg�P�/D5�ã��2�	~��&�q���s���� .��xZ��7�yr5�In���6+q~��^%��-i���&oA�g���MQ��V��
-	#�
�"�v�����C�"��Q��jօ��h���	�^�9�3*k舌
+�X��2��4�X���#�I�4~
�Re��oԺ���s�*DV9#�^�R�:αߥx�/\F�[���T"�NF��fpI��:�ByjKU.6��
+�\�9������@Wa�^.i�0�ѡ��2賓‡"��ȣ�F`�A��6m�gT��c��V����F����-��>���Aȋ�>L.8�?g�#6�8V�<Ϋ�Zܻit�P	2L���.ͽ�s����\���Mj����,�Bhއ���<

93|Z��QI'���L
��1���Ƀ��L��sJ��\�5|�Ɣ��Z�sAK�0�œ�c��H?%����a�|�7�)�Q�B�9_X��ߓ��In)8���dnO��� �ɽ*�ZM�O
�vpڵ+T�(�r�{Dr�8iC�=?"c�Ǜjj�Q6)����+��P�����
�Y��o�e�W��IXyU�#��Z\^��UѺ�ϊW�մiǟ8��י��Z���?��r�+2�h�����|�i�64:�<P����
L1υ��k���<�)Z���Z��j*^���Lɩ}��/����Ή�8_2��~�	��m�5����"��a
R��D/{��H��3���zݢ`�5…��Y�\
$��@��ʀ�	�8\���@ꛚ/|����GfE��i�oi��oí�≸
�fh�
+F$�S���������0���d�n�:G�҆��1{E��:a�V�~���UZ(��TQ��n/�ߡmwVZ_I=�[�@k���7�?h>�+_l�]�7y�:H�<�|m��?�%�e�s�LJ���S��:E�f�6�^��/�C�¡�v�����(��ó0�`�֗�
�ۯ��,#����;�����@�/�m��Vɞ�c����T�|���Θ�3%�:G���+������.g۱j2MK��UW�������z)f�����|��2�+j�4Z�`�NN�<ˍ����h���XW�K���IQ����Ç6{���eȌg��kt��,��m (�v�� ��9�.�2hN�#*[�g!�#��G�i�He��9n�
+[�@�!�^���8�jZ�����8��aj@"�:!)b���t?1���! �)��������� ��|b���V�bcy��
$�d�+����{P!l)�����-|K��Ӓ�;0D��4�/�&7��ő����	�=p�V���AF�l�]N	�*��ŝ��_DWJm;c��	O����EǣK�tO1�8�����U�<q\v	=B�j��.<܏�V����>����oX?����B?gpӷA�������O�n����Gk��^*Z!;���Ad���t8�$7������8)���vh��]�P$�-���R�{_��3�����:��[�ڕ㼢���y|��6��}���
��e��2��i��6Ձb6]��am|���]�nN�b:����f�%���</:{�����Pa�)������R\�;
+>����c����\�qWN

y��c����I�0�O��팙i,�EE�ܽ����Z)Z(|����޸��a���k��2����y���N˟��g@2��И�N�ٸ��t�����̀���e���]~�yp�
�<*>gu���*8[�aO!������?��
+]y��R��Ϩ���!W`�U�j��i��o1㰰��c�sT�H�6��p�!M_�4�>V��j�<�d&��z_�5X�8�ܨ�NK���v�@E!�v��㼂���]f�ց�,\��jG�K�C5)6��YL�1/����R��Z��x�~;$����8��<���E'q����9�p�=�~|N�����ֿ���̀�Li�YSX�L�^������-Pغ������T��cU��z@R���c���
+��	��]�c��VÒhl>(٣�2�����/}�AS�L��I�
���O�m�
Qf�;�$��\�ߴ����M�
���XbM�¾9oZ��S���='}\r'���d$P�0���d����r�
+��d���n�&��퓉@6����k������[�+�iz�!�sã!"1����~��i	���_�5lt����iL{��-�x��v�
��kL
n�^i��5��pQ�e��QB$������Y�&��i�?�t,^������`�����:��J��ZA�.vx��R�l���Ǒ�)0� ��o�S@ځ����S+�r6����M\�1�;!y���3,�\L�����(�z�$�J���ڹs��+������/�P��s�9�A����H����n�
+3�Kҗ��CqM:ݡ�pd�4:
�"ERB�m������&!�Z5�scr�e:{��99)���Io�A��26�Ȍgn��Z�<�+�)nm��Rxc=�%}8�ߝCC1ȥ#��?%�8�k:u�H�V��l����-����J5B����
++�]��m�?o���u�ɮQ��>��g{�s.�����C�Ъ �X��|8� &x�4��!^��o�YSX8.���d�=��.ӭ�;z���X�qF��3g�L�cGA��P�
�@�R�'�Bz����E��"�(�2���;�u��|��3G����ge=y���.׾������)���R�=�	��)�z�9���S�P^b�݆��{g�`G$��'m��i�V�(1,��K�r3�lp�:�Fz�_YwI�wH�ʱD�[���I��L[;�b�F�TGMFʑ��i�A�}�
+�rz�e�2�y�|,�X���q���@?w2����*��ŘO�uQN�ч��ĀcR�
���'k���n�if4��8���������A3T��A�UZ�ro�@��{��V�4�%��d{o5�̴�7����h�r�0w��Nx��y�Q�Vc,�l�Uh�s[�@|k�9�33fC
�)W��b�M"�~l�j����b5�^��?������;�UЏ]"��X���S��9���L�[&(�M�����r%I�	A��x�[�B�x��J��VT��I���h›�%����+��I�'����W'����I3��<jL�`�8:5�N�oAaf
��J��E�>�im?2����r6��'x������&���/��߂�B�cM%�&>���� 4���>ն��� ����K'�����	�h(�89V|������E�y�=s�N�3����_�r�����)�Dz�>el�����M�p�'a�<��J��PM�|'���K�䶐7��2�S��2���9O����<��9���@���Q{mh�O��I������D��*hX��v���c�(m��{��y�<��L����-��>&��|�Q\
�h�#U&�]�i�9f'��E-������["���"5nϙ�C+�#���c���'���q��B�?�G�G��lI�+��ozk	��E�����ăXo,UaFc�
���1;��{�O[@�o㷜�w�:�*��̰Jo�P�/�� `A,�c�3�tK'3"����
"?�UK��Q$&	�
6q+X]M1̸:�9��rβ��������JZn� ĹX���
+��ۂe��c+�<:u-\�k<�ƝG����bl�'��]���a�^��2�h5�	�?�Q<
+"tpvj�\�$Z���k��=��J����[�եdr�{]��"B�3߱KJYUx����|�$o��w�bPILh�������.I�zM�!�V;��5�r(s����C"V��:�+��NW�G	!�^&չ)tź*��������D��î�9W�N^7�t"=gs�ȑ�a�zj+G�5_�D��9> ��e�	��)�g�u*�����#�~��
A��%9������Ĝ�\/q��f<�b��n���?��]֤�g_I\ˠ卲m�d��Ѥ����5�M^�2�XO،�t�K��>�9�V�Nr�)=���ԍ
��\�JGC�#����"&���+b��֒�����3N]��*�Ȥ���a��d�.g���f�B�#T���b��44ĴT�#M�?����W������%����=	3QZ�����":������F)��,���=HgY
`�]�
Y�y$��˰y&|خ�\߈S\�^^~ �l��ii�TW:��3s��X@ĉ@��������t9g;58�P�O�ц&�⮲�ߥ��ϩ�C��_�t�ut{'�LvS*`_iݵTo�d!��S}�"�?�*AbA��+l��h�iӈ�ك׎�x��Z]��kT�������S)���1���Hz�<ġ ��;H���שb�7�&Ti9`�����6�Ƈ3`�ƥ�����vg�a�,2#M�Ŝj��h��Yh~�Ǯ�����ү?(��`���;Ѳ�~K]p��>n�!���#$�Ih,��)�/��4weݥ��W��|��'�u
�ɷF����@P���UbW��
+�VE�n
4��߀��DB���5��dl�A�'�ٗ�����W��Gx��b��%��9K��c�#���7v�PNq�|/�9EP��5��]���q�6wcI���+0 ^��q�Z.��p	�K��
�H���m�:���F9-x]h8�&�*��JOa��,V����ŋlc�m�z�ST$�‹�b���sɌ4��*�3 �3���EɁ�iYx8vT�C��8�O��;e'�3��KSR�r|g�૘�Ix7s�T6�g1�JU��'����1HɖkyB$/�=#�bض[=�_�=�3{��X�D��{��z����v��ɈǪv:�Ķ�����^��� �[��i��r~N����\F���H�6�-Z�dL8٪=⃸Ft7&�Y�m8�����Z�$
+�77#�8c���i�C'�p$�P{$aa�W�[pJQ��ceG�t���\�Ql�M���}I��NK�!�}�������|]a�.��8�歰&���y@�~&�R��N����
���Ln���/>���L��\��\(�� ��{�����^b�,�2��d�O:]������kD7��ܴ.�cd%�րO�V�	�n���.asz�y��\��d��dM��k\t�Ԙ��Z�
g �M��
��<���
$59*n<1)�զജ?�� ���ki��,	�(E��͚���fq���*kԡ�S�L�`�(�b
+Pg�u,�t塸7,�"����\ΩM���<�>Fx����3-�v3��5D/.��B��
+�q���,x�у7��2�5�x��&|����L���U�t..�n
�`��Jp��x ��Q���޼>�s6�)��*Ж����y���Ah��湂g^��6�ϱW}�^_�*�B,�5ʕ�1t��1�����uW;9�Nh,ׄg0e܌�5g��ҴuZ�<bv5>�ꮔ�^��N����<��8F)c�{��rt
�&��e4cnZ�ܴ��<2i:#-n
+���:����9�oN�X�fp��ߕ�\ ������ �J���

@��0���H�t��W4��#4#��u�~�����T�b�F|��qn�S�<h1���=~��Ɣ;|�� y�}&Bo�F�7%*Ҙ��HE�9ޠ���E�RbC��Z�4z��<����;���K��d�f��.R��f,$|�g�5����F,`g@9�%it��p�
|�0��v��X��ޭ�Z�먎F��Gbx�>�_ӥ-�����V.5i<��󊽉�y��?�xB�ȗ��R����W��3{���pT#���V�V�Mp޼z��i/�y3<(c�SO"�������U��_�q"
�q��X�'���;���1&u( 5:e4��Br��Js���T��I)�넊�>"i�+WK|y
+(#B�v|���;Dl5$R
+D�:����T����Y�7�R
�f���acM�ŭ:���D����R�,����\Ѭi������Y��ʔ��v�8<i,T�%�+D1�Ʋ�U��S���E���}�
+	0��3'TkD��ȑT�2���ª��rKE���
:��4#Ϩ@uam�S��2��zGI�H�������tLg�#�<=妮�#zWQ�1o�R^�$Rs���	s���������hX�ӌ���5n���a�Z�E�%N!&HT��jLȉJs�NU������
C���,.��K��q��.��b�1\E
fL~nUt�h�p��)����L]J�%cʱ$L#�����`�TZ?DRnq����'T��>���,��Z=N�����r�R���I|6���ƴ�ت����f3|��<�Mn�~�
+��͡7B���t�,Q�ʹ����^�o++�(��<F+�z����(5�q~�Nǭ���;#�C䗋�&���Lz&���ಣ�n��r
+��G��.�q*靡X+�L��w���]����X���
+�u��3K�Ο?fɛڶ�q[�} :���D#�8Z]�C#��N�/U���:Wa<��\+!���Z3t��.jfr*'�jCs���L�����9��S��g�k3b>�6S��.l4�_{1$�
rr�p��T;yL�$��		�M{�PY1�y�H��i�rV���-1	��R�{d�tˀ:c��	��6<��?!��(2J'`X0�3�
DC�
+b�~���r�L�z'njI"��T�ukg����Ώ����1��.b��j�b��ob�U�R�K1M�'z��O?�t"2���J�`�:if
��V��ne���RB��@g�%�IƂA�rp���I�W���mO���N�f�<Q	�,D�&�UQ���(G&O�N���D%�&n�WZ@�O��W��)/V��l8���e� lʬ��uU��9)cp�����D:ݥ�@`b���bz2y�Q�̩8L^���P��a 5�i�ki�n�Z�e"���3{%�|й���ٓ�(��A��b�L�)g]rW��W�b�tl� ;���Sm`&�a�=�~7��J�|M�o��1�AD	��fmO<��]��J\��t'�0N`�V�?�����K3F���������e�Ȥ���L%K2�L�`��c�֙�%�䢜�U��eDҜ�T� 
+�V������c
+ӛ�7����+�9�(�(qe#�%Ma%b���5��uѽ�;�s�#��0��W�������l��V�kn��ʖt�1-oB���i��<��m4�\Z�����W-����`�Pˇ9��iW�a��%^h�0`���1t�%�H/3�׬�7A��![��fs�@$ǻ4��(����y�/Ff�������v<r��r�y"f@mU��Z�4Ha�Fخ7]-��ބ׭ �.���W܌����3��l�=-�~$���ښ�o�ܸn@��;��q��.̑@�w
+H#鐂�Hz�˲���'�к�����	���ZUۅ��$1�/�:�r��_
+��NW���Rq
�ɫ��կ��Y��1�#��ܴ.��z������w$t.9�q�{W�F1㧢��i�*N�L�P��m���n�C� Že�4R��;,dC��cJ`��,���6ٷ��d�w+��d5�Ȏ�}��P�f�*S%p}�'���+�D�ֲ��`ci��q�qw���5"i6�1��_����?�a�n�`D_���ܴn@d~zk����qt.Gb���((̓�
+ʟ���u��R���Q3.��~�zMml/�J�����\l�[�6tf�v��(A�yu����T�
��O����S]@̝02��=�dt�a��B��U�
�n
�`���6��!�U�1��kׇ�=��cK9���Lg�D~��,Ӥ�fTzG��v��W�>'D+�_��b�	���O4�E���:��|��e�]D����>K12�<��#V�	/�|���%@p�\�*kt��Rvz�w�0E1�j��G���M�-˘NiF�ڹt���.�p0/�w��zN�mE�׎o�~�U��ɐ�����4uA��y
+Q�m��A��I���%kzТ���6{{�ɘ��
������{�[����;�� ~�
�!tR Y"���2#���0ʔ<��l	^H����y^,@G���
=�S	cjc��a­a�
+xg>��7h�H�
+�j~Ã	K����k�i��9�R��<��E�����qt}(���QS
+<��ƒ�/�˝��u	h�����$��@$�*�Gb�ȕ���J>��.&����,��Bd�S}�"�?����w	A4��+W.
^��'OPmcL(�4

X�F��Wy�
+�S�SG-�����M$����Z�a�5����o��^139��`��>���`����ȫK�4����.e�����<�D��6k�Q�^�8Öa�
�B�kI\2ɇ�����3}��#��1�;�4��$��~W�KKˌ�<�'X*��~"�z�,��r��:�cR�;/��Nv�nTݪ��2�v˒��
�:z�=T��!�D�O��O�I`������xsk3�e�ZZkf�Q��8�S)��q��n�3c*����T�}��+ʝ`�8��2���馥+��إF�k�AVm���,,�qW�
+�H�}5f�QsUxB�i�Ą�+7�~���{�*�6쬻�#r¤T�QB�!U�:(q#��jc)U}J;s�t
�M�X1^��Vf\H�J�oh�d������*28{�`��h[n���N^�����c!ꤺ�G�s?�viq�5��h��K�t��Ŭ�Q��gC��jn*�?섐���n�h��{:�y|�����D��u�U����1���I� >E-��$�"���*z����V
ۜ�ͳڡsj��ELk-���%?��0"�k��?h���qϘY�$�ᷪ����)t�Ů
-yF3�YL�Y��(	�i�u@��0m��18�����kR��큄�~
+~뒓>�읃ZGݔ�n�CqG5��z(f�D�3k"���2_�t�)�Z���k��+F]�^Hg���ܶOFi������wy<1����i]MI�u�'D�o�C����(X R�7^��ʇ��ؖ��Ӂ>��W�!�E�ۧ
�5X�,#�fTi>��%U��[��Q�Ē�\Dp���y�o�'�/���,��"7c(���)�	ϔ~k1W�ggY��I�v���:�\����.�xG�'��9����6�C�cA�k@�0\Œ��y�� ��m��'�(��jsŕ@�S
Vn�����Q�&�1	gt�h���C	!ߊ���a�m�Ku%�8��H�,_�[�1�D%�}T�����d-�|*�M���50_b����-Œt�F!Wq���X+�s*qf~c*�����PW����pN���0����TM��ANt�(�(�
���u����WV�����I��o�kEL��\���kS�={ڗǔf��.7�G�W���Rf�9�pc
+�<˘����0J�J1r!~LS+�:WLP����Q��/:s8����,���m�������ʙ6N��	�b�&]���j}�rNj�Rw
�]�,�6]n�2�
+�K�<a [���̌j1�����G����E��o,i�c9K����QU92��c�R
+g�M8���%�#ƥ�z�t�.>~ ʚ5J���䢕����`#��#ѡ| �wu�Sׅ�<W����K���[LJ��~?�A���2q��8Ef�5m��*��I���5�x�H�`2B��T	v���C	K
PQ/�NFq��\��s0��lb��2O'8�iL+����ʣ���n�iy���X)��^�E��@�1G�hyܻ9��=,.t�mI�2�vL
]�����}����S}�"�?ދ��3sӺM9�<'���5��!��l�ۜQW\����`���@c�rR�6�J.�լ͛P�n<��B@s\Z/Ё����3��^�N9jҢ��:�r�KJ�"����f�]0��r90b�ap9�5�UX�:�}D>��6Q�|�S�ů�N��kT�	����`vI��2sR�Z*�Nju�Ѵ��G%O�����6�5M�p�I`qLꈸp7g7����ZS��)��/B�O
Y\YiFlu �������t���
+;���t#�ɛr��P��P�t7�����ke���cQ�7<,����N�����޺r��[�5����Ҟ�7���E�h}���!eiS�}�8��Т�>��O��]a��0�`�6L��cd����k΁����$c�+�k�pØ)�DŽoJ�����r=���ŗ�4���:$>���c�p)!Řu3&u�CK�:I�tߨ��ө2^1�\Zd�f���e��5�� s�6֘��W��I��L�jd㸝�r��-�/'�5�j[�
-e8��`�!s{�R6�t@�Ϧ���$k��;��<�W�.�+�$����3IJ�ӏ2�%Fg���N�"�Gϕ��w�2���������f4�D]���𒒻i ��n
�𼮚��iF��	��{���M��3L�3L�!tV��SW?�*<Q?
�!"��$e����D��u"O�t��7'���BT.Y���w����.�)h%���%#
+e9�1��џ� -�e�����p����:����hy���#���\�m��k�Q�RQ"�@C��_�E��"�=�C�©�Ъ��\rb%�bM؍�"NT�ζ�j�������	\f�l����5䓜�p��
+��W�����NUT����7#qM$��W�<�J�KS�p�������)<>�q�%r�u=c���4���&]�����s�|`�s:.��fFႬ�_Yѹ��xwE�I�� V��t\��1�o|��js�v+%f���hv��%7��i��Ŵp�	<�A�J6����%�l��@������>Ɍݟ�/�)�<���NP?�V�pV!Vpq]!OĴ���$��ȱ$�S����2f6�P��u���Z4)fG7+�i�viAo��{isZ#��R�`"�(�r��1�҆���hje�o�.2�m��aB1��u�0B;A)��]���
+�`oUڦ�a��
+�Z0W�0G]v�����N��/�n��������QI�!z�$�tMn�8<1Ԋ�]1��S�So��
k�`�m������
+4�BH�"H��͇cA�NПc������M��¾���yf��t`�\�֢�(���_*���aBgq�9�Akȇ-�v{w�C���)���+��)�S�y+� �16�J���w�1W-C�a-Q�@�u%��^�y���=i�f��U)��2�n]n
+�
�z�e"dž!���a	-�Qׅ6�$̪�yFڗ�_:Эt(�%#�s2$n
+�G����&P{w�*�ir'ц`�v֪��K��o�j����3����X�n���㸤oAI��-���
{���xEwm�h%��}�K�_p�^�b16��M�ϽM)�*|�E�e�C�n[��b��ԗ�x;Yv�UuO��c��o��v�̙�7����8�n�bŊ����Z�j�z����Ϗ�"7�cؙ�#�f3��<fRr��q|�(M�]37��vm�|�
j
+9��I*(ܒ���c�r�	Uoe%��CbF�F9��ԑbxt �m�
+1#Ɠ�1b%5.#dc3�^Vz�ϋ�Ҧ?d)��v
�{<asT���!�o�>^�$sJ��1�H�h�a��{I�f$+��.�?�
+;1��3��|E+�#t!���D�b�Yą
+�<���� �E����1��Pm#q�UڽC�;�j�I��Ċڛ'�����s�+�|�]n	�G�z�xWɩ"����v��93������c�U��3:��n�1e��Ũ�}���q��x����wu�鲉v�(	`�b?�6`�Vb�`r�o>u�^�|z�I����*PL5�����\�i_f�"`bB~%]f2���~��X�FļGisF��1HB՟9�p��9�+�~�]�/,��
�ַ̛�gDy��7�.ٖ��O�����]�����t��w�
崸FNUUV��7�������~s�%'�Y���ٴ�5�v��0xQ� H�)�v�i�b%p�r�z!љ�ZB��G���	���9O�4C�I�-��I�B��a���
��-�E��d
�0���sh��f�_���0^�9+�Nvb���2yiRP����60mZل�<_�v��
+�{3���s�/q��q�rJ�c��l[i��:9_�l�m��pƚW$W�)����1>�u�5^�RbI��e�l��n�3����NAg�$D���T_?8D�3���;���7o���3gΜ��zk�������뮻RRR��ꪥK���7���Ъ��
U����|F��*�L��hX�yi�	�T�	E��;t��#���یH�C���Xw_q��s2
�ѩ� ]Q�z_�3�K��L9�ª�I|���j�Ǩ��;J�,���Z�G���%�)�%9��6����y�R%T���}�cm׷<3n�X{���v0O[���Y�]TÌ�L&N_!@�D�����rE��G��}��nQu��XҞ�Fš�]-�#��A|���RDsP����N�0bS`�Ҍ-�&�l��fU��X�i�9]
P�$mƤ��ޤg����T�ŵo|śh�X��IK+�@\��K�a�1�d�b$u�_k�<�����խ�k���c-$�R@�u�Y4���k��|�ܛCo�]�+�(�÷D˹��
M,.,�=���*܆U��$_T��Ұʂ����E����R��.ex��z'Nx�O��q�؏ϳK�����V �w⿪t�w��b.
LX��v���L�q�ʨr��*���%��V��%:s@����Sx��M|���'\��42r[1̶�A13��@_�"zA��C��֖1�r\�T��
�������V��V���g�+h��2JFq�&X�
E����!t�#"�M��(�/�u�ա�	���C;��|R��W��o}.Э7��W���M�����*�XH��Y'<���x�>���jF)mEHf��{��^2��0T\&���㲠��F�~t����b�3���#�����@[��I�g�ATb���1vc����{��z	��ƛ��1&s�l���Z+	��3���u��]�p���#G��7�e˖���t�?���
�4wh�%L4�&�(�7
>����DZ�c+�:8;�K�z���J4��Q�S"�W,�2��ݸ��j��b�
+3G(Wgs���X�S��w�!��V~Yl<]��f�Io0�c�_J��ĵ
+��úF����lt�"���`Ft��>7�uY�䱶*9|��}��N�|�����x��[���R�
+��{p�4�h��26M)=�9EG�!������x��J���<����N2�/)�䅘k9s�����R����i%ʯ�JΉ*���Ld�3��
1�Y`�����f�����:V;j��C�,UP"P�)�>��
9��3յ�|cbKW����tj�8��n��
+���N嵡�*��7�n����G7��0I+i��P�N��S�X�>qI����ᓑ�,F��cu
)���N���|�y^��}�axn9ء�������1�s1��1��.+�E���>���5��+	j5�pG(f\�0�Eܖ�V��ļ�۴�Z������R2l�;���/�4��ߚ?��yI�Rh�-U��1	~�♇99��/JO�Tȓ%��[&��!&ݫ�xe���A�h-���Ў
����1������L������� Z����ބ�qrn
���ZM�����{uh��p�/
+].F��z4a#G�`�4&��k�����+�@Mc��|Z��B�}�L��qx ���b��Ax4�ϵ$C��bu��Q��+�)}&Ů/�I�����!5S�4�#Q��{Ȍ
���8L�N��y�Q����N���ha	=�[�I0��hŕU��si�ʍ�$D���T_?8D��C�∂h�)/I�I}Eq�c�#�L��*O
��*�5"+�_�Iq�̉�^�%�%�,PlX���SG�e��rKvrḴ^�jaF`N�����r�9Lv�ω.�a���j����VRN�c!c�BD6����Iop{8ۀ��y/Hn�	�da|z�27��N)GMR�R��ll;	�B��(���5����-�%ʂ����avp�¸ ���#�@ i.Ӑ�#��5�$���/W�5��@�2_��u�MSx����	�����N��(A�&~�H<"�YÐ��\��F!4�:՜6b��x��_N�Cp���x�s7Q���1{�4�����Gć��0�sQ�*rsa뼔�L��N
+5��r>wIPR?�h{��S5;=��.��Y��\Ț�����GF���4��26�N�re�7�-�����,�F�
+�R��qG�Ə�3��<���(ʘ˝���c)?�gڂ\L�Kɗ��଒���UO
njn��>U�NJT�Gk������h=e�}�2���k�G�$���v���Ab2X�Z&M͌c��U�B_���a�M�s9�wl��m6-��^��O��x����
���䆟�L�p��K[�������wZD2ՂB&!��!������$=H�2��)��U�PK�%NC�)t�Ѽ�N��u��)�4�#��p�z�?���s{�`>r3�7�R�XSc-0�Z����
+�V�Ю�ƽFL������8�f���r�CH��e�<���3�?)�7��)�����t
+�y9L�.:������o-_#�|�B���?�Tf>�\�3�`DV�ׁdA�g�֮6��b7�nH�"<
+/��N�����Wy��rL�0�u_?��VЍ��T�|N�r��I53����r9�Y\��g+�^'
+V��87U�����&.��&"iZg����E�Dʸ�K�������*�?`%�VZDzZ+{��h
ST�11��p�潼�Ut���G-ס��i�r'U�o��L��W?Q��FhD�	���1��J|�)���yQ��dX�Y��0&��Q����`�u'��,
q�1�&
+��D:���1J.iQ��'�z��Y����T�~kJ��"/�f+��̉�Y��hpe��r�%
˷Ӟ��V�h��8�*��-�'!a���~��(� xl�����|1'7S+���CD���G�Ɩ4o�p�vRH�F�|��&�׉
+,��[��P���א��3b~�����Ne�jN�ʖ��ׄg�A����Cbv�B�>~�,]�4s��m�8�p&;z2ag��e�o�A ��/x)�����A/��xn	���O'�u!��S��E�15�v����9����g��qs���d��vSF���4�EA
o���tc�djX"�a�z-��
o	/^��>���.	W5#���p���
+�J�Ӏu�S���]Hw��=���;�>�W�/@�=��aǕ�4n�2��t���,Ռ�b����C���	��ft�
8F*�`Vi0��K(834B7ŕ��򖍙4�U-4Ey�!Z�ʒ^O��W�I�(鐹]z�[4&A:I�\~���~<y����;^v�e]t����燾���C��?mF��:�o&���W*�,�z��Ě����x�È���3�p1I���:����x�0��(���Ě�P��qi=�g4)��4??�%q���Q�g��sR�_9����ܴ��&G�Ըtt�cFڐ�+��'Ѓ7h#d�TNv4�0�dvb�J��M���ʾG��ˀ�cxK�6fx�^�������Y��Et��9�Lr&��2#V�1���R�A�0�Hss��3h�c}�H~U��bL���b��1�}��a�KT���&������!��ylj�~�t2��B���LK�i������Lm��^b(rs��N�y �4#s5��H��$�a�8B7:�D�E��A�yR�K���&vϻ�8�*�Ydz�Pt
q�U>�
+s�q~�O��{Ul��wT��
+��e��γ�*Y�/#�uEͽ&�C����K�>��+����2-3�����!��lG��D=8!}���+i�������f��%�q�ߕ��n�&����ځ�O�����/�ߩ���D<US�z�g�1	~M��ޱB���\n!w�l�<1n�(ϊa��=�#1m�=�3[d��!�7�M~��\g$Ŝ�&n���y���:����͡�i��E��7o]��sfr�0J�Z�����k�3���"��7���s�RU�!N#�MFYB��r�ӷ���� ���@x0ꖮs���I5�Y�s�S}|3z�J�ʛ���㺩P��C<�̏hu}w����o#ۀ�?xd�}��q��-)�vH�׳o��¯�N��؎�r��I�2b�jV���dG�K�wy���͑(Yv�,D^s��D�r�-\pA�޽ǎ;�o~~���>?�hݤ�6Iڈ���	U�&$t��,��^I�˱�"����>!$�'J҅+�b^3���_W\��ª�����j���Ě�>?�uA�f���_�EA�g��5�N..������4WmfW�'F+���ʃ�K��H��3‡VZ�%Ц�
+��E�h�N�o
'W`x�`�T��%�a	�|׹��O/5q`�+;\p-^�9�P�1oRk+1麊$�Ia�61Z�F!�grS��vL9��@C� :�h�$=Mb�܀1Qb�q������
�������8�ڱc���2�����B�b�+���4�$��E5�*�ۣ���ⅈ���v��cf�2{�F�hhF&��RB�|��v��9��ġ��Y��|����0��wE��/�&16����
Ð���P�Ц�R���u.�P��{N��,]��ƙ���Gh=�/�	d��PZ�{�ޅ4ia�*V�AgC�[�woEb����0r�m_v>楸�F�Mt��ⵃ�:D�yZ6��X�˔z�r�&�9E�Y�������K��"/�P����1�C�N�	��=��ax����*���<̮Q�u�$�GrQ���!s��$�I�V��Uk�\}��]՛�=�gɌ>O\Wq]#��A����u�~wexW�n�K������m�_�0�۲I� �"�[
�0�*�9�ψW'*��/��v'�x5"5���a�s�=Gp&���C���1��ݹ����-W& ׊�rp3,�fv#|��"P�U&Q�2a:qD�]Yվz��yS�-y�܎+'tX?����O#������	�hk؉rE[i���:�z�\��!211�w������V-�q��DI��]<O�8<R�Ҡ�-L�9?�U秷��G$�j!ż�v�#�LqvJ!_�T��}����}qwǤ�P��Ě��~nP�k������̳����eփ�%5�(������	$z�"n��ܸ�:ؕ��b��0 �Q=��\"1����WK)�q�U�A���=Ϫl�qdAY�|̽\!�ȕ��4w+s��-f9~����r�nZ��&�~g8�\������K��%ASȊ/��3���Y��}�>�
�gZ]�m9�{/����x/W|��?��0� �}|�S˞�T"�N�ʙ'�w�$n�xpm5FXq*��|��-qM�XƲXY����&6NV)��2�9��i������a�!��gJ��S��{�2?�/^w�)<,fր(jُ��dw��E�	��>���̸_��3դZR>�Ef�$�;��T:ʉ���j��Y�ډ�l�N��f��	3�03���[�CB'�5��L�
�({n]'Sy9�+�&H'�3ᏄA�Ѱb��*���x�x�8�����bE�H�
 gМP���Q`nYA��9)�`�j��G-qb|��Uz��ٗ����H��쮌,.-Z�c�:�Fp�������Zn�kxRW�\��.\�Mɫ�����	�n�W�Go
+ݕH�_���_~�mo��Q�aJ<;zg�H+��8��"U�d���߫�z��ϥxׄi[o>f�3�h&���a���w#�j�Ǟ���
��9�vI�hUg��.c�
�,���&
X��dK����z�O��i��{��[Yr.����L�����Y�X�iq��IB䲫O���������g������'R�;\�ф)̄ed2%A"P�d�I����QKú�i�М���
~W�V�l���u.�6:u��M�]}ƹaBջ
+3^i��s�
+�@�ִs�*F����φH�	ª6��	t���}�d�c�Hz#���%!��ٛ��xub��S�S������E��&���Y�g]j��@Sc�͘,޼�,��9Q|����qT�g�����1l\�)�O]c.���cf
+S�l�B��WjJ5���x-�!R4?��D�z�b�	���u�-VB�"KA�j&��[�
+>	{�R�	k���L���kAt��:x@��)=J��k�|>z�{�WX�n�S�����(Y�4���m�p7A�hɷ�L5���E*]�tO�l1b
�C�#�kر��TڤYԡ������׽�H;�8��g'��V�O��Q6���y�1���(�j�ܼ��]}���b&_*����~Gt
۸[ӦY�����X�-��v&CDpќ�7;�'�4c*f_�*�3���<�V�icW�"j�������8|nZ��Io�@d��1��7��xpd�_v3�x:��ȼ�c�=�l��$���Xz��;�l��kģ5!�Tx븇�23cә:I���	��µ��ӧ��C���Ѐ?������	.��\I�"P���R����}��ЊF�Z�t��}ip�7�b��)�R*���O�}�2Bx�P��߉�b�3�ۦE���<}X�z�����oi��#N"&ƃ^ �,�Y~�/�0+��|ڵRL��<x��k?�~��0���V��/4�w�O��X��Y����PJ@ob	l9u��:uꤦ�r�Ν;��_}���U�V��寽��?���a
+?+V����K���6m�����|���?���v1����@Oq�:�7bGD�t
svlꠜ���<�K�_�y^Sj���Ѕ��E�
g�$䧷�~Ι"B�L�Il8>�Q����G�.q��2c[�u�&��\���2�
G�t\Z/՘���c7�pt��b�2q^�8/'%W���F�A���"Q��1=yaƕ�N�p�Sbzt�]��"�ls�7� >)Ka���`��r��U��\���<�2Z$<d�m�`֛��yD����ݗ�{"^�hұ����a�^�wMhq_��{f`sD>y��hB��3���˵�Fʳv.#�l���Z��ڨur���q�7UU
񙭷��K��s뙿�;��T\E;d�H��ߕ�KG�hg�o��y���w,v��{��/�
�	Z��⁄��®��1�@I`H{O�p���x��E�<��V�2�S��%v(��VuGx��c��/6#����9�]nI�&	+��Xo���pZ���`穨�s/��4�NX��I.uA%�e�8%�k'_\cr�%�Njv�Gq~�:Z2�B'����!tVq��Ҁ��o�S
+���*��"ͼZi	�����帠���)�!�1���hJ��Ը�N�j���;}K9-�@����%�����u��CV���w�[Ð߆���	|lr��;B1tsx��E=���ܟ��B�OGm��V�ڍ�q%,�/&ޯi�Nr�W��U>k�:�U��o�rHg[q��W	�]oM-
�c�G^��e[�=��r&��e�g
+�+���wb�5c��<�ɇٿY]�����kG4�Ȼ��'�����*nP.��*�h��~Q�{�|����S}�$Ddee����?A�1cʕ+7nܸ��{�k��������~?XY�t�^�??��l?��
�0[�9��OoKl���qL���O�i}u6�@�d��	��Ը��V����\�N.��i��(������7���k�S@�9��(.9���)g����9���f�4L��o�U�T�ߧ֮�y��:���bQ���V~Y	�]�Ep7
��a`n�����r0T؁k�Pȣ��{$R�o0 2G��1���[�*U���bVYb~,	��b�=�D��E���-��@,��l\�`�q�|)9�]^�u*޵Y�L-b��C[�:�%$iF��zs���Y�s��\�#��v�UU��iu`Ao��s9�Ԟ���L}`?\�,T�y�.�,
k���Z��M�-fͷT��-э6q��H���҂Y�:J���������YiIk��f���rW�|o��QCh�?pK�G��r��}�QQ9BE墇��9�F˭_��9�t�j	$�i;�ٌy" ���5�E|��F<���Ҟ�'�~p6��9NP�́Q�% ����%���i���ܺ��@x�^�L��@��Ѫ'2�����z�b�_�7�B��(����e�%����(7�+~��˩4��J�r�:��UZ�WyN+*��)9��6>�	��׉Y8�^�
�-N0ʜ��5���v�%¥���	�'vc%���Nh.ڊX�qi���Z4�m���B�[�+7�>4���9Ø^��8Ս�#��x}�ޑ��
�Ek�R?�OL+�ڋ�Y:@Ōu�+���*6JK��cΦ��^�O7� ����p2�#�1�1
+�����eۈV�|F�*l�Ҿ��>h:qn�&�_�&+�F&�p��+v�tw@��>o��siO�-�,D^q����@���_|q�f�����>JHHx����^@��E]t����^�zϞ=�����;��C+I�l��LT���k�q\�^D�X��(+�˘$�:
+�1�5����S�NW"��ª��<�ZH���ª��z%5.+�xp�������*"{$�����������Z�`^f<TP�9�$��%o�$7�����-��+�N�����'��� ˳����l�����U������F��T��0���izj�.]g6u/#5�*�c�,��Д�e�P{�f�骉�T������!%]�ʜ�V�R�8�[u�c��|�Iܕ�p�1A7�^�%̻'a�=	���R�o���L�EPc�+ss)�%n�0�c1� L:�߸�3��~��3�V�|�R���V(�y?x�X��J��F���Sa]�·x.�7
cm��*;+ǕP�g
1��Ē*��:�0n�<FXd�{�C���J��s*,p�2�0�w���q�{pB��S1h��1� m�mGN(���D�٪%�]�h0�%��I����ߖ��n��R
;`6`eHע�aK��rS���P������*-fN
N\'�ɘt��ѡ��ܤJ�����|�k��i�& ӊ��,�h�p�7�x��U������E������H��4�roer�J�1�L�+
+#����B+{�	�3k��_"x7.�$\}mx��wK�K�.\Kh	h���q-�+��KWCt���,+�"���~��A�!$��K��A%�h;A'm��l��@_����}b�.�0D��J��@�k�U��1i�L��%��VW@�ע����^�e�rL�ï��Mxo���k�s�hU���x���I/ɫ�,D^~��S��#G��~��%%%' �֭��(��P�š5k��wl?&��D�;�<2�M�wĒ*I:>�I0�9�����M4��0�–(�ֳ�ƕ�}3�����Ob�9?��@D�L��.�޴����S
T�U\�@p�yat�H�]��i��:�I	By��Sj��Oo����t�p�ZN�z���c�;&a���
+�dYe����k�<��������1I
JL��!�ϙLj���m�Jd��l�g��P����w2�P�a���ۺ'u6S�qBU��El�v�`p,��R�X
+Lw���+��+�w���I�Sh�L�=��p�
��%�8TQ��#"���T�4H�2RP�Fm3�)��4�i+fw����E��],��a���<V�Ŭ�[��4�����Ͻd�b�;E���~����촏��R�p�1�hD�3Md��C0��h��Zd�^j�u����*\ˋ�mJ�S��F�R]�~��o6Dz��cj���Д�y:��ݺ��* l�#���x��)F�����.Nz�A̯K�y���2�dz�J	��+��SL�Z�'��z䧷e��J����vj��"��72i6�1_�cG�f��x���
���a�j~z+�'RA&����|�B_�q�-/���)'�J���Ω,���yX����_��M_��E�%��աٕ�i�-���Rz�T�'�nwWf)��6���F*To����(�N��zY�_ߺף�[����<��kHi���h:A�y����X�4�*��k�`�Ȃ��#��f��#�=�;GY���U�	alNJA[��=�%1(q��ףb��-���T�2C�7���B�IB仗���T r׮]��`��\z�O=���(�iԨ�СC��wl?�h�|�p}�����Z"v�&�ɼ�T�7U�f'椌a:g�����|b�?1[���煂*���ۗĥ�)g��M�y	�qQ��8�k�~J횄�x�s��{ڬ��:�֯9��z]ޗԸbb�?Ti������5�<G8�e���]c&���ѩ#�\�#��ӈ� ,���J�Ͳh1#��@�8��d;�����&����9��c�sQ�iNK�N0�[K7�a-*�R2Az��E5�ߚ��a%Q�X{�Zb@�u������U>�l�0��:�h��Ct�|,Ɲa��������<g������D�M�(�6�|��n+i�k1=�/�ݨ���c`��^�z�$�>G>���bй����_��*�{'��Eu19`���[�F�; ��Y*�v����M�e>y��cQ��[ð��G��j�=XG�bu���%F��j'�I+�=�hg9&�f)N4_�
�D%��t����C0��$,p�?=ejk+Yh{q�HXDG4�놞DR
���a�4�
��eoy��ʳ缗������q�m�x����kZn}[$Y�L�1%8�^B!���gkG��F�ɔ�����G"&&Oe�����:�v���M�����7�.�8�@r���)��N)�~����6�<�T7&„�w2��}.�Ty:?���.�u���Eȣ�{�6�b��jl�5�{��3�߾�
����K•�kBڊ?	�mO��0}�$,�/�~f>[�&W���:O��0�?�c�4����&<t&�K"
+�Y\M̠�
��씰�����8�?�D�lV)��1k�Y4M�۹��&�R�_�XJ�,�E��<�Ǻ��t�ԑ�0��)����S����ˬ9I��_���������-�?"_xᅌ��ƍ���w���|����?������I�S:2i:�y��]�b�ª��u!�S
+M?#�,��LaF�����w"���FA��yi���`_~zK&���Us�^=	��S�:{r��V~���_�\�CN&N>�'�߷.	|Ȭ['��S�du0�i�����-�NJ�i�
+3b���z�6�ć������!w5?m�������K�+Ϋ)�A덋{UxLl�Q�$W*4��0~#u�8[�����/0��8�>э�#���1��a��׆JY���D���PLTE,)J��^,aK�0�o��s�ǎ�M+�2
+��EĜ�N`"��q�*;�5�
�G$��utT�<��4=N�޸i�.y�:\g��%��Ŵ�W��\	�~d-�&G��{������ce[C�',� �(`�-᥻�T>�z/�
�
�ӱ��m"P�Џ`�X�v=+Lw�)D"�9�\��t={kzsxQ�˽٥,����{���E
g�
���Љ����:�ɷ��B�KÝ� NHE����:���
{Nݝ�g&��z`�-���pƷ���2e���b��y�i��1=�}>Ī���2��E��Q�u�vNye�l���24&&�e�|�zߴ�+M=�rQ�z��*����al����72��
�J�t��
Q��>ƀX�W���ț{�Ɛ�:����sEz��Wi��A���ꉟ��p5��Y��i�e�B���d�Z�L�1p
#���UBl��u.���0�7&h��:��gF�<�����J�*56	���a-�cW��"����HN�S�M�{%���,j�
9y�~���˸`^n��L"Q�M~"3/�E��Mz�'(y#�z�0�d��KO���Yh�����~g�ah%��ʄ+��;(`��LJ�wC+.�-�v+>-�F��$�1��`*9��ZB9�q�Y�	��K^�Y�T��LUNſ&�uAq�k�]T�f�t�OBQ�[y���s�۩�&>ЌL��L�_�ũ���Ըj\�����Q%�8�֯��3�F&�Ft���h�&ھXZ.�����u�xf� 0�������L,��1�u�S�ߛBwk��r�S@�Vq�5.�]�v6r~l�k�Rƒ��Y��	W�Dg�p�j�'��ٱ��J ?���٦��|��y\��jyQ��s�e��,�ω-�,/�r�8޿��;LXיb
&T��n���(y)
l����  `tԉ^��R��D�v��������ԍy��n��m1�j0��2�E���̙�MVFǫ
+%ߓ0�V�!d����@�k�s[�=��0��Gx�6Q�h1
6Y0Q����h<�g�����Y\���u;����9m�H�7�~͋7rMxV�۸��(I;r3Q�7aA�=�9y�p�%�W�?�@Rh�6�	�[yd��g��|�=�s���]j9M%u�I#�f��m�8����Y2����
+�4�͙��ލ�	�	:��7�+2�Kj\��ɿ��M`2j�\Ʉ-��pB�F��V�G����3��E��Ŗ�@_�uc�D���;�ʼnj��\G���02yjZ�Ѩ��:]ß4�cQ ������rzV;�k\��I����¶��⠉\Pl�(�ZЏ�j�(���p� �׵������f`��p��1�)�S�O����Xz�Ø�<cY	��>�KF-�9���K"�\�b1?R���d;���w�}�#ʼ=��\lzL�q}�*0e�I��=��$!򝿜��Ǔ����$ov����y���g<�u�&��m��D�b/]����!���D½�T���u�+��E��f<hV�ig�r$������=���5\e��>���z��a���E��_8g�u��+p�$��Y�q�w-�~��d���Ty�c��ȋGpf;�)�c�T:����Db��ݹ�H��uK"�	B�R�s�;f��
����3"�p��o?�je^�����$<|B��\Q�7+�1�E���
q	3��N6�n
+]	!�S��"�hȝ��a$���_@Ӊ��%��x�*��,�\W�}Μ��N\n�r��_ĵr0/�cOy��+�'����魔�>7�.Ά(\�[�$k�G򖷔0���hs칲�K�y!H!x���/�)@�}����t�I3�Û��̖��#ɒ��^<����z�_�7�'�����Ĩ��vyd����1q����.�B�B$N�`�iy��ߏ��������a"�:�i<%~������&�� �1t��h�:���>Wa���g�<gϐg��87�����i�
�*3^y�w��ȪѸL�<9*��yL�{�2��T\A{2q�7�;�r_������hb��(�^���T�����[�LI��x�C{�L���7uƬ�j��u�|�O9'����C+�+F�5�b�8�{kq:�R�d<��;%��2<�X�"4a|�q��18��O�7c�{i�k�ڌ�ژku�LP�f��rf�2x_��8&)�C�%�& ���c+`h1hG%O��n��D:��5fb�3�hI���\��&R�X�%̍[x�@.ʃ+��soP�؎��)Vo�|��r-�r�`��*,�99���:S��}ⴚ�2�o�h/eD�쓄�%>��IB����W�X�����s�������ZV�����|��k���W����[�q�ر��c~T?���Js	o�6f2J�p�GA�f�U�ω/1qwH�_�*���4��Œ�� ��:_$�[O1��֮:���ɵ~1�\�W��oA@�@���Nb(��S���O�ɵ.�U��.��[c�'��7�d�VL>�g�X����<
dVi1�Mt�ͷ\;N�xGc��T��o�҈c�힄����P��^�w9�)���,�[��p�1�@�	�qi����v��ݑP0e���gFA̋���ޏ#��=��
=����u�3�JX��T7�pW�B��Ѿ*<�խ|��
���S�#���6g��5IXq�Q-S�����z�YOs:KI;��L�qi=�����5h�ܴnX�!�N�����1���]�����螶�Kok���,�q9�˨0h�pde�9��������<wTdQL�_��G�
+���Ow{(�=��,�ob7Ev3y�Y"��L��7��D��'��h�A:7���>���zp3����'b�.���f�;B�DwH&x�$*
+��Kn
+YW���^�`�������`����J�~�bx�?���皼k�3��b����s�ZW���~�?è2n� ��|)����Uk�����%��C��f�vv2n$�`Q�[��]�i�y��T뗄�	N9�l��/Λu~`�L�yɔ��}�� #�$Ӂ��L�)�ϲ�@98q��"]������{��p��{4㖁����������̋�<M�b�}k*x璁�NЪ�w�?�����Z������֎�jc�_��8��
(�o�����{y.+e��L�J���"��ru����e4b
+��b$#ڧ$��8	޾7ė��B):�\Y� �ֳ���r������8$ujg������B�]�XZ^aWvr�IB��?�����"���y���޽{׬Y�"�G����?`�����c�ڵ�>��]w�������QF�ˢxkd�t0��)�����|*� Ȑ�p��MB<�	�P�g</f�L���ɵ~ŗ+-~�7 �O��8��Pe�vT��G����t��g������]r'T���^\��i�$�f�OCn���M��sP�M��0��7WnjsZ�#��`��g<N�Bc攜ؘd���p)�ۈ1�~bo�Dgؽa裭å��k�3Xi�*���"��.t�3�9�a�
�Z���+���|錱�>��0� ���w?��N%����B�{f��;R�
���z`�-3��~mh�BB�!�m7͋֬v�:
+�zT�,;���J����h��ڂ����r�|>����UzK�D\YM���\���=ʖU��Ν���W�A��q~�V�K �1yi�����4��
+V���p����o2Ů(���Hz����J줅-:I�K�N��8�:	cK�R�a���`���7��j�
��Zјb!�K�X?�'aG�4��GF���R�X����,
Kks��7��˩���1])
����#�	wE_(c*&��xM��tǸ�2��N����7�[JǼv�H��M�L1�YH��a9�?�,��]<��q��
�O��#�Ŕڵ��2}��S���W3bR����92���LN�]��̩I��ub��O;;���b2��qi=��i�T`B�rfs
P���)nU)�QӼ�6�A��E��]�k'���r�&�,J��)M�����*�n�(�� fĄ�}�"�a�n3���+Fݱcr�LR�k�mۧt^�[g�B�S
+iFj1hm�C�Q`=e&hl�~��cwQ#O�9���'���9q���9�`P���Aw
����P���4Զ�F/�˨��/ȌR鹮��{��Bܹ���bݴ,LTn�J�v^'O@�?����U�VիW��3����شi�^x�_�~�;w���.����������?�ao���Q]��X��\������1A%�Ȑ�I�:�S��C�&���7�~O�@f�v9�Z�Q�%�j��	μf2�$��|Z�(�-�q�Ě��,��0�T�z��,ô�+-���1�	-
><d"J��R���s��Qw*�5��������DJ܂e�B�0�="���R;e�+����8�M��	k�δ��y�+]��ZJ�#-%}@cE�NZ��…n�������>������z�3�����i�\Q�.T��$bя� �pA����sKx����@��ܗ�K�d1���c�	�8��$��Y��+wN�
+Ol$�]$h!�LUy��M�c����G��\�Lv���W<�	F��ń�"�[�t��ɵ.���CbLl5����mQ��B\t̾��By����'��
�*���+�����Gb��>��ЁF�.��i8��И���!��~�gB�	O��bU����"xO�	����h!z
+�R�������a<n�Ÿ����;m��֯6�K_.q[����K2/]�(�����nYuC/�/!��8 ^:�"`A('�M<���������|��,�R#�7�������P�P���Oj�p%A"��LT��<&�՟�<�1�x&SkW�R�6���}�Z?��~N9��_���7Ryn�35�d8ya�T3�#��]��C$�0�h��0�}�<V�D_b�	�����y@�Z���Բq�e2u<��|>��{X�q�-����>(�>[t����P�c\EJ�(��*!!��}p�O�I�6Ҩ��PU5�,0�f���o��ĵ�h��u��E��䳸x��F<+���o(���(X�=��iGr�X�#%#m��bmx^�%��ҫݩ}���˱��!����9��B��O���C�v��	26j���/������?=��#yyy���o���8]G�����E��le0�0��$��:\ˤ�@L�[,� ��fsӺ�傒����sSj׈�����)��y>�N��L�	�n����/�o>2�	*�����'�
��K<�֯9�H\�L>�����Wb��0 ��{3����,��Oʼn�ox�7�saQ͊#�z��̀~���0�W���@	��t�%u7Fs�wyax1&�M@�jGt�3�ü6��y�?a�V��bK�.�	�&��	�Ebu�S��rw��ֲj�E	��]1~)�UЁ���7
N�
�Վ�NnF�ng�V�17�x�,���z%����ɂ�Ur����[�б��(��7?�U��<�Ky�Rq%�6����f`�E���KڬQ����z�:�3/������B��V1ޢr�"
�K��������P���<͋�rUx(����e�~>�4��
�+B��a���0��q
@v]h�`»�'
K��I�Jun��u�JNO�w�Fo��\��/%%,��hި�y��%�$��׆��x�����p/�	"�8�0�ĩ�� "f$x�X#Z£�T�1�G>[�&�T���Lu,��0�	�i�J6�qi=���k�@������<x7>��(�t�;�����{�cq����<M��8?sũ���S�4�&Ѻ�&�UH;�9��3$�[[*���i�Q�e�D��Ą�X�[JLJPl�I4Ɍɍ�X���ê�8B��%�7t3��ť��0�Ŭi��M�����td|�'��'�EI*�&�8X���aD
��3��دmJ����2�9�V	�_��dx����I������o��`��
+[\��a]�	�i�f�5A��'��1Ҵ�*=�M+�f�uէ���eA��z��;I�\��S}�H ��g���M�4�^�zbb"�<cƌ���XgO���Ve����pq��ǥ��7S�UK%�;�#�-���M&����Vղ5��$H
+Z�t���ǟ��.���Q���U<G� #�3��u<��y�ﹿ�/B�����ϲZ���'(5!�7lX@���""6�.Ei
+�4QA%�^��@B:)$�z�K)ґ"�Ɔ��f&p��}�wد�}��o��z�;�s׵��f����"�Վ+qj�#Kb6cX����
��x"��|�"�F
�q
+��|]w;j$u|Phc#fA�
>���wg�[2�ٻ��6�Ft�zD�C��٨Y:5��4�B�����ѺKݖ���bX�0b��wƢ�q'�;4hs��΀�δZN(�?e�W�8՝P��A탏u�@���F�7V�5�M��u�"׷L����X����(W��]�zc���w���TAF�/4rR�tAyz;�{Dj`��^��|��)��.A��唬^�8͌2�0�BJ�ɇ�����?�x&����Pw(կ�L��vh���/;-^t=�T�4�w6]��S����p�i�	��B�ax�x4���1X t����g@UZXKV����T.�p��:�_VM����l���֣�<|O<�7�ϱ@j9}�r��˭�%F���bɛ�5^�_��[�N�C�+����8��)+���R���nC��R��}�����hg<A�@+�#+��#K�4��5
�C%�;‹���	1&Epd���7��*ӳ
�L�"$�E"�lT:WI ��bi&8;6!�x�c��<��fVq�٦݌Ъlh��e�CyM�bqb���hH9���i8Yh�������~
��f�ސ5AM�NFoJ@�3Z��E�/��\�I����|�t#�ӏAn���3Lb��J<�g�M��
bd��0f!���{Yh���x<�%���{�&3=�h�������lô¸��X��7���	���F=���L�/jc��-D>�g?��Bd�֭~��իW�߿�gϞŊ;z��_�1��?�FK�2�R�Ё���HcD!Œ��	%�k�p"V�'����������}
+��
D�S릇<�� �i�z��u��ispMU�S��cL\&l<�TA��"��6�A�p���DdE��j��̰�������J�x,�����V�7!b�ZT�q(p�^s�1x(R�T�X~m�Z�v�q�)��y�j�����,�DZ�U�3��� ���A=��]g>H�^�4y��$4js'�8?�w��k;5�d<ژ+�4��p`كfF���4���E$9���qqA49@�~�R#�:��I��t4�M*��B
8�vA%��h^�Z�3�-_a)�M9����H��9h��/�Z���t�e�H�z`S�\�jJ�%8�8���fx,׈D)͌}�?b�/�$�_s�F���1*p�yS��~G�~�+o8�A"-6ѳ��c/�Y��ư�v)�USiu�k��)�_W'O��7w�Y��k���&�<w���]�c�d�����-]јsqc9�������6	�D���/w_��8�^���j�*��%���k�m~?�G@�4,s<�$�Q��8���V�;3?�ͥ�$�Tf؃��J����BSK��8��#K�A������M"
9X�"k*�ȬxL�af���R)ѯ;f$
�/���HxҦ�����R
|�IF�4&]���ؙk	Z�����T�
+I`쫳�\�!�]�����<�&am�F\����o��e�|�禺oТ�R�pA���t-Oh�,�hV�tF�w['���phI-n�?JpM‡�:�����`��K��=�ۇ�6��fi/6ZPu����hX��hYd<̉Q�}����&�wC$��[X�Tul۴���tNM�e<�<Z�.!2�ҟ��+!��~����?�+W����m�ƍnnn�����i,�Tz�F���/�['[\"@�hDgj*��`vdqKE��
#dvr���3=rC�s"��DCT�,��O���Ky�&��Eb���~��)g��>����$�YU^P,�u�{@�kb����D>�,{��o�= 5@�7���j#YC�N�ȍ���VjGS6~j%yE�
|��A��Q��L��n��Q���_�
��LJ8-Fuh�k>�Y�Y1zLn�p"���9�CS�/V�v�W�ϵ�X�	i��5�l�8xۉƥj�L�E��\��;���|��a�y<�Vm��Պqe���AB�����E��5�fH�����Szw23�aT.�'%��N�UI��09��b�A?[^Vxj��f��0Y�
�����Bk���	�PޮihG�)mK?a����2�a!4t&Wq���s��N�ל��lu��םnl�;�:hs��3��|��L�1`�U��́�2V���ֵ�~�/9 1t�.
+R'�sա�Ex��k/�Ru��u�V�_��_w>�D�c[�i����u�})�K��Ev[地��݋Z�Z����g,����ז�~͝��k�όm�XdGx"bBV���\
�|ꘔ��V���X��8���w�1�6'����Z�L�H�>5�kFf裸`��1<���2yk��>�#��c���XBX���1�3��VwR�%�
1�K��P�)4jT�A%e���J��y}�4���bha��*v-�)�]��?�
+Ah!��9^���fĨ���p��x���U��v\y�εj��6���x<l9�P����8K3qҹ�y���Q�[��L;��]Fki��W
!#�Ғ�R�]�5EIY�ߌ��)���H��E��i��G�����W�R����/��b׮]��w���g�U�\�̙37oޜ1c���Ϗ?�����Y��4��S�$�[3
c���r����t�/0uhE�K�b4��8�e��A��
+AI�����X�H7�Dӕ�$��Gd������Y���_�\Sy�s�
~�"8�����z����2%%q�_�
+�>�4a�Ē��x�ӹ��he���-\Bp��Q��#:���;t#�#
+S	$�g܁�
�I��U.X���7
�(�/��A��wtq��q�t�4�SP/�#Z4a �
� ��ơ��Y�f�r���3�I3 >F�괯�ǯy�inr���d�(v�c�ml3ɖ�eDsȲΒIAa�֓��G0{�(K6ݗ��՝��
+�iTj/
X�\H,C43����q��xα52�45��<��t4����Ά�%@�}�zRG�-t�q��Ұpe�jm\h��N�'�򸐵��_v���ԦS4;5
ԣ��
��2R�P�N��O�z�,�YhC.�������K?���Ѻb�GrM-���vS"���0
���9졅-VM��Z�:U�+mw�"�J��
�J������?h�k� ?R(~`�nWP�����{8G@��]'@&2hFrr��t��|
m��ᡖ}ڒ��2��y�4�v^�B��a�p3ɿcFHŴ�iA��ڋ,��k�5��+F�)H�u e<�?�wq;�S}d�:�Ӝ#S��;��Tx��3�/�2�}�7%��ֲ��^���a��
+��
+��j�q�=�E6������5��g�t~u��8��2�Z)/ ��3K�X����rBJ�rN�J�DžG��������P�8�N#p/�(�;#`[\
+>���Q� A\����q��Հ�>,�+��8Z���\ǖ/��$�4�]B$�ϟ��;��;w�<��Cu��5&&f�ҥ�֭���7n�{����Y�F�͛7ߣ��� cӦMy������7??����R��`+1@_#�rF;����Y�{�Fy20��3�(%��G��TI�
��6\,"{a�f�I�+4g�.�dG��W�@�jzH%~E�1��n��+�-s���Emv�fs0��r"� &��ȶ8�eef	u->�N�j�ߌD�N`���q{��gK�g���3E��ei��K�0ժ
�1�8j�A�A8��8m�M�Y��D��Fa��������k5 ��Jw��s��)@KsM|�U�G2�5���ӎ^w���tj�з�
8/����_�D�Z+��Ņ��ٌ���>쭍t�Է:n��������J-T���.�N�3B��N�����EX�B�5�e��ҭY^���p�2}��.�=�=�y%Cu���L�E�/��U���PO+~�+�5��qyM>��~�'6p&����Y�_KZ�h�Z����SZ�>ۊQ��`�i�0xy�9>;�AC�L,&�q�������E��D�Q�c�X��F�|O�[�N�Χ�1Z�2	H�
+:6$c��(y�%6&�,�-�+W,��̍�lh�ߕ#s{����x\��3�Q�
M�(��C�r"�n��{�p�����P�#/Ⱥg
+�L�����
֜2n����8�V������t����:��x�n׵,�$2ܩ8pмVyJ+�ÄF!p]��4����R�E]��ʪ�
3|DRVf,B30$�X�qE�j�����`k�����q�ט�g{&���
-S1�R�%���&L_`Ks��k@��*��M�C��pM+�[
+J�.vQ1���⭕4~=���ӹt�-PJM[�$n*��<Jv��G���Xn��(㋟��B*8��e�95t��rw�f�����!���Y�N�����+~Y\\\Ϟ=������IIIC��
+
+Ξ={��[�-[v���۷o���σ��N��D�H
A]v?4Bi�>~Vy>��%�ĕP��b����%}#��f17N����L��_@�Jᑓ�ÑT�����g��д���V�a����?�!�Q���j2����;��q��$�G(Եf��rA.�f����3B��]:C���$A䨿rk�Px�
+Y�U4*��@���k��Z-� �_�zj!'T��M�����W{�˲��ή�(a49
+����i�
+%�ۣY{��R�X�HZ�J���V�}����u��>o�+�bg�V��SZqqp����UV�\|(KISҞ�6V���J��+F�]��f5����C��|��}�(��!|����TK�Ks
+�g?~�DW�b���a
��!Z�
]OwkA��x:i�ar�ۚ�)!C���m�[�2�\�9�y뗝���[^u:��|E������4&-�<��)H)��Z�n���",���5�Z����q|ia�
+Y��;�[Աv�
���3�N�[i�Ag�����
�s�ė�ٴ�ʆw��8:��[]`5]�PŨG5�Qgk��C��X&X��pM8]�ӭ=��66^f�����N�
+���H��s�oR`�������x��0�G��,������N>*?�����U��G�>>�����Ū�
WiI[^4���8c,�R��\;A%j�
K`�����wǾ�+�bn��i_�Hyo5 �U6�t*~�Mj��H_�+C�"�B
4��m�R��N��`�����`��=/k
�p�/3�hCd��Q��L&�$1Q^39`r������5��]���[���i��ж�I���~����
h��3��
+^���T���F��j�mG-�[���W�I��"�����9�:;v��X��G�޽{�6m�Ž~��7�����;{��!C��N�2~�A�*����v'3VcZ���cgl �R*�c%�8=���K9��:͸/�GX�"�P�|2B�D̑V��
+�}�D�ˋ�)�bn��6����^K~B3��m46R�~`cAx8�.i9r��ǧ���� n�~��x��.�6��<$_U�N{Ǚ�AJ�~����3U���������&6�ѲV��
+-H��d�P������LP�BqVD��5��'�8�X�\
�E�/�`��ø�ӕ�g*
+_)_��sF7p&qdmY����x���s��4D7A�v����e����Kj�q#��ߴ:�/"�*��DA���-�3K���[-������Ao���Ԙ��-�BI�q9q������'�G6P�]�g)���yZ*��E�ab<S�jg�>�C
+���X�
"��ω��[��8k�9]�9-�u���
#�$M���0K�Ѩ��&�)QR�� ����M��-�Ҥ4�)=\r<}�������{�F�U��S��`�L�Zk:��	���dz���gP�ER* �� x�%�k�k��7,}���ؕ�n��c�h|F�g��$b�e��+��$�[=Ǵ઩�uA@~�5�ۋl�Hy���c�K��|cL"D�_ElN3;���HM��"5���f�W��	
�c�j_�:#v�����4 �����r_��|}z����mKm�xރ��xl_4n
�����$9��M�}��*J�4[KP��)J�5��2�cYzH�D�N�*��6q>C��u�g)P#��“#��Q���0F��4�D��rM�a��c�u_�p��@�W`ɣ��4�j�D�vj1��/|�ɒ;yEo��Om�9lcl�J�Ѻ�W�K�)���7�:���"y(�.r#+���q
�"�?��C�S�����[�n��OժU0`����Y�~}�2e��c�eff���裏��W��0H��b
ř�����Ms�<\HZ4n�0��c�:|-��7�`��)0v$�#��#�E�_E�������r�f
����t��<�ly]��X��ɯ�x����˲�`Ӛ�q���Ȧ�G�װ�ɹ�:�c	���PW�T+ø�kos'����S@���v]e�~8�PxR�ϣT1�����(ڵ���c�b,�gS).-!N����1
�@LP�G.��EɃ����@p��x�鏷�'�¯�}��N��1�<@���Ij��pe��Ԃ>�c!�K`D�����F{�eE�x�����n>�鿉�H3��6^&��>@a����fΉ,���)�
+�7�Ho
+�RH%� �R׈�i�EwT�>zRg��͢�z�����q��E��W.б�9՝j9�91�6��U��r$(fd�QJ%
$����*c졿�q��
+�B6�YZ>6�R����� �
����]�=
{��E�b�`�`JY�g�":���3o��]y���F�ȝ�0�Hr�Ѱ�i5���(�ՊX�-D��\j7h��e�--[H����U19�X֩��K�J��=����wd�~���@.�G H�E��{�0�U�o�/��s9�.��B�fU����[�.D��mN-�Q+O�LC!��h��W����`w���x΍-��x��E]��y�
5��ᡖ:�͌����SN	l�U`�EUG�8�@[j`=�4�	'���-�7ㄖQ��X�.�H������w�R�9�6�枏�Qz�1\��2d?�����VАW��X�{���r�,@��I�K��r�7�-^y}�TQ�">VCd�0�]2t�h������,���z��'�|����Tjժ���=���WX�T�C���ɿE��G�V�f�r�ʭZ�j߾}_}���u�ֿ�c�����W[����@|�I���·\jF]L�3�0T���Ͼ)qDs
�5�&2�
%Q���_
��F�cLĥeEX��+�v�[aD��?&v/��H!�s���&r��E����-
umk�����5�#��B�#Ϭu(nSzw���ɪ�L@
�?�~5�c�U��|��`�����7��q�i�x\X�_9�ȑ.WF7~��l.�W)�um�ܤR�T��l�\�x0��q���s�A�8��*�{���̹
�
���75zvgw�B_����k���sr}�$W��e�
vb��[t�f(��d���vB_i����4��LwЪ��%�R�Ob��nʎ,E��,
ۚ�FNN��-Z#�{8ϣ
g�TV�O�=��>y���+�Ac�(.�C������;�jL<t��T�fb���T;3��_���~`^ۃv�~Z�����B�����o!�v�V�},u�l��(y�Op��n���EFuV�u:�H�85�+CK�l�
+YB�Մac��t7}M�j	��,�G�g੬Z���w��\j�eJ`c�o�<N����i����
1Ħ[e������K����ID|����L�X�Y�J�7%C�
ʴ��,z�V�<I>N��4�э*��!F�|��5��7��r��$��y�B�W�rz�/��lLlZ��Ԉ��wK�f���2�3Y8"����������Y:�5�c������>�L�6U"}�!O["��6��$�ސ�l����
��<R��{�W�,�a�3��
�ߔ��q�4P��@x���"�ss�h�R�Kt�w�F�o=�t1}pa��ֵ�i�k����`����1���Ȣ�#�����he:>�̻�Hz�O~�)D�k�.00�s�Ώ?��k����3�,[�l�ҥ+VlҤ��l�}w	<�G^$gϞ��:�駟���?b��{6Z^
��1��u>a�	���"�]������9�+u>K���R��CqI��;HFsy��-�Q��8��Y�1�օZ�?�|F��E���Z$���AK�䃀��[Ζ��W6��9ƴ��ή�B��Px��\�Fd��{(Ѣ��̏��S�3��3��eʯ}�:�^���#$���A�˳j��V��o�\�DaZ�f��8�<M�j���a�(>�b�E����uir/~
+8k�#Ы�<�K̙���ᕜ�pm@�����3Z�뒺���n������2�]ք���Ǔc�`�O-��4���(���'�Z:j�g�b
��}��ղ�D?!�6;�xf�y��&���G�D���t�<��8�U2��C3mO*��ӎ/~
+<���/�<�m4
+>�4��ꮕ��E�@'.޴&���n��m�O�W�g��W��Dc�|B�Y�e#�
&�e,Wc��}lp�^�)�S�zh�`e��7
+nڜ�;��c98<$�TM��R���s?,���C+���Zv���j%�KY��Ѻ(ɕ��i�4��_^���k���(�a���Ɍ�ԸW��A�J�%l�^�a1s5�[D�i�Y}�����"���O�4��&l߈͗I<��qޣs"�GN���
��������m���wEVK=��z ����5q����‘�tFz�1ٵZ->w�#s:M���ѩ���c�&��q���2��5��+K#`'p�RG���b?{R��L~-��K% �H+�� c)=�@
+_�'ѐ��X��ZXa�ePr����Y�b���*�a���ֹ^Ӂ��\���J�#��G-@q�О�Qv���E�rD)�~�I�߇.���4���xc��U����Ф��	�>|�����:���^�zU�T��@��…qqq~~~���������0��6��<�!J�z�a�qכ���3I���h���=-�AHy���Vbf��W����W�"�1��)�8Õ
��T�
+�@�����������d٢ف�-5�����ue~U������H=P�;�W�p���
M�K<�s�-˝!�pA]������)	�Y�N	O[m]������%����-��u
+�����N3�S�K�"�%J�� r!eh14a���ʿ}$��&��JZb���\G����ܰ(��Y�V��QV
+��l�ԜԵ��IxɻNr}g8�M
+CB�+���e���eCs�ev�:��"��)�iq���D��[]��l��*ާ���N͹-��Dz#��D�qR^�o1]*˲/�eZ��� Z��b�?����i>+��G�,D�i��A��Z�S���;�����N��"?�Ɩ�{�
+~�j��~���F��688��3��=���^���=y�R����'����X�����k�y���f+�L+�n�!�
+�ɍ�ɜm���@����_8�r3?
�	y��d}˜\�v8g�!'��k.h����4M�(���5Cs��4
0�I���H�o/�������1��*xw.im$d���[�@X��ͥkV<�l�.�-��d \0+<[H�[�[�}?m˄��m���Hb�`![]K�(Fh���=�3NBp�_��-�+��d?��}�Z�?��>��
��x�Hh(�s
+��)ZeG�@-�Ÿ౒+0䬰O{}���'s<�r���_^6bZ�W9Y�����4�WfF�y	�����+ا|�����7a�)��zLw���s���Ηj�X�+gI
�R�c<c���]���!K�����Ee��ui/��@Y�Xl�"��dd�n)�Jw	�ԟ��S�t�\{������޽������ƍ�d���m2�����֭�?[Z���O��}(�ۍwW�s�c�2���BjL�%����RW�e��a���p~P�Y����8%=�E+��Z`��~,�k�������^�s������/>��7E�9k[M9�����m	�����l�[�I$wAX$
+2=�YF>����P��0�pVY�D
��e��љ�t���i�A!Jy�Q|�B5{t��I�'�)U���Sm��,tU��N�q�>�i*��)���m�-�_�Z�+��|��Ψ���m%}{�R��58߼�Z��3��k}+�j�-.zr�^�t�R�Ս�)b���K�dVs��j�ȴ��*�=Q��(�^F���+������	5�-��z�Y�/Lz�p^�B���`�L����QY�m���:�._2�>Z�Š�;9B��d�,ԊP��}�K�O���rE����w)���m��+��}*]D���4��G�Ea�+��0��T�Q�q#����vnm�_��+�f�����o۹vsY�G���p�\kZ��sFWsZv�8O:�l��?,�<��\l���[�G���<��HJ^9(����и���ZI��?c��Uz
M*�e�d|����%"�����*GU4�UgWv��q{M�d����*v���e�����t
�$@�9Ĩ�ɱ��l��	]�N+�YZØ�i,_��9�5�L�6^"
+��>

wАVs�+6RvDi:�����"�\U“�zhVu
+*E�|��߉1�)�3C��5�mN���
+�I�7h�(�j�޲�Y�f-l�j�w���+�e�ۂU�;�97,[q9'I�%t�R��"|8�x�\��# �%޷�J} �;�!|�c�D�g��M<S]����6z�����q�O�-D>�g?�"���}�l�X�bw���G��~���;֯_���{�`����c�Ls_gĞ�q���.ұx�~�V���uF*.9����10ؓ�������49�5�
+MJe����
]�
+ag��c|bւ�2q��x;�����e�Ge�Ţ^�i�{Ύ�El�%�e��`���+�_��euR�2#Ōv��Q�3�y#D�e���;���KX��|1��2��#eh	d
+�Vժ��2E�����CC
+���	�z�I!|�0�a��a��8_��]�Nk���������;'�]'E�0/3�Q�8��'��J�0`��I�Vv�6�<�F�[���a���J�[�0K��$H7>���8�Cs$��3&޷7
+*�{,�e�FtPV��rq��4ąG߂}67NO�_�j�mQ��X;�?]�b�X��i(E$K��]QW3��|2X���h�ւ��Ks�B���G)7@��׉k�g�+gDž_\4fMF�����hhgM�<�&d�U�j��B*5\�$5������3n~S_�-�
K��[�b�J��Z�Vq�1��	52��a���@3�g٫���eK�Z)��h�o���s��ZTwZ�KH�|	�`~���Gx.+#����#4r��欩 "�#��1&�p�6A��������&���*��H��e�Ԋ^&s��*
.�|��c���9����P��?�b��HQ����z�פ��`��b�/�)�U/�,���J�ez��8\JJ���<W0���!��cd�	�=�੥6�������*xj����Ij�=���e�+�N���x�����7��&�oĝ�z���=����:I	h�%c�/�Krh~Л�<���ͪ��9c�J�`X�����4�����m5ܶH�e�Ѫsֿ
D6hР�������f�����S�.\����+�x;���=XS����j��  �1	jX�3R��8S��� ��5i�hZܖa�9e\�
+i�u�R oAx��DGx"�H="�ȣ��@�v�͌�#����N�ݔ��
ZxN�$}��UO��*5��N���)��0
��Z�Nh���I�"��V��9Xc�C!�4��r��RQ�oO##8Vc�lq+�cu4�O����3X]	K@]s��)�?QV�R4���@�[�Y�n$<?�9�Q�J�}��g�/��s���]�9��+�]���$9�<��@���{��"�i �����@�)�g(>����mtF���W�D"�/�>z
'e�;�3��t���DY��I�5SU9�>��̽��É�R�=�,����q���8�_3ѕ�d+��Y�j�w�3:˯�w�c��j�ain�j�i��~-�p|��K_3�8��t��%׵����s��=���BV�S�Ϯ�)��ȸ��]y�$�r5;,�H敠�'���qS�����D� �&�"�0�s,�*�s.&���Vn�+�ZZ�#��-���k�:���wT�yT�)�O��G�A{��yI����{_H:ewC��� '�\���S��T8TK꣱:��Z��͎k]��x���j��̲���x�~��,FoX$��\
�t[�кzX�2ѯ;���G����_�N҅ƒ�U��~��h�t��%p����@�p���(���=�+~��UFR�	i�5�����H�Y4~�T�]:y��F��?�_"�`�5�p:/���#0]7�¥Pۍ�: '�@�W���-���V��1B�0�PQ��iVEW$��^��y�iVF��a_I��-�eE���Bd��߿����s��I|�{�x��wA�mIZ��oXemt�U���p�ԟ�3��O�@�a���
l?#�NJK�†�'��[�
c���/l��RlFt�[,h$��7��x�2�Z�D�l{S���z�^��
�(2��mF�e�!<3�0D���x@���I�8��HE��_�F��ci���G0�gx��K�e@g�g�����d�v/%��PL�쒋F�2Lc��'�L�ޒ�(�u���et2�6I�H����h"���vvp}V�jb�
+�<o�l�Ġ��1y�fNzS'
��k�q_K��	�E���-��^�xN�P�X�ݞ����y��������.w��Z�D@_X�
;ѷ�<f	��2�#��%��E92����wi����qo�%�P˓]��ua�c����N����-B�
TK;+��w:��5�1�
cӀt�m>��L��M����F�{��{��
nR����t�
+�_]�~Tb���ﻖwp�5��fNgi8�.�\�[��Fi貐ջZ�-%�f�v�A�xΓP�;S��Rxl�$�\?
M��X9�æ��8bF���i��m$\��]w֕��w��8�S�k%b"X�RD�
LG+��Z���ڜ��oKYp
-ChQZ��-
]�=
��Ȣ����:eE���E��ai��X�
Uf��.�
+(u�՝�4<��f��#Kqʂ�PS�+%���	~��T�3�LS��̰yZt��\��%�G�7r���KM�z�K��i9_�fv�QL���%��:�g�~�z�S������92x8�b�
S�V	����ky��
�2l<1��H��+�$�.���Q
��<�	����������"��o��I���F�����s��w?�����Y��.��n�՘�8��%x�٥Sr�3�������#|�*�9?�&ϲ���W'%�	�dvd�D�O-��
��'MeJ�Ȫ(?
��
dۘ�2~%z�e_sA�}-Dih/}�?�������2�5���a
ܓ%��1�X�fLu�:����4��Y
�c1�����)W�$��e�♤��(�!&Z�LYv�V78�_�#��o�I?vQIXVh[Q'�DiG)�����v7h�91�q
��������@Ct5��T����1�:)���Im��w��s�J�V�,���N*�AF3 �F]�\�Ђ�&��r�E�Xn�X/�Gd���&�T�D�F���¿��B���_U�[�
+=	ơ��8u���,�5.�0`-)x@K�HǦ��n<��L�%�%�|4��ǵ�֙�y�q�m�k�^���售7�E�s���k,�DiO�	�O��e�� �.�{���U�M
�ӆ�]{�2v,`�}%y�I���ж�M��x��H
+hr0�J�����~;:W���d�
+�ɥvb?�G����O0�/^�^@
�JȊ_�

�ڟF>�A��P��V�Ỗ�9�X�F�"��|�U��m�K%�e��A��^�v�>�?^�A� g���ѓ�����!V��H���x�G�˴ã�SC�Ř%�ܣ�� )�Oa�90j��ّŁ�OH�/~�Q�-5�n�����F��e�/�<I�/e�}��X�o���`X+`�z�\r7���Oݙ�975�FQ�G%�;�=���ID~�|s<&j�mN���6#*�g
+
�'�K�Y&I��Re�ct�Q��ǔO�|��]�MX���z��:�ɟ��;�\����9�%��I^��߫��ڶm�;˗���x<DsC�>������]3t�G�t�U��-�#�x�@V����N���$�w��b��^$|�AH��$a!3�-ڒ���6v/^	ҍ��n$��=��b�+��pw9��Gb�i"J��Q[�D��©��|��`t]G�S���+`X2α� )�澑���u��2��(M	x���_LY,C0e��!PX��G�s�f��-SX[��E3��wꫂM��������Z�D�
v�*��{mlW~-'JC^O�r�F�6t�jT�F�Ƶ��kI'��kC]gėEp�Gk���ݲ���j�\��Y��M�0��'�@f���Ҩ8��VZp5Ԡ�@����#�ۈ�ƅa{osى�Fc�U�9@;��3)—�*��n@U
.���/�tނ�,�1��n�j�/`��f�@}�]�S0�P����e�U���'ѯ3֎�q]��Cs�T�Nh)�MF�O�j�āJ �G���Q�$}5�3�Ú;Y`�}����(mu_�%��(q��^'}�Ow̒Y��Z�y�}+4�2Tl�A��t^\3����-���
+X�DV��)�&�(�sǗ�7�/��*���d����Bz�PG���N
+��љp]����lR�g@�5��Nq�����\�)����ς�
n���,m�
5w�,"��[$���C�f���V��e�
+��LK��w*�d�>����~*MeS�
�w� �
vr
+�.�M��T~~�\t��xT#V�M7���nAXdV�?x�$fExq�4�
�)����"غ� :A���^��d��dޑ���>�c!7�c%����{5����aiE$���ZOSN�d	;9+h�����dq�Ǎ#�.!2��?��wY���w7r�\E��
v���-Z��GO���-:�-�bT���E46
+���j��+
�l�+F������҂_Q��%Tl3�38���-9��S��'9�`Ax��G�����-r�8#/G>�y$���`G�z����4���
L�����JB����]q����Z���˜�����jjvCF�$�s��-��u�*�4	�X'%�)8�3���maw/~����Bk���M1�V��� AF)�n3ؚW��]?#{ԙ@�V��o����%&(��εX�m�3��jk�:0�������;������N6��C������Mu��6g�����Ŧ(q�$#O�w,\a~Л�(O���Ā7�>*R���(=�O�]��G��hAE�q�P��
M��㶀�^��h�������3�n9�|ċ���m�M~<��z����Z;)E�Y���B�҃_��ee
+U����+��7���/�r��DQ:-�+���s���YY�*K\��3�$�'�U�",�!�´����z'�qzaI�z�gIZ�R�}�ڊ�N5���'�[`>�}�_���krq�\���к3�ޞX�H�t���y_�W}���_�,CH��zX�mF5�����0�$pI�����E�mA�?��K��N��p��ERA�Y@y����s���P��3����w�������c��B��n��+̱Ő�M��`�������p�]W���[�����PB6J畒���+�PÖ[���cIV�D�?��
�$I$�������Fu�&���3���
+���(��ys�f%�w�59w�׌8������
SzA���UYƜc�pk�<b,!γ%U'��3�l��Ҍ�Q����J�<xj�-|�^����/�h��Ȩ\��ڵk����7oԭ[wƌ������y�V�p�-j�!��|��10<�� ��\��NT�9�d����������չk�R���2�ėd���Y
kQ��1�7�Z8����{���]�z�,ӡN�(
�͵�U�JD	k��i����o%��Rlnܤ�:��
�IZ�k������<n���-��a['X:a]���e����6F3ō&��N��7���9�!㙀>����9+�h	�R��}�#6�;�ki1��g<AK�S��X���Q՝�|7q�s�|��Tj�����*����}4PS:��	cK�p��%���l��ZF+��Pyq�������>�;B�b�E6��b��ǯa�m��מm�BAђ	�������<���D�H�F���Y�1���R;�I�� Z�T�q^$�
�����G�1��r�#����Ϧ
���?����F!n���!eԼL��.���Y9��a�0�@��b�h4HHx�m��]��03�I�s��uZ�{���]�4p���mm[$���rS�	�<��nW�$�x{�,���<�t�U\�7�*�
+U����o<&�d�}�f,isD�Vr���m��.4��Odi���2�����H��Q���" �#Џ����d���m��l�L�P�0�R]�â��~g�c؀z�~HK�����|��H+��\		-1�f�l��������l�_W[LY��R%6<��D�3��R��!�q���r�Cwe�̒܌�9��#O'�}F+-����F@����0`H�=�ı̰���60ɿ�58�cӦ�TB.���ì��"��ܙ�s��e��Id���ٞIJ+k+�iX��iOM�U���e	f`0fp�G�]#�.!�L�?��@�<�e˖?���_ʖ-�7����������'�������ǻ�*��M�*�\�3h���
-�*��]\'m:�a�A�j”ҥ��}��I6"ѯ;�CT���H�i��^(#3.��'�w�tEv�HA@�����g����b_m�H=J�x��s����v�Wr:J�C'pdm`�P�ĉ��6�x�\�si�
+���a����jt�<[vd13�E����(g�(�v�����w�������k����{��N0>��B���(�C��1@*�aD��U=��)�H\��lu(�b������q�}���ʵu�%�m�}�R��k	�*���TZu�o�Fʪ}d�O�Xo����W<&��f�Kh�2WFO�c.+bO��=�*
1N$Š�-��x1t��y�U���R��L��X���w�+en�`?	�T�)��i�����ড়���>��p���}�&��d�����7�w����G��fb����`�D��l3��J�p[�Q�j}��8�\��Q�%|�Z��Q�v쿮u�5q�v��0��ڄ1+�S%�����9��AN��a`�8��l���J�$��H���
+��,_�l�J�L��<�z��P�o\���"�8i.�,l/�i���s5 lr��ƨ� @-+��	/���z�I�b֑%���Z�2_� �
c���eI� ���+�и�'e�\�J��L�E�l0-��Y���6.5�������	�gҪ�4M�����#��@7�V�����aR�Y���.,��a��N5,�)���A���=���4�)�GK�jư���F[�CE��%���̸�B$�p+��3B0�-5RM��}�S�i����	"�/�7u!ACp�o��O����Ly���G�6y��{�x��W�`�g-$R�_~E����I%���v�*�
�Z~�F�ͣƾ~S�0��M���4��OC}�va����BJ@DI�8"���Ǭ���y��D-�0�#�	4
�B@'�}��s���*d!�rO3��x
J��ݤ���!8�V���M�
ln��<Q����WE��`���BVx����2z��Jd'$��
Y>�#O�
��I���AZ�۩����� $b��`T1�3�}5�*s���Z���9=������J��+ZK"�ԝ4�ʢ-W�z�%�Lג�ך9���M��4u�ڸ64q�~Sn&_5�i�%�k�>�*�В
�P) ��h	[�0�H�DI����?����
+��P���	�A7���}-ŝ���o�ʑ��t��0��΃YAP;
+m,��<i�5(����hm���o��Tj�j�!�  �e�s��|
+t�t�5��s<�
+��0�"����N=�>���~��0�
+Pg�S�2>
(mb�v���&i�Z��)���N�+��~u���93�֛9�}�.$�_5���F�l��
[E#�p-’���*���k���1�.���H�z��P�8�J��t] 
\V�i�H�=O�c:Jԛ"/ �������!��x�%-�����G>
�Ӵ�S8Ť,9�%F �
g������G�ܡ�>�N��BuU]��B}p�����k��<��!%���\�p����0��U˧䚌"6����g�,��ax�R��)�:�KH�Ha5X�2���m0Mc��ekx�V����������M5�@
+>
+�b�3XI�x)��z�S��W
S�	ȑ�d��}��t3�
�QnVrz�tS2���eױ*c	�_���b�E
�<4�t�IGKZ�jKGbp�*��y�i����/�Ȇ
�/_~ժU8�7n�رcG͚55j�7������h�y�&�w�~饗���݋?^
��F����d)��E���fNױ�TE�`'[џٶxE��w�NJ۶V�u�G.�]�=Kg��T������J�hΉ���N']��M�tI��L�����#��%Q�:�����w�}��eJ���)�D�~]��ۥ^�Rõ&�����Av4�������9�E�TVg�A@��B�rʸ�{�<R�̰��s�"��:
+Gゆ�(��������'�է�)$�x�h�8�V�b$�T�}�)"9�������EC�;�A�v�]Z%�����;m�q�7t����Ԓ;�N�uF����G\���]{���T�?ZcE$�sV��a��$!F���Q�^3B*J����D<���_����I��8�h9�6��#�Ʊ>����(OZҘqV(/(�7��<ISh��Z]�J�a�

���礤��!ι��ug�
+]GG�B~�"V��#�%�}��Cq#�(N�=�[�ͬ<0a��#:'E��&�
+��p�30���7���7��׏���D��]��
>�r�[cE��1�9R'�(���kw��<����k=�`�vlQ�t�g�NX�&�̥t�� ��H���\EJYIpKy6p�1m�D�sz �?" t��1α�%��oL�S#�����;ZO���
e^��0?ؙR�
+
`rXmV�C��,�Wߢi#X���B�?�T���`�ů�k�:)���㏠�m!yO����"�8�졻%'Z�����i�uL,�1:w���03�!�ELh������j����a!\ʳ�G	�j�Z,c�PsL�L~�
-�qC��ށ��2�
A���C� ������dV��AcZ󍜊'�Ȣ�l~@�[���i�k��\@���/^lٲ�@��u�֗.]���J�,y��a6p0Ϝ9c;q$���݋?�T��UOm�^Eh��ퟺ]ƊF�[N��?�=Z��
+�G�."�X_��=�k	,b}a�)�y{F������FAɘ7e��q�oxQ2f0�xf�βv
8�*����?|)j
���m	�
+
͢4J��[k�O�U�����-^���gTST�0EKbW��q�Š})Fr��[�	t�-�؀��R���l1��3<��V�����;���0�m�����;�x�Y�*�*�I(
���h��[��
G�c�HKWns'�y�M���I���4����z���څR�R�[�o+�*ee��lxB������<1�k6n/e��,���6G�iM���t�
+>�#I����k�I�d�Ϩx$�'�)�@	[=���O��V�Z�R����S��N2Y���lӃ�l��Hw:B�ɂ�hnΘ$�\?e��ge��4
J�IF&(�=?���e���S�<�1Z �cu�j�,�oW9�ؔxY;��τ���.��=���n	���&u��)]󆴉��c�-o��YPS�m�H���]�x����$H	����z��f8׸0�1�?�$F#��	� -$a
�$J�w;��O�N�8��s1I�"����b���*�48�@�@�y ���B!=�I����ե�7+M�qX
�Ȧk�*��j��zI�&]�Y�����sٰpӪ�r+��Y2��(;�`6f-]�x�{����Ȋ��%�wR�fG�H	l�J�m��"��q�����3�A:�V)U�ɪi�RT:=����y�]�ooF�4����`��QY�q'em��!P��t�����8����Rp̎�����tR��0?��qhQ!�f��,��w����Ͽ,/�~ڬl��T�Xq�ҥlT�^�O�>׮]KMM}���5��_�G�"�5R������]�9;�TQ7�cc@�H�H����1����'�{<��xVS>c�
��0�~V?�� <̈@���y�U_�/ꁆhc|IX<#�:Y���s�K�� ��Av4x�r��b�� AFSi�!�6�cr��c���{R�I�7sVZ�k�_N49���7��=q@�z��	�_���OlZ���5�:��1�q�C�x�b8��7X�$[�B���n��h��ح]�,W�C���CW7vb;�N�36p&��驖�M�DF��c���%m\Q���[g����A0��G�NB��`o��Z�2>xYk[/�r��LIE�.�+rf�x.'��_��|hU��)F�\F�h)�s���|�����9e����5_�ޱl*%}�����������d��� �.5���ReV�L4J�L<t��|c�3\�;�l�����kj�E|�oJ
)�	�O���b=ܮ+ ^1*�>�c,����(\��838��G�|�v�o�&�P�Cw`��}�\�9�^��"{Q�.��-��&畻u�ְ���x��ц�it�@ϋ���͖`����w�az�s!�9?GP�=t6$�}�˔,��h��]Ɵ�p���
+�@�0!�)#7�.x��a?8{�1P��.;� �+
�O���,gE��mU�0�ؖI��d�Ԛ��E��l�5-��j�w�6@�0�-��2��#���H�C|L�R�F���!Oc�h����Z'�a�p~�ۼݲ����(�y>Ct�'���c��e�Atqd���}��˸.G���t2T,�G3�W�eSJmN��X�ox��%��i]��4Xgո��b���n}��X��.!r���s� �ƍ��11113g�dc�ƍ~~~<~�kT�/���qOП6y��Ny�~�f�����K�������f�,
��FY���21?N�Xi�٠;AI�xR��!�0#�	�W�j fI"/H����Z�%�D�b�i���m9=F�(P�P'���(�pVu��3��ޔ[׎_Z�R��J�'�)�;�1���)?L��A���������g�[4��a���5*�JC�^EH1Y��D��F�>�Z
�����V��@�P�����ץ�m��K,�Ɉ_4���0��d\FQLc�h�)������|{W
��m�Z�n��4v�|�!�\߽�k���I��j;������=���O�`O�Ђ\��j�Y�t�kEmd������c;�f<TU��g4��&�w��x��sv��y����P���ϕ+�*��^V��#�'Nf����V�j�#��6Tu˫�䅵�Kq�>��m�'��f���!f��?+2b��O��2�L{nɉ�
c�M��ZYV����<���&.D�R��s��(�Gb�0-��&C���
��%�N��=�+F�K{F��g�~Q��Xi���d��]'��n�}�ڮ�I>��kik��.�S�]'p���<o�����f�R����9��SF��dUy�󠃥��t%%0��x�;8������������OoK�%��}s� �xb���;3������^>�skJ�m���u"'�xҴã��+ ���z�m�'/o�.h"���M�����~ր�Z
�O����'/�ϖ�؏_��ˏK�~L��ѧ¸^E&�6��.6B��ה,�maac��y[��ZI�`|�:�9?譬�������D��=��d�k�X|�%I�'�sZbR�U�D���'Љy�L'�b<cc<�r:�R��'ZX�e�L�BJ��\DJJL��|�+ 5��zȒ������je�\CK�h�LSL���t��x�1y�ZS{�
D>��C&L8w���kAA���~��{�������o����r��=z�{�G����mr��v��
1��0J�r
7[}2H	�
�h������}|��$xa�t��}�Q�)�i,�.e"RjYr�j��Tb�#��WYlZ[��V�d<���� ^L�<��s9�95\�3G�ur� ��=���-���*!��$���sx�'?o���ۥm�d������~b���+{��UqC-ך�V���s��Bf��]�
n"kqޣ�}�[M�)����,jN�_�*��
b����V•CPC�ބl'Z�k�>)��E'��ӵ0�%)��:\��L׼��*o:��w&��q'������ε�>�8~R��Gxe��i��h\����j�k�.�8/��̋�Zb*i���x.����q�s��~�ӈ�V��KDk-TS/<�aA�r>���J��n����[]�uqk>��fVE���hD�������G���Ru-ѐ�[��e�]�F��ϥͷ}�y�+�:tl��e=�/�g(^|J@Sl~��1�s��ԓݠ2�Y��R��#����7�8��{2��rG�D�f
+'XD��*��Z��C�6�%�9�ڵ��3�}�rS�����f�ƨ�?v����h%#���4<��d�D��)/Ba���J�b��8�k���R��r�e~���2'�6�L?1Ѝ=ؐ@$�7ie,����Dv��]����\ٶ\���⶯�����Ww��'ҏ'�u��m���
v�3U�̷�Mo������\<��~t~y¹ű�>����ȑDU�y�iyN�}L��+ˌ
�
+��"�.@?�S�3%r����}�4��r��Ɛ�_�yI�3›{��%�~�c5�&��WH�b)�˜Lژ索VgpP	@�p�Lj����3�#�!VJ
e�Ezp��.���R;�X�\���Pt�.�7����֥[�H����Oi)�+���g���ȑ�_�%D7���;�ܹsg����-Z�J�Ν;2d�ر���oٲ�#�<���ѣG�.��W�nذa����G�wO�hU�^�����ID�1�����X4@i� ������u��(�/���0�W���r�Ѩ�ύ/~�Q���dM��ұ�a��l�׬�q4��
+�B'[M �[
+Ix�_���-�H����\�s.&j�B��� \���e��u8qӊr���jY�y���~��S�/o]~bV��bW)������cO$����ͯ��xL��T2�2;��hg�C�M������^��[,R-}��DF�>��z]-$�C��rY��@�b��4��?b5�����<J��-)ψ��h�;���]g�N�0U���i+ך7���p>�ٿ����19Ɗ>�(vݲ!�,>-�lSJmA��|d�a�K)�ȳ�e����
 
+�C�����Ļ��+Y&�#Ph��r�����zg��n�Nk_ڸp�%ha����t���m�
-識c9�ˆV���krx��S�ۣ���n��Gß����Q}xg��cinB�P���W�������}��
Z�3���c%�����~(:>��j� K��>q���7[�(�V���v���{6u�q�1T@�����ؙ�}���R��*���.�q��t�$�0�g.0�$n>�M.Wf,�]�"�gFo��������8w�����ͨ��2�Һ�^�5Q��%�}-�����}\1D`/�͖3�ux������i"����t%BDo^ە����5O��tlB�S�H��Ƃ���*�{u[�����~�����o��zqY��%ݷEgㅥ��x�Rt�Ja�T��$�FW|�H[�a�#<�QZ�����LN�}�a#b!�����Z�ˎ,�eG��}b��
@�>H���O�el34ë�<�AR�4�{��?��蟉%���&�<������+'�܍m?�d��C�Ǥ$���X�ld��2�Z�[z�{�>�w��
�vt������!���?26n���g�}��^|��������_�~�o�������rww������ǻG�*�Fmgps'%��}��i�Z�,H7�3f0X%k4?��d�:��C][��`e���1�h��������1fFe�I���B����BCK��F�6��5�lY��a�myM��N�8Ź�,A�g':b��s=F��|��]�����U�β�vy}��������T��e���Ĩ�7�}`ËE��Tr�{Fd8�d���5�f�;ɿv�
+�z�x�Y��҃����ղ������>�k
+Ҥ�{�&�����v�cnӛ���<"�aE�r$�H[�F���!-OĪx�n�l�G����S�c�5�H��e�c��	�Oob�4s2���TtG�a[�g靱�ώ+~Ԟ�5m|���O���`x�y���l�O��*,6�����*�w��U1Wb�D�@`r��܎nEŝ�]ȹgS��*
+�ھ
��w��љ�k��~���ڤ�
+�ؙU�F9]ϹU9��Ry�Ѹ)�_���
O��X1�3&5�����o�y1Q4#�@j������$��l�"74��
+�i��V�m�,S^������S��P�biZ��ի��bC��I/В�Ż�J��to�Ll�Zm
?-��]�R ���m]�;�N~����*�Ro�6"��G��d���V�zM��$�~JK��T^Ѻf^�4�����揟�8oX^ʤ�:2<��$�
�g�r!�$}��e4N(q�v8��B�R5��Aɽ͜_���U���������H��}9<�L9�p��߭��=�`��e���L�l�!0�
sdp�
}隫�Wl~�$�f�Vܶ�V[v��.���_YfS%�l�J������^ّ�c"F�E�<�J�H�v��Z$�(�p;%�{�SK{&�Q�g��|��`@�X�"(�9�]�	�_Y�>&2KÂnX&)�M�H
+��!&���\F���������!:w݅ਫ��Κ�<ZB�ѡZ��֍�:�%�Z���"=�g?�h�����5k֭[������V����4�8�pF���d]RA�Ot���F�l�]�N�WL���(���2�)�Fgg��$�b,+�-<`Uc<�FhE�$��1���/��}$ҙ̗�<JatyE0��(���<=Z��������؞T�\n���P'F�tzVGtxA��9�_Z3��։?�
;>������7�/���im��
�^-``�3����b"a;a_�"�1�"����6��HGz���2\M�P������ѽ(�h��F�h
�Pi�Ve�pG��҂���+�)��Őh�o�:|=���8���u���I��5�;5��_s:7t���n�؎��;���h��S�e�X2a�F��32�G��Nb�h
�y�c��$��)
}�,ˑ0G>�E1�z��B��S�.�>?�z��ʸ��䅵9{�;k�_Z�paٴ�|x|�K���󀲪J��9Mj�:!��aT&E@�M�J�,�H�ɠdɹ���ɒ�D�$IrE�؃�0�WUW�k��?3�5﮻�}��{��{W}_�]��s�Z�%�)OH���6/���Ε-��c	/Lj-����?}~�b��Y�ί\xn��f�>A_s��p����%+xW�軞���Z@p��8�\zD�]�
�L,�tV��$�ܡ[o.��������W���	���5og'��;�z
�R�Y��3Q˒nj����rb�'��=�Yu\�1�|d1K7�ȴ�I�J���YV�}���v�����S���f��	��w��er�=��7M�q���������=��ɕ��,����MK�:>���K^ܐK{���b�[F]\�p~�?�o}��Gj�pk�����YQ~;���������ѭEVUӱ������ޖO_ٜ���y�G��UTV�T��$���ݤS릣�-�<v��A���x�]=�ۚ��>�k��O�=����kL����P�
0���@!�<$5�145%��xNHO]H�����:*:b����d�g�ď�-�ĤIy� �l~5#�cf�G8Jci&�	�CzE����2eU�?�Eد���Ɂ؆q-Wz�!z�y��>��@����>�Y���̮ጯ�d>�Th�.���j�#`|ѩ�[�w���8i-��8m�_:L\���8Q��w��{Hmw/�"*1�n��+���g!`x��"�"��u�^_-e1cheE=����@�2�����ֶ���a�,ߎ����&:W�8�:S��/Z��O�OƁ�ǻ���0�z)CVX��`��s�k�W
>�B�s�i�����ٛi���^I��o���@D�4L5�qm��Z9��h���J��$��&}�I�s pWU�;�
��
+��:@��l���q�V��Xg��y�MC�������_?��n���'N$fy�����iO�#���8o6u7���™Ww>#�$,��hI�봶��2
�$�[�Ӓ��5��K\��B�dG�A�甕��xЀ4�����,�4�U�	�!H��ǻJ��&'�oz���`+!	��^8�T\��«���9g{��=��b̈́��i����r�ת�&�n&��m�LTvl �o�--S� ]��)%�#��Ǹ��q>��Q�����V������J�,��>�mG����Et%��n랂�t��
���9����H�΂���,�[�Y`uCM���M�mlk]���-��[��9c
+㪈�������
�-��{��r1"s�i�ҷ��֧����K/�Z��,I����K$��t-��0Cx&g~;6��i���
���ij
��0�C͜s#CO$<���������{�yeH)�:��t��ޛF+�i�Y�Jq�gŊ�P��.��gc�d�H���Cz��U�7W���z��쨇�}��ᢐϜ�8�1�Z$k�F�cw�o�,)��i.MrΑm��J�+�	�
ٛ��]�̂����#��-"�Ԃ�=�v��̓53gc�q"����a��2"+�AZk��X%�)�~�ke�N΁��a����	�[w^R��	"�~���k�����_�U+:=�9 ��3�]wky��·�v}'���������h�R T�'��K��1y<0��mQ7A��Uhj�HҼ�
*i�ږ4hU�{�e�ctn_4��š㢁K�����^J2=.��*��l�˥/|lzdC@dO�l
�̱z<��1ΩDQ
��Gڊ'�0
����b�8��䍤̕L�	`��������uMp�x�J͵{c�����Ii�3�Ab���֡^�LP�X&�lU�hY��ʬ�./^�}�x�ߦ�n���
+o�6�D���<\�k��x���xaUgDe�����^5gd����ӭ�ӥ������N�����h]'��pѿ�
+D��{Pdҽd��;�	�Ը"{eQF�g���p)Z��3�Ʉo��~����t��p�{�=5��>g2"_��� ����":0����+�(�Bf��I	��b��N�%�=E,��u�G5�Q*�h�ǫi5�����7J��&�N
3d#y�`�a���>4�?�Gt��X�?7%9E��F
+y��r\{���j��޴m�5�{ި��ez�'���3�B �м�x#ܦ��
�!��Rhm�(v��ӆ�k�n���X0(�}y	3�}��T:�j\���h!���`%~;��꥟d-�7aq�ԥ�G��{e�.+�U�"��I�"|)�(EC��������9�	?̶�X�R��Ϥ���#�;�tC��@!�����
+Q��%�)�ZF�}d9�$���\���|γ��Ѣ�=��şD���������;T_޴�孴����Ϸ�����I���U��H
>�C���fG�.e�Ve�5Eg �+�8Aw��'��4��I�;���"�D���5޶��5Mb7�)*���D���J'f�M�[a�Dr�g�����JhX���2]v�q�2�l����s�o���������ӧOHHH�v�F�9�w���u�3Z5ޙ�{���o+9}1aB����'�3Ϡ8���=IPSә��m�+?�w]7�_���ipDc�<@����p��s�rtZq
+�o��m"�f��c�!�T�~Q�W��
Dž�!1�����~���?<��֑6�p�8�ӝ+��!`�67�O�n��'���uo���UU�&�0��j��&⽦���%s��V�KL	��YJ	�.�w�kc��j.K�=��7�T�9� �6��2X�X7���	|���0��;h���M�}�u��uh+�gcw��u��~A���j��h��e�	�馗�w	a�p^��.�}��S��Ne^����8��΄�DN#w%7��خ���E�[z�4�,	Ӫ���1��Zs�sC;���q������f~xu���
���p�����z1M���Q���q�P�]U(
D���ET',"��=���&�k5A��t--��JBBu��v�y)a��Q�E����e���F��E�Vm�U��s#�B_�j4�*�^������6���e�U�~�=D*K����;xMD���P�K5g`Gc�sj��4��\VtzaJ4;�C��D�X�W�=�N+����b�tL@jzV�!�جŕ2T�*���uK�kxn��ƹ��L~�+}������[H�'�e��^�4���{�tysa���?��V�SV�5מj.���i���[�	>�<��H#ݪY_���Q�;��(rmi�*ݎ�[a��O:��E�Y3��G���2��A�W��j�����D2}�`]ml��E@xo��>;xP����N��U�
+�wt�dz����Ğ�:�S����ia\a����Dߍ����u��2���H(z�FQr�0)�<d^X�?�D~�w���>��M����$r�˦̶�iIp-|�o���!���O_�?�U�q�Đ�:o�x1bI�0������s~�i[ۙ��h�.	[P{�#��E����WKw?!$h��{�s�Lq����{@#��{8��9��ؓ��G�z��ٞWU�@��Ob�}�����柑���q]�|���]/ez2yp�pc<n����Õ*�W�L
+m�H����ˈ�YQ�>�X���Oz4D⠄�eNtq"M�AƎT{����%����*5�m���ٯ� ����v����ϔд\N^�.JbS���!.7A�hQ��&u�����@�h�n$yǙL�O�Ut���o8]�K9O�uq�/8�U��beg�\�Kn������Ό�N�xg:��G 9�`W#��0�>�}���8���[=h�ɴx�S$�p�����'w%fݢ#�u%N!B�����D���6@����+e#Oo
ʣ������7m%	S����8�y[��ܸ��?�)�</�%МQ�ȝ���?L�̏��ﳓ~�י�
+�K��/�ڞ��A?�)-.t��&n�7�@��[=\�)I<���=g`�3\-�l쮁]�tM����1O�B��uzG��eswO5g�KN�G��r�i�7
�E�t��������W.ZaMMi��m+���t������<@�����ҝ���@��敮����ӄ7bǺc�S�-�nXđ����U����5�cx�5��Ɓ&b/�JlD*�ז�|��֊�$!������H�����������>�V�A�AI\٢��尬ya͗
�gr���I�gž1C$���\2��䘴�:Zoh���v*◑�Y+������g��,��8����OuGd* �K�T$�OZB�Tdѫʃ|-L�xNJ���	��V��
+�B�ew�hu����٣�Mg��gZ��;���؂w���@�
j׮�����C�C;�p��8�0a+G�S}��2�r
D�*v]����]M̨:F��~�-
~ܸ��{o�~U�Im�.����s�����g?�AQ��h{�9k�E-_uQk��ҝ?�Ds�g7Tph�<�Z��"��H�|7.l����s�nn,���8q��a�`��O��a��?��|�S5�6b��p)F�T(�Ғ
+�=�-�uSY�B$�37�����d.5=�ڜ�DLf���	3L
o,����&��=9�Ə{����;�Z�Zk�-d`A���^j����~��t����X�$iX� I���?���E�I>��ˋ��p���	��8��wޯ�̪ꌈw�Tp���4z�y��a>�#������J��/����m]���W�yr
�]��H��q �jڟ�!�^pJ�aM�`R�|��l=;�ë����O؈���n��u7A:�D7y���D:xf�B,)sw����k��#U��)<ٚZ����Ą���R�%$��)&u#+O�[�����fD���9pzgh�kD
Z��+K8�
Mm�Z����Hoѕ�ij_ۺ���l�
[�MOD�t�mo�F�h4�l<�\qC='�y����|aӪ�`M�N��ľ�-f��@[�{��<�{���0�_���2��<s8]�<sݚ5kx���Vqz�,U�i�Q37�����.�������[����q,��!���p^by�}�պ�9���{�ɦX���/"�����^�Y��K���2b2V�N����M��b���<u@V��m䱢Z��ˌ�U��RY��'��^^� 6d��Z�1����a;sC?�I�Ⓑ�1*8��pљ��Urp�l�
�T�ϻ'}����i��1�oߓ]Rs��U(C;�U��a��-r��f�`�3�AK�{_�ȴ�TܑU�.6F�lכ�T�E�y�E��C�\�{��{
����}�ќ9sx��M�<����+��rO�?���v����JN�;�D���Ce㝩� �ș��q`�_5��0q"��l��
8��=�֕���?&�
Q�G�2�$�k	��b��󞬫B��'��V�Q��T�s����ו�,�dOYU��/��
��¥@k��D+��1p��sN薄�IZ���g#<V�	��Eh��%yJU�2Z��i�Z"��Eq�+�Z�j��cIy��5SJ'/�d1���Q4�d����������_4�o��k'��?oH�k�'oT�W���"��x�&-�5��	cP $��p�J��f	C�hGn�����rzAE�?Z�؄�u��W���;��_ �\������nҞ�oeҳ����VB��-�j��H_��	��"��p5��,���,�7�Q#��k�XiI��o%�ze)���H�h��D��t�܏N�F�_&��D��Ltə�s>+J�OIk[��kU��"��\��[IvktI���B���ج���O�W���'�Eظ@&� p��w�eJP�l�/I����'��
�LВ�?RM����B[%ɒ���p����WZs�k�[e�y�*pE
�'�XC ��!tPg=�{-�,5+��&�a5F?�\���s�l�UY��A1.�0/��	�3bi4�B�g;���"zm��V�:
x��<A�+K4�u�G6�E�Y�X
����$!06��+���M���Y��t;I)O��}u�$�U%ӡ:�t�����gk$����b�<V�n"��G�w��Շ1�E:=+���U��f��Gx�
�9!� ���M��E��q�S���L�w������aT���-��1�vZ�\Z�W��EĀ�A�f�-M����ġX��/`����7
j�az�\̀�`5"1
�T�,�Ff_�65WL{��&-�u��ns����{
+�C�q]�dɒ
+<xp�r弽�[�l�gϞ��6lɒ%��o>���ݻ�J���Ӯ��$~Ļb�8R����=ZÙ���K�i!��
�Wqb�2	:#�s6�4|5���jD-(�#��'�|]�3u���N^��!�`L2�Fz����k� &���,[���b,X���%ܳ7{)]��yn,+���RT��x�c�iD�X�)Xr�PE��6,�[U�_�S�W��M8������c�,{2pE��Ǧ���_R:pA�OW���Y친�(��J����BnA��X�t쪔��<�;�����&oxy��rX�D�u���$�U���bU�M:����v�pK�k�2*�@��tZqi7{��@fj9s[^r��l���;�Z�i�[N���b|hG�99�H;�s|������0�U+�N���@r�&�J��ω��-�eE��j��
+�<��$!jNHH5}�ôh��2�mj�4�
�ӄ#=3H�<9n�@��e]�y�B�"��U�#��[ kiQ����ã�������9�uj]f„L|�V2ڪ�M��!o���WE8���G����3�A+HJvR~h��@��5���~�jV�q�y��{Q�9�@�Y�ɢ �/;��p�Rx�4��Iダ|s/�S&��n:��ڑ�筘�h�0h��
�m�Tk��-�צ;Dϡ�`L���䊪Þ�k2"X]������
D�R�Ćt���˿�^y��E�{d�;Z輍�ݶW�G�֔�,H6wT�eJ�5F�"��P�F��*I'���u-2;��jD̼�c5�`A�d
1�$��-Gt9;��H(zF`hV�Y��Hp*#��%T���~�[6<'Z�4���.�԰f��
Ru��G�-F:�?Mb����%��#��"{��$ZJr�:R*_����0��	�g�u���hZvc
+3N˂ؖ.-�|�Ax��]���B�����C��Ye
d��Μ9����˃
�7�q�.��=�YU��~u�����w�sπ�@'����m8a�o]'���=���f�_�/��!�:r~���DM��}dC�UI��[ɟ��4= �Ũ�Y�1x��������G"�_�I�'~�×Bk�Y�r���f��	R@)�9��s_���~뫋n#>X4@y������(��f�;q��0��b>�Y.�G�����3ה���Y|�ވCN�x�*�2E����&���p�g;��[;�C�3�M_3��l��H�3MB
��*�tO��Շ^y0\�U��S@�>�d��L����Ey�vH|/^��ӯ��YU�ӊN���O�ƚ=�e��|Cu.�.�ok���
+\��n���#��'�������3�rЫ�Z����g%�D6�,l�˓ ���#�'q\/ѐ�G�Ѥ��}��{2@_���	r�mV)�>�[JA4-���޶�.=��Ȱ輫FA�
��d��OT�i�(
�����>_�ħ��X$���4�sZ!KB��w��4��+>�.3�b՚�,��oS%4�+�{�bcw-�Q�U�Y���Q��$��X��泰X����#��*��Tj��0[-L�]�Ԝ`P>+;�A�I��h�@)-��Mq�[&0
NKbt
�i"/��A˓T@*��&
����$�Č�E?ʓx,+Z�����c`�62��a���\�3��%��i�&����8NY��U�z�aa8���Y0��X^Ky�t�.;Z>��,I��XY��˗+�7�v�F�D��
+�	i�ux�0X$�ŕ��K��2=`朐E�̌��D�Ę�c���t����4ƫ�e8m����S���L�]�.#rg(��ch1~bأ�]f\�@$�@J9��5�6�0y#:Z�(y����
�ܵkןU��p�fO���A��}�xp���AF4{�=I�*�i9zv��b���=�9#�g[�4C�7V�	����o{��[�D�ǽYD5��g87�1%�;������HkK{��d����-cڲ]��$�^�%;� �@$�:���� �� �YM�	`р �D]P�?�O���gF�*�؂�ZM_���Rw�q��=���1�`p߿�%��x�]D.�腱~�WFd�
+�V��eIj�=)��Nض�ﲔ
+�h������M��V�j�?[�B�^���+V
��Z+Y�g�+�
+�Ē�wJ�ODh�e���F�ӧ�3S�r�c"M>������[����z��`�S��C`R��$A7���YF$�~T��(�k�–����yn�� ��JG��iL�X�_5jt�����*�YVI�(pI_𞘑n�O��܋��O{&Z
P04�-
���h���|�����{���u�nq3����΁���CX����U9�햠kɺ��)~�hpS2W�#I���1ۦD� S�g�4����Ӵ�3��}��Q�ܛ�o:�r�y2Vq�Z��<&���p�.^W��p�tMX	7W�R���3p–���X���^-�H�Aiy=�
|4
�K���x~�,.�w�a� �wt�tC�ֆ�B��$��ɴJ�7�N���j6�u
+KF�ӱGހ�V��x&����8(*Ǫ�(;>�>�s�}V�Ηs$��Egu���E�/Qy=�B�s�
+eE��dF��s����2��ܚq�Y����p�q#,"#�����Zk@j%��Ze��J�H�t�2tb�_��eV��
x�ra\�q>{ ��CP�-� T)!�&r2��{�s>�uV�h��-꯰,�Vs�nj��]!��:�f�8�C����yO!�/����}�|�~?�z������w�w��8>���	@���P�s��@�.�|��3�Xt�.�0��V.��_�1��
R�粊O�̀���~'�l��!�#��32~P/��n��%%�[zD��q>�7?-���IFeZ���ևb�ߎ�d`����n'o���H=���r1dl�BW��ge�F3��+�����E�A��Ӻ'<�EU����
�07�3#��_6<c^XK�.k�!@<h23pw!6p�DY�O��ȸ�@l�$�䙐�#�D���[��h.��ͻ�4���ih��_!*��.�{��l�nV��9����Nk��NO;����W���2�to�Fz���Ͼ�=�
+����GT��H�I��6L^�Z<) E�����"��4�L�~7A����D6��x<b��R>x)Ѵq)�������m��CM�9�Y��D6=O���S%JHr=�?$�>���V�Md�{H;�T��O�ݨ��Gx��T�7;#p*������>�4αX�ޱ��I�K,zG��e:�-��NB�j��q�qS5'H'��zKxVu>�K0���۾A��[��D�ʖ�hQ\4����V�H�߈Z�+�&����z0
0
R��/J8#e
�~�q�d�����@�.́�`\�� ��K�=��j�:�q���,�2�3��}��*e3��Rl��ؠY��������5I���V^�<JB�G�I.{�ß��E�m��r��y++�1�J�ud~�!
A���r$+�ѥ�;��c��,�9;����JD��aF��~����k�ӂ�ϊ|
��
����
PqF>�inh'�Y*)LOJ�>7�"��>� N�쌖9����2wNH�u��r���#����&���@�-r�a�A� 6�2ڗ���8vd���j��;�����y�!�z��M�AY�Z�&�{�9>�{�ϟ��.߮���{wy���ŷp�қ�YѤ)�$�}5�������#�?3؈�-*�XqQ��C
+�c��h��[�w��S"�T@�������M�LE[i�"��� �x�����(�oR�Y}���Y�$���0�G!64���Ĵ�{WR,�Ip��b͑ødzJ78[]W���^�´�����q
�:	�*�u�U-(\�%&��Ӫ0+�knhG�,w�{�ئ%?��0.�-�gT�c'�V#��梑iӿ�a���|����%�ӪY�p��n&�S�]�OF�f �8L�"Y�2����G�oMg�
���Ӱ����s���bp�t<G'�ᑸGan_
+ń[>�̛�6)�����>�Vb
+��,0@��d�T��3"+��M�
gBD@��	q�<�<0o	1�'��x�-BY��Ve��	mxH�C٠Z)5�
<��ʉ�a���nv��К�PKIf���3�
+���V?7Q7�0t��Bܖ�5V�;ڍ�?�P�@��]��h�SۙK�@c4�x?��=��]K/@`��n��
+zڄ��By�u&ax��\a�V����b,�-�7�dn\>x�
��%Bm��(D@������Y'{j,�V�R�O˞G��7��|Ü�b����j�;��L�ƪ!ӛ&<�}Qγ����f~N�^�|��^dy�b��lǸ����t����G=}g���J�2�l�������ޢ���nV�?�ݹ��6�7K `�`��T��tzD�a �����=-fz�gE�ǬD��wLU�����!9����� �������	�_$�Z_aœ����^��J����Z-c�� �u*7��0�����)S�mk���"�����=��j���'gee�-[vݺuׯ_�y��޽{�~��ɓ'߻˻wZ��{��)7��E_�T)G&�`m#���MPqrƉnܸi�8X�9㇡��I�����5B91Q''۴꜐\
��x��QjȆ��ޕ7��~�#~�������c�{:ܿwV#|��S<�%M���h\֍mdsZ9�($n�%Z^��UQt�	U٨�ʮ*��Q�E�.���b��(b���ʟ�b�����.���p���U���=N�ي������ZuV���y�tV�	������$h��%� 6$���
|tM��F�����W�f�k:��3��3��������3��3<��=�hS�#25��_���_S�3�ر�N���RÚ⣠�R鸔<�=�o<�Z|�n<�F��:H�.iQ}$�U���~�w���e�� x���X�w}q�V`kyIO:�I��\�ʜ���\o�km���E_�8<QCV��� 𖉾��� �_믹7Ǵ�EUo��{<$@i��tte����Q�x��͙X
����`�9!��C�ss>��ӗ΍(�����s?<4��W	�L�qbe�?=B�{7R�u����/��4pcP�m���i��ͮ�h!�ϧ��{��t�y��T�`�p
(M���h�h���wUy�I�"I,>�����dj�s��Œ�2p��z+��p��S	����ʞ�Z��@t)u̫8JE��iV���Ô��|�&�W=�8r��L�I�O:KlMwAҳv��$Z�OBc[aɍ�oˑku�L̊�#=��l�g��D�n�hJaʹ�zV:ynh{�,Y>-�nf�rb��EԄ��v�Y=�1^ƀ�L�[�/���E�f�`�Zk W�(��	>[��(ﳖ�C�A�8�^��O�["�|�%I
�M�=���*�~�k�YŞ�������o����?r�ڵ�%K����n�*�W���@Iӥ�-}�Rp�6�j"����wR���!6=�вmAJ؎�H�0��)9IV��0��0|� ���
+b/�.�c���K;;?��G�-�*�^� ��6���T��8�
�)�Y]�􊣮'�0��
�
+=\'<�p�/�5"�����n�?�l�����6aq�rZ֢����#���7ȉ��,�,a#G�_D"R┆��ӰG��=kk�҄�Z���9��b��P�<+��_f\�iE›�u\?�bp
4T�o�K��{����x��������{�nz���-����n�ݬ)@�{���X�}�9��|�R����;�%�
+.㜵��$��i.Aq�`�.Z�JHK�MY����4-,)�*�i�~�i�i���-+e"�-��a�m6쯛�u%z4���E/Es�E���g���o�D�0Q%I&�z@�/�[<��*%H:�^���9!�Ws���L��(�]
�K���a8�9E�A+ew��5��ǚ�;-4�~��J���i�QᢽSs_z���/������!$�Ö�/r���p�e�`L���+�<�{�2y�6�`Y0��n�[��`�T�/�D��
+�V��*7Ű���ȉ���-~�eh(������!�v���óäG��}�Z�Zx
+��q�c���"!,�42�aw�y�	�Р�@�����2��Y�(+�ɟة�Zŋ�b)2��2���ԕk��@��]����ۙbbt6qʵ�/�)�1_S�=�4y��O��(�t���� �	�
DU�iʫ��9�ƼE�ͮ@�п�w$��9�)�!�l���s��@eϣ:�%1��§0R�鳕хOU]�����x�D�;�We�%4���z,�~��\���	"����m���#�ӟ�S�s7�hm�ţҧ�O��U��洈ޯh�U��GKx��~H��<�y$p�q�{�[da�|�
�#`hf�> ^�&�!�W�CnwL�sF�/R�o�>�ЇAƽ���Jg���"nA�Y���>���u�����뚹�ya�4<QW?N��7\�-ۖ���I�)^��}�����ٙ��ʬ�q�H�����g���;�&_.�:��ʬ�x���?h��:�w���OZ5A񱯈��0���U�����z}����^"�����|����q��{���]�����p&p��M\+ex���]���c|�J����s~7Q����9�i��)���H���Pˈ|
W&��c�hL!��_@tQJ�����@�;�Ҳ��]�ys:I���(o�w>��ΏZ_�s�%�5#`�f�Ȉ�D8�]��!��̮�F$�X��%��0/�%>-#���MtK!����G��kl��.�4��Y�y8X�(�`�|m�k����bZ�!��m�g9��9��j	ئ&4��a5����͠�����eJ����V��_�9#�8i���|V�U��2C,���U�hv����h)R:�|XKsX����#��jE��xcӡpi�
+$᫷ˀ�=Z���fBG�`~;Z��h�q�E��Yh�Ig'�pk`%wM�J�eG�$��*��D��t}��X"(�߫��wo����^KT���~��<"
u��،:o8يTzJ�hގ�NK-Y@�
�8YsV�s�t�
+(u0�A�+�<&�g!�:]�K��Y�LFdE)���Ɋz�7�ތ���Aõ(�@���a3�/N����0�T�pGFz�g����[?�������[؋��x~Z���&��S��%C�w��I���T�L�(���^M��!2��w���Y�>���5j<��c�W�&x�q�Ʈ]�*V��.��=hU���Z����Di�_
SR=k��tD���^.�X(�0�ʳU�Q�g��ya��i��	��5
[����<h��F�Ա]^���S`�ƐE�Smw%f��ʻ�a웧%j�{�}Y�:�U�Êg&x���8j�S��������I��\�&?��s 2"$�-���Z|�t]�%��3�>���ra� Ȃ���x���4��0x����pPuϤ�Z��5�ٴ�m��"_�n�ݣ�3ۖeb�[���Z�M[�LU�S\n[�T#w%A"�����D	b���YW�X�99
DPv�T!t+�O-�~Ֆ��k��^����԰wA����,Zd������_�#R����Qv��F�2�&9��TЯ�L�Z��D6-��՘� �c��A�c����
�܃��x�z�1�)�YQ�@N��e0�5\jN�}t
���LGhrQ�i
��*���m\��`�5A�O�#z�������ە��P�!�1�$	��|Sw3�����eϬ��GlO�{�/L�`sϸ��ۉ=���NG�qO�X��n�l87K��m���i|�����q1:ѝ�������*�X���]W�Dih�"c["+	���,��PD��(�u�7�J��s��,}$�.�
��yn<ARgg����Z�f�n� �#���XmV��`�N�[���:,cC�KM[��MbW���Bw��
+�Ǵ�DH�����V�%�
�����Z�E��ɼzE[�:����\���{�fPq�
`��f��t�tX=�
.}@��Kb�x�h�{z���9��|��	�iv[��
+�ٌ�#a^Xs���8�tz��YA�5��[8m�g]�'��	�����u�J��c�5,����C��;���Bd����W�
�_��ŋ5jt;Q'��M�4�|�򽻼{��>R��>Z��Pr�(W��I�c���]g�Щ!���p6����-��Cf�db?}z�,�F�����D���Uu��l?�ک��_�3��myILF2ɟ��J��v��ďV
�Dwq�R���������7�ĸ��:�q�R�����?��97�sJHW8$�&��Q�07�mv�CR��	٧G͉)�ӆ`Kzy���l�
+������|R�9,�H)uz��w7�!���Y1Jv>��9�{U���U��pbh�T��?I�yl�E~��+�[uu�Q
�%;y]�w������m
g\k�(�'�gn瞑���9���V��8�`a>�����7���A�@�
+�r���?q��~K�+
+��ˊ��_WDW�$o+kdFr�*����h�pTUvY
��Q`�^r� �s"Yhf�g��ɬ��x<�U�M���kY�3'�t|����`��&8"r��q#�2��#R�
���,�[��H����U-g���b0C�x�g��Kچ8ɸ��|�ҹYH�vl��=��[h-�=KS7p[���+��t�~�-~��h�`E=�BxB�(��{�_�U�&+l�3&�c���
+TYz�E𸯶�B}�ɩ$k���^Z���h�芿!��G�NYå5��
JZ=�J�G�=���üI�#�Q)rK�Y=�Q����~�
Tj������Alb�ku��r�4d!8��W�|,���چ0˶F���Ӕ{O
oLL�֌�Ί*�٪-A:��c$׊3�uf�g�J�0��2��o���Y��p��Zm9�ʉ��2/���T%cM�w
?�4�]ͩ����j�G��/��k��h%c�=Ğ�(�3���Y8�'|�!�E�!Df-���D��?�<jԨ���%J̜9����~�����^�z�ҥm��Ϳ������|�-{Ĥ�?�J�Ls������U������!����A���	��0�I��qꀙ���u�bI?�弧��8js5� �-��w�>ޯ5�>��l�ԉ#��XO"�<�!�/�'�@��֢�8��j�-뾛�/�he��8%�3T��W ��#_�4��FH�<r{B�xnq/"_l�ל�؅��:��֊�B'���aB�
+�q�jF�n��"Q$S��
+�rs�
bj�����]����s��;&�0��
�G�R�I�"�kTp:��9�y�#ƴzt��5���5�P��n��Y��������� 4�c@r�
+�O ��4�?i��i
�5�[6XE�5�z���f�=ޏ���<-�#��	�qkV�Ҵ�̆D
�mQ��O/���?϶�
65sb�rU:7��7#p*(�#J	�c�M�O��5J6���hv���7r��AÈ[!o�+[����k������E�j�;�a%�`&ݴp�jȯ�隖������������L�8��-��`"q�������[�/@p.Z� 1
,��B�/Z�
D��$���iI�C y����꼡�[�܋TD�*OBx���H�q�Hv�6rƂ5z3z��5��)��~�:{��.V�=Z*��W`��Dx�Y�/~D0�e`�*���8�$-nQ�Vӟg$p�`Vj�= 3&�
+��_�۱/��J��aV���Ȋz"���$��^�v·�D�
+��id%xx#����ژ�
ʴ�x@�K��3��9��|�]�������Ajtkx��*w��	>bΌXƫ��$p�i���8�r��#o���&�j�˪����)DFT���"oܸ1q��}��_~��s|}}o޼�o��ۏ���W�T���'  �B�
+�}ذaQQQ��o��Ʊc�n�������V�Q����f��XgT0`t��
+|���B�$�c���36�qF�z�/A��������L�];��3"_��$)o����z�#bcn6q�6w�)r�N�
+�Jݞ���:��x�	�gq��u���/�I�c�0�
*e�C����|I��N��%���`1b(bPT�u�ʲ�k1=,s3iG��y
KQ��� ��v<�9!�l*.�_B���oq�U'�2LV���W�i𡕔oh-�/;����*�'��^�f9��=���H�ț��uw��t�7t�
���DM�LҜ+�B�+�:g0[gf��i�ez*�#�qF�L"8nY��_���g�U�sEOƯ8�J��#Rϱ��u�Y�2��,�K��"�%�b6�4u5�׮r��gE�j2�RF�
h�"bA��W�ڕ$m�����Z�`bj��c�d����l؋���E��ҭ��Ns��;�Hۯ��%�޴C��p�6O�|P�Gl����	�CkӌV�*Q��#D�Z��A=������ӓ��_ #Q?I/#H�MƂ�e[Є�hJ�Tm&���i!"�Od1��E�t��Nf�2&ʭqt X@�n��D�����������6Ub���w�x��ב�%���Ugw��M��6�輶Wb:+��o�T�&�T!����	�<�,����G<3�X�(���WӖ�Iݙ��򧭏,+�)�cU1m~�T[AF^9��bKĀK%%�<�0d�
+7�s�*��T҉+�t�$t���Ѕ�
|3f���n<1^
*��⭏Ӱ|�!�E2N@Lx�8�=�$4��0'�Dc׌��ʵ֫b�(��]J;��.|
+��䉾�>�؃q���z�c����`Z�����r�Fx_诓��?�3!E�5�믿06<BH��3�z��˗�Ӌ����ɓ!!!�7^�lن
Ǝk��*T(99yǎ���?�-����A�U�wi�yY_�Y��T��R�#
!�b���1�q>�&���8�R�^m��;7���Y�ifQI�:&oy�_� �Z㦨m������E�
+��hIV\�e����PhQ���#2�����}]s��r�
+b��!�)~9nل���3�-����m�"�0Kk��U˯�~��M	��[�o�sℹ_h?F�jN�B�ya-�J��i)|":{�u��~���=EP���=UY������r9p��ݪi9��r�f�f"����:N�[N�f#��^�5yrKsw������]!?a��h�ikr�q�,����0m�/�8� &K`q�q;�a�����T[xГ�  
�*�y��GO�'Fv
<'�� rAl �vz�������[�4���Q/���l��li�
�d{�=�o�*�0~'������#t���G�yG��d���0��v��Խ]ÿh�0=K�ƉYI)x���^��*E~x��
�asww��6���Ul��n��$��n�v�N�'�Y�k��]4�i˕�T��%A	l�
�dfE���,:�|�V�
+i��a*M���|�5h!!k
-EZ�p��dO�h��u�knH�9lhS�pBݱ)yؒʗk9lm�������UK��*GiaS75l�� �J�<�M����G�� �e=��YQ����E_4e����&��g�j�b"4�%XAnqWUq^%8͍���/TedV��?�Y�)�av�#�N])5�	�/�r�D���h�V�ŝ��*8���i|�k��ts!l�y�aZ@*�����` 1�ph��d���0����Hx	>h�`%�"�NxJ*I�˷%�W�[�-�w��!2=��]>�)D���>��C ����������=z� �{����
%��7o^�bſ>��SO�k��ޟ>}�u�+V����A��^z�����d����&��!�GFq�J*��e�2���&���I{jػ����iD���ƹMEF�m��@`�V)u�֜2�����5拸�N�~�V���I�HPi8�+�������i�=�Q�&�95�1Aw*��
��@��+Q0@�⍹�����=��^�����K���jᢸF;�0�?d�4F�?�)K�h�kb���v`G#��j�k��h��V?�"b-��m� �y��qO�u��MݍD1ď
�ō��-ܽ/8�JN0Z�����P��"���
+x6�pS�N:�PX��$���ÍK���t�&'�(ԝ1X��&���r��-t"DET����Ք�<���c��D��y�ޒiI������1eT���ȠMt�h9>�kȸ����-
Cip�82! ������&��uI4��k���F����cT͜k����|��D�5w��Z��` �|��-���M�[m'�������.�V��f���o��
(	'�>�mrҖ�]���:����}֦'�]��iHQ)(��]��(%�c�0��������d���u~[Tj�
L����
bBe%��gVJ�w�B�/R�)b�oN��m@�]U<�	P��o��
��r�����e�yy=�#��EȨ��Y���Hs��Q[.�a��?b���������#\'�5٦����J�d��

+1s)dV\N�,(l�M�����	6�/�
+��YY'p�l�Y��d�b��#�N��ԪX���qZ�;\�e؀��A�J<��[��g�p�����/�x5�c�:���8Y�e$�mf�X����O��d��:��f\���
\çC�l�ʁn.�3i^Y��c逴��w����:���Djm���/N�7�T����޽������K/mܸ�ϺZ�/_�����>
��߿��;���\!�f�T��+�t��.�X�:L&=�:�(e��`&�_@3�ؓ�.}݅���q0'���Fi^��¸B �����_�Q	�׶C�tX��q��7�3����d�Vj "��u#����=�8.�Rt�z��{�fl�}V��^6�{_�5Aa�]����ٛ&��JSq�nh
�3��\x�
3
zS-Sw�ߦ�p��$���M�����U��E�X��"{��{j*N�j��BUG���S@L5���v�9`��;�����5����u��zN6
�n�[S�����̩�̬�������	m>�@�ZCw�Ҟ[\�eRY�X��et�SP_�k������D�-�R�&mD��)��Gp('��$qxn�W��z�'�]�<.�JR��yOF�P����zR�i����y���������BW�0�L��蔫4;G�˛ؗ���I�*�C�񝱅�i
�t��
+� oOQ>D򣶽"I�S���y��v���^\CSw�
��J"�h�:�`�s���;x}_�ɢ� *�@�q�gT�c��v��w0s�.~J3��O�譜S����r_��G��C���@��<����X �Cc40E�p�� 
mI�Ʒ}��	��Z��4}�xgG��u�>�c�8l�c^X~N@�p����(?k]�[0�6��n�I���w��/�ɥ���O:�2yBN�/;�ĚҞUH�-�|�����Ga_���2H������1ÀQq�����T����k��6l�R�|��G�B��6�<%��4���d�}���V��ﱍ�W������K嗫|jvp�����
�&�-��%I�y0��C�'ʶ�U�f����$-�[#.[7R�2�l�N!2��]>�";v����ѪU�;���H]����v�wQ�p�Q�F�ܹ�}���?~���3�K�nݺ�g���:t�{����s�����,�`�)"\�P�ڶ,���4�&�Y6I*%]�4��(��è��ϟ�	\`�c_�{c�T����1�u�ȅ��xͲvUr,9
ĺ��䲾�"oj��J���o�+����̧�M�E�_@3�17��O�&��k.�k�k���TyLMȚ��j�:�;ᓁ9h!�Bk�i�|X�*�]�V��u,��7T6!�v��x�'��q�����DK�D����r��ॅ��vG��J��+:ź�#$$���,�R�Ma��ț���]����l�N���*�h_e�-�r�����(�]L\��55��n����nYŞȎzha�piIx<�<�
M�H��i5���"��`[m#��b͓(Ϧ�ZRB?�;�?�3t�ʃ1\m;/�`��>�Q4�5��-CQ�zz�����ϵ�.��[MIut�c�O\%ݧ�r��/�-��+0g�d�T,��M���m�`M҅Zc+酏��2TSۙ��=N�w��TK��R�(���()�j�uS�;�-����o�������.B~�G�*�A�t���/��cZs�E�������J<�B#�l���H�}{I�?
�E��8@)��
��c�)kvZ;n���z����������R�Sf4c�
C�c����Tf#W8��,��Yr2\���Ē\���bΟ[�^G�U>��o%���XL\lQ'�>?򵥺�ʄ"@��36�;K��U�c܈r�U��%S�'P]W8-��f7�,ub�B�憶�<`V��j/t'��-�v��I?��Uʤ���P/׌�ɺV> J��&�mS��Z�1d��ߞ��P�#4����s���Kb���+���5�>��$�|�B$.�.�w��*U��ǩS���S��c���s��cǎ{�<����5kڟ7o�,Q�D�~��������n��v$�–���4�VUWjĀ�����'���v�o�B�f� &�2�h�)��(�51V�m��P,V�1�||޳��6[��Λ����Օ�US��!쪢e�K���
���;�e�Y�i�Vx/f���5��=wp��,1�R�;Fɤ��:9A��9����
���]K��)%0WL\��Y����&�������?���|n�q���L��Q��^�.!�S����&��|���j��w�I��U����zk�
+@'hΕ��V�1�m��	d�����O�t����|L�S q�bM_��27���}ԣ�B�p���T����I-���G[U����
x9"�����A��.,�~�ْx�G���a0
�=�S������Y뭶!w�ԑ����\8��ZR��N��fnMr���*�	�h�2
�U7�+Y��־��S�׉k���Zz��U���8��{����uO�WvK6q��L�HKMg��_���/��n�V���Y�(4��o��Hlʺ�ʀ��pI���x<3QRf�2��
Pc�.C0�-�M�N�:͞wt)�5�la�%������%��F����6R���c�Leb$�=�4�Ix�Bғܳ�$G�<�r����35����hF3LU�ԓ9���gf�g5�w����j��n�+�MiPYv��2����@0:':F�dD�Ο6�C�km>
+F��㇏,�p�55�)�{ �
��?�68B����� B\3�|v�^&`�۲/�d@�p�7J�r����8M73��R���|5D�IO�
�ݑ�>w�_Ԃ8y��=�ȑOU#�>��gM�٦����㖭��"4hp'g��`�q]7R�y��ϝ;w�~��ϯgϞ��|��7[�h�/�h�Q��M�Y��>F����ʫR=�hQ�%.++� ,��a�A�f���k�x�4��D�䏾o��Y����uO��R�`;;<��e�,\SJ��+��Uy9™��I
+�	�;(ˈ�
˲��59�H��ࢡ�)������Cc|�V�=��]�_��=c����e�w�+#��rᇸ}�:.E�|���/��ٻ��)i�1��>_�l�Tg5A�Z����z���U���q� O��D��
+V�K��l�G�̇�99��3o8]���t�q�2D=mć���v�9l���&�Ze^U� �!�d"HwC��gu�x/)�黖>�-��i�g
W�U!;��4;���Y�W	������Oz�T������:���E�Q�vK
o�s&>��?�K�_�&�;�- ����X����D�l�K��V8�:@TLe��DRn
+ܘ�
GD���B�+%
�n���^��jk@��~�M�M��
`�5t���e�$���j�驺:��4���k�eE�'-���Z6�`�,���$wӒ���[v[J�/G����^~bn�]�]/��ց�$:��@}7���1N ����AB-���¶U_*�ń�F�R��F�W����#��L�֗�(�UN���b���›J%�t�&��{$�a�Y�Ff_m�pz@
+&L�8
���K�i�_F�\|vԃ-ƃ�&�n�U��Wc�̒?Θ��yB~�iUN������}�o�������8_�l�02Ucg�j��f$0t	3���n��
+�+��_�ⷊ
O��ÅO��9�ȗ������
���8���_�x�d�壴��+�ayn��4΁!'�J}�qT�#r������J�>ȝ�$ָ��C������wlll�6m�pG������U���/|��7�'o��F�w�C���7ި]����u�����O��]����4�+yV�X<���	��dYHZ˜d0L�]�q�	�R��bk𺙁c�X��6-n�l�˽�1I�^�9r��g�V"��O+Ҭ~+��ˋ�X�C.+n�jZ�� q�(���6g~Er^r���'l�FS�(��?���u��j��$���e��k6�y�����b�ᚼ
�s��#����)0"�ml��xc�P)a� ��;��_Z��m~4�k+.�a;@����k8�u�����K��[:Å�rfWu>m쮍w���n��rGu糺N&'7q׃���.:��eA.����RгZ�
��Ni��^�s�}'5JBz��e+2E��D:�qO��i?C��ߖ��|��R�����e�����E_]�����J8+�	�f��"�h%���B��̢�:N*1@	�����?��	
�Y�\���q��-`�S
|s��Ho�*N~��i�����a ���+�T��i:�1���]G7����!<q�1-&�UۙW���O^
蓴�@���2����<�-eM?����Ƴ���j�&�"����YQ�m�5-�΢�uS:�T�EӦ��<J-��b��WU	mj����jP@$���\)��@�	̹h^oeV�kf�qc��޶�P���\�����A���*�=��h
���nU臢���l��]��Y����g�]�ِ�U��3��)�
+���i��Z)>�~D�s�z�EA��>;�~��j��T���8�'�H��
m�2��j���{��i�аY6��+
.!��ay;wG����
�z����)��|?w=��
C��M��L[�Y�4?4#`�5s�w�ڄ�{�fg"�����"����!2==}޼y�7o�>}zttt�J���S����"E��ܹ��G����Z�dI���'N����?��_?q�ğ��1{�l~�B�
+�=���7}�����U5�XgK���.�w2�zp
c�����di��,%-�>^Q�Њ����C$h��Ô�~���l����#l�k�rf��
+IqJ�������}��_a�&3y����M�PGDc���h�n
<�����Z�k
f���E_����R�;#~��LЀ������K�I�l$!!~�Oi�y
w���x�t�3�.2B�N����5AZ@�l�c�n�|�=J��f�=E`��D_�u�Z�;8|��L�9��v���׊��
玬ƄE���Md^��
+��t��
+������0ҋ?��H�bxm\��w�?��nh}�Ƥ��ɡy
��Z��S=U���3�oi5y��>0.:��?��Fz���e�I���4~='���ν������=�;���M���]���h�	�[�Gz(�jd�'b=��v�j#\�K8M��~�⛖�Jc�U���c;�\����Ч-��Ēu���_�y�$�緪9���5DK�q7���WKw؎zsp�_�uM�K��J^N
o2=`vd�=l1.9h�.���z@q�P�,��(�o5PD�O���ъ�e��?"ȸ��G��2�9_��*�qeE=J�Zs�:��,�Sl7.O*7E��.Z�{�4$��Y��)ex���An911J�:@�R�r�
+|�U�!�T��`��� �|Ȩ�՗�O�I��%�+���h�KL����Ɨ���!G�1��3�A�	��vO�ל��`0
�1���!~`���蛯id�n�s�5f�4;��H��@'��.����
+;��[���B�VI��m�Z@U��d�B4���V���i�+�;�ȿ����o>����SpY�f
�:t���������>������?��%J�e˖ݰa���C�-V���^"������9G�!ş����)�$�U~��Q7#p���dk��SX�/;�a��|�����.�Y������
�
�̢�a&�K��<���"��,Y
;�F�;өTF�e�W$f�	�xC��P���|�gf�g-8]�����x$8�nN��S��0�	^T�{��O���5��4ki�S�6o���F���t�O�JVO�&�qԺA��%j�u�n�ڞ:��_�p�iKr��u�����]�ْ��u2��ם�R�W�+q�Z�~qMg���H�r樾�/������W|�%j&���ch�<U���HB��&������*RHTk&C��<�GĻj	ZV�n���`В���u��sL��*J�
+D�
��{����qP�q>{��aZ�[��p"5��
+�!���t
A+P~P��-��c
�
446���<݁��͸��2
��6�[�l�3\��[�#�B����N�k����e+�0`M���D����� �9���l�~M�^әh���o���Q�\a��q� ;(c만�D�6���;��/ľT%o
PB4��҈�⸈-��lÉ�%�Ky�6��Ӓ��Gr(�q�g�6-��=���<<�))����iq��
>\î0�t�H��������L�D ������Hy��`�,����Jă��!#�rv��JJ���
@:��sLk+#����y6�K�*-ǽg{&%�c��	����V�h(U������-ZI9&#�-8� $MW
+V�Z�Vͥ�Kg0�����oi�M_h!@�+G_�b�@�XY�袝����}Vd/_E�
+
+�,a&�á�`w0x��@���4X��9n3�2@EBL��!�����?
�?�����m��/_>{���?��Z�lY�~��s����͚5���@pwE˖-+Y�d�-������A����>���OT�I�g�|p����>2� �Pb<��2����E_�VH
��x��!Z
+|�x��~6+�
+�a�k��@���=���I�
+m�>�s-���ŁȾc�P)�xˉ�cG_V��2�-ɪ��*Э�H�<�*#�u�A��jޑ�����&��8����3Q�`���:Y՜���t���u=N�K�6>��'���3�?��c�)I�y���qUuVe�'���{��L)p;��.�[��=��.+z�i\	!LgPcw�{��N��ΘJN��g"��ȥ���o����L���l�w�[��P՝�
�F�$E�^{Yҫ�
3��0煱��ŞK
k��

�8�ܸ�9�q��Q�4Ĥ����>`�t�7!D�`$��\Q[PrF��`��`D%��`�m�+Ip	��u�&.{��XÙ�Z�V��{����}]��{����o%5m(�K�B6lË������)@�"�%0m$r�H��p$��Vu>.���	�;_u�7r?���g����]	E����G��e���T=�d�: ���� ��(@y
 �ٹ6-Q��"{�̚v�w^X3M_�(�)'&[����nL�&�x>Ke����Ŵ<�D���ݛ�3��2�+�Y�P%Ɣ:ϊ�`��������ʶ��ZRQU@��v���߳[���P0gň9 ���AD��s,��IP��� **
+�� "J�kN���{�����;�q��s��g��\k��Z�bq�_Ĉ+�i��>�)���B�1�"�a���
+j���L$��lQZ�Z���N�^�dF�_�
}�n�B҇f-��TR#d����d1�-���o�S�AϮS�_ax�m��D?�J����9�q��9f���ጮ��x���с@;�(��+�y��򯏭��Ĝ�=��G
e�h�	!滘4�
gx�l�=��3gb�tW��V봫D/�!���
�b�C'ۃʯ�K�*�L��~�i/r�����3AC0џ?��S\��?�~���Lf�ȑ��ɻv���[J�*eߖ��~���p������*�2-	�	�x�>e6��C�%�LC[N�\��.��Y�bf>�#A%1Ռ�\��Iy�0i�U?�9w�r.U�h�CX��]�3t>�sl=/�屢b�_V�'A����Kc��L����[
iBL�V��� �X�+�a���%VE�J��ʫ�l�	�|}f�����r�:3��t~������)�s���6�q�@��u4д�"hK��J\}~[�J�Ń�]
+P�|�h]��E�ۧ��!�
�0u�19-�pvz�[_��7Npv������;����r3��iq�{I�k԰��UE�v,���/V��=�M����
�A���;zi��n��F���D�4�^Y�B��S�\�
<�Q�1�1�E�r�H�<��U��1�5��M�,�m�����=)5Ɖ�0=,p|����c�>���Bu��8������M���jn��MR�=�1�,G��7d�u�b�r��
R{3�;��Qf�1W�Iͱ[��s�����\\�o�-~�����v�ǰ����ɝ_��b]�K�쑷��ͫ�|}\�����W�k�*�Y�c�7�2�b_��
��-�3"@Fz~�%��L��~�_CF\��$#D��a� V iӆ`�g��*�d�-z�m�^�(��Py�̼�����E2��"6�wX��F���&D�\~�@����+��R��x�!Y�T
+g�؊��AsϸJ�B]T��pJիG���cc|n��A��{
=�N����
+�]�L{���e���5�r�a‏Ȟ�\�\��2�>B�#q;�&�2�@@��?J8"�ɧi3��F��A�_5�(��ㄚi�YZ��<��t��,�!^$�_;��\	�I˽�Ko?TX'zA;B��f8��BdӦM�O���/�=�v��
48�_խ[w޼y��裏��W�ڿ?�
+
+N8���Op<W��_�Ƈ_�H,+�@g����Tc�E^���Тl�΃hΙ������W�Fܷ5���`d
¨_2�]0‹H�^���obu(��g���� ���`�����	�%̢3�^yg|x�\
�uc�z�!�;�%0P]��T6���*�a�qwf�$t/(ve���ŋy�W;�u^3��7�x����M��c[����Ϥ����u��q
�W[]�qFL�͍�������8���4	[]}IuV����:\��*��.e/dDo��Q�x��m@us_ޢ �j�A�#����ٲO��߸��H�֣�U�vD�,�[}`�Փ��$��;���2���H*RjL�����es�|�*�x��nf3�3k���`D���T�
+�9�r>���D/(�H�Ox�J|�(�ƃ�$h�z��.>;��o����OA�5�1:׆�s0*.K〰C;��(@=��8�tŽ%����)��Q�U�:��4j�`f:���3\Y��|~��3̗��SO�s�k2���qz���4�e,h�M�59#��̓��̅�˱p���]w
o�I��{�/�mf���7}������W=�S�%��G3���9��>)�^Ԛ	��v�41m8"�D�!��H�S�$	��_ܣD@"��g�V�J��ɥ%��C�i��cDGz*��+�YO{U�>�xh?�,Mheb6yw^{
+�;*q���J
+�<�O
T�
7������>��Q�#��͑i��"�XX��
�8Y`�dd��`��
s2����"
+Lm�3�RRQ�Q��(���a:�Dv���a��f��vc�|@
�wD40E�VF.R�c���]$y!�����4%>�����v�w*�
�,N���.� �1��W������u����
"���ʚ5ks�1�w������U�t�5k��3�
+2��+��������N^�?�E�(���j����E6آ�{��x`T>����s�ݘT��_�l����L��hz�?���T�i�a<��oAL�����=�Rq��T	?���s�-i�c/��O�X@����/Jc�W�C9�ʤwX�u0��6P�֟�NŒ�x�(�����]g
+UvCf9RI�z�k���ԹI��ģ���ixT5JsP�}�4o��%�L~,v�z\�|\�U�NY	�%6痌�B�崋�8z�5�dV�`;��X�|E�Kf^�4�Ӑ&4������`
�p[�m<y���q@^��9�/'����U:y~g���n���V�	�DP�F��æ(#d=�E4��� ��)�iJ��Q������=|tǖ���+�u�a�d��jz���4g����/��8�EU��9��B�'�m�Y�_u��`σ5�-�~�,�.�#]��t��*NMמ�nǩl���n-�J~ѷ���aJ�x���<���QD\�~Cf:��X)��|��i:��1H�k�
+�M��{	��p�ZY�^��@0�'
J�-��+�Q=��=7���t\�!�Uw�쾫'����+����gٝ/�������1S�5D��R�~å_�����A�9us�G:�%�	#s*������am"Sv0��g���H*dшbs:||$nR�]�zL�0��0
+(s��-U���qض����J?G*���`�P�b+
�����&
���uȝM��Yf�:�Z�����6�č�.��e�Nrʨ��EU���8)ﾉ�[�;��.�� �$���]\�}���7��7 ś~�R��⹟�p���r2
C"T�jcp^�_�3�1��vvU�VV-�5��^4��˿����]��7��S8��P>�;�6���a�)DV|�(��T�5j<���ynn�?�z饗�=D�'�E�S_�*C���,H�?3���*�d�i��B�����!|ܜ�Y��VFa2�Q�Qw�濉���(Le7¿`�wq�ʳ���>\ ���5���ϓ�՝|�D|�ʦ����ɣ��.B����92"��:H~���ߺBnjZ��acr��q�#��}�E;�@�%v*���dT%h���;'��/�������!>ȥi�E�w�ڛ��,s����V�&+z^�V�S�
�p~�JA����)�ߢ6
ܛ2+���M�]�O�MP�*��lp�(������H}]f)��3�����pd�7iZ��6�l=?�U��i�i�Ui��)�s���"�.�p��w�/�U���(���LT֘�AX��c�ƫ0n�R�.Jq�m�(�,6��J�+�ve��O�='T�0��/�k����ٳg�<ax�\�MT�̞���5h$-x~
��ut���<���4�az���~��5�iH�0=�sa���t >ȅ=��G�r~)<%6ӱ� ��Q��S?δ�*ñ��Td>[��D�Oau0
ӣ+���p�9N����t
��	���4�럗�:�G��_1��E1����U�]�fޘ;��{���OpRf�^�P��U�l7N7��3�,�?���bz�[��)+�|JT�$‚�_��>�=bu�?�)���ů�&�Ed"��(��i3k��[yV�΁�� �$FJf���
'��>��+0�}8�x::
+��t>��ha�6�Iq�EN�����R͋"&	88)�
�ٳ�FQ�7
8�R7��
+׶,r���QC���73EU3�ӈ����:�	��Cfc��VX��?�KluØ�*P��Q���nT�i�z��h���֫��$�H���G����ʑ�V��ܹ�����Y,�FJȳ�˿̍LO͛�wVu�v�Q~�x��s/���ग�"鄣|�S!��������SO�j�
+�ܳg��>�ߓ��'�E�S_��*}��J��~�8t)�x��Qr(�t݄��>�i<:w8j��hX\�>^T�Z�*��&��:��GХȻ7�n�U�C��&p�EQ�����/�+/��@å�Ap�'q��9*ԩ{�ujr��:U�T�jL�𑯴aڿK����\MC)����Њx
g�;@�3ҭ`�hCW:�ٻ���������?�h�=�M���n+華
+�{[�-@�e5��Q���|����Q˰/^�&r}|̛3��J3��礖�h>�$t>����|e%<˿r���9�(o�/o9���Sjg;��r^���L��,#��Z���jB�VVX"��4�nD����#i��k�Zf����\��N��V��qyA�@q\g^�6�\�
+�$;|A�����*`����lD�/���Kmx����J
.L����b3��n����9b�
��.��������2��Q:F��6�d�7�(�m���	d�W�d�_���W�;�zvz����:�1�v�,�;������NM�1v�|t�ν%��㎂f�
���S:�9�޷'޲�[�=�{uN��F_�!��Z�J��� b
+�����_�Q9c��a�+�_�oN����B��1B��%�Cs8<��Q�D��'F��������x�V�gU���2�����滛L�..V���sw�]��Rt7�N
+s8��J�f^"��平�:��
��q��Ef���l�*3��ʍ�|oh��j��jM�K�$*k䌚Y�瓫����_(�A�W���+���'a�=Zz�����ļ�8q�yNN
�y@�q�*�A��ʙ
+�x�Ew�x�B�b�����.�����Z����]��N@�
+�#`��c��T������y\��J��<��!RlG���B�M�N:�$n���5mڴ��9���6~�'�E�S_�h}U��ϫwoe�Ì�ZWd���_
 �q�3Y�X{ b�T��Ʃ�;)�n��Q���W/��[1���ќ�$p��
��]���SL�V�'kWq�O�S���y������m��������f2�U���>����k�9������J�xq�Ж'��q@���=7e^����7Nq��������].\���e޾>�"O�}.{{f�*q,�:3���%��u�%8�������ٚKB	��s}�i�� &�����L�P�hlpA�.�P�<xI����(�F����qn�����C��d��P/�s�At[S����6��ļ�V*�We,ռ>
U6�濉��׀ 2�P��S�^�{�A��՚j��oAXq�nB'���� ��(w�;��c.T��<
�fT��[c�������\�Y�ӝ�Z���*xtQ�uA*�:͡�e�I���Q���&i����_�;���̥K1B5>`�0�M���u�-]�r�k3Oq�a�	�ک��'�����S�?��1�
�W�Ӱ����¢�����cʓ}sx��ڹ[L?�����	�yN�
+�HZ��	¼�c�C�a�K��Uw���:5���ӂ��ȝ{l�����8�<�,_89��0b7.��A3�Ò
i(<��Of3�4���*ʑ�ک.t��쑂5����JA�T&d
+� �I���͑�R�e�J���C"f��7;���N`*���e6hT��%�x�b�!g2��v��ுA
+Xm����]c�r5�MU�'1�AO.���O�Ĵ�n;�u{Ӑ�rr~d߼�:�Bm��V.��0�u���"K��]E�l�
�����Q�	?g����2��fUYf/Gh�B������
+�~m߾�Q:�_۶m���#���"�y/zUK��1�#ݣ�vf��J]"˩�5t{Q���<�r ��I��Fd���
���֯E���	��3��S�^��%ٜ�
�S

 N�v��y���)u�/��uຝJ.�]���b�J��ٳ�TwFz����3j�
��r	����*�ڀT��^v���4]3�we��E���O
�P��*(��S
���4�y�]�S#P�jEUr����W�D�c�(��>�)Wq��+<�{Q�hNF=��-� ��of���\�K�[l�ݴgQ�ܫIF����i��	�1��A*�QJx^���fWk��A��=�q�r@;
(�V�[��ҍ�X�%"?��k�*V�T��;
�Z�r{M�T����*9�,�&*&D��JQ�q$9�JU]
+�k�����'T.@Cr/k��@��[��E���RZ��FI����[8���
+/�v_������ΗLǛ��*<}�̉;b���t##�}C����K�(z�~����q�z'�
�4��!h�(�q���='��o�OOIWs#�ǿ��Y����c�W��_>��Q�\^$O4$R wa-�G=H'Jo7�<
+V!L�T�t�}5�ZCkb�CtZ�V�>2����P������ԣ��Ԙw�
+���D�'���9����*�^�3���u��٥�9>9�N&�j�P*��_����\Ub*��J���w+i��4���1�:�ӧ&�隸;t�I]����G��1T›����1�����8��ɀKP`�{,(a_ƾ���@mpp@�5›;8��`w)�us@^a��ǁ���ʾϔ�m/�qh��f:D)�.����aA�%`3(l�z��k(�+�Yy���ظ�O�M���_U��r8V��W�y�-�(Q����I��\��~:��~���Ny���fy��/s�9�@3�1�D����呮��mmnC�Q6�Iӣ\N�Iy���ijWk Gğ��wjƬ:5��y,�ʅ�V��'�	��x9���	���U�LI�7�K8X;�G(F�W1�EHFfQ��hۄ��9��ɯ�8�ߏ�+�s��m�-E�z#��}C�z	'�t�v�6�xqvGp��+G�ߖy"�b�[P�8��ރ���&��_�¨"��\-}A��ޘY~m�I|L�3�:���y�
>�������&���*�����+��+]���T �%S?�ӁT��C'���2+�
+�yA��d	�D�Mk�il�~�R|
QI�����vļ��
Ӫ�#Z�'���4B3LPUP��Lf����t�s�.b��q�נ�Ĥ
+ {�\�;3�-�f:�q���
�^����%��ؒ�-����K}>��l����M�G�P|`��ū���9���ygf#C@O�����N
�
+��4I��,#����K�(Ƒ�_�z�r�_ůF9ra��(=~(���@
.���'B+�ۺk���Niw���]��X�ۜ�p��*D�p}C��*㜎�2�v��UnQ<[5��9����?F
+���[��IV�q�'�t��Y��Ed�9��2pv#F,^$C�=����s]���\x�eF�:T�z��I��D��~�Nd6a�V�0#�\3�t�'�E�O]7���"����v"+
1���jC�۱{1�L@���.s	�b�+�.Q�`�+"ߝ|��#{��U<ʿ.҆"3��a�q_���G��"h*�G#�#�g� #�	v�n00�h�mXt��O2�ia�(�i'�S�!��Y0g��
+8sDv�B�Cv���Á��fy�
+!����.�˨A���IC�W�d�8d/
+tέ��ѹ�ĵx���͚^��s��0�M������yr��)�tf�_-Uꌚ'����w-�L޿�q{x�bV��:����N����ab^� "�WZ�9
3�¼g��"�狀�_23q����i��ʐw�oF(#�

��\��H�.�:3OY���Iqc�U9|-ʯ�$��.L�/�����*1�<-�Ro��ɝ�q{f?Asw43��I
+�$�1�s'��8���4���TB��&�A�E����2�c�!��%`42�	(�.Q�r�����
�d�U^�J<�alTz��,��T�	EHO�+du`��êW�������8A��|||�-��8��2�e�jm,.�t���5W��k�-\��R����j�:�ϔ!M�]Z�Y����׷�0!�1��R/�v���uWh�v�ei,��i<�OM�ѱD��zR�}3G�#h�$
�,M��OO73��v@!�1g��
R��S'�ijҽ8P�8�9�9i-���h�b0�O?oj��"Bgp�] ��w�
N�]
+��C��MQ�Q/���Z�韆9��n��`�ު�S�1
+�bR��H�V��U�2�����̮S}V�:�;c�V�ߪ5�(A`q�5>�s�C&I�*�����\��0�1����[�0�W~�ؼ����VrƗ�z�'V5�(�U�%8٢�C�S痊�	m��b���v�6�ޗ��:¨���a�p8\�l�*�g��{b�O����^��d�T0s�I��<��e��\�
+E���We�n�ɕ��v1��k}uw,�b-|Ly�����[��[�=MG����
�G|�9�(�?���S^$Ҕ˿�4C���<1
+�U�G���*�>crޝ�izD��㙺�G�T����J�8�0��V�
+��]�b��� G�6"��V�pv�*3j��t�/��bp�
��L���9w\ۛ;b+�i餼{@�9u�ľe7Ҁ���@
+�� �"��Ձ�{KlC72�v���nʬ�6���w�[�����!�(sD��� ˩܆2GK�q(
���j4�+��o�Pg1�]�
+�EZ�GQ5N
F��h'�~�pzj���K���y�iB��\�����]
7eV<T�kWƲ�����׎��U����x)��|��A�|ezIU.F��5b"�����W�
+�qR��h]���0��K�"m�uAW��s0�칮�I�,���GE�Ȍ���Il\l�5\9�_��c�iN�O���ȶϷ8�
���^Wf�͙�8��
+4��%:�NVL�L0�ۈa\���b}���/�e�Ǘqϵ=,�Rt���*���<'�d|1x8^?���t��;�~{��ֵA���[X��駟%;��P��a5ѫ<>>&�\�`A�[�̄�����3��)=�^i�i��P��.�qƬ�u����7?���z�@@�}�S��)c��LV�D-�2@���^�Xy�F�߈�����w���נ�?>3���f�g�3"L*��/��f�3��.,�$O�8"LBS8�^��������Q��ه�|�WXJ]DM��X�x=�w��@�}�nP�*J�A{��N���v=��x���U��M�\|��U��q���G'�P�D�`O*��St-�9en��<m��D�U
9
+��0a�b𝳇�8å�U/}…�M������w5IA}ɷ��<r�9*{�Q�89{������;w��՞�yѫ���)}\�G��L!&��*���$W��}W������G0HEf1�ѢL�Y��CyN�\�+u�^�$�~��?K��t��6��O�D\����	���"��O�gdj�ƴ
T}"~~/V��@�Fuj
���#k�I0Z���"5�_�߄o�>��i�eU��8�
���.�`6k+��7�x1n&�0�Ʊ���ʏQ���p�(�"���ҍ��k���Q���b�b��-��;�"z�����D��xIA�Hj�m����	rE_���O�G��4��s�$�h	d�E�{�� ��
�7I��
+:g%#��=&w�F?�����F�Z�ш왌��*�����\B�V��d��ϧU?�_��
@)�:����}ڂ|� 8�׋�6|�."&�L��GXt�~�C't~e�=+����
|pp�E=�2𶕧d�<?r#e_���~�k2��az�1�;��A���mY�>e�vJ���7��W�z��k��,Tr�H�c�����
n
v���4N}�w�h�(`B�;_��/b�tR҄��7M�θ���c���t�{Zܕ^T~5_��*�x1v�ļ1T0&'VnY����;�
��V�	&vc�!��}��(X�1gJb�j��%�W���l����
+}yͲ�m�"aL���]�O�X�dfl??u�z�3�~�_�Ek��*��A1;��Iֺ���a�L*��ʃnc6*��(�k��˪e�%����s7�Y�/��r:b�U���mպ�s�V����K�6����nsN�t�1ߺp��H����j*!<��՗�Gpقa��-�,vc�	��G���ۮ����-��7؊9��!�ip��D��'��?�����=G�W��K����1�S�$�婅��fש�2���i��
+U%��eJ �z��X�Y�V�b'�B�K"�X����Ϯ����ۈkɽL�RT��`]_�Lq�ӟ�]�
+���w��_'�YT�Z��R/AK�z���W
v�����u��Ej���+S�B%��yt#�H�4�a�͌�_�݈��ڈ�\)�[�5��v�pF��
o4��%v�$�>��ˢ
+�0�f���h�R�3�(^l���8,�S�|��qoS�"��|nj�N�_�_Z(´���|r�"0!��o�b�t�%�Ċ�a�1$Gד��^�1ʣr�+��Po`���U�52{�H$�*ꦇ2鞜R�*����g�8�r����>��+���w&�M�cQ�i�
v���$
���0�\(a�����XI����<�6��t5؄��Z�}��TE�dDi+ �=~H�3�/$w��{Klk�z��5��r*�e/L�8��4�����sk����=���ⴍ��!�T���t�.��
+�+3[��ٗ�`� �����U]���{������F�0����2d��v'��9�ʃ����9��	?7��sgծ7��������?�Q��b��=�p$n��S�Ҋ��U�iU�r�̙DS#��U�Xq_����kZk}���nμ��9Fg0'FЁ��#Y�>����o>.��Ƥ��^���q��wY3����o/rKF얊ǭt �%v�4�9�,B`{�Ɛ6
+�,��i�^�S���|�4�[v��^
��ܑZ�ݦ��7����s�h5U;>4�J����E��L�̘r>8�28@��3E�p��~\!�Y��6	<��d��!EǺ�ޠK���Q�|@
����y�1Ǽ�����w�-S���՞�y���3͉1�}
��/r�С�G�Y(	n6�h�DƧT�wcb�6|�;T�-��j���S�D�x��um,�V���[�G�e�R�d����1���:?��4䫙������}lcn�%�I|�3#�1�A�̜ta�v%�ޣ�:�J���(U��^�Y�JDI"N@���n~���_����8 Wg���b�#"��@]!��8��[J����
GQcc+
�In�4�`b�3�Q�x7�*F����y�L�}o�(�(%\K��r�o�t7��S|��@��=�5o�����(�Xb/�+� e���}��~;��G�����C�2����#Īe>�V��H���|@/a{x�lDv���9���Qj��1���(�z�@�	om^b7h��K~���c�sڏI�9V����D?�**x�6|��ܦ�k\6%�t�
�(L�3�m&R0	<]�&���@��(�?��˷f��"�N�ərK?�%��{�|F�����ڨ(�TeJv==�tE���
+7�A�[�[������R�P4/�e�ˈ���R��?��lZ�W�r��db�*�L,=FA�f�, �(�
+?5S�[0Q�S��8Eg����ʭ�V�?�N
e�wU�E���'��؏�v������/��Z����Vi�wx4��1dH
O�%��V���sO�)��E|��v
+M�~�kd��k�U���3z�6��Mݏ�pZ������;+��ٮ��+]F*�b�����iu��gVI�5�٫���\�C���y�x�v�=P��z��Q�5�!�y'��2����;"{V'�Z"2�s�+��'Pxkwi���v�͏��X.�3v=ȫ;;�-�.�,�<B�Qa�Q�8Y�V�3f����ӧ׬Y��j�Ѽ�M<zB���=>`�,�Ɣj��Ȟn��ĸE�'W����G�d��-5�˿��<��~1�N�sv�j�{Q�OF�^U��{�YA��D��3����*>�
<�n%��9�B6�v�щ";
�Ȕ�W��`.����Q�v4̈́���d�# B�{��_ȵ2�ߘy
]�8�q�
����#�n)�[��t<�<~zK�
�B���*�
0�YA�Zb��Q��Ks��F\,�~K���²](�[#�c��az(D��{^j���qR�\p0�p�H��;�z^�t]i7—
^�r��<���a?�Uq탊m�
+��-]���0z�pB�,匎@���*�1��sƠd��M'�g��E�����”i���)���F������sPt�Bt>�!�eV�������V�����/O�>�+���h�:CZ�oLO�t6э�
+��Ì����B�/t�U:�N|}��26�<Xb�˂�`��X�*
++p��!P�=�
���n���F��gF�Ʒ��d]A$��YaM˿���"��j*�Ӫ��73���g���|�K\]�IW������U�
q�s�r�ŘQ
XAR�B6UCd1�:2{�ʜ��W������� ��F��z�HIX�UK������z+
++Bd0c乏`PZ�܇Aߞ���8+�ܣ����uv��zX��w�X�ہ׬�w�[�:
+Ll�yх�"�>�h>��w^�UA�w�`tH;�'�2���Wf�6�����5QFG�
��CU
>�Bi��z��ąZ��=���*�zx����M�0�J��Dh��%���.�
�A&=���y��7��sdLn9�o!Db�����[�A�/���r��n��E��#0!g��]��2?E�8gd|���0Nug��dE
,\?�70���#s�f����J]�k�!���ʼ�VέWJ�tW�XU���.�5B�Uk����Y�j�ψ���x�4@�<pq�:|z�?�J�-�����M��(��h�I��Q5�����(4�
GQ�9*�y�;E	�%�1pGKF;P�
+Q�ŋ@Q�T}�C�2�?�3z�k�:8�[��h'�؁EEX�d���82���3Okݵ3ا��`�ᚠ'�E
j�&88��C���:��~�D�ʼ���tPq(	�S��f���(�-BD[��#�㯽!�ګНY����K!{I!*�eO:QV�8��W6���P4��"_�u!�{�X��7vt�4�����q�
p��/~���?���[Ѽ���r-q�
��=��r��/�L�*"�-�d���â��-���NS��3�$�*XG�'f�Y2�u��$V�Ie�0Z:�+t��k��*@�U�Bl-�$��	AGѫ,��߬����-��8�C�^�;H!:�1��95�ʭ��o&���S�yQ���LF�&W�a�y3�nWC�'Tn�P���WX0��b�KT(��ڂpD~�}I��)�]a�&���N�C00�):��̓{s��K<>ڧ����}M�L��|5������]0ԅ�M��=r�j�7�9�ҬP���=��9&�Ua���	��)Rp�
�::y���7���?�b/�b�Z��kxd�p�CdS�I�r�F1��R���F6������,�<0NC=j��UY͎�)9��r���n'�=1�}F?3�G
+�Y���Á�}��5o���c�q�Z�l�p�Wy�a��K(�)U�
}�,�i��aF1���ر
+���7�q��՚0a&��\N�~.�
��[��T���X�
+]�?�N�^@���
+r?/�-�*Mg��
>&V��g1��Vk���;��8"�\��ytj��4�u1f�X���rnR�W�.p�O��io�6�	�R5�,�ެ���G�
C�������@�R�Z�2F���?mF@��#H`WsI���ۉf�R]�95�fPߠ�Q�P���NF9s�l�U��s����:�`&X-9��n��)�*-G��*�
��h~.�y�N"���w���B������qd{�x`/T���]�K6R����)(p�-!<�o�d���
���@�w��O���K�����s��̢`��[�fV���I�H/6�����5]�5dF����'���0�Do{w�ѱ���2���p��*�f+�8��L�Bt�=Ρ?�[1m�΢)���\�m_?ݥR#��z~*<-5�s?+���ax�0��(�O���.���6u��OG�S:��(Pa
�hwѾq�b��y/�\��BE����5�H?kw��I�'�݅�`|jw�	 Xb�`�^���FF&��i�Y�S1�9�]n��p�W;���?��A��<}K��?��tF�Y龓S��SG���S�F��B���]�S:�!���,����;�1��u#o�0��EE�WOh��w��;��ِc�]vʹ��E23;ʨCT;+��@�(�;���àm�ܑ��:�e��:���p��K�q\κҨo�=�ŕոK����EL?�o�����j�c-~��-��s�r&�5D�m]�i~���?&w�bh�8B����(�?��k׮]�����ݖ���^�]������x�	�	�/eڮ�@��ݖ=SV��HA̡YK]Re>.\��$��6EUoT�]�E�F�N�\K�1/�z�3��T	��~;9/h����|���1*������ǯ,�z���Y{�+��C�˶�F�Z���f�	H��e%E��cJ��"�sς�ϴ�r�*4'�B�,��=���y��i-�U@�|	��ib�T�ͨS��L~�0��3��/�_	�C�.H]�e���+R-q�sAIZ�v/\,{���ۊ�}���$d�Ժ�U�
+rio���c��	.D��P~�X���cLQ׎��q�
ZZ>#v�B��aD���)(h�|�Ub��XM
z�V��n5#��f����̓fa�֓'�'*�fʹ�U��G�N�6H�%��aܕ��Xx�>��9�ú���0�%9��^����S��z�,�!\�^$}���㹋��Y���t>�1��e�����{���[
abd	1"6�ab=�L&v���E�+$�y�	��T�ԗ����i�h3w訜IXs��"zt���"�
���qZ����a*e���)-�g;䅫ͨ���Y���3fz�?��B�,>�ȅt�'msԖ����Q�ǣ1X�Ȗ@$�td�tϙ��Q�p>�K��o/J=�
hˉ�����r��K�Fb�v���e|6Sg*B&�E9���B_1X��<H�`�}�V9D�&��>7�8�c�ɦ>n�jWŖ�����B�WBwȍ�%߮M���A
4�$<H�6vI�^�'�_u�v��EAA_8���
+�����
+� 5���X��v��o����n�Q�bh��b��7M�I�{�����|(�r>ژ܁H3_�o������,2��4�QE��.#QKU����S��%����)��@��d`f� �Q(
+S6�S���:5��'W�}\��؁��Up�6@yL�`�xVTۇ�Ϣ*7�q�%�‚D�ڔ�|�y�����(p
б�f�2G�U(�v�ű
H�+Gv�n�e{%,��|�ޏ��i^s�[j0��&kc��-o��&����@Db���GC4�E��<��xX�"m���4�m�*���^�E{F;��z�
�z���@�BU0�*���\�>_���l�#���.?��Z�6��,SŽ������M�0����+�I���<r�b�i��Z.�t8���D����3�˪�@	=Q��p�l���7f^t^F+������IL�|�f�d��(ݡ
�����x
�Gez�a`i`�(�g#�
�K/i!}�W��Km�r�\�SU:�Cf>�C�p�/O�������
+C~�����\;�k��{%�I�`�h�f9�ɸ�9"PZ5]�m�5��C��8�C�T
+ǯ������^qk�WCX�2V�v3�/������by�4��ܴ��c|��
+.2��b`U5�����d������s�C�e���?/�����4�㒚

���*�r#�UQ4
+�c�(=6���D�61y�K��p(�ԋ3����7{�Ι��v���S�粣���\K����xE� �x�7�#��}����b��خ��Xs.���
����!r�
+�4�P);�~_-�Dc
+�;�c@ɈwB
j��e��B�r����%K�|�����V��y����4dV�����8f��J�0�X�*25ءt�
;6�GR��?�R�J����M�v�8�N���[���f~��Z�|؁��j��z���	~��3(�sJ�k�k�����`�W*�AE�5��&y�}
��Ӣ\]�)m��%<S����z*w}+-�1��4�SaG~�)N���ӡ��;�4}x1�&�g~���Qt�e��.T�K'a+r��@švmP������BV9����1��Ι��m�P��� o��X��k��P�
�&�=�Z����.��C�K�Ah��^t�	�[�\�mͷ"�܊J�|Z�0��X���Pn�:4̣Q�a']�H�OGfOa�M���5������|a�~6�O�h�hX��z��e�,���Ё��mx��
�d��A]7H�8��-'t?&�_l`��y4�Sm�VW�X�z�y�g
����(8���pZ(�������ݶ��G�CP�8��9u�vƅ�7U��V _�P�4�K]���l%�y�k��sk���v��N=��	b7]�W�@9�\YKQqln�br�;@L��Π��C��H
25)�A`���=3�ֿ�	q��Ê���QX����� �^�!r�=\ʓ>aZ�����&�|g���TxNj��X?݅�M�0K/Mc���I��SG<���n�_EƑ5�H;�o2cm���̟+�4Z�0`o�:���rA�.1���fv=^f��t;u2�
+��ѤLë���^W6��7S}���\�eUY�oZ��E	��w�,`�# �k���4z^�-f��Tw�]��uh-ڏ���s�y�C�/?���B�?�J��Zưs̐�y�0�ˀ��؊}&Vn-��(ɷ�rƢ?'�5.�1��n㌚' ��k��:
Q�*�R��fEQ��D�T���3k���Y�����0���ĨpW�2Z2�b�yǦIyw3��o�����eҿ�;C�����W2uA�P�2>]־��%z����k�P��3�[˩tv��N;4$yiU��.��]�=�#g�xq��_�Q`Z�6�d��pY�Φ+)�Yw�m{A�=4�rrD��ج��*�H��/��(s���=^F?�3���>@�:)
AI^!�xC&�,�>q�ELj��
M%��/�����L^e�p[Y��uPn���yj���!�
+;׎�Q��V-ln��6���8[\�c]��4���I����K�((�[�J��
]��r5F����:([�Qpꜽ���9?_������(�!��L��+�����5��F��6N�$�&���<\<M��,�b�	.0���z��.�K�u���s}fiG�~ \��1�=��ϳ�F��Va!]=������:�)�)�$���
�lR��zO3U{$fᐬg�W����EK�y3k���c+�L�vZ��-�Bq�[�Z\p�*�.��>t�2a ��4�n��x@�@
�;35���"
ʿ�+1�p��tp9�xѿ���NJ����?L��4�Q��t����Ϯi���[�����W�U?2�:�B�p0_�+�Ũ���U�9�W;*q�0��6���|k�F�3�Pe��2B�8��ջ�Yr���!?d����p���qu1V:M
N���J?q����v<��k�9b�|�(������ܲ�|�
�8:g#[T��q���H*���ʮm�=UQ�w��B��|(�q���6,��5N�#n�Y��?I�8��1�m��J�<W��A7�v�q���'2'�n\�Q9���fzA�G猞Z���J]P�*w@�L���k���L=��F?R�ԩ��!ݘ���FR�ؿC��o�(�����ڪ�"o;����D�
T��6W�1O�A��`T,�Qp'dT_���(m&�@�l��9�#Ή����DŽ:B���]-�n���BV�o�(��ւ�޳��U�Y�J|�M/�G�
iU��n$�rX�9S�Ƈ:3��é)���
+Op�B�
`6iQ_���^���K8�����2PHR��/[��J�����R���g@����Ooɼ�q��ׯ4.�L��Q���
܂�
+��$�D�L%�0�8�C�^��8(Gi���?S폅���ւ�g�!�z1�ߐY��M:��P�,�Xɪ�r��(��S���嫍����`��m.������u�һŚX�9<{.c7:gԤ�ٙ���@�����S$�����;3�Ϣ�}U ;GX���H���Ά��D~[9�1!�Q�S+�d'Rf�q)�dǣ�p-TU+��pj��c:��tC�t�Y�S�Ug���/Ud�ŕ�`� �=վ��7̌����|�v���T_lƂ���u����k�QҌ��J�j��P�-�D��?R�b���ҟK��Ρ�{*��iÔv�zd����	��l��N�"
t�])<Ԙa�.ZGO��û	27;�M��Lee�@!D*2���?�ܷo���[TT��_~_����T�l�2�9�v=�Hq�7��:��1�C�_=4��Ͻ>��Y8�X���
.'��?�n�,��W||��	�
+&Tn;��U�r�`�"�Qy0�Vs|�/���*��������><�ZC��w�'Vn��s
,�
nW��U�ȶ��C�,��ʛ���D>A.U�����ֈ�t�
`��`2ߝ٬l�����t��a�ҙ^eu��,��N��� �@9�6ۏW �™_;�]��y�/4��o�,Ⱦ 歙���
��<��X�N:h�yɕ�yGf
+Ⱦ�6�}a�rľR���2�y�O""�墔\Ϸ`(��5��p�V;��q���s~�W��Z�j+~<eI,�U(
�F,
�ha�d�4U0��
+���bg��9ٝ�wߣ�S{�ϫ!�[p��8qhP���[\N�����5�#��8n���9�1��/����;��p���`+U)�~�6	�v]������z�9>���;x�ս�p�]Z����u*�'r�s�G�I�sڠ�1�8��� ��"�����Wc+�{<����W[���/'�x�s�n�A�U�����`M�8b�%�ֆ
�KY#�}����g�5J�+����M���p~*8=�|f��/��_�_�K���]L˹�O�'@'�=�fSZ$�cqK��&i ⦠�܅9ܺ�>�i�E��#��Q�ʙV.�X����I�_�~�س�:�����F�����y���:��1�>���>���By;ɾ5t�����F����Q��LZ�A͠����wdޗ��=l�[�������w+W���[�|)eu(�È�zZ\��LPx�`��B��jz�?c���a �0�c��Ȯ*�ʒ�Fd��ʚ^�/*��wv�Jc+>>�‚	�����k�4�n'������_4�O�k�[<�����
+�nj�F�ա}���?%Ų��Z�����
�;���D-!q��Z1����Z���%{�*i8�,�eijPf$
+�`��9��Q��>�bkA��Z�|D�A]d�
+D���]-���pko���$�2��
�T�%2��7f��X�)���D�qyP���t���������N�\(�۵ST��wc!8�ȍ1�VD�g��Gqf���NZPr�(í*���k�N
j�gAˡ��:)�]k�O��h�<���r�	�~���S@��_�į@���Q{�b��
Κ�ݫ�]�6���=�$~l�����f���P�z��
+��_X*2P�0T��R+�¬�`A���$-b?��#R��8��n�{��g���8�W��<l�C��8�G"~2bw|�(ev�Z�6��p)�O���g?BOs�ѽ�V�K�7O𕀲s��R+�qA��_|�C��ù#�2:gL߲�=�냡LZ�^dF
į��}W39XU{���$߂��n�1����
+�K>���4����������s�C�)����ke`�i��?��� uu�\�!/jU>eХ܎�0����!����cm���fs�=�ν��DƑJ��#��)U��T��ϖD�*Nӣ��h�����+f�����X]͍�aQ�s�bS�C8������mu!�ڽ��^�I�6�B��rk���C�Ȼ��G?�Q�֭�}����/zC��'����z8��e̢q5w�؊�=�_7�r;�͡Y�&Vn5:g���
�A�`Eދ���ҽ�j�ň�Y뗈���'��5��𧑃�χW����;�N��$�S4T��L��	9c�����Gd��Bk���Z�w}
&s��=��ff;-�0o�42��j�e�U�}ލr���Q�J�J�6|�|�[�y#��?�ϪU�m�Ғ�c�]Z�<g���f[�6n�ƾ���
mJ�g��V�V�
+�P��gf��B;�խ��<H[�?H�?r��mo$��
��)Vי]Yѭ_ڥ�1z�'o�
����"�Ns��z͑b��~�>:AqSϡPn�
+����hհ�w����|#��i�*�MOK�(�f+�b"=|[���j$u8b�Px-N
6{xXԻ�ŀ�1*��V��Z
+w���<����&v�bԈ�4?�R�zU�q�0;���ޙho�0.�%_{�'+'w_�����ۮ��s}.����@��Dz�0�"H��i`�2e�\�w+����,��x�%����􁘪2B�6X�#�g���.��X��*>�S�;b���
,[��ڎee�D��Kj{�LF�)N]ejާ4%�;1J�6���?��
�R�Mg�u����iډ�|I�/�O�|*/�(��k��Q�9��`�A�8�\U�޷gֹ|��z#z�V�\��v���i��
}�#[���e5�e6{:�p6š�G��me����ޠt��0��抲���J��l�4cO�,ad��\H�̓�Мȉa��+�GA$��{�����������m��D�M��T�����r�����G*�D�xEUo�V�,�w��UX�:`Wǐs���Ɯ����ZG��N��7H�A��YOϨ�;��_�]�3����K}�̦��[����E����f4�ҍ�pw�2
��A�W#��Lmzo�&�:����<�tO���n�Tj$��~j-_ߊ�q'�ʋcN�B\D5�dK�u�zy=������Q�
�f�gZ��!;���{.XȈ�)����Jk=qe�vQz�J+`K�T��u�����ifG@L/������]��w8�����2�^*����:�n�A(��s�Ѻk���
ݎ���<��{v4�z&��}i�(��T�+�
n
�|�+�yu�CD��C���D3��A�UX/|X���3D��c^	o��$�����ٛ�H*b�)�ǔ�L��Z���=y=րK�xwǝ��@խ
+9~�U��=.[6��3��}.{����)�yR�'�Ӈa���W��k�f�bw�5kQoA2
���P��Z�A�\͐~��f%�Tǡ����܂, S�]<�bo3����*�^����
+[��m�}��
G���P��Q�<������<f ��4�$��<M6�"�$
f�NOM]g�~���N���B &��9������j�`�=�9qE����ok[a�C8��VT���u���c�8�ۈ�s~K��,����rV&��P��
+%V�P���ZU��
E��C�
٫�.��Im/����
+-ԑ��bbH��i�_�h���ݷ�{گ���{^is�H9Z������H^{����,U��i��V��^�w��#/��Ui�&
��C����0����@�s�
gS�]��M|(�z-�&�� E!o��u��s�%b>�ڥ���
+�
D�rl�>Q�Ʃ �„��*�4���r��I�|r�f܂Y���#Ă�[z>���UtF?�gP�LiG�z[J�6�t
�.��ϵ$�	o�yĦn��\�X'��������
�^a�c�����.mp��X�3�+�(N�������óg�ACKt���p�Ʒ六3P*0�	_��q��-�7x{
6r�Ӝ[3o8�E�qk�3�~ak��h��k��w>�V�g_s�{%"���hG�!v*����D����毝d�]#d"h
+%��(؛3�v���gp
T�z
~�ċ(�9�~�ֽ1��snj�nĵ�[�7L�`�Ӽ|
��{����ؙ7��R��m�����l3�
'��W.�Ry�a��WHH�4��ͥ0�����:ٿ�D�E��=�
+����Kf�{�豗�]_��лp��2���:;5�R�[a�����Ӆܸ��f��-�~x�u�R�"Ƶ/(Ya1���G�X�4e�~�>�`%���2�����9)=�r7�q+o�;��EҖ\�C����K�����4^�aONM��8���I颳�=�����tJ���t�I�љ�v:
�RJȳ毣Ù�f���<.�.Z�Hv�17b�p&#���`;���SEyn0Lr�7�v��D�q��?����ߵTܩZ�W��<���D:Kȋ���X��"��rZ��4䣱iY�i�7kWᤗL��8!D�/��(�?�ܼy��_���u��7��w��]��WM��S�5ѷJ����O�/�U;��P%��x�#��
d�K��rbރ�ʽV�/�kvF�?̨���9���T��ƀ T
�e����3V��}�js�K\D��w��������8�ALZ8��y��}��P�����������F�}��Iˬvj?Y{�:��w���b�x	N���DO�W[!*��1Z.V�l��N�+��O�4�Ū��w�r�GBeD�o�F�����W��@��hHY�x��Qs��k+׆��j-��WD�Q�hv~�S��u9��H�_��K}�~����i���vT��P�Ҵ����[N$TA��=J�F]{[V)!�H��h��ۏ�cEih�2�ەi��.]�6s���m�p�t������4\-F_Î��.ݖY���m@���L�
+F�6���Nh����^3�c�����1���p�����R�Ƌ՝��,��E%�����nw`0N�̋�yfd��9v1���ח��d+���De|t(s��ͧS��5Y�u.–�~�9��Ӗ�~m�p.$R���b���@��
r&����c�n�:h����_������/;c/�'�gֹF�Wi3�Uv�-|Cf���7���\��s&c���gK��S��J���4�t=����_id�E�<'5�|�*�p9h�a��F�O���ƻ3��>�#`T�7����R��*��)�'�qh�g�lḋֵ���oTPf�����ú�I���-X�	��4�2�,�v���h����p���#���\��l
ٜL�Yt���ݎ`��Bd�������G��X���g���|�m��bhʽ;*g�B���Y#�g�Ѝ��0N�؊�M�YT�&b���)���Iy����	oqb�֓��7E�����-����Kh�;Hu	��}�\
\Ы�*>��&Tn��p�*8��؊��`"o
�!��]W��
�=�y�_/9�C�כ�	ʬ8H�X"<�6���������ǡ)��*f�P
+��*��P��H��\��
+���h�5/�@�Q��p��\R�(s�V�n#f��K������wn�?w�����$�L���FA]�F�%�4V�v����w�k�z��Zƃs:�#y8
+’��iO'�����1�����9�	�����T6%�(Q� �u����vA�N.��}p�(�����}nj-ƹ����,��U1"h4�W�]�˫�^�1��6��j7�k���w}�����x^���g@�=����d��D
q@u���U���J)-q�%?G�?P�K�;���_?�b��������̄����$��R�$N���M��������w#��k��D^j���t�e����<(Ƥ�I��#�Ͽ�*�F��D���8���"�lX���;�jD�lWv6bl����L�%�%��T
gGᡵe2�0�
+C�b�b������3���������?����9�c�^����8/��pb�T$e���nU-�!�d�+>y'�xw,���3�91��J�����n
��[T�����6������m���4���b��P�)�ʅ�;Ɲ�2�`(�� 1/;#=b��@��#������P{Q;4UV��#R��T4�!ҥ-���C����;/''gذa�wC�a/��v�>pAu��TaOUi��N���?�R7�N��fh��`q�_����cL�2:g��j���5�g���Q�7#���+�,���ƗU��ۉy
	��'��7**1}:�r��Ȝ"���p�����J �
+�4�G����'\`p4;�sL�oEF�2�H���fn��~\��oQ�����T�H��
i*-�����[��<�D:p��UL;�Jձ}Ǭ�-_F2�-���:�����]*P���i�W�"S|k�-�
+�4�G�x
+�]��j�\�����BQ�
+����v��n��)M��q\���LK�N{
��Ǥ���n+���λ�(=���S�.��q^����8�^?݉�t}1�d�M0
+�=s^9��g��@TU�#�Yt#
+hp+�{��_�
t�ȜI�N;%���.�#��
+~ۧ�&�~�-���*�b��T��*�4H�K��<O�RC�5�xQzL;��x:�^�6��%ot�oi�S��i�KnN����c�R�2�f*�x��w�jQ����H
M�U�_�,��ܡ����
+x���1\�P�"�j�ٔw���
�ڂ��k�*��j��
+l���1f�����y�wU���tHG��0~���KӨ;�t
R
W@��.6ǭ
�3��W�bz���R:�Itf���4�ѿ"M
L���u�'i9��J��J'���)�-��4�6X�2��M�F&a3���f,��i|�ҥo�0���d�!#�d8&��H���c�r*"=Ж�'�x=sOF�f�$�->e>�[�֩М�$ ������/���?��[�|�C�r0���
�T2�%>+�A�_�'R�y�k��|��EN�3��r<s���ZRT�F|�q{	&��ڟV�n�ܐY#��M�6��<W��U���=�0ߋ�*���3���h����D��2N�QkDV��Ae�#2�i�
>#����6�"f-u�1:͍4�0�ڑ���{��>�/^��s*X�D�!�s-Va��*?�:���)���΅��Z)s�����Pg&v��u�	Z1�o�E+D{R�
+��AC	�e����ӹ��.��yX����]���Z���v��壃��^�E��
`���*���(JF
��M[�:�k]��֢0U��%N:5]h6L�x
��C6��.�'�Z)��q�blo+dt��F�#9��S�3�����r&�{U�=�����b��32{�wZAUNN�h[vK�Cl�.��h'�h{Y�@��QN�a��u{�
+���t�"��[�s�"�����w<y��V�s��P��O�-���E̞̓�]���
�� �h���V���>��Vt�V��t�}�Y`EU�_2�)��d3ӻ���TWz��i6N"�uim_ 3&��.b2�"��뀭��1
R>�4���ք�@̩��k3O1��X�_���01p-�]�l���X����LWƠp#U���0Ν4o'���_�Qp��{V{�^E��\��s�����i&XE�+�u�2`#G۩�|(�Ͻ�o&d�f�:�3b�t�Z8)�
��!��p��D��{ѫ�8ZeRރ��F�E$�k��
3��J���)U�E�:�r��`���'�-��KN�{��'W�er�;�?a�p�NA;茪[���_|1�X� �bU�9��=�:1�����#������񱩏�W�4���+ts�޷����3EK��Y��ֵR���8�uw1����5~dX���J�D{O�z��
��`%�?n#����g������YZ�M1�M�:��ámP/��gU�i#���|��4�.���P:����*�8��Z��;��{�W��.��+M�k�UT�
%qGd��s���>�m��˼����m��Se�gѮ|�.����e�wFh�3t��ʵ_}U��(=�邗�2���e��B�_��P�o�dP�N�4͑��n!����jQ1�;�6�$%	�*�ۨj��g��W�]�U���j�N���Xo4�@Z4}���J���-��Q����ә�=�]��\���s���6)��O��C��:�e�e
+���Tȇ��U1�y��f.��R�`�Y�H�[��`Z�	���
+Z�_��.��Md�)��2�(��Ț�!`�D�/i�[M��Q��L����`J�f��a�!�|njyq�x��m�O�(�bе�8�#
R��c�M�:-?�3v�v
�Խ�#���.j�z㤫��;��n�P�:t���Ve�#.�m�j��4�;��H
+WV~ɯ�)����k�B�|�H-f�o�UW��P����������\;��<`��a��c`��v7�B$��(������ZEK�~8���"�x�ʯ�W�]U�Y:"{fQ�����\�IywO��nb^�5O[�?	6׼�J��2�r>��ϫ]��qE�M�v��
V��HAAOʠ�CnLψ���;�rơ
��Ph�_�.�<r���j�������Ҫ���y1J�����EM51&1���bo��.
+�0e��R�t�6��
+"�4E�.]:"��"���~��YY���K�7w}�
�f�z��=�9��������g�r��ǫ�N������R��i�,`d���2��ڗE(�X[�q�����b��@'�X$@��o���q�<�����9OU�`F�֖_���4��
�(Vԣ)�d�
+7s)�ydt8��wl�`
x,G��}eҗ�����-a3E^7C�j˕4�9�SF��ޛ�N��S2g���^Vb��@�*'4���+c�,/���>Ә�˒g�
�!r��Θh�‡��Η'�c���K���8H�cӤ�|�٪�	Q�7q�
ӟ���p'Vц}�g����{��j3�1B�K�҉�C�ӊ�@��]Ht� d����ֽ�~��-SK���[��վ�D�-uRӝ��t
7aҞ;�_ޥk�)�Ea@�)�����������(�+�a�]i��4)j��23N���RB��Pe��
�h&J�C*p���<�N�(Y�Ӭ�Ւ���oܿ+"ߘ�"�ܿK�xwj�qeҏޤ��>��H����@0D2
y^�@�����^��(�Bs�
�6=K,����(�.M��K��%D����7^�t��/O��`�k�>*
oI��nig����G\�+{��;�NhD���;b?���60�xR��l�ғ��w+�u�3�ڔf�f��+j�}^Ip4j)p����b�M^r��n��`�t��
+�c8�Ϙ�"���A���Z�g���ro���\奼��
��T녩����
Q�	C��O͡���wpZT���ZM��f�hu��чV�&Kn����r��KOl�D���7nH���I��e�G_��v�5f��&�w�����$������{L���O�#�J�dR{.�H�zbʼn��F>��}������
�,�r���CJ+�T�WE_�Aߴ��,��.�4
Ș�a��
�n�cD��0�O�����a�b��<B��a�..��Mk7��[����yD�nS1��C���������ń0"
�Y�;m%�N#�8�H��%#I(
�Ks�;ss�8��|�+������yڦ93�������]�t�u��q�@L�]�R�`x�q�^����pgj���z\�ͷ��/K�u�}��޵�=��D����=bI7C�3=%�8cpV��io��b�z=\eQ`�u{��1$�M���Jv��������`7�ip��R3~1ݕZ,ب�������ȝ�̅u\��oz:ň�
+j;U�xK�.��f��2u<����.�&E�;ߌ/bB)k�p��d
+Wͨ�0ͮ��U��fQ
Dv*���4����e�]ă�>�K�e�ꋒB�Q�����A���>����e�:9�u��ſZbXNa�Z�+Z	,��c/o�R�f:�k�z�!k�t	^
+���䃼�q���a4o�2m�Mɍ90$����&��2E0�
���yL�mJ�zJk��Y�����U�3���h�$�t
+�(���i9{/�Tu>/�"{V��-�A��Vu�	�Lİ`v������F����,;m�Mc����s�! �F	0������+�z~@F	�!��]��F��A�C\��@>�����!�`#AF,�Y�J�7{]�oJ1�3���bU��S�U���E
+
+KKYMx=8sPh�T]$��(��+���	�q^�+č�{Ń�K����r�{A�Uq�dzc���9�`|b�څY/UN0N��SA�N�_�;��Ŏ�ЩAn
+���fRZ��7ܻ|@�L�i���r;�0���/I�a�@+��R#�;������|��a�ۄ���Z��k�R,������{鴧��\7��8/y���"������<y�(�<?y����:�h�i�T �c�0h�3�y_���t߃����3�b��x4�H���fmϭr�1�H皛_]K��q��,���F\�VP8��VtMy��x��]�
+^X��Q�G%[α�����Du����&}.c�lby��>��-��U뜖�R���2~����j�ﶥ��[M(�I�t�2�F�,Y~��Y��d�Y/���H$�[�rrĹ%bF�)����%�m���Mt
+}�o�
=µ�?�E����lPҼO�L4�����a�i\v��8��j��|��q���1�>2��2��qA^��@	/�5�/(�2�
�8�K���vGj����Hrh�P_�L�^��AAP��Ø4@[�1έ
d���@���
~��I�ƌ@��6�զ��=|���iX橙��E�:|�`|��R5גm� ��$��Z���'�Y�1
�NAzSu^We�a��?N����q���u`f����a���VU@���ʕ1ncj^�/�
����|�b�zW�b���y; �A����cl�=Y�{�%��v�Y�;b��
��{���2�%ZH�gZY���,?��[
+tm��{�g�ŏ�a`����g��<ݐj��,W�s
+�9~�R�0"h�����3&f���V�3"�՘ZK/l�P8�T׺ЉIQWq0�Y�}fJ�ye�?��9����12���$#Wz�����>`@Zh�l���J�T��~�H�^{�l�
o���g�
+-E��ʽ_b
�Z������ؖ[DH7�+���@$��$����q�{n��S&k�-Z
+vɧ��ؘ)�
��T�N���XZ�PyM�P�Xo�ށż���ړ#����iо����Y�a�]���\�K��U^
(3�-s&/�sS�z��фW㽂
+�[�nj�=J}
\���qL4/�X{ŕ��̳��R�?	C)��7�(^��Ef2��p���\3�"ӭ<�T�Y,��-#}e��n�ܺ����k$��q3㇦6�ܞ��c	��q2%c��ew1>ͻ2������?$ך�U����<��s�8����'Ĕ7��3��H�
W�{9<u��ms�	lc"p��B}�d��i)
+ N�a�&�>C�k%�8kWE�pj�Y�m
sC|'N����{t$h�R[���#��%�wN�f�F��*���~�@�r�n)kg�yA8�|�QB�����1����ki�����#ݻw�[�n�J��4i�nݺ�����܀��4���.12}���u/��#�eXr�
k_����]��	!���R=[y�1��o@X����K��3���:�B^�TuǸC���d�'���-��Mw˽���6ž�v�~o�˻�o�;�`���)�LK(�	Y�Y3Y1F�Ū�*8�J�O��k\p�<�8�po@!������'�{��<�6m_t�2 c����{�VS��yb\ݟ��_���,����5@�:�4���!�D�:_*��'Վ�7^��q\�ҏ1�/�
�pn�"y	ˣ�z`�cY�� &��`j�:�"��ڼ���q��H�V���cg3&+�+le�~��W�4N�,�b�v�r~��U�o]����7/M���r�ܼ��Еܳ3���6e��4�hf7�Ȝ\�4�M�X�O{��̎)F�s�	�G:�Q��B��
���aQ���t:G��k���o@�x+����$7,��+mq8��r#gVێAd+������˱� 8�M�[C<+��i����4]@׈1�+�<�q���u<�5I�+nT*�"�˒^��a���lʛ
\/zs��e4J�/�FG��ϻ&�q��a�(��
�(�7jsm��+orM"�QX�m�"@�@��i�=?�SW�R����|�����MM����y}2N�)�p9{mhq.f����sS�
%?��6h�듉��k��Nj��
+��
+8����yp�:1�idn[������cfr�dG*�7�$!^P���k9Y�7��p������9��/�>i�|�H{;L^<W+�̫��[F�Id�b
+��8Ъy�a����h}��o��o�#F�8��3+V�X�����;t��4n���SN9|��?8�_�(�$���g*�J��+o���:^��NĒ��Xu���|���z3�"�_�t��H
+���t|ګ���RՅm#cv(`�����j{ЏW��Ū�������� r	��t\,F�M�VD�	�̮�a��Iv�=
[�"��r�U��G�|�\�a�[���f�r7S\��j�^֦��Q�7\)���]鸠�3ŵ��{�D�̰��cj^>��U��<:��11��j=���_\��>is���D"4���m�]�ӆ�s�~�	�yjO��������c�j�,z�ou2� �]j�hݍ��h%-������&�&�r0�����L���P{Չ|X�2�J�w'ˉ��“�W%����̜�_���\
�/Kz��yIK.j�/��G��oHB���-�zP����7�û���9�l�
��!�x="�q���b�+RŲ����X�e4���]30s�h+z����U(8�b
$�.�F�tN�ԩ���|�U}�xB_`����E����ՠ�Ǜjޕ��K���޺;2ah�>H�
;hՈ"����ٲ���U>U�ܘ���)5U;���bIJ@�u
�C
+3��1�Vx1����b�9���^*c!�5��#���U,
�qW��Y�pⲮ0��ˬ:�7%(�p�G������E�jG�/��������ŋ@�ʯ�M|i��L_���v���*��M�
<Qdy��G��< ��5�q��:jyݞ��R��`��v����˄n�tJ����[i�-�
+���){g��������j�jw���2��]H����KE����F�����z/�+�����"7m�T�~��k��-D��W�z���OH�RӦM�����ENt6��>$��o�^~9�^�I��t�y������b����
���Ra�6�.�����/TY�!��:X',��?�j(-�WzW��A�Y�a��B;UK�k�3�-W5{��Q���.���l�a��/|�(�8�@Y:f@e蚖Sd_�����e�K�B�+>�z��!�z�XQ��
Gָ�'��e�_N�T`�g�{V��`��a;L�KF�^GD�e_�^R\�<mDNK�hH%p������XE�*���
+��1#PK�&�BkMo��sIҍ	{A�VU	�/�[*y�'��\z'�zj_�bU�@�y��wAX/7qD[��‚Oĺ9�i2P�)�b��j�4�V+qA����鋓.�'/4N�&���&�
��f����?��po�#,d���e/�e%<�"0��,z�I��&2k����`�� ��nXvF/�Q5nU��A�E�b��i�:�-�QR��15��#���6�Y/�0�T�T�Y���k*Z�v
�K�2�x�g�؊�B�b�����%���HW����/ �����|U�oq(��3[�s��f�	��F�/XP��G}�^��;_=���#�~@r?�+��r�"�3
+(�0�����}�:��^<]Ѧ~	
+�[:Ke��-1�hK��\�/Љ�|��L���6�C=G���%����7ߒz;�я���q��K�	���'�s}��%Iwes�q6}�8�{�KƩ��M	�/R��B���F�_n@�~|���
颌�;��?�,����>ywIߙ��.}�/��*��ͭr���(����p[�6���a�s�l�Y™q
�5g�k����r5�J��C [+�x\WU�v$�aa�"����[���B�7�|ӤI�_|���y����;������O<�cǎ��߻���*u�eʥa�œ�^({T��Ol�-5��>RB���bm0D}�f:ZT�t�"�,B�\�5"��S��
�^��Tک��/�qg�x׭[Ǫ‸�$����}핿��MUg��{yB8oi[�"�mm���B��gV�"PR��g��UrD��@(��n���5i�	�y
��11{/�Ò�gy�xtͫ
�ѹ�c�������ck��F	����AT�
+���=i`�H�3��9��{&��p��c^3�)�`�@���3���M�A@���!�h���Q�Q<�n����3�W�2���j4��oۉ�,���’ܠ�K���JZ�{u2�	�Vb]�/��6I�_�t�6sQRpm2��Jd�x���76�#�"�!(�!:������Q8%�w&.pm,>U,�WY�!�T�It�Hl���¬~�꽇��|�w�#kܭ��b|�(�M{X�_�#��1�OU�0�e��p�$.�iڝ��_��V{Ue��f�u��I�rA�c�y"�T1�K��ld�CJ^Qz@�Á�*��$~����[lJX>�Ag5�P��>��(h�Ft�ݾ����|R��G1�ʟ���5����#��h$3�5R`�`JN�������V���0uPU�kM��-�ޗ��?����6�=n�Z�H02=��B�����ZdD=��4�
�
+��1#DžP���(�7�wj{
�(���&��
�KA�;
�tY"���EC�,�vƆg.[2$��]~�N%���驉���jc��ҷ��;�ޡ���9��M��8b��q8(��y���j���m�\���5��Xa�c���y����=�\����7o�AfΜY~�g���C�����њ��#Ҙ؛`�{2 ��jRT�
HƦ!�W��֯��M�
@`��V��M�a��$;EŀsD�3�4ˌ)B����r�R ��]���m���N�ś<-�̇�6�,���Г�n3��.W�0��E=�
�6㶕�m\���ڠ�͘�b�ž[�cr>����+9��*��;�f�ѹ7���+�DBH"ĉ
�Jj�]R�L��օ)�}?�^�k��5����5�#��,���CB!"S���p�d=oBN1@�E���м@d�8��d6�4/'Oa�f����W��l|����/�ֲ&�cʙ�	깬��9W�l̮�ӎ�4��޶'�G!�io`%9	C�8� �)����N���(�����)���4#�I�Zk�q��wӬ��Dy��#aRS/)0�\Q+:�W��O#����A�3Cc�Omh�g��>ׅ�D�Gg����"��{sl=��¿*S�۫�v����d�~o�)��Z
&�wn�C'�H�Ӣ��+��8��'�b�w�1a.M��/��~A#�--S�����N��q��?w�2em}:���Q�"&Ov^��U���|-#�>���՟�_�G,�gc�5"��R�]˩E��Fᡔq�p��*�0�O]x<8P����u����gp��&�7'!7}2����Jӝ�<��^��j�t��T�ٳ�WR��B�l��k#.�(��zڦ�X����X���
�d�~��mc��nVi��Ֆ0h.q�l��{�te�J�f�2��Y�ӄ���D#���u�U^�O.V��<���W�װ<N���Q/�vA�o���	��W��U�ֆ
��"�3^�����1;s����ID_N{��sP�`v0Jڕ��`������F�;����Q�\��8��5ژ)���V�fTsXҨw�ͪy\a-Z���OZЭ���:�+��k���1΃V�>�jx
�%I�U�g�p�7�,�/���g\��i�&�1	j+�VПG�)��8���F� s|xN+��aٝ�D�������5�%S�Ң��M�QB�HP3���
�ɍ*�:[=�^#bN('ԯ����quO�%��r����k&5��/���g+o�*��k�Դ�G��yi��ז�ԋU^R��ԛRo\�<CL���+�$����d����'��3Sԩos���ր���>�D%?,P�C��_�L�K�J�kb�u��Ć�9�&a_ti��eɳg$�c=�O��غ�U��<��\�Q���p�P[�MX�O9���v�"��Z-S�zV�G����a)pip��U	Kj�ql�_��e�#��X?d�����dĎ����5��/��qZ�k���䂌�15/�u��:�E��
�V�d{���2�,i��a���q7ՙT4'W�^~�Yw8G��Aʑ�� �o��pʫ�;#+fW�xdQ��;U�;e�O}Ds�0}���̗��n7���8Q��N_�Һ�OL�/��]�:������e
+�83w��1|�_�\;ùEdp}���r�c�����F�~�5)"X��o�E�Y�5�<aq�������ra�T�gyL�n�P�����_c������~.�s��.���rM�}�jQ�Y�U���Cy��o
+�%�A�Ý�\�!�e��=D-z���>)�_�<�H�l?���J��-�b}̵�*�G�Ѫ��o���	�b*�:��F�P�B�&M�/.��{cy\X��q�׳�v��{H�ޮ�������f-�`�W'���;gh���U��2�����H� �
+�*���zU�j���,� �6	���(�K�>D;��F�,��]b��N�n"��*�5rQ�<��.��jVot�$��A^�:oH�g���
;���^���9DdN+����_�
���Pr�z��9����ò;����$��8O�q8N�aRR�>k"������� �qrRR�Q5n�M?
M �&Q�[4��O�[�ٙ<,v�� s
+���+-b��KW�ec�AL�}UR��BUJ�fs$c>�|b��Ѳ�\o�4M���.&Hu��0�J[u	�j2�Ğ\�am��G��hB�G]��k�ї&=��+��H^>-����;���%��ƛȖ����	F2�A�)�=]O8@�-�Yq��)�����#r#xd���f�@�г���G�:ʸ�/���1�.Y�.b�Lāa����[Wy��q;��@�7�m-�,w
�d�#F�u���e��o�¼,�MX��΍�f�!�C῁Gr���\�@���h��Z����B�rW%�Ȩ��û���ְ'��
+_#���Lo+�j���F��f5T��
��0Z����]�5�V�W�P�%�(Y��/��σ<��\�������J����I�
+�	��&�@|��Z�7A�$�h����V9
8�V�2�xe�ߚ)�?>"���D¬JsWj�#�v��{�i&����%[ڟ1��O�u�ph�`e�'^�@�󷋷�m��Y[�Uf�����E�B�W�	w��K,�,�+"�O�U�7XW�L�����;zv���Y�~�=!r��݋���N�޽��8�o��`T8�
�!�L�Xe1����_����/vD5}�H�/�;ekH������ Z|:���5T���992J��S��1!�;��vU
�ԋbc��=(X�2��>Nn�MÊ�8�[���[�,�z�d9�E�V��	.yz� �S.hl:h�o����cZ���/���w����7��|����?�7}A"vud�;	A��
���ŵ.(��dXv��?I���>�������HI��'5H#B��vb��qu~>�M��L"�Q���`ƹ��:Wr���uc����q{Ūї
�7�?����5�#��@��ɳR7^����y]RL�`����UZ�Z���SXN��[�=���-�[�?�_ #>1��/N:s� G�TnIBW��OƝ��i��&���J���!�G7����[Q�D���0�6w�]c5u����3O%��z=L�1q|���Y}�&Z�vS��sR��t�+ߥ�Ρ��;>RT��	��*޼s`樉�k���Ų��HD��8lQړ9��sƼ#ɘ�Z(��Q�y�I���j�Z�d��_��i.k)�හ��,�Z�._�1��I�9�2��8����t�%*�8a6�V�j�M�����
v��VJ��ES3�����	�]�zW(_/4#
A�ց?���汻��<
��H}c����d���������kz9TQ��@R��N�[~�P,#(�|*%�e �k�����)X�N���N�5���=T��R=�f�v�T��wa�Ō���9yIT93D��ilޣ
[�H%�3��v�;���`�{مWڔ�crK:ť�~|�
k��@մ����/�����������?}6l�…�7>������?�/hU�"6�u�*F��4�(0'E��ڧJ�s�sUV�`�K�@��p�ϘJvTz%��M&��竬r����q����lA��Z��tn)��`D6;�tR��k�Z���R�M"��D��
�w7����b�r'����9�ۓv�A�]��I��-N�*�a�xL0kP�0�/���0<'�9���,�ro^'6����$�>5S�bl��?N�����db���
O��G&ԯ3�~="M��
+ ���VFbO��G䴌�;s0_�
���*ujI;�+��R*�n)V��8�M�$m�{zr9`D�w^����1V�Ɏ5f�;
����v�8�G
+�8����K�׸�K��lñ�4�۹��\
+ L	'��A܄A�b�)�
D�8���  \]��3�h�u�
��.�`�N�b�v�oe(��F�ki���v����Y�;�1���؅��cxN�!�zf��{�/F׼fpf!1�R[�z�{Ʉz���?������t�����ql8��v�U-��5�1�ZDd<��&Ġ�H�7w..�Y���kQNo�L�2��F�a��E>�w�Z6\9��GC�/�s�����v>���kT�����ǝ�-B�����=eZ�X��
+�~�D�!����}
�.%~G�Ձ	
��8�w�I�ڿ�'���T�*ϩsq%��7OD�hŵ�	m�-D��~�N�tb����.~�jK�=��_yJ��x���Hm�c�F�v�|e�w
�9T
+�!8`S��X��>E��$�l����r}W�8�[DIs�Lt��
+x����אi
+��Ҿ�V\w���p�N�fuu����9d�L�1�����O�n��ԩ�A��o)�����C����r����I��tԈ}<��ݖY�V`�f���r�W�ν3���?�5.�1�s��گ��?}2�9
&x�D`��O
=��LX'��ؘ �tZN���VA�
+<7�Ǜ�{�����P.ӆ�"�S\��*�k�)�; ��9�u%�WY�&�͂HV�t�����so x�ѸU<��5���F�G��0��׾O`r���'7<��$Bņ����5��ฺ?{��	����2��ɤ� ��xs��Se�珫�S^�ʽyb��k�`L�ˇg�%1ȴ�7�rV��>��2�1&�&=.L�^��|Nr��3�	��}���M���F��|�M����,�6P���o/9�UN������y%��yi��@
���x��R9ӃkC���&�"����ɣ��ƨy����w>��C�{O�����56�m���zIrl�wL����{E՛�����`��y|r���ڿ�~����9��'ޣ�� k\�_rdH�g����O��Ì�i��3��#rR�y.�H����c03Mzo
zƿ�H�ָ�¤��$w�F8;��T��*���?�38a��0Dͺ ����m����{A�ַm��2��{y�>{��am=}�fm��l�G��2#�R:�4����s�V먟�BPU�{�J��T 6u�o1��{p�.���y�	�&�sWU˧߉ Q����I���;��襤��������W�U
+n����YR�������9i
e�|-����U��MI���TD\l�J>���%s���1��5F;(�ij��e@;�DN�S�0q�"y�������n���N�M
��`d:Pi<+��.�*~��Z���JE��;F�;��k�ɣ���'���� �_�C��M{�h�� ��e�P 	����P�FkJNn���N+�z_�_bU��`�y]$:�n��F5Bq&.�U�8Y�ʮ��ȱw9����#(cƅ��R�,E�;oU�v�� �L8��LX#��M� Չ
�SHV�K�F��H�~5��RòF�4��@$v�X��V�¬><&�h8�A��/�/����@�Hl����7�#���Xk���ؔ,�՘׼5�ί��?4��O�S�Qe ���+��ë�����5��2��Ы����a����/J
+nLM�2�]RL�<�y�tB��hL
��X�H�#pX��ylWG�^�t�~��EfćN	np�Q�Čf�z�ƹɃ�&=E����͢�[�<��8I�}9l}\Rb�^EOa��^~�l��&�� ď���z����	�a�F,n	#mh�S�0��Ӄ2-3 c�2�ZO��qB���3�����B����#���>sT�;�����?�sf�$�����A�s2(8����Ђ�vs\�f�U�G�)h���g%w���n�"V�i4#��pr/CT�s�(J�i��b �5�Eכ.J�����[O_?+�Y�\�Q������.�h��U�+�L#�qbT����*l5� �	��uС���ﴔ�A��{�����Tq�-�PN[�[�K�<�!�K����YێR�����K`�e�s�a�\���ԂH�޶f��{�����sw����Ŭ�}�[�p8Z�]��dST�SX�v+��3�d��Xf?XaG��
+��f����$}���z���H{�-K�UvӃ�����^�vow�pf�l&
��D�����[�5/��W�:��n�����.��6�4�~��c����UE6�h쳊�7X˙6"C��	8r#rZr�KE�%������3⥪��c�t&�_���X�6b�Mn�p����!9���`���_-�����4P�
y��e���r��;�W����c6K��Y���O����dl�%��b�>��HT`$c���F
+_�_
+^�-�ҧ�:���<hE|��|�G	�^���ѹ7b���=�L�P���_��g�L�I)����'�n}m�5&`�h6�/�|'�k�)�{��C�=G�.�$�o���S0U
�5��4��0�(��=?i�M�>�)���k����"ԋf��9���
M��)y�65�D[��`�*>��ZPs�Vng[��l�<F�{����vn�pT$��&�$9K�K�h'����wm��%[nn�m,Lt�`������
��K�(��ܛdL���V�D2���$^
+��|��h���g�ʽ�v��	۽֍�‹�5��"��^B�g�Լ����[<ΡOq`�������_���vq?Tj�L��ڑ�>���ʓ|?ᢤ}���Wb����ZT��`~��j�d/��@�Ɇ�ޘ�6�����#Z|<���z~8���km-�
[c�9_�i�8��!�~��[�P�
+
.��7n;ݼ�9���s�A�f�y~��ܞ�>�r"C�۔�O��R6�Ϊ�1��Z�R�ަ,~J�,goo���cz��~��X|5���3��W#�w�-�����7.���ڦ}���Xg����|Sn��7
�"��roR���n���Q�˘���S��%:�=�v	)�2	��/u���Ѵ�{Wߌ
f�uwT��QR�����?�"gOu�8�2�v��F�j`F1c���!q�7�"xߴ��⺾����c������|����]
>�k	f��V��j��W�i�5�`~�J�����
+���?sz��zˣ��r��Źy��G�)Qa'X�H[�����)g�r?�����w���!�JNwp�`�R�����*��U�
��P�νn\�S�����̎�y
��[?����F�p�� ��O��o�k�D(3p�e瞞�S%�ΙqR@$�NlPmt�5|Ű쎘�qu~A�:Be&Ғ�㰗~�.��|yj"Q<���w���Z�M�s�b�E����`�����H�b�-��Ҋ�_TQ�H�n�/ڦ�����5��Z��rE7�^

+�<�mH;i�Vnc���[�U�d ��b�.M�v_�9�`�_�I��Q���|'�`t�
x,�xD�{�8�fS�rd�{G��<��	cj^6����Ը�'On������wMj��3�Q��U�v���N&���9�E���m*�u��:��o��8]yrd[��*�<�0x,t
@i����ɥ�/H��qh���#8g%w�ܖz���F̯�,��!�Iw�x:5T	�_�5�+����Ȋ1]?�>uf߼���ƨqłg��i�:�G�2z,�߯��u�A�Zz"�.�`^`���r�Ղ6�I�q��U�[�ME��;,
+���w��b�o���f��y�E��3�c���~�{d��Em������I3��o�1UX��"�I{�m�C�DF��I�"�
�;�	��u��}�@��1�M��Fn�j��h#r��=�(G�K�d�9��F���R��y�I���2Tk��k�����e1��˭��	�{���;�|��c����U-c�M�@!
L���牥���v�q%(i�Q�$UU9Pt��dLTud�^Z���c�jq��t�:�T��@�u�l�M5ܮL��Ē^ ž���T�JR��D%Sn/���(���PF���V)�t�Awq�&�}@��a��AUtR��a�]�����u~�!���ܛ�P̕Ń�9b��w֩
���9�I�;#^�lݓ��I��q���S��_b�9�/�A_�'�;(s
��"X����s�-� W5I��d���I���q,V��n��+׬KK;�kI�a�י?R3\/��w���sG�7F=�J1���#��a�s
��J}��~�
+m��pP����X�rKV���I���*�\b.Qq��JF��w��V玘g�A�R��$���9��)a���8�cj^�B����#B{�tb��A�0�JF��{-�M�I���s8�sB�c���ʍ�ӹX��+�� �ѽ�L��Y�^/!*�s�
���3�i���TB��e��w�V�`�@D�"�e=JG���W&�:�L
+�{��c�N�{�U��E⸬h1�?^,Έy'�uν�	?S�k���ǘ�����(�q��s��#yxG�Rq�O����i�8K���֡u���V�E=��_Ln�u�l�P�áT�s+%�=&j`���yb<�yˀ.��͏�Bߕ��&�4��\���mVT�+���*�\k㲞���G�E[ß�� rh����K�^h��iq4�c�2qO����#�.�1����z��M4�
��	g
�WfjE�J[�C�/�S���ʕ�2{FN83�Kd=%��Tu�@�H0vR"�(��ۄ�y�!�.�
v�����;�e��uWH�mL�޺��>��ާ2d��]�e^5���Eg�/�a��cR`U���+
i
hN�(6�E�s��^���Q%@� ��>k�9('֯1�AV�`���O�����!�"�p�Y��gFD9���.���%�=
�7�.��Xl�����g�:B`z\ݟ���bL͋��^��h�q�kE>0�/Mz0����)��ƍ�ט�X�n��z9�f��Z�	|�#��������ҢDQ>N�ԑY������IF��ﺤP�15�d�C�%*
8.O�w�P���)@$�*�ݢ�<b�<��*l}Z�=H皖o��&Kt�%��6%]F�H�M\Y\�<�_��ګ�՞���r�N���t��?�6���F�}��x�4H��� �,�}���5�k�2��VC����xV!���d� ����vW&}��x��[��yPm���
�]�.�,���”�.f�yo�Ӎe�.7��'Fۋ�N��|p�w���$����f��&EO��"�?�$��ˡ�))��&8�䴦�*����ʴ,�K3{H�����Ýv�ᓢ���>�s��W�`���f��<��!O)��/1�pS�us���G�+T�1����`EΑ�f��y�w&�$�u��L\M�69��J�I�8���j�Uk�;ZŪ����.���ue���̯���>���,t�d��[���Q}x�������
+xI�}˰�C�=
F�Pe	S�	�E�?�k�E�
A��DXΉ��*K�űP����*K�}I��x�)fVb,��It��o��*[W�%���n�8�d2\r��
+�,�:A�k����t�
+���+�b�������}��v�[��\��U^C�6P�+�ƴ��sڄ���*��.8�j�^\�^v3�LjX�g�li2��B��%2�����?^/�*������R��>������G�	�򍁕
���=I�= �$\�q,��q0ٵ����%�.K�5V���\���ݮ�|a[�ӊTa�4��b�+�E�reB�נ��N֮�jL���x{DY��v�])\$B�t&�xJ��S舋��l�)�q�]�ݫb�eܶŲ��nAT�o^�`xH1�c
+�5 c���Q�7Oj�E8?���ck����I��:�^�w��?Np?��|a�8��,F�q���qv���
\P����qtͫ���̸Ȉe:(��P�J�~�񒨂y��=3�CKy;�yC2���ij:E
�eڠ�i�icg1D�a}l@�/�XM�V�븂3ca����jf���;/�6�bVp�|�Z�c_lg:�
l,��q�{!W�?Q;_T��a�L�$ێh!w��+{T����N����%s�LJ�����i���k��E���2�0rY'k�_�˭ZɟkB�#��n+����2]c;v���n�6��}�f�JaX�*�X��+��g2�5����AP����r�k�3��]�۞�XuE=]'�*��hlc^�d�1���c�:�{���`��b<+��u6��a�UV0SC�=g�H�{�I�kq=���lWF�)I��}�������/�`$]�P�ٍ�_/1�L8���?�d�#��{
R�o�w/�h[vv'3�a�̀���V
+6�:[����݂��u	�G��B20������ ���c��p�b�'��w���d'�k�ޒZ�Lj���|ty�_ǒ����_�S�r΢�:9Ȼ�N����x�v�IF���eH�g�Mw_L�c�P�4I}Ĥ�.A�A���3�����'Bo[�QM��/�������^7�>�@�ϯt$�����w��c�15��~P�R���˒^ĉM�
Z��pC�1u�ym2pt��eIo��i�@UC�e�5��yL\��),Q��b:�o�[�r�p�g#�?Z\� �˘D�f��1�#
>�� fI�?����wL�+�k�s���#�IAOE�5��7�T�z?*�}�ଁ�#ǃ*�3Y�d�Y��Qځh�����ɠ�I��
2��&/VY�Tr�O�)x�w�ҡt���ӝ��U�Xx�N",K�L���W�[`�7йp�
+�0"��͌����ϻVU�uP��L�M^�i#[�[@�p�
+�� �u�G��8���b�\��ڊ�tm�W�S!��w��'�A�k�܆�I.���E/�Ę�ܛ���	�����y|�
�	L�N�T5�n��t֦g�2�-Ns���(������7ē���(2��>�/��ܚ�� �s�[����j&�6��@��������a�]'1p���X�"�D���D�+~$����>>�T���)�}���D��3���-ڞ��X}ݢ�ϵ�۔� �4���ә��Q��N��H�v�M�$��Ƅ��|���dk�X1�T�x��%�ZD��f+��gs�Ay�s�&�3�+�{B�أ�N�䲾ioKq�p?<�I��h`�h�qd��D��_Ihɻ��:��!X6<�
V�������89�
Dl����
�&����E�����8����i��..ˋ�j�=�~�Je0�؟ޕ������P.��{@���:����N��ͼ'��(��wV�n���2�v�@@�ŝ3ymRL�b��N���"w���nO��熖J���K�໼R���5W'���mfw{�h�1���&U��z-���x2�Sl#dh�n��]_���7��#�7�+Y�բ^5��!:V��t\P�D^�~��_:�?G�s���>�$y�d��{4;����a������Q89�I1 c�$ob�k�ٰ�y�[,{�y��*)t�]�6Je�&��2b^�	t�5I
P�iBZ�H�����h���^�� u�{���R�I�d
_��`��!W8�
+N��Rd$r��XA,~8\Ѓ�q��όj��ڮ����Ŀm�)�% ,cF����reW٭
+�,���Ԓ���+^����Np����^d���-Q�k9}TA;��
�Vĕ4�:�k]��i
+S�{=����i�l�-;��3x5�ͻ��w!�x��ۣyE�S*^)2��l�����	Ď�i���u+�*ۖ-�9�(�D����U�<%��`�V�z\_�`�$�%s�O�,����|U�c�3�T>B��&�4��k ������ͼ�
���M�i<`�c��G ��l[���w
��T���n���u��)6��*��8�ܪ@f�b�j���!�g;�Ы��N��O��:�u�ҧNnT��+�V�&6�*�u��z?_�ŵ���>�W�f��������9אּ�@$6��e����/ۻ�IXf���8b��ߔ�;;N����	�������`4!��̡t�U�۩h�)+x@~~�TG������5������S �Gw��Z�\ɳ�)��HA��֛��Ki��;%O	'�������_�i����Ҥ�)���Q��H(!���T w{YғA��I%.uI�#X�H�`����
+�P31�5b����1��qcj^�	D�80!@�{���'�S#k�=�AN���>��@�8U��G��Ao��ig|�w����i��Lƺ���<�k]4�QjR��}�ޡq�p�DX�M�>��h/�������
+!��Yĭ�,�0���H+3e[��/R��_��1?�~���7EX����x�뀅{���D~Ujq�޴�%_�9F.^�%J�<̝�w�U(�Mnɫ�e��{g%���␁��vN��W 5���+��<ǟ?"�ֶ���A����/M
�=�����%��vl�y���c:G!It���pfp�;3��bv}��ԛ&#j��^�W��1��wd�v���d���gY�Bz��L�
+Q�k�}�g�z�7�ep�;�����ݻ׭[�R�JM�4���2�~hU<�^�h��W	9ӈ�:j1G�����}��O���h��W��Ex�fv����ZE �b
L��=ce;�v����/-��qn^��".%�������zSpDoNM�N�T�vI3�t������ǔ'�m��5���t��D+�������������?F�^?�^#�oI�3��?2��ﰟD(#�?�j;e�T���wF�'D�Ζ\tq2���G���+"�%��&���g*�9#����Ӓ%W�q&�����	��;�Ɲ#k�1��O#�����JY��Ӫ�es��T�*�䭮���g�X����bS���f,3K<V�0�E�u���O��V��j��m�������TX��ͦ�m��x��MS-I��p3bT[h^z��d�J�?�]r7���Ga檫����� ��&�'߾\u^�plJ}f;
;�����
+�^�xwp�@B�!�z��}l�_��8����R:��o&7����A�`��E�1&�M˃�+o|�Ȣ���Mc��ƧS�}����𜼁cLvDC1����Hխ�o\���s���X��&M�K34�)��Ӂ��W�� s�}�fҞ�\*�-^�w��U?�����%�q�o���£Ȣ���XP?�Γ�=�������X8
�cN��UVm9���Bu�nE@_w�tk^�o=�-�C�5�z���ϥų�sު1�
��DuI�X
+fb�I�MS����뎎�-<5cF��K�8)(\���a�3*�7���
+��7k�RM�a-A�s}����f�+�IEo�y���_F���Y��Ӻ
+���#�ˍ����}�����R>m;E���t�tԸ��'#�q�_�˹��(�9'���~�ߣ�H3�:t���7>�S�
C�Z���e��K��P�}�u�V0\ĭŜ�iT���~��{����1\Z��[$��S}۴��L���J9x�b,�p��⛋cD�㻁?{��P&N�
��<��:]�@Ҳ�e䃒��抍���/b�b���VJ2'<l_Wb�����?cR�����Ze1�cߴ2���Lq��C�=�����a���;3�s&7J3�8�ǩ�u�݈���#��GH�-�!�N1��ωt�P��b��|���3c����=�ؠ��s�k�?:�Z���/qș��b}�
���|ڱ
+���9���;�n2A.�hPf��,i��bx�@n�U��%`��Ճ�y���z��bk�0��Fx�@�� 1�dpg)7u�r{Vp�%I7oSސzE�#�̀}K�-��~����7�^�|̗���T��^/್�y��Wд
+dS�ʒ�g�H���<j�<,��vO�g�D"�6�A=���gGD9W^ʌ��࿌�����;8�.{G�����iQ�f��15���}���[^�:'�9������{���6G���;H��6��ST���h��r�;C�=�?��G���U^'ʎ����֛#��1����h��io2�o�NWZA|�����
%�*K���*�~By��E�ҕ�mms�~�v0w�����:����R�S�];�O�w�� ��;hه��^;4�5������(P:�	:�e�uR�m�].~g*J�8H9%��P�n�G�O~�e|�T�W>��n.�%���/g����d;I�Ůx;��2e�:qr1qe�i-����2,5z�k�����
r)>�U��z�߮�ˮ;�O�
\1z�S��� �ҹ8�C�2&�{��f.3g��U�K���	���!��-��uFxa�K�t�H��SzD�������
+�Xk����D���8i��w|i��'�ȋ����4q
��D��L_��t�b%�o�Z\T�95G�Q���?�f�2QEX����c�f�q��{cF���k�O���%�٣so�9*������ۋM�� 
|%1�D%V�����n
p�-
��c�Y�0��᥁�&^���.J>�,���d�yq��Ë�5�
+�b��8���2���C��H�l���J�v���;�����\�@��eC�$c�2?�x�
�5%��5j^���+��x9͌6I/��޺�t��Jz��~as���kWy��b�%�cO�X�N-�8�ʙW%�nL�*	��B�"�����_�+l�ͩ�-Em�U�E
j�O1�0�1�:qH�g	�	q!�WE��K06�GieG4�����J���ij�(���/�K��.-u�b~�;���
#�_���_�ai6�h�#�GtywHނ¼-*�a�2�:E	�r:�c䌫�S;���]iKte��N���ZaV�x`f��Ӊ'y�ފ�c��,
�
%��2�/t&��(���`�n��&�HG1+v�bBYo��j�m�T�k!��+y���v9���g�]e�����5A��!_;i�Y��ͷL�"(c���Y'8��z�U��X㝵b�s�79-.�)�+W��	K�`%D�	�.�t��?^��.�u�in[�~�bF�L�j��3+���	
�����S<�l���}B�=�k_���<J��Ӎ}�ߣ��V-�؏2Z'0���:*m[ˡ[LDc
G&��&0��(32s��UYs=+mg
++'6j���-#��%N���
F�}��֛h''�D%�'�ږ��
�.@( �h�c���bo^m��S�8�D%�M[|Oj�؉�f����Z�kR^N{�&�\-ׄ��������c'U�6pS�*-'fyE�^���ѕ���b�1�� XZ��||G�GWĻ��\.�!�3�W�;��d��a�cs�T9�~]PCGk��[��\N�P��\z�	+E�BvH�^�5��9���ҧp�tz�糕7�ʽpyQ+��k�IM��/‡Xdv��98��fQ������-7�3�ҾT��Uz��'�!�ē���T�EP�����<zk�,��B��&A���G����ֵ.H;@�����<Iok�%��]�餆U�4J�HMn��f(	��^v]����X�)t�L�Q���@R9�__hB�z\h��Oކs͂��V��E`{؂��ܤ�X��10�D��+�[�Լ��ж"��"��N�;����gP��H��z��Ϙ�ѕ|jpf!��R���'��W�ָm�&�VZ$Q.���/R:�
:U��ɔ�/BB��j��7	bv:"��b��nXl_F&�d�������C�R�6*���Y�6N�#j�y�Qm��� z'E<�G�9��*�Ƣ�sx�O
+��:r[�]o�/��=^t�rB����Do�Z�ڻ��eS�%��"���2(���3kU{k&O���%%�^��B�N�5���c8���{��=��~�w{���&�� r��͜6s���#g�q�C=��P�������j�� ���f��e	�ޖ�̫X]��~�0g���@BQ�&V�1���uՀqN�Wx�E�N��ۅVOP�nЭ��|y�����DA>�i��S�8���ԛOw�SH��Oݞ�o�tQjvOj-~_�d�ݪt>�Dq�x�1�0)��ò�c��ew������}be�{Q����?\T�
���ـ#�H�
�k���1Ȍ�� /�&BBH�E�B�eח�~|W����d���b�m
�ĕ�)P��R.���	_G�J���PeE9���\K�5���Q5n�9T�f�1�C�=�
�~
+�e�  ����sYp�F�}�R���3i
�|E�z$0��&G��l�0g[�ڡ`Ul[M:mG]�e�d|?�uq:=FƩ;t��
�K����&,��"�Py�Q�b��W�1ӭ.�����2Jp�W{2a���'�O���'Ś����sV��/���u���&��#�.��Y�4��%W�A"z�t��~i�1�.�Qi׳�׋\1���͞Ϫ6�YnxN�¬�k]���6Ͻal�ߌ�q�ij�`*�ڸ%�*E����Oplg���8pl���q"V/�KWf�u�YT�Qy;=��n�>i3i��s���/U]������n���>�FҪ���9R�j=�HX���u�G>[��6��a�ӽ�,L���˶N�vaQ�2ںr'Ӟ���ƛA��c�X��~�:��|�Pz���A[������@:�(�)%����e[��K%��J[\�ŕ9�qINw�]��m�bXl�
+�u�`=�[������R
7��U�E�Mj�<�֒�Li�Fp�o: ��(!��)�
�������/:�����;xoƀ��\'oH�c��M���{&Չ
��Qӽ�XE@Q���iu����eK�M��Tr�h&
�1�ȊW�5߈����mË����1��G)��U� ~��*��U�%�nLM!B�*"i�@�/e�,��Ş�����sߴ7�I�G���m�L`�þ
��􈜖x���X�������H1yN�_�&z������&WӈS��P�����"@�5�+?�4N� �,��%9N��e#��wQ�P\��R��
�v��<H�sca�KL���S�ew�����p��91/hN�XR�l��j_�.�>E�I�`�1�a�[;�����R�������&h:�����_�*v�X�c�W���2�V�%��N-����ő~{j�Ē� ^�4ݐLz ���.!���E
+�Lg@b�@y�K,����@$N�/��.V]��~r��iU�zP/��~MMO��x5@$G�Gn���7��?Ep������s�+�}���^��6�8�
E,������Yf�
�i��[UoP�g���<�ƽV�
��ԺHJ17�˨ko���&{������iIG����_Q�s!sSRGZl,�nTmHrw��f[����D�9"����~��-H-!��b�8��,a��Wv֊���V�*�ώǗv��r]��N2��/�@i��Jjw[���&)��V)7:�/O�<�oBf��FV�3�D��W�fAȨ>%d��ǝ��*nc�aͭ�2��~��2�y$E��U�S���q]��	4��mʑ�9yN�c�	�����#X��;�<5SSs�٪‘o�{l��_�C�j��`�������x��Z-�/2s�#����t���]k�ˊ��&
+����gU��8_�	��ժ�Q��_<�]��[�nr��ai��8�~X�r���s�a��IF������3��&=.��7.�֌>���D�uN�U��T�]@�#�ν���9@H4:��quO��be!�$`�sZ�x`x�Dl/
�ĉ����#NY~s��m"x���{�m�c��>n:��T��%X�Q5n�!�rZ����7&�j�ߤ;Jj�5���ro�csi�Q5n��x�X�6w�7�����7��UC�=`Z0}f|���y��}!����D���|'�늻^N{K�q��N�
+����Pڐ�����-�v1����	�<�J
+M}[�}b�k�QR_Zvu2��d��Mߖ���{S����Cr�>��h���Ϙ��5Ĩ�
+X!:�(���'5H��D�z�.
z�bޙ��Չ]��?7zdā!���)|^�#�Gx����D�ʨ�Y^;����V���+���4:�z��#c��z\ݟ���U��dGMJ���S42Tq�&�ˈ�������g��އF��;Lpl8(��{�nݬ_�\��.�6�;#��H���%2~��u��nl�_16�C���+6D6h�=�ni[�$�.��N�
�O��Y���?��~
���G8�I�Jb/��;��	�\
�/sA%�~��T�V|*��̔���96�?�'�v?��v9����!)3�yv�S�]
+-�Z�L����:�0���y=���]}5���Γ.�ײ�<)�KI��9�g(9�	�Bt�Qz�FA�r�6���ȿK��'hUW�j�0۫��@��M
+#�m�\��-\��T|�I�5������{܄i�{�4ܑ�@�{�e[��e��?�G,�(�u�T�߽+����Z����DǺ�ϩ�*�]|�d���q��Լ2z�M|�8��m�
^;Kk�u�<���牂{��~��a�����x`8��]�ɴ�O,;?Ryݩa����EW�.�5=l2����d��(
!�>���/��ΰ��/�E��'Z�6ٜ_G���ǜ�ؽf!4�^�4H �?}2�
�M��[�� `)|7��ZR��;��eR�8�I4�T�޺��`6����}_����c'��:\_���WY�=d6�c]*Ɖb��^���_���q��oM�%H�W��z��1�	�o��4|��'9���6#E��`%�55�ޡźyP	ɱ��/�5�����S�J��	����	�oS�bu�e��(6s���7J0�ui�)=/J^��,�N��=��J��y ~�s��2>�;?K�g���፱3�g����Z��924�kQ�G�ԺX�����S�,3/MnX��6�=�1�A��:���s��w�ʽyT�M�V�� 
�$
+�QR�'o��y5#�!G	�2�������MAa�S�>������q��[f��6��q%���kf�erW7��֤��727�e2C�L8�|�Wh�E�Q�:{���L�=y��f�>�Tɨ�]4ħ�ix�,�Y���	�~x�7b�"/g�8���,���_�Uc�ɖM�PL�嗠gd2nAC�`z[�`j��x��#��>��]�X�#������<��0ۑ���o�z<2��I;���<z��'b��[��SEÆ
[�pa�ƍO>��cE���܀f��X��WT��&i�Ru�G�V�wz^�E��}cNf�!�7ח�8a�1����
+E���?'��g�@��;�I��*��P�%�V'�ܔzݩ����Ы��%%��޻8�ʼ�,�uc�U�#�9��l�?�/�Ė"xt᳨�>�o�e`F���A��|!�\p���QY�F�O�2�ۇx�/(͟��;;�qV����&��^���7Y�h���d}�dm�x��d̓�'���^�g��C\��-���={E��q�pc��7�#T�X?��I
+MjX�𖏌�y
�����p_���_
"b����I��
B�ѹ7(����7�; )#E���+9d[9!!6���bs�A�:�9y/�
+�K������8��g��Ar��{����㾾95�û�ySj*���X3/�"�!Ҍ.�?6єv�9RT�>"/����BQ��;��/�5�炞s@ێ�Gf^
+=�����|S����#�tV��6�-�H��q���ꯏ��p�DwZ��^����C�HK�i�Ɖ	����,�L�_��T��x
�&�y�Q&��_���|�����E��_�Dz
�E���gL����t��E�Ԧ}���#r
+��a��*��9�����W���>�k�b��pb�fv=&������ J��
��KK�st�y�����nA�BB�_���P1�W�����q`�U^�$'��^�����u���t��Bt�o���w�Y�x�|]�2.�n"�pB5�O�I��uwj���5�B@a�2?�#6���i�-d+JYp���z|F�������<����?��Q'��S�N~̅�9J�|�¡o�{��
ݺu�S�@	D���?�Yy#�Gi���ک탭��ʇC#@������B�ޅq
+P�� o��Y��{W]�;������`G�X�nS���2�'�
�C�%=����������ZE��-Ůr��k�&�A�>�Eb`�MF{�p�o�*�|�(�jW�yz�5A���$R����DX&]o��1��^����qÞ���q_,�F�dlWa���Si�
��4��,l��Ƿ�6b�W�����8��y�������B����.]���z?t&�)iOԨw�#k�@����p�I��QRyE�ġ�!��v)DQ��B�^��,�̠���[��`1���YY�OIJ���:��
+$�m�De+Q՘Q�nQ�ޕ6ی`�ڕ%\-�`g����9ֿ��ѹ�$Ek�2�{M2Ҕ� �m��ۖ���g�U�Տؖ���;�ץ���
�1�"J?~1��p]h�1�V/��
+#Z�"��:v���u�$�<k݁�ו� ᱌��(M��*�]y�k�-L�OSO3ϸ:���Y��*�Ct�`�;�
+��~�I�\�D#bɱuN��aP�F�1�X����9@(��Ɓ,�u.ݤ���1�������Sp�İ#k܉;�/]Բ�Sg
�]��%TT�*b|�uP�0����w�Ħ[�<��[d=tڟ��E!��Ħ���<���M?�$�>O�[���S�!@�������,n�zeJ��!���؇�=�
w\a����sL
�_��B8�dо(�N���hW���7�7�܁-�YQ�.�w*c�*Λ�R��7��.z�f����ƪ�_��"�����ddq@��5D������?�S^�����{@gUm��k= �$�A�9�z�ذ����{�.`
�$@iҤ�@BHHO�қt��;H���|�9������ÿ�g2ޑ����]�Z{>�Yk�g2�	��o,x��)�_5P���|��*�o��$p�4Lh�S�(r�/|X�X�Fg�8H�B�u+�8��6�@7㉯h5�*�8�����Ȩ�4���!��!(����.�o�����T^�\{h&GZ���w�z˧������T�L���Hn�X�VNL€��&�>����у�-�����K�^�������6�p��@!a���-e�c�,�m-�ja?ۄ�Y��E�J���1�e� ��Xڂ�~"����*�c���̈�l��(�L�� �XW8�$=���ܪSf�;98O@�@&������1MVjZ��_�O&�0��(�?����u_ɐ]�Yy�h�\K	����o��&��~h����u�@d5�5�	\������d[%ֳUr�ӎ;����O��8r��K���� I,�|��7�)]g4��!$.o��G���=��.�)�ԉ�nw3�d6�?'��B@@l�U�]��ic�u��d�>��Eq��@�j�pPux���.s�c@�ܘ��~���,�BpRz
\K���F�"
ǔ���+'�!p���4��{Dc�����1�!_jn�v�0 Kŋ�+SBz1z����I�K�����f��K��r,�uy#\�
+���v�/���/���ΧM�_Ԕ�5{e�E�C�s���Ĥ0N�K�V�5'��,�[J��h�V�Ԋm���'�.� �ǃ��������������{�U/��IX�
ggU�HʗX��9�h1�e�_&l�/����$3wk�M蚡�^}�h1�&O4\���J���"�����܅�?�G�a�����x�˦��[S�@0�0��$���7$|Es|3$V���B1���ėM�ߤ�-n��TR�'f9�)f�%����mo�zt�����-�
��lp��K�꾆c6��t�N5t�ͼ�5�x��m�Q+w`�
��n4(	��,�m�S@����^��w{nH��J`�q��,Oo�S]�!�:,RV�sd�鞼�A�1K
��'���-��9	m�؂}G��#_ʚ#��pW!�:���c܏#��	z��4�Q�2��6� �Ԑ.����13�5�Di�'E�������R\��܏X��
����#� ��AM�"��`�D�=�&s�UL*�Mrp��遉@�
+ho����9S0Yc�1����+����� �<S��
+���a|`�_�]���i��2�,:�űo�-�[9�>51�N~WTz��1�8_@�i�^`���j@&v	�$啣�‹H�$2G��݆
+���F����p�$���A��w���?�R�~{a�����BV���I%�Ќّ7_�ƦU׼$�.��Zd��O�U�)m|K@ЈdNԣ�1Qy����@��.�W�w�>N)�2�t	@ok��C827���I3JßQ}�-�}��^�Jz$�TEF)�V�_W�ܠ(�ڻ̆h��B�eL�&]�U��l��%;�nj��S|��ӹXQ�M�c�e�o��C}�.,iH��T]�-�����۩�}n����[����cg$�7���x++�+Qt���WeOD���X����F��R�%(����2�,��j���i���
ke�[��ZP���Q_�iU���*�j��E��_�.D�[�hD��+�s�v�-�S�Y%a�į�kU�Z
ra''���u��
c��@�b�?��v���M��5��1:9�b�<b'�&���4jI�_Zz[9}
f5���r<֩�K���G?�;
 6t�Qm�����]͚n�Znj
7������mko�ikp����\��K�5}����~pܘ��b�&~�ulqk152�$�)ifhg�.qb�d[��V�˒����!)�,��-Bߎ����#��{ZI�D�VNvg&ʤ��)��8�neφ�D�.%t����wA��k�	���Y���#gf��=����L��\��qnI��o'���Uϋ}C��^��/�E6@I�;1�&�.��7����9=p�|zx�Ya-��X`U�\J?+��,?C6�V�3Bb�����Ö)U�HƉ�<�*d�`�"mu7�ǒ"{��a����w�x�)ҫ,�)�lʚ�&�t����h��7�_RB��ʍ�N*1
+O�fQ�{[�+<�(K����~�)�����4>=uf�� ��?T�M�J}�B�v&]ɯs��!3��M
_��s����d
�ih=�
�C/|;�x���	� ��J��Q��dW>'|6��?�]�)�y�C��ك�^��V����a�8r<p��21hbvԓy1%q�hsА��ά��x=�.ԉ����)��ep{�Y`�����sU��'-�d�h/�9��+�����gr��Ԕ��h�+�z�|�S)X�^�ʪ��$M��3C?5�U��`�u�Mh�g�W`�}�߮��l����K��I�'�۬�!�;{H~�
+N��Gy��r�4 ��E�s��1&
+d����ˊ��U�V�0_���A�x-�&E�i
3���;	�����E1�
[�1]���4NO.�f�E_i0�UT�[�"?I�?�������N � V֊
i�3w���N�M�j��u�&؞��^�׵�C`+֬�wj�!:'M��SUo��3l���qo��V`EU���U=�\c������9!����fTq_q<ۘ�jnxko;��-��!�~@���k�mLu���ƭ����z{8�=v���S�St�Jn^3�81h��T�2lzP�(Ƅ����ZF�
+") ��},��%>�dZ�VQ�
+>:	[�&�����\�/f��tAL��{{-��{������w�
�"���Yw`@�]m����_�f�UJ���?Nk��CԊg
+�_�D�
Y
Jѓ)'sz�\�ˬQ��Y/K�kLTN��e��D�5-��C������^l��ЖQENZ�~JHO�^�.?Kc�aZ�x�x�6��	��=�
�lq.��P�����N
7��@�V8&�����a�;�j�rmᲣ�)���,-����Ql0
p�2~l+����-B�M������EB*�ՐYVa����K��?�r�F������|��抹��<���ۆk9gJH|��ؘ������ttHU0��=חwG'Ǟ_<�����k�^�p3��W�����W��31f���]�l�Ҷh:I���Z��yZ[+B�ʴ�TY�z�3��N�i�a��O� ��u���}�R�Wy4;r��RU�W��Y�Frp\�)��km�]�#�,��1Ϟ�#5|z��[�49;@V������L�_'S�4?1�^�!��x�p�il� ��qA�{Ϩ��&��nS!���d[g�ˑ�_�8w�8�%0fCh���
���c�����ʳ�40.7H��lʈ�ʎ7[���"���r7L�@
�9��bq���P��4���2�Lӏ�[��F0g��֚\7ՙ<��n���?w!����U'[��1�^�K�DB|ES�RqԹbxL
Ȟ�b�g��&��Y���x�-	Q���i�!�K��p�V���:���ENU��>h ��c0�6=��؃��si�����s�͚n�|����w����Cﻆ.�����iPPg�h�-�iv�����5�䥆��e�Y
�5�L
�r�'�T�i���f��.�/�;W~�@,!n?FO�BV�����Жv�M6�+le[Mw�kwr���%w�EI��*-���%wut�Y8�U������W��҂/Ϥw�Zŗ������~޷�dRo�Ҳ��2�:��[/�*Q�፠-��n�����*�3���}t����>ڧX��2�p?X:ݢ@L�괰1�V��j.w�� �Q�S���ɗ����gv��\�zn6�Ŀ�fD6��1���Z�eg#o>C�������L�|�`�в\*~U'���;ݺtF�!�,u��J��M�����f2��o@�^�3����Sݹ$Y�<�KZuW#��+�Y�ڦ�3~������Jz�3l��6�yl_��������
�W/b�I4���{����BW������O�o~Gh�Z�-Bo�F���E?&r��r��R��3�tPN�c8-t�)l�.
��ϋ)�!ٔ�/fF�N��18A"�
+6Z`����4;�]C%�i��,��+�gb�M�n\��0P��T|	@�ܧ�R3��cЕ����u��E�	�+��?y;�7.M�[�T诉���s�*>s0�p�j��@��Ղ)Z�������ӎ��U'��w�SY6"y�|���F�����ک �.�T��bWٯ��6ܩd�T�ki����8f�D�u��N.]
��:���
+��W��5I9O5Z�k
�æ<O�
+|�f�h��	���k�s"��ױ�3��0	'���$����;�?������R1�j��626���{nٌ��`�8����Ty��s&3���5�����4��P��ml,�tZ�{G�hoI}�e����]fCo$���ɭ�z���Ur=����T=�֏���b~s��m7���8!�;�أe4/b���D�>�bp��������n�.YM��H�Tb��Џ������&�Q�H�C������@c
��]%/�.ym����.ϓ�cqr��ˈ�88�׌R��/����]\4n��a�t�( pSr*���ٸ(�|i�������%���Xi��*����N����
*�^d!#S
+�&��@�P,l����NoG��\��kR�y-�)Z��LPWlko�:�$����6_�=g�h:K�Xs�U���knS�tSo�'~��Vz��j}���|�w���,�1f̂�$�D����$gP��f����1ݤ0V9as����39��pIa�#���2�z<^f�9<J��2����V{~E���%���~�&�&���8dgCw}Ƿ���4��:�\���=ކ^����rE�z��r9h�I,|X��V!%-���F��ƣ�iv�3\}VX��R�5����$^z���[�|9+���_1+�
8h�9Q�qi��3D3J�����h���A
����'Ӓ�5����������Wl����H-���0��)�V�{
"�lӘ������֠A��4��#�&,��:6�-�W�R/���0�
��V3t�W.iB�8ot:�hs���d��p$@?��\��	.��m
+K�cOi��=�o����{�h�
���R-��t�U�ej�:{M��U��@���OG�tƾ����m���ɻ�?w!���Q�/�o�yGj��	<BM
����o+����K�dy)���Dl�j3ZP�E�
RZa2,{�aso-p�N֛�Z�0c�#���^�
�:)�O�W}��c-7
�f��*
|�s}j�q����Q͍���]EX�ۮP��[�
u�,hHsou]�D���OL.���;���$�um�]&����ϷxS4��	�`�x#0�V�d�ĴO0��g����%;��&�&S��hJ]M��u��1�˱���Zwy������7dfOŬ$����X�ǿr>���N���^ߖmc��u�'G�}>��c�v�t��������
W�J���<!�`*1�}��g �L�|M\���&&��6� ��h�`%X!����I�!=zZĂ�ڳ*�����Dz��rq���A��h�̓'���I:Tu���AX$`���k��&��f�
+��|$��{[�褛�X$+c��}�G$�J��&��e�2������+
s��D��N�v��ϟ6ʺ0P�Ss	`~���������^99�ݞ�
+�c���/���YgR:�ʙ�v�k�jU����/,K?>�3�4yߗuD��0W	�)�)�O	b�D����Q�]�$Dw%'�!.:3�����<O
b�F����s�ˤ���(��g��2 ~lzx�Ġ���u����.�&�_��T^a�=�[>�V��1�aVdd�}�W���pv��rږnyF9i�D�S4�Jo���I��
�����|�;�f�s&����O��K�fxL�-��*]Rh��yS�H�����<Bg���a5���$���)�vJX��j 综�������o�Bxv�*1S*Sp�r^���w����`���� ��w�"�(.������G8�]�����Uy�p�j�k�H��-F��8Z�`�i���OV<����V�ےyMю������}����X<+��W���CO�]����d����fb	;z'Z{;�llf-7�����kY����&�q�`_C�_��=���빴w\�#�������D1{!�X���9�}�!,�����Il�i��w=u����
+K9r->~L������u�����a�������(�]y1%g��K	�K��H������,�%�(����i�;=�[�S�^Gr�%���En_k1ݒ*� �n��{=����������|��|�͍o	�Y����h�����8�L����.Y�V�r�c0�9�$�]�ð�'(���L����V�L�z@{�D�3E/3�����Q��eႌ�.�����S����>�M��v��/�,�v��#�>O}�A�����YZEk<����r/���|�w�3]V��r	
�\|�F�Ԛ�73�����E/dE�l%�m��6�`��V��	�R����'�A�ƺS�e��a�'�>zv����i9�]���V��<
+�Zw���+mykFw[���uuJ/�}͈����5W�#}M�H��5��Y	�Jo�*�H����<0O���b"`��#=�8+-�9�QP�Pr����[i��������
��t�<czP���I%F���%�_�J|�E���A'k�d�NK���e�R���+�̰�?�ʷ"��ȣ�ۯh�=梧��sQ�>�U!�0��Z����`Sx㕱�?�8�
B�,�K����j�
K��f,Fu��q<�2N�Twr۶P�m�����*d�e���1ճ�2U�8��#��ԀL��Y!�W�يth:�c�7��xu���i�I��r�z�����-���遉���wB�'޹?���Ə�<��آ�0>:s%�T��7��?�
�%�^�1;*A�+�S����M�
+����9i������xi�����<|�`�喈���a9AF������n4������j�)0M]ġ��q�]lko;Z�}����5���]�7\���sllE���9��-�Q�ի�.� D��H�^�풀H�j�$�s�+���r9��2.��,�y}�C�W�n-&
KZN�Wrv�j��l�"[B^�5/�dͤ�D8��,p3��~��^Z\�-�!]d�^#�<�M���D��"q>�ڪfZ�Lo%K�"1ZMh���a8�:�`��3�s��e�k����F�.(�}�|)�t��A�T���Q��Yam�/O�4�q�
Z�p����ht��G��0n6AGc�:��;�<C�]5�0Nj��'��i�-j�-�����z�n1˻�A��}�m�
"	��w�USI�Dm��/�"d�����[}~�1�yg;;ꩂ2�Z2��%fc
5��b��-Px��ߙ�;?-Y�����^.��osv�$��#���#���E�����i�t��vr�ڶ���Z���on��d����
�XLF��4�>�f�;2#^��/	���7�a�oz--��ܘh�ay�NF�ʐʬ�r�]���UE���H�jF�@[_�RC�
!�i��l�W���#�c!J)��i�"�nz�4�"�ž��� �`�v�s��ggB@��������܊;[% �P��~v2,U�7bj@.{t��7Uݹd�`�
MUI��/�Z��qTs����UdoOj�k�����݂&_�+�2-&�����MV��Mq�����F�S��$u�lH�'^=���E��
+N��w���=b�T+8$5�u�'(a�E�߅��Z�N�'�2g�dI���e�"�-s�,�@d�YY"[��*�V�ʊ��X�0�u��-:��sR��]�%v��=�J�&�Ah DCߢ��ڞZM"���&��v=�^i�m�Vw��y+��ܧ�"ԃ�,�|��ƨ�o�6تn(��Kx˵}۵o�-�꾮�6��q|%׽��4���9�B�d�[�O+o��+o��
5��^��ɞ�mm�tB����e��b�=%���
+��j����ܘ�TZxc;	1<ַЯ'�o�=������:�*���`1�W�uP��b�es��H��j�3��2J�����og�7�h���>�s��J ��U�|�����%�]V�b�Lr�@�p�D�ܛ_�(�;���kU���vb*�njR4?q�ͤ6�6h.ˉ��։�R�����v�>�
+����6�������5ܸJ�'8���t57�����Y���g��M8E8Q�Cϳ
���\�z��l��Ǚ?�)�y�FO����{
_�c��2��aDI��;޿��K�/}�ʼn
��Ӳб>�����*�D:��ha�4�L�&-O>�X���W6}���ϫ�����.�n��<cƲ����7�M7��<��#l��DS#KX����o���Fv�p���z���ٳ��N	��7�C���A��Kֶ��i�Ip� +���R$$Nˤ.��U�~M���R����/0���
+qG��`_
��G��1��D/k�7��G�k�����U����`��ݰ�N�zR�.K�S��\Q+g�\��`J܋�/�b�
�.[mޠ�Ŷҡ�=��wx�
+p�����Cu}|���Z�)ײ�_�s��3���'�m�R'CN2����Yam��-�iR|�`p��v�N4���^De�~2ik�~����	�Z��}�B��C�Z�q<s+J�Q���C�ZIzM�?as����*[�x[�f�t�0&l�0P&V��ة�o�GM7Qy�᎞$��qk��Ղ�T��88�kRK*�^
\��T�'v�Ӿ�Vr=0��E= ���}�uC�rϽ㺀����w��H5�����\�����
+nRE���(k�)-��6𷵷Si��B^TEm��U�ǁ�X�8�n8�2�ީ�4-��Ū���Xf�E~Z-@_.��Qb8pv}C�[��uuU���Hv�S|m%���"#�	�e���QB$�|�y|Mļ�Rp�
L����/(��rBIֿ.��
��ڗ�,��9��ꬰV�KI�|V#�ʉ~ 3�ux
�	
�~���o�;�WtF�(N;�/ڦ�1G�i�@co�W�]��Ϯ��k��e�
\ �E'`���3t�+���	bVs�y��Ϳ*���^�����jz�űQ��#V"M%\nu�;e�]�PZnÒ�,�I˺�_�ʼn�k�%�F�!�˿n�:�ԅf�L��kd��a� &�x,���:��r]i����<ⷀ�&w�8��UӇ��<p���땡�WN��\	6.�BL�����ͬ�`˦��w9�
+?&@)w�_�v�jӃ&�%�����/]�ޙ�鬰ָ.F�g��Tb��
+m?��� #X95 Tű
�
+�ܣ�8w��\.SU��	��)]Z:% _f��M���t�7PmFsj@&Xi���e�	���tK��@�6qK�"���V�|�owR��<���E��z\����MN.��R6l����앭Sr�_�\�N�(��F0m����D�%�nu�TS�����/4��9��c��}t���lU�Trp�8�|���bpZxs�s�>*&n2���j��oZ����	���?������a�V7��(��ʹ"hl­�C��މb5�EF�Ezk�9Q\�aƿ�N2f�X1P����!_�B�������#�iϋ(��hղ2�BSo�;�&�b���⾂N��M,'���k
�r�ګ����5���u�
���$4��Ŝ����\��q~��[_+�{pP�ˮsϘb�O�
r &�������qk
+W���j�U�vZ�N��ť�R�0�o%��0�2}7�Я�a�i���g|��Y;=Ɲ���/�e�R�K�
PJ���r��P�=-�*�j,S��F"	8J�ė��Z�+H%4v�����\���%;�Ġ�Y�/��7��ńa{1�Y���(�ޔ���}�ۨ�{3�	��4��8�޷�E]t>'���'¼��)�YJ�E ��ComKo�*𺎏�Ι�nb\ָ��/|!��u�Ħj���]K�
�w�N�� ��eT0�F9�r�W9�Nt�0�'�Bِ��Zl��SBz���O��p�O�G�_Y���-N�)tv�H!A�ia�Є9�$s�G{��]�{�i�ut���lo}_L꺍q�o���͝��jD��F��_�-�y�G�?;�1��m5|2�MT֏�`T��7�_�ɉz��6�ńg�zה�g�vN*1��$5�"_R��
+묰vy��prf�~B����̌(?#x�‹���G3D&���Bc��Y�|
(�$ӝ�*W�j�;�]�#F5f9`aGN�_�
8-��!���!�Zi�M,B��ª�[�b�Nf���j"<������L�~\�m6m�LL����Á��
�8fN��g(ׄk��k�SVv��{�_*����T��yZ��E�Yq�G6<mu����r<
��h���9ђ|���2JU�,r
��n�m����>I%F��l���o�c%�۶�(/��nC˦�5+�X����V�܆�.m��3��IOim��X-S�����V�M���e��Yx�U��e�⧭����	,�ðx�@��+�<j�y>�W�%�ݕ��>}�U��{�m�
p|��Oٮ�f�4+��jn�
+h�������*�I��*l��PE���l>�6Nķ�r?���>d5M+@�l�>�����
+mה�e�����f��~�Ŕ���<$ju�+�4F��D
�k+�6�����e����ca�X`,3Xyv�;5T�
+;1��Z�����2�z��F�%֛�`�7�%{d6�%�Œ�a(̺�%�΂�y󘘬�r[���~��
+ٌۘR�a"8�x���S�q��N^�Bb�X^��1���t�BT~G
+$�T{���
+����D8*:c�gpF����͟�=��̾�l�G踦�2�~C����7Y<�*_��\K@SU�q�$?�x+f�"@�߉A�MÍT	��e�������ݎ�uW���
y���*�//"�w��jw>E<�c�}�
+�����_`%�@wHfe_�I�hU��靖���Q�@��������e�-�7U�{J��K��lx
+���2G�y�K�쿹���Q��\q5��?��dV����SQ��&������O*1F
���A������̈79������6�5\7�!M�[��$E�|�͝�i���+0-08��b�3V�G����60�]إ��`g`�4�o\���0b��i�
�w���+��H\���Yp4%}R��0�m�ϕJ�Ӓ�?��hc�X��&i���:l����� N
��0�€2WT=�k��������UI2Ri����\���!��;!��~�B��C�Z=P,!~&�����VC���._�o�r�iG"�6DE`[�F������=�,;�İ���_���y�ys�{Gy��J��᏿Zy�>#U�ij��à!Բ����]�%��:.���~˵
+�w�u]
��H�jU7���ᚾ��6�����b太n���k�N=p��i���ƒb���w̄b��ryFx�=������09�8͎�ͦ��
+kH�]@>R�O*��,�6&qv�*�g,��6��5
+[��s��%��<pÛ"��5�Hr��J6��$H��0J��
+f!����)Q@U��+H��ۄ�LgF��c��H�2�tfYJ>OɎ�;�m�/��"��8��ou�R�{c|���،
�Pl��`c�<��S�.�@�蚪�T��w��7��7BS��qIt.Igu(;�]�*��ɘ���_R�L4��0�QÍk��f������1>m<���U�\�E�)�
#4��@JH,6�'�M��*(+�p`���/��l_t��!"����
p4�8�z+AϳS�+��
+V�A��2�H�X�P���􊚏���tʒ�����ʑF!كiU"����m4�rlٙ�ZV�Z9�\~����Ya-馴�Ƹa�%k��
���
��i�3�ę���hd�謈�ih&���vWt>�I���N<�P�|1NϐJ�M�5�6����o��C59�"��
ؐQZW�%>ǛR�i�0$��e��5iyZGf�ͬҊ�V�V�
+����av\תAa�\'
«ˋ�&��tg�-j�_�����y��J�����<��Z�f�0@0n>�9U�v�]d�[�'O�S�K�gj@&n��
�.]��mG���Sju����?������
q�p�1���2mȠ2zh�g��is&q�7�3���xp�Z��1[e���Y�!�і#���r�
ͼUT���������Zc3v6���-�Β檹�l��=]��]�M��<�^xӵ��J|���%˻�.��
&���q�f�
+M��Z��.Y
n�N�rS0��Tm.
+3����/��#�\�\��/��L/Y'5����Nx�I%FY�$y��b�R��}!'���Pp��\�Y/�û��������W)�����K�>JdH{1��D,3&]�9u��J]���$�}L�ڗ�8�\��jl5�����\B�1U�P��D�#6�Ik�Cay4r,�����^����:Yj�iGc�zK��2�h����X�
�T�e�M�7�sso
>U�7&6H��N���}��y�M^��n(�c�
+oi"��]mԤ����D�U��4�*Ճ�VE�ɌxK�^���x	s��V�p6��zH����D�>'�AZ�&��u<5B�q ��4����F�����I�@�AIP�>��1w*�ANA@Z�H��hɋ)	����)p��^�&Up*��Hzx�YaeE>��"��+
+V��tbZ؇�KV�h�)�(`Vb���X=噡���d^v��<�vB@&�;�\��b����)�j��<�h�j\k���*\��O�L3M�X�8#�����$?b%/H�č�DX�U��H�Ɋ�h���_��z�VI%��ᔕӀ|ͭX��X��i���)��߀�B�*����-���
�HA#lkZ�.��yF��~�drA�5<�VQ��+\kv�Z��ë����T�_�w������h"U��VV��V��m<<�wBd;���܅�?�Ve�X�;/o��r'z� �e��hY���.�����0B+2�I���ZɌO��z�ͽ��+�ʹI�X=�'~��w�%�K?�����0;�&q���R�t�_p��pOc*˹jX׷�G�ݴ�\�����#����Rݍ��ƃ��J�G#on%׳��ㆡ���൉���O+�+0g*g}���Y�X!�'5�|�
+R��{�"5��b��~M�ɉz@��xV".�cl`!
�@:��l�y�d�.yj�(�b�!8�<^��6Z�;fv�G���	2���J4�j��0�[���'�TBG�ʷ�k4�w��6Й��k�a����ɅR
+�&73�
I��A�����;׺7�aQ��������S�Aqч�@�.:���D�����Ī�������9p�h��7Q0T�vr�y��>2uz���q��k�m���PH���̲���CC}�U�M���r�6���@��xjȗ�+�7QJ��2���5/��,�"k#�U���Rr�$
ip�g��4��ץ���$p���+�ȞR>�V$�^1'sٲe�2e��}�����9r�[2�j�Y�&�eâ[�4��N~����"c��N0���_�хZ���La����_3C;`�٦gsc����]�Ya���dF���ɉzt�d���lQ����L*���M'�������V���?��/�^���(��!��̎q�y��Yu�ef�D�E�Ԇ�m?i&�i^�YSI��i��:���H�h.
+H�
+k�;�� lT@j��„��s�tc�̰�ΜDӔN�WaL��C8��|.͠(�v����IcZX��
K����F��"�c��46x������ytj@�e��"����܅�?�GK*�0}Uj�UE8�[@��G�1j����w� ��CTɿ���ha�kx�l���[h�U�h�KP��np����
�h"�V�~؜����U-��`_u7�}��m�������)��M�|�5���t����n�1P�+���[T�M����6�Yf���n�m��:������2���X���٩�M�� ����ɖ8ϫ��4�1�T%Ѡ.������Q����M���&�8�/��=�ϐ�H�2@�ƾ��q0k������
%
A@��׽.�1!D\�¶��J�I`E6�sݫb�������%���n�64x"/���m��`��#��Q�\r3�[���gp��[Z�u����4�袂��/��8�*@'٦�i���X�
Swh.T�No�}���L��0;���S|+�\�s̬J�]2�l��h���.�����d��x)OX"�t��
+�gΆ�ʷ�8Փ��?^]�.e�ܩT`/��Q�]�ӚTb��dF��j�_�RqH$~X%tJμr~&�
ҁ����%0����˫_�8��;��H����������8d4����0�WK�Q��f�{c��Ι��R�2p
+�G������Xx
�]�DiB~��A=���OA7���;6C�4�p=�v�sa��,ݧ��
��Yam \�"XȬ��XD�<�L����xI��a	���*�"���E[n�z�MZ2���O6���n$�>M	�=��\9|$ R}o��b�@��Rs'�Ț���K���L��
+�E�Q���&��ea/��$�Ʒl�Y�Tp9���e࿴�C�$bn��L���Ch��b�Z뎝�IWI������
�{���?"���s�+V,""�E�gϞ������*R��;�s�С�������"-��W�ok:�r��&t���t+�%��)f\�ݲ���3�O+Ñ&����n$�Q���i�gh+�/6�Ok�I\%�K�1��h(��ߕ]��@$,��K��B3!��
�����\�풀Hx%l�
+���o��bo�ε>�M��cHk���=g�T��(:��~��,�d^4L.�����]��6-�W:D	��
#��
Ta'��`�D�D��.�I���e2�
+P^̒��}m�n��Dn�
+�s	+
��
P
�f��	��@'1�@$W4E��
����B�~�������,<�S�1=$���S�q�]b3JU��›��6�obXx����&'�ΆU�¤�t��gz�TXMW�d�Lq�ʸ�М�4�zc���b0�4�&�m���8Q����:c�_�[D❠h�y�����Xu�	|,gf�[��eA
+K���'��F�
����
}���W9=V����q�E�cq���d�t����9YF��
+�@-�	
�r�Z*�@m�����4��Z����:��9��Ef��"���٥��3=�!}�`�+�+�;_����3C;�zbH7`HS?^�; zZ�Pjp����ȑ|x���<���3��D �
�j�lx5�K�Ty���I�+&S�pUI�tB@�i��4����<P=�Me?)2N'9/�,a�uZ6kg�ۓ3*�4���/�%^�/&"g��%�_coVبcL��*�EU28u��(�-�N��:�t�y�J�3�=Cd�Ho��?���-� ?�%�0�����:{
+�OC��:s��F)S+���'���xx�j�JLTPB������m����X���?�1lذe˖͞=�lٲ���OLL,\���36m�T�b�'�|��͛�����������7���|p���4+��a��m�SAY��S�
Y�t��
O�����b�Տ�N�V��E��`�S��f?�^�V�
+a�|��6ty�ܴV�6,dso
��M��誺�����
+�dg'��0Ķ�^��ZNbV7^�9���+�ť{I��M����L��$%;z'4���kI@&���5�w��_iD��X,p��Q��M���c��kXQ����l���E?�}4V"$�&.�*{�[�d��&�8�-W���0G)�QU��觖&�W�m}O'�j
+hb�!A���Y�.(v��3,r.O��.�Ŭ���!)Xf	��̌x�������E�V�?� �v�8Xy���"z��S�Z0��ʽibq������gl���;6���+�THGݛC_�j���h�TX�P|��[N�C�3|*;�Z8;�ؙŋ�6�h����y:V�Z/̒���C$ �?�H�;�����߰l��<
��)����||�F5>���$쪂  �m19�,R���D��E�K�c���,T�#�"ul��3+��,;ƔJo���z��@��"�O�(���i�)�~�>\|��\�р�l�q����S�t���"3�Q�YJŬ��Y���R|�ʓ��EɵV\C�"w��q�򵈇/V���mn��:��t�n���a|���@�)l�a�m4�6w��9�B�*<���	�Z2�S
��=��O�$�.
��Q-qM�<=��u�P�
���1,��GNk1J�o�蘢�mi);�	�Xkg���< ��s�R��.�De�A*g��e�:�{Hq��.��+��˓�I�B���?���~~~?��ӿ:;v�h��?�yޢE�����Zզ;�<v��̠�[%�0��`�liZ����g��R�V֭��rhL�H���,�Nͯk�q���~ױ{
\����k�m���ޜj�}[1�����J��7�Nr���..9�7�������
��T�M-p	���J�U�����RӾs�\r�|���؞�;��v�Bgrryq@�e������������;���z��=k�|~X`��*�ss%��PHv�!Q:G��)>���3���cD`'N��w�cM~D�*{qIAclF����tc��E�+s�܃�?+j�w�k,�B����ط���奚_0�du�bb���!��t9�����)��#�t����ѥ�̱T4։1�r>�AK]QA���
�.��;�[�B��{����#��zt����\Mg��뺴�.�h�_n�q:S
D�;o:��M4�@tD�M�n+�*eG=�YI������&@()-\�WLˆ�r�kY��Rh��
��AA'i+��#s�.~7��~�(Q��AӤ:��}�5d@�
2�ƅBrr��@��֌�Gm�2.�1��b��&�jr�l�VXks��}�ܘH�oD�s^�x�9v���$��4-�9�U��	��5��S��O�,�͇.1�y�5����o�65 gLѽ���LI'�xd�1ߚ�=+��x���E��
-�j9WMNs�j��K"��zB�u�k
��U%�&<��� �+?[��4G�c2#^�r�
й�eej$�)���lLL����w'�8��A�a�x�-�R�R�>
=Z�6lQ"pBzʼn��Bs���Ak'β3s��h�A�y֘�T����P����%��LK��>Z�OCx�TGZ�;!����?w!��������[�nݸq�P�B���w���#����������&ZU�⨪���.�ty]���P�U���db�T=��z3��D�h��VG�$h��6�
+2�t���N~��P�ߧ~�`��]0�WnK�������?����ۮccoa-��Up��Q�Mࢠ��d�+�6���ț�h���
�6�)6����*��,��&��3	�R$M�RC?�A0���)���/>�5���I,$E�uB�J�o�e)��L6�莃�ɂ����#��G{��H������l�}=��R�k���0�կ�&��H
�c���u9�/��������rink��)g*��_4��!��t	L��r�1��La^s�_�[�c���甐�t.�pf��i��bcu�j=�6�j�>���MT��=n_��C�%��eH��Ȋ�����a@��s%�eټLIDe�p@�|����:�����AI.X�5��6I����#��%�gE>�Og�B�-C��[[�,��.��������4�벳�.26���Q����>24~c�d��Io�wa�ېG.dqY&�@�p�[Ĕ�y^LآG|�
�;O)'}�G�"����Y��,�X0-�.YN���QOY�fD����hӕ�+Z�ϰ
���0fl-ozP�x�V
+���)�t%G�����W��:�:=��9�<^��`��տ�,���L�,_7�8��6���]�g���n `�:źØ���n&�/}�~��q�ax�߲�Kh����HL�I�πZJW�sÀ)�3q-�U�	�{��W���}�yF(3ЏkgZ���k6�n���LT�1��by��5��+���)p����
+eO��T��NΐТ<�D��;\]�H�$K�{�����!r��܅�+W�<��C_~�%�'N��AV�Xq翯���'�|��������TT�@�r=,���C���G�04��ox'r��~��l�K��}���L�6�Vu�;�Z�5�d�'�� �4�젵����u���ކz.�1�p�@I���[
���VuC@Ə���z�=�[����q����Om=�Һ�g8O?�J�56A�^"�zSK~U��R�:�/�)_aC�6u*iƖ�+'�Aޝ��Ga+���'��� �����/je�r��DĚ��|(�wU#��p��3$Y@���,3�d���k+��� ���N�Ru��qN
��m`	1�R����qHrG9Ad���*•��2�����
������2���Aƅ2��L���=���5�T.�յ,{�u�Z�V#�բ7q��J�Ʀц�(��
*������/7o	 -�-|4�Y��?�H��tӼ̕z@�X�;�����3��˶te��4fY׃2��� ��R/⥥��l�;�vQ�}��4d��4��v��h��!��i:˗V�NWo�c������|.�NZHbTX���� �
�^b����նi�u��RN�?#.
+7�a6
nASls�3��<"����眦=��|`� 
�)���
�!Lsfh=U��	C���A��Ԑ/g��¶�Y|w����Q��x\�%k�5�T�?�Y���R��w�g�$	����l�h�/�%��5+�#�����zhU��5�)Xf*:6ъ��bHhX�u
��r�
��Ẃ#�B�vq	^I.�(s���J�ؔאּ�xh���d�z�7��	Չ������XY N���{@d��,��g�^ɩ~���ɺ�hl��}���*%M*(�YTmzx}2nMʟ�!�xF�PE�-KΖ5SC���Xǭ��<�D�"����8DB+V����o���/���
+��(˰�y-8��(� UL�E+pcE�T��&n��F�1VpP����ZwU����~x�5�$��{"ȥ�36�[�
y��Ece����{�
�M�����\����络�m�XU!���P�d�x��"��9s�=2;�M�:^S���R��U�P��m<�?��5�f�c%pw5�{_fěX��%k�����P/M��N�a���M���Jbu��Gc%��X�l�O�1�'�q�VC��0�f?1�*�VV��ZC,��m��Gf�v����(+샛�+	�}Bn�����+Xi�AF>c�X��Zeifh'�*��gT����E�`�/��PI-˻I?[�F�
++��z��JxؚfP��(8ʼ\7QOڥi�G馞2Hv2H�`o�l��=e���ʮY�!#�w:�N�)tٴ�Ʈ���v!YV�x��������t��^��(���Ky��-�ᕾ�)5|AP���\Tu쯫�La
+��E�iZ�,(s/m˝H���|��&adۚ���MwsZF���2��q��%#+q�Y��xK�Pi�$��L)OV��r]!5{��aA+�����Ep5�1Qf� ��֒�po��t&�bOZXsP���C-�Qg)W���;`!�:��q�is\D+�W̻�y�����֖'8U_��~/�ƚ.�)J�#c�p��z��~A.+�x�PY�8f&ec��
W�G���R$��\a���8��r$����t�ر�	$��ct���&q*LvU��3Y��/X�
+����ia-��@�>I���&�
+/)'!=��o�N.���h:ƃL_�Uxp�Z��Sڞ�;!��[�?��	>V�\��~���=��&Z���`��>+\�_
+��4��bӣ�|m+<jk|Vr�/ZHpf5A0�&���[
�5�A� ����7P���\�
+����
�9������@lj"v��K��z���
�r9�*���E���Nl/V���g(�8�/��rY�Yo,<�'�/�#Y��j�U_�/�5� ��Y咃��q����!)X$�f���-bH��ߛ*�5q����_�����"�γSe9rG])�x�S��H�/H
F����/�q��r~�onWM�����ݟ��͍�((sw(w����G��-I�j�{�G`77���VL(����<Nb�L.�9CJ�?/E���X٘�đR��t0o:0��>I����%��1A+���-=T	Ӵ�W̾�WKo*�<�r
7T3g�f�Z�~�ܸ^�
+�9f��ݞ�����t�ִÂ}�4h"Y����o|K�,�“��L��;�K�/������c}$���h�Ǎ����@��waaiܡ�__�2ēʙ�KV�c�et>ׂ'�V��pv`����`�!�����:�j�:K��=�^�ˠeؠO��+*ŔKU
,���Ȅ@��~Tb�D��W�ƻ.1�e
+c�A.��ynR��Bz��t�47=�>hȿ�r��,u��/�����U��6���>_�r�*����y�}�F�`�q��� Ӟ6'�;
+f�2�@NW�hisJ�x
ӼZQ��L	j��(�ϦגtW0R�j���^-p��;
��y��������|Q�Ff���5]L<�oM�{��O�;+�=����Ȩ�%n3_̉~(���
�ǘ�	�-�)5��"�d�<O�-��t�mŵ�y�䚇��d7ޅ�?��������W�\����o���
+�iL�yw�6� ��VX�R�]�
+�߰�K[`�V|�wQ5Od⢾�4����v7py��c�
+�*�N�.$�߄�A:�����'i��k���x��
\��U�W-��FL+;myp��}1��z
��j K�	^�>H+.ū��M���+�%��$��*=�J�Ԋ�7�G
Nh�7��$�wY��P��N�M�o��o�fV�A
e��=% uoW�&�����ç��,+p�>��fG��'_a?{��dH�7%���ǡVq�f\�e������r�ɬ���CÜ�GMZ����U�r0���b��.&[�{���]�}�f@�3f�ey��w(6~6Ac��I�yep�H�sWb��;>V�Z1Y6����L��?ز5�'�5҂2��p�p�4��|'��lp�ͧ���f��I��4gK���Ӕ8?
փA�]�Zzx}��^�+X�"᠌�)=*}��b�p�!{ZH���z��dt��w�\Io@�����$���LL�������P�"�R�"1h
+:r�;�����n�-;ꉬ��8���|���e�QO�_�QU�SC��;�W^L8�O�^Æc�!�)!�y1ʋ��'2�Ҹy�]-%<��2�ψ���öK�ӑɰ��sG��K�K�ts�%�[�0���hR��΢t�\��&��ݩ��[�G�AK�nP�BB[�<�|Q
�Yi�Usyx�*��������;l(rE��k�!���p
�٨b�=9�"�
+];��ޱ
n�=�d�KU���i����
�A�nVώz�s*������</�E'��/��\Dx=����sNKo
+D���>����_Ƽ�[�?��y�֭*U�DDD,]�t���k�����͛7W�X�'���I�}���C��b� ������ܶ�D�U
ӷ�pVx���B�a�?��������+0��F��`�b��>�T�gو��� ܄c~�w���W�z�'t����0Z�eCK9m]�
+ڂ�ͼ�
\��Q��}m�=�cPTn����f]Mi�j:XA�x
F�b%�yNC�.��Ux��o �9Q��Vb�pPAC�s��xHLv��q˶��Ԁ���)������_Uͯ�@[v5+-�a:�
+8J����9BaSp��[*�
+W�.Y+5����(���>���P!������owA�B*	@�1�ܳ�*�BN����
�(dY?h��ª�y�
\���7�'?>;w�����LM}<!������?I�5�56�
+m�R|>xM#3��蔻���j�̛���V��b��Fz��v�~@���3,_��ȶ2n(��…�JH'�/�"��hH��T�[��E��D?(�:/jS%q9���������J�|.�:H��������<i���|E�Aa�F�����`�ތ��~���dF���D���TFl����݊�AEG��9��(Av�'���L!>���?��J�cL)������W��(�>�0%��.��(�nj���8���h���
��biKl���j\��������+��6�综&��U'՗�ʜg*C²�p�5�s�V�J�^�n��k�RЦ�>�~cwt��Q�$<����)�E����E��˭���
�Q㿖!�MF����x�'�kM����?U��ך ���.�J(�LJ��yV�A=��0�Yaiy��8�8-0�Bs!G�H4��\�[��i^�^V�K�&8�:��+���:�0�A�R���)D�No������-����L������ٷo��wȐ!���"P�_%��������֬^ˌ��u�������W3�c�����h
+�5
��O��lRcV׃7��C��կ��F�Zx��n
7���}˵��@"@�&��l�-0q��n&�c� �4vj>�܆.&»��w����cbpI
+P-������@�D��a���22t1�$/o�a8�V�сܘ(�c[��
,
o˙}�U`�������q���o��%Ѡ�L��(�β��0GS<� �,[�ʫ���J��n/�.�~g��m�Rk�j�+����#`X2#��|�EC�/��yq���΋���n�[IN���/SC�}�Z���r��d�(�3�[�=���Q���,�2#x`V����,�N��df��_���ɝ7��Q
���*յ�PL��Eq����0�HOa�
�9���co��Q�<@���!aR�A�����v�VT�2��8\�5��z
+�
`q@(Y���Psֽ.�����P<Z^ƫ��R_��;J����w$���חN_�t&�0C*O�p�������U��
+Zw�l� 2;���
+F��̽��[���7\�h��K��M�[4e��̢G��[�kzɺ�ss>����9�
+����y�C��Z���:òܘPR3�e ѿ����Φ�$3�v�i9���
��
^c�n�UM��ڦ�A��N.��Vp�F�U��-*�BQw�b��_Z^d|P�p�$�Q��:������IKq���i�#
(�x�6ܐ���Μ�Q=���-�ɵ�i����1:iY<lrp?�ƈ�&vm��^�_
L.��G�Œ������y���U ���;���i��,�mVX�쨧@[ڄ�U1�!tn��;!��[�?���g�Ъ�����kNZ��X�:g�Â%xU��j��Jhx�Ž`� �qe�`ձ�_So9�f�<��D`�?�y��V}�	brL7��ls0�+��ə��Co��o,m{�0l��|����f��`"/,���Rꚺ%|�c&�z�
+^�QEN�0�7�J�細�|^
�-9oqV�˘_�3\�o��-!]Ĩ�P\M���r���u4cQ1���Q,��2�'��H���<�|����G{K8)ײ�O�ퟩ{
�̓k����<���:#��i��]8*uɈ����No�dz´��x¼���/b��H�;Z�	�s�Ci��
4���aK�(�5!d[Z�
�M�J���қ��h�Ds�wq]�
+통�ش��ZO-cD���nO����lN|�/N<{�{ky.+"٣�T	�u"+O���ɵb�8�Iʘ�
 >�dYc��Ǘ�>��f��Q�_ 瑩ß�?�(+�
���jr�
+�-6�.�3O�Fv���b�1��㊡��L�
կ�k�i.0�'�+���bt yw�2#^U%�'1����ʏ/2 3#^��21�&7&:�t�;�d�F��[�bh-Γ�wvɪ	�����oV�6��c&_1�'1����~���Ӫ0L5�gr{���
*a����0-{9+�p��$M�%~]�O�yIu��i�_N�q�Ɵ4������R(M�%�1~,��K��h�(
C�r�7�t#��B���������}ƶ�Z�z�S _�"-���{��ZK�Ԫ��Sd�4�?SB�s�I:����9jI�r9��F����&��ݠ*�ȟ�G}�<bO�����JNJ��8$��%󷂞�~'D6ts���.D�?���r;�+0@D�b�f|K�w
^�YMӢ�\[ŷ;e�{krSco��5F@��n���`�h��C�fSo��~�0��k�ǔvZKX��5�8г��mಛzK�{k�S��)h�-V[��o�|]o��̭��T�����S�A�L%L7��̚��WlAA���T��/�fǏ�Ϝ#�_��J�:�#&�����ز�D�{�d��Z[N l�K���L�J&]UU��@f���F�
er�=	�!2��@	g�bc����/�Y�7��Y,�Ԁ�
�R�UBv����ſ��,X`IC(5.���fg>5qa�.��Z��xV��p�Z�7�T%���g��h�juL��X��فq����'��Ŧ?�4�ۂ�ǧa@R����Ή�Uf�\�U�`������#�5���A�!����N��q&E���YF�&<��}�Kq���U��UK����3�2����=����
@����eV3��o��Ϲ�bɆ%�H���(Z7����ޱ�V���ϱ��Y�ʁ�^"O����|�(�״�I�1�m3 i���Q-<ё�I���j�Π$�Ƞʉz+��
�`zAY���e��La���#����o�|�3�-�n2�<�BcᏳKVc00P��D:w\���aZx38^����|O�W�f�dɬ����J�c����Q�D�5���όxMUANs��3F^��bxw�Q�%'��Q���id�B�S�-�k�
���y@�?3�c�Y���֜��W�z�5�#ս���0SYPP���V�j.3��K� �YC�?��x�UT�n#`�����›�$�v���6�j��|�����}h�lUU�
�ɀg�Y!Q��
3J��k+i[��ժ_��o
X�݂2�rr��.tx.��Z��iv���+]�{"��T]璕ްK��'�%�>^��b��͑�j��%E�ٯ��H�Us7�|�%��ȓ6�Nb�
AH�jr��b�c�S�ת�k�
+Wl���w^Yϥ��zߵ�`KAF0�Ľ5���������;飡;�s���`��b
*&j�p��<��V�)1�WU������F�r��������}�i��S�Du0���XAL�i�a���@;~"8���.����U���Z
+v�/H*U���V-%ԧ��\���,C4��L�Vl��6ō��S������Sڑ׭ �<EJ���X2�d�E��&���I��h����F���8K�?�
�R�a�1���h��LP��soʊے�}V��9�������td�9�*Mj��S����0f������
:�M����vs�nmh�m�R/�
�8X�4���/�x���Y�"
_�6=�������
����ǜOlg��.��P0���'�,@	ҁ�Bk��B����HW�6Lp�X�h�>��O/HY��5)o�����a��Ii���Ë\Ȍ(�Q�O����tS8{��g,����>K�OxS@
�_����7��f�d�4c�b��b���`
c��fvg����0�A+~OJ�+�	�%�̍��~h:���ƞ�:39r��]�;��WQ�L��ɧ��ь@����Ϭ��Zdy�*�n���0�&މ��_�����:[��;̙2��Zm�V[�Y
AEE
Q�F�BB��y��	IȄ�"3�J"���"�(�r��zVb}��}��|V��/�S�N��g����z���������4�~_Sb<@��'�N�H|lqN�bX.���w��4KߪdK25;-�6j&_a^�Ξ��Hx�2��y�V�c%r�J}��+Kh�������7�sqN0�S�9ʯ\Ͱ����
�3h
�59�M|I�ͯK�g���Tc�3-��?�6=�܃!b�U\��!��$� ���U1J���+�	0H���a,ހ3�F���
לK��HX!�!����^���p��A���6r���R�`�p����|�,�
Ww�z:�@�pP����`h�p�g[i�Ew��@�h�@5��j���>n�{W�ޗl;�W�p�Y<UU�[�|��0z�G���&c�0&��+��9?P`y����̸��a�\
+����X�[l�ʱғ�66�ڪj'U��2L7���}"�wڳ)�72kl��TV�J�^o$����F�b�{)���S��g(�����e/-�YXv��sr�J��T��pqʕ�������y��-Ϭ��� `�1q�)Wk�j�i��H@�{EV@UTk��r�^�ˠ�dsy�0&:G��k��YUG�7:���P
(���.�?�g)
�7�}��Ưp����S�<	8���b�r��Ԙ�,�>��<����s�5��m
�
+sf<�j�E�+�� h����>j"y��Ŏ�|X+աnl-oܳae6�r1"*ꅜ�8�Z�4�)��I�6O�(:��op���"�֛�D�D���a�
������z&��e+�w����N��~���ɷ
+[����
<�cc��,�����������tKm<?d�=�5��(�z�����ѭҶ}������;@a^l6sD��iBT�VP������AFH��x��	�x
By<3�`�2�>`p14�ZU?����Q���*<~���p�~%M`����
�]�i\dN`a�-@7�(��4�m�
+�9��Hm7H���
L���F�8�e(6i��~�s����Ť�3�>r��#�<#j\d��&�
M���l�^U�
a]��+��t"�&)�ަ*5ÃvhZ�D����UUk��/���xwE8���
+}N;�{�?a���|����P��&\	%�2��~&2�A��s�"�Œ0�����k8���-�y�u�y�[b��®r<����3�|��C����m������!*S��\.Ūd�c�L+��>�(�{����EI����͈��k�^��,#�6;��Ҵz��z�E�WA����Ys���R���k��٥�W_\����&��{ِ��7�����CH"��kb�����%������ ��UV���p0�O����Y���
Âq�6�A_�ĩȕrm�1܊�$���0wY���5	S��V��¤�����^�3��m�J���}�����kB߰ƒ��
+�W�]=LJ���@��L��آ�e5�)l�¿t��^�Y�ж����G��咰��kXu{��=���%A��]X���c���{/n?�e��nۋ�W���벬���؛*�Z��j[�����&B�i|���+�y
G
XZ?�2�%0VzHP�}D�'?z�U��G�(�����+�ۨbċ�����Q���@:LtI�9�|�
+W���R�ԘW��3⻎�3΀���
�g߬���:��9g*P�Paҭkiz2�\����@�`4L9|;��v��}�f�6v���HS��v@n^4�jcM�{�.z�����U�8����K�$>�p"%涏�$�D�s})��{{�K2%�w~�e�Tz�D�Q��\gn�i��	ШF�q/R�/��m3�������I� l�R�PT	��v�M��~=��+�}�f��LSNh.I;����m�����/�gc���D�|�Ɋ�Xv�QQ�n�.���I�`�hJ��k�I�x�O�3�N"�[���z���?�O�:���f��o��p-]j��L��-�U���۬5U���.��A=��颠h�銬�Z�K��]��S{[Š���A'!|��p+��iŐ���u�:	L�:
A�����um9�T��v�>��(���
+�?��������g��ucf: JA�'FM��0�DX���?c-1��h��uQ`
��ݹْ�Yo7�nYv��_sk�t�H�ka��C�,��H�la�
�bC[x���3�lQ%W�����f�y��,I;w�(�:/4F��k����
+����3S��*j�NE���<(#��x��<�g�3X	�P~�`�FT?b�cc[J8v��f֋JlWU�Y��`!e|[�Z]1����~�������J���v߶V.�n�nճ*�!$5��%���TndD�m�?�a_�׍��.�r�Ë1,Tz଺w����3��/�uQ����}FW_y�4T%�g+5jV�B�M�z��&������黜4�e(�Z���&{��nw��s��8�)�	6�V���w�n
+o�M��u�_�&t��m@O����XA��
X�7�s0���0>�8?�
��%��>tN tL�ߋ0�����
+B�PUF�	�%%�3YeS{��\�|��l0��n�r��0x��BA�O���L:�_ri�ɭ�ks��
+Ak�o�Hnל=p��R+�A�e�n���x:'���*U�r��5��)NΛ^�tL���T+��%'���x��c�Np�L
��ֆb`��驒\x�$�|�2x�d��\÷hR��u"�k���mf|'i������	B�}���|���?�V���t1�ű��=�-Wa�@L6�w�\BG劔aň���2ǀ}=$fzbI0�`�#�
+e���3X�gDb*��{9�V�B����"h�9���L+_��
+
��_�u���8V�-�wa,9����?�[�<��Ly�����yq���޽Ђ핒v;���^�������ec~�75|\��o˻6}����u�n�+�\���]2f����@��Os�H�x�j�Ǐ�2�UJ+h�d�����ʪׂ�}����'ԏ���i)�W���ۆ�>s����-�6���[��f�ۏ�5>�D�]�2��BxLa�wB�n�E�0�X��Կ`dT��=aA��ŋ�S��K�pX��
+f��/\���F$GJ�|��+e�
+��׼�W"���)dg\A6�z����[���g�3������q��jxe��PRB@��G�4=�E�@1�$��ʴ&�wI��<��U
+��PY��6�EY��
t�ӺH��ϻ�k�i�h"��R����Ŕa�K�y}���U�xg�U\�b�Ya��#���8�rn �0��\q�q�fF�?q��7�f�1���\LZ�������ɑ``
:���ja��{�Q�hn��I#�ⲕ���F��wМ�

+p�* ͧ�� ���ϼ�Hᅮ8�٨V;�����G��}������a�y�T�#�<���G�
+�v3���$
+��ZO��a�:8o���v��a���s~�\'��Ϻ������ZV�˵�i�	��/M�!ܖ���_
1��TK�%��l�-�ߨ������?�mv�>Z�k��)���خ}R)���245>v]�\�֟�������%n%��֌��ò6~��x�����Y��8�a��J�p�
��+}գt<���G��'���{�7����m���1�X�'����1�&���QNe����p ����4
*�#�t�[&,�j�$����x�,�0��
+&#���f\7)\�g��`f��SP�Q�,=уd(���Ȝ����
+��og�,��Ԋ)�VM���5�l����i�>j�kbt.���
y��lln��E᤟<\����V��63�^U�_��9!���I{}#�X�t��yE+2�E�7U�����`����Y�w
2�J��
+m��
+��%̝kU	j/QL�-�A.8rA�R�F�גh�P|'&.��3�����^�ݠ���+��]9�>uF�
9*沋%<q�j�
+g�/aym$m�_�+�~�$(���ޠ�y�
��g�^@+
st��++�}yfM���@:���c@I<נ�G8ޢz����-K�'�iQʗ���'[��[�p��=�j�Lx�$�<�pz��4ro�����e`?.�}��Mc����� 2�D$�TK����(��
+�
+\�D��3��-��y
C��N�����ą�엦���j`1Oz�U@�-��	W¥�^
+2���N4hU���ɕd�
+Y兊Z9БH�b&�@aH
+���~����S���T[m�~�pa3�4�j,Nꥱ!A�Qt}�!���r7����&�I�p�kZ�;g+ψb�k*c�ѧP3�'�*��@X�.���b����Re��\	�����woI�N�����p�u�)gˋ˂��v�$�����N�I
������Q������&_�m}Iִ�jn�ߠU�]���H��I>NA��G�j3�g�[ڊ���eU2�=}L��C�z�PI����*�2�S��egl�]���!����.;�;�_�
k�H����D,Ҍ'��+��Y�B�^p�(Щ�5�`�����\�-��ym�X��Y"�k�������<&'�L�1{��MP�G�	eְ�R��u�0I�V.��b�uF:Vti���u��&.��rس����u���j8�a1�m�~zM̲Ǿ�l
+78~����]��z��̯�Jx���wZu���c^�r�?D:~_�3b��#x��W��(��4|�h�]����7�eL�D皡����T��V���*��[(#�<��T�7�(��sO�2������8?��i�Mɣ��د�_��<m�rg<��v�F���G��;�d�)��6��T����؇€�*���0]�1�s��c�?�e3%y���� P��M	P�:�-__b��1�::��<\��3���WT�sz��]��хI���C����c�'�c�p��p��
+�j�B�5��=q��@�F���,@7�5����Y+6��
+�_�r��:�
�	��AL1;zDI�9aP��7
�ᒴ?�N��A�L���RFZ�aŦƾ��Sf%5���.<�u�XOq������_7Y�Ŋ\퀵��in������%��i��R8��"��k���+�ۗ���?�b�aD�/s�r��a�d��jq���
+�6y.��Zz���{��>gqyx��[�eb"�}�/���&y5�ahU��i���D�riiz�Ț}WyVݻ�Y_w���<�E�^X��`�q���CGs��'���&]0;���vjl����{�8�J:Ȥ�c��W*9q
�S�����"���#��Wd�0Yt�G�b~!����T��r|Ћ�{�Fw�p\�P�7�JZ|�gv8�����&ߣR%��I�p�k�PP
�tyO��w��/�U���,3Kێ?C-��
+��M�<���Y����
�%��Ig=�z�������ۯ,#c���{�[�J-ϬCYr��Y/d��U�S�����I����0�θ�JK:�+�uGeYI`�	��̻9�Lv^é�H
�Z�z>�I�e���d�'��B
�`M��&����s'
�ޕ�b�Ȏ�6`U��;n�F�$ҹ�}@�71h4ǻ�P�������b���_�e�P���G1J�|�_�m��㟷��-��x�/.��k�[
+�q�%t���ڽ�\~hH�=�	�d0wX񩨙<,8��i�̠D_W�Ą�������^~E�4�x��ǿ� ]i������Cq<�uͭ���Su�T����^R�6[�yzI�پ.
+$1�ԤG<Ww�s��Î�ܣ6�w�Jj�[�7�EYsiOڜ��+�'�|���X�X���8��ن`�XiL�=�a01j��=��f��} ;�z/(/��~�]F�!A�=t:�I��z��6�55�����/�ڎ���!g�b��_z (��M��^Lw����%<��y�%����-�Vjr��8x/[a��"��
�
+W^^sf'�R��M�3���"y������y�I��.Cڪs�����Y'|�9�I�u��K��PE�SE�	�<F�2ZT�j�@v,���-J���WT*s�٩���7=�gL��|4.�\[�똪�C&�m�کFK��\�����=Tӳ�	Bd�`�I>NA����r��L[���IgY���-�B��+Zc�{�xO��P��؎=�z)0z#�Ų~���x߲�ɏ��|�M�>��2������aSU��
+?�u���p��u��M�x̓F�U��ap+>�hR!ҔӖ�m�`%�\��t� ���y
+1�1L�¤s$�ç����X��h���+�9+)u��(�ѭ|���*��r-��z�Z�j�J�<r�O��-P�.[�sY��jU{���+Xr�
���ת4�o��,���T:��3��G���U��?�\0ٕ\�{L�o#p�dK��Y6��۱���V5�5�Xs
%��8Z�~s�t��m�,�z�U����}r�
+��g>�\+O��%Ɇ�6΋������-S�h�˃c��2���RJ�0E�@�h{� ���(�F�B�ٷ#1�4#	&Z_\_� ��hu�.7����m�7�z��Z ���K��
�`2�`d���%�hj�%�)\<�M�^�p���s�ݕ��w	}�.��E� 5��H��$S6������r�1��1��E�7����|��G�s��Uو�AGkap�k�N���y�'�}-}�r���}�p�G*;5�8�/*���I�I��	L3*����U��Je�پi��jn��j����;Ry�\@�3<>y�kVh�W%��b��bR�xG|��t����0$e�ݠ<j��]V*��U���X�II��V5�]{�g�2�*̠��8&;���<���Dž��*�)�-����2��|�ٸ�f�o�_A�Z��-�
i�͕�����?�)z�E� D�:��)��#�hU��وîq�:*e{��L�j�X�N��$s��X6<�/�`u7�(Q�%ż���+b:�:��-a��ʬI�<�b�]����,o���n0]Ќ��qؔ`u�K
+zj�;�c͙��?�>3����ma�b�b5���V�]����V�/��K�cT�3k�E����d�E.`��J���������rL4UՋ
+1��U*x�
�2��F��o����=��Nu��w�
ld��$���WT���=;��M���Ҙ��k��S�E<�H>�cp?|��u�\��k�=D�f�+���;�''�ca⻎�zpf��w�j���)���zʗ�D��3��M����ٶ�4���]K�X�؊��r��מ����J�:��X�F��۱Z�g��	<z�^��T��T��
+�O6E�+�=}��-KP���,>uj�N�����
XTm��ys�y)V>���ȁ���`a�m\�"���������2���ca�H��o�0-���6�b��5nJ[����
���ڻD�JDM�O�\�
�Ȭ���@
���3�V�ca6�Wa�g&t�óFE�>�jԽ�k��t1�$sgr����% ����/�O11���_n���h-�5����~q�`8&�m"3��"���13f�#H�}\��#	*�T���yX�U�xr�+|Ey�����^��yZl_OJ�^��$��QݓEy�9��$B��KbT�CteA�E��`�3�0��qx��3�Q
��A9C��Z#���U�z
+ր_(�E^iz:��hZԐ�э��ո�L�(�5L��u�ꡟhD����|���?��Zs�6"]�ڥz(6���h��z�4��a
0�X�gNe�l݌�p0t�m�>�]�Q7ӝ;�1��;��*�c=v�m�S`����������%)���g,y׈��Ύ�8������¤S��|�;!2|d��I^P��<���p+2�d��zLC�˘�Ў�4���ˮ0Ĵ����E�E�/^R^��%�9W*�*����
+-_�~�F+dd���{&;�����ʺ�K�Wj��w����
�ȗ��?��X��z!SoF�S��Y�+|]����bs0іĪ�*�	��qZ%g��Չ.QBO�8��Q��o�*���-�i7����IU�V�Gq�9]�O`��I_�2~դO��3����<s08��E~]�k�-R'��#$a
+�䒈��r�qI2���N�t���>�ţ˰l���-�ov�_��������n��	B$}e���Ԛ�%Y�k��k���8Ì���(��!��@�}oV�Bz��z_Z��p΀v�W���<f��&Nk>��#�`�v3��G���E|�e�.pƙ�#��~2-6W� �d�4Ş�Xx� ~�λCM�5�y�$Xl-8�˵y���8V��yq=Urq�V�?�^�K�
+*��w�#��n��k'�]��㖕�]��f{�3��SD��U�30\@��
��(_�2(�g���0r�x�Nҽt���^뼯D*��#c@���K��c��W���r}|<�O��VHnı�3tD�ms��6�E�Y���>M]�|ma��)W�kkZ�v����J�,�#ơ�)��W�%q'��[*_���ѣ�m���˜�}¤p~U�/+>KO� D6����D��*#���+A���As�{�]�֥���la$���W�`�&��'����1�o�6�#�;Yɪ=�_���������*|��bX|A�Q�T:%�%
+�	�}T�ג��k*�տ����r���``�2�m;��B��=�\ú��i;fv��\(I��E��ٖ7�J�g(��)W�Y�jEK�`y@��1���@��g��.-�z�<�i�e��]i����2c�M��zc��dOr�H�ÉU���Lde�3��s��P�a?Qf��h�����̠1�'$K[`���=��V_����Z�;�U���$b{l�X��Pk��x�N�K������ľV?�7:,�`����pD�p#]�B��9�9/*�շSU?*��P媨�ї��Y�|�E�,Y�2�����!�J؊k�f%i��]V��Z�z��YT�Ά��Z��ӭ7/��E�h���(,��.��ߖ
+���Ų�K�S<�C
+'=�Ƀv��=%վ�u��.[��[�Ax��P�b�|�����?���4�� �U}��GEش[jB+`+�SVYN�1��
+��k&��Q�N'PI9CU��P%73K���,�q�;�B����k�8�ֺIRf�"]3�r���7���|�	�>�sm-*�����Y��1��2~ް
+�&������ R����J���*�'�5N�b���/>�$Q�¨�[V�8��)�q<M���$Y�1��8�-0��6�n���Y�Ԭ�&�m���6ef1��@��o�p;
+��C�����0�f�\�(iR�ư;��~�pΦ��B5;�So:�QJ�1`�eY̘Lo>����h�M5��m����3����z�E��V�Ew�Y/�����p)�PS
���nP!�o��V��.\���(ԏc�'O���Q��J uN깐*a���U	��b0_<���-~����n&��5�*�)W
+ZE^����ZP�>�9�3?��y�VmP��#Ɇ_	����}�@I�v�����x��QC�T���H��V��46{�\{���%�\VYy��A;��K*���"����Zuݳ-ů8�j~zz�3�&4jz܋�1�D�ޒ�
�
+�tw�"�[];���\ʷr������Z��a�;U]'��ҳjE��Q4^s� ��S�}�8��*rr��|���ɕH�'����-A{�۱��3�u���.��Q�mp��bN�U�f�w���`z\7����Wlc4*�M�B&5�L���@sm��E�����F��17;�"x�E�^`k&�{�uJyf
��o��t��^l�(��x������LxR��TY�c���P��6/D��H��x��j�ɳ�=U��3_�e��߻��N�it ��%���}Mkt
��[{�?Rݍ�s�K������H��o�:9��¤��~��$�!�m�1W�T���'B|@pU�"����Z�
+k
]��a� d*q�+]�%�j0,AX��ګ&P>KJ��4��<�bɵ1=�4�ӫ~�Z]���J*��Ű���״�`)�Q��-�����0���pn�Ӂ�s�@�=#�)������h.{fB&�g������63������Q\��̪Ij���ǁt��i�	�Jj�I~Ej�y�oG�$�`��W�bx��y,T̸=A�l�8��)��#�hU&���� �Ɉݭ�%ڐ:�a
W{0����0�;��.�2���M��;�-���P
��M����o8�30�$�*��e�p2V;�Sٚ�:��z�Y�u]9�Q�G�f@gpq�S��8��һ��:LἸ�x���L&�S���`��Qm�噵l�!-�-eGB-=�ˉل����d��PS3��HϦ�ݢR({��XAOx
+o�P�����#+�t��w����++�W�oa�y
.��ύp%X������6
&�c�#�iR.��C)���]�`���J�TA�"~�n�u�f��­�|���(�XL�Ț9�O�R6�:�L-�j��}�/W��������}i�Q���AN�Gċ����JvL�^�.�CI
�s�s%~~s�l���I��E�,$�G{F�4�
+�^��S�t���s���rJHK�8���a-[�P��]M�����$ݰ��ʎ�S8�-�_lP����_`m�dZ�SJ��9JXP���ϙ�0���A�*��`P�;��$��[��VĤ���]iM�U�z=�1��
���P�K1Βߙ�����Y��o�!���F�����āœ|TP�9_�g&��M�䒊�b���+g�P��;T]��8�F��Da=b��
+1]�Z��m�0�Ry���L�;/��/�N�,��]�(k}�x��@�G�`�&�3Z�F?��N?U���U�c�U|V�-~Z�#���͡e�X��l%b��[��
F}�D~����V��Oj4+K-����މ36;�>�(�z�е���|��F��i`[ �@��}8�(�F���4�w��E�2b�t�	Bd�॓|���?�V��d�wS���dA\}Z;&��jL����iK?�U㱊�����3�&��eU����
���涫��~��G��Y��Ϙe_��G�T�I`�c����5�|�BN���%=V+����ć����;��w�d��BE��G�L����
�9�l����������d
b����}��s��&#P�J�[���� �����BU���"4�w0�Vg�"{��&z�BD$�2�J��M�?�XY��h�Wi�L�cʋ��#P�>�Z	տVq��%����`�yP�wxq[Е.��{U֖���1�\-�jU�v�=�g��W�U��{,'
+a�p�n�«>�ʡOE����A�R w�*�����lי�]�S�W�
+8�k�v&i�yt���d��H�e*�7	���Y��%���Y4ˬ��
+�n�d&���5-�_�OC��.8��"3��(��ֶ"Y�U���PK����Y�q-,�ŷ�^4���T+����o(���+���c1wڄ+$#���z$��U	��t�*�ͽA/=��
�M��M.~\��4����%�`c�V�
+��\�W;=t��/%ߍ%!Q�>V�K�3H�"9t���GK2
��ý�xG�hO=�Y��N�הƙw�g��9R"��`��j	!nw�9�qpهL�J*O��]�v?K�g��_��Jx�4$]���(�������z�K#mku)���<)���q���5�s�t��˘��51��?�8�N�Ü���#x�0[�S<���ھ�n�q�i$cs�Yu��� /)�1VA��}}\����!�l�����ۃ�O�q
+"��?Z�y�^t�	�J��-�aU?B��u�[̚\�ݘAV�
d��������s�rW����+=�&yi�T���
N���a�J,�L�+�xXjc���p�4m`BEsLuP�oy��,rM�p�j��3_���[˨�������;�����矋���ofBGg(�s�YW0+��FI.6@d��>��慇���,��bㆼ�g�
4MT�_���`Ku�*+4Ӌ��ܨ�h���n3`\����b����Ӥ��Uz�DZ$84,��*�_෈<�L�Q�e�N�p.,Fn�g�7/�����L/�P���ZHd9y��L�7~��U�s������}"�޽��>kɭ���
+�:�1����<Ki��@7N��Y�nL�/�+xu
}*U���a� DXQ5��/H|���a��:��
Z��峒�T��Q�YT��qlT��,O�/������h
̙� ���(�dz)U:�F֕#�o��/�g����d�6Y��S�G�t���פPm��iڹy�G˨
+�:���i��;]�����ʒx���}�En��׷Yu�@��R�~kx�m.8#���U���d�D�ZIv��І�
+bvpN��8�
�y�48�gWe�����cT\x<���̠�5���pi����MNـB��sM��`]A�gN+Ie~W��ԃ��3���@���.�g���T��)�&Ջ�R�k���m�:j��䴾��r�Vǹ���Ɍf�3�y]�y�T@������Ѵh[�z>�Ѵ���.�U��(Lj1�zӠ$~����W�i��`_Q�u� &����<�
Y��.[�I��z���q�T�����[��N�q
+"��?ZU��zXэo����xU�G�վ����_Ux}�����v-X��	,$�3�7�"�]�[�Ŷ0#^=3��gI���:��L��o��N4�W��0CM��B��TL��X�'3�B�P������`�q#�<�$���/p����|�j�=�3o��XHH��y�9�a��W��h`����z�ϩLB71��mAo��帞uMl�r��/�ؽ�B���-��M�3�^�P�'<:�P�BU�o���A�zM��A�w��T4
N�4����n��27
F�qtǃA���x�N�ޡ�0׮��C�Zp]@7^(��;��k'��IAŌ�L�w���v�PQ����bάE]d�xNPX=M�������m�q����я�t�,�Å�Tݫ2W��bf�wUBwfaR#z
�C�a�J��M�}�4=�hu���N��-�Ray:��>x"	�"�:˜���s�
��(�ă�=���3�Qt攖�E���&��J���O���CA9�)�፼�:\B[�h�0J���ҷ*�����.pn��4����g�e/N��n
+m�,k�r��´����VW��bЇ+gR�jJ�t)T�7�??��-����t�E<y"-�����2�@�\sa+���uW��#����>_1�;��ګ@O�m:@1`�$7��+���x��BmYnQ5��\*�XBG�w�?�R�L����'�Siȷ ��")ƛ�7�Z‚U��:����c�'_�Y�D�*Y���8U�����8�ӳ�މ�21�Wa������π�\�I��5૲z���K�_y�jF��t�)����G�2+��Lp�-#3�>\�UUp��vw)Kz�*}|
+��f5FR�9�c
0�U�"��t���UY���E_hz<��[�Y��T}M��g��>�6������ľEA��D
+ ��3�ZU�����j|΀Tф�%��0�
��
+�&_��.�ͨV٠�K��\�rUQ��bu�aN�;�	�
���]���>�����9J�Zi �1�\}�x�E��190�"i|�,滶?[	<�v��c�ǽ��3��GL^�d̔��W>�FY�_�;VO���'�2�wO0
+���>\G75������oچ�������0�$u�����Q9}�
�r�����ʋ�Zl(��
��s�NW��V�
+}�9ݏꡄV����r�\�aA��J��e�����������L�l�T���:��F�PS܍�)=�/0\��p������а ���_��b��-��<z3|�6(�yv$������ג���VW�/H|��`�q
�㟷M@+P�sb�d���`Du�.Vm������b�6MD���I!��6��=�K1������V;�QRLIE�nW��Z�|��xZ���M/���8c�A+��6%�\�僵��y8F���8��r������sC��S����[�x�o��^��q��a?�P�q���c�q�cU��Az��3*�q"�[�@�;�VD�T����z��-�(O���G.��:�X�N����[�S�r��4���2g��*�9�HΈ�b���B�K0e�H�ZxR�m�����\Mcr1LF[e��1�B��Y�,�lE�Z�Ą`�N���ck���G�[��O"o
+:���D����0������3Ӫp֝ �
+��|��sl�}$\*��O�n��1D���<��TO;.�
��V�H�n���~������x�r���a�3�Ae;~Β����qҴG?�SZ^�g�w�ұ�,��=��)�{?�Ɍ��zig�P�a�����N�Ȥ2"a���
���C�
���[����hp�%?J�e�����
+]r��$F��k*���IJ����1���{ޥW�VCU�

�k�4T����n��Z��L^n��OKR92���
+*J
+�q����(Ȧ��z�+�dY���`%`ǿ<<��w9A�g5�h������ g�����G�e��@ϺH/���{�zj*��U=嶗%�|�Ѱ��a���o|��u� �;�bɚ1��Ç�<�J��� ��n:"I�L�y�W�<�I�������i�_N�R����|���Y�Ω\Q�Mȴ��bQ
k�U	�f�P��e��R��D�n?Ӹ����6\�����H��u��9�7��\҆͂��/@�kUBl�{2/����},��
+K���Aq��x8d��g,r%��ѿ��*\l������A�zK��*ķ�EVh�O����ί��π'��}�E[���	�bry�1}�؏��ϭ
8�e�7����^�|m_C�L��d@�,W��´Kr�W��<�*pX�I{U�n���`�
���焟���@���G;����3�s���̄v��^����)1��m^O�2��[�"�%�F�����3)z��3g�������5�(
�{��8@�⏌%�$�29z������viz�f\����KfX�eT�6|׀�'�7����D�J��Ea����z�M��c
+k��R?|��
�PU��<SYe��$�֎�V��*�[0�%����;X���]v�\�U�rAl&u�R�������UO��1��ֳv���'��TH=�-J�I����8��1���s$��F�-�a"�a�bÛ�&�Iq��=I�7v3��?GKm��:�2��I����bͭ�p�|p��A0®V���|Xd���x
+�z����sVP�S��8�J�,=��ez�����W
�X�\�A�x�	���A1��m�
�����;��@Fޤ+a��&��-����^t+t��/�S��r*/��#O�pr�VE�x�3��7J9�Z���w�&|$>r���*��Z=�����Px�RM��������}*���hڛ�ϩ`�
+l�G��ؗ�j��g&<13�1:H/WV1�~��\��;�_-���d�]�,Ϩ���<�4=�H��71�p	4�ٵ6[�ȏ�/�d.�b�EMƤS!/.�G+�~���z��~>5��4;�
+�M_�	Wy܎׃�R��ҁm	�����j3m���F�%��pv�ϵ�g��եk�T����1�W�4�F���&��l��
JW
,苂���/>�P�>�
+3��_�'�ҭ�����9� ��Y�Ȏb�~P��P��_?�������6�n���*wo��£^�M7
[�'�h�[��f�mw��{�p�iv�e�FP���}�8/pJ�r�e|�=���"Nh�)��s/�_����.9h;�	�ze&��Ʋ*�����N2�x[���Nj0P�ˈ�i��ɭ/�nI�	B�
A�|���?���"]� æ1VҸ�/����7C���X��[*�`i �Y�p�Z��a*���ם�vy��
�����$�,֒ݯ*�t3�d�h0C=\D{��T�äS��Oe
�ȱ߆95-�:oᵪxA��1�{²�QN�́b��,x���`���*3��!a�@$0�	�\-�
��I^������f��T����T��T��ݹ��.��eV2���ͳ�>|�U��R��(�����g+�˭x�ς�SUi1�\��I�4�?�y0��p>	�A-�ǫ�&��������I�h�H�ws�K���/��:\BW���s�=[ڇ����W����.���x莫�˘h%���r�t�gS��R���^H�r~	Ԭ�&Ӊ�3��0G���p�Bbp��w��
��8Ew���£p]V���z���w$��Fwr,��"sExV�l��u�Ԯe"�2I�0�����0���R�h�$��J�
��|�6"�%�������Yh�&� ����l�D�o���U�h�+�>K���|�(����4Q�t�0W�%������ǹ�bR9������������QQmn�e�������U�`��
�e��a�<��:ms|�ꙕ|�_Q�'�I:�G��K�����ݑe��?����;����I�)G���F���G2Lj�s!qz�
�ƎQ
+�`��wLs��$V�λt��A^�JR�/MO�J� A������@=�e0m�����3KV�3j"�?5v��/zv�%L:%��C;���`�xV�yps�'�O��L�0�.crvJ��z���9�?�!z�ymp�I>NA��G��ҞFңIy`qz[���x�ɒk�q+$E
+r���;^�J)o_koq�{�GT>~�1�9k�k/M_�ô��y�˒3�ܜ�f����������Y��_'F�U�/��I�}sjf4�4p\�}0��:s�W	�)#�Y���_��[RdU����+o����۪�_*w�3�]���%]H�+�=����Y﩮�i�ַ��*���f!�������;���嵮>W�znA��Zn8���"�O^�,_�p���(���Zm�� _ɉ�	��@����wC�
+�Z����p�k24
F4��n�*�]ޤG��)[�f���l�e�T�[Z�����p�/)8�ᅫ��l�W�
#���b�L|	���l�������p(�ѿ3�T��ʼ^A'j}`��:�FZ��|:c[��Z�t�B������[Ќ�I
�3k�T�|>�1�o
+�W�*�nR��c���ƐPM�i&��0����8V�k�`ɥ�cbG�x�;�r���f����q�����G�����zM4� �'��Ĝ����a��b�)�ZQ�yxn�jE��dQ���� �e8��Jڶǹ<��dK�
�[�Ro��p�lG��Kg+^�ce�
�:7����8/��q>��:\�)- }r�~���A'�8*e��|�O��\��kI\n��r�����كZ%� �3H6�.�
��� �a^3gA=z��N�Z_�|��ŧ��ݣ*�-�yUe�_��p6��=��ˊ�m�H�Xc�1q��V�
H
+h�l�h�4j"�^s��	KRϣ���߰IQ��x�!�	'�D����U��#s�����D�-���ZOs�8 �vwboa�U̩QW��P�$\�b�G�-�he��h�p���D�����w���t����L�T;2{<b�w�p��i�93'FMq�+���B�}̎i�}q��:%/��V��ssĴ����XVy�0f��4-������|
ƓaﱑNg�^dѧ.l�W[2u���-��
+fY30��+��;f��+�C
h>z���U�:K��\iz�� 
��&�:�nSnS zA��
-���@x���(1�[![��{�1���7m�`������w�c��
+�t�0�I��AC�������,WxŊg�C����A��{Y[��z6]ɿ��K1�.EH_�\��
+���E���q��v~S�d)G��=����Ʊ՘���U.�3�hg�*Y�Y��B^���E�p�ã��LhG�s�٩�e�j��}iZ=:k�mt>�a���jfBp��t���W,�9���q�+���hϥyq=�ŽܪD�Z��*_�2(��l�s<��F�Ǡ=�Sij�9��-��
���<y0�<���=��k���T�qU"�J{�N'�`���:c����4�p���騾a�L&���_����ү���;.�B��R��^:�h-iQ�%�И\�4/.{T���r%Y��������>%}|#
����ʙ5�M�U���j!w
H���(V��\���J�o���^V��,�G�j���mIڹ3:)���[YF����q�g�w��#��VV�#�	�j9��\�g�M�,��2U�So.�t��Շ�-g.Hl9�Z��ц�=��:ɖ��^㳂��+��i�sg��f'_�=A��:hr����.]�����;���;��>L�vᇾK���J��|0( �m.y�b6��Tn�xW�Hh��ψ}�}�x��#7�j6�@yH�X�%h�;=���B'q/��n��b-ݙ��!:J	�8�J����r}[�G%�����G��[qt1�Ȗ�ж,=�����.
+�bN����n��zt"��K�M/�;���
+_��L��@J�@d�A/nj
��bu������	�}�z㒜�d�qN�Y|]��NO㻮�
+�۔���w��LXɰ�2�Č�]9��:%��t�-31[���h��%�l.M��k���o_�|s�_����;����
��B�4�x{�V
+I����hZ��Z�s�Pz�M����� ��P�����u�R��Fw����`I-Y���ϸr�V�U�~�(���{���,�������Bҭ*/��Cn$L�N�(+��V/}f�c�n�'���3����XlTI��)W�|T��g��4��0ߺ~��uD��3�Y�'���`�ɋ�V9+�����j+����o�����+
#����]F^�{�e�E~A�4z��wC���g��H�H�m�g~�alM��í9Z��<`+��y�G���A�m}rO?�>}�Y�;��w��Q3�Fa��Դ3^%,��WI,��ߥU
;�O���L(�h��e@�����9����!��Aa���L[~��g�jAZ��e����)���\�����K��-�1�׋G;�n��NJ��bP'FMeYblF���
�	�'����>KYzbQ�-VF9z�(�	���eЅ��
��}�Tfk"��L�*�[r�:j�tfn�Y�NB��俏�,����u~��~�
+U�N����	Ukc	s�Cx�yUp�I>�Ky�w|T��s�Γ���?Z��9z��+�+6u�k��W2,f���6�*�e��q�ø�6��^)�ROI�0r�g�q��H�0�{Hȅ��\`�U
���O~]�0��gg31-���������D��-�	S��ad�I��L��j��)�_�z6���-�l%3v��p`�)�X���t�r�w{�E]p~��#�źˁB�:_rYel*���9_�JL�T�Y�^�yFq�5^B��Vv3�A�
+�2��}��5�����^����8y&��'^����}D�� �]���V
����A>pyk�������Z����Ȧ��������k!���Bڈ�䱬Xi�O���U�.F��
+�����\-�{ls?+���y
�
+�M�)�_�::݇ل���NxF#6��:閿�VcgAb^�Ԧ%_[�z������B��RUW)�E)��υI
��:�ZP�c���A�]��<�i����?���2<�I��xM|
+��bfṂ���<�V�NGf���rtA�e��
�"(�u���f@�/Hs~����;̔��b@�ʤJ���}�,	�.]��e��q�t�d&�K�R���Y鍻q �z4^���jNe�&K��R.�Y�J�H�W�F����>&�� �H��BޜJA5;�$�T��O�_����˜Ye%����z,�8��#^�P�J�\�ٲ �WX�z,���gZ�}��j�ՙG
�Į>pI��U�.:�$�\h&=�Wy襓�'�^�E��񎕷��\��5IK�O��}�Y�>&���H�v2�=>%fqr�Q֟����+��� �ŵq�۲�$�˶�3k����S�|=-�՞ D^�~���D�l������?ߋ̶,�ϰr�#�ü	�`.{ȢDS�L��A>^4�gl)���OE����P~/<�E��r�/2�0�Vc7���6�O�8���K����w0��0��Zޱ�a�^^\w�jAf�t��K��b��Q5�QJ\*-N�z\����&/6LJt�	�<a
ۖ#�x���c�i+�(H2��i�<���[�;ko5�t�3%-�=�s��e�I��59;mq2�,7����w��y�
X{l;��T�y���V���z��&�L���~����;����,�,�@�\4�1x��`\���u����<ryp#\��K���N�|(�� xw�q���1я��څ��r�P~�_��=������'M����\�T�1{=kҹmo1�~���F΅
��6`qd͏��|W5�
+�w��c�e%A���[�҄�q��ޑ(�M�b�J��PA�f��r�P�S`��r���1��ۦ��zQE��s�[���yA�Cx,kiZ����,�J��������<�T:���g)'b9X��?������Y4i��e�4:��Mw�3��O���6�Ơ=�	,����yH0p�m��/_��/��K�p�x�߬�*�Gs�7�zRp�/�x)Ձ��fp��c+Y�gF@���_�����k[4�+�,��R�>p�ҖG9���
���X	�Ϫ��=�K�K�#.,Gu�x��9!����Z̭�8I��e�ת?��-�����Y4����%9��K-[ k�L�LA�"�f�^P�t{�����JH3�n��
;���?=�9�0%f�GA�.�hR�(�&]%�t{��JF>����^ɀ��fL�
+����{�w=��5�ʖ�G.R��m�6*���(�������'��/Adddd���322:u�t�������?Z��4�)'���6\�����z���A��߶�<\8���V�;S��d'++��a��s�y�{�:��|�e"0U1.ꦞ׸|�{�^Y�&��a�1�6�OviNf_lb�2���ũ�#囏
��*՞���F��N�C&5֎Ƹ��\/yj���ޖ��3� �=?,��ͷ,�{�c�X�Yè�9��;�z}���kH�k���6��3�<��-՝\{�Q��WT� >ɤ��Ё�JB禙	��|Tx�2���-�� 톕�P@����n���^:�r_0kL�<�`P�p8�I��?��A1�w{�|�`�MA���+Y�8&���p�/���w:�1z@�A
�����<n�l%�ia�����I�"
�^���>y���q���Vy��B��a��!���d��Z�۬��B��i�D��8�h�
*��C��-LjB���WF��gV
�S��y9XE��R�����`��Z��`Eh�.�ZU0b+�2��W�Zܥ-�ϼ҇d���s�UЊY�c	y�
;Z	wEq;ڄ����,���q�	C�T6��"��\�/d�	ߚd0��毪<�Lږ��v
�ܣ��ӗN;j���Fm�m��,��U�'�-�"�Ϲ:s��Rm�,2��gZ�J�&�W���v�:•r���E�U;F��װ� �^�<Z���I]A���71��_{5��1��t��F�c�!���Z��{!n�8=�Y�^\O�*z';0���U�e���|q�\~�-MO-J�nr�P�Q�3F�3����X�<��(�'������3!j�S��3�Q�N�*2M�K\0�Jt}�C��5k�̙3W�\9q�Ĵ��;���`���ϥ����P�8S��TɏE�t`���,�|��<7�8	�*onf�uB8�U�#|O��T�!�-���$ӟ3Y9�C�s)-B��Oe
+��8C1[yRZ�� LI�����%���V���\[��h^k��lf�������
+��m�F��!�|ĀǢΪ{FԳ4��1��v�yL�j����X����M�����y~�*�ԳR��Q噵���v-��,3A��<��?S/r�3?��ԋyͷ^0���LL�s��:�4A�)�/�F���\5�S�/��
϶��OiF�0�k0�w�h��_�A�,���<��������P>�/�\���x��Iп}��U��Aa�`6V����QK��H��?�?�u����{h�+�;Ok�w3^�.�f􈗑�:p��#�T�l��TK��I^\7L0��������E9���^��Y
k�3Ī�$�ñ�1!�t7����1�X��H(X����G�(���p��q�$Y6
eF|��6���������i�X�߽8g˦q��6GVx�pà'nnLà/|S��`��`G+��S_��Q�����0�g�9E��fn���\b����.y[˯in���1��ʩ�<�[v:o���s���A�O:N�
+�R���;�� N�W��a�\�^�|˥�
+��)z�X�WZg�+AҴw�	�/������n^���50~�x��)��c�o�i����N�_�&�ƃ�k��ܵ�<n%X��`=;���^"/(/6f�b��a�y�]��'�˿���т�L/�KY�w�԰�p?�O�‰W�-.�3K�7���"�ӿ������w�z����Ӫ�6o���|�x�b��e˖�G��?�eőz����3�����-÷0�x�L��ᮧl�~�
C�������6n��q_�u5�>s~��[����o�G�%7|�՞	Q3���ֻ�0�I��;���/����G^��q�m��P0z�p��&�x=��3n'��'�d�N�T�q�s�j�w�b����?FY�yfA�f��s�̄�|�˕
@R���+s���a��T�-I=��4aʥ|�ڼ�@A^��V���.Z��q\�#`+���Dgՠz0�kUA298m�Yl ���q�8���9\�a�
\�'x��ڻ�!7O\���.��e����%���
�^�Pϔ�Q��m�U�
�…��
+c�]p��E&�^ė�+2����\0��N-�y^BK��g%�-���4�4�5s]kOߛU�^�|:��J&EM��N���>�е�K
+]��J��4 ���j?�cQ��)��bQ�:��x��I
0�s�&�9;�2�ϯ��V���<�Vz�-�ƴ�T��i����V3���Q���)�p/�;���C�)-,졄b�>í�?������!h����K�*�
+�pW0Ћ�++�C���Q��!s��9��H����>Y�F|��ra��U|��e�!}uW�r��l��vN�I��J�'W���G��%���!��Ҩܯd��U����˅w�9W
���R�8���V5?'����=��֛�C�*�\?N�k��������R���L��Fw�~}e�<��S	;C�=TD_Խd,I=�ʶ���Q�G���A���_>RLNW����RC����Q�{~£<$my@�`\LA������”�����V�ةVCa9n��X!�7N"��?����:�I��/���|��?�ŷ�~��8�w��H����_��BC�@��P���%�J/��`�l�t<�\5sm������F0�Y������w=��b�{�y�%2�P���g������V`'���������v��&J�(�{�)
�8��:�Uy���9L&�fkm��?r��-��zvzrU��L@��zz�>��+�wT��r�@�%wԽ��cz��g�q�5�^�b��kM杧$@�/yq��rU�o��ԓ
)R�a�<���^�7W���;@�z�
f�]��EPD�5`+M�
�o��tl�z^���#�m�{��*��4���#�&]�M��YR�Yzz��˜�16�����*�J�3|��,9/���OU`,�\␯��_\��Jb��Q�	.������ ��G����ZN#h@]kā�RR�S�ލ���c��\��/J����
�����X��7�J!/�uj�8I��Iql���5=�yl�$����$ׁY�c�IA#(��W)�t�a�z�@�3�o
�ഀ��G:�&�Ghۻ�A4����w��
��
 ��ۇ�h=�$�N�z^*m�S�qNὖ���gU��+�i�l�ϩ���P/�
OWl�1���H���J�`��#�̑��N=Hu=~��t��ʵ�7���.��{�t�6�g�~�6�$PW?P90㏪Pplr��\��Z��;)z,� }��k���Ҵ�9+]�YM��ͩtk;��rg��Yu�2Ѥ�ц��k5�R�c�L�!��%���x�E�7�M2;x��ԋh&>��(�g��9	G���I���ǩ����������۱?�
L�����:A��0��$�gy��"�n������Ջ�q�Y�:V&	�	�}#5�]@$+���^Vˬ��ﴘc�v�r2G��L߯T��C}�S}8>��f�àj�H��*��W�E��Զ�^@�	�m2,���F��2���Y��q��em*�8d��R�
+@��QU
�����0��K����⦥�)��~���r�WXM���M/�2���X߸\V�?�J����n��7Vf�`�AO��\�0��j�(矙tL���~����V���̻��6&{3pB�,���P��Z��T���q�	��$
+ZzS�
����n��@F@�FAl�i0�U�j�*��9��`(ܐ��E�[�;��]"�����{�YZ`߫Ȯ�����j/�W/H?2f�<�ȿr�~P�E[hUIܩ�
"&�V��ĽQ{�K�|
7���q�� ���#�i�¤[�3�ӛ�7�C��w6ʏZ�Z��Z��jE��`�ZuJ�`��Ѩ��Y,ሚ�pQ&G�a�`┘AZ��L������H wE);|�/"G���6�7y�N�<�H�3�xquЄVmLl.m��*htKЉ�hL�'�;4�r]��/�_ ��l<�Aത�HK�K&��t�H@?d,π���0���Trk���zFgne���di8������~��Bf\?���~(7�j��Ʈ�M.z`Z�*�ս��x'z���1��U
VU�:���gv ���_�i�5u�f���Y���l���R��D0�'���1�����|k�������f�w�g?t.�93�q(�Jx\"�ǫf&<�q��Qog�hI*�
+�����ӎl�2�5&��	*W��׵^���滴��Q2ZN"��9�ljCd۶m���W�\9iҤ���F����;�	"��k��/�(;c�#�r��92�����H����,Y&����2�p��XƶnV�g��jV�J{4�J!�s7������>��b�<�wq�A�*�7��|��x�*|����ē�F�&7R���4=��鰙��b�]1��*?�a��������@���g�w��#S`���Ag�\
+�wU����������J�3��8����#�
sM7�|WH���	�Υi����"$HF��=!��6J�Q5���f�r�H�Z�#y'�}�H�_�}���"(�	>��_
����mA�˃�}o�����	�zc���Xc�r_0��������h�ۄ�a���	:�%Q�!�=����U:���	{� ��n}�+W=��`"<Nb/���ڂ,V�����@�6
+2�M�ݟȷ=��^�ƿ����ك0�����|
+�P��K�a��!�k.;����%!�O��%��r])�/�˕`���X=�L	8?x�*��T��`x�]��Sz�K�Y�&�@k���@n��&�^SоEP|o0�I�dѾ����+���n���Y����xD�x�_T��o<���<Ѫ��P��ƟU
+ֆ
n-�B!��a����z0��
����,�y��0t�,�򲜊�Lj���T�ws��������~u�<@��tv�+E��IYV��G�ZJET��ق��C�?�JiSWK��M- �5q���U�����Q$���];�Ă�,ڙ������V0��Q~� �
!i况��'�����)ϐ��〦J9�a��a��;�$�ls����qϛ�E��<,Ҹ:sǻ/�cN"�
�>�ljCd�-RRR�<�̳�:�駟>����G�2w�}�|�b�‚�CWS�G�ol��l�L�,��e�
�g[��i�xj0��i��	���s�ܺ�\_9��G��1���׀�}�?�+�x���	���v��k^L��d�1���\:���j�hsa��6�����o��g��� Nq�5:�v~b+�,���n���mg���0Ŗv�z��s,�G	w�[��ɹ�y����d���d&riZ=�Of+�W�y�-����w�KЌ_�^$�
XC�T�w�B�׹�
�&���Q�U���)�I�n�O�yw�@!�;my0(itk�i��0��2dp�y0�ڠ9���q
+��k�y	3/?�+�͈�D���K�����[rϘ��|��6��
+��;����J-�e��
��38��U����I��(=����J���$�tyf�Q57*��\�)���gIk���Ч�����=��m��;�}��Hu£f��bs0ΰNe��qm&�]{w�:�/X�~ڋwڈ�ǻP
����4��4�S2����<��rTG5z���
Ў�VZ�k��qn~W�:\�i��ӟ8�cp���w�;���*-t͸:�
��:���P��Q�끵17]7�b|d�o5��jο��p���U��_�i�����(5�g�wr<U0�8x/m������U��g��ż[��*�����7�0�
+6�V��lq��2b,91�zy�%
���ڏ`������j�P����׮��t<���x�<�6��|QK�`h�����b�%��,I%�,��Ϲ��d��]R����YR���<�[���=�2hd�Ox
�$>t�Y/H>��)
�?�V�6�>�������u���IqnѢ�]"`�fq������os�v������#��m��?��
+/�lJ񨜞�����j���i�\�t��=��$cƘa3c�B�S��v�/	%��(r���(��^t(�P!�m\3�I徵�Ԗ.��4.��v����~�̘�3uƼ�����|��y��y����k���_�BMPj�ױO\M7�����@nE˔1�P�^�;�E�!}uv�*^�q���:��U.�d㬍rIx=:"��oH���O1�8�[�Q�28Y��6L.�㻒u��$���jU�ߵ���[\&%�m��Q4MmG@�D��
e��F&�qK��A��=��"2�c�.�H�ȷ$��j��ˠ%�N��V���IVy�~�	[�����Zޣ盼[kx���#���kU�kOt�r]�q^?����{��7���η\Jf�S��Mx^6����|An���`K��eO�d*�D���I-C,�������q��heII�S��=�7-�D�@�?��"I14X�E�Hp����f��R�l,<(9���y\�v��F�Dz�bv��A)��-9B�"<'ᚴ�K�)Fk	�r�ԃ�-����DY�JB�n`�i$�'�-�?��y�m�9��<��O�dԧ���f��GZyS�Sݫ���6�$��{7����f��-��<g>����ּ��Ҡ�x���ޗy�����Z�Rka봯,�ݧY�$��o��%'�)������n,3�Z�[����fQOi4���4���_-
�I���2�y���I,ԼI� �wv��%@3d��<�
�L���bNj'ќ��
+�C�9%�Jꏕ�;�����y�(<��"�_ZB�h���+����k���(�4m�*X��Ju�9P��PdɂR7�x��ڀ>��[oPҔ������\��jz���u	N�˒���s�UC����"E�w�UD_�X�����F�
��Ç�*U*((�aÆ�v���L�*�'�ѷ�+�t�#������c���/x8�*,�g;�����L"_Aa5	� Y������Vpe�<���q�+/���;�e
�Vۑ�������Wl�pȂ
e�e9�ٔ�!��$�~����
>��Ŵ��'��1I1�\뇎pA������.����R�6q��*<(I�}t��� �\�8�(��G)$Ev����bF���P˕��0�t4���«e!A=)�1lQ�X�����&�.	'�G��ʓ�e�	�2r}�I�1f<>�U�u�J'e�wc���M����y9b�`CI����׎@����>o���2
c
�
1K���\�a$���u�d��\V��u}�[LOx�U�X���y$s�v��F׽��`�K�m
p��t�ӹQH��GW�^����ts��\�Y)~|�����;Lf�GASJ��3�a%�h�� 9�J���0w�	aӸ2�+y!����툧�ip�����GtNK��?;���p�-��Qc�1k�#�@f�4"iIA�%	��Jک�n�]7��k������b����iN*P
++��{�
S8!�X~�zw��$~�����޾�k
������˥Z{�u��"pIPi�'|��2b�&� ͅ�����މ��y����J���x��(����`%���ŵ,D�[V���m����7*ߵ���
�	���Sy
���NXO�Dښ�~��s�7���U��뚖���ݝ����a�u�n���3�
ᩊF�vY��uK���+	�U�iܘ���Ϗ��3�0�<~��b?HP*>oJ�����@in�R��M.E)�S'��(��'�Ն��n�lT���
+�2n?N�u�����\�Ux��a	8�x�W�;�X��8ZX�y%�L�I�1^�?�g�ML�:�`��ӧOߴiS�
n��Ƴg�fv2OU�s�P蠖�-ϻd��[�#;���{0����};u��N�`H�>Յ��Gg��Z��uF�j�mxS��7qe��D���<\���B�-Ru�SK�c���q���z��q��r|���siV�M<�E�\f��t	
$F����OBEt����.=�D��ґ��,�yQS��`��h�Ə�nr�	or#)�q-)��C|��N�K��Z�
1��&�I^��Ro� ��t/?r���g&^�k�e;����G�	��À����;
�q�{��yK��1��]}$D���}^�F��ͽ7!A)h���T��%!��U1e\S��v��#��
�ϵ��w;��G+;�D��hw�f
+�MiA�0��\2��+�	ħ�Pe%�Z��J\Y6e�q�]�$c�$
fM7�X���\��?æ�?�$�1��sK��`��n;d䣲B�U����t�u)�e!GZGv�>�5Û���.��y�>�C5��*�"a�$��@~5W�I��$��Q�r��4��d�wZ/�a�R�G��
��gK6����f5�^�� ~���z���B�O�4�ÛZB'��Ӕ�{B���{o4���|�N9vӴu�h
+FydxV���m��c�wJ�OS�,y���"qOiy-����t	I�B���"I'd���\���1�I�m�+
+�h�HvYT����"�d��lJ�6����G�ڑ�"��G㺼���ĥ���iJ�xF�
��d�	�>ѥ������E5�e3�`Y�w'�ML�I���x�t-���ҭ*w�?^���=��O��[��K�u1���ݲ�:Kߛ>Vr����uХ��;g���t-���t�lRd	���3��&�V�ڵkW}�����|��˗gv2OU?T[J�~�	�t�8w�1>��&[�@g�
�� �A���ZV).�?^�1v��+���
�1�唓QA]��_Vqp~�+����5]�� n�_BgZ)r|�u�Jb��*}��]���}�Ȥ"�c��DM8��{{qS��:@X�J(R6L5�J7�K6���wӲS�|���*�7/�&���C����vT��᯻���ԭ\��%Eߩ�o�KU
�t�-����q]T��.�B������Dv$z�=�e9A'٥�(鿎O	���s�Q��~��U��V�J��o���_��I�����[K�� ��6���"-�I�d�������Ԋ�R����dl��^_�H)��)}`��@�Cn�޷Nsw�d�fIB6�8@D�aH5!�?��PgW��.ŚL���]Zq��u	B��U7#qd`s
����
+]F|͕�������-.>�D�ߞ�s��o�n�$Z�@1�<@�
�y�3�o�9\�2P��J9�
sK��n�G�s	aSq���bk1_]T�j��Oz!�d{;���4ϰ��8"E<O���X:�6�������K�����"�
+�$��7��������=Tݫǣ�z�n�U����:4
+kxmQF�����jh5��(���jjq�������&YA�Y�$�Q�Q��h�����u�V��D[�J�J2�T
HQ|~,L�Wv���<�q�����ʾR��
���-O^��9���Q�/&E��v�� )O������]4��-4����(޵˜\�#�1����#R3�y�a"�9.�L��
���<?�6͊��ޭ%��ځ}@QR��2��*Eރ��r�7�,.S}��x��F|�}�p�!J��>�V�;��
8�>&�`lW6)�����"��S�N�ϟ����#�*Uz��3;��
+�����2����2��n��k��������Y�x�GQ(-\/9�D�&�#]YXY��2��e���q�R��� Ց�7u����
ݕ�&E�N�w9���?t
��ɦ�Y\1YVel ��íI+U	%��J��t�!K�/�DZ�:�{��CS�G�?,1jΎ�JJr��\S�ҭ��E��ݒ��� ٮ��%Ǿ&zM.��2�㠤���.e��_aX��$���B�.�r최�*JD�EH������q��c6��b�1;DLZ��%�0�V�$[�Re��y��c(��wJ�r��ފe~��7��ok
��,y�`�b��ń-X�zޓm}�r����O�;$�N(��>�T��;�y��r�@��'�G��\g��G+�b��`|�
��N
������������|��o��u3@*��"���	�y�<�q.���)nu�[#�B���<7�����\�D��̌�o�,A��ҟ.��D�ă��E8��If�k޹).�Y_n���~%�Ϛ	Ar���"e[e,�E�]|��fFybn�Uj���#!!�Hco!$�tv�ן^2��-6�ͻ��׍����|˥�<�u��ٟ�(���n]�R���͏w�rV�
�jd���$8Q��N�)}y��`::N/Ӛ����P�F��|���>M�yI�CZ�ߥyB�eפ�IhT���/�j���!�
�p5����te���O$��
+4˅�i�	�&Z\[��N
+$����%�{-^|M���5U������n����J���zJ�$����Fsc4���$N�E8O��#u'k����87]x�|�IH8*�L�IȆT�n�^�;F�:'��T�l���/��T�hp#�,c+��͗M������"���{��V�^�?R�F��ݻgv>'�p��̗ݑ�8��&p[?��T9;�J4uCaeU�F��"� �DV�z��S�}[�%�$VTSA�t�Ne{c*�#+ߜ�a�I�r^HA؃��K�˄T�����%����2�5�m	��]\:�����Ĉ~�#XTJ&�'��-�_B�,^k}+�/,U5�]�����O�4Ș�Y��(�,��8��O�)�@��.,�-i��H��X���&E���S����2E�!�s)\j �K�]��R���-�����Z�]|*�v�G@��R]3���Ĥ�ëM~A2�al;���T�XW,6�H�B�Y��6�^���������>�5hQ��m�ߛ����r\�Z�H;1�cns�ͥ���K��8����Vdpq���������ƙM7�vR3?h�_�v�!�$�P2�3&x1#�\�ə�X�7�_ �M
(0�x�o�lv)�¦Ҿ�<�Ā%[c����L�~Z��Ce��6��k�e�T�p�[�K`
��0Y}�ru�T�|D�Q饉��c��oR�怖��"�4K�LԴ	t�$󞮫��Ț��m}��*�����K��~��B�;�V����y�%�Co������^'�����4��|ķ�Oi뮾�Jd�����:���z�M��"���>$��jM
]gN���&ʓ�ѿ��g���s������O��$4����t���� ���I�{^r,�j�jRx��#�}~Ҽy�]2���uD�-C��w��#}�Yx²`�)�3K�I$�@w��夊��
+�ْI�Y�ЕH�>#�K�'���u+�J��ѯ��j.�j�vn�^�-�'��������h}���X*}/��w+�sK��zh��.U��\6��ka��#��9�d��J4+����Qd@�wP��`0r��n_�r:�j0ÿr�\�`0�規3fl޼�A�7�pC�>��`��°a�bbb J(2��
��`0��`0��`0��`0��`0��`0��`0W�_9��V�ZHHHtttǎ8�/e��x�
��f͚P�m۶�q��<����
�;w.pd;|�p�N��������V���;��K1rU������뇇�ӎ{��I�QN��
93/$�G��[��B�@VC�#G��s	�W_}u�ʕ���+[�,=3k��D�3g֮]����@ ���w�EDD<��#)))k׮;v�Z�@�
�o߾|���W_}իW/n�{��<��4hЈ#�ҜʓKrf&^ (Hf�)�\;2/������s��͗/߉'������]J�.�s�δF ��ܹs�F�2����_?x�`}}��Zv���y.�ƍ3rP���U93��y� ��-p�#�x
� �G��1cFXX����3���ˌ0�����:��F @�+Y�d�>}�ԩY�f�u���l��g����[��G\��'+Vl���y.^:C�Syr[ά)2o$�l
��p18rZ\2�q���
+*���;�.��cǎ�_�>��B#�<y�{*Th��ћ7o�֭�w���)`�֭[sӫ��*""�����xt�iN��m9���<W����v�/����.�נA�z��>}:�.��;v숊����o�m���8~�8�jժ��������)z��I_�l�'�|����$�
+�"�/��� �d4�H'^�+�!�8Hr��w�!��Y�v�eF�}>_��@����װa�/444>>�������ҥK�Ȇ%'xLJJ��.����]��
� �d4����YAWaz[ڤI�[o���ѣّ�r�|�ȑ���W_=|�p]
+�a�Z�n��ϟ?_�\9]���Y�p��HŊ���r��8
+�N�@ӎ��.��pE ��/�o�6m�bŊO.B��2�-eθ�=o�[�l�����m�ֳg���`�
+�@�F����zZ��/��ݻ7��iӦ<��������DiJJ
+��;�;��%9/)^�(Hf�.-�P;2/��pE o�/�z:l߾=k��J�F @�KHH���C��2֮]P����>��#�:�J�*i]�D<�.]O�w~�<�!�%�������ڑ�x�� ��`0��`0��`0��`0��`0��`0��`0��`0��`0��`0��`0��`0��`0r!!!ZըV�ZÇ���������Μ9���4m�t�ԩ�'��`0�0�M7��/�V�^}��Wo޼9O��S�СC�-[��.r�w�92��j֬�k������]��/���5�?+>���
+h�ٓ'OV�P�^�<�>}�t�#~��#��g����^P�ҥKs�-��`0\)�իWŊ���{�R�J�N���i����񱱱��뒓�9��/�t��)<<<88����ۻw�����U�r�ƍ.\xȐ!G�iٲePPP\\܂.9��W����E�)r����))!!�J�*\�z���l۶��}ɒ%U�>}����p�5knٲ%�O�Ro��6�[�l���B�*W�����U��6��g���:t�#�`0��'N@=-Z� �Z�n]f�A�MRR�7�|������;w._���U�6o�L�V�F
=9��L���;w�رc�۷��6l�
U�^�����$EFDDp����O�4�X�b�/�'N��uv�ܹz��o�q���z~�(~�ʜ�c�΁7�r��U�VO>���-w,^���q�>��3>�m�[��}�Q�r�����?s���<����
��pE�#�z���3;
:�@	��$�����P����2;~Aاcǎz���Ü���[X.I���RX��s�����[�p!,���R����	Q�n��?��o�={v��kؘ�-ܭ�aI��7o��6lt�?W�@��=4��`0�	ЬY����*U���tΙ3'�E|���0���[��eQQQ����� ��羍7r��^��I���9j�(�����E��سnݺE��a���p=!-Enٲ�ˀ�C����ĉiO�8b�}��~����_��iӦ]w�u�3׬Yç'U
����Q�٧�~���/���G�~qP��#E�3FB�p���ϝ;_�"�_� I0�H���������;{�����CBB��v�Z$9t�P�O��;�0`��m�;8p�+�ڵK�N�>�bŊ�3�,Y⿯�`0�d8x�`�%t���}����e1К���ou@uӦM����…�f}�u���Z3R$���:)	^y�?UթS������~B�3fd�:w������f�"	o�W����
��p��]�v�PDp��U�V�k�>�|�3u���s�N�r�.]�T�Pa͚5��dv<�AL�7>q��ɓ'����Z3R$Anpp�N~���K��S䣏>�kh5x�޽;��̙3a����?�쳜����H��}�lӦMϞ=���
��pa�ҥܶm��Ⱦ}��-:a„�'��믽{�����+�+W^�d��.��;�5k��ܑ��t|G�׼ysN+_�����3����"y1�����R�J�~���ƍ�S$x�-��ꦏ�g�4�o(P 66RNMMM�ӈFCCC��z�I��N�
+�G���`0�)A0أG�}��[�n.�c0C��СCmڴ�Q��^�zmܸ1�D2�=
+3�
+endstream
+endobj
+10 0 obj
+   277787
+endobj
+1 0 obj
+<< /Type /Pages
+   /Kids [ 6 0 R ]
+   /Count 1
+>>
+endobj
+11 0 obj
+<< /Creator (cairo 1.12.14 (http://cairographics.org))
+   /Producer (cairo 1.12.14 (http://cairographics.org))
+>>
+endobj
+12 0 obj
+<< /Type /Catalog
+   /Pages 1 0 R
+>>
+endobj
+xref
+0 13
+0000000000 65535 f 
+0000278899 00000 n 
+0000000141 00000 n 
+0000000015 00000 n 
+0000000120 00000 n 
+0000000455 00000 n 
+0000000241 00000 n 
+0000000772 00000 n 
+0000000751 00000 n 
+0000000872 00000 n 
+0000278873 00000 n 
+0000278964 00000 n 
+0000279094 00000 n 
+trailer
+<< /Size 13
+   /Root 12 0 R
+   /Info 11 0 R
+>>
+startxref
+279147
+%%EOF
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-handover-campaign-rem.png ns-3.19/src/lte/doc/source/figures/lte-handover-campaign-rem.png
--- ns-3.18.1/src/lte/doc/source/figures/lte-handover-campaign-rem.png	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-handover-campaign-rem.png	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,1323 @@
+�PNG
+
+
IHDRa
k���	pHYs
��tIME�	7����tEXtCommentCreated with GIMPW� IDATx��W�eWu�?�
+;�|�=7��Z-�j@ BH ��"� l�`�9la�,��YI�(�����}�'���^k��������EŨ��_���5~5�X��℈�W�U�_�W����ʎ�W>�煔�K�~�ĕ�)b}3$0` ��б�xzB��a��ӊ������<�䤇���	5V�`L�m�ov?�옴V~\�J7?��,o�tJ��|E�e�@K<2�%�yu�:��ȸ�l,���)��G��{����[l�a��%��q~F���(�|���\ms��[ٷ���Q�Fe&m�p7z�X��"W���kLձo���Iq���Yye�*��.:?̻�ۊ�-��}��}�o Yv�����E��iv����`i�-c���>�{���ǂ�D�o��;�������4ϧ����|ȶ�o�����f����QvN���J���|�Y~M�’����Dv�=�⋆�V�Ԋ���EzC��͡�u�n��]k�n+�L)��s@�l#�dHMI��J1,�4>��vq�Q���x}N8_��80e ����Z2w[P
��O��6�8�aJ��
i��� A���ec���XN8i?z(ސP�$73d�O�&�U�5 �U�c�BT����M�����]~
+A��Q�o���#�R�o��S�pM% �i6���B[�Qz�^z���c6_����P�p綵�7+�^��Vt�'�N����]A�jC����W�7 ��^�>��;l�0�~+�`��� yn��1H�I@�z]��N��#��o��X������'�t�����4=6��k|"�,�x��TS�����B@:^��
-�8�Dw�t���������1,F0kA}
+.�@�'���e�HlK`Ň�9�$T=\����ֳ	�2�ef�%�+���:	u,(���C���wQD��| p�NH�M;�Q��w�$Kr�tt8%����9�`��jQJ��6C$�	ko??!!�Q>e�����*��d�9bYt��tu�5E�]�xD�\�驶R>sT�	)*��ڔ}��mm���2w2B��������߆��8@�VJ�
+�+8�O��2�Y��q����A�J����mL%�O�����p(�b�Xw�j��|��4;/W[?��g*3��"F�ا��ɉ��{OSz��k�������8�$U�%?�ڷJ����������b��bJĻ��[5��F�9k;�J�O�3m��r���}+g�8;��n�N����'�1>l�?�ə�gF	������뮻�����"���B�5G�"б�o�#6��٩�.=��=�ƪ�l\4r�u��u�G�,�X�)����Y�eJ����-��sj��.Cu��a�P�E.6�M�*�&���b^�o+���xV����fC����Xq�ڊ_&YMߺs��-Y��&P��
�}��u�����G���0}�o�%��$��s���u�0|�--�[��`��_�<ے��kunruR��'�Qc�����<��4�)ā,{�
+B0
+����dG�VC�8����<�gR.��D�%�[փ��{��B���-c�b��뚧Z�����|C���A�(;_��\o�a~�+�f�b��L[� ;yu>'4�je*��3�6]��]���P` ����s��q`
+�qs�|\�!܀���R�-5<Ah�*���'J(0pG0�B���(
!
M�bFV�{-sԀ�X����$
a���PM�<,#�C]7 8c�5y�T�>B�,�yȀ��'X�TT����.����SCUa��クz�^�l戣�|8̞R-|��4{��D`1�!90Q�+�g�4��i=�[��v��Tm�xP�1)�ٙ:M�ɂw�R�^_/_��v�Vm�P/�n�C��f��
+�bL#�۴����z�%�D�P��r?�����hr��!���1Ɛ'��`�BA"����}��A��C�lhf�e =X��F�V��E�e'w�vK��0£)��'4T%���E��q�.�4��"+��lX�
+G����%�Q5Ecd�ɎR��oP��	d6�;�;jl��ۑ��(�p��f����	��ee\f͂)	��u��M�� Yih�2CS�YW+@["v��\��E&8��ŵ��Eqp�6��2J�������Ź:-U��a�޼2���FodԒ��{��
����)Rp*ŏ�F�	\�Q��V�vef<��D^���4={j�G�p�Qz�k��
+ߦ��n�V�����%_��d]��oK���Qz���m�!)�D����9ƌ#f�/��/��l�E��y?���\iL��s�x�R�P�\�v��A�t�V3������Wv\w�u���l��ßR�����W�Dj�n@sk�i@``F*���,��e	Ey�M�3s	�x0%ѯ���3#N2�6S�1)E���H�
0D=�Pc�1�2
L;w�
��x�:+[ΫX�k����"��9����&�.�ne�I_�ۊ�?U��+���kSu�%�;�8�14�L G�����0�€=Q�Rko�}�d�EY~� z-�q�n�W�|G��@-�!ˊG�g������ɛګ�;����g&��B!����T*ߍ�
H9��e�}���2�4T��>+76�����<�C[썳]e���u?�]k���L֞��1[�^4�}�P)V'�Cը�ف�ф�HuͱN��,��7�sF:S��1���1g�;�A�1��O��X	N�P���D@����}��j),���}L�d�]̀��
+��!
hv=?���l:P!0��S��"cw�J��""��Z3�������r2ħ�
�b��1���������0�~�
�'�b��R�g&
+׹�/;��I6��u���M՗$�٣��6CE�H>��
�u;��7:��QvQ��R�7�7�&���)3�p�Mu�~�r��X+\ć�k\yg�ק���W�#�1K�M�+�+6՟�f���W��aCE��0U��-����2�59&�Fzj�𯇇�,��r^A@E٤̎噢���@��p�E�Ͱ�r`�;0������)|ΐ����\�]�է��<Xs�n4�N�Z��5����<��>��d��X	7
��8۹lc�
+�~P���ٸ��B�����:�B�m�;fv����x�4SkD�b�V^7@>�#�e@B�&�T�}M�@���@S����H4I�1?�
��Y��f#�Qf*��jr$E(�:�	.0uXk.������l��*4�*���#�ϼ�h7�Og��(?c���\����W^%�s���)�.
�P��Ò*��-Irq�^��3|��
��N��f�R�%㵃NT�7�[���Qw�[�	��
+�d�V�۪��
t��{,�����c��D�?��16�F�-;?�|���0����(~Y����q�ZDn'�j�x-g��:�w����n��?���u�7[|n�������d�:���8�Ϝ���2�R�tO�c�SP�Ŷ��l|d�e�{����2�
�����)٩!�k��'-��6�X^4p��� 2������}l�]
+t�

�*1�+�!�T�^+ۚ�Zc1�(�5ن�dan���k��f�/�g���}�����Ï�]_.Xw(3f�C���q��`���8]yi���X;ʞ�Zw
	Ǿ�u���
�������ڳ�|B��x��	>�M���L6
�����@������Z�=Qr��8_0��h�n�|1��(���|f|�-iZ�Eϰ��Deِ��o�/�n\�/l!�[��$C���lm_��L?y�g��� ya�'Dj��HOjb���tt0.���#��
�u���R��ZB����M|zF9�
d>n��}�|QGkx������A�T
65�I%<��1$ �

8X���M��`��W�mE�y��8���X\H[�X]�3S(����$wo�3<���>��++��z����|����u�>4���(����(;�h�g��V'~�'�9�1ϹY�M�49k�ֽƔ:�?7���÷�����Ă��~�N]�\E�N��؏����'+/o
o�lޑ�w�;	X��p�_&�E����k<�)�k=݊�.�$?�Z����Lmw����"KX
+�Z�o�O*Ƚ���ĞNz!p�]��ʶp������Fq�q�ۂ�@��)劲
M����
�x�d�D��G����U���2�Z�S�;L:�� �q�5&�� h�	����;��w�8]
�(�^
+�&;%�����2iSx}
.ʘr�*�ĸ=�Y��{mUv������!B�(Q�B�2���`�����s5�|�y(7�@M��j\Rq�U,�k������yF�
8, ��yZG��	���7J$"�h$�L`�Ҙ}o��d�<{�]P���]��}�0z
������BǺ�ij���[�w��=�*�Ԧi�<�^��ʥ�����9?	��z��s�-	>����$?��^���(zr?|[�����̐�ԖA��\op��^/�"bf�OՉ���=���-iS�W��R�Ӄ��)�$��<�
�,�;����{i��#�?���?3#�b��鵀�Œ�|hZ)�1,44���d
*�Y�
u��
��y�Ā��b�U�æ��Ӵ�:
�eE΅�Th�5��Gj�B
�R�g���AMη�m�&�@"��8`��'��(�!�-ޑ��̔d-ɗm�(�2�>5�^]�~������(}����p���Ɨ���S��g�[�Wt�=�dk3N ����#=!g��m�-DO+������~�:R,�D��y��Px��*�H�49ͱ�%#*�Y�
X�>�h��:)�z��F�
�63DV��9��tG��DT�ţ�:��
�QT�87�-����P�d�T�Rj�5�3T�)��~�
+�<�%���0��"�ua��4��q�Z	NN��?n�]���06T��7���Y���
ʠU�S�'��U�r��[���&;��0!3���D��{�E���r����O3@�M��&3�i�vĔ�ke�T�n��a��^K5�<�l���$*�q6f���#&�u�N*;?Vf]7}:/��q�n׹5�_^����2�B���(35V{5�@�	>7�^�X�`7z�o��Xo��T����q���?�?Ut���б~��g��[RuJ?}+�.rĞ0��`��YM=V�8Ɯ���E֘s����+�hI�9Z�6:��7k�M�
+�.�!Gw�~��]��޽_��j�܇lhv��	�����Ѓ)~~=O_�.I��)�q�²���6��9Duv�"�>�Λӏp2����������J��:�	������G�ȃ	�2w
��EW����X�:���
�Y��J	���~~bb�[��B/�S3�)�,$���]�	l�Ƌ��Qޘ�;�-:���Ӻ0@`����i*Ć�,�Y����UN^J�aI��gfm�����M%��^���^y�>�[>g4�`��%?�/)�7��4H��ɇ��EQ����M�[ivf�^�;?�f"H^8ռ2N��Xw+=���6�ʬ���5��P�Z|ot�(z%ϩ���1��Öܛ뭕ҵ�-�ֽ���]S-|t���}� zM�N/:?A�$;?H/.ط��W�ݯ��쎮��_����fj����1Y�{�@�y�G��Y�_,#/��p4�%�`
�],�XM@�’���rj�d	g��h>�A7H�
��Q���Q��$�Z({����1�Հ�r��:�P^��0UOX��ʬ�}5�1�K��19+P��2R]�!`�X�{=1�-�)�|��K�349E�����u{���Y?��ꤻl�u�r��r�?a��	�N�K��O� �z�]b��y!	q���q�!�#߻�u�����B�agpÑc�ڲ
�j��:���j?����c���80
+�_��N����{
̠�4�q��],�\X)W���s���/��$��ȇ�ncK�uk��ds�e��+�["3��72*��~����5��V3�orujLqC4��e�����HwJ���PGx�
+�b
+�Ӈ߹0�AgDJxң�9X����0(�)�ؕ4�O�(�a�r�3�W�Y��	=:lA���b9��	-M�6G2S�E���Pwʊ��UM���t�o.�Ņ�������s�@��y�(4�����
��B�j�A�t�R�N��b���[�Y�{
�F��Y~N�����j�=�ັ��l����
?��0~^���j���6Vy�R[l�h�<w�v%�j���,=�V�'"{y�8yVɻ1�΋�'J�T�?/؂%�X�|N��QvA��
+�G���+��Ώmq����Qi��|SW{	E��)��J�W��M�RMf\T7���̻j�������%�Q
+���'#Z
+#x��'���1���>���% pt�Z����/8�X#��P�F
��rM$ѷ�i+h���ieV&`c���$Œ�_�fN�{�Ć
"�P��5���u_��pME�,�6ch%�k��z@8|�Z,�d[ZZ�LXω�*kd$k\ϫ��E��(2B��U���IE�}�#oEoR��r�`��w#/L���|�[FO
���{�ji�3W���^G��W	�\���|�c���26��
@����U�|�R�v���;����r�m��|Q���$?czⵣ�yI�+�wIq�� ����dO�l�L���/��\��������_|U�y��j�&���Ou�r�y�#Q;~�}�b�;�dF~��}��N��A��ƴ�ng$x
�W٦�������ԔF�B|\3)
+�Ę��!�p]�պz1��MbǬ:��2R�,�]���r;��ZQA
+s\�_gcE�a�E�9�ֈiE\2U����_Ωk�"g����z�2Q~B��ލ��i�|���[f���o��T�����GG�UJO����7x�o��(Z����0~���oE���öuW?�qn���|���Tk���5���J��,;���y8,�F^�����WW�_T
+Ȁ����Zן�/w�_��y���?����jo��Z��l;/���p>��g���Y~j�<wj�������
��5盙�Rt�g�D/�P}���׊r_?�᲎͗YC�57�bْ
+8Ԧ�6��bR3�8}d
+�(����k.�(Dp4��[����L��ӷ'��d��k/�-�Mwu�E<!��#XPpqLS*�Pa�=�c#�8��cl{JQ����)���OJLZ�r`T9��(���^>S�̌W�Ǘ�
k����p�����3=#X���(��|���bs�J��Y�ލ�Uэ^�����#f��Ƴ~���\�WR��W�֯
����r���‡��a�vMu����k�%wg��-
 b�:?�������i.Gos�
@��e��Q~ZɾE��a�TM��c=��%�Y+=�b�&�ၬ�Fl�1�SAF�2����!�X��=�}�1�M�g&�:J�g �p�#0ʁ�
+�,�V9�����@	7Λ�mlf��¯\6�
$���Q@�ZӢ�ը)�p/6�P�[�]6�˙�E`�>�
+�D�1]��rSF0�^���QK	"�3�,V���H�ո���d�}�u��
�K�mH:|a1=�eHe1;Pk��!ibత,UT3d1�#���l�<���dI,q�"5m��'�fZ��'���ս,�`�]�M#Q��Rۺ߲~�|T�yƺ���0zy��,�7E�%���B,�j�>����`�\!X;՛=y�k�&W�S\��-�z��|>Q;]y�6cI�Q���5��D���p�,���bO�^�J�G酮u�-��iv��az)g�Lo�槿5��c�V���W/j欕���~tt�(ua���PO��7NJ��gu&tH�[a�r�mO������3�(0�],YH%�,↮�4��IZ�QC�)A�^͛K�aEB��Sbݔ(#�	�y�M�<C�@��M�h�S�-�)�[���뵂u,>�#����{�K,6J����"�:�?F�K{�e�u�!_�eCv���x�M�u��
+�
+��y�n?)�bD/g|�/FL�wk�fi��y����)ڮG|� IDAT�s��ec��G}��J�z���ʐD<�a��qgۺH�+�NN���|��=���_{��K����9R>�F�*��߷�W�h�t���2狎�}�7Zb����~�F�y7;���8�͙i���Yb���j�]��	����#�<a/�G�3��#ا!*���va_o��z���~�>4
�/���z~E���Ӄ1�w�w!M`%�1_:��D?9n~0��
vr�1
��t
��;C��@����w�U�td��i�a	��Y���M֔x���P��WC�>�c�i��3=���L�����ս���A~���o��]e�Qv�`��u_��h������m'�M�^���QzIk�Y׺����o[��Tr�$���RuR�~u�<7U��zk�� �2ub�4����M�����%��ͣ�iS��/��0����2��`�M s����8]��ؔ�q9=�(Z._U�d�1���{#�
�z��E���?�#m�ۀ��)�>`�x������|׆	�T�,��船Q�{�|�C��pcN��g�"�hm�����]A���q���-�
-@L#\�2&�몏%ل}T�9���L�Hq^-.�$�-��^��(z�#@C����+\��F�&rPx��(
+��"_�IHD��jdJC��e 1��M��Jb�f��R�4���Y�����^��a-(�51^�f����S��1����Gg�E�Eﳆ�5����U���K }��I��������\�h�������\���4;�T�����ȱ�Ca~
+�TzM����W����Kq���Vt5à�ֶ��g�C�we�De���I<κ���g�F1d��i=�۷j�<��~�>i~��Z/���}1����?v�1�Sϟ]�Y��xm
+����
+p�Ԑ�a��!d k��(9!ƴڇE\�@�L��B@+�),,p|
?�!(�`,��	��E�9|��u�%.o{L�z
Ɯ_v�͊И�����a}����4��f�wc�N����"�C��25G����‡�ru��r���4?׷����op)��K�n۾7�_�0CLʥo�W���N�3t�t�_q\�R��snF��ɈDŽ�8:����=�`�Ui�6O	�vk�i^!J���d@���8����0֦Q(
+��U��'mq4��0f"H�Y���afr�
��p*�T�̔�����v�Ma�y01S�bb�[1�-,��d
�57�0V���s�V5���������������4���>�����7<XW�'t����+{�@�m��
<ׂ�{���*lÜ���d��	M���Z+��!�jK�n��&��FS�c��|��!C�a#O���H��I4��Fj����j��(�ݡ�����K��q�������J�R�oH�S%[��?�\�n^���^�� �b��&[����أ�u��k��
+�q�[���$=�@�Z�>J/Uf��&J������m�W�O3=r��E�{���Fo���L���t��� ����ʹ�N7ynӹ��"u��ej2�ˠm��B82�gh�
+�*���y���mCs/Y���
</�%�e���^5�C1�&���7�#X���\,�8%��h�\�2����M��d3V�a�"��	� Q�Btyd!5������4y=#�f1d�mv�gz2��W.(�$��1�P�Dr�Nb�|q@S���,1�����Fjs]>NTl8w9��JL��φ�=�$&���,���6���z:P3�z��q�g[E/�Yٍ_T��rO�6��"�<��6^�x��Tp�����F�z�6Q�s�/��,;7H/-ط��
f��D�$�`�t��1�'�8@T��Pp~�{b��{
�`��]0���� ������A�ǺW��J�z��m��Y�@T�:q�^T�~�;7�Y���&�̆��D�]��04�����N���F?ξ�Ge���S���O���ֿ�92�������V�~��YX,�	1�:0��H(g4d�%�6VFt���4{bD+1�}�`��鈁�c�
c`6_QW���d��1�y����V@�\�&�gR��z��5"Zl�ey��Q��3�0w��5U��/ F�n�I$gm�ur�mu�M�u��i�e&��|e�5��e=�Y��m�?Gd�/��A�����ȶ�������R��R�}A��4;�R��s@�8}j��kL�l����L��Ӛ�l�+O�h�R�b�	��R�;���Z�a8��x�]���z��ݏ�yޝ�:Y�	C���U��F��ލ�#�$�3�:I�k���n1|SjJ�)o+~>Q�r#r.�f�`MS~@c����e<5�Ք�Uع
����	��=������)e���T���H?*�I=�m�:��_~�>���ؐvq:�#$h�g��'�E�ؔ���nt�����vv���rL����,�	
���]s��df�(����Vr�t�K�%�����փ����� {z�����elǗ�/fد�>�O�^٬�L��a�Z.f9_�ӧ��/���v���}Qqh=�ٷ���w��{�!;S� �_���(}j�^Vu�Id��wV��	���ׯ�>�0n��n�6�����j�G�ٙ_��㱄c���s���;IC�����)|�f��y�6/�Y��t���>{{[D��c��81���2n'0G�M>�s67*R6>�#�����Ͱ�;Q�=�	G������1�N;�
++��?5�Br^Fb�t��{;�m�AA��cR6���W-6H�/��(���@�4������t��B]ie[W�s\��l�ײ���d��2ғ���E/NL�fݡ���D� 8,�g;��M+o�$��X�W��|]OyX7yɱ��������O�6����R�=�.�� �2����lW�^�M�^��Q�h�7��kl��m�)��4?{�<[�#��MD�j��(ır�JmƯ�쟷�~��4?���q��b¿O��\뗜-
�����ԓ��8}z�<G�Ɇ�o����Q�B)��ֽ6ߟ���xX�� ya��|ya�>����O��s��Sϟ���K�#ߌe6A@6���	
4���&~~J�o�l�k�8�S ��h&�%	%�-��%5gc��J��@�f!LB@F���Y�i�^H�7d{%��(ʢ��yfuLoB�ֽ�|gK9���@��!AEjK��j��Z�0g���y�`�*��g�b�2��Gم�/Y|�mݣ��r�+��{<�G��m����4?���0��V�X�x[�9��8Vy5��8��4Y����+y����zt<?�R�l�@��B���
c�-�`��!w\Hкf�x�<�T��_T�As��R��@f�N�B������$������(�8��@�1Bf���FE������l�0����-,͙��Ӄ��X6�7��aփ)S��S��}t]�,���W��l�]�bn�X)��Z"&}�^4?gOq�� K�ߧG��܈�˸
�1`�T���q:�#�e�峬��"�;f���HF�X��ÖGj����nr�p�f,��|��s���O.o�7d���¿s�*�|ֳ��Edi��Ŏ��Z�*�1�ڎ��~�n׺s_e�c���#�|0��4����dl&�lA�}��&�u�{��8y&c+˃/
+� �#G���v�7��W�b�����3�hST���Jr�Ò���}M�@��z�ZqJO��t$��hcÆ�����ˀw����C��0�
_���y�?��c��Y�q|J���%�vFA���l�3,`�#"@B�&�@�
y46�{�wڛzj��E���
+�z�֢@W4aE���Q-"��[F�/򰭬yd������
+�����c�)+�@m�Z�y8�y�t1y����b��O��U��b��h`3i�r�긌G�R࣮�\�*��@���J����@
��.��� ,�o�\6V|/�J�'�ck����͚J��j�Wzߪ��j�>0]jo��Z� xe�v���`�����x�u����[���&*/M�'�\m�1M�g���3&�Ɔa��z���d۱��[&�Z�/	��������5���,�&����L���0ya�>�Q|c���Ϧ�/�o�S=�x��N�7S��f[����/�c��l�O5sk�}���d)�#�����������Z�q34�%\?�#REi��Ǵ2�Op�� E@E�a#�@��
��uL��E
+�)��&R$]���)%��
+�>�[yi[�f��V2z5=�d�nL�D��j�����L��=�g�J��\�-,�g ���av�-,�_H�6Cձ�kT����7��+3�
�X|�(|�e=05��f�+Wq�8<�R�}���?�_��ZA�<�z+^�
�
"p
��-z�k�
�Άb�x#�1i�`�t ��qw\�IDž�TW�}c�KK�c��U��`6
+�欍��8�݅b[����
V�3V��G��:�쌒u�P{�_�bH�ˉK�+�l�J�]B�8}�������\P�-���I|N�
Fp`�5�OZ�[|�R�
<�Q?�A	�-���>!��E�t@�D`d�������D6�N���x���� 	E�
WD'�K��bO����z�bq;~!
ՌŒ��}��r�Ǔ�4&��D����߮��)�7hm�1�l���R�$1��[���=c���8�x�k�:��썮������R��k�GJŏT����V�b���d������U}g]"�q�5�[)�?
 ��R��!�!�d�s���{(���S����%y}QƓ�H�La��h_� ��{v
����
+���d8�����!@�Mv��_�0t�*��E?�04iF�cL�hd��Z���*v��ͺ�o�G�z:o��QMA��Ɲ�"]�M�A/����8dk��5���*���N+bIb���-�<L��jJG��.�],w%ybU,׬�'��
�7&R�q�z
���5�jMl�6�#S�T�$L���������wM���vy��󾧟�3�Х
+(APH4��c4�1�D��Ϙh���Ʈ�Q�"�H�*Ә~�̜���?{���@�������Z���ֺ�}o�z:�����|�+6[qYq,y�!;-�w���~�f"g��� y����?����ፈy{�ъ�C�� ��`Y� ��ޔd�Y?/ϙ���];~��k,��j��z�����qv�m?P�����:ήb�0�,�/g�7|"��4��x_o� ���UU�h��Qz-�e�I��(��aZ�g�5^�y|ҳ�/���NvM#��P�\��oڈ鷮�둿#=�|�A	N
++���=��hB+!�$��p,d�
+
vm����HN���]��`3s�
�r�Z|<����<���G;X阣��-)t��`[�$�]��\(���S}�^TaA�Sf��Bԑ��[;5=���s=k�br��bM�����:�b���q[�Vzc\�'Xǵ��zڶvD��6g��K�Kk������.3Ǿ�}T�IĒ�<`�y���/��R�:��a������8�3�(R��y�r���bh9`4��C�@H���~w�)�҆��<�A��1�4������D��ĖO&���<|��
nja:]��gQՕ;�y@A�+�'�<�ծ�������})��6�J�…Ƀ��Q�`_-���8�*�e
��S
n9D7��!��u<�O��P!P>���hbC:��&��
�q�COH�0D�=�,�Y�T\fk��YYk%n�':*��-4��Us��,b� �BkP��S�B2TᬋXJ>���9��|ǘ�!����8{�2����ʝ���~����eYvR�\��<b>ںh��C�c�/p�1f@�i�q��F��"�jL����B̦�%���
��z\\�Z�t��dz�+y,��q�'N�����ZM���iQS`7�H� ;���4�i�E>n`hiH}ܸw�p��RcJ�+��oR��V
�@�j�q[�xOgH��7݄�$z�3P���Bj�ȀY,[,&]�
ܖ�&py�0u����	�
+��Z']�E�Y���-M���d��/�����YO5S0�	,d6S�ܗ�IDLt����<����X�L��ŒYl��?�����:,�ʳ�=Y�Ge����rKn����*1%��Q�
T?ы̸߮!?Q����������?k�?�/��G?��́�_���E�w�Ԋe9�X�}h$�?J��4W�y�0W�z�B�1�����e��G�+�6d���m?���\��$�L�Ú�R�O�K*�*�1H:�_՜z�R[��be������M�sZOg�t����ǿ�����ߪ>���둿̛�I�!�8t���d���a�G{
��V��_�d(��d%G+���$T:f���E�3�
>sRZ�����HDm�#jO���M�N�p0/`U'�3����h��Iw�03�ϗ:h��M���[�+��LO��BM�|���|��r=��]T���g9r�R�Ѵ<g,�A���KG8�O�+������4G��������ޗ�࿔� �>Ώ5�_��e it���"���U	B+h��W��e9P��:�L#�R�,���\k�G����k�P@F$�W�@��f��� ����� �NƗ������boY�R�m��j3
+�J���e+��-+��B�qq~���b�Q�S��_'5�YA@=sLA�b�9��f	�1|�Z�����h
+*�p)�����&�������tb:�\�/7Y���^����v���$�΢��ņ
��XN�6�C:�y
f��_1{����%
;jb:�)3�F���c��徚h��p�Q�e&l����OhScX�b6Ѽ4�-D�m�(X����+v�f���!7S�Z�7"���]��,k�G
0��_�h�N���%�
+��Gó������ԥ������=ڌs>��'k5S�͜O���c����
��|�	>��iCզ�)��bz�����/pȐ�9S�w„b�2�ig^?9�.��o(#�?�.m������ֱKR�-hUS��pj���c�0icECV]����s�.�=s�\���,t�[eX�����>u��
�le�Zr�B�ڝ���Ɵ�z�$���E�����1�q���
J�5��'��DS�O3L�Fe��1��L٫�&�Y��P>���#0%��X���Qk�ŗ��U��\��5���n�c+�ك��Q�ɔ���҄�����
H`14YbB���i+q�����������W��,>+��P>D�4ݯr�����u�6}�����k�������=��_��ݜ����ZOf���K>����A��a�
+��$?0� �B=�p�N���y����m�ug������x��L����^�4�DQ�N�b�GL�W�������%�zYy�0�A9�������[����7�_ˑ
n�() 
+���tp=�DC���~��Y2O���E�c !�0���J;x�=ӳa����lv��(�Vq+z0*�-4\QQa�Q���)�m=,"`+K��y����sC-%�3�)rW��l%G��򌞚���\��$�8Q�@r������kF�|C�o�=Ro��xa��#����?��D�X߶�zr8������Ӗ݋�WJk0����l𼇈@�ůw��Rm�B�z
+t	���̺O�U��zIc��՛�-zݗY�9,{���C�����5��C�i)0��79���}{Q��M��_��G+Ώ���H�z}��̷�~fj�%$
�
����	|��+t��	���L�
#�������m�!:N�����mK��)�s����u=�`x��‰}�@��0.N:`a@��s��ô��f��SG�FO��M�hf�݃?�p�
�:�������X��j��UM�O�3W��Ej+B���r��{����<זOf婙:��%�������������&��mk�d�*��=���
Ɔ�ݛ������ݰ IDAT�S��b�����T�6��~���x.b��?3L� lk;py~���(W�z�`��:�f�L���kr���R���G��[J�}�lt�U;tG ����|K��Tp[L�z҆qM���O+K�_
n�����%z`�]ڥG	�@{�o�h���i�0jp�a���9�Z�%&e�ty;`�]� �C�4�,ݔ���VM�J��h�Yb�M�6���K_�����➶���D���w����z�����������A����	6K~8�˫�Y����G��t��]������j�8y!;�cю>���_\�/nZOv��/NG0�n=�G`V������9��]��M6����j�!C�g��>�)��2#�-�^�r���K���E] �s��|�ݹa������,O͊���G�K,����jTޭԦ����h��F���Eڌ c�a�[��z�q���x��3��W��&ġ�x�����^��JO��m�����'WD�� ߹��}>��l>�ڪ�'�_4��	��h���{v��{v�g��zBEl�C6�3�������&JS֦�S�%��J�,f���
eH(0���8�Q����*h���2*$H����P,�r��Yv\E�:*MB@A�e���V��$<���ACN�'$k#�Ҍj퉝�^+�z�}�4FD��ܚ�#F�:��?��w��?W��͘��GՈ|"�P'J�ϲv��Ua��Eqv��C+@��&�C@�=_�)Ȁ�c@*�I��,���=a�JX���!
I�"p��)v
+��sJ�p�h�{����y�4��+3Y�M����<[QM�m��T�$:�ɹn9�3�P�Xߩ?cA��iE���vI��0Z����:0��F�s�
�3\���Wϛ9����Et4�E~B����v�����!� ��_=@��@��L���Im�@6Fx9[v|l�ɬ���ޗ
+�01��2Eb`�
�p=~���þ8�'3u�rq���Tm��
+�>U�3ݬY�p���~�P'j�X����
�:et��K�/�j�H�0��8>���w�*��8��#i����Bw�����̓Ǐ��q~�8Y�V��GG�i4d��qvM�N��j=N`{�myq^���U�n�{�o��aoa���n5��_H�3
��ZS�v,e0��Xbb�}��u<s�����Sx�
Շ]��>=�±����A�5��
<��3r6�d׬(Jkl:�l���t�(�S=�{`2�90�=�-�	Q
Ŭ`����-��C��5�k��u�f"Sk������1k~��\6�(���u��|��(��GS�93����ɇ��+'�?��7���x4_?.��8 �`f������ZC�rc�9�S�~�[#�Du,��2��&���{�Pm̌U��
��D� XϗOt��h���>��ϕ!6��c��][���?���8ߝ~����X|NS�b�V��l��>�߉�k+�g��A����5���yyZ�~]��B������*�-��}���J容�p��8�/h3U���7�����[}0��Tz����йe���|L�-����xQ�ܜ�g�K��׮�1U��Ώ��ZO����iV\�_��>��·~�N���m����g��n8��,�0?%5"�H�O�v�|Y[�L����,�CS�
+�Kz9��܆���>��M=s��1� c r�qp"s�b�(H�4;�N�s�{U/nsۻӺ�5��Gk`Ґ����$�@F�BQ�}D���<2/�ذ���ϯX��z��>Ìa̱����'��l��Q	��(��23���Kߐ�(g+DҒ�#!9d*��,��RmF(\�vd}D`��%�����f,�+��q�(@�
*c�r��4Qi,M�#Hz������
+�
@�@+0�lʒdz�d�VӼ8G�Y���x�z�{l�[�]���m�3).����:0�$��U�����yf�_�o��&��^�@٥GІ�.�h��+pW.Z�;8���*�<�)�aW"��,����^�l(L����,���F�,C�ĠO��|�m]2�|�Ԕ�pԂ��c6z�9��y�*[‰5g� �������oq��\��I�/Yl�a�L���j͈}�2
�zX�Z�N��_ӏ�e�Ǎi������V��4�4����4ּ�׿�V�L����j�F����Ȳ�:��m�cmi=�e/���� I.�|n���ߤ�Ǿ�T'F�GG�������^����~q�]��'��76�-�W���G��D<�#��Mh�*H�Q� ',��igGlËs�����ĄG�Iٯ�M��?/�B�S����i�a�Ţ��1�Aͱ�XtUP�/�����4@
�7�;�٥���JL�"��Ѹ<#R���TO�8w �^\���\�s.�:%5&{�uv%_8�\����G��swˍ��ʽ���g;
��*
0��{���j(�{bW���Z����D�6������?2�]��X�҄�Q�K6�],N�Y)1,���P�>��O>��.W�8?�[���Bo$�
+3�x��[r��aRs�����ۿq|sw�n���m�]����h�O�\)����CF�|T�i�z�;�[߹-��뿿��F�;V���H�W"f���ڿ�%o��_
+6ed�g��|ɏ���8[<���ڑ/�?���ɱ�>�����Rms����(�c�9����7��=�5Gn����w����Y:V���Q�c���bHGc:��Y�-�G���h"p
GQ��D��(h�bPg�Vא2���r�J
+j*h��QE�|�S�8�'�u5yT���1E22eU,�Z��"i���|���lc�%��
�/Y��d�QO��@	CNiF��@���*�CIy�R�SWn.�x_��)��K@rݟq�R�'�������[��a׾�޸���Zτ5p|���s�!��҆�ipB@��א~� �!�-�	��.!^
�
+‚�4��"(s�
+�|��<n{��JX[2�nYOV�]����'�n�5�,�n���5^�;��k᫣�~bm��	<�-���
ْ�lOZ�;$T6��&0���N�q�@>�^���T��a������@�ѷ�x��CG&�F8����cj.�qp��BC
+Z$0>N8�7
Nk�
S�[g��3G	�t���
��!@Ϭ���%aNiI|U�r��('��JEa(f-���5U�j���L�w�i���t�� �SYq�#6&Tf|M��f����
�{�
��]�/F���D�4�^��/1�ӌ�79&�I���6c��d���#�Yd`�������[���C���Ҧ�5��vc�Dn+�`�g���%g������9�:Y7�#�3�%�>04�3]7�=L�[>l�`���@W�df|lTq�
�Q1�W�&_0Ou4��6p���feI�"gʊ
 5l����E��U��ţ�]���bC
���n��#5q<��a��A(�xrWE��&Ԧ���-[��%[���Vf�^_��i�D�_�0|r��T�m>�`FMkU�H4�u4YC52�}S�ݴ���Bv)���0�=�tU�
�*����+�Nv����68H��M���^�L�_N�ܯtT-�C�/	"�b�j��1g��
�V�ofz]��r�NXM�l��,v����������Q|e5��J���Ug�o�}���b�6c��
Ƙj�_<6��a������L�����)G
��\�4ʮ��t�w7����K����xƒOO6_��?�P�N�;?�?:5����#���[g�R�N�K
L��,g]��m�鮵�m��z��
+#�W�mm��А�]�kP�ItX�5�laU���r�,��#�Ϡ�d�1��f�o�!��hv@4��>)���zkd�o�=g���JE,��"5��b�aN|hb���Wc��ENO���
�h7QT\0P{��D<S�.E�m�ꊝ���Z=Z}۠8߷�o\Y�nb�� fI~���r����<5𾒦��j[^���ά��$:��y��+q|:[���;�h��\�^x����^�JP�� �	�Z!4��[��&!��@+p��;4!�A��1 -����b��+�%D@L�x��Q0�Ju�0�c�6"���]��b��1�.�W^
+���1��?����^7�l���0{�N���q|�<���1=�Wvh����l�]* T�0D�6�z����T	�es_�"��h�j�9���]�ӡG3X	qƂZL��t��&d}�cae�<�р�T�L[/>��1uT�R`B���f��8���Z{F�?T
CV�NԩZ������CS͕O�G-��<��}#�^�ߐ1��{����?L{ߏ�W��Wm�+��p7������g�h��J~Hp��v
`���F��Y~"��i�P�g���1����ߖV^��FxC����//��|)�^��í��5��x�\�k��#��Cy?
�,�I��Dj�'
�������Mx�<�ZR�]X�3F�b
�${��́YԠR8hy8�C�N�V��H:$0�ᅑ=�9le�ZS��>/F�ˏi�tj�H��\KC5��#��xw�����<�vX��j���gG�Lo@�c5㈝c֮���c�_,���e*Ւl���x��������H.?��)���4�z�-|i����N;���~W�E��l�Lݾ��aT��
���H�:bS��Уݿ.IFj"7�嵋�G�{\޵X�kp=C�žTMJ�\赌
[��fŅ��������x�=ܕO2ȴi�Ώ$?8���0z)c�c�#$��_����:<���0~Kw�Q��F��[��-���?T�-��@�^#�6#��m�w��F뙴���}.�^:޸˜�+4T��b_�<��13Ts�D�h��u���#��=IvU'����٫-~ؕ�"h���k9���b��Xa3�!S�	�k�!��E���54��\N�5�Uܚ�j���RQ������@�E�]Bo���S>0�.�(���ϩ�M>Q߆�H�)3��^��FR�����
��e�
+x;R�c;,%`�����-�.IJ�?���J$J3fȚ��N�ʡ��6[ꦯ��?9H_�:�d�~G�5����_Z�}I��Y��Z�N���Gmg�`K׹�ȷz�#z�$Z����s�w�q� ���>" ��
+�>=��A�� ���^���	tfAXМ8��!LJ�
+Nq�u�e1��$!�
+�\�f��"����.
�����`fz�
�7������7��/w�Ʌ�El-(�ɚ�~$��z
^7�����%u�3�Cl�P���.mG�
+
�^�)
ހfw�z8��_5šms�y8�v���ດ:.�\kc���-�-�Tq�͜
+j#xFL�-�_q]sHCncU����X"��`�%%�Q9`��u R|�Դ���K�
+?��}�O��⹒q~*��~�
+ �op�>�1�g���'�y�]L�-f��\���g�~�Z{�ָ��J�3{��"Ǚ�T� �a��Z�����v��,���6^-$�"T�[\�>�V����VxC?ys ���y�ɠx>c}Ɇ�
B>,���G"Z�ӏppdz/א�hWD���kjf{AC�K�^��(��&��`���,�����L�85��
��TOU�
N�?j����N9=�<�����/o�Ǻ������Tor��D�?��M#�=�´`��:���9��D�g���ĺ�1��a�7U���l6���.Od�s#��G��	x/���_�
�0�N~Y��[le��DmNt�io��4�Z+���x����qy�/����P,K�������2
��nv

�7ܯ��!���8o�_���I��t�w�z��J�]Q�K�	�b��DU�Z�g|�fC5���
+�B��z���:rG���sn5r����]�=����������
iz� y���`���ǕZ�Y;).p���ڠ̨�:�W�g+�a&��!��5�
���!�^��o:G�߶~ϑ�+,���Y }X�`��GXQB�T�p��d-?KA$!��ߥ�]����0��А&0M>	�ԓ
��`k�]Ч�X�F'�z�)	N�q�4��+œ�Qka��TJ�"���\�H֫�θw�!q0z�@�$�D��}�������u��l���}w���d��r#�K�u�H�~!��l)�/l	��b��^V�z2KO׺��Bً��>�Z�����|��M
��9����?x�e��E׫B8����=�����ˇ�u ,�6dH���K����A��6��
d0�^!mh���1Yz>g����i��RM8�����V�z_�&4��je�^:󃏚lx��-ؽ���q�1$@p`4����Q|��
��q��'+t�
�*n�K�\������1���k[xVL�K��إ'N�gp��t�������)$G�`cK��h�F�@o�����B�׸g�3_:�܈�\�/�!�h���\��
@h�藛$���`�'�*��B��To::�`V�<��|ž������[�~L�9M>c�Jx����Q�L�v�e?��l3�
#�G��� ��X�~O����
+�c�0R�~� ��FC^�����"?ce�M�����8�j��J�=+Ï!�g��m6�[s��pn��ӫ�kKS5$�:L�o��8]��Q�GV�C*	�����^���;��q�Z���W@�,L�1𘉴�m���P���5�х|SC$�X �\mDL4@?��*چD]�L:��r���ۈ���i=ꋣ�W�Q&�ŮkO�7Dz&�k���Y|������R��~�I���sO wX\sn
�J =q3u�)��/x��bշ��7|
e]���J�k��K
+m~�)g=R��.��rv���S�\���-�nZ�Ӵv۬����.pY���;��Tm��|[\>�b�e��?�s����|�c�w �\O�z]R��𾈘��x_%���?��LQ�^	>S�')=]
>mL��󼟷���N�z�w�'�!d}2��s6?�0mx���Ы��*3��S���!������I���R�4�^�ۿ@�V��/�f��8H���~�(O%��|�}�7����!�ֳ�Wl8!��Ȩm�ppt@ό�s�x]	U��������k9e+�Dk
(c�0PJ�:��_�3�C��h�Z~����hKpl�}3Xc��	Lj\������a�"��J���Af�Ԁό�b��`]W��sS=�C�i"���
Q�G���ݯmi������a��h��,��8�V��1A�řJmr��ɵ�}���i�CQL��"�EyF��D�?\�V�o�5�x�N?�
��T�@k�]h/��n���U��A��-�98u Y�@��t!���A2(2����3����
�ޅY���j�^��s�|��{&M������i�g3 M,69G10���€v��	�.��}�dA3���᠄�
�
+�8n���/�����e@Ip<敤�����\��’LL��ԅ����8�V��5ٚ�����S����a	��r�"��6����9��T��K���ѐ1(P�lh��DMK6�Z���<�<��L��F/}KRnq��;���慎��=�Gyy�H�{���*/ήV����/>�J��Ұ�t���cL�L`;�&�{�˅��S�iZr�R���;^��/
+�o��CJ�ɋs��2)�ŹU������zjM]Z�7Ty��C.�K���3�k.Δ�m�
+�!�+�k��4{q��@t����@�����Li�e��
����Uu��|���a)
d��}Ym����]��l��8����`������51;Pk\ޭ�G�6�ra��?`B����{�ƭ����C��a}O<�)�����
��0^�ڽ?];c��uO�7��xW5׸?%p��V��@�|>���������j`��Ʈ6-�$jL��*����_�	�dž�
�9"���Z�����䇢�J"kX�:��Z��W����T���h�}�LЋ���
+ݯ���-�������4���z�[F�u��x�6����<9��މ>�p� IDATڷy�S1���/��c���'�WSY��{������U�G��cBtW�g�g,�[�'��ڸ��Pڷ)�Ɛ/��Jr����צV��w�S��g'���6s���{v~7Hhe�d$�����qvNdV9z5�"��~G�������0FC1�=\�8�@��'�U�S�����3��7��
+p�k�H�
��g���˓�����J?��,A�&�Y�%��
�嶕���4j�c�u_��A��ّ��3uB7~����n��d�}�؅'ŋ�8��ϝ]z|�}��؏�j7'�5�:�(�H���bԶ��/�rf��g����?0�:{�G�S�A�V ��,�U���p�P�a�_ơ�A��`q/,��.�:��%"H�����`�1�`p	Z7��h�
1�U�޶���N�^iL}�{3�r̿ɵ�ڿ���07��<�������2�9���Es�-=�/�P�p�Wb����
#9tR0���5ִ���:ie�� ��3u%8#�a�)�":>-����AD���I�Ǝ�GXI��SU�&1BC
@�h"��X�;]�d��h����Ғ�Ca�y54�d�\oYή�[��f8����۵i1H'���î�P�ܺ:�Ǿ۲g+���V�ۈB"p�_�v�i������46s��H����!N^���D=��uX���a^��{�V�շ
+q�����g��ֽ�}{��<b�LM�Ja �-�Ȱ�r94��I����׳?f`x�"ݮ!�����8�(�႞�/\��>W�ɗ����	ٙ�
�rIńsw �JLL�hw�߲Sd�{_�"B�Ɏ���R=�L-��W��ݻz�����x�_��g�
������Gl��Pm��׵��*<�>���#G�oy��Ds"��№}W��j w�b�A��n��ӦA$�rS�G}�k�ޱ�_r<}aMΏ7Z�t��~q���oz�-ֵ�|;��H�o���o9��bA4����RҊ�J9޲ύ�r~Z�rQ��j�����~�j�g&�ޗ���㿪XT��k�%�����c�;{�_P�׭?Y赒�l������9��ȵ����������g�k&�|6t��Ԧ���L=�a��W�-�h�_�~���������'?������7����b�0{�����V坮x�s~�7G�sk��j��=)O�8�X��Ʊ�߿��?G~\��@I���B�A94�:Vt�ɚ`h�
	p:���
+��t(��>�5i�<�aF�
N���:.�E0��̄�XՃ��Gئ�ڊ2�N�#2�� ���jl2���2��J4>�)ؔp�ڒ�+|X��V$�/��A����:�����Of�D�����B�@��m�]ʧ�8��tox��=��i~YZ\0Z
�\JXi�m�qc]�����{6�5�@@�vq�e�D��<
�ai@�
� =@�A��C�@<��Z0
+���Q�/�X69
�C2к.eWH�v^	��i��-~�4��:)�MS�m
aId�4�ش�Oi.��1
+�i�rC���
+*K����$<��F��Fdb��p��=P��Z\ǚ��R��+"�h�맧�)��P���p�4'��Y�h���lyT����f!��n��:��S�hn�\;�6
�,�X!0�k�+��y!_o\��P�n��� {9+�h�����j[�+�re�8�V��n��c��_����;��L"ol��A������r
�.3��͸�-+ M�R���ۇ��A��c����Q�'�����������eF����
��#���3�^�joƿ�@t���a�Hg8�Y��g��%���%]�uO!�-6��xUY-�/��)�@3,���,Mt�z<0
��ڼZ<�e�P�p��BOu��Cq4���ɑ�T�(�IJ�c[��x;]�f�N��k�}���M_�p??7��"��z�!i��om��g�eWu.:fZy��O��Z�ʡ��L&0��1ɘd�$���m�Lp%��$��rj����x����g����3��C�W��{��*���~�Z��Y�~��c��JO%j+gd@����~5�t̹>S�(IQ��t�-���T���U���ZO��u]�[�=��;t97�����n�܆�������H��42h��Ai�b5�dXun*�<#�H�첣���D��lȻ4Q��������8Ϡ�ZwF�sC�Fm�X�Ntշ~���n����:cT<
���@�N>���x��s����K�:���f�O�Z����i�}��\
+>S�{�;m�ߠ�٢cݖdϖz�#~�h/����.{_Ft,����v`�P��R��@@��I��T���b������t8_ye!OA`�d/�|���#�;��d���:�?&
+d�D��$����VK�h���i����G�����1�*d�ƼcC�Gc� 7��%��&�^R�2�j(F�	I# c�
c��c9�� c��`5
�MԲjQ���i��x�C��Sc'5Z
T�r+}I�f#y
+"�d��7���'~���}�cݦMS鍀�j�Y~����_�j{�	�Q�w����O�
+`���,��F'
iz�ֿ[��_%!�V@�6�B����(p�`��%���ap|8!
�����k��_��������N� I/.������7�*3��!���:%#�6'��z�Ϻ���a��Z#|LC6M.��9I���$tIeQ�U���p(��)Q���4?Q�>M]�Mp����X�uo��U}<��fX"�V��]'1O_5��"��4d�����O	2�k"�� dE?Rf�O&֩�~��2
�|��&<��̄���$�~�jBԆ�sy�Ŏ�������"�g�֒!�œ��iw�x����u�
�_�]G��9��Y�A'�<�r�(=�8{�͔(rh�|ѧ���^�>(��ߦ��햸wf�Iz�1���B�:V}9�?"�	���i� ��{��b{#?[CVa�kOӋ
+���>�H���v�4����G��`R�̈&�\jB~�@���A���P�$><z�J~����Œ[�D�� :u�Ρ��f�N�\�J3X�)�Df��}�ˎ":���Ȱ|�����<��^����#�nź�e�t�?��~f��x w[t���'��5����$�-���Wă�����L�t�z�{r�LM�e'�MWFz
���
����LM��]Ѱ�Xvh�d�N����
?�G8Ɏ�/\�Ή����fƀ%M�*������t��[Ro(��H�f4�'��A�j�����w2uj?y�P��K�L����fK��?ɻ�-q�Գ�uk9���~�����Q�]&����%��B�:Q�t�?�}�P'��5��C�ڞ�K��V�pm����K�jk{���kC�:c��s=����%�A�����\��w/w~ڎ>U�����tM�q�7�Q�񟿔���V40��ln���!V#�*mN�Y�X��Ԫٟ��O��)PtH�&N�'�jt���J	�d��A@�,(��<2.1n�Gf��홣��
�Q�����1�31NM�0%��1[��O!�G
+3��Fl,�����sS��\����2N��#!�!������K��s�c�wm�����V�J�G��W�OjN��;��XQ춭��,�Sm�c�.�`4(��q�C��
P[�& ��*�2h?����`�1�ǀ[��PĀt
�a�0>����un*W�l�>{
����\Y>���"�^P�u���}Ӣ-ҕ5�1��!ٞ� �9��G�@�[��%��*9I+1{MwF���لP�4���Y��i�S;��Dv�A:+&-b	�&��`��Q !�B���esĆ��Kd��<��L��:��`{��∂XRG��,�]Y���~GM�����7ڴ��%Ϗ�����TG�%����/$D%ٳ]1Xn�WG�K\�F��g�Զ��]��V�U������i�-�Ǝ��&�bp�{�F}(�����ԇ�J�vb;%���<���
GWr��i�
�\Z����}��B���
@��m�䌕f�6��4;y���M�9D
�Vɶ_5��p)5�Bb��hA������z.`����[��z�����,/�5J�����_�z�f$
+�bӻ*��V��r�%���x(���|�Jv�F��Qg��X��?|���8�Q�Ѿ͖
ZQ��f�1��I3�>�C�
+��b�+�@�?HH�nùv���45��m�.����ZK�%k�I!f-yc�6S�My�&D#�]�d�S��yR��m������k������P܇@���/�Z���ѫ�����u�v1�[����蝌�����+3�����������$��Q��vĠ}����I�ͣ����i0��X?y�ǥޤM�u���1��q�WG�맯��s�}��\����׆��+���ә|�|���%DЪ�j�k���җ�����$��\ϥz��x-����ހ���G��_����+biMN�Ĭ�
�@ɣ��~t�mY�w�U���"R�8x!�)��HB�@�p��p��fFf���D�����Wer�����x&cJ��QH���E��2�6غ��k
+<j;Tr"I�Njp��!=�c��Gj�g��v��?|�"�T����;l�g$t5���s���)3�O���jS�����4�$+Υ$+�
+��ER�c�+�}9�������oh��V��#�xuX;�Au����`�`�NB�����* hB�ۇ���WJ��^��@܁<�,��ɟ��wC0
+F}����Ƽ����_�7��=�m��8QUk�Zq'*�4�x�KdC6��Z";2S���C'�ձ �K,�
+�BR�+C=]e*1h4e�%�X�S�
#���D���2�m�Zju�
+
Ȳ4�р�:$�(
�K�5�
+6#�ĤJg"�vI��YW��e�z�(��T��TV��ӓ�8
�#��)S���ROW�����n�bf���޻9[@��O����J�s���t@$g�[�Sc?�ww��D���
�6X60�@(5a��U�?`��!0�7����U>]���	@�Dž����7��������%�y���M]�h>c\+�ٴX�B���0�$O ���t�Vl�)$Z HQ�=4zW�o���5JRAW5VFr��1�Q��	 	�AW8[]˞�ҕ��|q�P7����󰸤�|
��-�V��r��L�qmj��\���͵g�7'j�͎sҕf"Q[�)�Fj����C~�f��v~�E�
+��1h���Z~���èxR��q�קz#%9"G��K�zFa��Q��&��-�>��LO8�%���H�	�!@bB�$`##	
�*�9D�ʬ�A�l٠��GB�{Z�-q~
%	�`�:��jg��=����.�5��տJ�1JR�-2�ݯ��4BF�T���C�u�� ��җ��/�G�k�zr�?w�����=e�ƄI~���E�
+��й<��[B��RoZ�k���j��������Vz&��i�|�ke�2��Ӷo�$����gg��?4�O�����_v7�%�}
+=A��zCm�ت�	�f�k�h��3��l�%6�3|.E�ǃMV��N�M����h$8���
V���M�Y�l�a#��@��W	�2h!��CZ�hR�4�i�ط�\Ѣ\sH56�XQ˓��$,���F
%�XM�.�.I�2�=~T�_`-�S>?D鰗]��#��!�4��Ro(����T��U�(�)���-o�.xN�u�t�;�x+@'�_\k�ldZmv�h�-A� ,<�RX`�,��R���@>�,~�4
��h JӐ
 ��)Ai
+�`� O ��)�;��\��jl��6�R?y�me&V$Z9�cd��yH�g8H��C�Jvxd
+�����s�m2�
0��U��|ɀk��M�R�&I�
J�uު[������8X��F�r�T���4��!Aj�F��(W�a�*17�<��
+��
+��C��!F�
++h��[���т���}(�uj���)�Q��	��'���Զ���%�;4�lI�����>��'�������O���l�X���ؒ%�
�a
��5HG�(��L���jc.�H�h�9XX���@�$�%0:�r¶�r'&�g22t��XmSh;������7���w���Yzi�l}��-:4��L^�iO[!e|��l,�f���A@��8�CO���w
M�6W� J��
|D�Hf�G-2�d/���O���󝨸��
��/.֦ѓ'���@���2�`!~i�k.�r�����O�*�735�c���%�~�D�/��]���i��dk�Sj�ͫ���.Y���`�8[����3$��aS9PM
Uk��ɍkS��ɚ��!!&�3�+�U�u�j}��C~����&�U�k}���'c�$
+�:�޵셜��^�|�~����c��x�+lg�(S
tr�>tnt��)���%��O�Cq�<׾u�����7Q�j3��o�g��������WYlѷ\��O�����y}�7��٬Տ�\r����!����<�Q~W�_\�>��()[��|�Wפ��}vc��+�P��ǿ���X�1�U��)H�!�mX��
+�q��wI5�8�-R��4�\�BA�X@y��h��&�b8A�8�v�ؑK�Ȇ[>��pM@���6�I[/pB=RwI�S���Ѯ������
��ѐ#�Y����İ�x(�a��1-L������>��eq
��������%�:F;�1L�Բn�tA�-�u�(v?��譯��A�*�:�Ro5�ܦ�x����U@I�S�ڒh	�>
�+ l
+ynI�@e�
g�[4 \0���QT��U6(	J�V �F@����rP�]o�Z�M��4%#F��bWI�߰BIbHv�͞�>̍���l�q�Q�
+

R׀�M��ft(�h���6�~���R�EC�2��3�ߴi:P�
+��}��l��DM��
��}�4��� �P��ꐠ���B:mA@��蜂�"���`3C�#`@C�Lp���o�У�#Y
�ش�4h�+N^�N
��칄h��A�ܼ8W�qGܑ�S,���x����Q�r�V�F���8}YQT��ZOf��iJ�A�
F
P���B(n�p@+H��k��
�0�@C1�=(r��w��8}q��}��=c,|�P�Z�Yȉ��Z�A���`b\a��dG�m�$�4ɮ�v�3a��}�&�{��Iu������Г�|�y�0e��&o��>��Q�e�6�|��~���F���_#}F"׺ݘ
+!���bwaj.;��:ɕ�x t�5�;li��΀�byRI,Y�������X��A�zɕ�ʟt=皡Z�G������eqwɺI�!����,)=�N�).[s��P��N��e�g
+˂����4Mu��{����4k-�,�uN���%��
+C׺��ʾx`����N��z�܌!rNr�"����Q�J����ҌE�%���u�'5����nѕ��U�.��v�E�3&��}~$3�vZ��фڌ��K]qw���(}����7z����������f/2�Gɟr�Rr��zn��6��X�?Y����(t���
2����+��+Ο=[zw �M��?|�}�����Et����8��~�������ֿ��Cl
8ĶAYc3>-֔��4CR�)F� @l�q�!-��%�G&��
asmdK��L�Z#�p��(�(�#* �v'���^ͱ7ŶI4�w���y$�(h$9�G�@��`ú?V[��Y�V�z�bGH,Ϩ�_�����Ox�>��U/�2�nal%�gP�\��xB��h��r�w�C���2��T�")O�QNj�Y4	�ZO:�~� �A:nA��P��SB���;!��p�*X
$�C�.���0�C�@�[
����&�9
n
�>��@8`4�e�;��Ců
��lWZ����%�$z+}�M#jM�B(�c�V#|�FvOѳ
�cm��x9���ba��5�͌�������ʓ���Z IDAT���̠%љ��:�&`}Fb��M�r���0�=��ĺ�Sf�"�/)M�m.Mtz:]g�v�%
�SvB��g�[^�����>�~���뜥4~:��$�^�:�Ģ�B
RNdj�%>;Vu��l���S��k�z��c�%�.��5��M�����f��3y�x��Ir^}���+�7
�8�b|�#^	�,�(�4����>U�s�g!he�[�^�Y�N�a������Z�=���\�B�~��=�}a5ys��!�b���Z	ishV��MKaɅ��L�4\�6�uEGg���^�Z���d�Ƈ�ؓ��T���
+[<p(��2kM��Ӌ�숽R�gj��(I[�$��N�5�8W/?P�o��O�ڷ@���N_S���y�L�ש<oX�Zwt�K*�=4�g��ae&,v�����WƂO���Xl�г���h��z�yU�TmS�!��}�BrEU,v�LMw��v��	�\m���@M�x�&ꔑ�/��+��
+o#p���G�)��Ŏ��ʰ����?U�A_�;,$a$���1k�Hm��
Њ8����w�c4@�?<�.k������8+Q���/��X�^s���^Pv��z>*v{�!�'n0���]�Xv���봞l�>X��Q��drGɽ���4�A׳n.�Τ��	(ۺ#J^Y/����Jo�&o�k�u���|���K
?T�?����Q�/;L�hu�����Bo��~���*����?K��>���h2/]�ǽ�1���gG�H�}��[��2��d�u�!�+��X���A5����1
y�n�#e:T_�$O�x�<�`jd�2�օ)�ҍ
+s
8��c��-���d-���
+��|�[���I�ӥ&2h�� 
+P�b�/_:�%��6��ގ<� ��$�*?�\�;���w����vU>`�;1z��V8
3P3[k/��oqĽ�6�O����;��<˺7/��B<��O�7�Y\����oo-\06}kg�$. 
+�ə�<��
+k�͎s�T�nK�&eyT
+��`9`4���wA�X>P����
����.��!�@yPZ���W��c`4�
��8�/��~�Y��ꔕ��!?�?�/_,���"A�G,(;�.�) 6�K��j�o��{wZ�
���+WZ�}5F81�H�rS�X+֓ĥk=5��-kM��F�ڏ@-���͉n��!ij�4��}j#@��*��҇։�%�ӘU�l�Y{:wL�^팿�7���w�=Sg~��߼��
+#ib�
�JS!�]5>i?�
˒��N
+ˌĜ�B�Ύ�8{%�CN�2yF��*��i�:֎@�.��,�+C�W
��(�F@��
���
�q8qp���$��ֳX.
-����R�r�뎭�y_2�O-{_[�5����NA�(Ұ�[�8>)
�j�63L6:��Ȝcs�� 
;.hg���l�ӞE�q��H�`0,.�-Mc���(����������+����0���#���Ok����m��~@����5ӵg���E��š���\�#��u;�K���6[�$v��(Vɹ�
�Ki�����+;e�i'1����f��X�7ErW�������~�f��<�ƕ�Gj�ės]��Ѐ�����FF���U�6�%zS(�6�G�TF2D^w�M�i�Z���3]Mw���I_��C����LUd$���(͟��c���v�w�s��Tm�+hk(��dX�G�S}� �C�L��ڔ=�vc*��>,�3�''	��η���o���1S^�|��!/���9�S�~������+*�G���y~��\'~���!��Ă-�⮵�[
+�k�)S:fWT��/����F�>J���x��r�9_�q��ȑ��9�VB���N��-�-+ВBmf8@��egڄkD���nI�+t~��<F�S�Y�;��0��+���ؤ�b~]&'U�\���L�+�3Xc`#h
�2ް���*���f�Н��5�(t��2�q���掲6�?"`���i��`b�):����aq��V<q�g��=��T�s�	J��t`L��=�|�6���9��(jS���t' SfF���>���#�'&6����@ Ϝr=Ǡ���S
�B�2���f
W
�m�|�(4�$�
�C���!O@8P]i�F=�M����8���BmG��*�7�Gܥ��TegG��%D�t�
�e2oUl��I���(F2��O�vN�������7�=IIj�U��,U�[�f>n=�9F
+N�t�f}�f�2 
+㦆 'EԖ���OA���%�z�b�(,*�[��ڔuڻ�-�O�Is���Zѓ?�~��;���Ͷ��zG�3VҖ����/u� �"l٘�j��[[Ï����gД��u���\#�6���֓��]+��<;�q�X6�����z0�	�D�P��x
�n��� <0�! ��C:˃�%���/A:���u�uG^�߉����)}9屸�܀��6)�%c8�:
��$ �		���z<���}���Z��!_�ْ��]N^[����\�
e��b�?=wI=�����W�{�����>�!��l�@NH��ɇ��M��Jό��NU_�/*�VJ�?���/��t��/E����D��?��{�i�ײ������&jz6�����S�R�M�V�6y�aB�c�T�2h�P͎����/�	�{p�I�\�2��챕첀-0:r����6�|~̠㉇�ijSj'U��� ����T���)�-#򡚩X{�i�lA���5�u�V��y�_4(v���p�����DN�������ο�z��M�۽��@����V�7ej�P��p�?*Νk<�ջ��^eL�s�Wz���Q�F@
+q@�
i�DmCW�e����fC��V�C�'�F��������Z��c�۪�w���{�������ٹ<mX<�Ӯ�͆��v�f_�E�J�
+���w�^y�̑���������/��j�JY\\�?�O��g�uVSSS�}�k�����G333��^r�%G�����a�9!H����Ŵ m	�;4C��h�r��a>2qϜ0@2h'p
��E	�̉@�d���
+ȜE*.LIZ���`��
*1.{d̀� $���R���'�gg7�IurZ�ݮ2�C\�1k�O���Xm�+�/��#�.�[�PHrL�������K=��������$V\q_����6i���o�Gf�7Kok��T+�y��jV<i8���e/
+�5�M#8q⣲a����p<�}�
+dqZ�1����^���[
�?��l����D�@(�6Cu4wAet
Y�ơ��� ]���@)�
0���ݜɳ��K=qo��s�S�%��; �@���O�e�Φc�'��E�]D
�?��V�'9�2�D�ݴ4�9�HG�k�����e�%��ygό{Kn�2���M3�6�	"-��U�(�&Hq����54��0 ��q�o�:�қ�V�<�u22y�!e�dV�U��
Z˺��Xa��T��l�D
,�,��R�5������9������w�]�]݊�,�AJ���X�Pj�R�n��ߔ�mL��v����
@Ѐl���9�!��C�'���%`�+�� �.�Hz�ŐF��Jz��+]�l��������;�|� ��+d�Bv�db�����Ç�ik)��:��q��O87
���%���>Fzc�G�FN���Z�&�}�����������ڷ�K���N�
���]�`������7*V���	c�_��4�,�
���������[<~H�ɺ��@��蝙�AITw\�����ʚ�+��F��T\��2�\�S�	@�6;:Qz���=g���Z�g!�(S��
eЯYw�a�C��Y��_��1��<'U���[ЁK�v��.5���j&7��8V�ID��inPش�Z�n��KI����(�R�5��{�3
P��q韛<����*����[�զ����.�?�Z� P8ҾG��Nx�5�����mi=������a�|�ZSc/Pf,ʞ'ء��3I�,JG�ھ�E��%�5�{�/Z���l���X�����m��� ھ�C���d@�Z��d�f��Z�]~p9~�𢡊4��__����|���ꫯ~�K^r�
7|�_��[^���=�_u�U�{��>�O�v�m�x饗j��7��
+C��0�Ć%Z�?&��
+�/-�P���U@]<��S�%ՑIgخqr.64��;\�%&��$�H��S"�т�G�t[�J�T+�d�!��<2� 9a����ȴ8؈JA6��k��hnR0B(!#�}�w�HW3c1�5憬��v��T��zZ�ʦ�{��
��T����r���K=X������C�����@����l̵ne���"�k���� �A ,�6n/5!�_�@K��N �]�9�Z�l@
F��W���eȻ���ʠ�U�x�ǀY��~�W���FЪ\�C�[5�+����m�΍;Թ �M�� �ɴ���#"6z����͙�
+ڞ��Q�{3=�p�y���`˄ȑ�D���Ne��/k΍%�ǂv[�/'��9Օ���	���s};��,��Ը��u�D��]e��b~�WU2T�9{P^e�"a�n�Gf�{����#'���?ܺ�Y����w�N���y�X��1JH��m:؛L���KQ#�	���T�т�rS��H3�������7��φ��{��3���Y@`8��q��ئl���h�,�j� ��6�5p����..ӿ<�|��2Ad
���}ccW��
'�7��!Z��d�}�nP��j]�s�
����%��`��������
�m�!$$'$c�=�{�?Q02��Y��{{�k�Z,�6W�^���m�#���|O��2˟:��"�D�*�Qm�'��g�n��_p���ryƠxrT\\v�E�uƔ	����z��
z��#yzk�.W��tH@gj�ŏ���s�FI"hK��~��$�ؠ��9�Hn�t�0�㥿�����G��$`����w���VwP�q�"o����k��K�3Vӧ�����0�H�A�%q#	!�c�����8;�GH�k
+݁��h[�҄�O�)���E����?�3mv8S[fJoE�;O�y_�g/�$K��^����5��&��
+=��^�L��6;�4�֓��F�Q~�xZ\<�Ҿ�)�����Y�?犇�Q�
+e&=q�2���+m+�g���iR2��i'���g/VzCݽ*����s����"������WRy2���G,���GO��3�瞳�:kaaaff��~�����/~�h4r]��3�ܽ{������������M7�t��{��W���
p�l�����(fHS�Թ�i�P:2T���	��k��.�d9�3�J��aJ�����	�I"<��c�N�}5�� :�������0�����2�Lq�lnv�,
2IψqP���OyOK��bR�����/n��$!&�>hZ
+�0�uo/�-ў�6�j;��\u��o�F�E��'*����;͞�_.�ݶs{Q���E���$Cθ*7`��XXY}��d���!��� |�`$T�
��"���@!:*�I'��A� ��@g�v�;��2�
�����hȋ+��_d���<�F�����k��`��pH�ʼ	
X�_����a�=�'S�U�'R�(
+3��	��}�(�l%��nߣL�����e�dߺ
������� �ܢ���"��~ܢ����B1ˢ�k�Q6��룣���>&OX$g�yϬ !�����/ �~
%
2�6&&��--B:�}���W�C
+�u�
�B�\���ܺ�i���LJ��Q���߿L��q��j��h�[`4p
i<Q�j��"nA8�%(���ہP@
q�΂���)����P���D0��ai�������=��������k��z�Sh�����[&�B�i�7QHK
�З3�*iD��u�je�s�	���p,O�{���&��tQ��kߔO����xj��S�K�U�}�Tۺ��
+��
�6�j�H�6_��s�<��A�?M�����^�v��ƺ����;k�u�<E�o���b���
���(}#�-��gtl�H\�W�q
+�d�ın/�)��%�L�p�=���C5���m&3��fjSn���w{��nxl-�/g�4��S�^���V_n�[x�D�S�F����8Q8��P���A e��a���+J�( -L��Gj[�����
�ޢ�/1�	��O/��F�f��}����c�����dT�To��7<ވN��U�[Q�\�?fL�S�)#�	��iq�Z~��s��2�
+����;����5w:��?�jS�v6+��Fo7XG$�-����n�y_��,�XR�c�c�}+�ˣ�y������Bm��I�%�.5`��������+�3�.[�h�
�9�O��������EPE����y��\p������[�n���;�=��N���Ƽ�P�
+�g&[�,l�!�
:a��R��Pc�d�8�>�E��,�hFD�{��DqC2��q}g
=b@3 G.iXP��d�
a;ŵ9�B�2p3Lr��jd�z5��8�H4���i�e�!�e��*�"X�9�o@���L�'��D�j�+ntU�MI�M�p����iJ�LU����|c�~��8�"�5͞c��|[VZF�*�uIAi5�ѐ��-f�[
c �rpʠp'��@X��t�qP������@�€{`�
:G�[�$dC˺(����:F�k�k�
t�o�L��;iR"J�X{ʾ޻���i�H}~ȀЦFI�hנm�EF�Rmv���Ï��p��N��
c��P�㴥��0�l��~O�F�N	�(3�I�x˥A���]!�&�T��H��xB�QR2<�a�	2�S\���yd�o�
+����#l�( �H�A���F�H���p�N]N^��i�xt�h?}!"4�OU�/fi�S��������<>*��}��C�L�2�"���g�mWy%:fZy�}�=��p��BBH"JH��ˆ�yC�1[�@6QD 
B9g]��t��y���C*׫W�.��~���U�׷f�U��7�����c�
��2`����eh��"��_�£H#0�:5}u<eH�3��<vT�#U�v��4KLؤ��f��&�}�����Dg�
���#M��B����D�/�}���A~�d���-��)��ў���J7��;0Q��滤�I��.�T��Z��7�����(=�h|,ʞ_
>*u-Ξ��J`�������G��̺��u�K��q�Z����Ƹ��M�r��P�Q~#��i��3�#�^�L��4U�\�6�5�?�iԍ_����Qqbս��~�?;����H�{�-����IU�ƺ}�j�uܾ���)u������L7sS�R�7���M�l"O��Ƒ��9m�I�_8�ɞ'V�$�Q�e1�/9?���8��L�j����F[��Ě�3BrJ"��%�����\O�rc�6Ȳ��e�q~�6�C��Դ.[�q)�֫��������䥞s�-�O��˽�K�����^��]����^��R�:Ϻ˱�j:+N�&hz_ʊ��<>�.f/��!��g��+
��	�;L���s���1r4�������FBH��QJ�����۱������(�?X�&"x�Ά��I'�n����<��P���J�X0U�U���lMaxf�&�:2mA�M��#�T&����Z��ṿ]�x�l'�00��{��8C�D�V�����[&3Ɋ��#�9�i�V�`�Bؤb��ajdKp�l氺���&����
+SC�	B=b
�ڿ`�r2��~8RV,7�Fo��6�p�/�LI�n'W�V��P�x@�r��.'�)�|��!/N����g��t�ӹ"�hm�ni��X����؂�����A	@�m�5�� \Du�
�)��,��"�UF�*��!ST& |x;"	Q�������Is����|ab
+Z!�jtv��1:�TAID�����&������x����4��,�D*O
+��m��M���a~n`��G��+��Ĩ8�fG�)i8�Tv�e�l�q�2'��bl�&	��Z/�=,�;tX� �8=��ܝ��:~�[_�e� IDAT�;�?4�),�ta�
+�	ͰBg\2�@ˤ�������U�PK
ʉ[	�֕�/A���E�~O<6��6-N[~:�_m��
U�<`u�$�4���ʕ�r����h�!�*(pJ�&�lD�T
+ۇL�l�n���r��J�GE�<���l� �n��6��_0�ފ�}R�F
�(V�->e�b�Hl�:���u�ke����c6;ڏ������P�ZR��=Yqb���Ҿ-�jF�Q��LmO�H.wR:���"P��t'�-BT7z�������;�׺��"��)][~6)Π�����[+�qc�Lm3`��+�;)]�U�B�ӗ'rS,��dr����t����AC���-����{ɟ��#��Fm�u��w��	���ҕ�%U���MԬ6^�'���v�l�n��\����P�e���
�ĝ�����8�M`:rj9z��Z��lϺE�#Q~�1�ˎ�?f�l�����^\�(]e������ߺ��4l�约L%�k
�aВ�c��!c����乌)���wt��Rz�b__�?Yr�eϣH,v�=�z��YŹa��5�Ϲ��Z�
+����T��z�o���3��f���xmJ
+���#�ޚ�}NW���~��8FfYv�����^u�U�sW^�N
(��pֽ�%�i:R��Ή7%��SFgZ���hĦ}X�`��B�]�	�S�q"(lkg�Cs@"�̨mf�,T���T�	e�a#�����B��by��퐲4ɜ�c��B�Z��fGes��8���1l`/�ҙX[uZ_�#,7*`�X5�F�Z���_�J_�3II�a�B9��F{�%q���sU��?ڎ��?�gs����Bn�3�Wp!Ǜ�@s�붣��:z��JBfH����q�Z��`��R@�0�Bo�i��V��X%�w��B1D�z��]���,4���$D����7W��/���y�bf�mq0]a�P�oo�ow��DnI�����q���MFz�xx���j����!����]S�P�?��J�~'ɞ7�<�����S���G|���}##�~vA"���nJr��!D�w韛ɩ����
+@r�=��{�F~��Y�=
+]�-��*�R#�lb��TG��ٖ��1��}RNL���t��:��f�U
�iP����O�%��GA��NWJ�7��g����7��")1����e��L�ɧ�o�ĉz��-d��6�Id#D]��%8�h����f&�=�v�iei�7@c�e�7WJ)Ԛa�ʣ�kJ�(b��LnSk�ݛ��M���#%�h��D/����_M��rM�±�o�o�����XG��׮?k�G\�JMk=V+]@N�^V�5i~��\W�����O_�M`ۏ�ݯ�į/�M��c��XB���/{_�z�/�?�$��Ѫ{�EW�q��b�m����C]��F�?!u�dݢ�/um��R�qq�+���xV�L]����َ	�i*��oXl��se����۩�J�!B�M�u�FNSe�Hnu�a��౹\O�lO��eqP�
�o�5��ln�T�h���
FХ�/�GS�c�vJ��,������Ϻ}�����!R�Ū�#�-
t�]�Zw
߬�����6����VW�Ҙ��B�{�!��y��]!���W;���u�j�g��_�A�j@K�A���һ�J��=J�\n.ٿ�$Y��1���xy�TM�쟄��ZW8�j�H�T�o�j�Ҿo�<U3�<f%�ҳo�g��#����K�4����-��h4c�V���Z�����(�?Xܣ�G�z��
����ˡG�Z��&m�IO�
����h�խ���E
�d}�ն��vqBh7�gHSPX]s��b��̀Cs��`�>�D�'��UU�~
=7��~�<���o�IU!������<�ln�"WiC���_VGV��y}kG-�F����]�
+�.�vh��%��*��(V�r�˜�.�jm����H؊ުM�������r�{m&O��>X�BiWJ��~wk4���My�,!�N	�U�Y��^
BP�
�u`��"��`4�	�� �4�u50�!���	�Z�e��1j#������x�^N:�E�C�?��
+OJ�mI��s��
W<��:�<��E��Z��o�3�^[�u����G����J5K���$���#��n���9�+=6���E[�Z��?�;���
L�!)A>,�`$�����=��
+�k�̜�^~z�����998,���1�&#<6����z�Gk�	오�Mۣ�~
-���tM�K%�kFr���ǵ���HT<s�����^�]d�X\�&�
hT��zQ��1��9d�K�:��B8��As;��L�(Mc� ����.�*j[�%�����9�M�)�]������6{�"'27���P-up�>���^?;w��N,���w�h��|�J����J[<@�@M4__�>��Q�?��|��V!���_��������;�n���.N_T�?IH1[� J/�_�ـ�9ߣ$�
?0|8������W�F�v��t�W+]��AF{�nLU���]��[��Ye�$@��G�EF�1Y�rd��uOɺu�]T�����3m��P�ٸ�HI��Պ�6���u��·Z��#��o��J]b$2�*�3�}�����?��I"��$��f�
�1������%g7�JE<Q�MY�#��a+��W	ڝ��5�br�ud����~{)|g�ڷ��?�$1�֦����N���eu�q����y�x��^��\��4~���Av!���5���4���m�֚u+�][<Xv�Y���36�:�g����o�Fo�t �d����{l��a|E��u��v/��w��s=]�fE���ܸs�����'�1Nպ�����?pv��sv�<������M7�T*��}��,���;�NQ��؀��;&�R՜�'
����ށdӔ�]�+(���P�e��1ֆCy�Ց�b�"j��@�M���M���:��*�Y&���Q��B�F�/������J��-M��ny�@e�3ҫ]�M���nA�
+�@u-;mA=^"��	%�p���(����0˥�X�N�X,H��JE<��wr���ʐY�����ɏ/�yJ2�?Ҩ�e�Ac�\���H���O�5�_�S$�Y�{c�ZU����a�
+a��E��z��۰|���e��&��@�pǠ2XU�3�VQQ�G���8��@�H#t�/���@�}+����L��Sy�smH_�&S�B7\��`�9]��.c�8;���w�'�cIr�0�߾�u~��Y��k�xZOH5�:?��G�[���E��p��h]l����\�ɭ�-�r�Bz�_l��#��$�6,7v���
+($_�E��r�ɦz�S��P��4�DR�km���K@-�)���QHt"5�O9'�"v[��0?c��J��/�!9�;R��9ɞ0K�o�wtW{�/'g�YZט:�]�6[��H��pT�?��~�M0
�î��4�=#8��?�x��ʑG���ʡ��syb!7΅�1�|�PV��Jn�CIW�f��$�;ץ�L�+Y7kS��_�ř���cl1ϟ	��V�/-q�O���Q�'���`����rcK��I�Ǻ�����|�������ۙ<6p���K��Y%�R�r:��V�o��MyqRZ������\������,���}~�m���Tk��\��n�Vi��$q�6����&ű�����n��HM׭R5[wdjk�8���$��\�h���MZ���c� ������U��ݯ
�K5[�o-Ԥ4�����^��%�6¦�\�
Ѐ��'���(�~��u�jߒ�clv8,N,��9��Bm��3�s���7��7��Y�iGo'D��Z�yl`ݶ���e���&�&hfӶ�
+=a�<����h/yY��-%1%�8?�Ѷ�*�H�񂮖��*5�t=�;,���n�{���
+v���b���P�<��~{5|��
+5V�j�jM�QA[^;��w��t���bG���{����ݻw�޽��?������h���K/}��?���%I������\��c��\u�U6lPJ��-oq]���8��?��w?z�UW�M>�A�K�6�2e��b��&#�4c��<@0B(X��C���
�4)�;��q+�" ��o�qx
+i���P6)
�d�U醡9
0�b��X"yB}�B�/����j��Y
+ٲ��v�gC3����Ne�
�+�z�"�Q�Zh��&[sH�?ki�}�;�p�
+
�jJ@�k3��%HN�����N�.mJ���-~p�~v��v�=��9�+�/����Qd0`E�B�p�&�`��۰K�܅�A)�!�S���@)��3QA������
@�
+ʐ,�m�Y�Q��r]�^,ն�ic�{o�ؖ��І�4��~�����<�-���?c����1v��a�?"�޼8�Ҏ��Ķ�1����s��RzP�M�-)=5�.�쟍���j@\׺�����#CJ@�)���WhP���.{l��.
(��M�E����P�
+����׭&+s��f ����c��%�ȴ�33�H�����6���PM�r{�0��ӳK|��=��fG��%�Z��g��8Z�*�o�3Y~�Q���8
�
B��^n��T�l�`
�6*[̓R�Cd=xSP:����@+paEA��[
�a��\��|�Sӯ� 1��¦���qO<*�T����k�3��Yk����Z���VSB<�u3/��gӁ�-��6�j-_��/b�EH�ز*\m�ҷ��i��8Oˁ
�Ӌ������t9p����L�s��܆�Y�ʼn�Щ�EEq� ~�;�����({Q���6�z�}��o+�����RJ2��S�:������������(9�gr��3��e�%#J�D3(�6��()
+=6]~O.�ct�I.'�
+�NպD�d�-�]ڸ��쑜H͹~T<�1�2��}K�6L�>DL���1�'�^��1�Wx[�

��xW�',N�ik��v�I=����Xl1�'I=1H/1�k�X�.Qڸ
����2e�-��U��u�+�<�b�!X���3�}1�';�	m|A���F��o�9��j��mO7^�P�������N��.���J��()R����`��D����Az����<q������k�W~w4��x�����A>���Ş����ȧt�����7�|�駻�����o߾͛7��'?y��Ww:�s�9�_����럚�����rS�]��Grc�!DS�тB)#új~��59P�0Ŕ��^�S���}2;��!8�n'���!@_C3ߠ[�Q9�e}�=32�6�.i�̮���� >�00��cĩ�X��k�)0\C^��>֥X��������C�\�3.a�j^��fD&)ъE4�	��S�Y�|�"�a���`d`����
��M�_s�;��"���Ԃ��¿vŝR͌7ߥ$�줠����ưxVa�p�((	�+�.L#ZA��"Ci-�%x� �F�����BTP���_��0G��"�?�����E�����d�8��4vK�b���vr�}:�Xw���Y�L�?f[wj=�{��SVv�[�c���,�x��qd����7~��,�^]�fϦ�;��0��"�B�f<�Bm������ӡ6nm���W����1Ӊ�c)!*8fp�����N� {�llEu�X��,�eN�i�G���*���#u�v^ߵ��12eR�����S#���i�DEW���jߥCF�̓(�����g[�#����*���o���1�j�1��z�gw�)�m46"Z�P�F�iB�HZp��Gp��L`�.Զ"^��%y��g�`����d�V�����*���B�h������
+=f�EJ�F��JM;����5���[7��^� �������z����I�&o^�us�_G�mYq�%Rj6����nX�Qc�4{v���Y��3�D-�D�^"����)=��5�3��od��1;����Z�}��
��Z��Țwuk�J������'J�_}���fG
+=Q�*��~�m<���K�ƚs�|�Νﾶ���m�J�Xt��S�Rp:�K/[[�l��-
�s��Ҋ����'������"
:��C�6��}����PN֭�]�p7��6[����u�����u�����XMP
���:���8f���b�B�X�/���J�ח_�$���Q~�T�F�j8��j�Jz.#z���jz��s�o�j����\�r�e�VN���:��@�r�[��DJ�Ƹ�h���ɟ3�\X�

�j�f��ݟ.�o�$J�q�j���l~��q��Q~AT���?�����N8w$,��ط�0��>���G��������/��/���"5��ž�j<f$ȦKSeĒ����͵�hѕ��q�X^/&����,̵7�ڧl^��2MJ,;Z�8q˴
+@sX��NN,L$�y�L�Y5�'��h,�}���h
+)�W��U&"�[��{�U�Α�S#'w�}���-��F~Z[��DT�>X��uB.�!���0)���'V��*�5�{S�(
�p~�uyX�&�����$?�P�s�~���W���:���xb�~|�_�њ��$��R�<E�%Q�B�˅�Q�B��	�p�F���̀At2�����,�zڿ����yP	Z��4���(7�rts�����r��،&��Ut�Z�ۚ�7,un���4�_�l|����x�&�Hb��cU M�rq�����Pϻ�?|G�?{��Za��o��í��K�/\��Bm���gG�s<��A�N�m��sN<���<6��f��{����z�;M,\3#���v(����Q
w�?��l:�Ѣ�i�G���#���ͬ ��,38
�YAe&�PӼ�
5��F��ڰ���|�H��=�.{���ɫ�J�d�#Նz���s���L ���cӋ�*c.�&��*�!�����J c��Q�@-dd=XU��2��A:�����r+��~zi��)��rQ-LZeA�/��WKW�م�Mo��z��a�r���ei)�5��S9;���`[��Dk?�D��R�0@!�f�Zh�f�B�Qt���*���������[t�����r��A�|����n��=�e�'�Wiv��SZWs�Q��Ln����^�0��'SyB��'c�~�����y�L��-�/̟X�-�LZ�h�v1���ι���ּ�E��l���x��~?{�Î�K݈����.	��՘��M�kڿ����V����b�!�e�FJ����N��VJ�26#i�wQ��ؚ��v�j�v���	�~���tI�j����MH.u��E�q���k:���������P3����[԰]��
߾y�����)]����A������ⴲ���8yy���
+����=�'W��X[����~q�����B��P�(]�S�2ڕj�0���ˢ�n�
+����A��IE|K��w���7~�d���?`�F~�#�[Dbb�]�(Q�E�Y��1`��”bh��F�H55i�쫒͜X���S�Z�ز$W�t�"tEn�u�Z�[ԷN�gISt�.#�!`Ց��M9el��,���@H@
+Ҏ��F�(1���~��~#���Ag��0ԫ	V9<��=RI͈�^6w���k����S��\:Hu�"�gj���lݖ����>[I�غ���Nx_��p��kQg�o۷a���+��~	Ym`�`��,��h��Q�nE/�)�ԂQ(oG�
s`5a
+���@���)�C@��*;`$�9�E����G���y����wtTF��u_&7T��,�D���N{�R�[k�/��ö����?'��	��&�-0�(����WLN���µc�+�Z���J���k^�n���[3y,!y�����6�@�.1���oXͷ����_�T�jz�ތl��ɬ�S9�j6��+�)n�2Ʀ���:��S��[�гc�wH��tG��D��J���
6��t�[	��dk���~x%�n-
5@��|�x"�y�	W�i��avI������?
�?�k�uQ��HQ�@6��i8�+�&NB�w
+���؁�Q�fAmpƀ ����.�����G�������b��;���B9]}qw���8���U��a^�,ģ�
`�@��p��?ʗ� IDAT,FQ�1P
+�
%�9�A���@��	�����h5�H!�����X��d��sv�un��hJR�U��X�Y�A�Ǵ�'�ٮu`���Bm�t J79[R���|&���k���$ⴳ��q;Y���u\��L��Z�JzSٽ]O��M����t��)el��؂6�g�܎����r�!U���8fjB�%	%Q,����vr#9��Vv|]�&�$#0E��P��si�����8M-:�Ԕ�C��hh����
�[����O/��a�$�'Pd���7,N�d����
x|O';�aߒȭ��t������\?n�n����1c,m*��
��T�h
�����Op6�'2ڍ�-v��L���0�^`���8IqraꙪ���)�����c�͋�[ޝ;�F����&������Xnӂ�ҶOs8���3�r][�gW�)���P�K���Rby�9�����)z�\�yEu-Rv(Ɍ��3@�<��	XW�X�G�����`�JN�L��m\C���E�Ӯ�' kj������!�u��Ů�gd�r.�N�S(���@�l�Ȅ
_�|VP��S�l���C'�H�.{�3,6�y_������|̾#�Հ�
��������[	d��#��(z�����
+�>lF�H����R����s��p'��j����/��:�7Q!p�›� <0�ƥ-33
+�i�r�>��+�sG�����į�jc��w�x�6���r{�
�P���ll~
y~,!���Z���Rn���D�L��Z���Q^�Xv�	G��W�5R7���<?6/v��K
+��_i�ر��c��w�ɏ'r�s�ȟ�T��(��
+����ژI��iT��
�O����@j�E�8D�fE!!�.�r�3��$=14�.
G�^ͷӧ�����E��8�.�rS'~�
�����N�g��ccߒ��a�S�~�Y� ��
�	P����
+�6C�+p���!cx�w�,��L��<m�'�E�={�=����]�B>e?��	�
����w�����w���g���Q������z`�I�
��C"��q�B�)���?�*-��1��i���'�a	�Z��uw������V>_�?ۨ�9�ϲ�]�u�c�������(?G�#�������n�6&�������$J���g�'P��J]���rK���5S�ϡ�/��5
�K]v�l���~��\?�}9�-v����W0Q��s��m�'��xɺ��<Q�|떑jr:,�zA�����/}(ץ��v�ne���n=`��N���|oٺ�i�[�iǺE�#�xp��1�=Ǻm��p)zSa�6�S�5�v�	�){֍�\�i�ҎM<�DX�$бܡ�?��d"��� u�K���j�]�>V�2)Nw�[)q���'���ʕ��yG����q~z3��T�(����9;8*N����*�����·n�����nvJ`ߤ�XG�Ή�����>#U˵$�Ԙ
��D���Yh�Φ��z�3��s\Z̅4�i@#-⭪�:��K�kN
���W���~�ńF6NN뚻g��d�o��A��
+�E�#�i��9���e���/�_�߈�!S��~�LN�v�=j�^���S�.���q��Y���Y>��z��ٲ\�V�60��<ݒIի���E�\�
9���M��/M���)m�arE�?c�1p���[3����`�1�#G��$3���hIJ�=�F��1j!X�@(�
�5�1���HB%%����[�й,@��`+t�t�,�HV�N>� [���y�9�������}��Y�Δޭt�w��\��x%Q��B)��"C�>
+@�Ś-�m��~yE�'l�n%��m���!Ώʶ�)W���Ee���S�]��4�����n�<N�u����O�&��?�����W?��rۚ~������6��sB�,�uf���/0��2Y/�H��c�H�������q0��aG����\QM��B����8�bG��U�A; :�^hѥ4?׳A�E���c�2��j���b�F��)Akx
pE�î#"^��Zp�1|��;���f�4�bp̂e�6.}�v�[g��w��u����o����<9��r}�)u�V�x��PX�0��:��3ŨkyeXNA�� ��<Emy
+۾�R����g�+��dX�),
�j��n��qz�k����a��y�H�s��R2,��0zc^K<(�x��*�7�쒱����<�:��!D2ՂG�����D��W�;���:?L��������Թ��|�1��3<���avAR��gj-%�(??�;(Ɍ�xHg��x��=�b���.(�?5����	"�ε������Dn��&���n�:a�CHJ`&�(V�����V���cF�Y�b'Ae�*���v�h�>%q(�$f�/k�9C�Fa$/9׵���֭�����]���Ҹu�~�֚4V����%~4��ӗ�o��KJ��胔�I�Ϻ�Pk��<��$W[�J��۽v��&e��x���5�pWܝ���쒒�Վ��#�,dʔ�؝?����� S��	̪T�6c|��\�N_���@6nߛkQ&�����,�a%�$��d�0p��)c�ȅ�Cݩ�-��1�ӵ�,a#�`�SH2C�hlų�����3/?�l���W�}��͗ܥ��!��d|��ǰ74ə�`�AOX��8����M�M�Y�$�?�o-��n���H�Qax@���

������_����l!�]e\7�����'�����O�w�����iz^wt��%﫞����I���U8:!� s�n���%C>�݀��*��@(D	�t�b��I�x1*φ3���t�/k�*�X��?���e��xޟ��sa¸o��Z���~���q1�)pn�R��A(*���2��������/r3!���,��\��ڸ���z�=�ug�\�:��6H^AhD ]�`�ڔW?G}pb���Oy�xz���l���dj�P�
?2*��0616q'ܟ2BJ�N1��n�^_����J�\R�ҵ�94Ğ��qɸB<��&��B֒�������vv�g�!hw�?�i�������# ����GyB�U��g�#��ȺHVa�Q?���i
��Z��w�+!S�I��dk�V���#؝	ό_@H�قm�E)��M��L�WG}�B���†�(20�P˹c�����;��
+c�$*�M��J�1y��%��1vԶ�w��j���R�z~G�	���S��|�Z���[�����bW����c�Dڔ��,�Qe�0�uF�ٿY���`
+=��S���{s�������vvo���)�)��k�q
Ěʛ*ε��N������x]��n�')�ƈ�u�-��z|W�iů+����w24�U��M��!0.��HB�u|~PC��5��0d���%Ǻ%.���.�z_֦���&�Å��t@ )�|/#Iž�eK���
�c��
+�V=��=�O���)�㔄��S�P�ĢÒx���dg��$?�b��'&�z�w
+=f���k	IS�)=Q���K5S�o��c������_��ӗx�T��$neg��]l�#�=��wM������č R�TS
?Te�дQ�X�!����I�G&��x=;�L}��B�)�������R���5r<��z�

�`�#���aeb7�~��V������^?sf:����g~���}�Y
���Op��I�e*P��
+�gī��)V��8�����'�?Vɉ�B��8D�dbWqoh��Y�7�T/UMF�
+�}~�cm�*U������8qq�����0���\������R�s�ݔ	I��U����H#8�#O� �w�V��0d
+w������[�̀90�g 9Pt~k����0
+v���gt��{eG̮[���*��㳮�-U�kcO2�E:`y��,��[TrYU�qpS
+/�=�����O������0v�����{kV�i��V~�~w�v�i��&稀�Q`FQǀ|��8���i��8�a��
+�E�&7�w��i���7���p~�|u��9UN������Z?V=����֪��빯����͏.��ˣ���҇:o�[���9��ۓ��ġ�$�l�����Ӎ}֖���M�J�nvH"�$
��!��d��^�!�c��t�F��#_ׯ̫��z�z����E2��Hϧh�d�&e�z&���y�X���鬕��iS��̢3�X#�����o6޵P�J[axj
Z.��e���.��א[#���[gN?���J�9dM�A��f���a�>��CMӘ��&��wr�m�^���5
�BњwQ�����酝Cqn��v
���m'��ۅ����A��:��I�~ �:���z���Y
+�=Z{�������;f箳��l��ܷ(��ҿ��`�F7���_)�7�U��R�|��ڎ�Ϲ�6�c�kO�����3�P����~z�d�v�����
+�/�kmJ] $����I�Z7�l!kg��������':�
J�#����Z|>��պ6g>f�m�Q��|��(�<c�d>�i��L���H�]��W�Ԏ�9h�g���t�%r�y[�=߹Vk#o��s������/��-�6ѥ��g���]gOl�aS�a�%F:]��~BԾ�'ٛ��ܢ3��8m�c��A�g��0���v��np�\�>�M@���,��vW�oer�]���u�o���u�k=�T>o>Vtn4hMk�@��7�g�4��2���������f�;���*me�ڤD%ʴ�k����ϔc��X�ڴ���E�D�9�k��z5�w��e�$���^4P�I��ͦTB'"]���b/ё��u=E�0D��dsa���M���)��g�f�~���mF|�knZ�K5� =�������au�f��9D"��92NaP�
+I�ϫG]�|A�z}���I�&&'z^L���H��1��F<�2��(TΘ{[=9��h�|A��U�mo&�z|�5S:��b�g�EY�ҥ0�8���qH�\~��8@�����;"��|0d���K`.T���v?X�
+��X|~Q�����V�v���!��gC����������׌#?#GIa��{�~��7�\�!o�ɔ�;�؝;>�O�J h��
��z�7�ɺUW|*n���7�rѨ���1�mYvc���lg�޸��z�m��l�K��g����f�1?[�7^PpB1�7^褛-�`�=�X/��r���jнe&|W�|��n�(�áѼ�)�S-��	I���V��D)O�Pw�!
+d9�iSKj����Rw�~*ぬ�ۿ�Z��{s����`�EJ�o5�T1�OB����V�>m�P�>�"m�*����`#��5-Ah���"DBA�����c�7�Xvy�v�����&k������7,��E�Eq��K��.ղfs����7�zM�n�ޛ�w�z�\7�_�ZRoN��g��
+���/~�M����-@��B����%
Da>�.R��N
+t;[�+��S�r8��9����s�]���m��A�ּ�S!(�����T}��B�;����&�_�oO�C��
H���g��+?����Y�XMF�WJ�׍�j/:����f*�;|k(��v�z\���V0^��
t+;�h����L���f�7�4�X��fM;b��~��V=>Wi+G+�ej��w��o�ӓ8i:�֥�����_i�o� .��[4^b�D=9%�'�.
+�|2g=t��	�5r_n��c���a/�l��n3~�����#+s?j0kL6c�ż�s?~+��}�{�y7s:�IΑ:�3���u4��Dl�C-�O�J(�S���s�m{�?�4-^މ.O�p#�4��Sp~(�(=�ώ!Ȯ�V�1���w��d���?kv�߉v�>�sY��~�e
F�k[�+�-i$�y�[k�-9�
+�� �⾊\ҷO�:HOY�[!]�$�CWB%�@�E�l�J,7��{�WCS�z����R���U�Z���cW��a�>7�>����]vD^�pN��@��?(0���w�oŘ5I�@9�~�i}�C�9����}�����6���Az���
+zy�;����(Ӳ-�
>�iF�����$,NT�ژ����p#Y�o�@�R5
+h
�M�M���L>A��e��o)]���HSV!ȕ�����0T�`�k |P�@#Y��b��� ���0JH[0l���ۓk�m'5�_
�v��ګ�k��C�Yb�TN8�Ȼ�a�O|��_ܸ����ߏf���Yo��=�tj�&P>���抡7](%�.*}{��Th�8۔�d٦(9��z�c�J�A��Tqo�i������G�(9?,ۿ��!��=��s_����g�(�k� �a]���;�&�ɡ�%F�UW9�i�]��bkI���9Q"�
+��z�L��Hdu=A
m� !�VO,U�X!�B�8i$�Q%�n�M�փ��5;_��7��^�i�E��A	8��L�sH��6�OB��
+�,C�gD��Q(�=O
QH�G����}����ۮ{��O�wŻ�jp=-�!�
+��#G����?��3~��;?:{�w�����oy?7a�a:`��ѻ���}_�P��scÕcO���9�1��ȇ0m$�x���qD�ۧ$鉃�?��r��l�w�����_ʲu�}�����W<�fB$�3?~�_�t.g�a�OP�l���Ɠ����_6ٞNtQ&��|"�_��]�l���_ѻc�l�pe�z�2��o�ON��
arg��Xm�[�r��(���Ťu�&���d�k?`��y�D��lO�5M�j$o� '-_���k�����r׎�n�{,�Pl�ϊ�Xe�1�wņ =�߻���������w��;��D�to��.��`>�aH9P6'r�s�g5(Ty)="�65����V��ǹ�h�3d���\�z��!��0�x���O
+9xp��s!݁����A���T����|Ѿ'o��3�(�O���O��nti�|�d�v�s]*�������l��c;[ߚ�.�qP������Y~���sϙg�Y.�	!����}����"����?�g�|=��o�1;�	��B�d����MS�0J�R���u
y )WXf��,�~��n��+��Kr��61ԋ��?ԋm��Q�(ٕIC�	���$��/�#jQ��ڳ�#τ/d]>��GO�rhϳ�D<�o'#�r�!qh�Y}\,M��[���.�sd]�l�0���g}R]�O�*ͪ�lRڟ��ɶ��P���T�Y�r�یH���.[
+T��r��H��c�]�V�P�$��e�8�^9ߺ����(���(!����Ž�_Y�=Mf��&_�_�J�4��	�݈APY�jdm6ì�f�D�8*��3�~3�#:���g���}���{�.��L��8��aAUm�k������bV�����q�,�)��A�Z��2pK��;��/��O<hZ�� h����r�N�"����K?fl����e���u����WH�{�`�]qv#M�6���ڙ���`=Z?�7^�$3�?j�9��T���\� �d��	�H��4'u��z����
xS�^#
+��e�i
+�D�}t��e���ݛv=���a5��L��&�@�^᧧$reٽ�~p��UFK��
+1�Z�XZ83l�3��
�
Ca9��BK0Y�C�{P���G��h
�lg>�޵wN��g��_�������M�\�Q�5s�oEeZ����㳃��]k�oy�W.���:^j*���(�#h=�c��.��ߵ��m}����2Di��rd!�F��)G�~4g��U�"�ẏX���\�5��
+!V��+U�9;o��(�1�`��|���ؐ�};�6U�k�\��R��J����
�����L�'�љR:��Q�M��qڞ�d�lF��ٞ���5�+��q�Kϧr���*���}��_�5Z[tڿ"S}��}��ؿp���,{קr���n���	��Ut�r?0��IZ�O�$�؜�k����y�lW뛱�)1H�LD�l��)����8���) IDATTi/�6�_�b�c<S4���gJ��J�m��}W"G�����X��eY�|�#�s�fҩzt�G�%��~ ̎�5�ݿ	��
+��ٚ���Bf�����D?~���}�X�o��M�,�#ǧL���_Z>Q��O�(�'S�������Uͭ��d�xq���&}�Q�9�c��%� N:��}�s�y�s�y�?�3��̟1����0����3��bY�/����)d�����c{G���@�Y+֢��2sV��rT��U1��i��J68����+�U��R�Y��u�D��=�
���'�zn��K�~��O}��,}��g�a͎�7���&�CN�#gL�[;��9}w9�$�"��\£u<��m��cW�l�0�P�1@a2�E����%���Ԇ~%�L�,[�Jde�.�q��&`�2bgZͥE��
����-&Go��3��ؿJ�H �z�"PR9�e�6M����Y���n&Ƌ��M�!�@+0R n��6�TAT-�5:O��$�z/���K���nAt��uE�l�蘏�x�:�ʏJJ���,\��QX
�B+
+�®`������i��0s�̀V`J�t����~�o����,m>Es7
�$4^S��J�
+9�>1P��4���'��Wِ�ܒ����j�|,����x���%Q$�Qv��f3U�$�`��p�-0B�T�с���t��B�����q�T��o�H���1ri2�9\
=��0"�u�����fx���N�c�]�.�F [ᕡ8Ȥu?9���G��QP�R��+	���Xb�%���2�G@�yP���Ӱ@m�����Tlp��I��˃;������}��ԟ	�
ov���v�53��Y��k��L���`f��sp,�0h�º5cW\���wN��5n��Яu�,K
�B�P7K�f��j�)	�b�
"�o8�����N�}fUߺ������n�!��e���|�Z�"����u�4�R�O/�:Ɏ4�����0=.�+�v->џ��X�2%����{��A+޷���\��a{�J�x޳^��=չ�e�����`�O���LΥ$�:��e��
+�T��9d���lw��B��f&��	�H�S�i��U�l��Ig&�ֶiT$�f
+�����%y&���g��gK�1��&r�2^��v?=v��/~v�T}R
���ݍ_��Dy]t�.?;6V�Ӯ�eNF�}�I�{�
6�s��m�Z�|~�����v6~��|�RŒ���}�OO7�g;�Iy�F�|j�s]7�� -?����P�^]|��.Zpڌ�FZ�r(�:l���T��
+��#���G��_���~��O��[�r�����n��z$�������@d�!I$�8�*��S��47����tZ`�E�Y����!GY$_eV]f�U0h����Vf�dk�vf/,g���~�\Rt3Oz�@G/�H���m=1FOاq0�@W��O�`��M����x�@	@?9G��$=6z�����a��]���~_�ɀމo���^rj�����_C>��;��!o3I���꩕ƊH��10�q	1��DK"gV`�(8T�����妚Z�v�����|�����k>�h�_�[��k�lC���Z��w�1�}P���OBΆ� ]D�4t�E�X@�e�A{xZ���'~�ɹ�X���7�s�ʅ�˭[�s�� ;��?�{��F7����v��Q~��j?9/Y��w���{u�y��q��.�{��`��_����̵g�{1Qq������ٽou�_p�G�y�m����a!���
+Ǿ;�.���H�~ؠ�\g�Z��s)�"o>�MO�$՚-��8[ �>9�c�-N��,YD��T �,�ږ,�ȰC�&�]zԍTb#���z�J�^T���j�@ �0-���;J�p
+����Cz�z���<�p���dy�j��~��MO*۷�ⷸƫ��K�T*��k[���>a9)E~N/�T��=
+���KpF�X#h>���}������j四o�իW�7|�h�M_��'n3��o���]�a�#כ}c�o�����{�dԍ�<�~e�;�q��-��=���c�o+�=W���x��~���up~������e�,��`n��}_���B�U�����j�`;�䭮u�i�"�!i�&eg8���?0��=�/v����o
����.�棵�׫��db����L����!�Z[�X뚏M�����&g+���G��YB�6��2����^!�m%r�P9�O����cUQ��X[:�&���$JԠI��-u.�6Yl:o�j����İY3H+��r|��x}�rFT�Y��b+�)#ςD9��-f*o�y��Ŧm�v|>%q�zU*�[���d3J�]�����֣�!$�/\5Y����Ӯ�_	�ƥlx�z��nvh7V�
��D.�K���ӭlT
c?%����@���g����H.k����τ�e���阏gb�btI�|<�+2X|���o� $%P���T���ޏj�2��{�_�>���#���OM��/�#�������ꦛnJӴ����λ�꫋��1�����A���f#=Bi�V ����59�����GMb��n�
+ʤ�/���B(�8@S������i�$r�x�èC*
=Q$�C�P�+N��ɇ/<��P;3�=��������d�8)�^��Y~��h?=�����i���y}O
w�j?���K���3R��1@"\�Ûȷ��Y�!#v��~|�\����Ny�
+zI�n�����`-co4	�Z3B<��Z�-Ψ����Y;�u��V�=NBU��ߩ�L
f�g�tY��A�T�����\�����B���C�p�(��Q��g�}xŻc�M�<��w���s�ݷ
+܂7�A$Ug�Wu'�p�R��,�
+���#jc���b��[&�C܄�!��)"F�
���go���0-�c��3��
&��X�U*����;?��S��,��"�@39�jߕ��d��Ķd��"9V˪�_��o��P(�y>+��b[��p��T������J�^\ROU鱱�M�氺L�6�.�ߖɑu��"����.YQ$�V!f���D���Z��eZj�f�ǚ;4K�ᰐ��h>���i=g�&gv�3����ĸ����~w��v��B�0�P\�d
8+��.�Oc�;�գ���q�7�)�FaBP)�QHI�j��F{'�6��L��
t�"
P
wќ������Ӌ��$3 b�.�K�&��Ve Id)�
�A(L~��r�>��J���{���cB
��_hu?fG�>b�]3�<��������2q��Tlp�����f�ю�w�W���Ivd"֚l/g��,Y���݌.P��w�lw��j��%c7@٣`��'�鱑ʍ�?�
/vX�@��3����v
�H��'���k�l�\||�u���"�!��&mP��l��F"ǵ6b9"�cњЅ��X�	�d�Ǻ�rݟ���]�`���ĉ3�<��\F MV�H�#�:��b�/6���l�bxyվ+�k9D�3]Pژ�ؠ�
+�$�4I*+����פ*7��ͧ29�i#��Y����|��N;~����T��U����{};�8�}6�*�w��i���C�z�b��C��?#���&����Iy���K)�-[�}���~���rȽ���_z
���Yk'[ǐ1����bp)+Y�Zs�Xi>��Y�5%�!=��.�ۄ�Y�(N��qI���-�4��=�bSeyZ���|��G�q��h�GF����Z"��Xť]ݴH����JN:��-U
�,�cM��M�]l$`�Ȼ}���Úx*A����8��#�psGQ��8}��N�����޶�|<���)}[�ڐ�&Xt��G�$O�grX�.��w�|p=9� )��Q;UeFH3[C�W�~N���T:QU�-��j���c�m�ڿr$w=�V�f���r�s�v\��o��^��8_��U!"�S0Z/ah%�Wq�[�����l�3j?�/�9�mU���4@(��)P,�ƒJ��[����©BD(��p*^"X*�;�4e��X�D�0�
����].|.��מ�|n�����v#q�-�-��]��S�*z�cy���m��C���r�7��|z4�K�M:0|\h�a���ҡ~�f�4OmFT��K�<J�T�����=��w
0Q��&�1j����Jd�@G"��ݡ��KN�앿0H�D�FuR����R��w["���t�v���,7,�m?;:S��u_'|�
G=4�ok�z�4/oL�[h�#�+c��R�&�2�G~���f,��G���Eo=����ߑ�=P	��g�P�ҒN��Ap���*H�P)�OBw�"��^BwɩR�ta�Q��I��z5�`,��@��L�4�R�������y���������7�ퟋ���������Y��\��3k����&)���!��ڿ�o�l[i���9�v�����o�Xf��_P�H����/Lv����g�c1Vq�,�ъ��}��ƾH�l�h��v�n�����)I"1.TUiˠu�x�����8I8�� �Ȯ,�4��`�ܼ�"��Hl�!�-I�Hm�e�T��1�jվ}o�N�&��<�k���?���f��gs��l�MtIk�5�l��4i�b{�.�bMɘ�d��n$�
�[m���䍗;�)Z�B�J�j=���#S�9&�6m�;fj$HO��+u1P����v|��_�-��r��0�q��R�b]7B٫tQi�Q�o����z��Z�9�$��x���)�}�����\p�k7�s̊+N9�]�v�^���<�\k����e�FV�,�}}l9
2�m
+����"('Bh+�gi�,��M�A2�y��A�AD��R��yM>j��!	
Pbz^g��ҽ�I�0Qثo#�0��H�%��<�+�s�3t:z�Lo�2tJd�
��
�~�B����`��Gq��6��p�J��T7|L�pP��L��˚�)����"�$X��R!�����#�2t(,
�@Vź�֯zd�Mz��Ir&qL�CF�Y�C)2�E��(Q.[�d_�|���4/�[�q�*��%�L�S�;��|����&ˊ
�*�΂N�@�����j�>����.J�BtQ=Z��ޡ����]$�P�}`����Y�un."7��n�Q�Q�5����T���R��]�z�3�}��۾T���z���u�i4?j���71��d�4�YlPJ[L������U��z|��fG�AsAk���rB3-+<��`���v��(���������{-?Bܺ�]����(���9�
vi�S}8���ǘ�G�%ZJ�azFCO���Dw��!zx���hS�"噦��c�SS��eަ$�ϥjĤS��l"���Y�����n�Eq�8Z�=����ۯmoZY:����pFaT��B䏆ΰp+�^d��@�G����J$K 3X9$]8��9�^	"�`�qn"��������C#˜�pu03�5�xɱ��3��\���)}i���z�ŏ�ɩI�9
m���kK�/f����<k(m�lg*R����-���%J���&oQ��h�mL��P����u��m6�]1b�n������B���/Z�i�,��
_�xl�f�YJ����L�9	���I���qh �0b�A}�͵���
+_��#'�s̩H0�$�k�ģ���b�qy��X��
�]��$r�5��|"�m��H�v��%�n�9U�-�r ��(R{�����D�uD�����[g�s�|A�e�Ӡ"+�\WŜ��/�4�M;��D.s�+�6��)�Q]숱A�D���
+��^O��~��Q��١�1�z#�J���������DR��x���d��?�G�_t=�\��<��3����:wW=ϱ��VK�
+�²D;zA�ƭ�#�m����\�/5E5�ң�B7eF	+3ݕ�I�AD���ZA{T���:��鎯��d� f��y�# �ԫA���>��29j����^͓�m�3GV��D���~���U5�7C{�\���3P������@P��&����&z��1f�u�p�l��~%���
�Az\7�s�؅5���<�5d�}��r4T��*9$E@��zͫ]C�Hѥʢ~]��Z��2�L���3�ҞKUO�
+���+�\��}�j�'
��W�X��h�*�������S׌�S͟[<A��@
̃J0{�O��DS�"@n
����6�Z�,�9	����^�h j
+"C�4��"lAi�\���7���T�X|@(����h��M�"L� $I�Ҟ�9��
��>�Y�zd6�,o��T-9�h�	Ű%Й6�J�z�S�ђ�Z+tE[�qb����V
+�Bo�&?�ayC?���>r&
m�->v
+����p:�MTl2��i�HOU��-��!zrW�08q}=�`�����
�_ݦ:Tu�B�%c�A��XY��s�yg{Fbknx2x�V����m#fU(�����Z(���ݐ1�
��bD�pǐ�!#����Q��p�H}�Z�pAd��`	QY
+n�20��G�h�]^a���\���|A�AB"��JV2���H�cAt��NH�'�T����q���a��ger<�Z��u?gsR�z�O����ɛ,6HN��#�)��Zl�`=Ԏ�h�]%�Z�^�>�$����φ�@�r���f"����寘lO�+T)Se�e�
6��#u���� &���m�Fr V�Mc�Ϥ�\2[O�I�cS��4#P��
+|�#V����V
���ȵJ;�6l��PB����'�g�L�h�S�M()!ʠ�X�P1'�"_țO���Yi��'��i'U�T�]6�c�R.����R�|��]��L�8�u�,��[��=�Ô�~zL�|d�i�Jm�����p��-�}��+�y�����v��eI����Ꟛ̇��F>�裯��׆0��]��

0���iS��,�V�-q"�恤��v[�+��5������g�p)�aD�ČtGh^dqS���
+[z�����*��@s�s�4�a`T��T�.,�
Y�������M�[JdM]?��\���$��Կ��s��D�s��,�z?9'���b��9�7�a��w
+s�Y��+$�R���*�a�!0[��^:����^YԿ��7��#{Xn�gI?IaĨ$�>��w0
+Ɖ�A(�L���l&c��}r�
+ʣV�t[�)�TyFb����\��e=�WMw����P��֍����gN�{�L��v�?����L�!���*D���C��t	��!0Yfr�ጀ���`�4QZ h��n���DAIX�>�{�Pđ�u�њ�o�a��U�r�v�wK�c��9�Q��.�wH���w��Ë5h�J��Z��K�4�ʚ6
mbHFH]�BgE:�CW2P���4I�W>
�/�pyp�����P�!�~���hnj���d�.  �*�n�g,2���a�Z~FC� �
��,��p"2:SС�)!RSNh�S��ѽ��X�&�3�OO�a�}�> �n��x�5d�=�J����� 0��p�Bt���&�i�����\��H��K�L�����JA@�V d!�6�(n��@	���
+��˗�
��s"�6�+v��4�x���������{����y��E��陏4��������k@R@2��ٷeb]�Չ/kv��,6�H�5�d��]�3(�[���Z��ܗ25�G�r̠S���g��0��h%o4�ɦ
+擁�%���	�b|V-��������`���j*��f�
J�E#F����Z����=�l^iSj+���@��A;B�=��]Y2IXK�q�ٴ��V����;r���t��az�RyB���T��v�	
+N����
@3�-��u�U�y��0��,��
]d�Zl:����L ��%��Ǝ
s!Q(R���	�[�n�oW�f�.u���e���VrF�xF��~sޗŢ��`="��v?gS)�L��w�5Q�Az�˧!��%�V��u�֝;wضm�֭[}�p���u�][�l��|饗��o�/
����˜ET({̩��*�D<>��|���,%:��|������ӵ�&]�t�
������c9��y�Vh� [�����j���
+i IDATª3B�UPm�h�r��A��B�3�':�t� ve�ln���|:�u/=>��#䭳���y�g��דU��7���{ɩ.YV��~�
h� �~�,c�S4��0�`��'X�2ы�=�����~��5�@:�~�B5�|M?Ɖ�K���a�k��(��ꖞpI�L�Uˑ���%
P�-��ʤ���I�1۞�U���w���\����+[W�n�9�5��mܽ�̇�����.���/L��w�ڈ�"�
+�`h��o`��]j���Nɐu�a N*��8d
+��E�r��A�B�y3�Y���^>$$L�#��]��?��Y�a��o��g4x&�q���b�mLU_���i��v��1��ĉ/T٦s�#��ѳ(�i�"�L+��Dw�I���H��w��DC��W�[$�R�'�ɓ�9��j�D�m2���S�g��j�����ַ��Y$+<���'R̋Y�<(�MYf��Y~^ts��Qϡ��ۙ��ZJ�T��s?[����ǎU�]1v���o<��}G��7_�z���Wg¨��=mt_4X�dM�s��~h�C�j �Ek��ѷ �������α"���	n@	��e���C�-dK�*	�P��Ӳ���K��T+_��
�>Pk_�����ߐ��y�V���HGk���T=���/�}�_`�=�\nO0R��F��D4��R797�#��r
K�r��J'=�a3S�J;��x׆�P����<�ί���c�h��d�&��-T��Lj���V��۴e��BsJ�P��.+�1�N�*Qn=[N �棭l��أ�d�p.D
;��Ӏ/��	Y]yg���U�M[ꊃB�1��B�܀��<���6��!Nb_T�v���H�XF�3h;�K���$�������
�!�,�dw<h����i���P�T.�[;��O�����G'�g�N,�ο��d�t>>N���c�k���I7̎)Yu�
Z3���^t��<���M�6]r�%�>��M�6=���(��G>r��'�_���n���?�~����u����cG�S ��F*ߑ�E��Q�e�C֎@�	e٬M����i�V�^n����Xh�)�"s�+���pT��B�E�������(_�RvG�V���l�F�)�Zz�0=��B�&)��3����QrYG��I�� ���N��������--���V�k��>��\�r���H
E?>Z�!"`j�Q��P[T�U>��	�
+�TUTQ�Vu+�P�n>�ĝÊo�~�����p4�3�_��s��}�3<�H�x�~�E 1.�p�&�9�WfX�"/;c��n��=�ŽȻ�ؿ�p�#�f-l�>���As{MfS����K�ш�l���dlF�ܛj'dj�mn�K�oI��1�"bRYQ�7��M���{ً�O$��<����C�so|�q���H��v�"X��Q4߀����Q��'����	�K(��ᴠ� �"F��Z�5/#�r$P	�Fg���!|L6�M��]L6�8Ν��v�w`Q�h, Ṕ�x�Ø�$�Y��2�w����@��g6zw.ξ���e��vژZ"�)L��ܷ��j�Y�Y�PS�8լ�\�*�LS�G�/�fopKL��n��rn	zz�!��}�A�A�!�������I���w�2U#���>�q����
���%��Am��Y#7XX⇞��\��)���l��4#�U����;��S�å���s�v��)�����2v�R�o�J�~��JW"y�B�����\�voi�z���HN�W1}�2(�)P�චb���9��.*�wA��5�lBNa-�!��Yh	-�'���/Z�yp��hH��YRQzY�6�}B2G3�dl�(�����oH��Z���K�M'ӷ�G�ߎ�-%�qqG�g�?7��M#�W��=����8��q�s�H��d�'Б{w"�Ѧ�lIС���z���L���i�B~�0��/ruE���L^��Dϔ�j�[��[�S�zچ��b���a�R�ς
+���к81Q�ǚ��R��t��C��$�LU�[Sayl�E�ی�2}��+��dz�0ժ��D^n!v^�P۰$�7��<g�
ő\��6t���(3��cنʗ�NLE��aj
۲��<�.%d�{8�����,'���	��s�0�����"����{�V�S%qZ�j����e�M}%}q�9��:5nK��$'�������u�~�4�w�GݿM5�cu><�m�&D�}��|]fn]�{j&b���U�vdE��ؘ���XK\:౞C�
+�K�c��fc]Z7�j��ڱ�g��c�L5�e�,�yZ=���~��Y5�ep�ػi��(�d��%`9zk�k	��މ}f�5�'�=Y&�<�]�j�*��
��{�
��!��"���L	;9"
+�����Mޞ�M�B�qNB����%�J�Z��VΑW\&^
��l��=}�I/�ۣ���tXB�q��?fYe��{ûB~~���q�%��]�O6����7vT���9���i����V�W���L�����PZ��a�}��	�s��3���Ǩy�^�C߻�S�:�CM!��.ar��ѽy�@��n�p8P
XMԖ!�[�p�Spy
+�a��;υ�%L���hx;��F�{��{��Jo�r�$��4Io��s�x�:eZ�nd�%	c�.?-h�ѭ�8��?���T�l+b�a�Z���p�m�ot3@�9�M��Z��O/�J�X���#ӷw��[�K�g3;���ڵ�% �
:O~��6��S{�B���+��,�˴%��G)�Ch�έ���a�o�8gd�����*�4~x{��'����k�T^�sͧ��ݷx=�E�:8
���Arjdt��?`,��q����^����)�1��B�p� ��;�����X���sw�`x�*��
�� ZF��
Q�ä����,��Eop�ai=��\i='ա8{�&�V8_M�
��Oy�w&�N��%���������y�=e��%�9�:�S)������4��2H��e��ܘ�w�?3-�-����7K�gj�����	&j�`�-N���g����H�?1�o�:���4����XY�+;�a$w��z��ـo�]w����������-t�Y��W<�L�9`�)'��<��@	:J4�@��%qjh����/��Nm+����d��[����Um�v�{璗�¿�	>�鹋ɛ�k��η��L]�֜��2-o��K�v��n1H�������^;��Q��ȝZ˦�Z󾨬OI�^ջ�0UF����M~���-i���?�zW\\_r�\a�����ʯ)ˍ�kŶ��W�>��k�VG��ۀ�$z �2mI�wi�2�#6
����в_���P�8%���8��r�$s�p���S���-Q��a��*�{��R 6��1P��T�|l�b{)$KeZ[��`7���oa�k�ʾ}�'K
+ci��G�|̮���X��V�:n��n��6��Fا�%8���U�i��1P���ȋ�laE?����3=mS���Gt��~�������f�,xGϥ+Ld��&�����F���%~�B8�B��#��z��,���R��1�
+~����6$�h�ه��m�[D�~T�@�ɳ�����v�w�őz�����
�>x9���:�.�ρ
+��,��(�]��(b*G� ֏�
1XG�
�0�Cx�2Ge�ULF7��X�@��/E)&����I�cZ��63ʴK�	�X�a�����jbe��J|]��]�����K��.�m1$P[r��
+�:
籍��-��fK
+�N���T��-�-�fS�#��]#`rhl��H�E�cﭑ�=�*�YX�T4
+�rDI��8c5���X���{s���e�S�{/e��B���
+a
�n�'By�D�&��#�@�
/���?�Γ�?�i)7Pj�{��@g��3�|��t��px�<��y�셑(����y��*@9�[��a�E2EPB�bf�O���^����O�� �Y@+�>�8������Z�K�g;��n$o�Vy@��vcJ�(F���_��9W�8��7�J0�~2U�#�X^o-W�\��9p�qi�Q���循�%�/�z���2�\/SR垚�2՚������*��,X�I
K��u��<Q�6#�H�j8�Oԁ�=*Kzq�[J|�$���&��X;-��l��@q2������ɹ���|o5�����jw����D�)#��b�ڳރ�n;l}*��GW�Wy�5�k��]�2-;���/ύ��Ħ�V��yN&�i%�‰jQƈj�w?2��f�
X�1�(cYaٜ�]��e����f���V����Ԏȹ�R�
�ta�!?5��G����머�ck.�8*n$���ߖ��~t����`��{��:�#�&3�H�4Y�i�51z��
+K�y4�$v��T�qi �"6�R%^}F��j���6Yt��T��kj��ڱUJ���j�0�=,m�����9�
���l0�:�9�xll�����,�7�=G_2��-db/���^�}�@o��<�\���� ϰ�"/qP�0��a�
����]�G|��l��/��’�Vh�X�`:�X��1k,`A��s�����i���4�`+IqC�}�Q��l-�`�@��-\��&(wP�r�`tB�+ ���yX����X{g.�9�ouh?��w�x�s+	�6�2�%=��@>��P1�	��|�+���a��@*X;�J�b�%\_j�4�Z�]�{��w����Վ�~��Sy�����y�?�l�wiSv�Yiڵ��+��l��>,�˪�C[�m��%����V)�jQ�'�L�H��'u����l�>���'
y�|�@� ��8��v�'�y��Y�4"�
��66�u�C�"�d�5��(S9��T�L�c�<�������$Y�~�s�
��䍕�?�
�y�C8
�*��Ft�'�E�,�C�u���y��`�6{�d/������?B4k��A�
j����H�:s!	��MP]��@���1��pC$#P�x���������?&�ި|����Z�o��)�|nK<�/��T��Q�1�)��P���֘����K��b��N�gA�$��N���2:�oO�g�?.�+��u��l@`����75��	2��'I������e���v��T]m�[�EG�2%��c��x
+���ݩ����P�bD�����Έ�RbҶ�Xh��C��ĺ���ܸ�MLyt���wο+S��)'��,1�CtaY�F�)7�'8�%j_$�L嵌L{�
J�����'23�K�X3�І�2��T	��
+�֜�
���NIڗ��O'����td�)�cU��'����2�����t�����?>3~�K
+J4����
+m9#*3�K��8J����҂��֝q����!?o�����H��6G�Up<7�-��=5[a�*5�dK��ΪO�#�6���Ǻ\e��{���U�l�S3tדּ���8�,��g�����<��7@Dө�;����
+��4O6�!��g�Ww�W�f��,0����n�5Ko������ɡԮeX�P����e�V�>"�d���6y�<�}h���C�wҷ0�^ߞ�+t�O��^
���<K�̳=k�tHf����l�S�GX����܎��:��U�!N���Ɩ
y���2�x_n����эF�(�p#�í��BNA(t
+ ܉tn�6���[H�E1.~�ʼnS�����_ϵuvT�|��2��(#Ys��j�σq�=P] ���!3xe��>�mB��B�;7�
+q�s��#�޼x!!�r��Yz�0~��z����{��F�֥i���L^�L=r�e��x�eo�������7�'S�\�R�6b=_��&zy�CiM����j�iPP[�|hOo㗝V�G�ճ�P�l�/�0�S��=�a�J�����ȍ�@9��%z+
&���M�j�0�s���;��]V���EF7����%�����!Ё�/�A�+sr��]�7�P��
+�E��L
+5�`2���x���P��hw�����P��.�0d�w �#X��8Z7`�>�~i2,��*ԑ@9�B��=�T��:��7�%S ϯ£y�L�׻�$E���B^�{_�ӟ�֭V>���ۅ��.�}��g������Yqg��EI����
�^Ҧ�I��]t�9ζ��-�b�g,�L��J�\/����7��<���y��=��?;.n�(j��/Ms{��N?�aչkX�EQ��M`B~*�K.[Ӷ�Y�v�uiJ`ޝ��U��	�
q,7��$��-�ㅙ�����+2�I`�9֗�8�q�|vhOp����{���n�)�$�3���=:�p#�x�vm��!-*���̺t5ѻS]l�y�0mN��t0��8�=e��F�u�׸$����o�0�\Pb��>M��	+�m��C;�d���Dl�h2g�m,�Em��D��=y0b�MY�2�,�d�G������;s$�����>�|����R��T7<�w؆2�M�[�l�m�J�W��D�P�5�Z��԰2�՜�=�{�e.��d:+qhalŧVYN�/M���.��v�� ��\MM��QUX1+Rk��j�t��U";���Mz�@ڷ����6��oN��&
$Zÿ4���G�c�(�x6�����h��m-Yx�|��d`6�-zm�<����m8���U�UV뙕2m�M�R��o'zw�y2Q�j�?0B(MSu�a�<׻"�_|����Z��?�Ts�Q������
+��Up*�%����@Ԑo _���J=��?�b���%����}5_b-���R��LFH{�)�-��2�]@��oXM��(C2��0�A�(հ~�@<�)����QJW�`S��q��F�Q��4�)N^��J.���I�
+F{��*�{aE�U���@�l�����ddSΕXJ@=���\6��HRa|E]J퐠ʈ��r����!�,k�SOj���o/�5��]�ް_i�NpL�`�n��؎Kd����#{�pН�]�2F%a�ie+���1�x��i��%h���Y�a~����h���{�Z�A�uP��#[ ���A]d ����E�$�����w��5��I���=��Ͽs&0<���
�?
&Pİ
+~���9�
�t
�!�
�VZ �‹�v��rm�����r�1�:���[����F�y�҉�'���"�����Go�4�z��q�A���N;�/j�,9wi�v��\]����)�R������(���,��k	тs3��
?�[�OpRh[��/�V'}�C3e}NT(�f$�٥�b��~I\�6r٥�:@�g܇9�Bq�b��8�#V�P�(���'j������G���woɝ��Š�jF����
�}�D�=����$N]��Z8!����!kYM����K��
5qҡSa�*S�EFt�[�2iYS��u��C��%Ya�N���'�Pˀ��x��U��	 Je��Qq�%4`���>�X/�E�����\:�M�Xw,�$�e,IM���u<6�����-w��}�{�~P0��{��KR?����4��l��Q�����CG���}:
Pg��6��b%jjy'���`	"[!S.�霒�	��4N]����&�[���Nb��'V15���K�A��yQD��쥛�I�����w���)8�ɻ�v������e�&J\�,096��N^�e9�5���lߜ��_��ƶ+��aa_guq�ĺ;��wd�[4D��/���޿Dޗ@�4�ǟԦ6�!E��3����0秬)
HƠ~	^��P��a�,!]�`&��":��

`&'n�W��>P�+���\r{?���򥳯/r0�������
�.��
dH�t������G����/��>�\4k��F����Y�b'O+�F����i��~�Q�/�,R�����C�Tz�owӟ���My$��+'j٧$�a�g��da��DG�n�h�{��KxD��>K@zf+�[ʪ��U��B�v+ KMr�}Ub/8h���j�ڃ�5[�|�,P�]�6�!v>��X�Sb���jA)<��/��m&�k��[��fQ\�j�d�`��( IDAT�Tq�,�&��b��
+��m�|-:_Et� X��ʻ�v?���Y�&�,���_
ѣ�VW~u��h��@�Pd��ᴄL�yi�q�c��"�*��A�)�!d��J;��l�&I�k,`8y��%��*�;�^���L�7��wF���lU���fV�߹`R�X|.WW�ŭ��
;L���5c���#.������)��9����͙>���~�_1��d���m
���������<��XCP�
��I��[���za"���}�;(�
�6����mzn�vme?R㝾ܗ�f���v$Ku}jhb�
z����@.r2n�5F4
<�)<�4��l'�)c�AqE?�O8��^�%���p��͑�]��zv�G�P6֟�j��RO�|:U�-,��Ui�@5���g���W���4h�/5�V~
,Y/��b_��[��������;W�oM��چ�b��tm�^�ֵe�8:P%cyn�K��������ng����������Ցw������Z�l�&.%�5���B�'ծ�G�mz�[a�e^fJ��ߢDNt�[�絝+L}j�
+���s��.R�-�&kՙc�J[�L�جAg����`�x@�jv̱6k��T"�]�2D9z�=_�W(�]{� �&�I��ԞvPͰ�cc���vN�1V"��k���%v�
K�F���m�0	��O�rf�Ո"�q\��'վ2�5�����8u�+������8J�4�?K�u�qX�����w��DIyᢺE'DІJ`r�ϡv9���,F���O#]
��oB��!ނ���Z.��ڰ8�P��O��a��js�(D- �>�A�D6
!��.yk@�$�i<~	�+���!Y�u��R�����`]F{����.��4}#����{�������K���8
+i�c� l���P���2��dK���T�!��n�
#a��̶8�#)椕���ׂT*�oa$��+���D\#�m�.�ϲhbc��nn�Ne��+�}��[q�CA#����#�˟�p
+����(�1�	* �T�oR���A��,�O��!>�
9F�B6U_�N~s�#�Z��tR)��_*�:Ǥ�,Fe܅5��E���>����,��c�Ǩ{U���%���'���X�X��]�X[��i��QB6'�/�˿Y��ײً��O�[g+��{�Pz{.�s�3�:�,��8��L������Ѐ�?�K�T>����B�J�e�f;g����dz	�>[!Č�����z�޳U���*���x����L��lS�H�FaJ�r��z� �٠[���1e������
�G���Pa 
+���&�qZ�F�?cQ���M�)Jӫ3F�&�S�}��ܻ������e3��6��v�w�O�u2]�
,� TÖʥ
+�4�3��i���G;�����,\R)�	Y^oSO���aE�g���``�'8G�1�[�J����\A��^����9͌�G|��FbM�{�XϘ�o�|U��W�_}?:�������������2_)���F≦{/'����RaK;K��n�dZ�Zٹ7V{�����-RSg$�@n��%���`ޙTij
�O���6�P66#c�jLTؔN@&�B�{-�9qk�ڑ1�M�;�/��.	R;mp۱�Y�AHvXk8B�0�F��'�����[�9���#�����ɢ��ԧr;��t��n������D�朐���҈9'IMTc巟M^:~4��(�z��x)��ǒ�5��'\�!/w�����`�
X�"����Qۏd�VC�Q�u�K�%�y�V�Gi
���(򒱁`��R]�z����V��7�S$����)އ�8�~&0^	�Bf0nO�݄�3y��w/�}��$�c���hG�'��
ڛ�����s�Ί;�M�8L~�a�v���*���qb>��O{Ɔ
q���H��Phm�汕�XA�keJO�!M�ёe�2�V��V�ך�E�H��c!�������d�J[�z�pl
N��Z��X7ѳ��k*Α~���s���
>A� 
+>�Gf����ѮA�H(��}d�0
� \!(��.�h�*��J��60<��y1�l�ګk�+�j�@o%?w��p�{G���a�z)甪	&���1��
+U�(h�R
a��ؠȡ�B����Uu<h
Y���d�s[��{����?�jo��%��z	g�����t6�_:�u�F������|R�2H�h!��)���?����
�L��b��A��yXۊԋ��	t'�C����qqs��Q[?3�H��o:4䷍�6VaC��
+B�L�/L-֕��
b
�xwUŪ�:��XeCJlj�~~�K׭�����)��s=�S�K�5}RBr>�K��R�Fk(���VkA��>l����W��ުC`�
$V䲠�~�+`S��!=��m����\�]v^Y;�3��;�'z���K=��)��kyaD]�D/��e�n���%���u������oHkZ�ʺ�Ki���r�������P�S�l�?Q;�����Ցo(]��_��D������&
+�.K%�;�w��ՕSC<J�l�7�����.M�cM*��k���l��D۠�7�
2$��ؘ��,�6e;�ldz��Ύ�����]��)����G]��.�W�LH�S;1P�L�3�����]���(x�u��E���p�����*=�b�@$����
+k-�d��wUy�=+h77�:
R"S]����胁��B^yi�6F���
����xr����`n���֠���F��(	��!X����P�
+��^
�
``�M85�����a��-ڴa�4�zvKE������i�G����0�mjG���0NG�x%�x�ȅ��A�^בֿ>�.N�W�׬�=�0���һq�Vώ�WW�OQ�i���ж�О/����G򡼆em u{�veN'چS�C�Xې3�–�����curȀ�H���&�خ���ydG@��
+9�j��E��5J��,�����3Ba)!������؄BG��D^>|R�F"_�;--��%�(�\�L��Vk>�rX�R�t����5d=P��yTA�a�-Pj#a%��9$[(RP2X���D�i�O
U��K�JN'iq;#ccf9;+2��Cf�Q
��h^�l
+�>��"9�_�pr�I�F���'���Ny��܃��~��3�l����}����e����%�K,|J�L^[�?/�A�O��:F��i���[C群���n'�������*H�@O�[-��"�-Lۡ�v�m��5�Xx����w�Tg�Fҹ�2y���I��ZM����62� ���g���l+ջ|v�[��1"#~��	�X/B��n�BZ�ÿ��l�3��MY
+��b�}` ��5�K���A��.�b-\B=w��!�z��c��z�2N4%&d	l	�m�a��R�?��_X�*�N�w��;�ӈ���lD��0�*
+D|0�e�jc]�J�*j�L�%Y����Q)4����7���1<��g��Y�Q��O��,��[��/
��V7{�{���yc�������7��:��������^�:���e��9����N�RH��Է{�.�\:n�DZ >�(ɕil{)t��X�3N����=JrAhO�\Sq�g���D���;s�ԗ<�V��E>�h񩱽4�I���W�Ȓ����}yl�,,G�!An�s��4�y
+��?�G{a���cv�c�g|�����=i�lK�k�H�7�~z�ӳ|67���DW(Ii�g�[�E���,�^��z�9�񓹺"�_5S����F�g���L^'�bV�R��Z�Doi2O��>d��-�	-@��m�
+��0`����]�ߎ��ṫU �
+�5T�c�Uߍ�߭��
+�.Ug���얲��H<ҝ���ec��)�I���������(M��y�c�ma�R_~q����4N2�.����!�n�??�).����n��B�N��T^��+�iyνM��x
#'C@�ʊT-�j[�88լ,�D�TXa���4���[>	�f���9/�R�4OOl�|sbOD=� G$�0��)\3k�yv0���l�+����N��4'�D���D�T�f-f��6�r�ݍ�&�W�����߁�Rp|V�އ�at��[A�
�(x5�O"[��b�'!����}� �A),������-z�z���N�O�Z\����R^����n�U�)�BQ,i�n��^�Qo&���o����ۺ�Bh�oNg��ӌiX��/]��_�ޕ�?���F烜�'�-���	�W6�̊p�∣�����'ruИg���ĸxA���0{m"3�!D�ܯ�l�ogd�H��v��l9����Mu�$?ۿS[?��I7��!i�%���/L�ﲭ�
+\��S��2mc�����PWGr�T׷�k�C�H<�՞<$H�I���0��F�|���w)T�k���W1��^і_�^Ƞ}��L���%˔X2=5YGVj|k�����+v�z�Z�t�����l"�j��
U93κ:t����"��SnneG6;��1�U��-,�h�Y�ǂlʊC���o��V�J��{���`�����m��
+��ڌ��Z�g�������3��?��ٗ����s�+ur>6�S\�Q,�t���?������7�z�C���p���s�a�L7ɇj^Y���.��|��>[�
�޵|y�;�Y쨋�uI*��ِ�B� 6)3�[�Z?V�bS
+I�.V2S�����8je6�q��yԙ�����zzC%
�:T��s:�e�n��s�N�b��B֤{�v�F�R��dUrUlφd{�Q��������l��TȪ4�l!HCY6|�0.�;rg�I�V�`*_�3��ߘ�?=,^��>?mm���z�[E^�歹�������Qc��D+LG�ae$|0���!hB��>�)�נ�r$�X
��ɓe��D	��0
+&Gڅ!���u����D�`�t�]�Q��N�[	�z��;�{w
F�w�1c+�<)eݘ�<��G�_UE�ͬ�O�f��k����iy�=��z�N���V���{J���T����n��ж�g8��-;l�Z'�+ږ7TTf�@p�Y�I��؀D��Gᄤ]�{;����|����4��9�U";Rl��+5�K������6l���g���`�W���
��l33M�N(J.Mq��<܌~/�_=S~�������,J�i�����UdSD
X��p�C>A�jX�V�P)(E>����
�#O��<0�����z~E��"��'���6��u-���;��q��<ii3밻�	���`�NF�J�+6z�����(��=�!��f��.M���
+6
+?F�t���w����a��Y�z��}�V�x��f�s�p�ٍ+U�jOQ�*m٥J���J&����I���!�l��J3W�"q:��u0`[�v��W��$��%���D���	�?�9,h�X/�9m��d�2�2W��!����T�8D{4K����RgKYi��%�g&���MAR��S&�QU\tHTfeeYfe�O"q��m��>1��5��Ŷ�`��4�TZߣ#mc��Y�8�:��U36��%6�H�#e$s� ֛uO0��,/3�@j|+���uiƉt�����[ϣ�����L�r�)���H��-R%M39S�����5�_H�m�>W������m=J�㱞�.}E~���G������w֑?����()"�Qq�Ǻc���ޫ��%�7�#�ޖ�KTjj3�gcy�4K-���4b5G��A�|5��ؔj�Y/7@r�#��(-�)1��T)1U������.�bblభ�E�IS�������d�u�������w�w�\U��((�b.!�B
+aY�p7�e�MH�Z��,��q�m��@#�$&a�b.����WÛ߻�ߜs�9g��Gttt�ȄZѲv�?�3#�GF��{��׊}�ż��SS�,��-�-{�EYpT`7��g}�}Z2Ⱥ����mq�O�1���"
g�>p�9H`I�2����bJ�\J��<g�戁���t���n���͟���(�ol�|��
+���/�c~0R
+l��p*%�~V��
t��� ���l	����B' �dB�i­ax�yD�09�\��1u~\��RQd��䘹Q����+}��Δ�Z�}�Xn��85���n緓�U�>�YV7js��7�7�_J�۔���<�U�	ʛ��4��Q�&���#k�5�)í�,��ߋ˗v��{m�ln6p�r06jѽ��v�UW�2�Sދy�)Vv̅
�#�#���3>�)�Л�i��&ڠ̘;�0A�����K���o�%fia/(8��bv�O�f�2K�f��B�1c�Γ5�����A�ԎP�J!jm�	��X�������P[
c���$�ǡ�#��l�;iZ�"��I���{���}J ����vW�3��gf�̭�q�)�;���,��;x5(��,zo�d�ˋ������˴9��|"M_\���(y���R����������
il/7'��ޗ�GP��J����Y�B�5)�m��;OWv��v�}i7��\Yn�4̵�]i���v47�?H�6��R}eiW���+K�*Hf!T�p[�d6�_7�M�$���̬XHWT%KE���������$/L��܆K�(>��(cԼ� Ќ�jɪ�"3�+�m�D7�jP����M�y"�*���TZv-Tj�$�n�Ѽ�n��ˆ�5k�_������yd�����o���v"k4�"���ü���PA��m1'H픫��
+v
+�	�9[���v4�ˠ�d�y��rl��9[.��ؖM�Ln�;��98�����K�k��?��7_�O�9��
I�R[�Pۮ��_����}�\�����VC������¶���D�����6g�Z�F�}ғ�v�7K�%��P�J۩8�2�"w�h\�5�^eJ�������;"�Lϥ*��j2�m-�vN��md�۲�m�s6<������8�zUD�	ö�J̃��YbT�!��+����{^�V/;���|_.Y�ۓ5Z.xz�כ����9!)E��5�n�pǺ�S;�C������MY]�:'+}�|<�޵v��/\���<�_��5J��ܳ�"-X�l7�՘��ր-�F؇p`
+4�W�%�i���.H�~�ET	��xA���]���Y�I�A�˃�6��-]T�tIJ �;����Tkz��Y�F)f�h�BY]g�2��G����o$�ۘ���̚��
+�?��w����;���$eS��~�0G�̸x�b�����t��*1�����հ�(aȭ�W�.�[�me��Y�'YÀ�<.xdQ�����ٜ�+{��>S�k�&�X@jX�pz�n�8��aa��4�Mi
Gޫ���H��Ā`*n5��ڑ�Jl�u��L��Z�mJ^���F�^��� O��`���d��(�p��'�/���	�
�)m���t�ick�ïZ[��jlZ�llP,�fn��K*.�Ϸ����w�%Ÿ�Wtk�V�3ƬX;g��:�����v�cV���ȫ�K}\�q�����q��f���o���v�[g7z�\�A�v���/�^P�e"M0DU;��K�犙�b�W�{������xM�+1��_�wO���t�S���Y)9츏0��T�5�'ֳ[C�sރ��Nq��8�,�R��U%{I2����g��� ��+�����:5Qzb:��겪�	D"���"�ɑa��^jeK%��	��U�e�A�V���)�J69�>�-̼J���(��9��n��#[��Q"MMG�ͬꪽ����
j� ���-�ҝ���yE{�{�!�λ�Q2y����7��Aݘ��A՗mI������%y�r��M�\���7����7_"-
l|��ʻ�M"�'��Zu����m=UT�K���{�X��3��f~��;��������>���G�eE��=`�6�N�"
+䥨�RP�pN�J�_�^8P�������G
�f�!O�Ӟs��˥�}�����.�TT���Q�/����깔K����9�VEC~|�nmIgh��J��>٤�3>H]{J�ER��C IDAT'�4��|,3tH�.B���ȡ��Z��C��,����H��@T��t�	}1��:C�MoXv#G�7��7�ޕ�w
+�V怫����J)�
e��T��a����<_nv�E!��M�P_��"�:T���t�|w�5��Fc
���Y�N��.f���`*�1f�������Kߩ��1㜇-:��1���MO�nX[w��|�]�l�-y��Y�y��fl?p�V�&ϯ������r.��S���YT�s�9��\�m
��K%���K��̴:�t.H�����_�x��j_�j���N�\�dƕ�u�s偔�{�FtX�� iXO�bG��M$|�T���ݱ�YTW�W�4�@4�@����*��e�z�ٷP��7��Vz�>�����s_������ڍ�8i������寗����3�F���;�C:P
�A�"�������A��bt
+��	�Gۘ����}��rq��mj�|>oP
\�NK�
u65�O��7u��E坮،��nl/��Wr�4��?���J_���j�ݞ���їj��z>�^�_�����w>�P=�� �_
�$��47;�ǣ���;�k�\�#�<�����><*^ʭqux�{Hs;�k%�f1�\ak۹X,����瓷7D�ˡ�t��b�9�U�-��=��[%Ej���v�N��:m��,K�u�p�8�V�D�aG&�+7�.
�-$��|a�����OwN�r�BѝW~ddCVc#�T�Wɾ���N��ˇ;��Id�r�ۆCE��/�KU����<
+�qf��U�ٱ�sț$f���%��au��>�k!9�YM��/�S�[��8�nWkX
rHxB�I���3�Ku��֯˽�X���b�Y��sRr�Qs��㩕��Eq�!�������e(�CA�喬Jv+&.�'��:U'���U���<����f~���;ߏ�����[�=��V�P)3�Չ����:����RRiY�g/j�Ze��
+}�KEf_�XȖ�햌�ʥ���z�z
��~�9U��|nQ�-�5y�T�u��!�9D�)z��)�/��h�DÞ���F�_�p�^���x��霸&ĚFl�Jx���Q�A݌G
+���Jɩ�f��8}U5d�RbX-ʶCIӻ{Z� �ǏO*�m.{6g���0d����+i��4�Ak��EQ��DEU]��o��"ׇ���&�;��B�L��t�l��Q�uT)l	�	��m"��|���E���j�b��E8
��[���2����	�
����y�i�9-Iꈳ��=�/�M_Q��̬�Ս��������5�F{�OVf��n���8��Y�.�Aaۀ��o
D(�؏�,�Q�0�Z�gR�߯�m[�rò��9�[��=������2�FD;���VI�†"��K���.K�����	
+�"�������i�a�hd��P���aC���>uz���ܨ`�=�ɪwƕ[�m<�~8PgW;o�����{i��<?�y�t=x�}�:���b/�r4�3X
S��aK����
�-�X�ۀ�0:�|���zP.���mݛ}p�����<�W����O��@c���`��]c�f?��Iy+��K�C������?ԓEq���$)Uj������_��n�٭�bR��p���]��9)P$����8r�pm;~_a���x]��.�
+@�
��Ǝ�`j�Q
˛�?4�R�le�<u�S���S�]���-�%z�.
+�aߙ��w��Ief�3�英��)n�m����,gvQ�O���ֺj�Y�Rʽ}sq�}���"Yڞ+��7�pC�;�{���eZ��O��SY�#����$J�Y�=]+�l4��El���m�Ҭ��V [�e�eUs�O�|�y�&g^C���Egf�y�bb���,��r��d��e

�֓��%��v	�LP�u��#}�JD[zR��ਧ"���X�QQ�ZO��K���S���kɊ��3ʭ�Yے	h&�����������o<��bd]=�T7�b�s�9"�.�v��s=�ti�n�y6�AC5�r������w���-��Q��:3�n�}�L�{r����]��x庾�an�Aj�Q0xYu�C3�|A��~�c	Ւ^ėj8�b@m��yI\ߢ��ċZٵ�4h�C��o�fC4'vǣV@�5�]M���V��b�2��=]ST�"��ܬx��l��F�De��_�?�>�/]Z��Euc#���:%(����;�X�Ӿ����k�w�Qk#��ջ :R��{�$PF���l���ԑ�L�:��f����D>C؃ `<�]��
��J^r���|iaV&vQ-���.>W=�Ɔ��V9�Y�������o�yz��M�)����{�ۄG����(���/�'�#s���ό�����,Y������%�ܠ:H(��풴�3,�8�ݪH
��s�bQ��-rY�9g���8⑘�ј���g����%��}~Ts9�g.{�͉+|�E�c��c�Zp"���w��A5��M�STքw�K4��=P���:Qqm'�Q�ґ�$�F�/U�J�y�s�U��Q�5�zY@93!�����K�#c��l��f;�G��E�?�C��	L頵6�G��0��l���k
)���?��d�Y��o�b��Ď99֭�rΰݪ|��|�I�}�9��&G��0��<N�e�v�~�����4}���3����be�.�*ˡ+�;������|��T�b�W�'�	m{Dե�3�a���j�DT��YucS��,V�ꆨ|I\]_%��ͨ���<��H�R"�T0ȧN(�,���L����R@]���%55f)��*�K��Ҫ�PMиZ�˃��U�QHM���̴��a��̟��M�+�h��/
+E!���@���ˎJ	
+1�qΚ���G�OXp좛L�Ⲽ�B~��85r��,%�yP]Y�Nnz��枽��5���D�O��!�Z�܊+IB�!���:p��C��5�v	�2�+��kewh�-?WL�v�N=���o���:
uK�u����/o���~OLx����;�	�Pd��0xNm+����~��o����ʵ�~�w��i��޷��˚�T��Ƭx]�����(7+�m(*��qu�+�$Ņ98�+��>5���,;�S���٫��Sڶ�z)Yξ���B���ܚT�s����[.6�m��>\X50��r)��p)ᴥ�,$���m�g�^�v�u�!�Ǽi��i�p�b�AkU�L>��Z/l76ͩ�1LSt";[sˑ��X���N�5�Uع�:�k|q٭���V����~K���|���"���F�4�/��,zO��᲼i��c�!�:t�*C�!Oԡ+8>�6�]t� ���3~�>�:�������`��;�:O����鏕,,xϜ���K�	(���n!%E�T�:jȍ����b�.������AIinCuaR�h9�$%�>�}��O��]?�L���cSk�qb�����65+�40�
��s��u&�+ 9�T9��R�〺{�h
�[��>�ҧ�1?�0|,O�Q��K/�P3(<�����%G�To����{�~uxտ���>|���'�]J�6���>����7���t#�M�A3Pe����}y�$^
kR�X��	�̨
+�MT��� �t��
+F�YE:B4��L6
`4zk^���0����=1��m��/
+8S~jM�yNy�E��欺%1��گ��R}E�u{b��V���è�SP!���?g?��i���}9�^:�J��I_� ������\�[yukil'���2s��<��{�wM�Z f��UW�TL��l�]%f�>$�
n��w$I;"��T��g}�t9R֜���m����꺊Ë��Q���zKm�zi>������� 	N,HPʩOAK�D66u�y��V.W���3��9gzmK�-��	�uF�m0��γ��W�7�\�T�p�=�QH�����皵F�����eɠ��̚g8�Yض�i��&�i�
@
�ئ�e�LD�=�⎙�;��SSO��9r�w�[�yX�dN�K
�j�^�~�?����ږ43�!���l��3�6Fzi�=�[��j�Lbi���S0�_O�g���n�G?�w\�_O��7�\[�}�r0��"Ȫ���1W�Z�%�5��+���딈]�i9U�-��P�>dX
`��@�>�?�ɳ��*�~ny!�ҲC9�U��/��,V�G��-��u}`_�M5l�EI�#I�W"}F�@�C~j�n�Y�j�1�Z��]�ڲq(\7�hm���6�,.�tCN�U����4DsX�ւ��J3�Pg���l9Iχ��
>-(+�1�-!��t�~��<��o��������3�[?�!�p�"D{_�)��
ᇨ
+8.:G��`4�1+���,"m�^l�M�Z��`
��W�(r娳l��⍡�ww�ĥ��nuD��(���7��S�iWlj�7d���yb����wj�s�ŋ<�냚�P=:���c��v)�ꃹ�'f���v��E�V7�����5�%��.ٛ��V���`K�=�c�4�b�e�Z�-�:����ʝ�G���g��F��������!����_b�1�ѱ��C,�'�C���;��a�:M1ߕ�ؖ5�dfQ
��Ş��v|�ۓ�U��O�O���Ne�mQ��V���w�R���T�}Tn]��E�Vw�.�e�|�	t	��YA2�T�m�ȐO`p
D�5q��'��`�nB���,㴸��}��vk�f<��U5Zm�	�����%ͽ��)��Nq�'�SS��^i���Iy�N�2PO�꿲�/7�������^�߷��rV�q;{ͼ�R'�����ml?�n��ꢻ�Bu�R�I���%f�b�Ѭ:�tN�LnH������6T�����W�����m��nW"�W�V�<ڑ�
�,-�S�ʬ��d�^���rA��2�4t _D�%�@�<�f&��"��ż$����vv�`l�>02q��u�D�)@�u��J�c�Mԅ�7�E~)�x���ͅ�MN���/��Cfő3��8h��c�z*?US;�H�x�뒝��Hw��D�k�\���^t����4���DM��*�ov"�}ٔtSo*�!u��h �/J�=s����_�Ǐl��e�vſ�'1���f�#;��\Ŗ�زK��<�Y�m,���0�_��k^�N�CD��[��VWW� x��^w�…����k��?��t/�qI�|�:���N@f���
��:O�uŰ�<��?.(K��J���=륖�9GD
��X�V'|1�b<����gJ}�7��ݪ�*w�霟s��{�-J�{ա�M�tjPD�g�#�y"r�:�sD�Ƃf�s>/n����P����|�K7T��l�>9��܆��s-�o��v���F!5s.�3Qu�J�E5���b��<����֒����B�(��S��O��p�a��{�7ۭO�:�r�8�h�Zk\`$q����h���9�
�3�����S� �$L�b��! 
��B�w��������4��/7���NtgN̻Tϸ�����=m��g�m���=?�+��zO��EM�Rsء��q���
���Ur�P��4{5��P���\O�
��^~g�^iA��`p�|A��u��0�!7�Ib�٦��6k��Zt���
:T�ѡ�0���2��������NWհ`���jƧS[t�?
+�Rі�-�Y�}V����V���%_�,���mw���{u�O����}yq��<�(�F��p���<�5(KH	�E����`���E�"�B�p4���P�0y�"����(�R������9�ȝ����Y��BS��t�����'�g��9��,VL��
v���w(
�fgP��&?���������r��V�ϖv���LR���64�Yq����U�bS��_��v����{b�|%6R�˯��6�g�
+
K�@�:<��ꋨbdj2����ް��/<EV�H2֖9��$����Ě�2p����j�dљd�~��.��=_NR��"b���fzqR�Ԓ�0EՕ����y�K-9�KRH�!7�]	8���l�6���u����p�������_���/m���|T�ϋ�
z���ӑ���j�����JIJ3
�6��Ou�e��lҁ�qp)(8۶���ld����U���.�������
+Pl���3�G�/��X>t���[��K"�b�xq,,Sd��BB�B0�
�̥��Yy���{�G��w����$I^�����/�?m�>�����/�¯�گ�{����7���_���Ŭx�a?��¬
+��=s��9�!Eef%��:P'C�^)Ʃ>\w&ͭ���8kn{�^�Yi%f��NiYV�刉�s٬�'k�i��#���26�i�d�3/ۋ�9��@P@afZm�ԎG&�ɢj	�Z7'���0��
+�BCs�1?P�A�2�IlvX]UX�e�즑q%ua�����i����OϪ�2}��v�C��ᨺ�9�}�r{c����;�9&hR>n�A��^5��b���(^������h�u-/���
+N����1��P� $��`�������KX?uWk
E��>��1k��������o�yO�6�ˉ��٭C�n�;]��G����D@&�T��"�n����7G���V�}вSئf�DQ�K��[z�9LL�%�Ay���-1ȡ��[O�(�k���lGV�T��l��mi��gv/�͘��澈�{����ۣ�1�;��B���6ϖ2lWL�qA��n�T��c؄7č�f/���JR�,\�q����:���F�*�n��4����4�G��4�{Q���讼x�ӷ7�߬J4:��3�t
7�.M/@6AU@��*�+skp<(���W����5��������kʹg���O
+8�.u���7Rӭ��YBz�Lm�R~Ki�qMd�m\�nI�!��M�b��Dk:���VO�+*\1(lx>;�r!��~u(T�H�=Q�ն�P�n�ݱ�/ͪ��H�����f~�ei�jjG��ˠK�S����d�6�+]��f��vq(�%ۋU��t�{fh�Ceb�܆�ETS�i�+��q��
Y0cPu$Y�(�y���n詁`�b5.,DC(��9g`��TZp�c.�U2��@d
��
+�'H�h�����
+/���ű������V�����+S;vI��
ArӜ�\  �Ү8��n-������hIgj7]�91o�X
8���7=��z�dSp�'��$��:Ix}��̏���'C��
E�Y�X7dR1��\��-������PHW$(��j￝:���~��?|뭷������^��r�-��~�?�A������_��W�U��9������qW�*�=.^-�*lSQ�/����L󷕦������R_1._��Z�=�AT]�v�U�Æ��j-E�y�(�/l;��v���Y^ݰW�t��Fa�G�jOs�c��T�(�J"t�<xs�W�*&
4�(��=�iPt�A	
��"Ǭ�ق<62;D���
+���~�� ��h]��s69'��qi{��������7,�����KP�,Γ���ڇj��	���#�{��F�AI��\�B��D��: �SqtT��Z/�.����ʑ'��W �
3آ���E�����KX���^c�hdJ7amSʙ�~Q�_���m�foϫ�����f������:�{��E�K"𷯕?�e�޽����5�͟^���s6"�,���T��f���[�H�4��59�6e�t�+��
��޹�y��ل�<�޸e�8��-YN�p͑�i��h�~uU�����4���v�ڜ�g�CK��F|�<�.�S	��XmЕK��1�J�lHk��S��
�.ҋ#�j�U͕G
�ݝA���El�$*Iyɍ��c[u�{��\l��o5�?��j�F�O9��}��b��9�FH������/��q�k��?Dò�f6�B�`�u����Mq����v�oTb�L��k������$4xb�\4.�?Vhvy��Sa6O�����7KLZpQk�pl�U��6��)�P�妗�0�-���t���ơ��IJSڰ����EnG��q-5��&����KY�U�����I�ڡ������94�)@�+b IDATD(��mO�(8�x�k!��{6���+�!*�����9�@��c��3���ͮ\�l�W����	�.��$%G��zj�-�u�Ҭf����.�hJߧ�d�;b�0K�=s��NK�R.8kԑg>��__����C��d����R |���%�e����\�����hl�g�t�-��"<5��u���T�Vjԩ����3M:��ƼcQ,��$Ė}�MWe<h�.�}{��lE�ٙGA��A���
udf��Xp�"�X��Q�
�	&����pJ��k�^��������?��d?�(����;�|���r�W>�����I@HL��k�W	��>�m�v��z_	�fݽw'�Y_�i�Ϊ���;}�P&��hT]�>��c����m50�Equ�B�G����̝�~���}�;qu��|>���T���F���)uS�M�ӥk7�#��B��h�s6	�=���nd�j�� �m��;rQ™�TS�4ץ-:*H�i9�>������p�/mg�k�u�Gg������3��u�/�ꩅ�iu��͡n��U��%ʥ�'㗅
X�%����~p���Y�G�~����t�,�t@B����h@2�(S0`��.Z��T����3���,�e*˛����?�hkr�.g������ԟ����J�`�'�8v�|q���ly�~�%d�n�lO�46Yb�%�)ub�9�3
�g��Crj2���ur%ə��jNQdg��
+.��݌5Wī<�َ`�~��r󬹧/�^ƣ'�o
�����tx�~y��Q� ��m�l��5��|�>?2�Zt�������ڊ'9����"7�G��0�����ڇ4׮_�)�ѭ���$5s��7uj��Q�Aks�,oQ���βz
��,o��0���V����h�YYެXn���0�@�󖛮�[U7�Zi�q�5�
+���n�94���'��j�}�<Ky�"�ѭm�q?�?O���]��KW�{қ��&���۠��ظ�媅j�XB
+؎h1h3�n��T�[5�Sm�����J�B
+2�D����幞�|[�2�r_׷�+}�-�V=1U_�"�(�9�K�(�Ts�UGwAYp�D�Y�ң9��鲡�uܳ��]��jɩ��XSW�]5l�Ś({�1��{�gXϫ,��-�M��]I
�9&�zl�`�0��V�M]�h�u=��g{bnb����K�`����#�S'�qSfm��$!����4�j2�wU�l�$��)������j1g���!��qO\���-.�o�������ܭ��Y�7���\U�Ԣ#3>�U�#��.]�s2�{=�.牢Z@��>u���M�xH��#�EM���G���%
�����.�w�)$3U�;���ֿ��Ƙ~��e������_5�_x�+O�f�B��g��90|AP�m/3+�鏖\6�����O8b2~T��q�-�xR��Rq�X����ݕ���#�Mc�}�޶��_��4u�t^y�uC����/��H�|j����$Joɱ�����ٚ#r�q�hQ H
�Ϗ(�u��6�ћ��1�\w�<Ky����-lƃPT5<��&�yU�����(�.d��ܜ��>�����?�G��ܯ[x��T��1+G�&T��_�� �F���n��>L"%�		�a4���FA���
+~
�=60Xǥ'��A[^���k`��6�6t�x[!OP髤�g&���j�g����z!����KV��K蜇)�������7���m�B�{�&��j���)����]�G6w� �YG�z�v\ Z��=�L�vf7��W*�3�T;|��2LO��|���)�߷�o�g�+b>gQl�.ݬ(pЬ�B}�~;Ʃ�Gu\i��m��+�{���
�/i�
K���ZP�ƼxYS���f�#g�	���{r/C
���4ԩq��s�'�n?�Tw�ُ���k�#(��kF����5f%��9��>��_.�j���=�ៅ-
0�]A��GRA
+�Q��P����ey�x�J=E�uZ��ܩe?��*�Uׇ[�YvŬ����]��|H�s�gw�K�f���7��]��w��!�"��1?�|�R 1�H�)�����P���޸�~[B�g/.�R(hdȧl�݉�+9w�
+;*�;ĖUdŒ���}2C����;ڂb����Y�Y�%I�D�bbT�|h�ۘ����kz�.������7�?2e(��JL��̃S�����$-�Ԫ��v�@��%�:�͊�~%rj�9&vu6�#94�y�]칧$��J��[��K4��=~4e��@f�K�����W)��ȟ�W�lLO��8�$-l@�	?+ ��P��ԍm��`�b;��ٵ'}�_�n�I
`�\��92�&|.�)�+��3C���BZ��1�7Dߠ2�\�'��mґ��
+�K.�3�۠C��h�\�i��d�M�v��*���������~�����MNNr�'$$D !�@	�"�W�
+Q�BoD�D�!�B-En)"=�����$'9''9}����w���Z����uo
��W�g�?������1�Ϝ2tq=���t�Y�3������A����1�H��Hͯ��]��K�Nj�Sη	�&��T�
+
+��+=���&�%�AI�=޷��K
��'|��H�c���dW4���
��{c�C��Y�d���$a�d�#-Sm���.�#ӆ�A:�S9�Mb��%�=�Y����Լ��&��O)$y1n!��xɀ�wƌ1Q�ƀ/Ea��N�X��U���y���d�KfQ*WlEjwՈ�.
+n��V+x�m��~ַ�ۋ�Ǵ.�j�w?�e��}|0��ɿLb�����@1��7�9Lm{F�`�=�+"W��h5�+�XiZ.T��fAH4�
h�"��r0����|�Q͹8�ʱN�ݍ�·���oP���
����;�w��4ą����q"a��峂�Gs<�f�Q��(�eQ�����x�FZ���0G�1�e��
+�.��$���9��7<�\̎O�Cy�c�B�:T�2%ܜ�P��-�idC\h�U���]�wiʀ��W�g�ŝ
+#�js�GW����эl� B�T��*0��$W3(��1�قyQ�7T3QzU7�m�-�y�8W��v���K�k�_���L-$�����CKǵB��$�U[�/�6��$j�	��D��Ҡ�,�,���w?�����g����wK��r5g+��f:��Y�ZN���|��}�����Stv��5��1��p/�u�Pq�q��[1"9�7��
7ˢ��e1Y�v���M�����Ų�O��W鬵h�#�S�$
+b]�0%�bI���n���F1k/a�
+w�����!�u�hK-�ܯ�bYN�f�t2�=5���ї_L�	8���v�bj�YI�(֮��$M͘0��R3�����O�s.�0Er�QS�K�:�<UZ�?eL�p�[��xy̰S�v��â(��5'*3�P�e�! \2"�F��聍JƜ���{�qˈ;FWo5�b��1�7�K��n3��i*f��
#l����p��w�JM�+���c�*M}n�n1`y�*��v�T�O��U@�C9T�)?�e���TCތ����J@O�y�#��vK_�
(����)�f�|�0R}���7�Z�J)����i4�������G.�c��t�:
����$j~#���|#/�8��f/oE��ȋ�T����zx�t�����Av��o<�f�l�sEs�y֖ˎq�A�q���l0H)�j$��wme�U�i3)ў��
�eCq�	PȪ�[���ܓ��>/�gK�<�XZ�.��2Q�P�W��Cev(?R�������r芖�$R�3��j�w*�0�L�3]T\���l��|�u�Q��V������z�cR�4�^�$�{��K�?Y�n$1q�5��x�~B 41�@�R��L���P�E�m���O�Z����h���A� ��Is����_��3��9�͒���p<�=n]諂
oE9�>��O������m�0������ҧ
�
}���Eh�/E���c�^�AԬ#�܋�i�M>qp:{ĥbO1�e:P��W�����a\���]>Z�[8sw�y�-��M}$�K^4�Xl��Uܚp+E/��
�r���b�����W��@�]�2�&���Ȓ:f�؈w$�ʢ�V�y�CU�ո�9���f��=1�~)�v).���mt�Ƞr��R�6^�ʶ��#�y$��D8��r����,�د��BkQ47
+_o;j|��n�4F�������'35��Z�^9��~�v0�^r�F�l1��O��.�Ϧ�'��qq(���h�n⼀{���
+��CS��I�� �F��]Hѷ(��g/g'����C^S/�dK%Q�Q�٬��l�N�%g#�$=�t��)�e	���!��C^��3Ț�N�L)+������R��ê-X�Pg]]���z�U�偊�m��Iݦ�
y1.ؤ�&��R
+����P�Pm����Qa�Z�Es���p��R��Q��_XK�i���vhl�]���l�"��
+М<p>=����82�b Ar���
8	�]����R�cF����E~LN��IØ3f&�RvрkS����r�N+��Bi�
�Z̞/��:g#7)n��%�ʧ��lI"�~��@��(�h��O.�/L˃M}�@5:<)9	��M�#��F���_L��hj�qU�]IV�l��eejm��+B����WL�H
�Ñ?زm�ꫯ~衇^�\[[;{��7��O��O�H�6S����q~���ҹ��Ul�.�g+|5����J��N��|[�U��L;�=S�J�R+|{�����L{��z���
(v=�l�f��M��i0ž-�Mdo�~!�V�${�#r#��P�e99���hW�c�<0�H2W�V���72�R�#�x�%h���vco����Ίّ�-��x-����Z*
+5�X�el�j[�<gGs�1�l��t���̳�.����r��%���,y��d�4��T��Wt:o�M~I[��w�<@�tߙ&hl�خ�WF����$
��<�@��I�)�U�ӟ�x��_K�k��e�<o�z��5�R]���:����Zzs�yM�v�o7�X��*�^¡��l�t1�e���ј7���s���Eڹ����2���1T;|l{Q�Y���8��o�ξ�՗/g�%�s�u�m�
�|���q+��]�"#y`����bv�3��W'h����ϧ�|b���B)A0#nn�9*�ia�퐃��y*u���zdɖ#�U�k)���qD�5�ԣ{]�g>�t�[J�w�����|����eM�+���~����`�w�3�a|����s�i�GsY6�UͶIbt��qz�4`���_���F��my�2_��h�Av�� �T{�t�Jژ��ʫp��ǚ�D��p"�M��*>2-�|8{����
��|ަR�	π��]���ee��3T���	SU��J�$Y]0�b�����f���Y�Q�Y׌��0?�AO�t�vIT ��ki�R��������͔�	��B0���]�娜b�
+�����W�])����%Z���Q������f™C~U�4�@�X�,j�K9�EF����zQs��������o�K)S��sK6�->6�j�4P�qquȪh4�O�\M
+z��p��x�p2N*tp�G�����<�N3y�x4I@E����$/g��|�K
uɦ�MU�aQ��O�����Z�j��ʢr���-м�5�憺l�g���و{�Uۘy�Z2HW�eSD����4�m]egL-E6�P�U������^t?�l�n�{�̙3g�|�����A.��,�q������J�w��ݮ�~��B�S�������/�u�4(�8��Y��ɵv��d=�1���w]�LJM���V��z�3c΃��g\,;�����9�5[�
i��Z��Qz����,�Q��T�`.&�6f�
+���.v�I��V�E͆'�-5d�ʆ�w��k5��R͗��l��X�ƤCe�j�w<S�ܰ���x4^��2@��'ᘔ���
Y��f&maN�\��s�1�u��d?��o,��Wĺ���z,�4��E[.i.gj;�e������A�6���z�9��1�~D��0�I������Qہ�9n3�aY��B��2`���0��b�lg]��Q��uE�1�D�B��6�7�'F����c�<�ZW�#�lT���>N?�v����$w�?��T�v���z�J=>�����&?�ѼI�u	G���M'��p�D��|�H;�,*fL�bw̃-~���N��GXW<
+p$blz4�����B{7�U��m��6�
��b}��ט����W�C�K␀�y���L��*a�vN`��LJ��,��"5��s�5O��z��}|��CJ
+�}��.ӸP��7���R��Ͱ+�OI��(��B��F�Y�����Z��KӃJ�WǾE�O�J���X��7H�
+�/Ϲ�ů�\[�yΔKJφjZ�����&Li�q!�nUly�%
�D�
+�):
��,恄S��bތ���m��-5����H
�:T�����1#FG�2�.���E9�$DO�#P�Wl*����.��t������&�YT��&���U��&�Ƃ݉u1��!����b��{)[�f������l
ɵ�!�D�A`�.Ur"��u_�B�:?���F��-�|�FEC7�rQT=r9g��UIAY��ڔ��сI������q��r�(�(	د��e���޻y��>��������[(�)�7��}\�Pa�Mu�,f=��̡b(x��X]���{��7eʠ<���\�4)�!Q[�x�B�@Φ��TC��ڼ��B�������O�
�4�;}�^S�L
+8���1���
+c�f�
H�D���������W}�����g������o|������u�]�~�g���o�Ї>������o~�j@J�����*;�����!��#J��T�+s���-�F��O������a�����٢��������J���5�'2]լ��b�
+���7i�+�����?�ȋ��Q��3.I���+�6	<�H�;.+.��i�߲�E��	I|"np���Ns�_
+oi����U��TMy��+��!I�/`5�ie�x�U���3o#��Lk�-_�-�a��b촓Cc�7��%�8eWW��8ƙ����Z��J�<�fǐ[Qz��>]����0�fO�V��멚&F��p<$�-[[���Ao, ��4B�����ks��\���F��pW��5���Q|O��&/5�R/~�i��>�OZ���jL!�X(��3e�cs�GXĐ�.��p'A�h��>�@@�4����⸸r�n�ŀWcnX�M����ct]��ب�ҿ��#
~xM� R�b���0��Kb����6���M)�����'À`�T�#Eǀ?#^=��'hq�����M�t����>mQ�,v�o+a�9&g��~�=	�J)����R�8=��[b�3.�!):J���.�z�5�2��񜐍z��E����[��u��=V��^�U`+��Y��~fײ�)�KJrɱ�S�6
+�h��(~Y��`�e־!/w�_��sR4��V�^��#�P����jN�Җ�5�dN�d]�j�w��4�!��h�F���}.f3�#�5�A�F
+P��H1L1���Ys�zQ̆�y� ���Ҙ�5��T�'
8�jiE]s𠥗�b�B��'+b@���!G�����;EZPH5tI̵�e,���\�A(pQL��"�۔�d���Hme[ً��M~2cq�R�U1!I��%"A���6�Cn�A&<��g�M�f䮖ڈYgȚ�n�͘UM��X�ԆF�`�� ��]xA}dM�;o�1nY�{}!G���E:�	��lI�]��Pq��.��-x��ꦾ���~Vf �A&������R���:A,�ǻzi�[9f�-e�&l�b�H$h�t��3أ��M;�Y(���q���6���pP5�)"ӞA�I:a@�T66��up�Z����].9��[#��d����)u2.��)��w��/�������X�'��}9�Ƣc���=��a�ۓ˖\	ҫ#]��q����;�[-��O��?��d9�D����V�����,5�Z�.�p IDAT5o�]��Ռ�k,^�儛���U�.�i�:�C�
�y4�P�!Lx `TĶ
}�DaF�N�
��9E& 4�Mf�z��:�Ȇ#�R=������PWǝ�w�ǒl�%�%�
)��m��s���ᛦ*?̠Q�F!:JM9����z���Ze���&�qr�e>%��
+_��1��i���&6����~��fl�qP�uE�^0z�������)�Z�˧��&j{#�7���a�M��
o	
;�t��^��M��I�?̀���r�-�T��uK��)Zt����t�B����2]��Gv�^Ⱦd�X���
+#K�
s����03�|��#;�g-*n�|Z��se�a�?[ŭe�(�4�C;4��'-Ժ8:G?���Hn��4�����SWݚ,�Ԡ"�)�t�/N~z��H'������'�S.o��>���V��;{��+��}�����/ej�m=2��e��[����w1�J��iv>j��泮wl0�a���0xg������l�D3�������-�,�%��׏���0��r��۞�p�s��������P���vm���EE�%����ʠ��Q�j�x�ag\�6��1�ݡJ��������kr��e�����TcS�A��+�$F�3`18�C%�ܾް(�p�R)�Ȃ�!.�ʦ���D���@Bnn7�[�ΐ*�5Y]�.��=Y_K���O���|� e���$��������҈[.�y¿�}m^޵��fQ%��$H@n�x�;�����x��7��y�b���CU�T���d<侀0L�����>�C����F�(��e�73�5�T�+���o�X���ب@EZ�*�a�@�A͡҈�y�fp�/h���7S��+UҜ�bl����h b�BW�D~K��h� ����/�@U,����특gS)争ܘ���&C%ܯ��f���Ŝ���*�@E�����_������~��7��|�_�3�G�^�����U�/��;
����+9�������n�<���, 2�C�"�=�H]c͖K���<�m\��%7���m��':�5����-��-� Vsy��H���Fj��,\���vGh��K6!�C*otʸ P4I�tFd���#e�",�Jđ+�)b
a#��)D'�>����Uu�*+mݝ4Q4�W��Hռ���9'�4�av�!�v��� ʮT\��+c��蝵���h��;��C"����[��ғ�q�P�
+��?~Ʊ���.���0��<���$�Pٜ�l�m���/;���Ap����y��a��Q��8�%J�$�Ԋ�{���D�1��s��b%�!�[�m���t�n��
+t���<�IM��\�H�]��/– g�����!_�h֦Z�k����6�+�C
�r�.��4�����`�qr�3��>�K
�N�6��vv��6z[G�g_�l�a�DѤ���0��3E��c5�ݦ�1qc�-�|�h���c�=�)oL�5k)�����lg�mW���KK�c�ڞ7�G��y���6.�����G�?��o
�w�	�KRt����{=�KY���2�ۡ�q�;�E�8eȕ��_��G�hLR&����L��~9�~.�^�3����H�4)�;ǭ�3I�(j)��-*F��(Ј]�o�;)�6�	��I�jm>�)������#.M�pΤr��U�56�
~��o��qM쏸�PD�F���1�Âc�Pi��
?F'/&��;��(������6��b4hC�3(�r��&�E1���4UjRN#���
ohNC��拻�.U|*�Q��E�?V{z�&��8��	Z&B���T��Bkﭥ���ٯ��o���ǶM��r�[����^�̔�?�ec���	�>�ژ�G%�*���cl8���8\-	T��[�	�f�'L
+a������%��j�b�,*x��"��<�&<���S��!�.U\QT�IrNX�P�A��K1��X���(o�g��@�����)��P
�*b.�.@S���
+D4i-j�6	��b#媆�}��µ����;�����\�?Wi6��)I�0�Y46bU!�������ռ�^������FCn�j[�<Qq�Vt�8���g$����%���i�����c5oR$�z�B��$���'�K%E��
9f6�rA�D��b3�2�e_$�h��mb���MJc�EiNN�H�*�Ȫʩ
uN����fM�RDy1��#m�1�+�꼱?f9i4�tV�2��͑.H�:�R���u�`�?\�)(c���P��OZb%�~���M��Z���<U�}�V�����P��f���������fU��l� 
+�I�1~�4�d�K$�5izб��/�p����4��w�T��W[^�~r�#)��c�Y[^ڌn�NV�+`d�V��@om�c�ď�h�hO�+	�):k��m�)�.f$�>����fL��8@$tE�ݺ>�q����*	A��*Ю�����,:�W����HW�`
W2�*Z!���6z�Ks	:-~2O{���%��⨁|�[���E5�J9��aG�F�f^�p%l	cZܠ/����' '
�h-�*�ߴEgo��.�,25ݎo�/�ۊ�������\k��o�W�
f�(ќ4��ks��3� z-@B4��E����J����Q�?�����[i?P������#�o��b��K4:�~�(��ɸO���#�������\��J�7I����8��F����5��Yq/Az���;+tC���g
+tE���>S���ccM��%����0jraZܲ����o&ܛ6�&�.r�C҂�Q-����P�%�1�{�͎^��8)��f��F%� &S�#nGL���k��Y
{�7��'BnGز(s���9�r��U誆~�j�Lʅ�qc^^�G���O�hDz:�"�^����Y�<�׿�ϰ�����B�`V^;&熼j�;!n�/]�_p1���r�6��s�0�ϗ[��q_��4ߜpp���	�ۍû�]�
�rv4�G	ˆ��2�\\�N������ľ�؛��`������O3��rv4��!����$P�m��D� ��'B%��ys��W�`�~�v�m�Iy�@�
+ڦ�I��r,���F��WK�l�#�B�ڴ�{����l���r��w��L�B��
�x,��z�_�_]0V,�����H?�m+�*��q^�(Sn
�Ce���z���c=į��+��ߎ��,�4Hn�e�es�-��� �;�UK44�$��yډ���c���S6��� ���=U�+s�OY$�@���%� Ӂ�:z�,�{\�xd�_�=��SD��â�%q�"��

��剞�̑K���9I*c�f?���f��� �'������觤���
ڳ��zϥI!��u��i��Z��!���e��$W���G��J�yC��2�z:�o
�'1��+�m>���qzX��e<?�����N=>�
O$��4`�reo�Uj�c#n3�6?�L��S��3�Ƞ�
�B%B݀��o���?�����iq�~��q�qU\��g=��hnȫ%�9�
��&��Pha�����/*}rؑ�;��Ks)w��!��	R‹���o�P���L�nym����u��!�ޣ���􎢘��5�*E�[Q���,Xi��@�zX������mGZYa��b�8og	Zs^���.��Ԕc>��T+|��p�������i�����]�h�&\����;�jo]�y��s��<�[��s֣�]S���AŅXm�;��j�˾y�_�[#U#�����E�P�GX�0��_����h��Z�
�!������Ɵ��):.��P����b�P�-*$<�H��4F�yՀ�a$aX�l���	0H,�#ڙq��!kS���]y�����*-}ɧ	
c�+%���O��H,F&`&�Oʽk�x�f�Ĭ
c��
���7��#�⺺>���n�����|ҥ�ͭ��_i����1&�;j�SN����_V��������OU��:�G?���������g*t`�
��y�&��M�?���I�gJ\��ˋ���F	;�f��i�s6j�r׉��o�	�vC-��Y�VI̅<x�"vYd6բG�[��v񊐣�FZ�񆾔�iW���9������5�{C#�!��irZ�b�1�C�D���U�
+��@�D��O9��$?�Ƽ���mNș����|�����y�h+9l�8c�?&��µ����w��������k�tm3�͕���~��0�o+|�#A�X�E뛕����'�Ơ���!���i�$E��N�8����Go�W�r��η��َ�=���%Kl���k�χj:gW�'�\�8̪1�_���0��YɼTu��l��׎�/B_@ª������1h+�����z�&�5R��n�d��Q��$'�T��F�����-��P5�Pm�H��P[%�\�bЏ�қJ��~ǔ�6����G*�_���0��F����ߌ��+]M�����*�Y�3�o4C��
�f�F?�e��ß��,e=���ΗћF��l�h)�۫��7�Z���q6�v�Y�<�dl���B<�뀡B�5�w

+pI!�ia��-T�8��e"��9Z��7Mӽm})FW���y��|ʦ�{���bFV�c���m]?3AwU�Yz�?P���;���/W��Ҭ����V�`�"0��qzy�]�Ʀ�G�t���*�K��ߎ��SW��/�F�u0'5�”�m�匝���a�l��Ԕ!B_6%�c�/4�����v�{��״÷�Fo�9�Wz��~2�%��qr�F��u�h��u���25'�0Jn˻���j%���*]
�W�����.@�R45������9�1�l+��q=�4(�(^��-�Z�9�*t���n?���y�H�����c����31oM�O��s�1�m�q���y]�K����dm�GڣZ�n���`�u�2)����\I�e�m���1:�P~ʘb�@7�ԅ����5T���^��ժ��7��.k�����Ò쒘��mQ�Hۺ�������q�җ"n���2Һ>�� �(?��KE1?/_U�
�M�+#N�|����VC^
x8�����c��i �꥙���ҳ���1�j�3	@������κXx4}�>�!_���!E�:�~�f:|��ϻ�K�M�5F�vu���"�G:L1d�;]~��/+�	�j�5�2���CCn��Z��MvGm8�edk�l�R�=�"��M}dUm�񔃀�b��\w�  ��D����$����4�V�F��D�}���S�	@͋���@���������z�5Σ�l��=�q�2�ș�+�W:���d��{���+Η����S9�+��F�n�6�GH�����5l�Kku�k�qN���������5;�l~�>?��쫼�3Oy֓4K[��ßMT�>��f�w�62]����֔}4�ENA���ʔ#���B�Q���$L_Զ�s1j3��G�#��4����R�a�@3IJ�i�"a�h�y�� �����j N�s�G�G�f�p���0���}t�n<��IzM�k�ık
�S���(~��_���Y�<s�a�2Q �z7zk�'�.֊?���8�)���� �����܇��jK�G�u&�L��U2/NɃ��Qȧڈ7j��>.0t����O;,�b�˸��;�
��m�w���Cc6+t������;bp
{�}
�Dȫe��F� O�y���/Mѫ�bGg2%�.���Wz�-��K�'9������>N�؊��P����S����R��]�%���.��l����I�G�q:��b�Y����ejS�P4_�u���R�q^s.g>#)"Ү��W���k�G�֓ar� ���}��%J���� h�<>L�K�\��S�c�e߽����%��F����0��v��x�����E��ɛ�i@@��a�ݮ^�3]�J��u}a����y4���
�M.�m���Rt�t���2]=F�x}�����Ƥ8�֝<�n���5��6y�E�._�ɝ���gOI��P]���
���֤�>��b�2-*��	�.�	�"�bJ!k��
+q's��
�2⍮^��6�#���7L4�2$������K��D;��}Y}��'	����&�mw�*!�t���V�u~HC	�q�����Х��������o�si4��6�Z���kd��y�O�.���o������WX/d��2��=��iāKU	ۣ@y���
~�@=��`P��6F��c
�6�{zu�k
>:�jʣ���[V���Fb�`�m�����f�=#��H�t��9F�²��c���	IdiOK���D���Tdx4n�- bzI=�W�Zt�zx�P�r"\��]�w(���C�_�_�Z��/����g��/�c�V�ly)Q�U�#Rl�7G���&��/��b�㮬t�~�%jo�+�������ZO.��\��t
�X�HuQP�r���g=���k���綂�40E3�v�ƥ �9��qc����T.f��{�lp�C6��"�v�\QFKi�$����O��M��qˣj]+Ҟ��m�-�{�w�V�~��|�f�E#4(^Nȥ�'�M�@{s��D��Q���>H��1˼�T/�u*����=�q�����n�+��9[��;|_�v����\
+�k��>ߔ�9A�k>ng��&�z�9�M�8�9o�[�[�
+�Uj���5���74�+W�龪}d-��$2(�d�B��k����C��-���%`�4��g}� �A����y:���إ�*���Z����>N�w�u}Yf�xg�u���y{Sm$�z49४8���Y��i� ���B�F�����
/N�]��)��8Qġk
:�f���5��r�HW)j�?]�
�o������ъ����k�:3��248'tʆ$
��"�#��i�#s�y*QS�MS�\��D�+]��	�h.���qz�=���e����W0��\;��	�����[��b+��2�(��F�.I���A4a�l�$t��$!��*�1�L��C��M}��Gjt�!_��<�ɢ@7]���a-Ey��k��ϗr4��j�	��6?W��Kb@�iO/W�v�DOw4���l*��xKurT�9�du�$�<��E�jă{\y�F������D��������C�_�ӼB�q�H#��tE�OJ8e����v�����2���mu}��T�&�����̈�|A}�J7J�15�f��{�	�e�b�_�i��YU%:����O�=���D��}�	&�		
+Ol���+,�@K��>���}��Q��4�I	$ٓ]d7nܸ�������{�9������������kι�B!E_c��Q�"w�<X��9�
M��O{t@³Q�yS
+^��W��K���u:��_-�耟m�[�ܾ�v�&!��a`�lS�pj��h
l�,����Yu��
�/�!�Y����0
+�F�PM�e�}~���k,I��41���V���
+Xm~�IW���A"`i��.U���aΡ
4T$(��&�MY��;�����`~���k��S����o��&z�WOU���b��'G�F�`�z��0z#@�:k`Ijk�k2S[���ZO8���Kc�L��LO�Qr>�,�އJ�iI����&�H?z�@Zu?�E�L����h�ƕ���ٙr*d�id��r�JD��N��?�AM�T����m
;�B���� e��!�R�_x�zE�s����P��Qh�����N�"Iy��J�g����'�f{{���QåT4�)D���-Ůk=R����6�+�^p�����з���_����fm�D�j�ǖ\+8���?�����?�~�pA�j`=E�H���%��Y��7TT?"V����iHϢأjC\�P� .�Q�&4�Y��߯h�StǸ��{��@Ld�Fa� ��X�ɋ���?�`]33���Q5�.A�4}N�e�N�_ԟI9	���_����e#>�R��4F1��I�1!n�P1H:x�I/9I������C;|�*�`�E::�j�M����Z���/��[.�����{��!5��l

�F9rKAd��^驳�i��
�7��A�]ӏ_��y��^|Q[:tR IDATTr?	p�����,����n�zIݢ��0y����4�禖�z���-�����Ԉ�#��i�'s&"S�Y���1

���-��.?��������1����2]V��	���hU��ǀedM���x�C��4(�J�gTi��a]�*�w�r���9dͪ�}��3�6%���a���&ei�{b	iQ`G�9�7��x�lC�zT_O�U�t|ɚ虵I9s�)N2L���b��D��q`*t$ǐ@/��J�������G�.�K�9(~ԣ��x�x]�
�j!�#n1�Ku�ȡZ�m���K!6�����R
K4��G��Q��f��4W	r��Z4�K8�6���t��6�f
Y��T�
�Y��T›�K#^u��$�VWJ8	����J!oW��?\jz�p�R��ͧ<���Z�N	�*:n�*86U|*m�}
c�>/��kJz41+O���Ԏ8����4�e&������RE�/��}<;߳=��,
t�7��Ϻ��{���v���
�n��9f?�{�����Se���\O�ݿS4l��P�	�&�g�I��8?����qve��t/y���t���DZP҉��|η��[��VrT�Rh��Z�M=a!)9���n�Q�+�k�ފOi&�ǧ
+����Dӧ��X:E������	3N{�b��b=���l�LX'�����c=�M-1���
�+�R�����Xp>�3��az+�{��'?���L���f6ή�zj7��$;��#��@�\����]ZO9�C���Faz{#x����B?�~I�������7ʗJr�XR���Tew-3Hҭ����9���!_r0���|�^��:��hL����_MgB����?h��(���Y���jʥ
�1��*Ig�����	In�-������,�V#�`�fJܹϏ���S�;��/���F|i��M�Uo���Iz����:��Hb�Z(Z��鰄3�.�z�2i�U
+2
�JKQ��=�JI
��#%���)۽��@-����[�z��\�	>7UW-kvk��J%��\�1l%vK�G�菲��v����=�Y��bS���Lg\,��h�ߕ��#z2�giOv#�1�@[u�c���_�7����P�/��OӀpR�r���5������&�T���[�迬�ZUz��ܾE��T�l�Ʋ�4�D��!�a��ь�	�)�j��Y�>1�FZ�.VĤ_�RF���f�����$*�l��E���tK"��Y�V�i6aV䍹'����&Eo���m���Wd#\y#�^	����?�c�����������;�񾠮^t��Y��-���6�Kxg�+�3��.�!�%��}Q�S��k���cV
��t0�>،yc���K5�'�|)Fk���ٲ��7��TNyhS�BK�7��e::�1�9�o�v������G5�)y��˂T�\C�-�D�/m��g֤qP[�\	���]s�KU��2�N��٤V�7�Ե!��[��|d���x[/�T}:Y�f�N�%����bpO��XW���g���Z?X���Q�R3yxr�7|o;|[�~���	�S˩����r���_������(_r��'/�i�^��K��l*�nk��F�J�S�F�H,�)Ek�ޡ9P�S�p�S3ydr�7�ϭ�m�z��]���Q>_���������鹡��@��"=0f�}���Ȍrs�����lJҚ�F~ѥ�,�"���F�&m�#�ڥ�&��n��N漰�1
+�瘝H/d�o��J��-���^��i���
�<�p%u��J[lk��kS){	�G�e����G
����6Uͅ�L6�?��ǂ:3Ȯ*X����?��[SS�MIQV������d.f���{����s6�~إ
����*����p��
��&�Y�%IjhZUF���-S�
��s.5jbrl����u4��>Mk�%9
1��W��E
��x�٬�*E����YSM��n��=@o,ҜF���r0���v����c,��t@�o���M��9&��5F�>+��׫sj���T"Ò3�yh�W�j=?ȏ���=�h����cI~XP2���aX��t�:��I~�(
����+����վz.և#=3����gg��fL5��R����X�m�C�b�U��M�h���'[�)IJy@Ƭas'�V���&#��e��݇�;f%E7C3f��/M˅���
��!Ma^��)�Ѹ��:E7��d�/<NȺSN޶��}���%���o�fd�&a�&2��l�%�;c����O�o`�	
���@���T�d�X�i�q���0G�RM�1�-~���/x�]�
+��G;����2�%�1����P��-V�Ώ~����X7��Е%:���"��O�T3��?v���1�Z��$ݖ!���
+A�� a�֠+�̧��E����T���Ac��e:	��2r�$|��J�F�IP��
+�H�?�ڼx���s�!���7���g&��1�q�AW{䏹�nELx���
+X,�)E"c-@�DK�JX]~bRܞp?�	u��A.�TOy�TM�����5DsK�cp�g�.@;Y�#e�� 7[��wȵ�y�w�>��\���eW��y����z4�K�����-�_����M!5ս�'��4���t�/��|��e��[��M�|g�;�_��\�xw�ß[��u?��s��L��o)�_�*�L`�;̮eW9�R�����I~"1����z����b��&קz�A9Cc
硚����J�I��T
D����f;��u�*"�O�+�����GU:�Q]#SD�
+��ێ�j*�r \Gv�&��b��h����z�+Ek9�/�&/�9���_�.v�W�rM�ݲ�7�zΑ�hk.�ݿ�\��;Fٵ���r3Aȣ�jG=������b��J��U�^�^�Vv�7���:���Ĩ�^��gB��<��v�MT����.��>f�T���
y{�<\��ʼ�	g�|�m�e
yK@:(j�!�[�O�51�3���Zz��Z(hN�r�
F�@��� �T��㧜U��2g,XC\��j0A7ؗ�_҈.����6j�9�|��xcZ�b��V��}�����
+�:E����j��g
+Aߴ7�{���+[��$Q��@�KNw�j���nv��|���v��^vP��Fn� �I�g����8?��w�Xsq�]�q%������V���lQsQ�P �F?��;��&��n�[���glњ
+���|m7=�N^Ts��˗���N
t11E��-�l��!���Hs񆀳�_��M]�Z���8���ob�4�
�vN�	�(_�9�I��
�tSI:��S����2M�rW��tr�
D<0Fs�0�@�25V_�$�a>aQTRmA��xJC�d�D�P�aș���\�c�����tELk$}^�)aE�Jxh�{�q��Pp��q��3.Ul4bl�<�P���)�-Tkt�����0���]�K�9F)z;�k#�y�FW��7v�Ӈ�g�fwȫ) \��0��
��҉
���/�TpB^׈s�5ƚ�6�����/`3LY��K
Fά3mT7�-s�m�F�60�@�|����ya��mS����(�T{z9�d���M�m��<
y�.�#ޭѱ���B
@���vK�r$	w
�0<��.�O&lrV�lѡ��w��ٲD����f�'�kj�gZ��I�
c
+�:�h���/���l7��T�?�����̧fZs��$����For�J���k=��������O��-��u������8�b:�}��ӓ�?m A}G��"*��F|m�C6��};�M�<c�v�2g7g���l*����.�&�R����
�4咷m�P+��TSbN�Z1��E���D�YT+ ��t'yq w	:�S�.�����'��
+�?�ߗ���,h૧7��`}+�N�����\/�*�O��7��v�w�3����J�X��KogW(�e��v/�~�AA�3��3��
+���0�^�ϥ�y�d��l�T��
�6?�%
�ȫ\�<�8"�&��h��O�T���FV5
+T3@Y�-xM��`U��%
��Q���P3	�O�?�3Oh��IV�[�X����O9P��<���!����C~v�n���ṱSⷛ�	���+tuE��h[�D���	@m��A�
+����5�
5�vr�0?`�V]4
�V��]�;tȤ�{rw����	�k��v��\�#=+)83����g34�q~01��\"�4lG�.�_.���D�u�~�]�M�U�[�O[b�$Ͳ����х�n�������f�!��G�Eu*�]����B��|��N�eF�P���]>��/p6z(�x?�~��?���Q�T��"�0�u� �"��8dxzk���g�l�
�r�f흆���^ʲc�
+��aM��
0����5�ҵ��:yi5|qM�Y=���e�Y��<n]f�$�F™�W�h�Q�fs�����[�r��AѦˆφ�7)�(�	I����\��A7
ܠ������M
	קC
Nҍ�b���
�+>�l�'�b"�-��񺋉*�:(~� Cޫ�CY��	q[�NVp��r�n�P
+q�.g�+<j�A���k�P���xOQ�`�<4�t�LG
�'|��3
+�/(��1�r�%�Y��m��j�Wl*.�z���3���l^���StK���*2H1���9{ץ��B�n`h�����DK���
+�l�O
��4N�;g�8/[+�ߦ�g��^a�L���0�E�&�$���E�i�3��5W\u��C}���C���8yE+|�o=3����d���1�n�2[t\��Z��%���E��d�V�O���ůf�)J-���f���(�\Tb (�7e�h�^��d�]�(�D/4SΣ%�+����䲢�ɪ�2�c��@�qE>i�j=3����Tj��e1?��;1ZU1��e-��1w
+�-"���g��5��qD���e�خ���������RF�5u�/���W����z���%w2�Sv�؉_�r9Ώ��/�"��'W��u�e@�f^P�Nniz�N̂�����D��U�a��⤕i�;9�:;66�
+-���'h���"qP+��	y#f���?jC^WTȑd2�/�p�b��7*��hlԾY+�FG���T��50����HV���ۀ�g2��ddҒĎ9O<9斢@��2p���1N�o���]��S�AM@U�Y�^ל
�6³
W����>oN�۞5���PĹ�������ىYX��\�OT4d����DƱ��3��Ez������](�g����OV��S������˶-����a~���oǷ	Tb�``�r���u-���f��Z3ܱQ1����f�"g�"�@�矽L�zϜqh2�����G���_�����?�2�)��q�c� �
DE���TELW��؈=���U��.)	�,\��T�����q�މV\t%l5)#S��Ê�(�3��Ȍu)���M^��P$�R���\���Fl�o/ZK6���C~��G!�M�C#nψk��2H��K)z��a+�N���iX��'c����C����[
-������S�W���|Ic��g�+��Iz�7blω�����b��x��YTT(����j>à�7�T�CM! T}�Y3�e�E�{,�C�S���.?0�R#��C,J-����5��yʦҘ��r>��bO�hf�,���yħ����|�\��x�kz}^�B�$��Ȥ�j�kQZ7�i��B���0��=Lw���T
+����7֓5����������0�|�z���+g�}/둒���4�S��j��)K�rSU����F���+�h�$W�n�<�z��F�e���ٍ��`��Q�MY��v|WA����EoUb߳���\���{�(���-���O;�	
+
���r55s��h�$E�R���Y�Ԋ_��V��m�V]�1Yě�ZILW$��D�2�#n��t�,�Bb�F�F%F�F٣Z�ĥ�MVM��g���rv4�Y�c��r�Ӱ�c�}%Z����&@��O�L`��M}���fb&
cؙ��~�]K�g�v�j��45�7�7��
`2�o�_+�O�z*ғ��߭��Q���.;"���V���)�K����!��h�����>&�h�g�-�c�4�c�r�z���9�����:���f��<i�,66��&�E<6�"�]��}�"�ˣ���/Gd��B���蝦��
�e�J8=~�zMhF��@�k>-i�8��ӏ�):��,Cǥ��J7Nӭ��Т���/�T�pnH-�4!&&�1,Sݗyb��Ӻ�j���N��HW2V����)��t��NM95���nz�~nG�[�Td�]�ԕ5��M+zS��\?}�-Z9�r�W��v�W8bd�a'��ȸb�h����\�p�&�A��Dd�	��>�Kx�)^�k�|B�ye�^����T����^��)ҼKn������ym���[K2��g�\Q2�A�Z!2�|�=9!q=��gݭO���QUT�ETu���I�!���(;9�͜!��:J��a{b�����X��s↢LC����"^M�X�-$D�YG�de<dp�si�ˏo��3
+�?V��[�5��!�Ƙ����X�h>��>q���(�}	oo�;����>�X�������	�x��U�~��1���̡ƈ�W�:F��'4€�<�i��9h�C����m�T����T���lW�\�l�k
�m*��;C�!�X����5OV阄���v���xT6��V�9� �"k��/�K�]�\�f�*������ɓk�	��
+VĽ��
yl�;4�Q)��j�_�$���̌��ߙ�䫾[0��3���i�~��nrk����u������6�D��B/�Q�^f��{k�Gl���b����L85�_���D�}��J�*��|�\�>j�`�բ���3�Q~�%w���Qz[/yI���
+�Vwz"��|Q�P�N��g��:_u��Qwws��k�a�S��PT��L�`lLU�K�L>Ei/��uݯ]:�޳?���s��9�:V�yE��7%��_�%�I
����sn3�z�Cû�]�p�4�Dw�Ӧ�>~�0���6��G���+�"=��zڢ�%�{�	W=ϐ]���lI�s㌳�M�O0��_jx�i'�曆�u���`AIY�(J��3���Ef�����
̦��aJ�Pm~��cEv�J&.��5����H�M֤8q��&
�a�2�,�LO���ӘS�:�8'�j��IW��r$���H�Tg�Ŗ~�(��Dc7�r��eZ��
�".�B��To��UG�+���0Hn��	�F�����X\��ب��c�ֶ�c}��!�r$���\d��^�9i�I�tg��Ƭ��-���C�"�����2h'~i��eAm��?�$�-5��̂�����-S�'��H����P7m�[_�Չ'���ف�,v2�����x
+�2zC�t�����Wl�o��B�%:a8w��3�[�؃����_�(��V.J����� &���7�Q�H�.��.�|#dϦѣ�=���HO���(L����}շ���	���v�1W�
W����eOxV+ӓ��E�
+ذS��)���.פ�(�Y�'�˫����8�=�n�#�[Tji�t����=*O�%�*)�&�tY�{
�3�$�
?��bmh�.���4øh����<�8��u�`��r�n(��G��k$��U���8
5	� ��j�����ǼbS��t
K�|�
+��SU13�uf#��tJ�cF�\\��f{�j���e�U��w��B��K�!6l��I��G��w��^�D��ļ:�EvA�E�/8q44��v�9âoz'�ɡ	��G�R��P������Ìpт����`l8�3{y�עD�wz�{ C@�Z�s�{�[�r��Q۶�)
+7�pû���3g��푾Z��&C���J�ǦY��ܓ+����������(�~��NG�������Tb���� �QO���#J���lf�����7��3����r�][q?�o��َ_��\�&?�D{����Xφz�V�3�D��Qvr���r3c;�s�ܕ7��d�D/6C
+T� IDAT�qA�S���sq1?kI�3�Ο���|�Y��Iն'�1	��g3
+X!��J��aC=ލ�lIT�j�5�q*��$7�nz�!��U��0� �~�/1[S�Tj�����^>=L^�����AG����
{���-�V��	����4���ŎκO�HO�ę)�'��3��Q@%�Y�S�r�a��&2F�@��]����1�����4��
��H�}���xih ����9j�fԢ�� DI �~UBӖ��W��)K?��=��Ȇ/�6R�(�@�)���m�,������hA�1����c����T���;-�������i�LWV�k:b�4��.E#�p��ߒ�.�ۋt(��׋4wJ��$�γC�C
i�_Iܱ�����	�D��1�L��@v"c���U�3��r����h;rGQ�1�%����
EY'[���Y{�Ɏ:df-�&�O�φGbC��, 	����3�)��A�B� 5�):E�j��Ǐ�ax��_X~K&Ղ(��º���,R�*f$00Qd(�Ab����Mw%ŗ[�O�䐊B%F#=k�����0��nE�Tb�	�k���B?��i���Ǧ�����@ ��8�l��V<�z"�t��-�&HLqZ.<�SQ\��k�ʒ�E��#%Z�ѩ������b&ǰ�#~x��a�'ح�
%�l�À���7pw�5eF�b�LW.�[,H8<�>j�a�F7125�i�A�������X�N�o
+� �2�z�d'&��E�Ѧ��g�ڦ�G�A�P�}.�\h���led�;y�S%���	8��Iy�A}�,���zf���������'�nY��Ǐ�tR�u��'�򰁶a9v��4�@�PW�|nd�nVP(��T+�f��"m�N۬o�Ǟ�?dQ?�t��� enxo��;m�������������_~������|�;���W�jvv��g�}�{��/}��ɓ333����7
P�������<��9~kA]Pr�^�C�u.�O��7.T�
+/������S}���7S}D����d�|���M���	�6UzW���֣����P�{�k����F���h�?Y����(�n��ؒ��&��U���=r�����L��TAuSS`��@�]��!+}�M����o���~��s���O���d5b��~d�IU����}�81ଛ��3�Wz�	GĂ��2���i%Z�433�����KO����g5W\Ó��K[��9�� 	*1�֤�Y�Bl�Q�gGF���OL��+r6�P��&P�Ѥl���a�Ҍ���{9z
͇�
+h�D�͇B39TW��2g��

�=����j`x�Nڹ�"��TPZ�H��U�\
+D��UI��T�
Um2-��q?�@T3�:|6�����.���E�v�J����yzc�����d�����+��{�#,[T���b�R�e���3,gț��G@%���g��E]u��著������+�n��4mkXJd�qJ�� ?ΰ׳\���'���@W�2T_����Ȓ�
uE�j��n��N��Ͻ�t.�oF؋yǢ*�d�a���F�b���
+r�ty�]X�_��/�}�͆��)C�@C,ɸc��p\!�l� g�����IB�>�Ǟ�}������
E��ܰ��b�y@Ҩ��h��jS�"NLu'�'�
+�_��
��T�.�
)�v6]T}I�+���ev]�a�3�9�%��$îF�w1Q��$O��8�0��7.���i�HG4b��r0�`�B�u��zW�[S����|6��>i�b��{8��m���l�id��O��F�şp0	�*lQ�.�DG3���t�M~M�}j�D������X�[Q�E�qq�e
����$e�S"�"�w.��&�lLبz��#)�����E����
udϬD�KM�(��*M�*		�F���N��盪��
�\Ľ	�i��"U@�H��������ɲ�WƱ���F�O�g>���w�G~������z�+_��_��_������$��z��������G�y��Av�l=l�gz��yi?�e¹O��(�v�����/�/1K͍A�}���e��6�n�Һ{���qv-@�T��E���:�7����
÷��[
��㚋avM`=:J���'
��%f娕��eM��\����~��������Nzr��x��L����O����a�!���nvġx+Of-k9ݜ�c�΅{|�H���E����}�	�y-gq�&��
E�Aeuq+]�w��ǘ��x%9�L@O�K�P����#����-�s���
�q�(2l(�F��9�~C��(?깑.(b_�j���F��(WP��ݜ����l��9F��C/ɻ��=(���yH��9�7�yK�kʣm��QC����IqE�Y�aC6���rvስ46�ց��EAB]ʘ=ar�� Ge�6%�[��@@h��ڝ�v"S�k)!�k�	���������YA��+��/�����v���nS5㮤BGRt"�ti*��eb��54t�]	ۦ@@̦OM�)� a=c_JMm%��1�E�r
)���赲ɺ��dզ��:@����XO��E���j1� �W��vV;�=�]k�E@[o:T��S�c�L�Ɍ)2q�����~Z!���q�JW��l
g^��"'�ޔ�m�5��q��.�oe�,J�������WNY���
M��dǯ���UM����� �l�k��^z�l�׷���W+��
+��|<�
+3���2|O�y��%�@`=1Ho�8_hǯ�����X��r�`�ѝ�5k��Ek!5�����N>��%��IR�
����dJ�լ�Pi�|�F�,󟸘9&����izM�;9
i�Wt�s���x����s���W}4O���X�q�Q�5F���b�u��
+]s��xw��z��M�c�1���b��B���jޔ�$���k��S�F	Y���y��7+n�Im��}�1�i$�GUIj�ꯦ� +���/�ā�&�N�dtqg��{����HYē΃g�%������\�ā��uu[?3%O:d��e�������H"!�Vk-�
�EqW��TS����O�8"sE?3�^N���߉��˾[0�����z���g��#��
����
��W��	��=�����o��e�ƙ��Ć%/F�M�i���8��Qˎz��l��V����[���$���mK�Sp���my�(#$����=��
+����������4?�;~�T�Qv�-���*K�	F�5�^pչ^rS�V-Ѻ�VQ�HiK$�iO�������_���_�?hd���20�r�0�y@]L$l$��M(w%;;#O�뭺�! �'��G�\Ɓ/w�\I�iF�ዡ��v6��>��9%��\�&7+����i즗׭uA�f��~b/�	���a�H��j��'�쮾X�Ѧ~~�:$`��y����fR��	Ee�T�-�|���7^�c�9�1oE؜/ꙵ��*�s�����C�(0��.0� 3Wt{���Ē��t$t�*c.�������NήpB
+�����J��KA�QCz;��g�u�z�����"GBd�	��Y���c֦��:�q��}����xk��:�C�.w1��'�UɑIj�6�r ��R��1�Ϊ���覄Q��ƍ9�����ZY���ԉQp)�X��N΁��^6YSc��T���䵞�-9����"!���ؘ̇�Z$�k�G�j���9񪄻
M�y�_~�U9�U���
�8�N�a@���УZM:��-
���
+u�Ƚ<������]�!h|�ӓo:-)&��#｣=��s���9���ͷ｝�խ��
+HHBBc�`0�
�෰�<�ǁd�a����a��

&�rl���RK�������X�=��fMX����ꏪS�j�ZUg�����Yk�f�f]i2��D�Az�g[��bɺ_m-5%�1�w�x�����Zk=~
"a�>?T=�,fh4Ǩ��}J-�!c!k�������6�tz��4�$��y�Q|Y/[2���I
&{p&���Ґa��v��/�g���)�-��8��k@��u��ra\�oc�G�l(���8����|�5���p�I��0�㌏�	��t���l�C[���ws���|�.eqk��"���"*\��W�#�X�s�b.�Eu��\�W���'X+t_	Y�Yh'4��,�f8�4��g�ρ�G���1�1�Z��A����^R�V5�!um�2,f�9��l� F��t�G�}?�f�?F��]�ɕ��t�w�v�G�y���;�o��݉_���J�.m�B��!/��?�XG{y��6�P
+�K/��ȫU�>��ǖ-���#N��t������&j�j�	���/&:�X�D�@/~M>����/���8�2c��B�D��"?�,�w9�BW��+.�s�4u*�=eUFyE�D���{ߞV��J��LY�f�\��&��9���aN��|��%���9I�gSR�
�s=5��e�����t�KM�c�V_g	ؔsA�
+�D�'�����Ӄ]�u��|CN��_����e5�rD*�zMZ6�3�:=�3��2������9}g���
�@��(sp��,(�3�^�lǬH�m�o\1�Q0�d7_�_u0��M�ɬX	s�ZzhHt�C�&��TK�ب��0�ᩅ�oXF4�<��Hbt�#&�AՒ]��US��@��%5�a~�u���sܳ�o�sS�PD���L�6�:p�����@�A�6�hv���.ӗG���]��p_�ll�u�|Y�sX�07��mv�B�Ǫ@�Q#��tm]%�t��R�4d~�w.���&Fh��R�%��e���uY6`:�!�<�2Đk�AKm�E���8EVq�
+��c����
�N���6���Yܖ�=ġ=��z��^I�z�S)u��_m��=��e�3�<+�ɘ�ӆ���e��g-I�&Q�!F�
٩���'~��u�&Kke�o��>Zp���=���6����s��Ą����׉�,6U_��Xτ�16�ޓ��Pn��.Fו�s
넼��7����㗀!��Ȑ.�ަ>g#ˉZ�N����7���e��;>s
h�Z�}}Zn��!��Vk��
eZ���p�|C'{=���Mc����$���{�>��E=	�	v;O�>�������.����<sab��c��3$�8�K����m��+2-�e����>g��\�j]�\Ccwh>�~]Q�����	��J	�*"f`$���a�ª��K���S���X��=M*�ry.B��,�������P�Ut����^�Z��5Ծ�^ݜ��W�<�F��q�g�:e!%�5V��.�ykr
霨�������n���}����j��ˣ�>}���G~2s�6١�V�>��D��L��,�t1��ߖ�)=�9�������t�,k����ޢM�PƐm��8?��w4�Y>ډޔ�?i��J�%�2��'
+���lC����Tͼ7U{C�Q�RCa$���G]��v�����W_Z�=#�9�l��k�=��ZKn͊��z��^�&+U�[�~I�����YJJ����Px�k���|Ϛ>e@	�X���X�V��N����^�UE��$��$Ʊ�̊=-��@uG�O�����lL���$�
+�d���"c��m�
+��!-�3s�V���,��l���M�.����K�b�K+�]zf3������,�e�ܛ�]+�,�e�0�9��۲f���C��pus:���e�(����
�$�\I�����zM�-�>C��L��S�ȼg��@�"�,����#B���$ns7�X�u�.�i
���ܓP/�f���C�����������
�{���K��܀�&�����(��N�������m�z�1dqb�P4k2��0�CM���1E0m�8�B�6`1PC���(�=h����KL!%'2$IN�-Ds1q�=Z� ̰Q
|Ü�qLR?�&zf�F8K`����D�������ܫ���F����`�����c"2���x}c2��t�a^��]��D�1iJ�	�|��b�)��RSU��u����[�@B0��7Oy�Fj���}��^�uƂ��`��:���~��^�0
+��7��0�U�K���+��|-�#=�gX쉕z��g���4 ��������6��a�@+t��.pp
H�
$��Ʉ�
x ���M�7���uz�@neo����<�ӣE����ԆyrN\�����#9�U�1Ɉ�:�S\���B���U�l�tii��j���������K21շۣ�i��=�lO�
@�w*3��h�Ti`z!�D&	��k�)&dw�p��J�U��F:�gW��b�gj��_
+_�Z�����Sޞߺ�]�>�]dݜ�koi�dy��<�qC��&��]��9�*0ĹԌ�V4���ȣ��[������o|����/<��|׏�O)�L��͗�νʌX�b��n�z4��7�%CA���+�;��?��m$�+�-��׺�c6��9^�?�Mn_o}q����;_������y�u�����bd(�Z�K�nj)����;������8�V�����z_�į���Ŗ[�-��������8�w�����uY��>�0�Z	C�&����o�9��fN8X\�O��a`���$�,;t� �ˆP���l�|����-w�����<f�v�[��}ͻZڬ��#����5--:rw�6�1��Ns8+6]�KD�OD�q�%�M��l2d���
��Ͳ@o��U0�i�e�5
�\��t	�
钄Ȧ�U6�����u
+���06�$�1��۽3��8Рr\O�Þ�W�f�zz�{<1aj2�j��3��ip�3���Aɹ�4	��`?m�^������(��$H0d2��9|��kC��s�W�tio(�m.�S�G�ԇ���d���BI@pL~����
^3��Zz�A��>��6"�TQ��
+W�*�ŀוr���·�t]�Oɿ�э
��)@S�8����D��h�N��X�<�V͜`�&=�a�����&���φRf`��n���%�uEi��)��3k뺞P�`Ϋ'0�1��M��&I�#=b���|�P�ODzAOd���T�0t塕�&��sN���2���C9������}=���>_���6��9�,��u��ʹX��(r�)Gz��5O�����)������ "�Q�Y�Y����+&��H/��`EA׆�������ఀL��]�o �M�����C'<��
��@��W�8���hIC<�_ia��J�:=���1pm(�D��m�<��0封���FS<�eq��N=ݞ��9,.����g�	�A�
+�eR
+<k"E޴��@�\g�M}��CV�V#S�Y�F�'X��f���~���
+��٩��{�ü|m��=�/ۮ���
6����F���zL*2�	������S��e��ȸy�~iJ6����ο�� ��ޫ���?F>�+c7mv?�0�ɽ�8㊓�u,�Ww�[,�am���n��֣��ڐ?��3�a�:,�NC
�f��
��w�G�ɋ�a����hۏo6�t�c@��_l�?ΰ�Ko��,q���L��A��><L������~a�ܔ��i���+3�	�-%zN��
W�L��aO>��vWm?��'��=�e��e�F���@�[��Y�8/���`4���]����]����Ȁ��(��(	%��:?0IȜ��uaU�W�D�;u���a��k5�O�8�|>Td�FĤ�b�*y�}���m]�Ԁ�Q��|��|,*�
+�>-n�]%���QK��Ƿ����H���K�F��=1®Jh�h8e���R��`�+����p�g�&�Q`�WZr<�W�j�=c`�{b���U�1���fz٘�X-�*���֩F�Խ{-�e�}Ȑ����2�=޶�ے3UB�F34�@P�Y+ꢂ��#1�#Xiӑ2���Ú�h�É
�O��jPC���@��!0
�)�,�9����(�TB�a��$9n�� d��$���A�a�	
@�dM�YH"H)M!*n�{A IDAT�lJL���O`|�0.������7�U���8������5�eI�2^ۤ�+x}�U��/8X��/����9�B5�����3�x��9�%�]�{�Rb���
!�ʋ��K��S�~�=|K+=������򺁼��~��"o��_����0�{�k�ɶ�2Сu��5{�U똦P���}�`k��w���j_j��50��<��U;|��S�ͫj�Ȧ3<�j�n.��E�՝���շ	��������.�h�����L�.�c �W��t�\��|ؒ��:����Ԑ�2�sH"�g��^��.�5��{e���U_a/�j���0O����hu�ByQ^�;2�s&]Ị��!yn�2�^S��Vu`<��7�f���WhMF��(R��-�*EB=!sBѼ�$>�v����۬-�X��K��J�����&�*���8����S���U���zׇO��og�z&���i~�!��$%픆P`�5}~\l���狫ɮ��3	y�E�Vg~��7<r׮]�V�?�_h~��L��������>�M�m_�s�)�zr����jFo��vG�
�'�x�v
䕈ì�i[��ޚ�?���PF�U��\�!�~|8|]�|g�ܒ�ԵiG�ti��b����/��{�+ڃ�l��u��߾��;����b�ͳ��YO hM�XO��#�@����:Ґ{~�]J���a_����M����U���rD�g�'�5����"E�a�I������	1�a׬�FB��ɆJ
����zՒ.�&��w{Q�4c��E���
�(
L,��/�T�ZfQfY�4��ltw�kkJr����4��%�M	�&G`���d���(��#0
n�ӥqvu������ԑ�˳�򰏕�����P�I��5ݮ�=ު)���	�a �#�s�C�3ޖ�<���Æ\JvL�L6�5M����^���ޒ}j>�:5cy�
��oج��""i�-S��6k�G�~b��8�gUb�`,�W;���7��*{
w�:���K�:�E����bs����"�Y��`H
IfH�9�W�=�l�ZY8
��עo\��g���;H]�}0���0D���<Wlڀ�M�̆9���Ś9�@�����@����
!��
,jH4�k�H��P\ԏ�^���.�ICzE]`��	5Y}5ڔ{ �~����Z�J�3���D��8�Mnn������	m��A5�ج�;�6�ئ!o����3��:��&����f�U���z�6|��:������<Q����ÞxV�Sckы|��[���0!�"`/[��_��e���9�?�حmxZ�?��V(;
p	�����1xY.K�Y�{s��9��>����{M�gq
0��β7X��vqG���5� �;���x��1��iU����ʈ��jQ��F��K���B9i/��
Q��l�9塯�&0�b�c�Ò�.lwMV�B�>�ٶ�܍t�ͺU>���V�p�]�q��9������֡�85h��|��Ԅݪ�+�h0>Ze�n�#.�R�T��\�]V#��x���9�o~��zk�P@����=��~prr���n�maa�'��O��������/�;wn�G�#9���#&��l�~2g?4�{k/�9V3DV��zɭ�u��kCy���c=�XO��)f?JnmEo⬾��~1|�Գ��;�+���o"���+���5]_J���T�f��	����N��^���h���v���zn��j�s����嵮��o?숓y�{��e�����8�c���#��V5i�W.v�^C^['.拸;g=S�(�X1O0�7�3��-�%�Zt&�[

�z-6�",��ٌI2T8eNJx�w|,d�Mew��Q���.f�#i�6u�Eg9�
�F�2y>�h`�
��U�����tU�M�O+t�6
+�����T�k�H+5�{��сSe|A��,�ާ��D�iD�qv����r%6vS?�GB�Y�A�"��˖�	 �{bX�d��+4@�7��%w
����|���QbF��������
$�]=�YO�ٛ��@�����X_g5����X(4$m�Tq�<�@SQ���Ր���2^�!r���I�j-zVS���:�ƀꀜ
O��`�N���r�\#�0E6i#�2�i���h����@R:0��	#jD\�)���#�Wl��`d�:C�L���L@:���ऄ��P��@��/�`w���X��&�`��Wn���{ػ*�r
т>2�^��-1
#��֞�.�|=&�3�|�~�e��s�Ph��U���ܓ��/��|��k��wĢ���;~���1V���'�	�����WG\(���F�����+�������D�._�}��vzeƽ�g*�_9bw��Nz��c�m%�9���fr>�
�6�y�)��@�D`L��?�f���Vϙ��[,(t�|
���C�Ix�}z^���}8׆'p�����,���
+	�4�~H�Df�x�9*Dݜ����Z�'�:�aa��%�S���BG'3N-1AJ�cI]��
�HM���xl>)��;�Se���f.�	KU��4QM�c��p!m��ex�
,���^��L[�w91a��{�d���ݣ�Y����ozow��JEsMl>�l�����Z���C5sbR�4a�>�Ȯ�i
+����W����fg0�p�
�y�{�o���g���w}�x�ᇉ��/���'��9r�o|��S��Ӹ8��[.�_�7�����T^��ݶ8���c$?`���@�.�ծ�~�a׶�s��G�q퇆�� HC�c�T�j�5������'�'�/]�}��+������\�l]���lq���F��m~���y��QzK,��}���(JoԦ�M_(X[��4��ڱ)x�f�JM��ZH�cbdI-l��g��ȶ�̉�h
�٦g}�����֘RC
7�iv"*2	E���K��Vk����e�ā
�
��c{�}TWΈ�[J�����!o��ź:웞�~�l���Ȁ�I���c�z j����"^~���,�%đK����7��q�CBׇIi�e�r�V̷w�7���j�>f�8�ˢ�����Wc�XD*`�g����K�7�DM��@'ƷY\�0����}A� 5y�7|��Ű�ݛ������򚮜������dJ����:��q�#Ƶ������˭�+2���z���<u:��1�6K�Z�,g����!P�,�ڤ�8x	l�y<��ˆ�6�.�(Z0_��M6�4g����^]�o��Z���nLq�����a�arljH�-��*�@K�h��F�'���1�-J�fpNS�H���
�����L�]�n�c�n�B�[��{0��2�KðA{0�̐��Ä@�AG&�Mms)��qv
�r3�"�S��"��-���""L�u�@���.?����<j�Kʌ�	,OS��M�����'��|����� ���7�o
�w$������	�'=��Ar��|�J��Ro�y@�R��,�.MA[|���eE_��
p#�YS��b��c�@/����!m���g�-�
�������!h��<χi�i��E�|	_P�}�(���	�O�?݂�lc�E�d`����gk�b����uˆ �v����M�d��$�4tk\�*)�LBԧ����u�n$3��������x�����̷��orY����1E�`��ӱ>u��P����Z��G�
+/"G��<`�sP�t�
�qm5��S{\��:Oo$�3��ZK�z| 0:�D����.KkJfX ��������7T�c8�}e=zeK�Q+
��I�?N����������t�ȑ+��riiirr�B��]s�5��G`eeejjꮻ��[~��7�i���O?����f�G�5%	���b��D����F+zC.��1
���{�|�s""F#��PV�݈�H���z��Cy(p�����,�'�����8[O�kw�ݘ>�����};��0~�%N%����{ѫ
+��GL���݌5_�z:U�9���Y�ȓj;��������PO�։@\$�~A�uN��ܷ�&�lO��2
^�,�Pl��
5Sjsp8!�I2�d@�hg`[L	�QMC�!E0%�����*SV	�#`��N�P_�i;d�Dr������XB
[*Xԇ%
G�7�3��@ˆ��4��!,z0n@2��6ߤ'xRj��}��Q�{:p��l,!���{�ݶ�h������j��W:z��>e���fE�9�]J�z��y�a�N�I�$�W�Q5�&����v�k����<�����To�I����
�G�	�4�kv��@�
�vEX�.
�LM��h@C�I�G�r�� �a�K��)�]��m:��8/�
���}:+��@�j�K
+�2^C]QbCnC���1��)�#�,�*H�$,�e���(�Y,!*����@K'0���<+m�E=����
�R�(H7tk@��Ypk�
i�űM�p�iѓ��2l.T-�U�EV(��D�E�q|�9�ݮ�0S�i.��`��dl6��i��x)9
o��,��'���Y�)
�A��X�I]�T ��2�=���zR��T���e�/	�����\�P/~�H���xV��Z��D�J�Y��H��R�5�36��Y�r���0+.H�	�גk:ڍ��h��=&?��Q�ԫ��.f�3���{�ҟͱ_�0��SU�MC_��
O��6�kK�
̝��.�;t��{m�������������;?)�l�s�%�ٶp,��ldN2`zf�j/9vL/�j`Ԕe��AJP�����Q��zr�!]L�Ɏ�PF�2H�,���Z�O(rBƫ΃U��f:�D��Q[4�ܕ��Vgh�F�b�(m��,���F���bCy1�0{F���gW�}p.]]N'B���*O��vz}�ZJ�
+XP�OW��u�Ltt��4����<���V��&��:����Z�$9~��M7�������Ν;>��Z���w�۷�R���~J12�~%����`��:[�|�u�m�"@a���/q��lq*���o
�\濬�>/X���%΅�3�gR�'�Wp������6�m__{s.�=��k�2��u�{9[�r�Y����N@/y��~Ƕ���ow�G]���{��}�a����������%z̵�*����'�"S��06%�I`=��Υ��KV'/.F&��T�t���؄
��Z,(�X�a�mV�����5sN�CgI?��"0;�MӘ��K�Ѻ���i��\}�\TO5���US��lÜ�/�sm��]�,�VB����ΧЉ��6K!nI�¬�.�"�A�wq́R�Z!n�Йe�܀�%|�ra�K�$�ꌱk,��o��L�6��֠Ɖ��qZ
Y"B�z�WS�m�۶��e�eŦ�;��Ј�
�:i�v;�jc������ʸ�b�',�U���bU��-֎�|�A�W�oY�ﰚ�:1�
+��զ,��P�+�9	����>{���Uv�
�&������	"�y
Q���*�"�w����Ι�ج�.k�>?�wp�������>֐�#JO����
��t��)�1ub��(��'7�rǴ=,�����,�s�&M�}�>\��5z �ɈV�؍��s>��0� <�4 
X���J
+=:;�U
�n����Ҫ��U?�����q
`��.K&5!���e�
�'l>���lɝ��ne*.����䊧\�� y����
+�?����{���Uz,M�X\��#��W��O2�	�B,����)i3*�N�z\��!�b��u1�a(c��tW_59!���d-���aM�^)~�h�J"��x�̷��=�f�q���7��8�lnޠo��=S�s9�-�Ӥg�x���K���̱7m�Rrp2,���9�+m�-��G���
�,�ZIt�&YUjNX��Ħ�X`R�j�C���}�=�f!a{b=��
���;☽X�S��qR�L�'�ڪ8����d��hS��,L��&!w1)%&�ա�L�?a��1��\�ġ/���n�������]�=ʀmʜ2C���%y���uZ��
�̚�x�YW+R�j� ���
����ȏ��o��-�h4�֕J�G*������&��^�<��×]v��N�~������K�w���ux��ٷy���j�?��u��1N��To3&�T;:�S��iS��{S��8�v�_?s���Ӗ�LJ�׿��>'�.�::��J`�ao8H87��������3�����w
+�"�Q�3��G��X"0F�5R�&j���ə��t�����x��/UvNL�\�ݯq��7\�����cö*x,� '��htT��(��Y�,N�hI@�IGd��`_`�G��I�q��hi��9�G�xLI�.��&�
�
+^��	3����mSoң��%Ms4�m�mq8~t��L����qt��k@�T+�!�kto��ʸ�	��
�(�5!���#2��ݓ@�)�;#p���s==bZ�p���
�G���D--�L��f-��Lp��X�	��N�����h��J����@^A ��:�����bu8kk��D+yAF��&����sg'y�ú���������Y|�.犼�7��"��C;�[�d��F-$���ª
�2�}�,�i)��
\(���Tw+�	�4�t_��kl p)	�j�}ZR0���b7��4�+6��M�p��]hғ#��X5ON�+��ÚKy
r�|y��j��ѓe��C�j�|/��5�?����!�/ӝU��I�V�G�g�ًR��JJ���6vjכ���ƻ���[�^�S�V��}�
0��)����q^��6Ž�?L�~eJ�u�����~@�*
g����s7yi��J%�f��rVWz����K��k��w���q��;��T
�����X�M�����!����;s0Ho�fL��$��N��!A@M]��̓%�[�s3$0
+�I|��������m�}�3�ArE�"��Rjк^�p\�c7��L?`��U�X��z���H�F�c��lkOc���hB��!����ߐ�AHM�c�Md��n�e=�0T������l�w&]���k����������s��r,$ M��\��(Z�.�)R�c3�q�&K�"\��ZEy苏�~�\K�eو�WjW����yL2�U[n�XW�3��}2r�l2%�c㊰�F��hD��W�$8JM��_��&�y�������_0�����~��{����[����o{��~1�����Az]��
y�i;y���l����Q��� ~��~��zZ�l9�W���a�PF�Q�j���3�ע��Ϟ����Z�w:��%N;�d�E�g
����v�R�ɰ?T��.��p0�^�s����B̻�c��� 8�y�����oDrk��+"�'��j糁ux(���b<��O��?����V��P���4�be��
]M	@w�CˀTV�S�@���|�}�g�X�/�?��
Y�C�m�1$�A�gjz��yM���h_�\,w����b#��陽�WV��<p$1,�ֆ9�L_��~�G��p�-:ޠ$�۷��5��Q�*���6��	��q|ELknI���˚�$G7��|�ӂ�j�oi�͖.������d5�6%ɮ�i�����K΃����{?�Ā�Ln�x_���P�
�'���/�r�Y�Q�',ֵ�B�Q�B���r���K���-�ޚs����Qn#~qJ� �}�L��	y�.�������shv���,�a3�N�ҥ���<�a����}6��p4��1��6��f`FQ�aՆ9�����'%
�[�R���`�.�;�x�
sMzLA��r�.)�,
Xe�똥�s���7Y�՟�f�n��>Lǰ<��
"*m&]��>¥m����s�m,7��}�
+�>�QL����}��gr�K��L��?���t���g7�^	�BGn'dYq֐ד;�DjJk���Wp�3*=:?���D^��ʔG�O�۟��s�����n�r��5;�{Ƌ�Xqr#g5�6�[��ִ�p[���{yE� D��E.��
�R IDATܑ��	l3!�yk0T�)�1E�b��nQ��h5�z�U���̗-*��@��[����gA
<��@(��:6�	Ȁ����N�]M�,��@�9�g3Y��0�V�M�u�hlh�^XN'
+� hlhB��H:jfTH�/��d�[b=�1
��{j��>ؗ�j�E*�'j�&�,����Z�u�w_�g(E~OMF��ҥd����������8��C��G��X�H��eH0�[�|L�oc����}�'���b�j�����6gl��mӛs7-����݆ď����#�c_|Ճ?9
+�J%���fk�Z�Z�	c�_��W���O�8�������)呆��<�q��X߳�쇲��v�"��a��h?�=I�|�a4�k�ao��>��hG�M䁂��D]^,�o4��(z~,��dЦ�_�~�7x�@�(=�
>jLa�"~A������^��������$a�����_�_�/įH��D�+���J��&3��Ĕ��
(o?ё�9v�l�2������h-Ϧ=,��r�r�+�������4�ߍ�9eޟP������9�Aw`��}V�0�t���DO�w/�=��q��ѱ.]��o�~�sp:taYu
+xew�:v	�W��>�
�VصVRh�h>��,�0��J�����0���F����������5z|�|��{,ۘIH�Y
;�4mU�i��4����N���Y�N�M�HD|�g#5�%�˱��J^���駇���M�����Y+��_ܽg�&Wu.��޻s���09� MR�@Y $�$�����

6�����E��%�Q$�Jhf$��9��s��s���ν��?�uo�*�����V������Gw���^��g�dC->Wc:?m�=���9+�5?�H6�z�f�	X��-Vٓɐ����N�I&0P!�U5�İ�ʛ�������j6��Op /��1��C:KxN���
���Qzp�v��`h\�:�֎�o8Z.�0��R��ئ�.93�� ���,.7�I����.��P�Єz݃�t���ƫ|�ऋsh�~�H�6�
� }7�rVt�5S�JW��EMȵ�3��eٚ��2�v<������=f���LW���?����$pE��v*�,>�����@ ����?Yt�İ��yD�.����џ��,}[W��9[���t�4���>���s�����b5Jβ��Y�����)]���7ͧ�갬G����]��Ɇ����H����P��c�)��V#����g4Մ@��fY���'4;��<.�Ƿ�����	Gl�GT/�R���&��4�Q(�-5�)1��-���y���-��T�,e�а�'�~�ޒVct���&/g�`��`B���3�gEBR6#N+b�x�3cb�eZ��si��_ε�b�2{�rM�����(�sc�$��� i�F��2�銑Hi�ݸ�%5�%H��P��uIh2�%,TF����YȞ�4��?�gN(�bb�Z>R.�맽�xS��	����^����f͚^x������ѣG7n������
�o�z�x>L)�����[f/�8�K�j��h�?o��KU���"��REΦ=�y M��t�Z�y�m<k�O��Vp�m<�T!�/ȹ_|��Z/�t��p.�?��b�z�{�m�@3��/�& e�vf�-Qr�i<���Lg�	���-�ED��mK4�a��]i��@PTK�d��/��,XGUM���|q������L�/��X�v�ae�
+����:�M�F�9�?��@���b��h�fX�*'l,�k�g���1�v�=�(�%6�N�Xu:Y��&v	��t:��
h���_���-:�XSla@G�+�4�#`��+Hl�����yz,��h!�:��؊����
�h:�z<��Y����$}�i�j&KB�2�on��{�/7?e�i�Ԓ���K��"�D���{��Y�Ft�@&�h�
����s��F[��9o���5�͎8h�U��1��ӭ��Xv�|�5�n}����a��su�c�d���bb
+`L�aʄ��$���|��7�R�� ��:o�Fo+��vxAlb��l�llo�C��Q�T/I�m�]��<�z�y\?�o9��`.�qP=��ұ���,�5h��Ы�xn�u�?j��&�⧎��	$P.,
+a܂�
+V]x��
Lph�j!M��o򩥁a�7z�;P��F��p�жJ.^p�7v�+@aDf�O�����Y����Odo��\�E/>_��	"'L�6�q��T���R*'�,�*A|�c>ʰ.U�T����rkN7��1�g?W&�"�Oq�ܵ��Ԃw컂��(]hi{�x F���Ү��k��/3PS����6���^c�7�Pa�l��������<��Pk��,+��T�u;���p�9{�LI�y�T���@�K9�����Z%:�d<?^�c=�+�W�G���+�bA�̢>�B���V|��
+g�Zt����k��X�J��ǫ��
���Q 2�p=Yi�qO�*BȊA�$�h�t�{w�����j����2+�G
+LF6���D-^[2^���}�Z�xYF�U���	֪%}:K,6�@�eAˈ�Z��L"ʉ���P�ި��כ�ʾ����6/�Mx����&�M�~#^k�V<t���7���3�ttt,X��u����}�{��w߽lٲ;�c|||Ϟ=��ߢ�L���o����j;m�E�����Lտ�X�t�^t�^Gdq>��~?�6J��D+~c��#&����˵o��a�1b�J��Ɨ�d��o5������OL׿!e�"���ߗu�jZR��R����zD��z�@�9h:(������ ����< I��n���\��0>���ؒ�����G6�}m����Y
+�Ņ[��"��n�X�>�oJP��UaO���!U��9���l
N�8��"���ja�L�x�\�β:6M;=�`%D)$�W�{(�����w�D�և��c����g5ڵ�ߴ�_���'ʴ=ϧ�Iz������̆��
+����������&�`-�ﰠ�A��;�1�-�w`v[�P����r=�2�`qZO'}���F��W����Dux���s$�\1`h�Z���A�Y�C�ҕ��O6�n��4�,���
�Lew�:uq(Q%"��e��Z�0Yӛ��&�dS$�lq(�R=|s�D$��1��Y�)��閪����.&�%\� ���;H=A/�`��ĄN;��Gs�����WYX��ymxN�O��Q����1������=�ў�����=%\�#�����iW����fh�C:��)�f���iu(�JVw¥9yX��a�
����&p���̳�g�^��0ia{��4�`W"`L�)ڵ��ZGg��[N���
-M/���5ve5�%���7Rr]q�o�e����袼��T�K�ɰ�疽;����&뭏k�>)�t}O��EW��+�M�fp���ߑ�M��e=&����M�쉢�4q���k���}���\%��3���;$e���	�f�l"�2ycFV�p&�M���fY��v0�
�"��
+�3�����+�^�����crw����d�HH8F$s3\V$).�&�B�U%��^��d��;OT��R���+�~�?k�ɏZ���_J���W��UK��n}0Q�H������LV䵽
+G��%K���V��Ȉ����!����H�����z�a,�0�d9��d�z���&�3��II�A��9&C�c�
U�h����a=�ˋ)Z+�Ɋ)�5��S�*̊I"��"��ZA��WJ:��M��>ű��M���O�]���o��.�l�ڵ;v�8����g?��|���g�~+��?�G>򑷿���*�����w�}���ď~��߯:��ףt�"�����r�x�AP9��D���aΦ�Z�p����9�S��+L��Ɋb��8�������^��f|�����y�~2
+�)��Q�@�0Y7���(bJ�9�h:D�Y�}�1��d���.7�_	�#B��|�σ�:�|Lӓ0�D���ߟ�ܦ�C������]�bViz擜U��
^����r��Lқ��Q'��
��*`�9�iu�J���8���7�+��[t���T����Ѯ&^�>;M��4ԁ0V��:��y��}W� 3��lv=�>>�*���w6=�~�#^�zzg;^��P'^CMBԠ�..������As��F;���
�І9
[������4�����3��������O�1�ڴz�����aBt��Sr����D1�3�(�%Y��"Y�q��˼䬬�\+97g<֊/�O�Y:���_�lq�aS'�ʛ����f3�l4?����gdg�
��>/��8���D�
�ӌy��|�.`�^���~.J��^|I${-q�o��@��I�5dnJ�:3�zB���%�E�:����Z=���t�>�I�\N �*�>�C�N�b��e�z4dCo�3u���|��2N�Nг\"!�ò!�ampC�)5	d����iO�vB=/��q���F;x;^T��,���g�i���yX5A���7������� ���u4�j
+�w�CJ�g��H��sS
8�i����4�)Ef=Y)0������#��j"���/
+�M����Wo|̏/jϿ�0F��we2?�ҩ5�R�'�l��?�u�6�����B��i���Si��Y�8�M�Ls�L�Rv������4q4��k��vp��a>bh�����~�U">�m2H	��`��lÌ:ޠ�\,�7��J;%..����6����H�pJ�β��Z��=c�	���
�/�64�Ȼ;���J�M3ß�V�+K=�ǚ[i�Wk,>�词��wYObo%xg��\q@Z⠤��9�c�O�W�e�&�P�d�t��E
=��0�j�������r�%��3��B�#Nr�DR�cLU���6Y�����v�Mq�^#0d���Kr
>�~Ϊ^����&��?�oR��&o0�+iW�6x*j���2j�|��)�ٱtb�3�d�o�E����5�o~�X��_|��{����SO=�{��{��ܹ�g���{�㎯��g�}���E˲~�0����/��I�7ŀ��0�d��ҵqrVѹ+�7
A�G�t)g5]N�b��)�O(]���J�N�xɲ�"L�����,}�����;맶��&��$]C�S�]���
+��8��7�+I\%E����f����8��XUh�q����t���i:��bj;
�%���O�V�6�QS�q��\��h��M�bh9)H
��I!i�1���
����&v�8A�������Y\��	I�^rq~���p�����@���dJHZ����;)�զ�+��Ѝ���<%!n�@#�,.9s�Z�
Y\�!�a.��n��nT�$P��$D
+�~��!��,���Q`s��r�t̕�
+��,+��/�mV$�����\Oesbb8��T�"p=9'LWr��V�+�����W�2�5��ߍԿUr��(�:���_l��i[߮�Q��|d��Ռ�b����ѕ��KQ^�N?������G���9~�ܗ���ט�0�L�fT]@� �S�
���+��Z	�
+lŐ�Q�l^>?��ӂ�&��g����*3���YxSUz�[x�)��"v�8=���2mM�Հ�y\kCO��u�5(����֏��Z�����î�����Ggm#C�=8U�����\�M8����R���7�4�Ð�s��8�P�)QY�����
���U���`
����S���S��4�rƋ��b?>��-ؤml��}�]��[���-}��B�.b0U�>^��?6�S�SU��(�qVKӂ��7���.���v&��c5M�@$�{��9��&@�!p����M~�f];�0��P����B��]™/)�H�Z#�x�0�/r0MhK!M��`Bb`A�@�I�m��C����E�Ƀc�k�rd�������� ѰУ�
pEZA?쥳k*�k����cq�|/�z�^g����L�v����0��B����z��>���H.������j~XC�aȀq*i_�����ϲ���k]q2H�����J��u����:�pb0UmHyEnN��J���g����L�R=��1���J�zmqX��q��Ǵ���P�2N��B�7}��n���Y]`
x�<�G�@��2���D��|&�������w��m���>��Q�w7���Ȼ���o|׻ޅ��޾}�+��266���s뭷~��߿ꪫ~��̷�Ƹ��,NU_�xV�B�4�.������d�������:�R�=L6>2����5~)ؤ���l�z��^R�m�L�^�������@�*���-^pC��i��7��i\n�-�{�0�0�CiY���87�[���TK�n]�����`�Y�>]�ơ����W2l��+I��c$��_���ra3]��F�9-+샱�WV�
�����:��%ۛt�'$�
:C���xtj/�j�G4ea�M8��O#CEA؉��tʄ�U�UK�xċNw��	�!L�P��~�w�-U�eaO�8S��-:Q�]%�H@
8�Aք�n���ShPҠ����#������ee�_�mt��'�JA�X�ab^L�0��@e��&���]��2/��OT&�ow���m&/��9��T���F���T��0g-�~4/��"�J��fC�G�I�"�-�Mƪ�͘��&ge]����F��8]�f��DF��i�8i���u�>%\IlH>3��Qm�J��ŅG�ou�qs�x�v���}QU��l���p$�
p�l�3D��`K�^�`*���	��'�9
L�T�co�Q•S�-�k9�K���.�6ȓ�9+�7s]���Q^C5k<�r4G��,��Q��yN.g�:�����.�E
(�T��PAȶ�m
����TS�P�1�,o֒��*��w��H0u>��q/�bk�S9��^�űb���[:�n������ٽWW+�*�?��>�8H�
�^#�H�:��6C����b?|s��ғty*gEa7c�$YS(�\o�%����&Nԃ�ƣa����!���f�������K�Ef:�%�(�:4t'�U	-�;0GB��������@�!JtW�7P��I��9�1�y���b���o3���+Qm��;�d��`���%��Qg5�f�c�M�ޜ3^��H,Y�`5�~_�X~�*��e�'�
� p�ס�FG�k�frV�x�ez,g�����輜�ZV;�H���G'��y�(g�D�Jr
,�d��mɼ@��iɞ���T����TKvu
+[G�A!8L�y�tV^;�`w��}eۼZO���B^ˉ�ɸ�S��՟���|O�����1�_x�}}}��~�C=�cǎÇo۶�����M7�d���ƵZ���n���v笳�z��'��ҿeA�[Y����Y��	Dƺ1���9kp6�c��S9W���O��[�/�m@R,�������Cۙ�+��4����J�'� I�$�bC����������>
@�"0��V]�`T
+��G3@�ds��b�alglfx�Y���S�U��R���^Φtq��|����Ti�b�p����e&�i=������obɇ�)��?��
`H��a�3���J��	z��]��@N�踀l�j�/�j
r
��މ�;>?w�V����`��hF0%���
+J�n	^���ϧ��	`Ą�!�GRhh�wq�8�<�:�{#�`�{0`a_\t\�D�����F氛f��(�6"��$�J�ӣ�hI�cا7�"$@"��\�܂�Z+YS����_J[0��m>��fe>+�D����*L��+ؔ)2l���I�Q�2�~��^��f�Vn~����c?�H���']�E�X�qѝ����-Qm�x�"�����B
DN;RQ#���,�f��
+�
u����O�I���e9X]���\6p����!�W�3�$��,.��Nf�a};����Q|�EG��]Ӵ��~f�N(H��os0O�����X�aHc|7!�q�L�C�*T���a��RiKZF IDATh����a�I�r�ʄ�^�aD=a��Q�Y>G�B����<�tan�Z*50m�9
��1��+�p3b��|8H���:��q�	�L{O�`h�	>$e���r|�^�J�m׷��m�Ǟ�ֱ��0���O��C�v��G
8�
�������Yw&�L槌U]��>U(�(Sp���H�l��_(7��6e�j3����S�t���&3�jr���:���)5	T
+^�v���;�\KE9�q`@� �zm>m�h�9��� 0��L�\�)�%�%���Y�%EL烒�@���v�}��^}������k��D$�4��Y럲�3��[t��ǻݿMTB`�)S�6ũ~�k�	�4UV���jCP)9��7R�8],ؤ������A/]�a=�K�tu��-��P�yQ����j�(k�"�)Y��
6�k=�"��L>h�z����%��25b�Q���,>(e����GcR-�^�~�1��./��7_�����~/|v�_b���q������K?��w��}��_w�uCCC�o[���ִ^��2~�K���R%��a#��~|��l���i�t�l��W��tyӿ���N�.|�ٺaig"6�[L����p6���k��7H	��t����>G���`� N�֦�VY�5���(�\;�	T+绹F
)�MHb��V���VY��R)AʶV�]엪S��MD�z/�z��-W�զ�����#���̬v0��T"�V
z�NH���x����o�aN7\! ����t��n@}/���pM?{������<��0���%\AeJ���P	pX	�lo��
+�p`�
�r�܀�%쎘��_��%�@B��[pl��906��	�s���[ѠآcL���v�OÏ%6f����5��GSAZ���	�:�:�P�EA-���-F��dg���è�}6�ɺVx��Z*{8+7�ˈt�Awǭ��'��;�y��ǚ�ߘ�K4>V��ߙw�E�Ms>n�����gZ��C�;3�O�c���/8�>���ѥ�1���r��¢��=��R��И�޳?�
+���_�=l�$�Q���,`8OA��mu:�éԱ�c�E�4 ��g�6�pV	p$�&�
+��
���


+Hr��/ȟ����g]����5g}.�W^��U\� �aȄ���߄#��\�s�(�4ࠆ9
N@�5:p�O��Rz�C�,,�T%����e%�8 �J��Y6%�G?�(cUd�����	Dߓs�l�jE�nW��10�1Χ�;�>� I5[�#m�?j��j�O�Z��N�1<�H�+���j){� ��X+	��}RB����L��8]��PE����b��S��Ce�xN��l�S��&ٙv�=-!R��;8?�-
�.���Y���D��ė�2�����u�S0~�PVc5E,HV0 -V]#��}��
�>ӝíxK{�էޫ�e��_�TV���}�(S��4Umq�$Hgτ7f�W�t]-�(mg���y���O,q�'�A��葜;��aN;4�z��j��O����:��
�'+��@��TnJdOB�P���;�Ɉ�~����#&����CQ�+���6kH_Ζ i�*�D�
+"��SM�7�V4�r.�h�)��V���F����+V������pN��0�G}�ꫯ��,h+kZD����Xx�\�� ]��J�q��@w�_��CQF㧲�W�f����Q��5C��:�0V}�`��E��oq6
k�82y�u���0ZA������Z�
+��V�p϶����_��~.� N��|%��4�3[��v�!���x�KV�uÊ�,���2�{o��Nb��D���k����Q������wU�u�bmڤ';��dp��[�ADu
�
+�� ߠ��8Zz����	=
63���},�7�Ɣ���L���.�ё�qP>eaO�NX�+ ��������W����,��<
�z���9�-�`�
@5�m`gHc2
+�
+lӠ���)�F�N��C̀�&���^�AB���dk-���F�jW!
K_\���ImR]bt6�CJ	5$
#�Opl1�m��Tv1�P����a�9�s2��um�'��Z���I#���|!N�!�l�^M�j�(��V�tu��[����[��3��{
+o��>�Xُ/�lF㧀�T�HUl�O�!H?���j9��R��숒���9���Ci��7�04�u�y�*F'^6B�a]WM��nhѱf��*�r;��e�	E'�}&�
+tt(�^��	T3�����W�O�e�10K������K�[�6�Yt%��F�:$�\j��<�=
��a-$Ш¯��ҀgH��g�����0���`�b,/F�iOH��(%0�W$���p@
+�w&[e��r�zuq�^�]�������F����</����0bBT�Ъ����$6�Y𫐄�0Q��@&���&�)�����
Y3M��
�C9�o��m^|���Jd?�V�7WS��|h!��U%%>�
+pm�
+�\ds
�C�1�w�Xm�fJFS�9��=����@��$�8��6�5�u:�Y��`S��
P�\�5IG����c�Y�M�Fx�`3��ӊ��Y�!�~t	��(ci���'N�ҕ�8��Ϝl����7�K
H��C����,��rV��H$�"M��"��.��p��6��c�����M>�H��_"��d�p�٭{6H)��FZtx+�8o
4�%��*k�iIV--�,��p�����<�'������e�U��7��l;�wE�s^�O��H)�}��|p۶m���I�8��|��/��[nY�r�ey�e�=��㓓�J�{�7��oܸ�߲��X�f�G����-����RˮD�"24~�2�?2Q���"���ӅatQ��7��+e?��ռ?
�k&���J�s�U�4L��'�*p
�U�z?�-{��B1����b`��U��"ȗ���y<t5�t#�#�<(���(4�dM�vY��U�!���Q�1�
m�&1�ډ��"�ψ����G̟�

��f�����L�������.�Ҁ�D���X�����SU��@da���	�o{8S�gqI�3�F;"
+�U����!�L�&�K6��dK'�I
+ez)��tv�@
v�a�2��"n>�r���8��tO���h�>���b�8�7�v�$����mR�G��fd=�MV�
+��/�d>!*h'\�ۼҔ�`�>�H)��[�d��@��t9���~��$c�z���W2�?%�"EN��S������2/z�m>>>��q���v6iZM��i��roA2��r�w~x�����:^��P.n&�R�?�dgB�CpPS��l�
����f�8��ꇫc�i��,,�7aSJ^�dpIL3s��ػ����E��^v�\~���'�Ojy<������ � ��
��J��+����{�Ui�^;��o��Ņ>���ĸ��}
+�[؏�E0�C� �����7pp4�t�U�xa
�" �	'�������Nޗ��0�H��I��BIJ�Tc��d�l_�
�݊4Y
�/X�����S�����6?+U����<�@��Q�Q��e�o��۔*	^M���^`:`g�1~�
R�f�nB�v���"�`�:X�S^pS���K�v��q���_�0����z�ɗ����]^V'��(�IV��:�50L,Ψ>�
+`��K�9���芁 ��<{��\q�d}�J�u9�0��y��X��<G��SՆ@D�%Lq(U�3�O�yRe
�O�q|�yg��#C;�yq�wƺ��_T$Lq H�]\�Տ7Y�^�1IUQ�՟���&΄rQ(gg�g,q8��6�e���R���o��5��L~J��+��o)GW�k�uAN�gg�_X|P
X|�O.u^�ӹ
+�L>#��H�e=)0腲=�NV;d�)IB����S����L��D���^.�w������[�p�>��L&�O}�����x���n�ixx���λ�Kv��!��0��_��������.!D.�{����������U���5m��G�Oߤ�ӭxKB��1���0�s�t�!����j+�>U�����Leo���R��_�5��3���)׾�4�5��K�(5m��j�*�|�:s�i��j����v�d�0!!����Ë�_��!�^"�t#
=P
+l!���QFI�X���xDh����a@�~e6�������
q,#m~���zگɮ�kȢ�ZMM��Y
��XB��p;\"�7���Tdh94i�L�Z%n=._��Y�+!�`��+.�U��=�<v�p`��2ʧ���솀fjp�7��RkX(�q�o{���UOkX�aƃa��uP��#��z��{�'�A]�p�)�ǁ�3�Ć�
�YWS��T{���@Eͬ�7�$2�z�	GDȊ�F����tE�]�%}%�XG����{;r\�>�m���%��@�7��=�� �<J�
+6Rr?����-W�=3=�����{��P�|��ص��'�|����d5gS��2Ս3�Y�G�d]�x.�|�����*��g�$I��
+l����	�O�
+��$����@0�E�N�\X؇7�f`g��E4�C�9XUV�
=��Ņcj[	מR���>Ю ұ�ˮQ[������n��P���oW�q3����C��Y>�
+`�
/4�4M/�����'��
�
�
Jh���DT+�˫�w�H����3����6�9--
+��Z%F��cZ�N��N��֧qR��O������X���?����{�aFȞ��� ���/����v�q0xz����a��T��L�l;ԧ��B6?.8#f�r�0~���q��=J�翙��B��Q�!���0��Te2CDY�cJ���N�Hr�D0�(Ŝ�*iu�&�=U�A:���Y#>��#޻g�_k�h�du�x�V�]��qQ�E�W'n{,H6p6��5�+���v�cI4\�1����H�R�.�[���(JV��/3��d���^|q���ft�!��6��a;H6J���:⤫�j����F5>b/*U���d�W���9}{ {Mq��%m���,U��왛�Z-|���A
~ҒsR����]�t���#�U�ƞ�xU#i��&"�d���R���5lqD��J��\���N����Z<����C���?ܲe˿�E�C=����_ud��x�����/�oq�ok����'>�={�<��S�������z�u׍���?|�/{�j#`a�4��%��k��V����8�/-�բ�hξ'������1N��V|	��H�C�k���~pc�B6��L�Fȷ�d����&R����8n#��E�BW�d�5�`X02�;v�m/� �N�"A"  .@hT0�#������-��z���8]ސY"�e>*]*�
�)�i���P��+�+ ۇoC�&�0J��m\3�����K�ޢ���#!���c�3�̿��-qE��y>�n�@He&�1��ф��tOѯtl6;��+h��%:�M.����zW�P(�<��wan�Lӎ~��.��/��
�+��� � ��6��]����q�DW�lR����v_���3��2ٞe9ݼ3��j�;�g��y�{��l��s��*���>�
+���s���l�0��8���L���酶����#q�F�N�꤀�j���DV�x2����O7?��fxC$;]^ϋ	��
�&�N
+�
�%�mxa��f@[�0օW�fo��d�X���
+.���Z���Lk�Sti��py'n���E���v��=�<������c�P�i�l���Y\�A�F���qK=��f���έ�nz�.�O���L���*�Ndpq�O�fh��=���"��Rt��9�5YCfJ"J�I�L>c����3�{;��Y%��q+�4��q�,L��n�g?C`x����w\�g���́������`�qk�&�Xh��%4b�]�ҋ23`e��!
+ћ���Q�T�x�nB^��K�te�1o�ȹ��f�y<��Џg�'�8�i�CA�h�$��"�`4�`�b
�-EF�|�𡮶sG�y���n������	?��j����x�k<%X}⶗ӊ:�N��]E�'��X�������lrA�R��8]b�ۛ�;1�K?Y��!����8^�?��Q$�^�1�?ǰ�%+mmoA�{k��.����5�� �(�t�J#���n$����jt
Coq���3��z|��Z�j�}�2Je���X9�F���D+�Ή)���_ܽi�fUy-<W�۷ON�}M�`��(Q�5숨`4b6W�A	6b���@4"��(�4X�U@E�u�s����^��Q|&����y��1>]��x��c�=��k������Z5�m�Q�-4��Ģ�@.kf[C���(7�GӞ����2�����U���	hvn�����G}�.��«���?1rǎk׮�ꪫ>���|�߼�+�@��k��檫�:�s6o���/~�T*]���͂��š�j��`��R� /�݋����e.ߗ��8;u&�,�O��_EI��ѿ��t��4ے�c�k	I���0;�Ѧe7r�6˼j�?�����<�G������B����臗P�b�ՙ���B�i����8@s
+�
!��
���rt�,y�$MO�B�d�<E�z�1�g�U�,�ke�_K�C���
k_�zxR�I@Jd�A�]�
̘[cLv�Nc�B����0���I�HЙU����I��}E��a�I3����� �
+vj�l&`҄�!�%|u��OƆɋ���
+vX�(���~(C���q��5�a���4�B���G�w������6�+ċ��F���t{3S$�S?%@��d��zl:�	"<���hR��H�5
���Z������|�2eJÊm��+S�z0ˎo�>�;���ϩT���uiZ�r-��'F�e��m�a!�r�Ru����b�m����9?��
�\�.��+�_-�?��Rpگ��W���4�� ��2ۏ�7N_��N��	�$�_#/�Y%lJ�ܳ�_)��;����X��l�}�_�����@�uNAǬ���L"�g2������_q�S~����C6����.a�BrX���!�����j��n�g^�b�K�6p_�l'o �R�жQ����Ur����Hg�	���H��HS���q�vm�R�)X�V�Vqnt�������]Ì�A��T�=�P�=Ry���~�Յ
+���{E0���~i�bM
&��+�hhc@���P�
+G@�]���.���T��S=T��O���劦tf�E��y�ã�6))�
�Uj�XSᡂ�!A[��P�
�ɂo=��uS�B��u�V�f�h�z@��E�nj6�/���`����y��{#%�'.��;���R�d�Vu������ã�(�?Wz�����E�+����^rnt!�ca���s���v�ۋֶ�s+%=A�ms:�L����{7��;ߓ���P���J+T��伒x�c��ϖ��^v%A����^��5�
/�gIs]��.�-��e�Kl�j=CIfѐ���`!̴c@<�����s��)7�#i~ҟ�f�����k�?1�����^��O�&r���W��C��c���������Y��_X�J=Њ޳ƻ�bӾ�������)
T�
Ύ����*�?
��������;�^��Y��Q;�hѹy�|)��N��<?�|Pk�|c��5�է(
J"lbي�[��"�.��V\
����>�P�!�TF@�n�*�@�-��ɑ���aZ#��g�x�ĕ��av�s��%�\�k����s
�+����[��Nq��H6�5�i��=���"Y���({d@!"/Z&��dCdZ5����,e/�'���U&�cl]�./�%b�TX$�>)	b�rG��a�R��
+�X!�*�8:NOV���[��m��
�
C������
+�����
+A
�Bs`�w�c%���
+�b��-bݼ�_����Ff��t��˥}��SCc����ĿA�VM�:ܿ�5�W�T�/�����(��~|��U��t��9��;�|c���Z�:���r��,-��.�-�@�n�F��W����
Z9�� IDAT���J�r�|�zJ�nvV��A��Z/=��X���UIjB
+����
+�F����8�́y�`�D0J�]�.�7��f�r�<Z''W�*ted���2
+��%�O�.�z��N��i�g��Y��4;��K��u�>%T��"���;H�/%o��|l&k���L��q��G��������U��,3��9�6���K��IW!��R30���*�0DN,1alzژ@�eM刔��"���L-U�JI7��-���f'zO���n��(zu���9� �֤�V���v{a���@),��+cxJu�����P@g2{#9�Q�
���_��W�*Ww����d�icX W&�(�ћ�O?�8�pIa�[�!���'��O\6;��X:y1���J�
+��ye������/������%A��2�7s���E��bl�bS�x,ʷK쌒W	���}5��H���!���m����|xi���	I+�W��̲�%m�L-����M�j�m�������ֳ�K�\���������.%���]�e/0`A�R���^ź�����оǟ��.J��tCս�bߧL��o,�?��'�B�&jin��s�E��|�˟%P��e��Vv�
�!�@ڄZ45 ������N7_e��'т ��?x��_~��i����o[�j�1�����Ե
+�;v�Z�������߸qc�����{��_��WGFF����/|�۷o?������5-!�gQ���gz���/qFH��1�/�w�Go)��l��ӹz��{�_5��׽�8;g��j��0:�h۶�i]'$��G�����iB�%���[�^',�)���CI�:��� Y����-t���6����9�gQ������ 0��J�v��b%�w� |�d����tv>y�4�h9�9H^4��
q���S +,r�����
�p5r
+^�E����X�b=����Rb�1nk��+d"1��]�^1��h�k˂�T&W�G������JM�B���
�x
?}Z���Y���2�D�lRk��`L�#���y�29��&�U��"ִ~��P Kͯ�g�˟c���2Os����|�
+�Ԭ�r]%0}9Q{�q-6��S�ڊ�:�_�uݱ~��[
+޷z��
+޷�\%�r@����a�6=!"���6��z��B�Yhiؚ
��8�VH��z��l�D��G�VOl;|�noO�JA[�|�ZPA`�t��-<��\2g�l�#L��1�_K/+�������X�lE�ubSZ�έ�*rW�z�#N6B�����Tjx[7�
+{>efZZD$:͑0X�i{t�����i��!��	Mg���ar��g'�-__���(��:k���}��>��Ê"Y#S���s�D�{Dߺ��.C��jf�Ĵ�tI����j��l�6$Y��>=6Y�~�[
+�k�)�[���M*5ggz���=N^Y�^�5���1,‚S��hƑ��S��A,�G����#	�-X.��2�O)W��	d�d��?�D��T}Axґ��d=3�`�F6�x<��mAĠhq�w���Z���|��E{yfR���￥׹`�j>��i�j��V��kv��컅���}Y���V�el�\���c���҆��
8�m[<�
+>�ȵ��+�l_���/*~8�O(��Jӭq�R��e7���y�F
�|W���89��хfxE�F)�����[?i�)
�q���8e�c�=���@���;35�ic!=}Ⱦ���T�)�?K��(?����VJ2i|��V��������ڸ���W�Z�S����d;;��
+�4Ju	�����w.�]t����"��;���֋/����o����瞱��v�}�UWc���5k��t�M���G�J����U�V�&��������w�����}�����֭[w��7�x�G-h���/���f�y�i��Ƃ���[�����XMhc
Y�J]7�I��Ń��f���������ݡ��2�F����s��B�om�oxLN_[.\�5J��&��_�
+_%��.sP�n�/���=O�j�;�
��WA��a�����A,�������X6�[�]���ˠ����B�of�����Fx��mV�ڔY(��=���dh1�E�
�D����ac��EF�^�+�P;�nn�M��*&�/3S0�@SA�jw�c�g�{�PÒܨ!���l�J��D�%ZH����&IM�JW$���9��jhd9���"3���f�kv�hB�R�����z��7��/śd	�Ps�����@��x���<6a�K����8D�t(W�Ti�~��M#� �\�]��
A�r�
+��
+Ώ����\�������#��w K��/^U+��;wh�ϏE�w��kcSy��S���yؚ
c�=�)�t��gZ����$�`�"|�����b�Z�#A���Hg�\���B��&}�|�NJ�yp������&�I�x]�x����'������HEF
�*,��\$�OTf�G�UFFX��_�EAR�Z� 4��x�Q���G�A6�_>�7ϖȱ5���^O߯�%�I���5O�?
�ym���4�8����=�-����g����ߵ���i�<��
�HS��9�%Cl$7h+�!|�_�
e<W�覯�Ԉ���_�u��MaI��(yu��~)W��F�h�!lh
�G�Ey*GA�����B-ay n�)TF��H#0�B
A†_C�B/��P����~y��[-}���������s��'$4�Mj�tբ�,��p�������|�����Z^r~(�h�k�k=��������wv��?�YL�M;0|��iJ�8=3�k|�G�H���j%��f���	rƎd��6���Ô6�ŏ�k�u�@����T߹�
0pZ������ߢ����W�z/=���	.[�[����]��/��FH�M���1����:�d��X;9�����2��roH�q���̣=m���=�/X�K\>��ߑC���J�VmD3=�(Ewh���Z*�m���j_M�*�]��D��� ;�O�G���?��׿��׾����+W����~�Yg�z�������O|�w�u׷���c�9��l���?���>��|�S���{sB����#�r��Z+~+���_���=���7�����$�X��,�k�)OT�b���z�jƦ������{�J�
+�S�5���V�]R��dlL�������#G�_V�^㗑�(��;��U�[�W��AQ�6�֢{�P��!�B�V
Y�"��)�qI|b������-�\7y�P�O.<T��ngǖ����h��.��M��*�g���a�S�,1̥y_�k�'�p"-teMu>OI��������ZblKme���ԡ�R����e�X�@.�@��ܐ��*����:]�C�ZR����c)@����5�Ar�c�F��ѿ��J^�ai�<�`v���zfz5�<7y`�jt���&���
0����l�g��k+Rgr��w�ܘ�U�u_��Q�猪?E�6�7�rE��7�BXHbJ�β���U�;*��
�yD�%�Z�rt��&���� 
+�.j].U���V��w�1���-�o6|�2<�젾��p�Fn:A�Cǰ�)�+���
�MJ��@Jl�H�WY�{A�:�0�������3�n����z棛�	���f�N>�-e�����k�I)�.�l�7�t�#��z���,6��LY�(�e�R!+��s�6��*��Y���yh��>g�,��x�<<\=q��1�����l"`�9�b8�d���H�HIS���V#_�p��t��~/=׷���8?Y�N)�l�X���v�b�&9;�z���|d�i�b
�&�K�%���q��`�ПEm-���P��PF�lL����7��ˌ)u��u�|�C�M�'UeF� �ҟ�x|g+=�b�Wp~�Ԑ��.�_ �A����ܯ�p������|3!gS��Y:�/w�mi����^�ΡڻZ��T˟��>��c3Z
���.E�����0:?��ע����4{I.����\�`���ڿp�v.�0m����_���q>�?}�����Y�z ʶZ�`7=���F��
+�����/���+7F���#5<h����L����_��Kϱ١Nv��&r���m�[�z7{��ZJ	��h��'��*Ab���j�5:��Q�����в�R�˵�9@��2�-~0�]x䯎�}'�3v�
y$��駟޸q#˲v�رa��w�޸q����gF��+�<Z��^����|�[��O|�t��ɏ�9?��JA�N�r�53=2Q�B���?���1VѾ{���f�3���(}�R��\]r�]�i����/f����0��y�T�|����?p�]��7'�P��%׸��,�A���HB���h!(���)8�
`��(�@K�%��a4�� AF�Pz|f��J᪁�5e�& _S�RA�\HO(�}�x|�n+8f��Q�l��6�"Mm�;�B������೨�zM9,M�BEryE<Ub����M[������𸐃��.���	+u)�wT���"|NfU��z:_��]s�D��Q���lj:���ar���=G��yj�n����X;g~*H��D�f��"��Y}�([~H�bA��C�4*5���5:�+xUOU\��ڻ���5��d"���FBrW<�9w̷��пʶԺn�Jū��eq|R��.Ju��Ϻ~��@�-�����3�ϊ{ %���;�Q��f�@��Pj�k��53��,��'��=���9�:��d���#6(x��y!�
�L��^����%�8��!92������,,����
�����H�I�\�30�XS�U�4�0��8��ĞT�tiQfN���Y������uC�X%�����mvO����i
s`��R
+c�&C���&��X"PZFߒu�]�p�9|Qo(*��%e�2Nd���|�Et�٩�'j��P�b;yM����؊��j�o]�W��y�c�Ӎ.q��y�$�HB�PGe�FeIZ���8�`��
+`�
ċpJ�0Ѡa2A�XY��t��
Hɽ>���^]L�'��7������iٙ��T�<NԨ6~I<��w���؃�K
8@-������>�^p�Ͷ��H���6s�:�6)5n;;��E������W�$[+�������y���ᇍ��K�-Qr^.7��}��f�KƸ��50Ա�X����7�G��o8�H�ń>���B��c�6�a�Zf[��W��ƫt�����Eɫ*�M�<��`>����^�@�ų�ܜ��>[��#���5��kOѹ���6���b#!#��^����������mvhQ��|�R�����U멚���OĪB��͖6�Ұ���������,�RJ�
��V��(�����ƍ���)@B�`%�D,���'��Xlf.�R�u�[��������=�Ǎ�>�g�3�L嚡��f:��ƭ��l����i�>��!���փa����7�pL�������J�~��4�V ���I{c�0���4�������uȺ���B�1�:Z�(�@��њ�Gy����3yl/}Y�G�Ү�(�nW�@/��,��n�<ڳh���ЀO�j���\����ErS7� �p"}6��v��5��f����2=�!e'�g����tՈ�7��e�LI�-�̸����lQX�BF�5�������2O�;b�����]B��!cn�E��xN�h#�a��B�;�px)}����"�
+3����-�y���^Ϻo������W��� �Z������}'%�B��~�T!�v�v[�>��֡;	�C��
+J�:�@�M����(�b��2��l��_l�H��|��?���C3%ї&(�M)-4P��d�,"3��:�'=���6>b�/��=�k/{*
J��N����_B��>���t�u¹������A���pf�2ҧN�����@�����+(����	z΂y�F�o��d��P�v�lX0���G�����RwN=�0��3��|羏ڤ�0ە�����z^��%5��e���g���Lˢ����'
����7�փ�}�B�����
+��W˟���k]�
+���5#����糒�1$hG�G�c���#ZDa���D� �Cwv
�Yp�ph�c�^�9�.
����a��l�t>���)�?=��ے������w��ז����\|#�*���j_V��M�������,Ͻ� K�-����~/|���qrr���ؿ��|g�xc3J�p6U(��
+iZ����ڱ�w�z�`����[��%�f�^�\���J�ʹ֏��:go�����U?��4{���������_���ӳ�^����c�m�X�䦡�g����~vZ��K��}�}c�58�s�Q�<R�t������-��7L*�ݹh�K�
�i/�K6c`C�rŠ�@(7��$Hr$O�
+;7� I��#΃ƈX-�����q��<���O�
y$!�5�yM�\p�
7�w�yG����m��v�����###sss���V��q���-�ǂ�W
+�k�ػc5A`�*㦺L�\6�h��;h�OHb���.?��q
A�
+�׺?L�6���m�õ�j�(���)C(Ju�y
+�E{qT�Y%˵ѮL�5,ZAfp
+�
+�9�
��A9�B҃S�L�%�BqI2��P�
�КA�Y�����w��7�9Q3�9�g�B�����D�jUš�lɰ��l��m�[Opڈ�F���j���y�V�N>QR=�I����5�����:�~�M��6m4���_�	����O�S�4�̣�@�4,�k|��4���%�r��&bS�ȴ
�K������9�a�
�Ӛ�
rʼ��6Fl2�a��]�$urr��"�7!�ӲS�C�N<�F(k�`������j�~h&~��%1#]m<��s��}{/�� ��w�A)A���B�U�o>��X.�
�®��^i�F�q�Z�2��-p�s�ኇ��%R
�z�+Q��g���2YqH�\&���z��E�9l�+��*�0
`�ޞ�
e�D�
�M;��hOG��D�
+�a$J�hn\AbJ�LSmE&�1���s�!k�'��*���R�
��Yc!�e&���׋�|8Ԋ���A鐁�y���!���=�kɇ4r��d]�<�b���O��c�B<B�$�����`>�L,I������x(�8���Jb�?d����7�KGJ�q�\��BHR.�P�b�����G]W��5a٨�!�;��w���p��z�	�y�0��
+#���`�E�/F�'o���8Q�VM%��Tš�ten��0/X$*�]��j�R�|�m��v�%�R�����s�?.�3��-�!
+��dR��l���)Ju�yc��ӳ�29s���{�e=�u�^R�|.�F����7r���ֿ��/jSdtAXG����Z)|����km/�lu�Z)~.���,�s�	o����w_������4�9�ȕ�"���;�x���d�%�>�v�7���%�I�.
+�\.WR�F��w�2���cћk�=�<���l�h!�˺�� ;U��Pn`$��Ӊ\�ai�"����U��h��\�bNH�7,�$$ke�lE�P36���0%�T�|Ht?��.yϦ�w2?�? F��5������������7mfff�ʕI��1b��.�|e�����U���E�z�3�n'����K�u�J"e���~��9m�(�R�$؁��?-9��}?��Z�4��C)p�,
�*z
�>��� �A9��.T&̣4���@#냻���y��
�h��j4>�r�A��5m*�8��y�y(���
�GFƹh�cQC16I�Ν��e��%���Ec�z�vxYɽ~_��C�=�\W�dta6|w���֏X�#�L�>!��v��6��� �v��*84W���d&ĎL���&�C��@�.�}�& ��VA���7Nޠ���r�,��%��3wzdYdQXu�>����cvj$.YZ#�2/Ҭ�gVX���*׎��)�|���A~<%y��5�������8q���>lY;:�O��k
f;�<���>�6���*�cX�,N:�U��6PG� �CH0
��ۤ��[�wi]��s�4����: IDATd:���ny����
��!��MmX�c5�"��hd�ޠ��V��\W9�dz���HN8lѢ��������ʦ�X�ج��Z�N4#:�ܡY�-iT�ɮ6��ɋ���u���о�f�'�� �
Ic�DlmRi��#L��mv,g����9�`�tkyX�N�S�	9��UV�-����\곶��T
�����	6�O���2A���w[|'�=߻�2P��W��k��*j�4
+��G����ћ�p��9d
+�Q݀�~T6"<� �"��0�hZ#�o
@���4?1�O�c�q��Ff&& %Z����q펖>�?T�o��s����/���n
+�������J����=i�H�q��cY���}���12�Fa��y������Z��ԸOGћ(m����v�h�Dž�g���g�؂��^�ׂ���[{�e�.��3ȇ����$ك��_�<�Q��o�l��w���]d�=G���s�L�A�?#�@��H����ԉ�.�Ŏ�8?)Q��8�D��E��Nz6'����|w�me� UKR=HI>�9˝Y��bS�l�E[��ՈM��Ĺ.��#!�"v^��'����c����ˮ���t(�x�����Gy�#��i�	t�DY�,7�"
+ ������N�X�4��Z���m
+:�h7�7{�I�����W�9NIK�*e��:f��P��Gn�wh�%
�� �AAk�E(�
�˃]E�oT��*`���F҂?��.��t2����1�8���[j�+��+c�)�ue����tc��Q���ų���l��f��d��lN�
+!�����\��m�k���L�M����ΝZ�2=��A��f'V�{��Īs{3~}�E~���D��G:�	���b�a�L���`
+Z%�` �I86�M=g�H�Rl^�_#/�27��׵͓}���4��$PH�X4���X�^�ѓ9��&U�����S���Ұ	"Ut��Ԩ6����r`,6;X��1E�k��w{��ֽ~�%!,(�BZ!KPG"�bp�yp*�V (:�(
 �<
+��G�-�_��ࣩ�(�<֜�
+�����ƔX���HN8�
@Ц��7�s�*]��-�L"�i�g�l���E���}��#����ʍ5��H�����,��M��0ӥ��y��_2a�ո6,�N�/P���DiehK��u#�y�b�DZT���A������#�#���Y4�Vɱ�	�d�g�d�D�p�l���]sP"��Ǧ�
)2�U�M��g��(R�u�~�?��ήy�؎.�$�t�^�D���U��q
+��,��х���E!K0��i�� ����4d��R�}p�@�A&�[pk�J��!<��a0��ٷ)5�����C.����q�x�U�����Sћjb�p�ÌM%��=����*=,Ĵ�@)�`�6�{���4|�
+
�8b�+"�`��<�1fg.���J�$[<��J�+"�9Y��r���(��%J�8~���n�G�kS&$���ݾ�Orv�����#mBc�4�"���A�n���'緣��n��?I�'�X�z �7����<�ީ�՜�5�f�D��(?�ۍq)	��Rڍ�-u����
��36�M^C!)	��R=b�9F�6{�O&��(?��m\Y�|+��@%z��5f�u�n=~$��	�J�w��ܵ����_��������g�q���u�V۶m;�S~�mY����/�������1b���d��g��Q�'ch�]Ft���Ue�c(!)@]�h/}��i{�xlr��9�6U��=�0"N_AHL�erS��i��+s\<��n�S�>-ܣ��$�epYoZ�
+�"ib��
'���8:{��a�!c�-�1�*G���\��Ƌ�-�ܐ��s�$�c��K�|�w����L��_dr%��z��gjS��>�ol?y3����䜅�
+��kg[�ݛ@r���BrNڜ6S���Ϧjy ����+�dȚ$�����*���h�C�D�w�����&VKO�b���3��*�2o�XE.
L{+d㤾�B�#K(�}�83�>Y�4�od���clŜ�tI�!^j��h�-�]qYc![��^pn����e��֌�Q�&FޘgHҭ��Y�rG�iCc�E=(
�r�L 
��;H:(.A�,�A���(�
T��oiS�k}��Y��^��LM4��{՝�ekۺY�u
+��w�j%	%A����5k��"��͟�����Me��s�&JiG���\�fj47e��Ow��m���Y���|����5IR�Z�Χ'�4Zυrifl
+iR`:P��
�&�L�F����7�?��S:1�/�eM�ȅ�/<��ӛjꐹ~	y���2������@E�)��gd0Ī�&��O*�K]"DQd�x�dz���p��b�r!�i�9Z?������,E�;���(�#Zw��w�#�p�-��ztw�GچJQZ���pYi-aZ�/Tj���7�9��c���,Y�ۥ�
�?;h�+�a�ǂ�¢���7{T��g�q�XVB(�pM��7���'P6?86��B��?u`��Nci��42qk��&��+�ۏ�u��c	r�{VJp�n����a�{Z���opq�TC؅RȲ�Uj��$L�P��K����u���o4�j5%�v�_5{_I���ٝ��q~r��r����;��_�֯��]l���߹]T�~-؁J���(;#Uc.ߓ�aF{a~l�z(��{r5���Q�r����;��A��%Յ%�k[�"54`?����נe~؀pF�f��e����`��~���e��PY(~s�����B)UJB<����k���o���?��Bȧ�	u�S��h�hPN�G�8MYn�C[�7΅�eڳhX�P
+6e'�փJWl�˱~�?b�P��%�+���j�ӌ�Y|lb�J[��-�ʿ'�ϛ$�::�}�>6���n�}�UXe�"���#��7QBo�D��
+h���g�w+�?�ރ��7w�ӻr06���ģ��,�N�fy�3I~�gݛ�������L��W���/��փƸR��+[۫ޗ
� ~���[*}P�J;�H?���=��$AbB䑌.��MR=��E{��x�3��W:���+#�T����L7��rˌLgJ�V&������xdxA߿�����>���#s�@t�U9�E���Fff�m�t����إnGϯ��D���>5�0;%7���϶o�X?G�qJێs�VC����8�j���3��ReY��
+��M-�s��"�r(#� �@+H�^��xr�����TNԁ|_�,0&r��5�.�9��̧-6���Φ���\�����׌�����S��U����&^��^[t�u��eN�x�?��c�����o0`��U��^v#!%�˟��x�
'�-",b|������-�ʴ�gι�Z;��ϩ�S�������M  Im��6� f��b�&(�	f�	%��E�E*B�|�N�g���^q��G������縎���w���s�5��c�w>�}�ߌ����T[m�hÛ�Ã�����݋��
+W���ճ���gxX�|�E���Pϙ�?��ԝFSdE�.���
d(�;jw�,.�RSv���gYln0���-KG�4#-��N�.C��ٷڒ2g�3e�>�Ai����H`g!�C�ބ���Fo?�%�
+J��(�Agv	�/���!�����i��A��0�ZǗ��6�R�z��6��Pe���l�}�v@ב��uט֋���t���Y�j�Lk�i�2$x��i5
+A	��nx���e˙K"
+�`9{H�b]ۥ��
t��\�Zֳ��z?:��7��{Q��v���? 8���,��j����m����$Ye�vz�7�m1?���V�ґ��9�c��@Y���uRy�G鼩��.*��Ov��Ke%2�h�		��ڑ̇8_��ik�f��V��'r�˜��؉O��|,��	D=Y�(������'D�@Z�@�/Q���qu0��ȿ:G�v��^���믻�n�aݺu��mݺ��k�9��s/�������o� �`"9B���6e?��P������n��(m���)���Zrx'>�������ϼ_�4�t�{9_Z�\%Ǵ��\8�ʲjAp^�N��1(��.�V
+��P�$��E~
�G0\h.�:���N �� �"��A��2Cv"��·;�SSst�ڼ T�<�czF���%�x����f�w�t��O�E����m�짚�Op1fY��rP�����x���"!���+��z�S��J��q���&�n(x�^J"��3dJ���5�X���
+ƋC�?-J���y_�QN�dX�ج'!5"��X�.-��-9-�(Х\9r��|V �T��6T���i�ʓu��daSm
+1[��y�i�O*Ɉf���:��$
�+k:RJ��r�,.�nj�>.dY��7j����w:�
+`�!������� �)D-p�Ytg@
0s�_#ɑB�����a|�P
�K�(4�D(c*\���Zx^NߥѺg<FI���Ѫ�o�2;{�c��'�����*Tʲ�4��N���it?ch{2�-�D�`����s�M�b��Fz��ŲЎO���1�L%Z�A��4H�TU�ؔq�c3t�*�Q�:_�;l�!}ma��$�%��~ۉA��~Qb�@�[Ry�p��׭��ߧ������&�=���H�
�jz����I`�YkD�����#���d|������
+L��m�яO	�3�̛�f!2s�G�!��&r����:J�0��.3�a���
c��8���3��
��^����q�Ʊ�S(
-�D$=�v���C�
Y��_�\��o���q���YИ_��n ��ҹ-<I�L!	�&H��%��B}�d�`X0L4��陛��_m��*��5a;s�
���r�~��C���]��e���J�|߬i>'36�Yw��w
ͥ2���B�I��?J���6:�:@T�7�SZ��nN{�:���m�v�s�|�C��v�r��56C &�w����oK�*�>ӌ��F��n�����6��St:m�)�,F
_^��~��,�آ�G(8H(�֫�Y���
+[�1��Dˇ�����ylJ������c=cݡ+����_ʖ���~���ַ�u�I'�A)=������n���~Ap����}��H��ωv�:�4���X:
+�#eY�t~*Z��~��J��g��~�2����B���5����l$�3֯:�ٮ��Ʀ�����D�Q��D�p[u�cJB�S�S�W�<YQڢ�!GA�݁���6x}S(.e�:D#
�,�*��̄Տ`D3Q����,�0�oU׿T׶mo|�E��]j�Y��S���Z�5��Զh�?�X�I��ާƇ��Tn-�P
+I��i�	�Z�/t�3��
e���uO�s]޽9�O���-��D�	����_��e��n �r���$J���
+�J��C4�Ƭػ��O$q?�G��D%�0�&�U��*�us<�c�J��	�>O�m�R0Q�1	�,���2Rs
+�#�Kt����9eZ=�'Gy$��4h&EETF�L�,8���V����C�D��	���?*~��Y�h6[�岷I
?8)�}\3�� Q�1D-8E�]d����z�������
��tz
�:��u���puSΤh�$zA?@ID�G�'�Z�Y���56�k{���Қ��FI�ӻJ)��&!]F���dBB���o��_w¿�T����{񉆶��&+Z��
e8l FB���V�s;��iD�$nV��:w2,!�Ma	
+�@!]�e�hʽ%�TA�ʍ�!*Yq����_������W�^�ϟ��J�d;rF#W�@T��MB"�<�M�1�|#Y�g>��
�����Y�aC��E�gߡT�q`���'u��j��YH|0�0�QB���@҂�t�Lhd=�pJ�j�n�f�6ʰw��Pԓ|Ouƌ m<�M�Yl��mṙ��<��C�z|y�頋�#�W�A)Ѭ��,z����$��E�Cp4�(
������v
�����=[��&�g@�A[m
+$�Ra��V�x�v碐�D��$����z���'��?"���`��ɑ��/�g/bX�t�W��s�����x*��
m�����Kk����RH�*h:�g�/�u���n�|,�+J�������qR
������
_II��O�bA$��E����%�?C6۫��Z�ZG�o�]\�lb[�ü_R����`Ҥm�MU��6�=m�J�_�#��+u�����#m�~����
�=D��y�5��}��_������믽��\.���o.b�Z&��/%R(a���p��u�,M%IN߹�BJ�	�Õ鲚N[��bq���Q)㑺�޾�妾�\bi[�ћ�wBe�f`O�l���a����I�2[��#�]h&���q�#=��4�~��]��
́���G�AX�����=����
8E����!�����Jy&�5��[�t	�2�ؽ����	i�ڟN�"�{5J�ʟ%,�)P����"�@���`��v�B��O��N{7'|Y޽1J֤�[2�O�A�l��S-�;[F#-G{E�s�ĵ�֓E=zc,K�x�)����%;�ڨqH��glb�K�l�K��bvV��M���K�C���Y:�'�f���*�����b,T��*p�,���:C�4�����^��u�i���zRPH��H�b�|�W����s�]�?T���a4��:w�9��P�̈́n�[�n�*�.��Bf�@v	�4@`� "Y$>z5p�8�z.D|��uK0���R0��f2Rp�ei;���x�Զ��c��m	_������=���ͥJ��]����p������O�S�`ە2|��b���ؔu?͛�/�wu�u�ɔN:s�
+W�͈�%GٴaS�n��X -�2��~c�&��ꉊ��J�r֡!@�J,R��;
��>�Z�e��};K�3�&[����[��EL�����hj�8��I�X)tS��`�Z�_���bq��}��
+!�r���պ�1��z�h59yd��Y��Ã;p�����Bw7�`��ꈚ�2�<�"��C��lڝ�]�I����b�A��m����0>��O�I���Ӕ!ۏ�WК
�!8L�Rgx�^;
)�@�� 
+�μB50L���$z-�i��
�)Ǻ/�A	d
+�<G��l����̕攄��w���:%���bIJ�����]�7�S��3v����� >#c�F�1��r��B��_��3����U�|��v��R�s޿8�C��3���%bA����b�u�������-���O/H�5�Ē�uwʺ���%>_��'mQD��Op���gd�lm�c<���jљ)�w��,�?�;?N��7��Jda��S�z�/��+��^�?ęg�������Ðs���/_p�g�q���#����㎓N:�"�8��+�x≿Ey5��$MA}���Y)Q�"���c�l�(�u�ܳ��Y�ٜ�C(;�X��F2k�y��
6�MV�l��0Ҏ�h)}�mo���M��R����*��m�0)!��-'J�����D�C�h33��wJ���=ihi=hi���,@r$M�*`&�>�9JZ���J��.
Ͱ���a'~C�x4����Y�y1IJ}�En�9�j�i�0�D��>�L�Ҧ���y����޺�������ީ���񔩿���s��g�_H������M��I��TV�xd���j�p�a���c:�u��Y�j�oi$c�(���<����O�#�%�.���A��%�&���o�����zd8Tu�x�j�$���D�+H�LNUP�������;ŏV����\i���.�sZ����;�VóK�!_j믘�!�R�L�$Me�3
J"��/�IA)��,���,�RcEg/
+k0�'�Ds+��#h@	�Z�Qh����ʞM�-�Y}7����ж	Y4�
��L���L�(^;������G��PZյP�hB)^nv�a�nh[���u1?LȂm<�e_̗7�Sm6�6�!_n��P�e3�S���%¤���XQ?��C�����L�R7���� IDAT��I$��b
+=�r�O�$�ьG���Zr�#Ȓ!��S_���
�/�fq��M[�������)6�F���c�R�#���dZ�'h-`G���X�
+ֽR�-�%�xT׷p>nY����Y��Ł�y�Vce�oSn
$�]3�=��R�w�C�s�.FRoCK���5�>��f�[eh�c���|4�+wv/Z��,�C��D/:���t*�A���MT�H b�>�A�Ez��
�"�!���`e���~��Mh&�yW&�s'��i�|��eM��<���b߃��R����R��	Ae�L����赶����t17}���b��xy����ʅqa����V��.ؿ�q>���0>��[�UF������c>Hi��@��N��^rTֺ���by���|�s)�J�����#3��l��m��a�
�X��!q;:�3��'MG��z5m>���|i#Y��V�\_�Y���WmQ�\��=�/ё-�k'����Oב�F�ꫯ����v�0����w�r�-y���
�f�Oj\�r����ߨ��|C��uH�Dz��̉�}l�
�Ҟ��Q��I�(VL*]�x�����W#I$�짤�Ӧ�&ǂHq��վ������9۸�΋�㻽K(c�4i�Y���vZ��gQ{
�Io�4�d���3�E܄��f�R0Zg�Z��9�X[D�x�y��i�֡�{R��4��3l(@p�B�����Y�v%�OԵ���L�{�ʌwC�}��I��5�ɦ�DI+JN��M�����		R����ū(	z�k6Ch�~Fz��<CI"T6����lbi�4嬉4@ҬS�y9��*fLb�T�DNS����0Q��nTW&���|�DN�ǟԦ����j�T��\�/-���e���$V�Mm�u'�t �e�n|�N�X,�d?%A'<W��o�6���'1��sۡ��A� 9��0s�
�{�
#�a�$Md�@sa��c�6���N�?�h[e{�f0��ϣ$({_���S��]o�;n��wX��k�:PAxN�
+�F룝�?L��Q�A�|.�yF���,���tB���ۘ/��a/��OV��mG"s�3�t JJ�$e{=#!pP�(O����x(�
.���շGʚ��9�ܜ�Ơ�P��F����dV�@�eȂ���U���~�g�=�����wwĶ<]*��h��-P�����+s���U���h[La�m)m������%dQ��������j�?%Gyֽ��t@$ߤ�;�V5P�
+�Ao?4���A�	ށ��Dvx�E�L�B�"Aij�;�93�[�z�6��r�_-?-���fPEyx�R`t����̓P�8T�O��j#j�Dt
Yi�D�o����?�sӆR0\�f�00�i���t�Aɡ(�߁��T�n��1h�H�����'�0��89ZH;�+-����T-N�#��K��]�1����ob�4����+U��}Ec3��bּ/��X��BB�nt>%��u��8�ˢe�)c�Չά�o����;	D �$r(Mm��fc�����car�N�G��:�q�oi[��7	唌,V��ת�rٟ�at����_�Ew0r��O������{��g��V�?��&���#�.]�s�NGy�7��^�w�]w��7�#tF�E�P�le�N�Y�g���i���Y>�̌V�r+����b�@uE�<}%"��|��DfY�Y����'b�?�O0؁D����
џ��� �3�öJ�V�++����z��>�I�yh�X�0��y���
dW"n

+�!�z�#�BA��U���|��~=0�\ic��A��4R�[hM�t�$�eY$�!��#�K�.,�c���D�Pʎ�#c�L�Ah��}�ϻ��P���d��'��������;?�eqq�*.3#�/�W��x����U�E�=JT��QB�Z�'R�Ց�}Z��T�	Z�!�"44�R8�|��7Q�V�.��9j���gJ��L�b��j 
�5O��bwOM5�����<�Ġ��(��,3h��n��A��p���߳��f�$1�~�ih6d�
!0�p��:ԀA
(	���$�Ρ���w�b�ʣ��_�����3Kĸ�zIJ&9L�'8LkB7
�v�e�l]���Q-��)���2ɺ߈�T��n�Ǥ̺潭���?'b��o���	D/9�\Ҋ^_�q�����uZId�A{:��D9c"���zR*�f�Y�p�9�9����LLx)����Ҩ��D)�pRn�Po���>�i��@۾a��_(��{v�d�zż|��>��Ԯ����Z�GR���j������p+Y,kâ!Wv,F��I������^xn�kOgR7Y��|�n"
+�$a�{�$�2z0V	��̝pƠ��>
+TC�	(
������^�n�ާ{�	�dMS�Ù��ڶţ'[�֠�!�"	`g�d�N)6��3�����̀���tPȏ�j��vnT�L�A���q�RP�	Æ���26���n�v�a�h�O>HK�|0
+ǚ��� ����Z��5}+e�@3���B�N@AiR�:��.!�ܶ�i��c���i�s�}���#Re4:�ߢ�}:�_.#��k�b1����J9Y��)�J����&����,��	��ҝ�r�#H�[�4ZMd���PY[|<����2��ɒft�N[�k�Jz:���������f�ٵk׮]�6����v�����,��l�Y������>���}����[r����_��J�H�]5/A2�H@jj�M�BѦ�*k�ߣ#'�[��ˬ�(*�"EmT�E徴��t��X,u�m���~��vV�]mw#xW1}M����$q!�W+;�nA���j�0az�O@7�$:��V�,@F�MP̃���Ґ�:�<p�y쟿���+>T<�"r�M����\����1��&{l���n}����s�<z5䆡��6���N;?����@�Rzh��(:�0�E�X�Nc�t��]�xʖ*�������Y�Ʀ&;_2hҍ_[r����M��|��ֶW��ֳ��J��0MA�D3U�
�8���Su��]�	Ԝ��Ș@�!�$d�V�&$��,e��bpw��m����"=^AH3bh:
K��1�gb�	eJ�A���ON��t:gh�4���M�����eC��#�����"@���TC8)����G�B$���[�T퇮�+^t��?�x�����\���/y�l��~�%/��.r��-j�\����}��Pct��_5����k����.�j�t�+��~�ʉ�_�F/>�k�:��?�<�TF)W�*���|���l�o�����r@)/�&���}����F�_@��2c�^"�}��X�ꢷ���*��X�if6e��v�Ȣy�+M�}Ր�DA��S9
�zr�?+�J��b4�d���1ځ���X��ÂHu'ğF�#�e����V�zj6<Y��X�}��R��ӕ����]�I�P� �p���B�H/��`�)[�p��I�̣q�Q�%'�tި�
+�#A$�*s���
��5���j��4��r�?}�p���e��Y�Di�{�
Pg|�����~��""+o��?ODm[�
$x�ا�•K����w�����ݕ��?s�Ȟo�!"x}�N�9�B؃�ѩBr0
v<Bi����/���	��^)�2�$�
����I���d�]FB���5��iv���?uS����m\��'�~g�/�ћb���y��eJڎ}o=�wY�%b��hlz�sc��e"d>0۹Π�(Y�U��
�R:	Yr�d��4��E�۞�+M��i=������Lp�ͪ��_��|=|��Į�x�w��ƎH�M�Y	ޜ5�<�����3_��k'���|���X�t)!d||�q��秛7o���~����Oy饗^v�e֭[755�u�������?�oTG��S�ꕆz�_K)`Vn�0xb����5�۔���b��D�l�։���jҚM��>]4wؔ�m���$� #9�e�b��OJ�\����� >9��"Z�7)�&J����*n��L�9PzFԄ��0�1�cH��Q��흀����n�ս�b�M����bē��F��	�'�!�����`�5oqː1�G�~y��_����J�?
+��M�(��enW���+�����/���t�y)�"H�)�2��Ӎ_{�m5�������h��/���|��6qYVP�����u�p��upEtw
�]҅F�Pq$���4]��)����Q�3��D"�*nIс}��i���N�6);c^ ��l��[ؼG�n���d{$��6Q�~o����?���)�;��t�s��7d�r��0��|8��}�/��e������z��R�{�B	$5�s0
+�=P��5J�5��g(���ᅣ��������.z�f�o���t�,��r5�L,U�;��s8G*��z�� 0=7����Z@����?��+'K>X�RȲP)3�/H��^r��m�o�|�TN�.A
V�N�$!$�$�te���Hf�Z��c�4R4} �M�NC���tb�u���H[���W��+H��(QICm�q O�U@�t�L�7� `]�C�K��ȵ�-�L=)����&�
,�v+>�hl�	7�o�i�.���ةַ�*�q<��Y�A�G�1z��V�,:�v�%��4�<��7���w}�x(��x�3 ���SS�C��������>�(�vn�C	T7#;=Uȟ|5��
{}^Et+5ރ�G��L�Z�̚3��P
�����Dŵ'�h���>�.��!��f�d����R�SE�Ş��d3�
+{�	�c)����4_$(���f �Ot��E�/���(�'����V�
�f�q��=�9�N�c���m�>�N���g=�nr,cR��/�	��W��y��!�*�k	�t��Ns�8o��'���L��|1#�H�9�FFZ��Ư�i�\����3�%�G��X�o�W�O��w�l�Ӷ�����Tnݿ���_4����٤/ӓ�ZB��n��a����?/��G}thh�N���+��կ�|��_��/�䒥K���o~��ϟ�v��<��}������v۶m�>��A���bL�
1�%���ݳ�ڞ%�;�w˚1��җ��PD'"R�dRo�8�eZ(I]
�d�ƒ@Y�*�NV{��tx�A�
_2U	.X����n���|�;�X�'k�x���R7�@�vO��Z��Ӑ���܅���%�$�H*@˂�`�Bq�V�=
���w~�xn���G8h���A����%(,��{���/�����Z�zH��Q����/zߢ�ݬ���:a���1L�n@cS��gK�5'K�������(��I1����?��m��b����֝�����3ֽ
z��Z����m>�Ӛ���sY�)�)֙�MIUV	�%EJHOF1�U�7��'�<�&`!�3d�}[��T&��#�lc�y��>m���MF���f�o3d�E|��G	h���&�2]�0?��Nrt$�&������8R�B�M��	_61�5���z�y�]B ��$�:��9��+�?�p�툪��@z%���E҃�~/m�6�'O�#�.�����;�M�g�y��!`�*w��eĵ��o��i
+ǫH	%תsw~I�+�a�/���W���p{÷{�7�fJBً��Ҷ��o(.�i����LY���}5C���i{]��H�D"�Z0��(�+K;�l��JZ�x�O��X��t��=���v��0
^��!�5�!V�z��<�����p[m�H%4G�|����"��R�%�����ާ�0�-c�s��V�cl�>��af�1\�%������/iav�Ȍ�Fϴ��y���ƚ+%�XɄ�Q���D������ቛ�0.����[���۪[M&���H/Bj����͇o&$�,�>�F�xs��� c�R����y3c��hm||�7>���F����Z�cp9BD��
3���LGyt[�C3���rp�?j��x��-�n
��^��H
M��P컯X��R�RN���ҥrL�q!�x�p�t���dZק����������C�R׶E|e��q��З�Ti�x��|����ݹ��C� R�m��>���ޗ�r�21H)�,mk""��+JR�,��`{tt�3)��lf�z!�)��e>ˤA��
RYim�l���i�7��q��ׯ߽{�[���J�r��w���}衇,˺��kgggo��|>�������_�9/
+�E�{2�]����M��%�"�%�Hf8�6�Rr��.�XԊ$���dD�^���Z��,MWx�%Vf�J����+Q�KIV�4ӹ!�9��tڎdѠ��/u�?
+��Y�����l]4=��B�j@�2A��L!���+��4�2��L
���oAKC/ �z�#��ـ�/:/n��vB�,�@̐9����z^t`뢯<�pSc�_X	�]T������c^4ܞ� h#]��E>L�����1�
���a�r���6LX�#9{����9�F!�"���9��|�D'�����!cl��|�[��2���|ĢI$�"Ub2�o��_�6�M���<��F6��9e�)�&�6�v����I
+���L��G��t�{V=0B�9F.�P?q���hM��S����YSOe1�mO\��a_54��F܌�@ ��fG���>�Vi+���.�fg�{��2h�:Z�. �F�� ̄�7!B9���./i�Ջ������W�s�I�g�?�e�^_��ڋ�uhl�Qz/�&���q�lx!�Dk���nW0G_��ʷ�����=t]ͷ���)��{�{�e��ݻR�l����	�Τ��{���_Y���l狛[���k�*�+������
.=
�h�h&�3����X��v��a�;�1����=�Jte��ƒY)�W3)�`�����9�.GV��'{jj��>+�(����&�J,�VP�lO���%�H	O,���r�ٌ�]����q�Ϙ�g��M�1m�4�������t.g��~4s �� s��̯q�YϜ=�zJ���*�E�O�B��,@њ��EF�A�E�lZ.��~k�����O]�OO��+,FF�g�=T�`,z�qv�p�-OG�+��	3��hh�`��W���C��H�Euj��V�� ��S�0]���f�D�(rx�g����i�>T�N�;n�'��N�q�	}X��(>�ھq�o��V�C��p,���վ<e�.�@��IJ��Gl��f��i�V!�	_�Ò�g
61S��?w^�wE��g����k�!�l}C̗��s �Հ/���{ߋ��6_��
+����mQ"�)�V�w3��c���.g>+=c=iz4�en���A�;��H��d�_^��/������?����
��:�#��M7��n�����]#��J����
����9������0-�"�.q��ؒ��q�f�
�eq�Z�R�$��"T]	F�$ 
�L��:R�b�"��F�m>�yW���V��|8k�����qKQ�1J��2uR�^	̀��w@4��&A4D�`�.��-�l&k�?�}��yo�}��Q��D{�Ԁ���E�E[��o�۟�F��tEkx�ڷ��,���������
z�C��^
+��P�Ȗ�D������v��f�8�Y��o��|:�~�����
$������'	���H.��2j�E>_��}eZ���m\QJT�d�h3Y�H�5�"��u���~[h,��#۔P_rxM��p��q-���z�@'W1�rA�B�hpsd-��6G���b7G��*%24�l-)";ɒY�.=�쀯R�:�ar�����Ӕ�� �f"	�٘x�^�@)X��w�
Y�w�3~���f/
��x���;���7���V������yW����*���	�E؂H�[z(�~b�+4��i��MHI����y{px�'޾�;�ԝ��{�����z�ZY�|5HNp�?�����Km�,�%��V�z����_����+���Ҳ�%R�#{Y��I�f�#gy��$TqGx�t�M���ۏ�j��߲��^�*ޕl'`�rSE>6�����T�� IDAT�)��]����$�պzU"��8:Aӣ����$�L�q
+����|��
]�֣�v�4Y]�ʎ��F�sC�S:�[�z��†��d^;�r�,���I�~��B}~����g��i������ǁ��Jє��a��
�n��#�%��P߹Ǖν�B����
�jPsh����3��=�5�8}���AX��Pd�ћ�X�����/k\�|����MP
+��+�P(�l��?��i#
+���i
+B`䈦���%�bk^C(���Ƈ�j�;������t�juJ�q���E� 
+:�
׺Gg{3�
"�+�ލ������5S%�c��7Z�t.�Ƈ������l�R6�}����|����e�����^|����H��Q.s�
+:�֌Nf$����9�
����J'9�l��|,�@Z��ݍd�MdvY���N}��˿[O2�L������v��6�J"���ۍ�,%�T�%2d�Fy������9����e��"]v@����M��	y���;S�(�[F�҈���i�a����R�R��lVBeV((�v["]�*-�W67v�RF����띯��~tzֻ.�~��:Ѵ��20](�ґ0�0Jh���k`/��@v0� 6?|z:���5��ރ�-r^���̱�lD8��1����l
k� ��"��5D�C=x�:2EH
)
`v�NCۙvoiu?Q�}���T&�/���u6�h%J���u)�L�V瓄�J��&��/��3겲��������y����ʹ���E�(�f�ж�����nA�pl0�MA%���(�*����wk��������������c?c��c�=֟��3������_=a?�IF|���k4�J��c�^G�t���:�ʾ$���*9*��oH6Ֆq�ʪ�:D7��d�H ����]2YU��7��MT3Fu��a����]�����#�ʆژ#�LRʓ���7�BK�k#me�E�L
+�X�3Z��:���qU���L�_���^R(�MoJ�[��kQ�%�����1l:��
l�RZ
j��`�9�]d�#���S1���-�.� S�"3���!�b�,Uf���d�&Hc�1@�ip��5��]'U��v'�z8��(�0JO5��B
\�Mw�Z�~i��s�Oe�f�p�{à�#m^/����J��C1��Ƞ�z:��H(���z�t��D-Q��ʓ��9�Á&`�bC�8��^F>N=(�� �ѿ��g"M"fp3dI�.9*�ˑ�ZU=�ţ���ji0�4-��	_��(Y���ـ�i�`�Ɔ��j�=3�^�i���&�>N��d�]�lK�m������IJ�`ܵ ��������jr����&2�pW"<j�e�ԩ�/���gP8��hJ�YH�P��rҪ��vG
H
3�E��	B@5H��<�bn;���Ր�����[�WF�Ja�H#D
~�atk�C�+�ȅo�#��ǼΎ`��d�ٝ/|O�Ry��F�4�0:��EiC�l����Ggf>���u��!����{K˿�������M׺+Nόғ�,���26��}&�
+��v�wk�^�}���%a#��g<�Z?��n&PmHe0җ�M�:�����f���W�H�s�����d3>W#Q�x����������nDo��W4v�̌�_O����u������֍7���-X��?
F~�����pt#LO��N�;R��B5�''��V[��,��D�̩gK�����:��F*��hO�T8B_��n�����7m��q2��|���28��j�f�#*�VI�o�
	bQn����b����ߤ�Y�3��
�s;���[��kQ�OC�Ȯ�^�Ek���}S�����ba=(��ٰF"�PH�`� mBq�Mt�үk�?f"j���8
+B��
���i��!�30��
%e^���al���\���	?�6&J�̧[���v��\,T���2�cPX���V#]�Ӵ#��!t@k	�`ШS52'f24'
�a�KV%�X%�q����ڔ/�����IF�
+=��v���G���VW�Le
��0��cT�=���j}A���$�
c:����\I�{|%UF�B��/��󟚫�*��{�֩:�O�k�Gᭆ��X��mzqፓk�)��9�IfF
z2d�Nu0� 9���џ�UQP2
+�f��Э#���p�HB6�.R>��{��}R8����yB@i�Ѫ���e���e�6Fz�Xj�:�	X&���Rt���[��+MV�6�	ˢA�gR�iA_2��/%#0+��`fɢ2�׉#	?"oϐ%%r.
M�
��\O��C&�����3HY 1��l�h6TaC�F��/�"Uf��m=z�t�xLt�����L�B.��t�Q�j��}��׾%:Ml٨����G�d��!C����P�k?_=R^�⩰FP8����N0΢����.C<g�.p�@4{q
I�$��=�Ȃ��}H
�u0xzG`��۰`'t@���b�
0=tk`�,�.2D>4�tv&	�/�
+f2=-B�������ϸ�?�s];�DbD�aB�0�td�#�橖�t�������6��:;V*��g0�z�����fm��0�ȳoW*׏.�W�ڞ��p;|�k�.L��'�9���Rڞ~��
+�,S|�x�U�������p'=Y*W��Nڃ�o陀�џo$����X����K��b
O;�J��N~���Zߖ�C����?����5���g?{뭷^}��K�,a'BQ
�^{�"�|~`�^}X�t�^�Q{Zj3G�B^�Q���d�R���ǘ/�s�j������'J��v�j�D��㘉R���ɭe����Ū�!��tKU\U�
+dM�"����2jꤋ"�BZ���z�D�sT�����C>_0`�/U���Z4��A�x"�~�0k�
+�/e���(jw��_�o�5O��A�L�C���!w*��y��"��4�A��@O��&��n#�SaX�	�,�>�-�R���7��Zw&|��?���ŗ��3����'w��<󁘯�Zw4��*[K�O8�t�s=}K/=�"��
�ǠF����ɲ4Uz�H�uSe�IT���Β���4��,�e����<�ZDޫG�w��#��ȇL�"���X0�GFq�q�rW��1LBl ߚRw�����Rt+�¶�
+�
rQ���"vV�d�ő��|� �K3J��*�j���$T`��md͇m���5~�u#�)��5�ml=~g攫��x�3"��!�%��@�Z�m0+`���hl��1�<�"�6��azPI݂f�5(8Y4�V�˻��cs�w����ѻ�5#���y�k����gA��v�V�t-}%�j��RѲ����M2V��U5ڱ�����9m^(+Q�I�����D�$��J MT�!%��my<KG��E��#�Tu��J�?-�s�������7�A�ZA����O�RY��W�b�
�������D����Dq_��tЦR��DPb���3����l=8]^06�|�H��ݯ8�n�ܡ�5�w�#6s����֟����g*�C0�@-�|�}�J��Y�^�Bqd֡��k��(��9s�އ�D�5�}0՝��5��bD]D�6D
+����dJ�	2���hMA)h:rØ�3�yf����ծ�1�����2�wu��.��$�f`v����=�j��?
��Zm��зp!�'�����zƾ])����z疌�@"����mw��܇�Zw�ڞ�/��-1_�MN��1�#mC1�kuv`��՜�\-�`��A�׷�
6m��O��O��?��_$��գ+�bY}W"�
+��z�eh���y9<�h3���2�O|������6m�������5��c��E��A
+
��0���vG�͒�Fk�66�p�8�<V�c�,�I>Um��
��W!g��6Ց��%�KF�騝&̑�=u���˚r�&�����	�hm��Ѽ/��ft�V=-������{"�*��x�lu��NҾ4��"e�E�(x�?�o/���;��kջ)��VDZ�@-DG����&0�Nhڻa��h.d��iEn"F�G܇�C���a�I)!�B's$
+r��tm�e>FWp1$	_����ǯH"&�r�2{|�˦t�Le�dSBe��zO���<�W�ҡD��&�}ItBO��&*�hF'�#�9�1�E��-
+�]�c�^>'�ag���DT�3%l��-�+Ak������dqM=�`������~�\�#[U���7��=������h٦�������1����5�a`��>�<�tF���z�ϼ���_��M�D�!��CD�x'AF�m�xi��(���Kq�q�EP�%��Gԅ�C�8��3��E�!�5��^�Y���W���� ���^�8?��3ۼ�џ�����?.�_�W
�g��HėYھ�y�T�
�';��*kR��F|�͵��6[M���T�Չ��~�9ecǮ�<������5ԋ��!�N�a񄍑<](�Љ^�{��Y�\�U�m��Wn�\A>]S�ma�8�/��OPu0b��P;�8�����E-�b+-Rh���:T�a��#����R/Q�;��[βh겙g��U̧��W4e�z�����
'���¥_�������ܕ ��m���]�d�B��*�ӈ���T����j�=t 飰"�YF0���%A
�5P��<�	�v#Q�H!9�L��^
�
)�n,[�?�!�a���G3�#���V��x��xo�S��o�BB��$ݐ��ZpX�E��YC�Q,�]�����Џ�����,�驦���wu���2�����9��4�cJ��uo����/�̇��B׎T��'Ḋ3�ݽ�j����[?�*o��Go$$hDoϽo����td�z���qؔPN,��7�\+9�զ���%����z��
+ZF�}#�$��g8y9y���Bs���{�|�駿��o��g?��0�?SB���pщ}s��-�)�Vw���B�0�e>�ɹ����S R�к�x�.�����ӑ�����|u��̑�&�p;�(G�HV�0	�@ #�Z��*Z�'
+-��<_0�¦��IĀ��%�G��8�|�6���nxཹ
+�'����?gT��k�%��N��+P)��@ˣ�"��1hY��@�
+2�At�0��g��hM�s�Y�	��6�@��$����f�[�����y���K^��v��v��k�h�nȮ|V��a�d�>5��φ.>��F�W�<�RY"������deC�)�IC��,�h�P�
+tX�0����Z�q>����U����y�@�!�M��@q�z�:�
+}���,��pV�����1�!fO"ߘU�)�u��c�-��arYW�*�3rd|^=�b!
-�і���`0���ʽT�EfE�e�o�B��Dy�n����Xux��V���mc��;�ӯj��Yz^���>r�WaA	D�@mtw��J_
+�btQfQJ�߀a�p�8� 8�`C����aP��KH��EA�F���RNʗ���(�x,L����·SҍŒnrR�|��B�O��K�g�ݩ,He���IS�6j��9��(
+eEE)��H%�꺤@AR�Ϋ�$DKmRU���$�~?��rdmK=���A�6A�Bk��<N�H2d	�
��&Ћt�a��qziK�ː�D�lH�eJ�.��s/���$'�t�V��I7��4�:�j���LJBS�Liӱ�]�V΀wsNݸ�k�>8�y������Ȟ����,hyij`�Kvz�1������G SX��sH��}({����2��H|��&�@v<D�8,� �<�{�0m>,�

+��8�R0mh�
4!�!fq�4�H"Y��^���� ~����B�낣�����'m�6W�r?~��o�%���6	RM�sB�}��o����6J7H�d�{m�(>/K���皿�*����#�̍m�S���>3i��|'���wڬ�J�b��M�n����.w=��7�L,F�+h&�6��y�]9���`�}�?��_v�����]w����ϯ_��mo{���;���W���/\xᅏ=��f��7��9������9c���=��1������o���)�3��]k�G�L*E�����:
+� �
��W�)��-Y�S�,h�ld�xl
����9Zα^Wd]
�����f2_<����{['�D)��|g��W��ߵ�w-��栛8v�}��^.X��G~5�w%�ð&��S>q4|�[Lg�(�P"�a�@�
�"����i�l��U��"�Cw��
 	�p�H��d���T,Ԯ|_��Ou�?K�PxGɿ�V%=׹c��s��S��Ư����Fe�
���?|���ko���F�ow�K|>a�f,�2	T�hI�E�/�X%}Y��1�X����ڒ-��&)pG��c�r�@d�2�~Y"���	�)uw��IU���c�W��MPOT���˸(GV
�{jo�,	p\�3�.�J5�!���2?�v�X�8 �QK'��]�� �܇R���Ķ�+�P�+��*���r�Ө*�=�A�p|���aPẐ��ߠ�j�;`���{DMd���_��|��_O�}gle0���4�aA��e���sf�"�{����.�?��д���*B�	Ib�j0��Z绔�9��s����h=؈.����@�Efd��v:�(�Q����C�9.e�T�B��h�� �H�,�Kޖ�F��y1���-y\ `p�؂��˵+�ľ�2Y7��S�/"��j[��YS�f��D5��Ԏ�9L/l��U��ari�,Tm\�J5�7�b@)*n�;׊D�;���J�v�޾e�}����?�Xw���Y�;�"���;�8�Qx��=���'�������0t�C�&�G�]hy�uij0ʈf`���}�T���"�*�{ᔐ���FdaW��o��
��v�B܅]�_
��~<�aC3�ۈ}$!x
+ӆHP�傃󊓩���7�h-�-/7u��O
+�/e�����7��v�
+���$�0��������R�,��n�#\�Lm��0��~p�il����3
+,�ktv4(�*����ԣ7f�������C�o��M�[J��:_�h���g<��|��z<<{q�'Az�P��on�eج��[#��ˌ�n%�d�c�����c��ad�������\��K�.=|�������ӦM�\s�u�]�f͚��n���5k�\r�%7�|�x�����0�%k���uxY����n�����<N���1��
+�舼C �I)��?'>�Z}nZ�cVG�LN��lK֏�ߎ��
e�,T�H�@!5��I7o0Ww8c��tGǴp�s	1��TZ�t��LO�iG��(^�w�+��k�!U���.!���j�:n0�"�;�p��@MXcP�t�"W�Kk�=�&�@g/�EPq�$�)P
 H��j�r0r8��
4�U( 
PX��'�'PD���Jnf��
)Y����uz�Y�%m2}k��5�xZ*/H.(�?����po�
~s�h�Tq�e5ڦ�n�~̗k�]0f�t-%|��x08���d�W�	ݝOY��1�)	H]�+��4KV{d�P�C*S�w6�4:j�B����V��mㅶzACFG.F��^�Ȋ��0�I����3PrȄE*Y,�z�/1'Qc3ŕ���~<k>�'�e6o�nh;)mD�}��laL�t�
(
�f��Qz������?'�'�-C�

+� �Go/���3��1p柀�03p�:�ć�@�v�����8ɑ�HS _�ש#�.ϸ?�u/�K=���g����TC�J �,
+9BI�X�IG!�K�/�|b"�����(�#mw#�`�f��	��J'Kd��xzW*=�n"55�ۇ�Y�x.ɶE�R{��iqP-y<KGb��*�ʿ�#�v��dQ_���<ZK�a���r��	1����iSꮥ�:1-5p�/2�BE,��N�Bـ�}��C?8��;���T��y��!d��$a`D�U! Ԃ�G�I$�2�a��{g��R~�h<����]s�`V�}(���lh.�Q47�Y`&ԉ���Ci9zS�:m� IDAT�nAe����W!j�0����뤒h�߁�B3@(t����Bp��_�ϿQ�6t��!Ü�M0���GmgZ��r��}f��o�)��`?��R�� 8��f/xo���`���ݯ��W��v!�4:�h����l�^[r9d�\�'3�/�t��m�����j���G)�O.��?�v��wX����
�/	9�
��O����'������[V�?-��(sg#��#<�r��3hG)�d�������!�2�4r��a�ͽ��H����������_��'>q���_v�e�s���GF��ir�\r�%�_��^������S���y3T�����V[�䔆�L��������d��ƪ.�d\v,�����ܻ�;��
++Y48q<W�C�Xꉒ�ym>U�t�4�6���AC��u��X—'b�k�.���(�䳟��R��#��T���e�Н�s"�g�D��e�> !BP�j���O�~nU�ܑE�
+tz�&�Y����Ⱦ�
��Å_�7(P����t@����f���_�(n���y������ӟ��F\�9Hi���<坽�M���0����
�m�_/o��y	k�6b����l�LA�T"5"3`�p0\QdFWB��td+P3�l�>���29_Ajp�8�b
G8��!�%"E�(ACGQC�%�M���I��A�
�y���}�vS��d�#�y�}���U�(�l������7k��u�GH:���P�qr���-I����"d
+g �&o���
��8�;9r��އ���KFWg
+�/B�(��!DU0FZ��HdA4(����"T�Brx���D���|)���啡{��C����7s�S��|q�W���0�H*�6=���}_ėR�0��:�n�o�J���HD��X�)�B%��Z�ى2;"�%�؟�.5�Sek$�Jc�f��Y��$x�::q{���_}���2��Z�i�Rt0vD�s�Rb
+8d��6I�Bg0U����%J0�!�`=Y���F;����O?��]�����5�����+G��4\��e�ȯ���F~5�!�#�6D���fPۃg�����/\�3��z4��|:���n�NF��<d��ރ3�pf�)�l�9HZ�U!B�<��C�z�R'�~��G���0�H|��00
~��4�a��ndK�6�wo
+|�.����9݄�H"�y�泚��	1j;��`A�>�K(��W~xM���0z��Vʶ�'x�������?z����bTc�)_��9��R����]�\�ʁ��o�*k���� �Hg���pY̘�y
_��E*a��_MW�=���?���v�*��uV���2���D*����.�r��>1_��w|�l�����H�4�{����s�
�x����?�������?~��ן�����Dǭ�:�j�.�T�����i$�ŊQ�:���i�ezf���=ļ-O"7��s| :�QJ)��X4� ym��3������r��5��*��h��6Î�o�$��������~'#Lkc��+#�'_P
+����.�Y��zĀ��)�&����})7W��;�bv�*�7A	h�+��A
�i<@fa�	"�!��M�f@p�f��,:�A�����еC�
�T�n��
Qr�Ʀl��E�?Qy�l1X}��5��G�����o��cZ"s�,Gb�B@<��L�c�p_����m)S�tT�';����d��wV�5��qh���R[)�re���:ı9�@3QIА*.��;�?��P�zqW�Q��Dq����b�1)����A�����]�KO�9ߖ��
�|��I^vS�t
+C��,@D���!$m�m�&����B������V�]���E�
�w����#�E�tL�P�
�G�O��#�8��V�"ۉ�a��LC!��MP�K�8c�)_����PyJ��;S9\�jy�5~r��oc���0]�'8���[�޹�!�BY��:�j&|e�|l^�r�H��ޤ>i�fG@#�DJ	�0�R;R�
+sb�AukK=��GV6��f�,o��:�V�r8���&ʃ���0W�@ꒁ��`Q2T/i�ES��%��;*�.S�Zr���I���������еݣ���䝆��)�0]��j"�����8�y嗬�G3���V�?sx�u����L�?��G�;��cP)�i�YDU����!i#�P�}��y����=
<�3FLGn���Oʐ�t!:Ӡ:�D�9�4A��a�>�ޤ:��n
}�:��T6�-���'���‰��i��A��e9ǚ���QC�����y���Z��ދ�6����|�����0=��)�:�[tvԱ��$���m��'��S�FIԉ/�b�u~4׹��v� E��l��k<f�ce�BY	����Km}+AR�
H*�P�FgF�5h+��\}k�g֚Oք�b���������D�$�i�4�RZ,����k��E�?����y�df����
+#AG pɸ�%^GU��M���$�3C5�H_���0�M]*-�9O��iP�duM��i$u�l���4���7��
+4�o��m���C�"Jӵ���c}�U�t��A��T@(x�U���+�RhyP��>�-��QB4�����`�L�ʭU�����O�\�`�t R�È[�)���~�A�k'�QH��an�Ø?:��LSG?�X���#캻Z7<��Sʰ?�������Q?z�����:��C��`S�֢t����棍��	;�:�͵�dQ��N�h�Kм����xx��6���	�%�����dy�f�G���J4�S�y��#��I���ںz1Q�]
�y<8B��0<��%o��DSm+�u
+*G����8���\VO�}ձ�7j��D�|<䫆���k��i�[4v8����!�a���Cҁ��-B\�
�x��{�l�S�����S�tt�~��t�r!(�"h��
+v	����p�
����~
<E�
+Ni�@pt���tE6{/c�t�#$5�g;��+e3��2�::�=g�IIK��/O�0%Q�'��s�c����p�v��4�Ϛ�D�z�!�M��q
�F*]FRɕU�H�,��C�P%61��*U��L�e����$�����#(stu�#�
詝K��T�jcڢ�U-Ӆ��h.T"ˤTL����Y��~r%)%~޽Y�!J:������6�2^d��0r��[��I�6z;��"i��Zt����V@�Q��`~�U{��J�6w����f �V"�"j�|2E�8�0��=�&J��
���Q��0q��i�]�}$}Xt�`��zp�HC�1J�ѝ~Ire���i��&<F��\�&���2v�X�A�����=3�{6A)�x�m��!�$c�5�j��2��� ~]ֹ���KϹ��~�h~H
��#a��F�����iz�5�o����U���s��ok��c��h����|+JO��2�8�f�<�����I�x��������
+��~�.Uٜ�|��~��@)b[���jɪQ��Z��a�NJڭ����lV6�],9<�W�K��f~���?�$�\q�'�"��]~���>�_��_�u���8�9�J�Df�q|��S����e��x�L�(���C�9 /�u
+2R�<&OK\I�P��&�Yl��K2ڞj|J��R�$U����DyعC�L"&<�>.��tÀ�q?���}�ٻ1c���r���s=�)�B�t�td*`6�����ӤR�*�U��[=y�Z+[��9!4�Tæ����մ0n��d��:��]D!�����o#7ʐ���	b�����l�E(�-�0C�����$�F&�5gG+u}w^�����ش�y.G(�Ⱥ���O��ikl.H�1���5����Ie)G���X�.Z+�cS�zJ�CӶ@��%��t�4P����A
N�f��G�4��`L"-�5S��<9��v	�1fGɛ4(�YqH�1I��T�'�u�$ƌTz�����tI���L�����LV���R����E^�
�D�=0��ڛӡ;	���Oa�\�.d�a�����&Du�!ڳ�v/��~���4i�jGF��0��%��A���>F<�f�3MG�@I0
����
+��cX�(�~�:!qz�����m ���֝��

�Ӧ�`�R�m>�GWJ崓���?����o���T
6��/kDi$M�!P�ٕ����$�NM��t�xD����g䓋�Ň�c#������\,��d�W�!����/g�c
+:<���.��M▴�'��v��=S�56�����i�ڎ\��V�y�s��$YS(�HB��>*�
���G�E~5�. �.G�� 9��`&z�A5~a����~��_����_�f�(��O`��a������`&�
+k�܂�oq��\��f �
+����zŽ����`x��) 8��<���#[@�B�`BRf,���Q�"i��q��)�ͻGߤ���w2�O�,h�!�p>����J�}:��~x�T^"��b�5U��r@�s~rqɽ�|�`���+J�w��uJ���!Q���|�ǩv������h?=�5����2�����<����ʢ��e�#d>B١,r�eX \9:�;|@'��H�^�8�M*PO��H8�r0����f���<��_�������;��W����o��3�8CӴݻw�S������T���jrg���T/8�n*"ut��ݓs:�WS.����q�5⚴��`�� �T�m��N��h;�"QY�t����=��Ҭ�l*K��"S�[t��_��?x�g�s��u�࢜�=e:�<��p�`&�6�IW*j٩{�{��b�Գ�tMY��A-�
�G "Pv	�#���D��KD��"_��k���4~���
�(3`�
$
+�:
+�k
+��-�R�r�kMS���Оk��[�`��v����䢂u�M�M��n��c�-8�����5�p�e�K/��;,��i��>#A7])�>h�3�a�Q�ܱh�CaQ��M���_gG
��aK�ԝ�`6��T��@	Ա9<0N�K��5
+��J�V[B���"�)����87nD��t鼨�IoȾ��8o>�h˵~I R�T�R������XY�E��B~d��=��#����]�����!8������ha����m��O��՘sKû�'���M�}h�
J!R�����f�b��-爢�
�����^oue��=�+g�g�8�M�}�\+U6c��4�ɘ6������g��	��9�-��m����X�5ҧ�3җJ��FR���\s��ґ}�8�|A"%�G��8������3:�|�����;��یa����6�h��YW�u��-�:dr���|`��"V����G�j�*���=^]�w1ڡ$b�󕦶�Xu�x��$ݠi	8O����81�0<�qV
q��P�Z���`���
+�!�ET�?]�!��D�p�ZSN�ɲ��aNL/@�`:4�xH��%H{�;�
#l����!;f�_�La��7
�u�
+�h:�%�[�l�=tj(�'ps`�>L����N�������XٚĈ�
+����?�x��
�6z�B���n$��ՙ�O��B¬�Ô�b@cǙv(N�i�S�|&�2�=\�3�[��~��_�hG���!B�r��S�����P%�N��׭X��}�1��J��߶«e�[��B�3�ńP��2Z���j|ꐵ1���U���|�-�&*/��o�����[�O�}�c��z�y�g�t���w�y�M7������U���;�\�Z�ߧ?���(���)��WDI�%&��Mb$��h�3����M�H4��AAD,���(ڢ�S����~�k���Quc��$��1���;��c���s��c�s��w�7���"Y�TOW�FZ�+tB*5���*\����m�@�Tq@%r`@��Ju*���si�|mټע�ӟ�̇4�[ڋ
+���0�&$.y��bж�M�3���*
+�&Ӡ$��E���K �m�!��ԃ��������
$��v�� :x�@�����1c6��L�h&�#ۼ7N����v_:��؍�tLG��2��ka��h�����;�k{��D�!q�������_sn�(?~G���E�Ԫt�?u���kj;部nr�Tf�W�&'��%c�A�nz����eI�R�<�n��b__�MR�UN��r��(��qr�N�:�^�)�T'�:xFA,%WEj�Z��
+9&�4G��^2J.�I�#C�Q�~�٫��EF�@���֚og�k��������I�9͏-�i�MR� n<C܂YA<�hY��B� (���
��Fa���ՋV�X�}>6�\���G��0sL{�~�%�t�4@��2TDZo�W�ş�Yv��ҟd(kk������4�
F�|S��-ϸ�@� }��9_>^y%��H���R9a~�c��Ϗ�/Y���/3䲪@�8�+�����
��*��}��0B,b�O�MB���m�*W	_=��7��a������^;�][!���nѕ�5R�MjUrtS=㑑2W��R]�W
:
C1�+���'������u�i<Y��0�,Nςb�ĥx����.�6x�P=�t�>���s�Nh%�.T�d
+���!t���F������?����f��s��7��hO"��`W�z
J�j�)�)h��<�f!�@�`xJ"nC3�Hz���Mp�5��b��qQJiJ@ O!%�-Xv2���,[2��Τ�s��mm��#tc��{�W����I��g�Qa�������{e06�Ţ8='JΡ����(�8H.!�
@�0=K*o�p]?��6�ZRy�k<��F#���~���������m��R�_�ߩ��
+���~&G��M���bSE�&�6��qU�#��� ��a~\?_O���'|��1l=�gǸln��`Q���_�Gڶ��#��k��8�GGG;��S^�R¡�q��A�v�eֈf��ɔ�����Rf&�m>\d���.�ߙ�?�i�lm{&�t��z3=m����?��Ք�z�u��i~�-�c��ax�-�z�>�<�U@s?��9y�E��_KH��Ke��_��\v�>�Z;~�r��}����~�b�_C0����;���ŗ��0���dS��Qv��^rXg�4�R��C�Bu��-�P����ʏ(E���x�x�H�*:y��s��<�x6N.��Y*ݶk�����RV��E��X����W޵r�v�t�nF�V*�L:��|I$��Fr܀�C�B(F�y6��9�2�T�8 ^��c����y@�^'���ꞜTP!�(H�m2x@޾��NW���+�5�jŘ��*d��+��Gr�Z�CC��tÈ�D�Wh�O C>1Q�x���]�š�%iz�en5-Ǖ��N�1��;	�QAq)������%@(@�,Bw;4�4�6�.3M�o槹��k�\Ī;�
-rn!$�ش��`�?��e��GӰ���J�[
+BX���&:��r�^c{�:� M��|%%a�#�M�ė���GH��5��������V�;ÅOv���t���N K�s~~���c��/>��bY0H*�,�j䃱�R�UVӨPZ$! ���і�W���ȋ+���e&���W�*M|�¨�WW�k��U%��v�K&�5�rJ>�b� [ƕ,2��4��M�W;Ps�Ҏ~�����+������W��D´A)4i��n#k!s8��|��
+�}0TC{Fތ��Ga�����

+a�o��?
�svLJ��~2_��x�i<�X���c㫷�-�.�*c��C�@�+����Z���oë �QBw�qd4i�!h�)B�ЛG���<�C��pi�4AeQ��U��גH��(���8ZbZ��xm�mV�2�畲��\��~�m)?���T+_�eG��$=��P�z��,-v��=�Z��U���b��v����u�����f�Q�3Qv�TE���^����Z����������/4��<��D,�X?lƗ:���6%���\mg��n�k%o+�,$�T�'�*2�m�'Xw���L����x�_J IDAT|#K��?���^띣'��/��<���k��������z뿉#�9����=?��ϓ$�o߾�mo{ۙg�����.�՘ڗVBi��%F�)3RqI��N#����+�@�u��f�#g�?sؤ�W���s����4K۱�t���9�'	Y�8�`l�sn�$���S��AۺW)�P��$��i.GîB�T�f���y��7������N�:S��p|<D����
��v4E2��
)`ۻM}�A"��rԈ^�����^r�k�i�s�ʲ��1B��B��k�C���^��<C���i�9��wd����,ۤio�����}g���H��?,H�bi�,��0;��w�)���m>�@�*�t.�T���
+ġi��ֈ��;����gX�\�5#��T*��"�>R�F���&`:4F�:�����f�I�Ar��^�%�R&Gͪ�)�T5�a���BF�we0J�q)�Ы:��n���7��-�G��
�n�����A�s��q|^�78�z�ۀn�,�����0�
�
+�#�������!R���(C/�PFE���`}� �I�PKA��W��f���dǚ&�r�T�m�G�Ӥ��]G }���_��L�Q�<M�7ۼ�@��\,2���U��T5�N
>�GW���az^�\�
+�v��O����ň/�K��}��iJ8 u:]ӢXR�Q�ɼI��U-)Ӳ�,1s>�:S�M�ѓ����ؙ���EGy��������쭽i�|W�[L//�
C�͙��ԋ�
��L�jp�����)(�l���4k���d�O�bi���O���cl��/��i'�}0;`z�/�fbx5��=�{�刦a�p�ׇ]G�1ր��[�(l�0\$,;
�hoH�'���;�雓�4C���?U�4At��'`���G!!9�
�A�%�C����(�@)0D�SA�E���8�߄��oct=D�A(�����}(׾U)��s�n3։�y���a,�U����ެ��	�xt��
+:��ds�x����o�8[��0����G�5���Ƈ��&e	��ѕe��R�E�+E}�R�p����,#~���u���l��?W0�8й])��6Q<�Q�|m����S{����us���^�Ťs���ŏJe+e@���D�o�ʨ�?)3(��g��K�Zٯx�Za����Rz�]w��7qd����?���~� [�1v���_8���oG�M(a��g��LV5�
��w�;��"QS e�
��̻��y�e$
�����AJ".+��O#-Bb�����&$bL�^Ս�!4gM�ti
+Ja{0XEDm�6��]E�Di)�d��*��$��1�!D��<�>Aڅf!���Y�:oEWq���f����xE߮����J1.�Msw�_�{n��� �2����?w�;)]�ҥ����ݿ��I��^c��.׍������3�-��\,�BH�@�|�F�mF�z�vS9$���Ơ"BQ�/������F�X�r@*�!���AzD�"�lA�� �Α��������GVJ�L��`�d���"ov��z����LG��1���y��@�EC�؀}W?;ՠ�v2��l}�2��bi'z���^+~4N��jk����K�6��Cu�NJ^�&f#��YOa �Aa1�;!9x�<�߁�a��C1_�þ�c�)���W�{��
�� 9����x��u�
�~��N�3��Gc
+��{��R�зG�E��z?��ˁ��E.�(��䒅��!��\��l��D�����D+����j�@�l�;�z̠P&����7��@+Z��.��'C����2Y�� �с�{d��&=����1˪j��y�*�V�ط�m�{�t�!,�Y�.��f�K���`4`$�ث\��˞};�sB:�V��!(e`^"�R��B�0p�=�& `T����iw��^F2��
g��
�
��$�d��2��z��Mn����˶��@���m�Pʒ�u�AxJ!Oa؇n�(;(~4����(�Fi�i�	\6�s���)C#
+k���4�צ�Y�$��6t<?�XֽR�ҵ��F�V���^�
+���|͢?7y���j_�����ޚ$;M*�6�ot�9X�9_�����l��������w�d:�%U1L�bj;��B�\,.�_�w�b�F��P�~�I.��ǎ'3�����4��Q�����o����|���4]0hn��l.���|�¤}������+��V3y�I;��?�WS�SY����?���#o9�W|��}�g�11�4M��կ~�3�q����W\��̲�n���9�v��bŊ͂�,-S&@
������>@5�oK�'��m9��R\zB�&���HHI �����f�2ҥ�giۄ���뎁�/N���m�̶���
�M1l�yE
+�@�CJ��Afw&�6�F���4zJ@s@@!�CE� �:��qL�]��g�e�{�G�w�����A�2#�}�q����i;��̂��8>M)� �ʑ�\���i�S��;߸��q(�R��\m�%���J�ӭ�J��3~X̏�İ�&c�Rv3��DV\6��b��d�M*���e���}�8U� 2�D@R�Acn!�6
����F����B�p�+�JR4}�Z�~�V!�vy]ݰ�|�����c���jk��\�#����dф+c߾\۠�D#I(�C�O�Η�O��u��?�ǿS�>�k;��8�{�Xt���-�QaH�0K�&D�h� 4��ձ{+���+QtN3�^����=8�Hj9r��:ɇ��+e:�}I~�����;�݆��B�;��O���sk���c��[��k���]Qv��v��	��\H��(h�XJI�U<W�6M6(���q�T������E��H�pX�@b��2^bM�K�j;4#�3<tH���Y�@A�����*6�3t�j�EF|�����L��>C/GOC�B�)�W��I�)
jq�|(K�*䲐˂FcW���6ՌGk�?�G�Wt�!Ĉc� �6iڞ��,�4�W��BI
+��H�P�e�[�Y���
+��`'d�����K���F��lf+�Q#��*�:�#J������V���9�ti"���P���@uV�i�xz(���`a7�`���n����L�&����sk�[�H"di�P�D
�l��|�a������ww��W��G-��I�v�����c�e������[�*�u��L�%B��wK�%�P��H+ˋ�7���֝ara&�1�u��:�{
+���6\��(�P�hG�+��5��Xw$b�N�r�l��Z<��xp��L���9��ٱ�Dm:��8?��Z,i$Le�l<�ˎ-�/4��ƶ~~���m�kJڌN:���+:W�R9t���0�s~��7�S�p�u׽�=��u��pv��˿�K�q���M�6m���W_}�����<�\.�u�Y�`�_�������m�>������/��#��k.1�I��r(b��Z2i�N�º1;��h�F�LJb�,cRy�����+�[0`�O�tZ)Gc{s1Vqodt����hl�ҸP|Zק-�9�Bs��!�ðaXH8CX������J�H�A܂��!�x$s��EP*Gރ��z�+�):��]0�燜T�e�/R�����Ս�=��^���ntU��Ŝ�����(=�X���>�q��(���C�y_���$?6J.�����4;Z*W�!F;��@"R1�g��s��?�4P �,��&m�r����W�f�u��|	��JQ�XE5-��m���jI�%��["���� U�@�B)
V�{��9HNȬ|��(G<B.L�v�Ĝ�I��3-Rq��Q�b�d(-	���j�;��ú���d�����	r@�J�a|�e>�T�A)�-T�����HZ R�����!
%��F0
^���\���l�����_�uFH����z�E��A~\���"��[�o7�_���Bg�s����M������������d�U���'Q9��Y���r0�|�\�Jr����
��'��Dj
+,���3�1 ��|΄�	�R;�K2�&���<�)����jONf*��U�
G����!��F�+��
�蘤��K@JL��Y�K��ˇY-U!�����e��d�����d��D)���@HX,�JH�8�Q'
�4y���!l�(���,�#�
+|{��A4�ex+��v���Yx�.�?��î�Nz�n�2���}�ӷ1���[y�l>�A�%�O�b�L���Oi7��h�b~j;(A�CI�f`�ȓCEkr�W�vvk�"(C�#
���n	��+#�a�H$!�Ci�$9�q_�2*zM$:��]�nM�gװ�m?Fgt�Ҏ#
+F��&n,X�״Y׺Kc�3�>K�p���F���T^��Iv��ŗ��[
�W*7K���yo�S�:��e|]3�@ɼGc�����?��=g4�HW*K)3H�_\?�����
��f���2�:#��e�g
+�fݝ�e+��%X,�gʌĢ�v 
+�_��J�������ի?�O|�#y�7���
���ܼy�>���l޼�^��y���s�E]t���o�����g?��c�)�.��B!����,Ry�.�� �#��T�����fz�Pf"�\��+hs���s���WG�F����(;]�
+�S@d�����#Ʀꃷ�J?��;-�)ӂ���@uilZֽ�?�4��CeR��0�ʫu��B�v��D8	jBq�{����#`�A(�By)�A
+B�$?V)[#���S	�)�+	G'Q*Fk�wf�S21d�6���i~�.F�q��^�w��v��qzf�H�jt6�N��~rI;��P��Az�L�� =���xƓe��C�$ʏ#\z
�*�*j�u󩖘��d�<P�P2��B�/��^�H���98Չ��������s�z>R��[	X�&j�t��U�lY"�G�y
+j�V��|C�o�����h�'
+�C�Ke�X?�H@HT�~��!��*���?빷��
+�g %F�aa7Z{�44w�� 0iV	
+p'��������<����b�\-]����7<���f��F�����&gu��u�R��������|#%Q��)Lϳ��S�"������F)G*/H����IR9�U%�F���%�t�˗��]�_ʜK�dѼ�/���.�`SsP���X�
+�H�+ȼ@�
+6��8Wٔ�A����W��;j[�.O���W‘#�Ėz"´����1�������*_�=�U��@�����m��4�*OH�;7+h	?2�c!1c
M�k����d9Zҕ�_9� �WwP\
�$�&��!��j���x�m`��8�ܘs�'�uS_'�}^_�*J��B��=:m�������g���TrL7�؎�,�p1��?%K
B@ ��3�-:
�
槗C!K��/B@)�v�R��9\I��7��`:z�St�l��ô��
�!������J�yF�~�tۃṞ����QLX���{���^�y��V�2����I1HH<?{.��\�B�f�ɒ{���ҦRvǿ��!���X�<?�NS����)F�\Nht��\�YwU)[���Qz��?;�q/=O�J.�����h���R:%�\�6F���������f�驌�i&�s�������l�v���������sY4������~�|��+�V����;�k������ڽ{�5�\sPv���~����|���]�ֲ~��k�����ojj��{��?��6m:�n��&�������-[�#���j��N(W�����<J
+�t7������:����Ͼ���CӚ�@�We���%)��u����Q&V1ڒ�3��䒒�wiv��?_*��
%��-N�""��
+���{�(�t1��1t4f��n��i�Cs�##��c�$-�P��,(E�s�i<DW$�q	?*��N�b��e0Ǵa	R��Je�����L67Q}s��7\ֹ�
��<�k-��(9D(e�b�֟�rYv�����^N�:��y�.T!c
+�"3،��+�/�r$e���/��ri���$����	�����?�V�D�"!PJBΫg��qm�FW=;HΌ1�)��X`G��61 �$j���ɛ��1+G��%ZP
��WaE�R����l!y;��gu6�Ũ��r9:>��^�rJ[����uJ��j�F0�C<F�݁��h&��9�](��� :d��q�Z OP��KE��o7O��j����j&�E9STB͉W麲
+e$�$���roE��\,R`i7;�b��h{�l6���0�P�o����|�vG�W�鴑�	�����/�Ey�x%�6���W	x�oj�K+�
��"��+S#iO�Zbf��D����W{�ae���+b���j<m�����X��3Q�+�LRԔG&|�O YP�����9ad���]��k��~x��Zq]��n�ۑ�XHwX�j{*�W�*t�wt��|��E��b��5���9�A�oB`��b�U�(�A�"x��b�J!�P(���"F��~�'�,�g�ǼUӥ�ĭs�A�ս
���T(@e�)��|��&��m������y��P�+O�ش�����R׹ʹ����
��k��jH(�o�I���pQ�tW�����Ѝ,K=��gH��k�;�-8���-�ɾ�{_M�ŞsG�-Ęa<#e͏�����w��§:��U)~L�r��OC�K�ts;�X��L��HK��a.��ƃ�di�1ɏ*�_�FW3�M�*JbK��M.*\�d��ٖ��p��e��ސ��5�d+�b�Nվ��VͺU��F�Q��I���Gۛ�E�䲚����JI�Չ�W͇��q}�Br
+%�a��|b��y,V���
�����Zuv,˺��K����엾��G�w�}+V�ؾ}������e����я~t�QG�q������z��?~0e��/�~��nj���^�����������Y^7v��s�Y��j�hd���H4T���6��^�'+Ɠ����y�bo��[:[(9_N�2B2.�HY-�_+���S���{�i>��GG�X�@J(�F�
+�
ϱ�D8tf�x
�_\��J�r��
+B` l�(AI���y�iif���(8�i<F�l��h&��lR�Ie?��i+[���L�*�s���Brn??*����ř�	��/s5`�۔�)�7���bq*�	_�H4����7�+s9�Ύ�D��0��^~��Z�XF�����6��,:�+�������Te�j�k�
"g�

�UZ�h���Uj{W=�uՋ*
+������Z��@-E����ɸ���i���]�R�#�G*d����X'�(�$�R��줺u�F��ӳ]�^zA��|n�tN�^%$�2M3V
+�
)
$a9����
��?��(ړH���gљ��R�;������8[	r.����?�qU��/��S��ف]�k
+l:+I�	�Nr�|rF?;�`�f3s�\,Q�:�3�d�xc�Ϫ�=���%��lS��JΉ�JJr��X��\�
H夲nѴ�O,dG���f;�hA	�rGC�%Z��U3�)�tC.�=xɦ�e<|�q��K��w��b��Q�8ddN�\"�HJ82GP'�2X^?}��̍��'���/���]���j0o����U�&�I�h�7p�g
�0��Ҏ�nݵ��4�GB`{�uDA� (X8��D���B��[������Ϡ���2��N~?��{�V��i ��������@��C�=Y�H��h/lJ�Zս1�����IIv&cSQ�v?�}��q��T�߆e�itp!e$!�~/Đ�i!�4��'u:W>���v����B���n���%O�j�~ou�CI,�#Ĩ��Ɨ�;
+�?p��6.>���Z��f'Rґ�=PR���U�6��)]0��u�� �d�����T,��\�MϞ<����A�S~��0߬��T�Tvž��6��
J閶���U�;��̂�=+t�?W�T.A�ɎS�,��6(	Mm�Eg����x�K��NO��Z;=ii���Ȩ�����_ZC@�U�_�>���e�����.��G{� IDAT袳�>���M�{vp��/��}���\��4�o����
7���o~s˖-������B���_�8��ϷZ����L�
+�t!W+	g��b���	cY�J~��^���K�=a~ȑ$�֑��
?:Zy�R�xmK��U�x$�N��#9_��e�[���E�+����!�Q��!%<��-i"��� 9J�����
oiQ��,@f��G�0����D�
�O��H�A��Z�0�m�����W�E�tE�S��\�KU�LIW�(�v$t�M�鹩,Q���~v����o�3-���^�W�qUu�.d��r.�����#q�:��NZ�^puOdfvZ+��*��%%t���˕2h^���!#�y��S
�e���v��%h��-��A
+�7�<�� �w)�s�ڽ�^^dYM��lJ�"&'�rk@_��QH��>�լ^"��R���R�P�cIv�R���:�g���I!�����R�zgX�� �E8H��A�mTV���/)����
xuDh������_M��tmWŸ�]����竹�#5O��D��'�9:�6_2Z��RQ�v^jk�z���4?b����{_��"��8��?����e����l#~[����SY�4MU��j_d��f3�
�z��%r0T�!�U1½q�A�a���LCρ����:]s��f\:����L�-�D���R���}���0�d�z��ww~�|���՟��}<G��:a��_{��kj�B,+o�/.ӎ���W���\��j;�r��Q?8=���Z�x��\e�;ƚ�),F�q)-T��O�0�W��z���T�]3�	`t�y1J��WD1�-�X���b�R��u�`� S�`ȚM*R�J��6%���J
b�
+1V�|v�������ʕG��!K�鼣X��]@��P��s��39�kˏY�c��3Kś�BІ�?�zOE=��;2~�e<\(ܛ$�D��!�����s?sd�Ҟ��C������-�/�i��^��e�������,� �X.���ن�S������̵7p��?`Ѕ8~s?�"�k���-:]qn��S	�<��\,�>���)W�B��;��h���Z�3|xԺ�ҟ&$�d���L�N��|�I{:m��7H�s���r1���E��(;���Ko>�)�Ƴ���!�oV�=��O��?����*������sϽ���֬Y�q��_����w�y�\s
�#�8�{��[������)4�	�PE�v���L�b�y���W��G��3$�(O�l_7�`���T�0�b��N�V�N�ɹ��j�{�H�����U����+�;�м�u�#�!KqPe��0a���ȡ��|�f`8`�ލ,A���@w*ˡ�&$Gw/
+	4i����@s'�
+`�X�݀���{�T�	�+��}>n�L����)y�Qƹ�<�2;^ c�U��T�Ebi�|l!�֠
�����A�|��C�E��j$v���<W�d�P*/�m�4̏��Y���|�aDY4�d:sJ&��d:P�NO�m����[�+髈Jfm����4G)�L�g��jj�C�8�UT!G��x����~�?)o+���ɚTu:�s��C�$s�ci�����k���ֹ,hƗYl����L��]��餡��?!�׵�R9���_�a���<�J"	��h�W�[F܃WC�B҃]�遧�,P��5��iS��o��NI�'v��L�Oe!�A�D-U-�P|���Ლ/y�ɀ��M%'W�v_Z��4���ݛ��Ԉ�KeM#�P���K�H$4??J(3���z�������t�v�2BQ���e-p��*��U9·3�uV�`]����0@7�D_����!_X�m\�L��j�
J���)�]�MC
����F�x^m]J/-������8�n-�М�n���������2h��7�_��ފ�[2���Gjl`�ާ�� i�ۥ�N�&D
+)tPAЀ�.���`:�����Bo
+�C�`��Ð?��g��n��y�|�5������+��	.����K?S
d��'(E}^�S�;���
+�5m�m�n���a���.&$��N��a$;��j�{~��0,���.2�G��0J�iv2��Ù�']�����qr8%M;@�����|��=!�Eoi��X��k�NYC)'��Y���ڽOF�RV��B3;Qg{�������«56��(W��LΗ
+Y��]���E��8;�����2�l7�`*W��������rU*�OR���L�*hS��+u��\��|�-��1�}�_�+�����`�$�uO��Ā��{Z�ZI��5Y$��k_Kg�x��r/_��6���}S�T�<�����F���\v�e�>�����F�q�)��z������:�S(V�>$wK)]�r���d�Vc�-,��@uaaapp�?��'S�E��y����̥�ͦl��8��Ϗ�~��!y.��,���?����࣮��P�=�c��"�x8�N+9_��S�ga�T�*B��p������'�,~,��4f
IqJ�2����������݇TxE0���
��ćSE��`Z�c[?� �n�i����A=mrF�s�����a��(W*�h���z�ϫ�s��dJ�Ჱ�O�2�T,VH0�.��0vwҳmm_+�P�_�YCȊI�Q�YO#��J�A�A�������"�89�!_i��5�h^=Y!�*d�D5-R�TX K�bp=,ީn$oZPN�����"YW#'$��,t��29�&5�h��5�v��%��±
+=���=1F��(~t��{��< d-�72�):���Wj�@���ߕ�"�nJ;�ɁZ�k�#�!M��qp��SP�<
��PF҃f����6�泶�,?R����-&�\�^�[?���KĚD�2��M<Z�
+�?e�[�$I慪S#U*�Җ�bQ*j�b��a�]�x6|w�|*��eD�K�4i�@�y,ʞ�j�U���6����{�S٘MI�J+R<�Wi����~�TS	��\�
�!��%:�ģC�l�����a�j��{خ�(��� 9�@��%,����K[�u�Y(O��������V�ʬ�>�����L�r�ޚ�%���ܽw�eU�����v>����9@QT
�D	
R�b@h̩El�Q�VQ�H�&�QPi@�H�HUU�|��{O>;�~m������g����k����������]��}��E���U��Pк���Bs�w���xV�B)!t�@��a:�Mv9�O��ɔ@���3��n�*#��0�0�!"<�iե@޾1L�����G<ɅJ5�1%D��"�@���(�k���έB��ѹ&>��Z.ߔ��(N�z�Y�'��znH���My�;��s_m��Bڬ�R0t}O�LG�v�	�4��˲�ax�^��2���s�{c�mh�}�m?�ky��j��3������wQ��D�.�ڿ��5������&
m{7iu?���﹘�/�ON��Le&��F(3g�h������7'�J/>��_�DWO榘/i%�f�.н�
h�.�9��m���Y6\pn�����ѶI��H_w��v����T����y-���*Y҂���M�#埸��ۿ�m�����s���׿�f���_~�r��܏?l�^p��J��[o�3g�\v�e]]]��sϟ�y�:�B�p��@)5���/���_������o��P�ec��o9��юOs�g��?8�y� *�9��'��Be,m"�����5s���[_*�Pm}7�%�k��Ѵxݚ>�$��[��G��g��4B�-�΃2� ��.��?(� j��@p�!�<���쇙An���>�	2EP
���$yh4/7�W��Y�?���27��p)�����vd0@�*,�����i�� �
+
b;Dw��H��L��f|�Pi�^��z���Iv����g�t+�����>G;�R@�ѩRU�$����Ip
V�Z9�S�;�1���^t��2Y��U-�� ;�*���IE=c�@����<Y~d;��6[�-��)�YhK
�jZ$ۡ5��1Ft�h:�S�&=ѵ�c]��l!���]Y��xФ�R�`�NH;��_�1<zKo��A�H����G+eJ�(
݂n�9
��
݀[Bs
+�H@az��򆱩�M������c�1J�H,Le��v*(	9)_�гd����hZ=�KϒHt�%fs��m�����DR"mZ�E�E[mQ0iJ���JqE�ڔ/:\6��P1�pJ�A�m^�d��)�;Y
|���8$�)��=5�A�7�A\eV�˟
���)Z2�W�&J1���!�J�Z����-�1�H{[Sq�r��
84�pZ����.�m8lD���e�F�%��V|>#^G���N��+\�.B}BB���l�#��*[��	�DDit]�N��3y
�ˡg��S�HZ��B�$�QI'���iٻ�����]���ҩx�N0.�(�)�h�Hg��C('�%�My|V�x1o����HKg�~rRw����L7o�.�[���q1K�v$�1q�&c��TY]m��q��0\aۯNU�'d����Tn���Ii3N����Xۍ�W};!��EF�l��V��az|�|����x)�5V��+w35v8JN2�WS����O*�q������8=�6oܒȮ�u7��a�6�Y*[���SqzL5|��HJI��5��ǕQ6oi/l��@��.;4R��<�
'�O(���l�@�r���N'c1+��8�7��C��i��,�i��ۘ�ٞX̜Ng؏���������$).�|�����u�]B��3g�޽��k�Y�b�C=�?����~�+#3�̳�>�r��?\���/�|���l�Gy���;��ӟ��G?�Ѯ]�o���~��7�tӒ%K>��ύ��o۶�1���G��[F�7^H#Ym�ZF��H�ָ9�y������c��eߛ�~9��z��QO�=I�Z�v'�ц�5��r3?n����^մ��3��<�!<�����iD!�Tj2��4���v{U&�E3п��C�2O��CkP(�GT� 8tQ��v<e @i�4FF�%$H�R�r!_��TY�bc|�3R�,�k�!��ג-��\%i��"*0��*�a�VO���t���4;h��L��/e��(8�`���F+��SM�3��x��.h����C�>m^ E��ˤ�T�A`��� �H���*��鼪����<��U��~��v�j����=�\Ʈ��
,�A�7�9�t6��^zB�Z��4�S�b��
+G�.z3?��?J gd��
+�AI��I!��l+z�`�*߿Dc#B�m��V�3���4]Ji�o��A�����MT�O*u>K��
��,_3������‹��F��R�z�&|�T�F|��Ɔ�=ze2�U{R>c�����Yz�d��(��ȱ}�`[
+�R�X�r�R��p���4��I��
º�]�tA��������e�T(^Q�꫹bR����j�"c�p��!�T%:1r$��,v�N��NrJ������7�e��#n�M��TC~��ӷm�W/!�4�9���
rQ�5d4d4�dŸ|j;wJ���(`R왭�&��4)�d>�eY�\��� >#s5:Y�~�/����x}_�g�fg��8w�}0]xU�6A�SB�]Ei�	�kw;��КB~ �נox$>�@���𼥔�Ms�����y��j��LN���eb4�h��bك|w]2`��9�,tY�|i�|8��2ƣ1_��Q������GI�6	�T�8]Y�~�������֝B�p����q����8s�dtJ�&�Ҝ{�T����S/���t��݋.�����f!��F���uo��hE*׵~��Q ����|.�=
+Z�|��������ಘ/��w&|��^oG'��@:�K~��@��&������^�+^|~+9�;��J�������O�@��RY�񜗬#
#�D�p����6�����۽dm f����3�h#9&QF�MH�(���o,�W�<J����a�;�ˎ��~�?�����nܸ��SOݳg�����xT�+#��������'���3�<s����j�?����o���k'&&�/_���~���p�����}���W��u���x㍳f������w��h*����ڏ7�,:��6
�'S9���h��#���?J��l�ҷV�t�_��fhۃ�m����e)���φ'~=��v)�}��W��h�N����|
+RA���|���5`��;���2�*@`؈}h&4�IzA4$D�/b�N
㇎��ٜF�c���=E�k��mm������jZh��^��YG6�h�mR"�-54���<Ʌ�.�%Д�)f����c�ᴱ��E�W�hŧ'n��Xړ��I� �J��E�wh�Dj�՞�f�DZԠ��H��֖yRE��Ԩ�BE=��<C&OLɧ;�����VЯh6VrJ���ABX��
+dU�Z�&$x��P��
+�������<���V��G�	`� �E_�|�`{���3�$�
+���FGS93g�$��|Qw�/m{�Rh�.����L�DB�+W���^��
+!��Q��,;�QB��n�R�T�x�d��2#�L�b3]���n��;�O���M
+�BӐI�>�~1�|���$�Ŝ1Q�I���DgD����.�2(Z"�,���4	�h�).�
�pbͳF��R�;��jr�z�,0��ޒJ(qX��MO�J�`Ǎ�m\�B�FL_�i�}3XU����Y#6�k2�p�aJ�k�����JA
�t,5��`D�J7HH����N����:S�2��	��jl���-)�^|΂���&�F�8���˝�	�F�V,t�MqI��$�z�t�ī:�����ur3�@x�#��R�s�$Yz���Kg ����7-Z�J�
L�]2O 刅
+;X[z]�1νu��7��p$��K��X�KJe5m��i���/s�V0R��|���Ҷ�����f���|������L����cQ|z̗g��S1���ӽv���c��%U��Ա�3�]I2����0����
Qz�k=����4�*��I
+����t$c��>��~&�1:��o5��
+�����$�����2�>�=�w�X��Gֈ���,���/K�lS��'ght*H�E�A��L6��-�K�,������5��\}k��W*f�:�@CI�Z`��'�Yo�������Ļ����e�����>���ׯ�ϯl6�A����������<��������2����ƍ����]���͛?�O�r�)7�x㟣�
��ٓ�|�uw%��l�_�ߖշ$�/k>II�ON�T�om�&�9�s �"�Z����<]%k;;��l�c[	Y������vQ��NB]�؍��
�<E��)�:����@IP���4B��4[����
+R���i�
+}h�°��H#�	�'d'�����w
!Q*��|�'#tJ�IyB�.˜��6�}uJ�HqL>b��lл�b0"��‘
+��Ո���I2&�|:Ԟ�ܽ�[�Z�F*�QGm�$`�r�����%Z]m�'�k�u$M�Ays��c�W'��<��#&W��z"�d���!3��QHP�1��膖�?��'�(pU��Lz�E2LB
p�Jz5�n���LdQ���U��&�פ��v�"f��%�ŋS�<M����}�s�����	ѫC��վ���g�A)���!
+���HE�L��"_״4IK~piG�G'~��^�6])C*[A�&�z�M��	�p���|S�8��tc���Y,�&gڤ��DY2�D6�o�=(������;���h��G ��#�Α%%:_A��K�:�qX�=���#vH�ȾcC��m��er��b�t5��I���
�,0Q0�`P?�'��%'��ߙ(�hI�:
+A��s��ω��&�`�ܻ>x��i�q>{G�^=�h�4�)0C(z�2/�W; a��k��]c����$�	J|Ǿ˲F*�/�9֯-k?�G�0�虏��Y7�6l(��G����� _�[}q�aCI�BԆ�"	����"	Q���|����|�e>yp��Xv��LK�r��/P�1�3�j��Q>n�|��9m��˜'z2l���q3���|?������_�7��C� IDATo��R@��Mֹ���z��iʗ��\(�t|�g�ބ/��r׼/��ct�AC۟w���?��|��9������ͦ��T��/���ܯ	���k�/G�	��'7妲�7�ʘ���W�)e)\tw?6:���v�bf"�\�i���p�β}K#��@����ь�HU�f�&R�Jd�����۫����3���
|v�zx<�D�&��J(�%cK(f[l����r�6ܺ΢Ӊ,&�q�h-�E��0^�%���\e)�O����e�u�޽{�͛��_��w��u���:҂�x�����'�|�n��+�Fz�w�UW�|�͜s��]y��]w��8���y�:?9q:Y=�ܢ�O��ڐ�n��h��U��g�i�֛�Tʗ�b������g��(�N��+e��(�|��}�d�lc�RV�e�{um��
Q�L
��D-�+]�P��Y�	�� ���A�PBy�
Y:
��"�bLG���1=���
�e��񹆶CʜT�
.���\�m}����gzY9Vl �
������B9*A0�6���[�p7[�ɶF�D�\��؇�K��r� 9N���%���;�šT��#��[���/��j2A�@+����[x=��e�ߖ�)�|79���jBA�k��-���*�V ���/��H�,�U	B��CfIDF7]N	���yFa"�a&�b�F�A�H�$���BY�Dݙ�
���s��|�R�p����4:n�O��%��J��m��%����M	�Kh#�k�c3���"�F�j�A����NӥJe��8Ɔ��ՌxG*T�)�k,v�K�ynB�TSmK����z���U .��Z[�t�y=���x��r@<1��є�X5\�3"�����&v�|���
+�,G�������9Fa4Uq7+�ED@+j�D<@O��Jd�c����7S�
zjI��'U�c���|rUU�@aȊ�R�z���y�]�n����KN6@8w˪��eM���9s?�[�,�gFo`$aH6՝��d��:3�8����ܠ��	_�26jY;�hEW��i�4B��>�},S�ᵨ���
�4&a:04��A⿑�4 8�B��C��=24��p���х��Ĭ�+3	D�wXc���j���\2WCv�>W'�'r$�
�*/��H�ѷ�b�MǢ7glJEo޾M)=LO�;?n��)���MH<���k>&k
mg�����rF���;7ڎ$]��g���Nj�^]�Wo}��1.�mw���q������ #1/g>�''�����r�m^�!�������wMZ�O���-m��.����՝�M1_�N�
��v2��ِ�Ղ1�sY������*�OW��h$$P���C��/���x|!/Y�p�)�y8\k��G[|�E��p�ZE*�f��x�QMQ�e-F�N�G���a�/J�����{j׼F��_��y��������_\�|��?�?�k�̙7�p��g�}���g?��+���iڗ���x`˖-�
#��������c�ǿed5|W,Ymo���^�U��v3�8�P�?��Ώ*�GcQ�u����{]��銚��R��R�4S���,���a��+P�ؑ+�]�a!
+L?�d`��[S��:�t;Кđ����4'��(�@mI��ܽ�0�]H<L��\����e��
S�vk^��p�{�ͯR�NŜzt~�wڏ
��=��Չ�;$"_��_CV �I�3���ť�+m�OUc&;7P�����K�����C��aSw�gv76��>�����J�iy\��rd@=u�%�)8���
+=A���eɢ�1!�(�c�d�Ayg// WO�Gz���N����SCUIИVO��	��H��W�[��G6d�l	n ��v$C��-�3�k�b��Y�Iݦ���#��Hb��V:�Ǿ7��,�����p�^�?Srnl��2���:�պ"LO���[�����k��:b�@q�8�3��v���m���%9��B��|�x�4�����Q��Og��[��N7������ᑸ+Pu��$��&)RXU<��`�;�n�H����5�|/9/F��������DU;�I9��Uj��x����3#Q4U<Qq��!y_U(tO
�j�L�sI�)�BL
+�}��Xu�[ HTu]�j�5!v�_t�3#5f���~���8���Ũ|�D֤hj8O�6���j����{/��z�����E���4Q�O�֨�=c�����z��
�b{��zpe$z3ھ�s�R�����k�����Q|%^��;ꓨ5��t����i�
˒�ð��������p� <�@�4
�A�P���T)����0\'eG�%s�2j�	R���J3]�;�2��0%F����Ҧ�0IN e�{t���q��h{��l��V#>=��e��J�g$(Zԣ�mm�������U�����'�����bK��U��wvW��69��V|�@��������g�ѻ)���(]eh����M��L�5�w��6��L��`�[�.���iPZh5�P���Ѷ����d�C
_R�o����,s��J|���ߎ{�e$�h�k�q�`n��<�Nl(���e?Y���Fr��&X#��D���Cѧ�@�-�,@N%�]ư/zmZ�D�E=Od��+��:II�R6��6ߡ2�����^z��O?]�T����?��/}�Ko�_�emٲe�ҥG�k֬�җ�`�֭��vZ���w�����;��$�������V��H,Zo��B��8@��it,�j�g������?��.�S�V�?��cߥ��߱6�O$c����t��$��s�Ώ��(ZgGO�jA��Ο�5$I��O��oo�(�O�Sd
+hM"MP�_��X�53P� J*�Eנ?�
+��s����<3MG��R��$d1��O�@��ɚ�%$�1^o%�J�bU�a#�C�N��u`�D<��C/�R�k�u���ߖ�}~��xMԻ������h�1�I�M��>�,)L�����gc\nQ�l͸x5P���
1�#�L�KL���5��R�%8f�v�!���^АR?g�*����V�QX�B/����F�>�q�@\W��j����J,�BE���T��@KB�B�H�D�M)0GNDg��\m4��9�ek���w�̇'�_��J��4�,~F[MB���	�|�P��F�����h M�y�X��LC��Ӆ��M)+�$$!!O�;�'�X�&S��Y�ft�A�h}^��s]�1�YҢ��D����w�k8�O�,�U�.d]CmY�>>&����?
H�,wɼ�ѐC)U�D]`/��b�����W|��Ֆ��p2��+�2Y��̪�4%_S���{�9)��P�I%Ĵzj9��1��9���}�+`��E2��~� G��%��$������bC�\�� �B6�����}����׍�꙾����x����_ښi�iT����
~T��~��4!R)��y��7�W>p����W�R�ر/�o�U�֔:�Y}3
+�|',�	f�U��

��4�kp2�;���J�c\̒��y�t�a$0�U��� �zqKM�hW[�՜��
+�f�V	�X���߹��k�bh�Izl���%'j��e)�+\�	�\B�t����i�ċϱ�͔zR�ge��1_bk;R�Pgc��P�Eg�{�̹����
+z3���`ߢ�C����16�U9��v|%a*z8��+A�J�V�v��1_���cI
P��R��e)��	٩�fV���I
+ƳB�rƓ���j�������<�W+��H=]y}W+]���ʳq���
�J�?&�%��y���(h��
+
ŕ�gT�LY�p~��M���o���/���R�4::�t�R!ĦM�>��#)�8RL}C��o���֭[�z��W_}��W{챧�z���ğ)#�|AN�ʲ�Z:m�|�P��u'�Pr�^���|��5�^��)?>��|�m=�&+���&kw��s��Y��0��k�l����Ɔ��\�i�]�b���G��n����(^�i����BJT�3%d��*������5���螭t����BG?�`��`lҴvY����ɩ��2!;��-#��)R�N5EѤ��g����@Uz�[3dn�Sh������aq��̑%y,�'��G~{�?ϰN9�:-��;s�
aLn��˭R%#�%�1~0Bc���A���lu�e6骪	ذ�;R�m��Q���iKz.Kdu�=�\a�{T�9�6v�3� yOCm9�~,�s���]:)��k�"��{��d@AM����I��D5{XN���)1�P��}B)D�l�`�#d�O�)ed�[�ˆ�uN�)�	_\om��}���W��g4v�.K��޾�ML��aS�V� ���M됓������'tm���R�|@��\]��//d�-��k)	]}sF6�ز�&��dw�7�G@w��]D�����],��A�{�	D��\W�)!Z9=A��^< �̐���`�ԡ�v
+�f�{����"Yؒ�.~8"uI!O�������^ʐ����r�Q�ˡu1'�d�ZL ����:l�Þr�����{�7
�IN���V;
+d�^��Y���Q`04X65[�8��Yvzy�������I+�iNے��}�,�t�/��3g:��OW9�U����D��$��'���˥�{��-Do��`r|Ñ�a�@r���&��f�v^��*� j!������Q4��gt����G��$�!U����#��6^��D�ج_���X�&5�2Ȑ�a�����J�d`�Or QZ]�*O
+B`Ѡ�SK�֓�c� %/Y�U�ѷe��2�FF+Re\}���<4�c��X3Y��%����/>-��uv�o�q�c>�>h9��Z�a@D�I
+��c��:����/9��/JN��(=��B޼�hߒ3�$2١����������OZ|Y�����MĢv�Z����<%ѐ����l->@�zh*: !_(�5�4h%��ɚV:������#�/�V27�m:�$�X���\��k~�P��)��ϟN;��+��F��v�y �W����y�Vt���ߟ�ׯ���?��O|�_�nݺ#�۷o�CO��1}䟾��?=)�}K"��lo*r���S9��(]&at��v�ƳI�2�Ώ�[�e��4v�$�b��y��d[
ѝ�+%�3��
+�N����"�6x
+�A�Rh:Giv�+�$�`G����Q�\�q�	�iڟ��u}���q��g�ɩ���y�T�&J���Gl�6��T2�+IAZ��U��sG��9�|\��`�ǁ"�8�AN��ɻ��}Z:�I	�����C�����ƥg�M��I@���=����[j�,j�}92���;��9,"�R49<_��jW��m�:��a�@������z��ǒ#�;�C�ȕ
�k��Y��z�@�U��t����f����tYKUr�C@*(��E}(����DeX-�����q�2Z���S(��Xֺ+NW1Zɹ�y��S1˵~%e9��=M:��(�\M۟�+	D���H�M���azBֺ�2M�5���PZ���(9�2�n���*�H3�<ѯ	$5)|)(hC�Vզ^�aE[8v�E��ĩvw�i<�`w��^�A.l��4�Kd�E���O5�y���� ���j�����dEKJPm�׋du�)�92;Q�E
+��wM��lzEM��!3�~=�\8�r�0�(
-�c5T$ǴԎ
�%��%��/�[�'������PW;;��1�
�k['
�Ȯ5ㅷ6�ij��o��~z7	�����_��	�%
+ZɾY�b��1�#�F|����P�|݋.*�>_��Og�����G3��<�C�����03��RH	��4�v��VՉ��k�� �@����{56���)�\9��6�?�dR�hn�Do���_
����-d5W����A�N��~�[*����MW���B(P��%
+6M��NF��)9m̠�Ptؿ�
+�H��e=������ �\���
����
���2���}@�7��G(�ٿ��uí�K���|̗E|����|%E��l������M���/-;7����vn�'�K)�Xv1Dz�eߖ�	��n��|>�j�Y�q�we�~���`�<L�
+��6JX��D�ɪ>�D:l�d�#щ֌d����DtZ"1�ܙȎP�(D(-��X�c��g3�"�������•ar��+�L���������e���t�����6lشi��7�|�
���]����O?'�L���k}Y)��v,��ݩ��E��-�]��D��;�b J�$��R�EccJ�����[6�uAt��[�S���վL�v��;�;?S����E&s�R�:_�Gn��	����Lt���'�s����8�B�~���T�
�;��Mۣ�Q��~J�Fxeg����5P^7V{8���,
+�%J���d%C���jj{[�ʐ9
����vG��qh���1H.g0�֠�W�ʊFkl�-�l�9Ӽ�{֍0�'K��N��jhp<�O�.a��������#LȒ�ږ'K��39���6ȱ
�%C��j�@��,ҭ =��F_[�r���S��v���z&�otd�<�1j� R�>m�a
_C�8�R2DcU���b���*��_��܎��B�{	I3���v��
F�\vs�U�.B[Bt�����R��Z�ZF��m�I)�\�.�!�aX��Z��S1;��~�d^όz�	_(T�ֶ��s3ƳR�ƃ��E�Xf���R&W�!k�j�����T��y�P
��]G��\�a[���XɈ��`��T��du
+/�tKm�C�[W��dѤ�$UD��!�q���:T"k#�%�*�f��@6H�A�fMm�!o�1D@����j8�'G�j�"}��c�>_�0C';AM���1�i�W-���	:�t���`G�7��K\���h���d��f��LV�l��vz骲�Ӽ��J�.���=)���wd�[����,\�XU)(Y�+M���\���me��<
�pKHC��l�k�K�%�D��A)󦱥�}:�ܨ�;V6��,Ԓ�
���mm�*�>�2�Ԩ�a
+CG^"a0�dް��B�/\֚L�~��'R�M�-�T[�.-`$l��E[���g�
+V*��� ]9�,)�c��P�I(f��;����jW.�is�aj�O���]e�G�w�|p �eZޯ�Z-YY4��R�O�ﱍg��4��F�6���/
z'L$s:�*#! mmo5^�K��zAȜ��d���`$JU֢���̹����s��_��3�<���4�ө^֔F�
+���<�Ǧ2�HX�VOT&�F�|`�W�X#�a�P�=I�jz�nqe���v}�;��0��?������Sg,���l6�i���X�V]�=�����V�0�;z�g�<�X���%;�5������ug־���^�r��-sj�U�4
�TY�*3���f�s��R��#~�U��1Y��зr>/�~{t���WIz�ilN�ř,�p��և���j�'��7Y.�D���1j�E)q$I:��I.Mz�:�iL@H�s��iF�����I9�C�'C���V�����f�Mm�$Ҩ��V�/�˧�d�LzI��
�Z��`��L	�8���]8�Hp��^����������r��#�Է>�o�3�,	n#�E�j��
��I������P���վl~��&�S
��ay�DLa�l���W�Zxu��-Cf0�B�Qq�0��)��9T�E����`tZ=cj���KWۤs&[���<��*ZM�S�bګ���EV3HW��Ε������H�B���_a%u?9�6���$��wݭ�}{���J��iztO��T��²et��R^\�}�|B�e�[��o��‹�E��r��
+U��3�	.f�w[4�3�9�F[��bXAy�E��bYk,8�_9s���/��^4����Kn�U{]P�y��01���5T +��m
Fx7YH�a�<&���,�����2���k�Uy�"�@$�$hyj/
S�Dj�L�ёc�&�oG됺I��j��&'ͦ��ym��F�A:�x�Dy}o���fh�(+�/��ϱ	���d�X<ǦM����AB8�xrN�t�$$��L������6�x֏�"�����\��?���! IDAT��L���'N�(�4^�<��-�Sk�tvP�O`z��Gn����7���4]DH�k��>���b�/�Jk�2 V��e��Pq;ɱ���:�i����7�8_Fے߻��ksM'�E
¦�-v�해;�U�V����5���R�
i�Q�.��/jD�'j�ܼ�@39>3u�t�Gc>?kl�FBQK��n?9���M=��X������_�����vH�S%㕂u{3Y�a>U�~>LNl�g�|�����M�`%z{�|Ҧ�`>ZIJ�/Z�*�M�w��SY��*�RBDF-��/�z��Z��.끉�2ԓ��(�U���Ӳ�TK����/i�}��H��w��6��Ng��R,��E�Żb�\�|5��_�J��X-9��b��@�\�C�$;��s�[�{��ނ����8޸q�G>��>������{�/��;'�mk{��Ă��ɆB~l��M��fr��Tʶ��1?Z���c~t~g���v� I�!����y� >��ѵC~t!%a�����1Ǎ�t�JU�lc������k/�d�f�N�e��z'�HA4-�B��T7�W�:w1�)�0����]��~��_��/f��'g)8~rZW�Z!fe���t.fKd����@J��Sb$Gfe�`����y���U]�ι������>}�tR��� ��@H��$L؀�6��k�^��� .� #@F�Q@	%�s�V���>�O�r�y�5�Uٯ��=��[6�f��������s�5��
�ZL�0���&�#�gq�n�L���L�f�؅!�ztX����!,�p<�k��\��.�c`���}��t܃ci\Wd[
�;sF>��;�v�Pfh��@����	trx����"�yW��.�� �@'�f�n��@@`\�n��i1����Y��Y�$�Mڗccm�Y��}8�ޔ��Y�bW����H+B����r�]ڋ�n�E�J�����S{��hhOp�-
Y�v��'[5�f�k��<LNN��L��z�������[��w���A#��/�Z�X��%�,
+��]e+0��j1�3l8��"�àH����Ugd޸�����>�U�8z���������]���x
��X������T	e�,n���Š>n��i�db%��*<6��{t<��n����Q	^R)\�ñ�|	�������	��Ӈ.L��4��6�Cs����\��J3%�n� �ޠV����M���6��)�'}��f �t�Չ���2t�djG�\Sp�я.q��l�i!�r��m��6�Wf�K�ՙ�Tொ�m��ݖQȓ�%��f�4 ��k`�@�+�$ɠH�v�"��BN�S��G�SC�蘏
�������:r�����/6՜
CV$!,X@�zpԅvBAG�$�����b�dxԗ%N=:]�\�z���hG�хHF�r�x����RJ[$H;ڡ^��CV��E�=C���FbC	*Q�񒟜Ջ�f�B�:��d�P���T/>W�b���R���]��{ɩ�؊�"Yn�'1�9���2��Qw�Yk>�6f?��F$�9j�*#U9V�@�r�R�J�̴��(3��vń���L�z��lw�\Wyb�!�ޔy��P.Ӽ֑i]m1>h�sO��׎��Ҽ
+@�MpWt��������_���w��y��g��l6{�e��w�y_���K
:�Y"�J9�PlL԰�gr��C���3R�b�A��R�O�������7{Fg���=?>?e��4�A�7IU�����R�l��
�i.�:���p{����")�����t��曆��@J���)?����*�7�;���#�~��M���4�a�R��D�B�WO�*����>a�{��u��G�U"#T�'��6
k�B����P".�N�	~
+�X0Ѕ��x��cx}
�&��$3�ŕ�	(��]����evF
+Vgq���G�j1�\���ޤ=14����iM�J�
�)X��4� !�`�M�	d
�СXƋ�����†���%z�G�����AJBl`����&�zR�ѵ��!I���T[�6���鋵��
+��$1EŘ����x{�����r���8!���=)�QE�_�axq��M��9�i�v�c�\�t��0B�lIv3����ƏK0��ʺ�C;@�+��E�`�|�[�.�]9	�������-��1��	��V���_;��w��gx��/��7/���3���aY�Tm
}�٩��b�	�ezĆ��E<u�q��ۣ7�9c�;U��(���;=:���tģ#15S��
+��ps-�4���3Kt�/��4}ρ�:.L��ԟ�;,�S�Í�x͔�ќzz�m/h�X�x��wiDQ��&�H�C� P��B9��_�Yd�u�����-�VTt����5�5�*&b����?K�kͯq�47�5]?�v�����"�|����v�Z���D�IIR��?�$�b�)
+c�4�`����I*�a|�P��8�_���X5V�DL�-4�,�`M���l�"�׃#*��z+��A� Ҭ�g�WY��9�YG�j(�:����FRY
+�px�/R����,
�
�1�����y;��b=���-���k<���ؤ����� ,��P��yJc�������T0i�eI��Z����]���͏zb"�����t���@����R��wC'�2l��Ov,�;cYJ�&��a�y��6��eA���jF����iO�;���y&�6��ۢ�H֧x��]O�i1`=�%��+��
3)��‘����Fr��fb�㿸�C#S������z����/�����z��o�m\ �V���Y�'��
+�U`�rL㳺��a���	��R���z��)�~lu��k��c��4��$䊣�3���v�ɱ34��co^�P��6�7>�_|k3�i���>뺻�8Ө�C�roe������8Z���V��N�D]_��Ҫ���+Axy^��Dz�y`����v����_{d����
>ۏv"
+���U������q�f�>����ҸRA�ROZ�����c�`�_�S��L��s4%����j��t��a��P���B`:�C�!�
��,(s�x#xE���K,�L�$HF�]
+��
z����whw�s�8��%�	t"�20S�JAL�&�Kto�^�Uwxt��F�	!yi.{43�M0PE�"�V��|G�m�޼�Ԥ{�R�����G��݇�w�����o��Y:���XEr$�"��9F`��1~����	�nz���]i��ʹ�х���|��D&��/Y��^rz?��+
+�#��׼�2�s{9�ߦ�ss��1�5_�r���B�%���S Ș��lNR�</N��{?�vT/��w=�照>��ĭ癖=�����c.�'��� �9Ʈ
+h�I������Ќ��ѱ6������N�B��hI�cj��H7K��0�KP@ xZ	O7�lÐ�0�F�jNië%v�^m�@OH�D/�Sw{03®��n�?{�
�4m"s�5��֛5�
+͗z2��h��8��ƪ�5s���*(��T� >����\���L�	Ǻ����k�ð�Z�6�_�����^?�4w�H4)���Ӵy����ͅ��n�n�7���	9���Y��S��2H�?��?���'2K�����z�N�uCU)Z�X�(�lDG������
+x:�ؠ�	(��{td�~0�~֧FG�BuU�,Oy
+dU@�t�1��s����Ġ�|W�@�QCC�O�3Lj�
�X��r|�Q��7�r�����J��B9�MVգ��*u���ZEn+�@P���%D<�b�[�pŽ��"9b�j����|Ic�!��X
�؋Ą"㭳�PE�`Z�ݎόI+��*UK�9 ��R#:	���U�8�ǫ
�ad�â!��@�#��,,�O��Mt�5k�Ztv�����,LT����k%�⿑F�{�>�`6�ݱcǎ;���>��N��YU��~rr9��@V�ƃ�醻�?(�����gSۏ@K��h��kS�vXQ�6����H�\?�t�t&g-C=�뗫A�h|Q�!��z������Ga�������r7�m��G���3k��V�_bP��R�Z盞w%���3���C���P���J/�~UygmC�+Ti�y��4)J��
�7X}�w��0�$}ɊZ7�n��9���ZZ
+�YP�ClÈ
Ct���"���
u`��wP}e���?�>�|Z��9)�pqHB�������8��V�P�!ۇi���	�k�;Y�j᠉�&=o�
+r	ẏ�
+^R���mz]�kBEA��D��0���	vc	�`�DG��:��N� .�kiF뭸.���+�u���4�l�������i|�^3\ԋ�Td�����-)r,�HLi\�A�a%�Y��;�È�l��B�3Y�(>�6I�j�ͺ�##�����L��}��Ֆ����;H6�r�l�39�h)�1�̷$���Qm��n��'�p<�&���^N
+������E�y��O=���W/���'�J��m�t#�cjrp������
PYܜ��cx��ev��|s@5
Ӌt7��0�~2K?��Q��3��M������Uuzr��<�V���st[
Nwa�@ͩ�uȺ0֧�4�89�v
��=:z�U5�����aX��#�*ƾ��)=9�����\a��a�0�U�2DN"'R�aIv"�,�	׼�ֺ��f"W��/j�?�����G��"ײ+f?�N�D�ڷp>��7@���8>1_:R)\�랓��\�KQdh{�*�EQ|�R��
��|,WDb��ix�I��,���vt~Z?4�
�qd)n���&�m��i�D��B��Cx���E����1����V50�ՕyA����$�G�s��,���rt�d)T)�Q������śb9��c�l=ԏ�̙!C��?L��=Y�&�ab2/RVƼ_g��X�KNj��u�CCI�T��,VM�/����"=V�P
)�l���|��դ����9F��ؐ�_����uwV���"!�� "�5^d�'F�Zx�Û�~�?�fa��'˵x$&��"���NZ?��nr¯��0~C��K��#����K/�tr�?��Ç�ɟ��M7���8������]?>��������η��D�Q��s~ 䨢̪�Y?���rn�r,'�i��V�K��_b�mߗu�����];*UE�lOX�B�2�P�f��X6{�nB�wj>���'�X:��a4��R�86�? ���LI	QtZ�����w��E���Eb��r����nr
+
c(B9��I��I<V�n oI(���E�B���OG
��V�{��T^������'.����Բ�A��$w�Ut
�
�0۴φ!€��|����1�MGڴ;��M(Iu�FT���%��	�#�yܱL�K����@`:��Ih�4
3Շ�1T��w�]�A�}?��1]c���D�9�(;���mf.$|�3�
�/O��
cVR:��V��Y�Еł�R,W��"()���/:�5&?����O��aIe"+���p�c<)�X/��]a�y/9�c(U����q3���K=Ev �)mޗK��
�/���	��SK
zVB8�W.�/�i.���c�z����Iv���g�����+�"�q��@c��jѫ+��FsC�m:���*!���h��[���O��5��Q����<e�~f�x�2��J�ԃ�[&�JxV]F^`ZA���>L�0���y���	`Q�q���E�����8�p�F����J/	O�V�t��'Jh2��s:k*���s���7�B��6�
�˥�>Jvhl����,]�o�)r;�?��8k�֝���$)1v��H�^��
 �u~"�h߿^ӎ1�
}����RE�x�A`h�ar����]���\(�pGc�2T�r�b"&ޥ��(��¸�Ι�+�MzI�t����eu���
�u:�j>�pžB	jl����g3ۺI��x��h*��ao���V_ʚ���ՎH�A`s	6�D�b�z#�<P�H��%E������e-�ɛ�kP�4L4�P��d�;9��̇�,������L�x�'֕4a�&�$����|�0�E���v=:3TN�*5!m��Y�&�v�����,op$��S��LC�\�|ZP
����sQ�F�B��X��ӏte>��>-)���!U(�Ot�
��/�:��+�k~C2�;���v���48011��Ϧ��6o��o�F"���5�����5lk�5�I���X�*�(�^����@"W2�mw�����Ə��y�T%�xA�q/�"�������q�|�@w�{�h'�KI��unM�Z)�4~L�!�|"��r�N.�s� �=/����X�'#z��E��A�I`�ƣA|��?�ȵ��ʌ�h�F���:�.�c&�+a��S�&"��i@v��p$�;��G���,�8���0E��q�O�9*Z�.^T{5Hua�$��u�.�^ů�_�W��AAC��Va�Ԕe�@K�H2�r��f�6�~	a���-�#xa�
��1�R��[����[+xa���@�%8/�k
��ЏCX<�]��U=�F���
���O���a��-��y*���ھd L����ʷ>����b�ޟ(�m^�O�b}$�
^͘?o@P����*���تHGb�U�9�]��s�Rs��U�C�䤔������.�����V�M	3Irg�r�f0�i�#>̦`��ա� J���)�14�
+t<����C,���t܃��M��-:�D���
��gjr4%�!4:��@%�X�>�e�
a��4�$:d:���;��lO��>h����+�tND�}8�}��KKx�ݺ�}�F/'��o�������F��`��l�z�#��tHG�fZ��]��a�'0�����q����-�&��2�����s��#[p�[�������Ϊ��������oG�Qr���1�7���u_�j4����_�(c���VD�I�Q����c��f��ȸ�X�|�1���b�Y�����N���Fp<f�\�{2�R?vpBP�{����t�J��	y�1��F�و:*dž	ȣ�
N�8���ܳ+��q�_��x�\3G����w�k���h�1j��"ޑ�ˈ���H�ZCTV:���mY���=e�W�bxi�xP�rA謮ȎUYcO�d��|���&���P�A��mY�����$�>+T�#�1�{�����H����Ć������b���R=YQ�g
T�J��z��Het�2�ʽ��C��)�D�c$�d(;�g8)b
+�b	2ے
�����Rp�����~�S��ߐ�?���:���z��ry�����g{��)
+��^+9Ư8z�!F�ؑu�����h�#1%'��Kar�k>���3VO�?"2��HlA�]�nĨ��!�j8�~!����r>�T���t6w�Ƨ	t�Ķ�d����T����L�I��U��i_�M��x�m��y�C�]����CR�����1�S��ߦ(&'d�_ F^��`>S���Xa?[�h()��a���
�Zuz����
ŷ�����\X����,G�.g��Kb6VxY��h5��({{��uxB�Ul,p���>�p�FO�F������`����.ঘ�	��߰a�B��J^�R��+$xʁ�
x�S-ze�n�]iX�O~{A=i`�@���H����y�E���v��Q;Q�������NTF��WN-�	�4�3ڔ ���4��s�����B��˘�"Қ������q�L�ֶ�C;ȱ#(ی�0���g�r��="���s�䴌�/�Dr��+��[��&�q�P4��*m
����8-�e����0���m�u�~��� vpb�Q�F��X*�Mk�+�4�w�i@���¥�٧:t��aBZC{����];�.g7PDJGW�+����٩)60ί��;d�^�
+^�?�(���eq�z�I`}�ߤWҰaJ��NOdpÔ���N�� j�>���hY=a��k,��)̞�T�J��NYA-|�r�;��L�U������^����#��?"�EL�~?>/��^� IDATwY���͝�*���_YƳ"����ڔ�ܡT�|�4���$rE���D�Ե#B���uë��.5~����\I�^te?9��8e>Ћ.6X �k�,>������I�K�pI�'�p[�^SU��&�0��4�92lH����f�T��kcF�0�1 ��]+�.�~eO�
w��ad�>���������=
�����o��h�jG������3�$0BE�F���`O��''Ɓ1X�f�����r3�1AV[����ؓe����i&kN�	�8(���MkM_em����5��Ym�;ڛ��c�g-$�+��,y��1	T�F��_��%I�� ޖ5%tբ/������𱸛���[w.��􃿶��~C�7�G�p�
�����v��n��뮏��7�x�o�F�bk'���W��M~H�ŧhl������_ȉP�%�
>�GorU(6���v�����~tQ7x�P�z/�Z�G�)Q|���zյCi�ۙ�7ڭ���R
����k�it����T��泟��������]J�9_��]q�����j#��D�r�\���|�ܨ�y?9�ON��7��r�0�Z�7�$���Ƞ&�	�-:����Y
��u�B�m�M!T��-�)�6����+MU[V��[[�3+�c�eCNCkP�X�ZtpJ�X�/!�V?�`QGGf��`>�+	�v���ӿ
�������^ۃ�i\��1�J��z��K�K
}��t,dqk79�RA�A:��-�S��q� �p�T�UYM�8)ґB-	�"$�1��8��6��$k,慪P0^�$���#��pV�ԉ.��/ˉ\!)g�yA����?5�����԰�1`J2$��BPR�r#�"Ty��C:@��:�[�D�j+��+�|t��΁	���Jê��q���w�haA=�L��
>oы]z�zpd��u�ǧ���M����� !r�����F��B'�+��}:�b~A��3�9Ā��@`�j-u��^f�|pI=?�W�h�E/*�;�z�$Њ�ޤ������;����I�^Ff�'c��|A^'�8Q��	��ړܳ,�1-��0l�cb��j�����n�^ V�������u;���&�]��}�P�j��=�ZB��>�6jy�t�{�F�C�ǰUo�,U��Gg��ֻ�(g?`���_���At�P�ʔ��0����;MmO,� @�������&?��Y2� �b�
A��+cȜ*����S`#
+$�^f��vx�>m@��yP~߆��-�.�T�1-(�U�̩u�G�k��ܧ6w�G&p�������$V1�h��u��|6��� `� ���b�j�dBy�ri.�L��[M�#`y�q��#�zR֘�1И�,�O�2�*���F�$�b�˱��},k��������"�x}>Z�(jIE�>��-�-�/�f�f1��W9���,�1JH�YؕY(j������|�#J�t�o0Vo��y����^�7�d��DL�7�y���ml�$������o�q��J�O~�_���S���k���?��
��d�W��w�ޟ:ګ�;Je�ڷD*?`ߖv~��>�s����~��1�~,�:�/��?M��w���}i�v�Z]��̧
��Xh�%T��|_Q�2���\�����bCʺ3����~�a���.,?e�V��])��T�N��L������O��D���'��^|aƼW�|'�����ftnɾG�AE�^��9@O.�۪Y�y1C@��VWO�p{@5K��t@�Q�/�xi���9���l��ʬ�)N1�W*� �R6f����

c2����>}4*�Y���1�x�.=AI��sb������D�:����S|:6�.�hޣ�>^�>ޣ9
^�^O�z2�Ԥ����2;sI=�Ǔ%-���ྭ��5`�oT�f��jN��X�eK�mF�����b9�0Td��D�x�|1ٓ����$)ñojot�]Y�E漣�I�MN]N��U�h�&�	䊜��lp:G��h�gh	2u�4���A��]��%>���վ�<�.��L'����ޡ�誎�9��*x~��Y����]��ʸs����DO͛��R�4�����ՔxI�\���b���P�f�������u�B
w�l|���&�ɘˆ����F�7h�
�"��d	w���}jTՓ����jwuhO���X
+VG���}aV�Q�3%��C6��
+$S 2,-��Zߓi��kt�PV[�Y����DV'��X�pV[���o�rd8�)/z��zaj����\�P��]��}�5J����F�|@Q��K5�9nhoD�D��0l+Jw��
�n�>�(���Y���z_ȚOw�3M^�$��=�y�
b���Ͱ�%��*~�Q��
�>6��@w�PV��������D~�����F�ax\���>���XX��'=��S�a]#�)
�E_��_]�U�ѸQ��D4��<�؆@K��0SCZK��:���SӼ���"0_j''��SK���Z�V崾�ڵd�����W|�)Q��03�!G����W���h*�kcE�u}9��ҲX��YoZ�NN�'Sy}��Z�Z�Մ��jR��5ޑ�R�k�
G���d����dX�
0P���b0&�|f��1��	Co���ާ����~/��oH��_�_��绱����Ç
`͚5�T��hE�g�r��4Ǟ���F��=D?'Xھ^|��g��{m�]$'R_n�������]��R�R�3��l�Ü/6���͇*������_���,�I�x���kSup��Ņ�q�|2��f��� �.���k�"�|X7v{�
~tI.�W��wL����R�>�1�?tha���1l�[֩��8��l�4�%:�b�t4G����	�ac�KS2Y62���:4+!$H289�~2��c�R�2,OD�˗�h��%U@��=�h�;�S�PG�$j�h踘���+�q���Wؖ�:C'�f��~D�<��#���T��r��p��S��QF��k#��Ю�C���{w�8Ҧ�6�j�xWF$ *�L���F�7f�
%-d����D�F��D�L�Td�DiĹ�H��J�/x�&-c<�U�,O�����)���Z�%�^E���_�>"������lf�r�K��Y:ʘxD"� "�$������۠W���}���U��#�b^�`8�[A4�ה����.�����
+�Gs�섶Z����֌xS��rB~�U��^�f'�ˈ�d�frw7k``�
����4�C}8*�'�zE<#�fw��5�e#�#���t3xB
+WΪ}k�k�&.T��
+��@
+{t,�����o���Q2�7b�����~('L~��lq�q_�g�
>Չ�>��p�����+J'rh�pe��:���*�x��c� :�6��^tB����1Q*O���,��8�-�f�Y�;��z�u/����ə����n=�Zg]��D���=�ܽ�B��R&j �B
+�ԃ6/п�0����0�k� iX���";�U�E8
������`�-�GW��9�Z$�E�2�$��P�ɠ!�Y�_���z	P��R8�㖆BW�f��1m]B8b=3�����O��
+[;x�;���D�뉾8
�I~�8.��2G��fCY��b��z=9�6 5�|�GUA�sZC(G���ƴ�	aBB�*p�o�D�|�@0VṆ,tF���dM]�"W:����4�4�*e�N���$�A�i���7n�i^J;�Qo��O4�?���T�q�M�6��
+�[�ܾ�c?g�s/����4���a;z�$@
����E��z�es�
+U	�Z"����k�c�$bS:������QE�0>ur�$�O������P��(�x"���^=K�r&��=����P�������e���|���X���\�y!G�d;�t!�7��|,6f�_��Z����"��krb/z�b 
�b�"T)"�[���xģ�"[ݣ���k[2lħ�	�&V������$���Y�EԎ�]��]j�TCMh'/y�s��a]r`!%�#�!,�ـ
�=8�
�*rqT�ppȁ����	y#x����}X`Mz�F���~\\u���|��0�Cƀ�J�`����,�j�n�L����T2ltt� �Y���		ű�(��bYdA�ei$��?�1L���G��[Ɇ��|�u9B
r�y��V|��z���^�c?��^��X�OS_)Yp�
��юO�)F��Դ -"!
�jv��mt9�i\{\>C�8��ā�3��C����
�~(��S�6���z���۠ YPE�v1Wf��j��F$$UY3!��
��أf�mި��%����p�v帶2ˆ��,�fQӏ�G5H
�)\3��f
+
+�y��!��x�O3}:S#���m�<���E�i\_����"����M{4�J;)��˄���k���yNӱ���T����:kH��|�/&��Rek��|�^�~��1���\$ۤ��|��jx$U9�����я.��b�s�uoʺ����c�wë����m��~�N��kݯr�9:������X��÷s�
��Ud���.����P�"4Pk�Ɯ|C��QwZ8ԥ���j�8�����<����-T�o�ÍRy<������ ?����6U�tLe�hS���8�/#j/�=���e�Wf+tR��2�#�5�XB��N��@f󥣽���2\P�0&��Ŋ�hp�"M({2u�"s1�Ld��V2N��ɪ�lD(ZH���@J?RԴ
c�"#P6Gѕ�zsPfy�B-Ǹͫ��
�*.�'j�����б`�$}��t�L|Q$�,o�D
+j"%�s�̀yRC@G1����~E����J��!�e?�����R���+�_��w�7�2�n.��8���Q�B
{b������T%D�Zwܯ%b},'A���/�����ۄ�D�m>�X�a�0ǧ8��L۷Z��ql,��$ʄ�)����M���ٿ:Z}c8��Dl��sm�!�p���\�z(��_Irb�l�je�ӏ/��o7X����ƫCʱP�%dE�p��U	sb)��%��+�uu�X`�m:�U�4���0;��^�q�¼:���0�ay��ut�,���-�.��1��t���f��}�I=09B����G�J�شI���1�q��mc@�Б$"hepu��*Wj���[�s�,�@� �K���
+�-ګc����)I*�6e�e9�,!^���
_��Pu��#1T�����ւ�B5�@i^�)�枎����&��(��jH�M�f(+:m�/כ̏Ħf|JZ��*#��鳾*�x?&�)�eE	�u�ZN�C����8�"����.͹8�aV�pq�FO�eoK�K�x�sa����k�
��^Edbn�^J�,˖43&=���������|Ƅ|��L���7/:Z��P�0��t38��D�fj��
+~
K�ϱ�]:��M��[��["��&�)��P�7�Y�i3t�'`U���@
+	ذQ}3>��+H4��b�%�չ?�7�R����@�f�7j�i6��Ý��w
8:��l���Xw+U�� �H/>�`˽d[J�#�ZD��?�@j��'��><���KQZ��x��{�����߆bM޺+�b���%kc�qX��g%�:�̦j�A`����P�p�}���p\aҢ�b�k`p0
(#`Oa1���'�%���#��tO
+���R�’��e��ƒ�DN ����JlKO%!-���%KB��0�H�t&
�e]��<�f�bB
��4#Q1�M��o��,h׫8�^k��7�<�yomik���AHB���`����$v�����38q0�vb��V��x;b0 2�6ښ�������yx��V����sGUdž���ޛ����z��~z��CQN�լ\dW$��
+�c\
5���gJyc;-;.��_d-#� ������b2�!�ʙ\tHC�%�롿eW��1h�'t�p�e��3�$%��g'��T��ۏ}?�op��?H|Q���ݏ�����_��Qm��h]uA����t�)C�z��0I�$嚔��91������]W^)�k�_�+��֑��.k�S}S��+��H���R=I�X�?W���8�vz�z��+�!X������:��1)׉K��]��|�b/��w��䅲s!6S{RsGf�rih�M����0��-t��(f�b�B�`a�\�U�%��B�ϻ.�Jb��`ĝPx���	٧Q$l�z�q"i*RY�1�e�=���L�lK�r087���P3���u��,�whA�
��Q��1]a��Ct-�|�)�����!?_��c^ه?S�k=�Ρ�aÇ�C�����z��UÛ#���H�;|�}<QY�:��5��]�,/�_0��P06z�qW��=0MD2�x���vN�yo��>n�S�ߌ>��5����@v�9:45M�f�ʖ�����D'�;!�rF�7�.Lxе�m3������ĈO03�K����
�0�I�ZȎ���P��+Sx?{2����8�0�J�O��Χd����㢜,��1զ�J�6"��ި��Σ��	<�|�˻v��?^�ь`����Us�~w_��
+xЁr��0a^�C��P
 �p�*@
+�4,X6�|+�)�����\��G�7�dk�O�r{.���䵛�4��ڥ����Q�����J��E�K�Y��s�Afv���� =u��}�AZj0;{���R�ru��u�yb�v_�|�Re.����W�5W��^��.&LjUj�L����_�R��e5��i2���P@�O��݇D���:�M1H�6�o���dW�,���_ހ/�p�2����0
<b�B�T���GE\"��&})��ٴ�����+��=7���������f��T$7&=C��8�~�阒Ԇ�XTUQ/���!��H#��h	�gG�&o�p����"qEҦv��YA]�q�B�@Ʋ�\�D��� �CTC�h��ӱ[PR��\.�K
+(��X֤�!v�3�l���߇X�������
�Z
��a~d1R��H̤h׼'s}���S�~�Ќ��V��r���g������N���q��5P�~{��
���`�K�gr}}��0�^�I�	 ����%@���\�\`��T��%��ۓ_���1w��;���8����y��'J���|�y1�����9f�Ϗ"��>�Lj�g����k|�p�
�b�N)��X�y��g&
r�;.���GGpށ`N�
r��T9g���z>J|I�`$���vN�'����+�33SJZ�H�1������bLiE�aG �l�P�j�� �	�K�L��Δ�|$��`��5Aޥ'�wd�Q"���O$�~�<�a�B
+�!,t��5��:��u�����2�B |�\�:���_?�U��A�d�Y�"�@dV�e�Ǯ�*]����f/��X���)%f������,��3�n~�B�SI!2�/x1x|£k��/(��|Z���F���H��p�B�W�A�P���0X��.ȗH�XQKA�0М�PG@.`Ms\Ʃ"6�-�P�J	2
+�2��TQc����wm��aa����S
+	쐻�"�ٱ+.�o�+�¶=�bÅJ���s��h̫X«}��ã����p���dž���v��B�Ni��I�G�3�����ũ-���k�N�3~�j_��<���&��v��~��I�K�+��#f��u�*��K�]����c�z�����0{K�>��h�EЎ��S��U�2���� �}���}\S��mB����Tgp��sr2�@uE���0�|Y�uD�%������kC\��)�WCo+xB��_��������������/.�{�����7��W�ō	�^��y�狢�lǼyL��������6�L(ݲ���öt�옂uP�Ph�^��	��c'
+�!���բ\��ϤP����ƺ��ɹ�ӑ�"�N bEi���Ɍ
+z�����fAE���]}(��a��(4�N~����C��
+M=��" IDATC�+��s]�ő��d���ld�kj�Y\��c�H�NXre����n�g�3}���7��Z��Z��9b{�ȑo��\�!�Z��Q��'���{B�B��6G-�W�٫+�C����S���_��׌�7�����-�����s��>���P!�oY~�55�s����{��x���Q�S��M�{B������?��S�Ư��s4L�)E7p����m��'��k��-����W����9r`h
5U��w,3��ԋ�=�������z�S���f�O�0�0����f8���*�^�����*�^�:�]�Y�ܮ)%;��=�-�DRni+я�d;��#lAH�0P�P��x�e|97e�GD4����(܂�k�_�S1�f^5��������8�BY��f�8��7�{�T50�/w�&�-����zԞp�*��iB�@��D��C�<a5;)��i�B���v�`PE�h���bl�k�Jε�Z��. ���Qu�
+4���Tg3�RTT���	)@��s�	��9��uqd��&�-~0�=��r���nT?�B�2<,����
ά��x�}���\/!�p�ПUC����bY6��bI��|���|�O�D�+@�̒�<a�O���l�W'4�R�����5KxMʴ���c�p�� o���>�$ȋx�@�,����qzħ-��.?�,ށ "x5�f�S)�R�
���k���hJjPp��Tu�7T�06{]٫�����6D�䚇bb���-C}=Ӭ�θ�J7}�({�����;�����{1D���=d�ߩi�������'�Z
չ��wEgb�vE�|
9ʩn8hX�[��Ե;̮+�P�U�t�/������,��o��x���� �
�|ׅ��H�w�/�W����~������ �zbNܷMk�0�`y����qzF�>k��)�Oy�I5ĭ���`-�M�%�V�x۶S�nF]�|�E�&���r^�u��d\���ֆ4 n�"NHU���'�឵\L)��l�NU4���Bz"�5
��=Q�Ŝ������p�
U��2Y�IB�sŰ���t�uU�҈��P�1sU�}ι粤&
+mN��|�����ߤ_�~��׻��,�_������|��'O���������v�����l���8}���
��(y_�/wD�R}�߫��
+B���=���8�'?U������z�w{���p�S*շ�P�J��!��R�Rӑ�-G��q4<��j/���9��Ó��#[�~�0{=�04�~NS���Z�[J�׊����޽�����nv����/��5`�梜Ss
+
+F�A�<��o�g�b����D�E�P����	������Ώ(P�T�؆��7�R����U�h������
D'����� 2
SY"�)�9�S3,���d���E$,�ŜMSֶ�
+`�*�9O���)�!�ֲ�	Je�����_o�y���Fo��0�%ጚ�H��0�fC��QW��G�6����!u3R5*t�96�-��7ќcwu3��$���%���6�Υ�^��:�qзe���]��l�E9yWW
 ���г
g}�^�P��E�4��	��?8�o��.?� 4����x�W<���s�}�6�=Z�»
+"��T���ń�)���9GMh\S.�'��Uͽ��������09��2��^�ò"��n����QhC�;t�V�-{ďI�
+e�D
�`J�8�u{�Rؑ����f	��Wkx�x����\�?�<Y�O$��=V�ⰃbZ�	��B�,���i*���b*�TuŠ����{�@�꼦��}IJ犝��Shhz'~��f#x���]��b����S�ɇERl[.�r��.���|?�iu�Qc�t�w�ӷe�h?{��RJ�
+'m�g��vb�zb��XQ-��G���J�d�^�7΋;���g2�]�w��_@�*�,��5����w��s�:��@p>��Ջ�_��'7�o��'.��П�ᤂ��	���`����:}������-z�ϧH��r�^N�k�!���$WDsh�B��=_V+ۚ�y�-��)o�g�!��N>;0�
�$4!,�!w;F�e��6�4&p �΂w�o9��!g
�sK�d ���Y��j�9����ζ.�췓���o驁�i,�E���5b1�ݵl�[A���o8 $f%��}�a��Z�w�y�����Ͳ�GFk��Xߠ�r$�ѯ��ݩ�A��6���FΓ������z~�����s�#���|y������뉚�:5�7�����)�U�~�;��R������`?y'�p�A��R���d���/�7�?;�ސ�[��nO~�����Eη�j�<�3�uO�rD�ּ�|��X���&q1T�{6����>�0�:�[zoEu2���!�h�%��F�F�=
��h����0���R͂����k;)eU�8��fTD��Q�h��1�(K������L����'@UԊ�zL�܄p׎�ł�Y�Sr���̆=
x�<9�톜ݲ�Jb*�6"�P�9��$�����W&|�����9��xCS�2��q@[E�!�>/�L���p�g�	,��7"a�Bd.�N�ٜ���"���J�yI!evqd�}�O"�);"����Mgm�;늍�-E߲Z�3!�Ķ��[�\
+�����q�a���5T��]hF8ca2��g�n��|�g|�_w������οݱg��l$��E��`� �3����/��dpE߲)�����ύ&6"�T��u���3�vC����>�`qD�5��طܡ޵����D�Y;�]�c7�W�^|I�I��H��M^��[������4���Ǐ��I`s�x/��(٣N��:oX7��C�6�
+��t`+�#F��II�7�l'��,R*�va-yY��3����Gts�Xqu��I�JK�D_�ɋā#���D�F\������G�=u����Wk*�o:b�p�9
+�e�~B��� pFS����űm�$l;�!u��u
+9�ɀ/,�;K�߁rnIa������{��_e����s��Sx�@[Ȼ�X	�.õ
+"��7��g�}���9*?<#^��{ti��)���a�B:&0؄�UY��(���#f�h@�)yp+_*�H����q���nV KP�QȖ�y�����߭J7���TA.��
���<6��e����<#UU���A��!����fvuI�
+̔_���@`�*d	j�ᗜ��g���,���V�
+�Th�_�el���7�{���>�����>D���?}�����g���گj�<�_1[�����dj�
(r^�8���r;_�P�M)�ۣ���3���Z�Nn'��蓮z*7�R}Sf-6���<T�?���氡i�9i��a�1�o��w7���#��0EΓ�������I��T�[�J���m�<o��ڥ�J����ݞ+:cs &L�����d�&�#��x���)�S����0��Su|YE�;v�(�Z�̢��C۷F�
+\7���������uD*���GG�fME��(�ն^.�I(�VҽsnQ+'v!��%o�K��*��rImO�Ԏ��b�a�4S �cGs�3���l�����c�0pEc�C��9ãV��t�xk̻c�`9]����5<:�ͪ�S� �^�f����(\p�j�P	��
$p��3N���yw<��1ٔ'%Q�Ѯ�� ��6�z��v��V�dg�큙7�Zhx'bs`5w+�\��M�(t,�B�,�6���#�����{�����>��{|~^^7�!��?5�����9t+p�(�,�-K�l��t�.��>�}Z��̥�e�(��|���t���YC�=
+�uQ�zO
�55��^�24���R�9���&P�=U;t:�Y˹�Q�Z����������<��������w����@
�w��^� j���8�“���x��)9�f�[�׺"g����jwM�G�dKs�XZV	ˢH�֩H*9g4�y����|5������#��nOt\�e���*앃�(���87����a���j�ƅ�k�<?�^3���64{�Hn�vJ�gXh�@�T…��S�.J�����\��X�hm�g2hIx���ϧ�|*�}���%|���|Ł�3>�YH���&�r�(3h�@y����/
+pcX͸5-�J��C߁�O�?��<'^�q\%`m�N�2Ԭ.���xhJV�e}��{6�[U�>�j�/5ġ1w\%8��`d�Y��Ij�>���"���	e\�^JI���wu�5�8��~b
+o�)�0���Jb6ᡏE�z�u�o�}	�����~�w�'[—C��*8���/}~����
���#������?~��g���_��;������Oo��z�&���r��Rs�=���D;R/L%�5���CI��r����!<�	��8��w�1�(9�O�Wҷ.��q�WZ�v�$�.zΉI��M>W>�o��L��#�/Ss����B`\���
+�c�Z�fo����9
+�G4-
�1�P�"ihf5�,��T�����Z���&����c�e��#^	q����
u��\�n%�9��E���	���3ٴ�HLW�h�uM3����ΉA~�#Ɩ����vϴ�#.��̞HN2�RΪ�$'T�<3��*A����P���lY�Dyd!f]�"ј�6��ث���*#�Sx��అ��W���}#�=�M�N
+�Zey��d9��y</���y@��������*��3����ɶ��8⦇�4��r��7��+�=�l�fY�U��G2[Ÿg��a٭"2@ϔ�.�C�k�{.��T�	ol�W
�g��1��8#Xy��̪����S��i|��A�� ^���5g����8ӌ��,Ӣ\�2�YUHə���Jb��i_hÎ+�a�"1�v~���A �=�''�Dob�����N���s.z}.8�����䌸��-�h��Dל5�̈�v��:�W����`��c����H_�z�=
��z|��؃Fl���'o��p���tc�W����)�7T�U�C����J�U%W�3I~�g��M���������9_^N��CuEaG�_q�l$��/}��_C��\�,�'#i=1��j�Z�:Է(�J�L$�j3D*��Y��*�$�=3@S�@Bq�&@��	PUE3&�p�à��Y����_^�?�`w�7��H�o��|��o�_���B�u�/��k��~(�=�v�p@s�5�u����g����!����r��/��b�G�26�n��/cE{�miLl�L�#;��q�6b�=���Z��)�H
��[pԆ&uI�f4�\��eO�ʶo�}k
�BZQ�)�d,r��#έ��|�rZv쪃�!m�s��=�{]�m�ͅ]j-9ᦶ�*Y�qm�;J r��9�ߧ�*����k����Ν�}������&�ӂ=�q;�6t����9�2��.��&m���0�/�����.���(yw1�L����n�}5���D�����7��Oz��R���\%�n��\%�/��{ɻ�T_����v�r�y&p��[-�Rs��<��Á:����������@n��w��,9/D�e�XT����M�Ol�����b�6y���ܗ�e7]�D5q(��.VČ���dA4o�����:vC��32��qǑ��Q�(�����S��堝݇H�+=j���ȴ�\ 5�bl�|LЕ-������P�n$������u}��z���Q �l<�U�6,},�ں�;�D�f%�ZAB�&�(t���O9X��CPB0���̷�9�"�v��i;g{�|w�ݞUs��ºJ}=Z���,K�Jm���]][��-����VBaxE���ݤ�	Fj4˄��-�x�4E�fcDv�}�|����CS�h����.�V��6�
�&���1��Z/i�5�e�#�3�����c
+_���,d�t��
`�[�so@=�	�)9
+|b�� ��	s*��X ��-�b`S	�~Ab��W�Kj%��
+Qo���^�,�������挓�'��PZą��d\pB�v�9��E8xӻ���7��/>tá����������MNU�&�GC�(5gZ�`��q�� "wtm];c[O��e��32�"5,w�*(�6t�;5M�����khzO���݋����6����U$_�)1��7w�;7r75G�ʿ 0��C�i�����]�bd�4��Zm�s�u�֜�ص��!�yӂ�J��e|�i����A��%<�V
^��R��{�}
+
+���
`a��B����O��_�p�@o�����w��o^�OOx}�+	�t�Ɍw���|��׋��] �<��'���'D�e��D9������DB0�v]a��	�
]�e1�n1wۦhX�j�6���l�� 	��[Ş�����Iϛ'�fC��$ݦ{*a�MOyb�aF��Y�a.�ꍄ�	M��`D	���jS.��|S���]�,���/���|]�Zӻe�尝�|!���[Ƀs���o?��t(�_|��~��~��o~����Dd�oK�3)��.��/!f��"�������/����@��d�{x0�_
X�eG�5����t��\ѭ�����h�f?q0U�7��M��g<u.Pg}+��~�owD����Ƣ�ߙ=�p����nj5�rsU�}
+�қ�N�?�0���H|�;�s[��0qc;	2�`�C[.IsB�c�Ox堼O v*p
c[���
��agd�]]��QYƚ��|O�Į��
�eW^��Ng4;05
�'�9Uk�����'�޹��%D��Qn���'w&��j��}�0����A~c�4$@]��v��s7��R�Pr���:yP��������M/$��CwQ��G��WR�s��.�RET���4��V>Uص�&�,i�򢶎��P��u� ��U��mq-[.	��-��d@H�si�,�3j�b���⌓��6�S�:X���Ch�#��\�O� ���w6]h\����2\`��_���M�]���&���
�Q�؁2.��jNC,�
_d�mzS�Xa�}v5��EY�A��4݋��T��ښJ}!]����yI��/�Bo�,���6˘��g�>�/cO8
+�|1ʨp�<�(o��H�K�|o�e3��݇�^���,?y�t?�R!p��`��ܞ�ќ���XW%ԝN�,eċ��n6��0��ذ��^]���.��C�/���]5�I�θr���_l��o��I�c}�#&����=��ى큂Z��\�yn9��^��9�q�Fg����
@ �r;�)I�٤&�����$ݖVEY�,Jwۜ_�w�qṶ�c%8f`��'|i/���d���Ü��WD��\(%��?8��>��|y��NBX���7�3����]x|���l
�A��A/ᶆq��b�(��-��à�Ww颏uV��v,g�>��T�!`�}_L�t�Q")��O�<��K�Ú3S0�/�b�����90���m
+e!D�m�>�	r���1�rYB�B��c��Ǿ,Ƣ�(жDϰS�m*�����ޥ��}�a�G�G��5����?��O|�k_�ڏ@��̑�UA]Rb]�l�o�%�P�����*x_��@�5�:�B���vzO����70-$�e��U��~�Q�F�2}ll� )�-�v�{}��Jn#X�y�rPP��14�wv��Rr͕�bs�|.ѷ	1�Jћr��swb�
�å����No��ِ�P�t�Ѭ��Q
+�.���h ���R�=9S��BԐAU�1�˚s�y�eh�v��
�M��+j���h��g
+����I�;1{%�.R��0T��6qI�n���P_�Q3rw����o��9�M�Rٹ(�"�M���Ƿ���-pDҔQ���`E��ё �p޲��[	lW�2̹�ì�j���[1�]�Ix�ϧ�4���1\�7o��Q��b�2-�qG7r�p���@�^1`3�)�)�9U�
�C[U(�4�D��(�O�Z�X�#;&����y�2N��C8[����	�ˎ�Y
+ IDATx��8��,�b�Nưb!��J�]ğXoY�ώ��@e �V�R	(( =#nt�d8w1�r���m�i�b �*�|�6�A(RO��eyE�Gfyh�PnG3
+B�mٯ�_��v���"j�(
+V��-	��:hg��,��'z��_�m�kӾ)MH8P�l-�U��(L�k���Q��p���_{��:��G����J�(�
��ݩ��GHp�J�]�[��fs/�IN�fn(W�h7��
�!�D��6t0W�oeG<1J����ѷz+yCA]��Z!15(1��r������o
x��ԙ�lN��)�e4�I5�>L3�$�-��0X}Eo"�s��`L��1;�5�V
;P�B_w��!�C�U�e
+�v��f�/�8P�C>p
��
+\��?!!d��_���f�M�g�_%�Q��!�	�����AB ��B�=˿��o3P�O���}فb
+�
�j����w�b߄חԑ�3�K��1�Xk1����6=;�6��ʺYr�{6��W��U�ܪ��fצ8�d�>~I_
+�^���^�SX����<ڵ��P���*�a�.O))�AP	a�y��Z��a6F�Q Gd����<m�K����^����S�TJ�������S��w8*�wH�CD���'�B���{���}���oƥ�%v}u:�K0�w��J�=
 2}����~��<[p�1I�6ѷT�����;�[%���ӷ��Jqv7bB�^�������$�s��:�]�j��fV��{�{V�^U
<4B�
�ZS#�h8󚃮���N��H�@�!�� J�@N���kMYix��}53Z*{b��m_����rN�F�//�����Q`6�G�E����m.�����O�//�~�N��8�Į��y�}l�7p�K����'�'U�=p45|��0�<0���=��|v�k!.#`]
��]��x̋{�x,��Yg<��єM�-"����G
�A��Q̃ZE��S�^�݄<')�MU��*����1
+D^35�L�D�sDž���Ƽ��'��!�
��Y|��h�V�q�O���v�;;��
m�X���|_:W���j#�Mx4��)C��E] +pZ���k�ݫ|�ֵ@t�@�/���s���"Ω6�^A@O�j��uu���|1ڙHmE�����O���&��q��)9(
p�N�hPE��w�
+
+M�S���gxW�1l4ű-��Y�-IT���nQ�m��"��@0�-ͪ �m]Κ��KB��Z�zdC������녔�e��c��f�j�y_���Nv�Zr�0{��Zf�ʩTp^��F]Ύ��v��@��];��9��htԒ�N�V
���1��6=7��Yq�4�A`̐O��X	_�ߟ��E��:߃���7�[ط��̿_�C���2�M`#�}��`��9	ސO���#���&|����xxbZܝ�6��J�
L7�M:�2�1^6���F�zL���6���Q��Yy-�n�L�ClzX�0�ؘ�\,�ɣԫr6���uqH���d���_����,�Y�J���,�tY�T�ͫ��&f���
b��@�B�@� �:�ќӝV�U54`U~~����y��
�F>������?b࿕��ȭ�����t�*A�p�M~•c�?����9&p"p�g��#/��k�#d�8�S�]�����Xߪ�Z���
+�De�c��z�F)z��w�+��ɋ�j�h������ev���ɠ���+���y�p��u��Q�Tr)A <W�E�j�����,Xk!NQ�3h
@�	&��vP��u�1�
QQ�DŹ�͏+�	9��X�:�
CEK�v�f_�5���k�f���//GjK���Ib�E���X�>K��K�(q������=�ͼ8�Ybw����A*���)q+����\���
�u�,����}f�B���W�0C�
�F�iq������y����(��^�j�Z���-�������$��(��)@�W7���.���G�rO�v�*�9�hQH��er��T~U:�<�O��+ڌ����;/�G�k7�u���d�+b��	�"8���!
�Y�׋�d0U�5���`��'�AU�3�^�eX���d�i�)�8���"(�x���va3_���� y'{��,D�S��u�����㌚��o*�&��N���r%��J����ϙŜ��2�����R��(�+��;5Yl��!'�k0����z����#��yP��)lG�Dlg�������[�DB�N��)��=c2�UY�0;r`d�Y�XŌŽ���|’X��8������l*4c������n~�������C�"����i�%Wu&��9'�w�̛sf͓J�Ҍ$�$$l�Ѹ���i�66�n���m�6�1�Ə~�`ll�AB�@h$���T���2+��;�s�s����n�x�x����M��ķb�X+V|������f_ε�^vCW�~vEI�(r�Fg��͵t�3�e�1>]a#�*�P��)\�kTa3��X���;��dW�x�٤�2�x0��m�&Gs^����iF�!-<B�o�}[t_�N^���Kg�o��!���G+x����IwP���]:6���#PR)a8��U<�C��t�G�X��9ɮ�zX�0����t�`v�	����5�x��pd���
m�L�,�PJ`�EOl�s	�B�PZ�7J\)P}�nB����z;'5�H�i	���>����`;X3�ޔ+6���H�CRoH�A�F���c���e��*Yh���q�x���?b��H��X��a~u+�7�l�G�;�s��D2Yl~���z�t9�S�J��EĤh���7�x�d�8eO3���2y8����X/J_��\��Q|W�fG�����N�fMf�f2�i�ǂ��0?,0�dڬ��q��I���s���J�x�%������
"n���*�Z)Ȇ�q��(��`���1�G 
�
��B+'�!�N�k�&
����=-)kƒ
8b�I�7Kt�h�l'?+�j�S�J�+S5S4br�o�r�����~4Io`�8[��-��v:'�K<���Z'j�f�{*����<�d��8��!&�u����${����p΄*Ӑ��'�������θX_���T+��j�'gv���ii3���9ȥ|3�<�a��$�:ۡ��rT$�]`Ȁ�橍N5U7'�P����(5d%�[c�6�A�l��m�V��n�_��wl����xtCs�ƴbሂ�G�Kx���'+x�,�����?+�'��"k����	��9���@e�jK�c"0)�ֈs�P�-֯��7�W�op�Ȳqq%|-��`���&�Ϯ�Hn�Yw���`A+��f�����g35d�	��i3 ��p�1��3O�����^]Д��
FB����o���D�m?��ԄjL�	{��C� �b�s���%)�
+k=�'&�l_��V��rM8&���V�>�;�]�#d@����%��ÁU�s��9Y�D�h౪T^M���4d�B5!�Lu��>�c8n�=e%d�u3�qN8*�u�.�BN������{8�	
\4M,(��bZ�ѓ�t��N�񦀖Rؒ0<�8�S0�nup�0�i��#
+bG�t����6LX��~
+��e7905�7���qw@gs�%��(P��KtL, �*^S���1)��" �Bt�Uq��>���+�ΎZ]U��*�n�YF���B#���aW�
vYq������
��\��1����
�4cK���z���=  ���vK�(����T�)׻z���
Qtq���L�<���\JY�G.gݯL8_����O�������3�>�����i����A�� ����5�.��<����hy#z�ÛD�a~���av#�8�
+��~���g�L�1�����Wփ�
++*e�p��M~1��m��0�7���֓��@(���۞�H$�"���Z�<
�i�i(w*�CUY�&vث��$L�xǀ�M��@�:�9Z!���	~EK-��'�l�@�FS���
~�X�U��r��ioʺ`�e�`��W�����O[�g�@&�d}K�J*�3̉�H�T��H�:b�d>e7���U��&�4yA~��[%�Q~}�&r���orw�z �ӹ���2_t6r�a�����2�U��-ZP�����0��L���ZGo�p6�@�̡���P٤��XeP��d�� X���jK��Y�#u�03� ��E���T

��1�r@m��m���ғ��U	�� ���
�|��X�W��
+�!,HH#��ἄ!V���f���a��a����޲�Zf�����$A����
3�w��L��P�
���M�9
+�
y�P��9��'wT��D��o:|�c\��[,�͇��f��E�<��-���'0q���U�UW��2]��n�}�vG��k�4gPD0�y�Z�)�{t|_�9w��g�t���X��80��pY=��q�lij�;4"r�	�D�%�.�5chrTD����WdJ�P�L�O��CJ����H3���@9��b�#PNF�i�:ʆ��%y�����PQE�I�	G�ajL�G����o�B�ZZ��_e�L����
���d'��5�2C��݇gLs`L��B	w�13��i�S	u4d66�'����wd�QF�&!h�e�҅��,�0��tJ�^���3�"��:;�S؇��Ԁ��5+m�uiA�`)��+�8�N�6=�(H���X0���4�=)�M��i�K
k��S��j��������x81��>�D�Y���mt��maqQ���4кZ��Ⲳ���^�d+��J�%������{�"C�C�׭��o#��΋�6�^��������,Qw>y���\5㱚�X���i�?ӎ�p���\Wq�ۡ<���XU�i�f�"�_��!������\�
�W�k�&��}?g�E�G9[�l�?W�?���/A~�5�KA�[o%�_�;��#]2�y)P�H�:�y��ڐ��R���[̸�4�iG�]ٰ�D@
6�0��A,�d�X�Mf��X�ܼ>����>p��e1�A��c�gd#��xUl�F�BG\0�%�_�z�d���3��Ecޟ��_2��/ &���&S����v
�l>�0,z�d��-���q~ANߓ������)������F�rO�3YP6�x3��*7m�[j8kf�:^1E%�E�M�r��
,D�2�?Y�e�*��N��zER�D0���[��6=� rv�4C���T
�A�
�����3��e�Ţ���<�|V�ђ�8����S�'�C:������I���^��l�wL�ĴjBMA��tq�O�Rh��k�Kc�6�أBA�Pˀ���Q�m�6����yh0�h�d>S�(`�ʙ.�9��V��X@�\�d�8/X��|A����Dr��r]�/���E��/rr���"*���<�Vzc�&�!�+O�a�d��8�����Ů��yX5Ѯ��U���g/�hr�L��XEY�]9�^\es9$=�p�u`ެ1`)���\��
��r�h+���o�B�.0ĺѫ�Mꨓ]�2]dE�����u�k20
��h7tx�L[�5�
BU<l�:Z�Jm��
k����W�׶U/�K���^���`�k���Rj���
�*��Z���}�uMzzQQ� �a�M�=Fo���Á.=��ra�����0؆o��+J��r�������&VF��
+^Wãmz��$���pO�&T	�
����էU<� 
+a�YPh�O�9�,�;$U<<+���X`y0�ChcmE�
i�
���3�ٔ�!-��;�괉�2�P��Yas��~��F��K��@1-vw�F�
E(��ӹ��6=e�E�Ҧ��@^�q	���ZN����v�G��t�Ӊ<��^���g����|>;����~v�����m/y%��͇��h��v�_e��T���qT%�q��|�v����Y�_Vw����
+�	ֳ��T�| V�u�����q:�u.ߌ���zѿn�7	L��=��V�3��A�s�m�jb#��(�|��9�*�4#���������c�_��
��+���|���Y~�����x�`SnN�D��D��n�q�Q��N��D�-64Y3�#�L��$�f�%��~�9'
+�K�k,�x/�W��8��u����,�'�B"l�2�@Lz�[}�+�qb�@0��v��l��k��}��t��av�+�w���:T�@,�����p�T�*��
Y�ΦԵ��S¥��E�/!.�٦�f	/O`s����Bۀ"��aӃi�4�|(����m�9����h��:��tڥ����M���̠W�]����`��0!��͖~���	4}�9��
�PȠ���q\S��ZK�Ad���2��t4(&L,�2ɏ@Wm
+�m,(b[h�;h����HI�i�	���D7,֔�g�0j9ȯ��Q~�"�`<����n��Ox�
+�b5U2�i��ԕ��7D�0�5�#�"'�e��K��ZV�4{ߌ�C�I�U�
�u�:Ƨ�0��6<�����®nn�o��z�΍�5L�B�6=S��<�-�o��ZB֧�&���r�Fy5��0 ���@��	(��
��
+]�i_`ꋅ@�kI�g,%&I�\1Љ�*I<!�1�W���TgD���˸;���z_o�s�Є���
+h9�m�%����L��P)��=K�;�h	/�4��P���B�GO���
,�7|-��\�XO_̠c�
+�hF��b��0�4�=[�+�tڄ����tB�&T=���֦�\�a`)G�h}I1�A���}���Qvt�WRh���-h�lV��w����jC�#)ѐ!�4F���I��aeI���
~��H�2*H��̦j�C�mc)���jCE�a k�G|ܫ!�����1�P@��K�����'����+����c��#~�ߕV�eI�_~��׾?����#��~pjj�q��n�mii����\����r���-�*X��n/ߟ�5�p�|q��"�Q����߮'7fj��ً
�l�h߅�r]M��*���9�s��FL��q[\('���)�sc�g�L*�;|�d�[o�F�k�lC�WfX`C�3c1?j�P�Cn��V�g���g�s2k]���!u�[IJ�ޢ\j5i��)9b�� 7Y��ǒ�h
��9HM���+�W�ַm~���_kǯI􈁃 �C�/�b*��l��z��f&E�3��t��(�-�avKk��5�?�r��+qv�g>Z0Ư�ł�W�o��g���:���ʱ�2ݡ����"�pm�o�����qtc�ܤ�S�/���	di���q^C��p����%��
++q�I��L(P��&T�{
+l$҉��ém�އS9-�!b�#�gԝrk[�?��Ԑ*�$l_� �*xTS2�g���D�1���
�>
%	�	�6=��Q�it���N�'�׍u��Cj�hj�YqDJ]p���HM �X5R��ө��	"3̯���L�*]TT�/�3��kĹT���Wlq���$�\�;Y~�c,8b�aޓ;(
ƨ�$y���c�*'�h����t\LI���uC݊`MC�o��U�E�$Ԥo=��Z�O熴ڧ�]�B80n�)��2�a`�������ZO%��*�5����ސ�Oz��FLt,�KJZ2�Ko=��L�b�ȉHm}�d������&��XJH���@��K�h@aL0EIO�P�MtiaH+S�(
E�Y��.L10��=u�����PAzF���n�?�}:n`ه]��pW�9�/ɓG�n�1l*ʇt���]%�&�X��
|ٳ�[fLۛ���?�?�5ke�"�
�2hWq
�X�9X�u�\N����$zM�3=}��4�m:aA���mI�R��+�q���޸%P98ګ���c��I�)�b�pvޘ��`4�56�$O��
+-, t��%���?D IDATZRا3%<X�*e_�˾��icg�9��������EN�_(�G�o��g>󙭭�:��S���o��o�y����w���/�R���/�Zߒ��nzb"X���:֌� �E�Zd�3�qB�m<>��Α��k�G&���/�b1W���ͦX(Y�f���hf�r5��9�z��K,~N�� ?d�m��֢7�jv��%������ ��`�55��v�j��6o�/>9jn�X-�d��
)-�%VP�+�O��j�M
+�F�����zE��\4����M�!ph�A�-�Þ���9��M�i�7�F���t��L�Q-�GW�u��gs�(�_$�+�G��	Mnɺ����g�3R��n�"^/���
t���&O���u��}瓩�/�b�_�W��˂��&�aD�|��(��ò)sXf,%]�>�2�C��V}���
�q|~��a�:}ņqV���y���R��
a�ƚ��an�=�����tRR��Z+�+��r��i�K�tN�6=��-zD�]��˨�ҧ��B0��Ї�&}{_��l����8�S@�8gcC��`	��اgjxS������mѐ���vJy�Χ.$�@-�^O7g
��d���De�A;�����R�͇%�Y�}����ώ�wl�d�����g>��I�x|3�m[<��X�-�)*q��,B�W|}��wJW���%��ŸJr9dd�-���k
+bc�e�:��}F`k3/4Ą
EK��j�����=�s�z�I����\�0�v����<{CD���"ΕyQo%�t�`a�)�쎐��s�3�����q�����%�NFѠ���)�����Ʀ:���TZg�x�	��҄”x������̈́�Uy��*sC�L	Q�.L�����Q�Ƒ�>�>�7W��^��
+��L�kxS
/w�>�/�hÂZB�<X�]	l���ہo�q.��9��}:�Ay8�S���R��퀷L���lf��`����;2hzX���i��
+^���ܐ����n
y	�h��~
iJ�1vUwP�`�j�%�صܧAJ�5d�a5������rYAnB)� ��@{�]�I�c[�e�p
+a� x}��x�{��:��24P��ٌ��'S
+3�f���tOFtf���؄��Q���
��I�\[[{�{�����������ַ��o<z��'>�'O���?��7��ɂ~��,~:U�u�#
�T�_�'C�M_(Մc�ߙ��6z������k��0?@_m��T�抓����_*rR]2�J�XlC�v�8�Y�Ab��/Gb�d+����oN�"�R5��b(��q"��W7���_
+��Ѿ��"��U��H�X�)  g�����ŁJ��gC�r��*E�@1ɞ
+���D�v6S0���n�&��C-C5��%q�b�#�
��؋�;r=�0���&_��nS<��lj�;MqF��#��݈����e��D^/z��;��H;��Q��Z���n�v׽�V�@����|2�;35���lAe��1b�����`�ڼ�2@�+��N�8P"P�����\����C�0����8��b?����חx	���~����˻|�@N�o�}�w�W�XsazE�פ�,�o��/���c��̪zBQRg{,���x�Noн%88�^Ѧ�:W�/����)�f�`��.�a�{8��6=�¼
�y�%F+��2+���1Ǝ4x��gM���a�����ZF�@Nƚ�j���a~���0}y�8���5��9Ɔ��n�j��:�w&�w+�
h���nh*��Ӯ�e�W�փ�����mqb��+a~�@�b�d�=PE�0?ؑ~�jf��#A~P�U��R2
�
�(P�>�
P%�/a@ 98e<hcm��
�9����E��
u�t�b�n���VRR�P�"����2�I �x��&�>F@}o&�췞y��6v��Y�9������bb��ӣ��zt��1L�;�CE����^]�̠C���.��1���sH�6�%.N,��aUA2��̕pWFI	�w�Y	ID͐6�t1�͘V%�]:��-N���g��h������]S�ǰQ�]�aiC�פ�z�M��lb�Y����SC:?��X�#W?���s����=2��9��h���c ���Q��1wHG�
��:U>{��[�w��/�{��̓��Ѣ�4H+9�	G{��I)ж��9�C���6 ��(�,���a�xJC���v���qRBP;��CƋR�6�0/ι��E��Yc�L������~����H"��_���������CF���SO=u�-�<w899�w��G}���?`}���_4���rW����^��PΧ���k��$U�f���m�����aS,0�#�9��
+E�3e��\��j����׎�j=���H����L�.�m��c����_1�
� �b����@U$�9�ɍ�=�N>ӗ�6��M�bb���1`9Ѩ!��t2���<�`ZL����5xN��\AS�g�
+�b`�ha�p�Z0����������ߎ�!�ojr,~!S
�_����������4yRO+=6Yz�&?ɮ1�[��x�X��V7|�e>�1|�a4VzG�_+��d�[��n�4lM���~�%�
+�&�d���\�q*����orb;/)b�.�6�k��]���Ako���8^��L٤�V��	v��;'�ч�������/�p�����k5��98��Ԡ7�qG�t,�f����6�ӛ�~�<)�p���P�4\��@��xt���a�����?�E_#������T.Sy�����ЀNT���I`��G�g��|�`qH���zh���t�R[E�c�b�HEC����ܖ��n=\3�qI
CP��fz]��=��q�d}#W�%���s��
�a��y"�r�K]v����[��u���������5
�*�]�����e�K���I�7���
+�y��c�-݌��,���.F؞���[��[tok��`��{s
+}�`�{�	�Y���.���&�Z�d	wo��FE#�pS�Y�_,^��b����)J�m�a�l�3	�K���������{ވ�q�gX`�g�5Pn�GTjB�4�s�'0�h(H�	��x����;XO/m�Â��Ԃ�����?cC��#x�@�D+������t����ŴVgׅ��`GJ�N�}��R�s�ŋ��s�#Xhnҽ<�R7�0'���r���’����
���V��������ޚ�v���y0_�k$9˸g��r^>\fU�=�����̪�7�5
iB�
����Y�Im&>����p��%�N�2�*��c�TOw�D*��(�+!��+)ua"�Nv�*���
�Q�!7�S�	4���
+b��O�b�Ґw�v�&��*���l�`�����!zbe+��~������|Dk��������v[)522�?�GF������w�Z�[��Z|��;QyuA\��S����~W`���֔�L����U��
+�-qzm��[��=�[��]���~S�Q�:%c� 	x?�~i�
�8ތ_�ɵy�-��*���aq��S"6a?�1u�2Pk@�Q2c�E����b1�a�l���N��``KHW�>�;=��AsZ��c�Nkl�*��.��L�YI��u�f�N�|�y�˝��������r��������o��Y�o
���ǚ
+a�Jκ�K��U�x���8��J�<R�
�u/c�(}��<f�8�w�Z�k�\��8y�c>J���T���j�`<���6\q1��F���JnA�6
+��n�*��*Pe��l���>s`�E98U��=�]P��Q��#�Y|���
c���Џ,��l���-��@c���Ӌ
+��6�_����i���9X��u����7�������q������K�>��p��؅9�^	���.ӧ<�݂��ң���Q>[ăMz��p_�cm�� 
����h$4(1O����	
T��r�HnVd�r���f>Z49�Vvy"w�K"�7���.%���_�*��R��c~;ɯ��)M^�����e��
q�6�눧������y��6����p�� ��o�A�Q�&�[93@�MՎ((����jP�N%��{
�K�Dd�m}������i;t�@M�7��l�$�9a,�N��j�'�!�(@D�=��v�v����mmu�ݯ�h?Y��y�����*��TO:�MXm��C�7���7����z���S�X�`�i)�++�Բ�֣s]:C�;�b�e6�1ۃ)	CCV�#	�$t[���+��e�������<�:��aLp7�]�6�������:t��G��=��?�ބ�[t"���6G��2�*��X��iA5��@6�o
+t�ѐ@��?/�����-�B[�����J�'	t;'���������imԺ��jJ�*�6�ha�F_R�Ѳ���K!�(H��y	����
-ǰ�\�q��ݤc6�"��8/!j�s6���C���t1���g���̦g셌T]l����?|�U���cʑ.\����ݏ}�c��\�� ��c�ߠɶY��d�s/g�F�Z_[����o�C�f���D�U̇r5Yt�����3�'� �$#s��b�pg?�A�;�Y�B"g=�{���
+��K�d�s�.�E���e�b�#�ｫh\�ߘ�b�<hj�N�qDX�6}�tXSK�Ή30\l�U����Z�bG+���Z��`K��hf���J�١<����v
�!�	�����Ş�[lK��V���R��Ko���-6��W��9ƣ��ߘ�)cM�(y%b$��Y/JoE�
L۾׳���7t{�Q-������H���P*X��8yǁo�M���4Z�UM�f��X*�5c�a�a��a�
�"��k�@ ��	$�t7�
���Y����m҃���>�ie��1�^Z��n��
���ص�+���^!PTS�jѓ1l�0��j�����DD��t4d}:م�9�)�;�]
ِB���ދ����)|M҂C-�fC��&�L&��mZH�R�O�
���&D�(�5����Ҳq�჆�I�T��.�OW�/�8��d+�cփk�W^�K]��u�a�uu8|�e>Z-��g���QT�B?z�TSi~u���I�������dj�%*ޝ랱��`��~�8�(�ќ��Q&IO����{�M"p�b��%�����x��N!��
+�����K�/��qv��YT_��Tp/P��&�i���iuK]�H/��=��{����	�0u~���zxd�s{G��9&�
���
�V��30\�c�dt;��
%�hPOBRa��
(�̖�i��Z�N��a�h����1
�N�K�k��d!,�較�E6��8�N���i<�1l���'��G�!yF2����@1�W#�6�|�K�$>�4Ȑ��c̈́�A��Qv��r[�ˡ?����>�S봭VM�<Vw�փ;�>k�8
@1��B�~æ5՝~Q�A�tt��OC�y5�HB�A�`�M'�����
���Y�	ve
+��r`4�
��x0C�
+8��h�5&c���S���Ѷ�P�YK.���H*8]������#�ד�&$h��Q�ǔ#�;����c�!�"M�7��
��v[�V�7��<��l���~?�\��|��k.9剅��=��#��L�{������d��K�想��Df,�����O��o>0�|V�m�/���7�$�t��c7Y?ȯ๚�#�I.����9�EV�䕲q�j�9���=��n�{�������\�;)eC���w)�ޜ�)%��t�������2�b(R�HJr��`}��S\�)��s���.G��.F/2XO�F��v͸������Yw{����0?�=��`�U���H�_�p�K~�2N����OH5�X�J5��)=i� L(8�ժ1M��_oDo�9���ދ �A�r���	���{�]~�s�ʽ��o{Ʊ��q�|,�G���ɂ�J�'J�H����`�F�`E@!�
�ǰR��
+�!-�2�&T
�����n�3�[
+B6�:0��a2�mӷ
��:���>==�2G6�ބ�r���U���FR�×ư҇�8�oY�����TD��6=إG��+��-��z�t_	wo�&�m�Y����|w��H�
+|���9��^�a3~��Y�]��.��H]G�Ɲ�By0US���F�c��e�7�k���N�����*5�/�|�w����k>��_(8����u����]R�[�c��)��&�9��c���sW��җ���m�Y{1�<�FFz;y��~�q
ֺ�΀�YXP�D���d��_��y�s�Ƞ�f
wv��$���}%�Ωϕq�N�P.�>]P�-}v�����@��pq�����R�h4�Ɠ޻��h�md88]%eϕ%�EBQ
�|�WX��1h�E��+�f_o��3�#"��WĴ=��ϊ]m},�ζ�Tb[r}��V�	�7�y%��cv��rJSs�������&���ԯ�����+����6�֋%�%�� WDE��f7m�'f�O��m�@La�Z^��6�}��iMAlA��II���	��*P��)�=��-}:����2�t�E�G��������ߚ<��<�/{ׅ�����D/��	�����Lp�Ţ
����̆~F�kBم	��h�`��C����X�Nr0M���]a����VM̺�����x+#��S�Eޜ���o����o���g�y꿇i���я~Բ�#G���gmm�̙3�^{����f'�~�u
+b=׍fr3��V���&/ί��"�1��.�8�OX|�(֗D��O�������-̞o�g5Y��g2]��3��d�_i�e�3���/2�Ot�ayIDC���M(�9�RW�U;Q՞�e �L�k��E�a��8���҆:�C�P�VA
k9K�My���hH��l.��۪���������d�w:.�x�2G&X?V���
�Hk���g7w�W��d�s�ځI5.�^�>Y�>�U�;s�p����b���`2�pxC�9���N�!n���\���QM>�	��� @ֳ��9�&ٍ���E�O�ַ�X*��(?�S���9f�F�J�����U܏�4Ȅ�}/�~�-���Y��6�����(��2^Q�}
�=�5ֆ����!�`G	+H$e�-�*9�p�&�CZ�p'
h
+��g	2�#XS�Hp7�n�=�cp[��f｢>ͮ��g�s���s�b��ꮮN�Rw�P�Z�ƀ�x�a��dc˜$�D0�!H!
�
+�V�:�s���������=勹��h�f�Y��|/�^k�g??�M�İJ7���$S��F�X�7)T��Q�]uѪ�Q�4���&�	��yCo]�[S��d�W\1��KJ�<16J��;)^��-G�����f[a���.k��եi�}�ͷ�;������ao�̾�;�T����/�6�0M���k�Y�d�{�����9�S��h$�X�	y$B�/Y�
+8>:��_z褼�P-�5��0	_n�U~a�g�����X�Y�Ӡ�T�^`y��h�Cw<*1���I@��}�¸�w�O�����:���-?���i>����ġ��Uc�;I򪢡9س�3
���p��&(AM�CaKOxw�>%��v�Q}��7�VD���5�.���P~����	��M��Y�'kaz��:n�۫#;u(|�����f�ٽ]@��'�S�y��eq۔7�
+AN����҅�R�n-����	�d�^>�+
���;$�!?Ur2��e�!_��y�Į7�]���rQ�QS����:Q��mY����'�f��[��x�?>���_�+ᣖ�0������[m��	2�V�N1tL�9)O;�:���J��o�~j`{�ͥ�6�٪|Yɳ]��.���z���,,��	�
R���w|ž����?R�V���$"Z]]=|�0�����?�'�'O>��{��S�N]�������4/��	�k�^�m˰�|��:`�m��o���]��K�Ӆ9@��f9v
�FR�1�U�'\�-)Sr7ӧ��Hf���'���&�� IDATx�#�����\����ǿ>�����6��D�t���mL���Ɩ�4�/�e�@�ȑi��v�Ӻ*�X�쀺�!��Ԙ�u��9�b���&�b߾4�K-��tSk��]���s[���~q�`.��_H́���������xYv���H�#�`��w��}�Y�~�ئ�+�:wh����F��̊W��c��O̦+J]<r��
+�?�������B8�9�"/�t�?����N����R��/���w
+��΃R��9l�;���Ǵ��}*����E0�5��U�ڞ=�yL��1��(2���6�N���k�a�4��:�)@sE�	^��mK�ƼI7T�H�noә��-y ���,���4āݢ���yBp,�X��F�U-r�K�ڟZwK�[�D�cS~nȏ�t����KP
�+�[�	��b�\�D,������� ١$RD%&1�H,�y�P-;y�"�2Di[���

+�/7�	ʤ����E�����
��<�����?'�7�
j��:�Ŭx��œB�>Q��a��8_T�>s��=ҹ5p���}���R�~���T�T���sI31�Y��Z�W]j=�?ЪE��ch���B���H��}�KM	O�߱����)_��GKL|,O�bM���a
�`x�g�^������?㭊8tǏ��g.Ix%�3\��/��W�"�v�ZH�9o
�N,ZK��vdKA�9�^,v��F60ӄ�s��pQ��aK �yۢ<�'tr�W�b�W����%��|j�yO��,�Ғ��dU�ґ�;|OMTڲ��fs׾�^�s�:,�84�!��,��JZ:V����7�U���~�_�C^DK���8�Y_s����7����yԵ(K�ކ/��h��U�����
��ԗ���ٟc�Ko>��G>5r�☋��C��H#	�3��{�K-:5�
�b�W+��q�f�_�;=j��Z�n[���1�لv�bif��<-��(J��DR21��S��Yέ'���c���o��뻾����{���3g���'?)������S���� ���U�3�9�˫�>f�-��۝����N7��P=G���5�ܨ���
+J��&��R�ua�����x.��2܎wo�<k���EI3G�Q�N���P����la��u| ��'�����Xq�c����=
+�����gVO즁�3�=˺�|�E��j�n����L,ۜ�+e�S��5��mh�������]M_�Qj�P�5����)��|�9O��)z�]�\
�/��v*?+hx�����+B�^��l����;���	1�����.�}<?����؅z��D���:[������$0����ׅ��\�zˑr�nJ�F���X��Pꅖw�'�TU�!:-���{��]������_4���x�^����z�#~��A$��!ߤ�7��5��؎�5�7}~\�3�Z›/�wę-�f|��&;|O�C9�U:����+�ܥ7���ez[���`�0}_ʻs��J�v\��"}c�Q
7��H�5�>�7�c>-�ttC_tH��j���!ϣx�<]��:��yf3��T�LMs\��8bI���O�ݓ�Iy�$��нo�}�#�Fу���z�������g|��j�����]��+�������z��;��Hы��͒��rdlk���[��3r��|����>�t6��F$��s��@"�1�T��]�g�?�śGxB��4s�nؿsPsPS�r�7�e���
bX�|Ηr	e�xh3��ދZy�W��u����w��$�#�;$_�c�-nP�Q���Ю)D�50;�0"�.�4��
�3��)_eh|j�T7�e<tɷ�̓g�		�X�N�aUݠ7EwY��Μ7v���H��L|���@�
9�Ն�0t��ϻ�������I�|�����o�x�m
	��rd'%f�����%���;��yX�;�]�u�q�LxmU|���z:c�Ͽ��YG�1�6��	^T�bE�CѶ�֣̌�CA<���2��7	�N7
�Ő��XL7̣��P�N^����60tơ�Cw`��$���=j(N�8Y�ʲb@����'��H&�U��e��Ce��n��iy@�A7�8�}+@�*1KM��L�J1K�qW�w�l���G}������V�[i��y��w＼�������X�^��ܸxeݻ���)�n�Y3$�eX������'�4���b�I[�6^���'�D��??�{I��HLm6������ڹ���˜�%ܪ�o��ȗi�{��<�Q3lc��mgו�W���L'����>���2��;b\q�>)_���v��~!F���vq���Y�*���<{�#/X��*?VRM����SY��,��W|��R��.f��*��\�;���
L�o$J���ӗ��+�3��*�6���Y�7J��?��y�ʥ�?ˋW�'?��Yy�#&��B[�	`h{��@(Tƥ�.ߣ��Δ7\�K�}Z������[��Y�sK9���2�g�t|�WDi���bH�S�"�v����l�W`�E�tP�1�c�Qcr�5H��e��G�?ē�Ǻx}�^
��ڀ���B�NN���=�	�� sG�P��Ф�D\�����L߸����җ��z��K�>��-͵@�oU޿;���w���ǖ��ж3/���UAI-��$��~�(o�D��"G��C��Y~��<j��J��
+1����}�Ѻ0�`w�g�󀠹�><�ޕwJ1��u�:/h��|�/�g�т<1��]~�A��^��H��b� ��T���0xȏt�M	_^o�C�e��"@Z��u:Q�e�+!u2
+r�?z�G���c9���r͖O���%	&v$��y7�%U��L=�o�V�l�DW.��E��7�U�\-uL-�Ćy~A�8��E�O��n��1\j�-ʐ�&�W���W��!�i�^PEBV�e˹�R�Ă\�$Qb�Uw|��"���s�U9�(����?���8�LF�|�7�F�S?��媄����S�__1uD��U�Y���A�]��I<�Ć}�C�)�Yػ��1�U���o=�����y�"��%��g����l
���9�-:m���:,�#彚8��H�۵_��-Ք�s;������OՁ� �D��q��f�oa�b5�T�jH�,{5�P���(�P㙩  e#@�@j�?�d��'�|���'K��n��G��xG�:_�
��tWK�()305mI^��B��{!�ME��|�`��P�3���c����KUk�9@��[[������v�{��%dž%��rߗ
56��(lK�)ٝ�t�)S[���͒W�M�=;����J��f��*@b—
D[ts.$�%�={ޣ&AtU7g;�M�m!�P0��EBr����s�`�R�����K��-��i��I�����V��q�?h�}�}!�n�g��?��x�*�;��)�����T���{��Gf�\�
+[���7�^/�\�%�'ey�1�ꍿ2l�f���W�7�-W�mUr�����(�fi�ډ>�����n�60Ӕ���)�-������5�u��"/�+1\�7Lp��#�͂[C~<�T3Et8Co�禼��*V5\L���8�Ք�
�\�E��۝���u����N'
�PC!��J��i���3�I�qH��P�!�`�k
+���@@�#~�@�"��K/c���Xܴ����l�

�m.vԂG�$���V�0IƑ/���mnnV��J�ウ�聠�������V��9b�з���q�	0��V)�"L����?IX����t�����]�'g0�[�c�{Z�>��&�����mN��V����;
�p,��	
'���<L�<,1�����M:�a�@/ǮK�*qg�AS���m�����X��
+�(,ajtЧj[�@4���>|�	�>�Ģ�ƴ|���LųvoF�!��4ˎ
+���6��<�Ž
+r+rdu��l�y�ھ�-s�)�I�Q��=�Zj���ZɩO�U��E�[�Aӹb�I
kYĴҤ���t��_4_�h���?�tgV�y�-k��[��DC�݊�̬��!o��=��׼��Y���	,݊�*�m�)���H��7�<?�t<a��D�ALTrv�94��b���
+߸��w�Qg�>�7yD}�9E.�+��e���8�c��іh-���
"�Z�YL�S�ı��+�#
-Iz	�,���Zק6��92�=
+v�ZS$q�}�!ob�q�,!A�E]�?m~�+�~�^�����ξ�k܏��HiW剖��@sm�o����,?f��M�i�}`��c+�����k�V�����#џJv���zvsU�z٫�v{��*�C�CI�����ѶR�ƾ��N��-�ij��԰;��r�XV�T�Z����	�pna��u��>��~]tGv�����'5��p
Ӓ�E��2����Y��ң��J�4����W��2-^mة�_��cl�~(v�r����?{�\���Z-��f�}Y��
+����Dw�O���D���5hv���3ԛ��!��� ���|(��>����_^�y�Q�!t>Mby��K��{<�J�������C�����c91��9䚎l���5C�
�v����t�Ӊק�v�ԘNl��u:}P���v���
+�;,���=����L�#m:�'42��S�j�c����a�J�u鎄�+td�*t���9.���Q7���
�S�=�g"+�в����"}�5��Cuݥ�����F�3�KD����Nglg�3l�9+���/X��kx����O���v��v��K�/��T�Tr�0�;�J-��Z���z6�2��@bR��K�O�'?�:����̔��Χ���[e���2��H ϗ�] *��N�뭧����o7޳R��I�&�U%z��lǙ�U@Mzs�
+�[oϱ���/4�L�^렾��q�Kg6탚���U:�0{Ѱ�ۋ��+e/���;Fç&W��^���O�F3�_�|j��^#�ɚ4m��7�����|��vC�h���(�SD
_�GY]4��fg�\rH�����8.yu������}���(VKN=r,���ʬ!Z����;>*_����j�#9{PǶM?c�R(
�LM,^5O��N������xǻ���⧶��~v��
�DV��n�&�ca�"�&D@͡Q���<9�uEnb{U:4�~$������}۝��鄄�6kRP�9&犋C;(��=�p��ЕǮA"[6
+���zhH�?�,�� ͱ?��������3�9�N�����n8S�=�*�ڲ���_?75p�9_�F
�E��կ�[���}m��5k���r�UmCAe�y<3�r�th��M@�[]�J�������OJ�3����YV�=_��z��=�p�m�f���_�s}ܗ;�򈢢�>Rڅqy��s�4����&V
+�P�ܻ�W]
+��My$��E�fNxV�"���`�Q�ar9�y	�9���rf�HxW�c����/Zΐ`�#���ӥ]��-�gs��Ĭ�}֕/��wv!v��s��=u���7�����C
�Rng�ݭ懋��<��c4|C�������-��l�Z�C>G>�lvS��\��A�����~����?��J�R������cƶsbV��륡1meh枽̰����-.�k�a�Uz����p)�0U�LmbaRd�k�M&��%�F'X�/5���h�U��w-Q3�Ռ{�u=3��P�U��mze��6�>��b:2�
+V��P�y�ao��%�%zۘ�j��s���5��zw��]�4A�=�Uu�gF�*Z+wb5�Y6����vQ�:�/�F����Tiy��`a��˾�$`��U��;��[j|�x��#�cyy��z�`�c��N�?�l~p4|wg�ϓ)jm�F����Q�<�\L�
�z
v�<��q�Ɠ���~��b��}�C�>�6���OaV��]���(�Aѳ)�g|�ĠCo0���r@+����7�H™�fS�
+�,v������%����89�!u+""`fsA�&�`U��r�l�aWT��D7��� hJw�̚�6���������L�U�DrX�h[g�a�2�X��U�
�pET��L���Y�lA�Ř�"j�<]uE�Xw�vbP,�ڮ�7D}����ɠ�)�($7i����52qS�k�j@킧E%�jb���x2�#G��vܙ�ނ85��E�
�ll�#�#�%O����Dp�_ܖY�`ͥ��K?�ȸ��sG��Ӷy^�'(���W�EiYG�M���I�{s��;���UuX���g�7��m�`�#%&'��{	�DT�B��"���8�r�S0��5�D�����X3�DM��Ub���f��W��,�?����܏ ��r�y`µsW�~����yz��ם�.MF��(�Ĵ�}qRܒ���.V���L˗�{�5��4.^����X��
+sp7��cm�3K�)1�/N�,�o
��eW���sS��������l��\r��E}`�K�9�u{T%� � �6�g5g.U
�9�R��b�#S�n��E��+1m��3���#})y��8%P���ka�u��I��q�U�/c�Ҭ$ū�/�\��o,ʗI�)��${��uV�ͅ�[FX�T�6��H/nA��,�)�Bb��2���7��C(�Z��|� |�-<F/?�=�֓���V�yJɋ�을��r�۵���QMp|�(�%�K�֣���$��My`P왗rLܕ�Zt*�F�e�LXK2�8G�g����U���;�3M�>��!u@�m�u��������š
+�Y�&���%��3}~*����_(0��c�	d�����4A2�a��%qf��":2��Z[�T�Zn�Nx�m�Z*
���F����_��d%�����)v'M'�7[������${[���'�i���AC�al3�N���=��ik�\�A�d�J��"�xp��
�e
A�7���<��h�����E�_ԣ_�d��p����ػW�43�-�o�ص_�Pq�a�},Zc~�N7U��z咸{d�>�f�.��})�E����۲/��FK�ꀀ,��l��"R;
g�a&[�r����9#�҆��*Z.��ڍ��QC:��+\*���;1nGV�2���'�p{�ª:D g\^���x�aE�K�=����+2��6�m
��P�����(��WH�SS�y��ʂ�K���RUTe�&}"{�1U9����9�gv���Mi|2;��UU�P��[������Z��J�z�5'(��N+�vΣ��s޽�D��uέ�ɰ=�\P��J�kQ�y3��H��)_:�N8��w��G|j�M13��f萜E:PS���3�\In�QS.���G9��b�#nȹ�(	h���3��5�*��%�H���&��2��U!����*��|��P�E�p��B��y<r��4����f��>�m}�l6�^�<�ɭ��u%����f����[����|i����E��D�"�m9x)=��&�;7��������@,�a/y��L ��jM��ȏ�U�,��q{(ʐ�u�t»��(���,̞}�A��_�FǗ�J�3}�9b R��#��z��v������\L}����%Ph[o���#w��0���痚o��O��٫�������.��-��O����r<�qf��^��E�^��0چɑ�P.�)8
k��p<�q���Fc�e��n�]zo���q���v��B���֬��ayz)���6̞֒xh/&�ȱ?�G"�>��tZ�Y�R�!C�.�vMT/��3��#.E�:�W-˜ilhZ^������9������0ٶm魆sֲ��nr��d��S^D%f#>�SФ�2���h�N��Yo���l�
+�w
+�5�-�z����;��c��
zy��uqP#��m�ħ支�#��|jg�ȏzٰl6�uE���]ۖ+���?H(�
+O]�b�d���(uA�C����?��<����J�KG�t�}]"�^! *]AP.��g�"�O��XZ����Z�)�G�7[[4��r#P����Ŭ<��5�f9��N��
+��)��p�K_OP��w@ޥ�UD(ଙ{���!�4vl�@�F:3XZ� IDAT�L���������$:ʖH�3���r�#P�/nI-�&��b�B�
1�'�\.{��B�Ϡm=��e_�]��S��ACS"����+"���DK�9]Y-x��*#��G��xT|!9�RyM�@Ok*"�l���oX	�Ͳ��X���$:�O@������l{�3GL�����VE�+�s��BOcb��;�~��K�xA���$��epW�&�s�c�I
+�P�/������#w�<r����,�԰�Њ��[��]mqê�9�NS\�7��O,<j\6/�;,
+�o/��/�h���8�ZpZ�N�qƩ�,�N�lL�n½�GJh_n�j+�*gQ��C��+uI��������@�G�#+��Tr���'������hn�MmR�b7{}�.�Ltg'��IyCC]Y�ｾ��s���޼�őۂR����=D�/2����r�p��d��<[QW}1��ݪs%���z��o�����%˄'[�u����_?�6ʽ��wĩC�Ԋj�+�E�
(��q
�p��av����bj��h�e�)�]~0�f��Is�^��(g^�:��H���U@�˗Gާ�؍�'�]�M~~8�9����}����R�\�T��$��\)�f��AJ$cD5�����B����*
$c${*�b�n�QY�r�1��� ���5�WF���R����Y��Ƴoy_t�6@{%ҙ-cZ��b�N�p�I_7�]�BE�O~G�XRnbI_V���U]��Sj��J4;���+�-�ZXV�qWG�>������q΂���(A��a}��I(��DZ^gF|�aO��������ND8�0���&ݕ�$�Ty��&�9��ް���!�f�)Z]�b/52��ž���y�l�}��K�bl���4�����v�� 1�|2�`��@:C]ɧ�C�����x��
+�ML&�pH�d����q�E�J^�Q��:O̓����Z�+�d�r�a�����85]
̬8���&��q�n�*�j�����Ԝٴ)���/����*��hd�CEM:����$[r�Ə��4��?}��\q�|��j�C�ŦyA/zkj����4�
��!�c	b6��z�b��j�p~���D/�4#`h �T�Ϡ%w����z1��Ԛ��	2�j%Vk�ͮ���Kn��
��f/�	�$9�Dɰ�
+�H#���n�u�9
C3�7���n�x�G�lt�_�/ۉ�g6��Zb5�3�d>|�9�7E�z/�,f�i`
+kN���g!
+v#��(ҋD:5՚C���ȏ�O9�#n�UT�&,8�q�7U���z��C�.	�"�ɽ���y3�aH��G5��
+�
+��TR#o�C��'&��@@�C"�Q� ������ܶ`�d,��m�l$2D�����l�����v����T8R�^�ùY��n &��@���>�a�E�+���j�ְ�ink���"�9CTԅAyR�
�����o��kSw�(سL��:b��F�����Hi ��G^ʉ"��� |
+�< �J�
�_XoJy���^��s����,P�ٍy�J溚�6�,郕��K~������}%��ؙ�oi��w*�cl��JQ���5I�ATH���o�W�#~�<�b{��)aJ�Ae�@��(S�t���]B6CP��5T��:j˘���
H #�`���l2��ɯ��NJ�L�vy����{6�W�A�bl'9�KL��<�ii���SC���M-ER�-ymum?}�/�
N��̸M������B w���J�K^uTb#�4�W�s�|�%O��)�pi��qر��
��}��µ8�g��_��t�Ȍ'O���E�ƒ��|��VL�f|I�/,��.�/��.\�<��C.فI=
+��<�tc��xz�q��e�bPͻ'��g�X�|9p�f�仟/��hF�|�/F=����-�DX��Z�֚�$`JTZ` �y����zޥ��[�͏V�n�
�C6�d�����`���9�ʵ�.$�Db�zet�{/��h<�C��s�tH�S#o�&k��
uM9���D>�~]���f�25�gF�͉U���{�����[D�d` �3Ie /of�#���3�����u5HL��>��n(�����IcQ��,B�LjÂ��n���X�5�3�Ud�Y�
U
[����
+��~�IxQ�r����ج�dn����l3���bABx��bU�-�z��������
+ˬa�s�&\V������1�B�1�=��0����>�d�g�	�-��2�w�bj*-���P�'ѳ�B��r��,�j�Y��5��A�󺨝�۠[#ѝ�]E��x�{!�
��_���Uy˖9o0��^U��3�%\*�\���My��,�.B���3�hH�XIM��(55�k�*0�pI�\������4}%�ȟQ_m�M_�G��(7�J���]^O޾���l��`�b�ˋ3S�냱���MSS7��r]�?2�@������
+�T�v$�&���F�eߜ�
+����46��W����rA�\R9�P�9�	�"��q)�xX���P@M�$Ŗ���]~d������L�ގ�4�#�dG��=A싴�)�O-ق�(��P^��D�,�'z�[}� �>�^��C�{��?��7�#߿�h"� 
+�,Mߔ�����<C���d��ʃc:�"��-)�����5�F(��09��t��Pf�k����\u=(54�G�%��\������w~b���-s�a�#Z)9)0�)<$o
�(~${��r�s�^�����gz����ݦ�o؏�fC�H]u�nn����J̎yC�IU���J{�z��T����r�	Ԣ���E�R��D��y�;G���tA%%O+�<�ǚtg�C��CץfD+	.�pJ�]7���
+u��OT��"���v�/8�7��lJ������M*ls;��Qqg�}`��.G^��bQ�����9�%�����amK9��_w���h��4jc>��`��
i� .Uۨ�>Z�B�j��I�o���U�9m���@[�,��R�������_z�vb{�&�zR���DB@-�W�C_�}��r��-�c}P���򦊺|0��#�~e�}>��C�g+r�t6\��� g��ذ[s�K��Jr�XZ���<(n��a����wDR��"-�������B(g�:�iTD��𨗻�4�TD5�R��Bh��i�U'��"�ew�}�<Ћf�j�DR�Ъ��[��������K���:���'gn���I�hʺ�l˦"E$"��mS�JR�M,������fjg}�&j]g���!�"͵��7��Ղrc!v�,�̥pl���	�Br�?gP��0�~�N5�t�ͩMbZ: O{T�5�e�7�ŃN,I��f���=g�sL��4�ܨ�Q%J;֑O*V;>��ڮ
+Q��ā`��ɚ�K��K���A���o�r���z����'��C2���-�Y
+�pP���g����]Q|����
�+Mʛ��f�누Y�bϥ̣���(�)��iy㒻�P�A,{\���xٝ���C�%6��2���f��)1��/�������b:p��0��Kd)v���>?2�#Ͷ!���}�R��5��

�G4��_ܞ�FU=��#�Y�b�����OD����_��+�a�b��UЬZ�OJ����B9p}h���
+�e(�
�A2D�0�e�t�@>�)wa4L	/��<�����Pkl8>ֶ��&�y���\�45L����7
�=��{�k���?g�����t74

�*���
Qȍ�$b���%�bn��E�S2)�
��i���t��3O�yx����{�u_��EoWqS7�b�~��W�멧j��]{���-�
+��<�$�s����N��k�%`E-��YI���'c�k�o�3�:���t�����R�#9/.]-��BQJr��e%`%���W�ᅖt����8�\5OV�Q8�s�^�+w��(0(�4��*-��!��w��_1�x�L��Ԩ����B�cQ�=Y��M���ӌ]SZ��~*c��װ.T~���>/����Pw����KscV�{�+uq���\���OQ������} �@��6!4���9��Rc����Ci��CP�eX����;�(z �>��&?��zU]eSsȧ�#:�	�ݛ��{O�<�yR�0n�l��{�Dr�h�?\�*��Pn�u�3�M�of��
8P�ٚ:_�&�j�g�U(7J7Ǡ�5��'&�
+��S��^���&Uu���N̑�����ZzO��|�aOn�G�ǐ�kX�"��RYMm̨�a>���䉭�%���B���m��ԩ��4��Oq]�fMeU�U�xA�ą9�����G)'s�Ӂܳ,s�
-1Ӭ�SK*bA�Lf��p�@�P��l�%+m�	�$©3K�t�\��-�cCԤ����@�e�i�t�<U���C���9
l��E4v��e,l ����*x;��QK4Z2�IKx'u��ﺗ�*8|$ؐ�w�^�f��눣7�o��8��\P�H�Yu�E
�Jѷ\Fԑ�.=����&����G�#��f��UT$�v�����5��*<q&q��e��u=K��?��?���z׻|�Af~�k_k��z�����Nl#֏yb7��k������Ÿg4咊�.��w�nI�UeRQ�$�
}9������-4�Q�{0��Y�]S��&���[+�[eC��hҳIU�B�'�u-�WE䑯(߲Oi
E7�h?��ш�%�&�Th�`�FXֈ<�|�ū�|fN<g�=ܢ�&|��2�lG�(��
��#�ٶ�q]_��<��Xv�O�~yc,/7���Ě�����W��s\�rc�~��}ai��R�l���i�J�,0��+�E�^D�꘻i��J�W0���gQ[����Q� ��_*(�(0Ci�I�.�/���eyb!��V~�"���m;�����랶�
+�0�s��C�l��������[%�An6���//f�B����w0xz?�cId���@�7����6b1
+D���5�Ʀ�9��[7�d�TW�����?��V�n�p_n�Kmq�#L�?�
+q�nȹ�pJp5�r�{��'zx� �|� ���;�8
���G��"2H��܌"��A��)$�+���<��Fv���GRs"�>��ꜧ��r�,o��?�$�όJ��/Uf���)�=H�
�+(�^"L7Pd����G�:�30�h/c8����z�L#����ϗn^�,b�&�'�rm����?�1�FM,x"�W+���b/�s���T���ą��H��Ҥ|Q��g$�+�����Gu�3���ݜ�Z���uՆ�Ŧ����o?\�wL�M���JA�ê�P��U�V��6ո�w���%�ݙ�by�k����j<2�L ׈lE�k�+˺�N��
+�k�l�^CZj�|^;��ru��$�@�I���"������e@p�r�d������\�,;�R���@t�B�+�feˁ��:S�5d�1w�Ҝη{���=���TĚ���դT]NŭM�<2��9�����'c7�IK.z"�Y\�r#{IEć�7r�a���!uD�9���A��
+͝N�eՐ�IM�OBQa�Y�m�Y��UC�
-��PS�;C�:�u��&5�R�����Ŋ�F"7�F>�%��]Y����LJ�K�7.���C��l�����~����o����SO=�w30�~�����JdG�S��9�����*]s��Y�/dv�ݩ]�
�R�`=����
H��A�Af&���r{t'�e9��qy����-���u���ml1��a�ry����z�����'��Sq�&�:9����
+؋�Վ8F�"�k�:���5�`�n��Ţ��fX@���U� ��xa
C���
U��vԒ
	'�
TՕܶ��"u�r�rD0��"E߸6@���&��جE��\;�??�>�?I"
����k��#�8�"
?���ƈ�H@�p�C>�
+�Ր l	�Ö�b��
�Pf���R����q�-�]薝u����!Ǧ%<b�K-���Ʌ�ϴ\O��@��Ѻ�q�:/�_��߬��f����&-w����4s����_rEQ*(cVZ�2�$)Ub<(�8s����v"g���VȜ�w�e-��y����=u��J�J�q���2��"�P��ܮ��������c^�ox�A��V�<����� ^�W��Tn����
3�_�<|�R��Z��n.)�]�����5	SB*x
����>�RCHD-�E1$�|��>H�09�:�	�)�
+��G��_q
+�`X�u�����[f�f�x򗏶l�݉�o�s�:�y�B5�����t���q�V����ա~�q����Q�,,�&�=�������ؑ���Rԗ4-ݬ�̗�ss /�;+����DU����*�֢��t�O�zӲ?2���44�b�50��DP����l(ʱ�5�\u�D(H�V���܅�0�ͪ�M�&3Afd�59Q4aȦ��g&�k��DH�W�$��KS8M�>��vڒ�]���j�3��D�2ؐԔ���������=����x���Ԫ�T���׳�88k���Mg�*�ڊ"�Aߴ���-��K���fB15J.5i�p�)f�6ݗ�SU���.B@��:ޣ���Ŕ7}4-�*-7���R�lJ��k{�Q�`�ۜ�����*�}R�)b�0�U���g�g��v���G>�]��q�ɟ���_���'N�w�}o�ۿ�#�^���W��������5
W�&1+��:����W�����p3���P��.>?������-
����}�&��m[V
�X&�m��iX4��7�����b��L���,%Q���<|��� �R�Z�~�<[�e
2����X����c���,�a�nj�Wb��nL������[KyQm�?׵�
�$�Z�5u�pJ���6}�W��7O̊c]���[�ŋG�m��ۇ�Xz��N������&�W��甞�&?q��)��[<��.����H4��4���0��AW�Ր���(
S�TW0�C���]P>�!�1F�!zZ��ߕ���U<
�萼�-f�b�d[2�7_��;�æ>C���o��qq{+�`aG�'GֵsCf����ٟ���H?��N��7�rW�~�{p6~�/7��xr��}	 I�@$
���<����7H�$���Þձ�{n�-f6��x<������[��,�_���x�F
-T����a��G
�|�@+�O

�X`����0)�)[����K�&��W+�^��^�#��k�7��x�~�s�1pB�Z�U�t�1wL!Q���
�$`�sl!5l	��=e��?
�c����e�bV�n�����g:��z�]�5m,�f�=ql����sp�k�s��Pn�Y�����Rb�SO�b�����`9��^foH��L�ǂ2O]��zf�c�@�)�\�N%�x(��_>gb���/�w��;7��M�,]%w���S�� �@�1KIif;׊а��k>��kd�f�-�9�E�8?V�j�p��ZE�'�	g���؍RO��Զ7�����a�Q9�5�C��ɲ\7������ ���v^�h�qE��V�������hܸN3��'Τ�W��S��I��=��@@h����b�I���2g10��]��"����J��V�Ԝ�
I�"|W��P�"�D4��!y�{uQs?g��P$2ǻ��6�'{��BX�ի����'��'V�G3.�jTpQ���ad�<R�(t�"
+A��DuNQ�?U��v��ڙ����������~]G�C�_���Á���a�*5T/�W��d�;M����rK��x��tb;�-���,]{j[�+�m3j�]��ڌm�P��UJ�S��PIb�HN�&VD9[M�d;r[����v�qwVP�Ѥ�m���O��Ӂ1o
<�3sto��	..�{�܏����'f�-
y�(��<X�I�H�T��RC"�"[��V��{�\aNxꂠann-��HN�5��l��(Z�V�Y�Jc�G�/F:[8����"��*L���kUA9�3���A�p�	�
�{�
+��dt2Ϳ������rs����.�r IDAT��I-1�rQj��|��	e��y�N��+����g֑�pR�{�ky�07[7ʊ�	63����O�<Ϳ�r������.�r{T��6C�e��܅�i1ꗫ��b8�m7r<v;��I\�!�<�}��3�)�<�� ���Ј����z
R�j����q��_l�s��0@uV繋'��P�YBY�z(w��ǥ��̭I�ܙ�;} �?�ewכY�<����F:�T`F���>t�l�
+�
"h#�cx^–(L������Z|P�(w�҅]����+;��!u�Y'��~�틕w�ϊ{J{0�?�ԅ��#-^��Z�=0J�%�ssҸv#�@^ޥ��ڎ�A��F��Z�[���Rr7P�<��4e�Cu
+(-�B�p/�������M3��&��C�hZ>��+�~�`w�W�����'�)�\�`�ї27'PH�-=Sk�~����|�GrחWsc�j��3��˽��Xmʥ�w1�����%劆���v@ց|�Ml�dl���D'
.X�hV�M�ę�X]�a$N]g�����lDz�_6})��P%SM�F����9�_��+Ur� Te6q�, �����\R�U��d��(oi��qQ�J�E[��f�#�[jk��S$[�@H�`�r�p�
�Ta��M�'��V*��#3�	S8�t`���YmsX�T�ٝ����_�g�#���g�W/־�~�QN��mnn.--=��/~�{����n����~��u��k��g��8�X�Y
�ї|�;(o�/N�2q^�YJ�*���Ē��>o���/�ʏ���wzjnhH�]U�\(LE=]U�,�j2�)Ŕ��E��E�B0��XT��x�\(�h��s�C�Kö`���=�f��K���o�b�Ew��:��ܧ���E�GQ�]�hi��s6���8�mO[�5����&j����U��c�����5���Eε=u&-���[U�CDEV�U��{n�}$�����^:�`4X��`�q�9	�E��)آvA���>�k0@Hw��0	�]�Qi�e��O�Ͽ//���]�����fS�10�LMm���|yM�
��*�5)^����������NiuY��®�dK�����n_��:�%c#�@=���s�!h*`��	�(\+T�
+f�E�D�İ��2�"uV����'ՒK-�7�cA��wr6�ܧ4��Z��O�ܻ��?��e
fS������,^���:��
?1+[f`����Ҳhlڻ�l����
+Qze�o
+{0���0N�I�ufc�S���)���ɡ)��&M�����t�c(&�g!�W��^
yl�� <��m�5���C�4�ՙH=SQg�m�S0'WѬ8�E����c&�c@x��q�=ֵ=y���hV����!f]�|\�q�}�����l��[�_u\���JlE�gf+�HȦ�w�79;׸2|O���o�PR�PP¬�LZ�U�_�\���a���=HTn����
��u����0D �UZ_
+>ێ~۲�b�Cum�?`��d�^����祶��L�LMZA�㈁̶c9ؗ�#�26���51�sW�DQ�4,���d�j�"�P�
$ي��"m��E-�i�xަ�˒]���ʎ^��qUjI���l�Q�l`*��^)�����+�SC]�ަ�����v�)�xֻ`���pU/�k���3��2�J\��ع�"$=u�]��7����c�'< PS�1;#�5�����Q�i9��ąG⿘�Y�Ž�H�ֱ��ݶY�t�vG�Y�o�����Ō������f�v�-�����;��������u�?t~�Ebٳ,-�L26ԕ�9��N
<*ol�N˛y-1�r�H�ą9
���r���	�ZfW3��n�\�����[�T��,�
3���akaNʘZg+���ude茆���p�(���٣ʔ�F�4A��D@�7�|:��Kc���{&��G��ڬ<"
�DY�Vd׋*��ԵG��$�&�*��l���8�M�ꉞ'6=uqa���b2y������_2��֧|�I�-�.O�Pfh�� 
�I��*�
+&E����PtaRH���H!^��<d��
+�=�E2�$�Vg�6��aj[>eW����?<i��'��ݑ:�8����suǍ�ɿn8-/���<�T��u����6�\��g�KM��#��;��oo�����V����g���U����o��L�	鳍����-�zr3�ޚ��Ĩ�s��!�+�ZKrp!��m@R�m賽��Yn��1�O�S����S��.?��ŴA�9�
?*�Et�"�ᘃeئXY�/O�
+CX
}1���2�:�����'��s#u&����_�>e]{��,�G�S��[gg�%%����P���_Q�� h���`�`�oFr
���,l�r����+7���GiW�̡�Ǿ�Z$|
���md�=���.�����u�|�sD�����e��g��o��G�]q���������o��O�?�����^�U��U+�;�X%�����������]��I�}V�ӥ99ξ��l��ʗ2ss���)�
(O��(�L��r�fK�a�
+�8�~���T��{ٷ3���Y=ѭf�^�?qm�֦>w5;�c�����ً�7wV��Ԭj1�];wA &�R-��=��?��~K,�
+W�P�gf������7�'�ŭ�C8&K2u}jj����FvKM���K�������D�m�G���,�a��|ޛX<\�����f�rA�t� 7��`��f���Do��DqU��Ƚny�k��yy���
�ɧω�[��
+��xj�C7i�@ɤ��/��R1�s۷U��;i������V�J�^UmL�c�Q(7&�ao`M �Xd
���.�����ё�2����g5�;����������XYY��'?�����_ϑ��/Er���C,E�6}cS�̒&�Q�����2�K��V���{X��Y�T���Y�2ErTrp]���kJU��f5RW��e�71�̩#��}�
8�w��aG��� ���m��H�ז�=��S�%��a��Bh�RG��u�i�A��5��Cc�3u���	2�E���|�
+����ԏ�lC!2����Aut�\@Z�(|1t�W�>�/��'b�3���Bu�S������hV~����+��[V�=�t���R���P
+~�"�c���	�!L�
�Ⱥ�H
A��J��!L. :��3
+���~&���_�f��{��/<2����\�
-�1-���4�ǿ����r��4e��_١,Ws��a}n2y�Tʝ���3��ǿ���4��p��nc�}!w���ьY�S�鏔�P|�;������3Ⱦ'�5�ؤ�����2X��Buf;{E$FOm�`vpui���}~\�ϱ����nq���ڢ��c0���3tDŽ7�|ΧN��.�J7b�OT�C6'��sO,�۫�j��jU@�I���W���ln�v*�$�j}:�ם�`�������[��g���M{i��҈:�G�* 
�!ه_�߀� <L�!Z�`|�G1�d�+8�����!���E����%��.�@v��(���9��RW��[�_0`ߺ�R~���EZ?m�1��s�
+���C`ʋ��7���$�+<��#�go�4��cI��V��=R����ѓ�{�`K���e�f�ŋf��-�j���J�s�/6�tm�Ep�L��(�N�"����h
+`X�"�䵱9<�ea�ʓ-���ܐٶ��!=14��3�9o�!3�d#y�[���ȲW����:_�8��+�U�O]�b9&�V�e�iT�z��ؙ9=Il}�OJK����:�k1d�š��+9L\
��;�$}r��뙩���*A4q�Y�)*.;G��K����T���_ҺtA�案B�b���lEN&� M]�kʚF6)�s�cX�"���ȬL-����AQ2��Z�\��u5�]�db�M��3?��?-����eճIR���򖷼���?y����������\J��Z��kUfn֣����e�HW��ݪ�*)��������U��v�]M}ށf�?jx_.ٻ<���E�q;�X�{����dMz�͹�5���Ȓ7Jmǰ��᜕G>�z���m]4$����XD��]{�)*"�4���{�juV?m>s�á�P�q�Gã��[���\�� ����%9��*�����1;hQ��KWd�rgZ����/��O����Yo~?���0���P?�￡47�j�\�_2@y�B��EH&�WE<�hB�T�
�0TUA�E�E(��ހ|���c�$���i��@�^��xSԗ���������6 C��F�D�r�n�UbCL��"JW�}\��4ya%��}!���V�_��K�[kt�9.庵��?9���}<����,o�bT���M�9A�U�ǎF�r���/�pD�o��p��ɱ��B	������J�~9Z悇U�;t��Mʓ�@SRw蹌r��ɰ퐵��	_�w�������_�1��7,�9���$戱��9��/��~����1��ҥ�׼Qeo��t��W�!������p��#\� �C��	x5Tf!$���D��7颧��;���m(P�OJ�'�`O�*̉f�#I��N��ӗE�qN�~�<C�����m����S��_�����O��v@b��A����Vg<�K�=`�>-^y�[7W��+��ss�!�b/�2��'z����_�g�z�ާ-W<y���C����G��Պ:3u��6=u!��b`΅��4�����z�ʲ�c��-�Rf�s��%/�h1����E���5����^��˵��@nO���>砶����-���L���r���Z��?��!XO�s[`b#�q�AC_�Qh�" U���Mb��w�#��H]Ml\������1ľIJ�k�
Iî��@L�Į���K����	*�����O3�+��e�D�ț��v���/�0qI�@���"B���ӱ�o
+��"�E�|1�6�m���i%���5PD���,cu�R�2~�ov�k�g�ћ���w��?�S?u��w��G?��I��_YG�;\�-�j�X�V��PӤ��������z�`�杖+r�b�Vt��+�̜��+K�$޳�ٮ�"���+O�u�H�6
+?���֖��٘�+%���UQ7�������.̈���}���J�g�<Do�5����/+��X~�~�jҝ��8�p��+��]>�P�'�����oʣ���E.u���[
+�����@(w����2X�W�S�zR����l�f��׍�׬�o6~�8���~��\�p^��
+vϣ���<IvP9�@HwA3�b�t�@��t����Cjd��	&�c�w�\P�/���lF�E8M�n���	��2���M�S!��И�hB��0@kt{���xO��
+�����ǒ�}�d5~_w���z,��ƘcYq� �v_���5��Wr}Z���r��zlV�ef=0�/��iE�����1�r_��v΁��)ZMj�>bѡ� �^���wM��Mxc��W�A2�j������S��N
1�|��.�dRS�C�DfN��[:���i��P���rۘ���L�����!����5΁-��F���.`���!�e��`��|�X���������%���oj8��~�.����{�V�����Yz��G�)�	�*�C�lm���_w�D�B	?�ɑL<c{��$�&!�`�C��;��q��ػ�Sπ�${�u�p�T��\M�{ssSnWW�/�$?����LJ����	�5�f���	Pr�W�9ך�4�a9T�"�X7{
��M��F��bl�
�<�u��k%v.sޡ�oN��Nͪ���ײ�DX�0k�Aj��@nJ�rT���0s���0��P�'��9Nx\�P�c��P��-��<��XʃcA/�s���v|1�7���IAI�f%��&_�C�^�Vj;���rS��jg�Xh�ib+�&Q�}@l�`��&
+hy�{��X�����'
+�\'�u�֒���u^X�{�I��Զc��,�`P]?u5�mV�w�F$d�xV�	*�f��,�,u��D�5�_p��Yt�Cld�V�+A��O�3�\��"�@n��hP.gnfN���b��bƱ*�V�ԅ�Q�VSy�O}���U{�ɚ�h����ꄷAtԫ�9�ǖ�@3�B@��@U���>?��Χ<>(�/����t�AR"�阖fŽC~"G�9�+1��*��{h;.��7��l��6ű�ۨ���CO,��
%�e�qJ��7��lT�ˤ�����Iy2�3���~�q���O�W��|i�b��\���FB�7|���ޮ �P[@ڃ�1�C��H�`����}�`z�\
� ��PY
	8�<�xx{o��P-P�dCy>1G���4�^�pN��f����IT�jqI�R����>�*�����cJO�����5�?/�n�@��JИl��</o����ꌧ�g�h�x�cߓ�k�G��K%����Xq�Xm�K�Uԥ����p���U=�hXZ7Ǐ��$$�k/,��"j�T�Hr�����)�v��8z���/ox�����y��[�]�Y�]�.@(v&����͉�a&�ä�c�~��t�}g��`�sB�0���>��dt�dE��,@�.b�
`��r�ƍ``r
�#�UԎAV��!XI��T��aحd��%I�P��E/��J:���ԙf��
�ɑ0Fs���kQm
E!�1����ܯo������<�
+�)���1�L�8I�5>��y����8-�iſ����4�fc��j��-4�;�_Y����+<y���Ž��wL�[G�wG��]��0{��������;���/s\�o��"�����l��u��xb�޺�4Pt��&w$���#��V��rEQ��W.L~��f��@�������=(����62G��G��-n.�\����M�|(���c��=96
�8m˪ 6�SNRץ�া��%An�X
�W�k�J�⡙��2������v��������C���#�0�ʲ�ڨ�6"��l{�?��8���1��U%�&䬬f.oy
+�	(�P-�Z~��=Y�����r���\+7���;�?�{P� 17�6rl9����� 35��&�	YWkrPS;O`-ʪ?�8��������_UG��`K��N~�/8���Jf"�đV�ә]
����ގ��uթ]X��_���(k�€eN9(�9�Jߣ²޷�^:0s�F"$�"���$�ٌh&���r�3�!�
+�:
+�̹yy<�b�6��s����Ǧ|%�Cc>�a[@V�&n��55F�T�^p�����a,�>?�D�&)P����K�UMQWd
��$�� RĎ)�b��8ROW��xZ޵�����\��g}��8�Ӽ����ĬW����/�30%*-��+�VB���;#YC�t�&l��s�����ax[��Lf�򎼼c��|jn�]m�����u3���G��W*��ïb��)z[�� ������k^0
_�l}؏��>FgG���j�m2y�;�������웍�c-׵\4ڙ��v��®L�sCy�r��*����b��~CC���� |��p�y�xO����h�lAMD]�����Kx]>ա�l�O1,���iF"�ё?��ƪ��m��^b�h=�Y��|�|M\�{���~��(�5)^�ǧ���O�~��f���������h�J5{x����}v���"t� `� 	�!ۄ� }���de��w�%?�UT�t��x����a?Ό�,��!���1ޅ)���1{��^��"l_�RZ!�&'H��R�zRa2y�V�Ӟ&��M޺��
�άw�_�����
+sR�-%7��n��=%���c��?/�������[���r?{ݡ������=Ié9))(<���U�R�=O])�Ҥ�e�����ع�|�jp�tAY�ڡ���Uˁc�a�O��{K�|�6��坩m�r�3�CџHѿ6}�O� 3�U*r���9Dp�k12�:��5��M�aIE�9���zӊ�hbk�O����^٩J�NPy IDAT�:o�dbN0�!'�[?/�`+��@�;0A�P=�Ʀ��i�Er=�#[�b���||̏&�-���Ӄ� �Z%�
+�>ɒ]	��2N�5Ml�˘�nU����q�nq���B�@j�Z,��HnO�<����ؕ���,�Œ����<|�ё�Jd_c0�E|]G���+���sg_ZS���Mݛ�e����'��2t�`9��z(�ܠ<6�M4��@�+a��Ѯ;��$��*�*�]�㝝U����M�9�lqw�k"�Hxqx^mJ�wOO�+�``��%[��-��07+��xK�!���[��Q~k��1?#���K���	.���g�eWy-<fXy��O��:���V��$�$�b�
mL0`c��`�lL���\a�l,F �0 ��V�V�ܧ���'���+�t?��/U��z���0�ƨ1�3�A�d�yv��H0OK�M�9y��ĸ���{��h�~H���T���V��v��j��I�.�.9�g�?2��D/��f����'�]�>#r
�A9lv�b�T�P�x��� :(�F�@�5�;�p3�����7A%�A�|�`L��+�Ϳ��o���-�k��֡�GF/�~ŗ߱���~�G�"�"�^�W����o����6��mJ�/���8��ݰ�J�6����zǒx{�tk���\��GG��W,=X.}�}�s�z,��&��=��ς�5���h�+6;t~ .p��Tn�X�B����l�)c�|�cMC|0�"�SN��>�b��ʢ��M�#��x��Qzu�e���$
+�!GsF��DD�I̚6�o�H��T_'-Es#m�%��Q����������vC�{c�?��m*���D���~or���^﹄ �C$����Bւ�?��V�[`$��ê�:�6��Z��(��h�}�{���7�h�?�k\|�w������ˏ�.��e������o?�?3���g1j�'8{|'sP��ѭȳ�q�D��k
+Y��v������$��u~:Zx;��N�=#��������L�"0�����J��Lm���v�75�[*��}~R��@\�ͯ��d�vFWJ��&�W�r��f
+��?"t
 ]�n��Nv�@�p�ʴ��zv͸=����%e���Y*Ώr���H3�23�O;5��B�Te��qGVG�cG/h�:1U��|֯�Dž�R=ʉ�i3���]Uv��f��ૢ�VNĖ&��JjtS�Uk�ė0�XՁ���9D�z�𹎲��{O'i���X�=�9�|*U�t��D���_\ζh��������8�j�j��%��]-�ڊ۳%���Ic���{�9eWh�
���7�d6�l�����|~�����8�)Ƶ�Ը���|�c-�f��ʴWenC(Tb�J��>:�#	�埭ܚ�Z��_���j�c)�O%�Y�c�O�.��}�.o��#02��z;�k3��$۝a�X�reEL4��ZK��lkŹ{�U�Y�"�"�ȼ�7w�H
�hxF߻�f�?ɴM��Ԇ���s�ut�g�v�Ws	�@�����
)�X���*�t��N�\R!	�*b�����q�i��a�K���b�q�܁i��.��H�*20�
T��b���-��喎��i�f����s��>xG?~�o?z_.痵�oN�+��k���P}�z-�|�:*�=��Qڌ�{
 ]��9(_^Tg�i���4Z��+��Nە�p��25���!�ԆO �uQ�?�{�o��>�ܴ��ft�b��}�o���w��t���*(G�G#O@(���$���0R���qF���ߥ�D�o�A�oL�g�bw���J�?Uq�ފ�(ͯ�
��HO�-{_��/�����O���_�.3n����J��J
��c3�Y��V[e.��踄�vGY�Y�L_@�l��n�b[�<��I�
Y?L7��80+>����f��&훵�rr�-b'�1l5;�5x�j�Ù�P�0���|��#*���"i����'!h
��R�K0�8�Ù/���6�u�������rN�os]ճ�V���Zu
+�i_�G֏k��'�n�W��yћ
	��b:�TyqY��S2A������Y:���8�:��<�����J3�D��޲���[��k��JO
]R
�V�r��)�P���|L�B-�H��9;㱵,���=g���T�(���r�MNjo*�O-4���S.?[r�a@-� 0����8=Sqo-�����Ɲ�X��KcE��`u�g��<��/Ɍ��K�\���q�,T�I��z���3���G��RQ�j0�6�����<��լ'��HR�!5�IJ��֜�Y���}��"��
5�]9��sS#r]���f��.��+��F�Y�
+�S��2�)tl��F���{��R�Lಳ!M=jJt�����M\��5�i��`\�\�I�Օ���M��i�����8���:�m�d$�m1�gK5���/�2���A��k�98�M��Pd�B	cs"��j�c�Z/t�A3mYD)�<֯8?�$>�)��Icb3�����O�Ⱦ�>5.�uUQ
��Qa:�μz�Jv
E@�K�E}_����%f�B��^ ��D���
+dg��<�?�bt
ߊ����O���_����P��ar�@;3�)�"rN��[�ž�טwX��!�.��҈�-������&���Ke6��9��W��w;�Yt~PO^f �=}��3��(p�'ՆR�SR
��}axOq��"n#�A	�`!c�+}&�v)��UF�-�D�p�+��j��D磯�}���::􇌣4��z�"׽����O2��k>v^ݴ�o��ڷnj΂��^	qd7D��N�a�5d��?!rt��0`�ͧ����Z�?>��W�/���TӃ�9����?k&�������0��S��/�
��Ho9����6�`���
��P�+K����5�
���*,��^��d[b�}s����8O���l�P�VȞ���i�J�~�3ޒ�myK��1z!����6q'ݧb�A{:��B�}�ŷv��z�Cq���%BN�8N�hT�~y���J�\
9@��C�=��E0�Q��yN�#�'O�Kt��ן�m�ޣ{k���
����;����5��t��w^ay)c�-_n�����}g��??��gTƳ���A܁ʑ0���Y��xXXt|,�?'*� KKZ�3>�ـr��q�@�}�Z�k��p6g@���=�8RnJ�~�������Av��f�Z��s:b_ğh�&Ǣ���u��9��T�c��h���ӺУ�u Ou?X��R[t	`}���3��s5��)�H�&���{��>��=v<�;8mK]�&�(��0N�:e��Xnkɡ��(t��T��Ħ
J�پԨ3�e�\��4qX#SU
�hۧٲL��O4��%i,7��d��K�;�I�b5Z��Ƨ$]I/��Gs]#���\�B~L�M��~( ����]9ň�PR��Ft�B��[���L-��*�]��H�f���^����E�ͦj�Ǐ�j��G���|���2AONy�]����F֡��*���,+�*^�;I���O���������s��R�G�	
+k�""�bUbDX$�����e�����䅣�Z��MB��1w�Η�c#l+'�AVxWZ�A�z>'4bm��S#����l�7K܁iVȹ��`�n��;?5�YyhQ.���;L�rPI�-���9�.ƫ��F�!#���%r��I��`��d��I��{��ٺ:=�o��gl�:�PHG�z51�!r���k�.��b����Kt@�|�����1����>�S��z��.1Ҭ�o��z�S��� ��XktV�]Fc
܆!��r��h6 o�z�	���
+;
+��w�Ǡ5����/�Y,u1po�ފh�S�n�~�'Vo��y�'K[A�
+�"J������_���:�27��5d��&D#(�@	�.|�ZCi��'���88�s�G$%=��d�=Vxs|n��i�0����z.�
��ټ�N:lQ����B�o��vi�!�۴�6��E�0��}R�0��#U	���@�ڄ�
c^#/��|�\_#��4��P�g�7�ɳ9�{�4��w��K,���d&:40#��|�#׮Kۋ�?��\�b����]v|���$���&�"/ 
�`�@�8�	�Eޅh��$�L��ጢv!�����(��op[��7�|�eoP|�0�vc�ڑw�QB'�D	E��
d����TD�nȲ(��,�"���<�$��^
J���n��э������������n]c�M?�'No��8�1�j���ٙ��2#�\mr�G\6�^v�ŏ�L�z\�҆��s=b@�\m����j�b
�óh/���]�2xk+y�T�u�v,w�j��
�J�,F��u�"=�-����(�m1���T�B��B{��o��qi�e'�.�U���y-���[!�Um�������F�U
�X
	�D�N�9��#9<�<n�f~Q���g�8��0^������qJ$%�EW��,f�:��(*�8���ޞ���m�\�O�x�=P�)�S��1�"2�S��_�(j5ޟ�[��PO�he�艭[K�:�=���xE�;}�ס��[�wp��M�:���]�?d�����U�ێ����}跏 o����gEW�����?��!{Ļݢ;V���JT��iצy[�| ���:fK�x��qi�`	�u\�l���(�Ж�Y�.���>M�H�Q�B��cܫ��!>D`�M� �iR��6).�;�9�'��!�*�=<�a<$[S�c��G=L-�;S���s��~��G���M*�D��W|�A"��nf�Yu(5��N�*-�bW�X˺:�Q�`J����u�`?�{K��;��V��Ï4�WG�v�W���� ~
tLȲ������9�!dBA-����)�%�{�c��V�:�����v>ӓSE�Ȟ�{\����\V��z��0%������t���h��t֩\���?��aM���
+{/�>�$mߝu~�O�t�S�E�Ja�f�ۅR�����ͭv�9p~X+�'
+�G�� ~-L1��<�1��j��c���j�4�Tq��:rdԻ} w	���ؙ�h��>%��x�hV`�"<�n���29o�����.	;�@c��aru�f�5D3�t���D+��rӉ�䐩�Z��z�+�C����|��)re���
M]��n�G���<��3�p�;�-n��)�[��߈��+ �4T�gB�"]�̉/���LxMv�=v`��/�a�x��j�a8���>���؏������ه��P����h������y��A
�-�%���]�m�U��{�h9������<Uj]�u0x.���4���,�{��N�
�
�9w"���[tŵ�K��$rO��"#���RS � w��N���z��>�H_�c6�M�fe��u��]m�Wt~�ȝ]���E����+9M	Q?
�am��e-��J冾*E|��#B�a�h��5���!
+���-��g����Ԥ)0t�0N�:#t�m�-ڋ���#�)����5���͐C�9R��.��Hј��9lI#��6���a{1SS-�'`��z
+f85V������ȭ �Ds�h�{��B>�	�iW��2^GY�]�
+��,Y�iD}�&�J*�)�&j������{&�ϟM/u��m��I!|>�MI'V#9�K7� 6�2�&j�N���O�馛.!�k����o��~k�����M�N��w�NN�D�!o�E�#t��A+�ҥ+�����l�ʴEc�=
�k��@)�������]�2�
)[�ͦ{�&5����!Nψ�m��"vl�EZ�Wo��,ʦ�ȣ^G7R>��}�\n��4q�v����>�4o��Ø�)�  rӔ��+��-�Zx8�v�4ǚ��@{yM�mT��w��w&�N���PD�Y0��Jߖ��Oj�e��k�Z]TO�[.vn<#dn�|���SG��G
[Nuu��J,.�ٜP��
+��������K�a��w%�E�;�"�)���P�� {�^����B�>��O-�vND�[��C�����Y��I�g��V�F�!38ҟC\�?��ʡ%���ˀf҅����}�� ��`9h�^�u%oM�ݔ���J�~��������8���߷��T��-3�h��(���$/�\�F(@�+.m���r���7Z�����|�!�jͬ��>�N����X�V���Х�����5�ȏ���t�!
+G!��^��;c�6E^�����
�g�h�6�t̉"�2̢eբ�%Z�D����C����t���%�n���� ����uut�O{�KG���,p�Fq�	��$�aUм'��{g����~Y�\Xe$sp�kFٕ#���J�<�`=�	�֬�P��##�?B�[|�x��/|�x�nr&����h}���oq�
eh�\���%�^���V��x�.z�}A�H�lv�B
0Y~Q�v��ٯ�Z�['�.nw����N�*BR�:�����?����?��5����V=�$������
+�j#�n����5��Z���������b�oJ�V��|~8U�j�'Nw�1�g��M��d�R�ԨC{.;��wQ���
+SrقMN��q(Bڮ�B��uX�'��8���:���{b_OV���C=y�1,5n�-g�Ru��|U�i�#tA���@;���q[NԨE���ؙ�y#����;l���6�����Ub����ά�7��L�ke�'�와�R�:C�|��䅜�[�ˉ�p
�D	�\�ٴ�� Q#��5����cHٚ�����Yʐ��-�s�L3��BU����ʸ.[���#޿��/,X�ؿ�W�Z�N�~M0�?��?^���$;���qVd_h���	Ԉ�fQ%u���L6���J���tO9}Y��?�تEE�:�iP�aV���TR�t]�(6�-%"��I��OL[UB���#3I�V�1�l��9�5����������:8�6Ǫl�L7d�����+9�q�py���>�Y(dc�6�o�����%���
��DO�s�|�F�Ϛap���
+Ȇ2]���u^@Ϝm�6*�Ifs60�"9��0=3[��YV��|�8��m��"^�_���igW�j�g-~m��έ���T�k�����C
+�[H�*e�=�<����A��`7�S����y��rcu�s�Gx.dgM,Y��(�΅;��C��T���
��6�5�#`��|;Dc���,�ơd�G���I�隁������JQ�~��9?EiC��ť�X��J�Õ�îu`�v�T�ڄ��_:�}��B~ԡu�����DW{b��+�P�Q�������LV�A7X�+d�O�U�ŧ�4	�-18�~\!���{�dO@6�8k`"��n~6��y�u#亓���VȄ�V~b8@��乡+"J4��j����7�g�,��^���5�&B��Yj�}"��1s�2E�g�G ��>L�� ���h�cnԆ��t]�KG�x� �pG �M��Z�t��YNY��a��^D\���6\�~�������M�PpN� �/��ۀ�ht>6:yK�}���P�>����N
+1�uƖ��������H[�M��I�|߽=�/+x�T�Odr�o=`���,~��t�����#�Č6<���ϴ�W�R�d{����ǯrk�}����Z���:��s,�BI:��vF��:uJ��z"V�e�L\v2`
��8tŦ����&����SZs��H��Uڙk��B��_�O�|�%�Zd�HN�X
9�#�hj2
:a�R��qٚ�OK�q�x��Q7�G*�7���؇s]s؜4zc�/r]�m�3m�N��XnL�֢ud>�pY}5����a3P�Q��Vy�O��/8T2����I
+Br�-�����Q���	�qz*�R�@8���T_�����gl�\�v8�������/w������O��'��ۭ=��}�3 �p����4�� .Q}M8�#�Bd_l���r���2J�|e�m"@@Ӿv��
+�̠u頧
+��n�(�֝�R���n&�I�a4�C�Uu���0�=��'�E���Ft��J�\�������s��J���j~,�ΰ:�H�lT�pO���k�Q5a��I���	�8yq�<j *��4�xh�<kF�R IDAT�Dv,�:%r��0Ŋ�a�6CP![�f5Cs��&��+�� 6a}̪E�	^�)�����U�R�DG�&fԞk�
��w;�6�+������m=>��_���6x�l��?��S_����K�=*_��}��d�1��
+���x�m��7��|7�)�O����0D�<�� �#�"O0�`|���s�.d�^g�P��x]/~g������2��/)S.�_��Lnm�;t-���z����͵�#�m�4��$��@+m�O��u��Ճ����ɥ�J�6dY��`M-�
��2G5�F~QOe���Z�����
s_��	�b�n���F�B�"E�,1g��Qr#�+Љ�F
+�c�UȮ�Fg�C5��̬�-�3�2�P#���r��=�z,�����/K�����ʆ7�9�^�F������?ٿ��S���V@m�z�Q��#�C�Ft�y���� cXE0����T�lZ��cΜ��c���2w|Ed�KH{`2G�?B�U�%e9���Ꮣd����-B성��hBr��v����8}^�}öNuzo-���{s7yi)�-պT���C�G3q~"�+�7'�5�-4�׺��gh%/崭L1W��}_,wK�a��Ҕ
+����j]p���W�ln v�A��7"�b�K�E��6���B�S]�9�dj:��E���ee��X����v�f���scEl-Qe�fZ�	�|�'G
R�o�CV�!�vl����Z�M
?:w�����l��DM�������mӆ��9
���:F2c�0
b�ԡ
i�\GU�'��Y��a�ε�>[zZ}��K�.w�3����{C����\��
[�u9��b�����x}5�&%�����xW��4:�X=�e��,�Ut���ʯ	��#�Y����ȏXb�i[/nq���qiܖ^�����-kk1QC$��=���L�#
)�Ϊ�)�EXn�C�O�U);fv����K–>-��{:�̪��.�ƺ�c�C:����݋��)z��>8J���%��B��Y7w�qa
+�A`eX��+��O����8�a��}=s0��q�,�7�g��~
+��l�;b
�aJ��b��d
+��Ñ)�*�NlfJ�|�Lt�q��}E��tb��ȇ��^��sI���V�h��u^HÆZ�C=�*�T!5��d�=F�4ĥ9�Q�u������-�*:�o������]޾O�{7>�yV�y .ң�?	^�=�u��!]�Q�9��&�6J;�;	���}��h��V0�F�G��J��e�Q�be�r!�W*���㞷8�?H_����R�I���rk����У��B��ÿn�oz��'���ܶ�V���[b<3�Vd=�*}�D�<*���f����b,&f~�\������=rw��G�g�B`EdG��P��)���,+�>�R�r�,��2=0��8��2Vf��Z��UMB����x֒�Eh�S�8��|�F'Ï�k~�������_���m�OƧ�� ؃ރ��!$��?o0`!DYZ���Q��A�^�N�Z 2C�s�?��9��O�s�5i�1h�P�]����I���
�P����Ѳf\�����O��)i��3ٍ�u!׽� ���\�%$��k�ч-~����
'$�؜���Az�6����^�*J���_^-�t�C�qm������_p�
+�v����Q������/'�DI�����LMR�����ζ�+�r����t t�eg25��ُ�ŞT�7��D���y��
+�k�h3� �dOg�

+�LG]m���)X3���8�I!��w�D7}yO��؜�E�0N;�v��Z���s]YW|݉�-!_j��1����Uu�����l?*u����Xk�7`�vB6P�*Y�7�󕡌heh�>�Bd_�sؼ��LY���Y���#vz�n+��j����������(�w��IB� `V�k�c$��t�W��?"K�&��_3�?^��Ԝ{,b�u1ĀL��,d�"�D�B����]�-N2��s��,�-LbU`��*�X=iD�S�p��U�l�M�]U�\�%��]?��;�*�u��-��N�5R$[�fy�>+5}�>;c��'#
O��6�'�4R���p`�\�l����+�B�\V����k=
���#lh0s	�|O����!�j�h��C�=L�q�����%>��0�n���Ȇ�,G� 5I�n9��H(�)�u��q�D.	�z��L�Zz��E4t���f$5�-D��˦=��![`�dS��_8��оo��P�����s�2k�%���
:����,����Lap�ǐ�(x
z�t
F�G�A��������\��h��7����[����=�Րt�:?���l���n�u8��2��j����_��]����]�=#N_@H���j�&���Glv&��i�l�Ւ��zzU��Q#}Yf\N�D[3��n�gE���pVdef\b��������"i䂾cI?‰�f���sΑ�|n�����ý���-�Cl��I%L��k��[��*�  �)�ٝ��7+z�M�t��i�~��P�5�{�^��E�Z�D40l�U�������7]�e�����3�y/���n{��d��-����Q�1��w�`�~�N�V$�!`�V���Oyw~Ɲ�����S��/~)��w���a9�6zkh��Hz�<KG`و
+��Zك��b� rx������_K�ɱ���|�P�� ~u�w�1>�z��%�������RtS���1�}Dȭ�6?܎ߺ�>/�Ϭ=Rqo�ؙ�~8S��{�KR=�HW��>�jzd.��b+�5�H��|��_��^o�es�6%��8i��d��Vh=Jɠ�ݢ�ZY��̮�Uuc��3��Ԭ�M[%��j?�^W�k�AX�[���`¸g�&�(�D��]�i%�i�`�D?�{2�+WSE�޲��.?��3��?�aӅ��ƾvr]�X�q��O��P��-��XN^��6#me"����(㴔#��U��-
�3�}�&�D��lF�bh=9߳��\~������@nj+���ҫ�װ-vz�~�'��'��B���͏%r�4<�EB$���o�Msw�Ӷ���O�ԓU�
+����2���H�~d5�83f�^l�	�(JT�m���vb�"J�d�@���{)�!r���`:�>
&�Fr�s�.����/ό��%F���Oi�>WF��آ~�oNL�V�/<��f��LJ�5�Y��"���gk�����"�����)����{8B�-�伳���U\���X(��g{a��o�
+�p��5D���H���WL���?�0��.�U���"�a\
+�iw`�z��D�s�2��f�-��4�z�@V�b|�6��*l�I��#�	�����z�����=#�͗5�pr�"��
u![�P	D�B��'@�fQ܂�G0�y�
+�:�@�`�-�� r8�K3�<�� O�eSJMf�����?u�r�ߵ��H�=K걁�o��+c��̞_uo��i]�	!75����A��Ў0�d-f�,�kR�C��S�@�}J�*O�fp��C��������!Y���7��I�J����/��pd�<s��:�k��eH*�����#��D�>1ζ�FX��`�2��s��t�EU�V�z���\�S.��`�\��Q*��P݋x
�6��Fr���~�Kt~�G{�]3q
���<�,Z�����M�G�!����F�:�`�P�p������Am@����$�K���~
q�F��.*�
�P�EC�Qm���ξ��%J����唶�����{}�����s{?}��Ζ�M��t?5�Di��n�����;:�w��+
9w��+6K�dj��%r�E�~$
+=<V|�1���X����O�m�B��ג�
��v~~�z�/�1�ut9��fa��h���Zz����NvmW
=��"t�U�2_Muɥ�Lm�e$Nհ0�t����w���$�i��ޱ0x��Z������2�Yu
��}E�h%~e���2%�.0�X��Pq�h��
T�jY�ϩ�����}�#��S��q�l;�?]x��Ou���t�礎��O���Y$��BWn!���ؒބs��}a�����ScJbJ���Ҹ�	�t=�5�޻�^>�������B׌a��q�:ݷ=��t�D��y;��]Y���ȷ��_��Ѭ�͒�om��
+�	�.�?�j�D�+�4H�Zʸ ��g�jHV�f{b;
�.�^�)	�(�	9!�!
%1p�]�0�'�Ʀ^	i9b֢:��rC�n�b�!>�Mq�N�JJ�!�fM���f1G�B7�MS!�ƣ�c��9)��8jc0-(�\�P����6�C��B��X'�h�X"�vp����9�Λ��u��.G���1��%I�5r�_��d&e�u���/ҩ"ek���
8ԊX�fM�#NR�
*�q#��@�y�B��-��Xm蟴�m���,��A�8�n�5=4Tϴ��n:���&*b0�p3�90�C�~XeP�*@�T
�x�Mh>�`y*���t��4�(Gg��,F<���n܁��
���5Jy0`���<__$/��'9?]�~��3�6q���E/�6���z��}0����/LXs��h�B����{���#KV���Z�L��J+��{aH֭�;#����/۶xo�ѻ��cG~�)�{��4y�E
+k�5r�E���!�5_�a_8+fk�FM���Z�N"ND���{��É��Pp3`B�kƸ��+����46~
c�����Q��(\n�Y�޻��'X!�'[�;�
+ق��@�5�lB�b�y��*��H�1@ҁ��id
+/�W��H:ہ�!��8�
�|+c�F�p�Q�VKYvck���$����#�nJz��9[Һ�uU�
7&X�[�i�zH������:?�[�.��d����M�>���/�(��L�m[*���˟e������Y,���\Mp:��紧L�hL��{S�u5۫���V��1�պ���~ ��y�fC�Q�F����ơ��lx!��1��zD��h��&�i3�%��X�,�4�Ц9wI5�ί��f�.3�q�pBC�^��6]zJo2��T�;b+'���z�N@l3j��J�ѡJ�e��:j�l���Z����
+]�����@�Zz�o�dD��l���A���fj��5�/y_ܳ�>�%�ؔH�#��8F}~�Lrq�� ��W�~\@�������Y�⿭�b�M�t-w���X{������jCC���m��%���Ph�V�J����ޛF[V�g���V���O_�N�T�=� ��
��A%�M�&1$6���&1h46�(F#6��b��4
+� PE���T�i��g�����F��qu8����a�x=s��g�1����F6NN3j<k��H��p��@٤����N��u_��$�70���ʱ��M��/��İ����4K����n��B2C�ᘏ�	�djh��sS�U*3�mrߨ�
+�v�6 �f�4��[��N����2N/�H��K���%����8[k�"�Pg�R���8�YȲ�
�4�"z��
(��r=����N����[wr~D���d��4?}r�U��4�������
���bXU�+pց
dKp��l�$�s|e]r��?Y� �b����[�tԆ3#�,��BxF�
+`U�\Dp�X}
+Z!n��
q��~F���hL��nϻ@]��wR����j�c�Zߨ}��yS��A�]d��E�'\��n�JN[���f�s�����¢uW3y�
��,���r�ҖE��LK����&/b�@ �F�u{=}â��o�D8���?��$���\y̥2�BUg��E��`[$BU#�T�cח�kç��UN�����;��iF[e�e�����~��J�n��,�L�v;�gZ�H�P ������g�>�?����vd�C����h�y*�]!���i7W�tUԄ]w a�	�+�h
ᡷ�$�@�@�y.��8��q<�<��j�F)<�>�����e�i��a�n���pP7�&/+�_q�}�v*�٥����wer��p����S���{?܏�D� 7e��Q��5Ƶ��\����G���x���bGSy�ԵDM�|�
�x�$�Rl���Ln��RV(GG�/����r�4v�j��ē�d]�/|:��Ϻ����Ǝ��p�2%)'�1���c��1i�1���Z�O�e�YJ�8;��]�������ˆr�6<�Ϗ�D��!#y vw��s�ui0�Z#H���\׻r�sO�m�(��S5��B���88m������Xt)W�֣@^p�f�4���U^��������+�.l�4�}6�IZ�-�T�}A�E�
�͆�E;��E��<ģ��{X��@�c����3�~m����qv!!i����������H�6�����E�>�~1B�v�30������a�p�l���Pˀ�T#1I@�H��"y<۹�?{�����@�F�&������雎�9��}��of��m�����;J��œ����`s��8aq�m᾵x�
+����B�RO�#o�f���^�Q�ɺ%����m��9��ࠁ��3,�e�G�y��	�L���(.�Uq�+g"�9a5�(M�a�wز2.E�i��~#��qA��G}�[��M��RN���~	yB�mT��*��E�2�1z�C��5�v�݌����S\:ޓ
��-���J��(�<36�r$M	¡3���>�{f!LCg��:p
+ψ8��6�2�ILJu�^Z/�� ��R�z�3�h����rS������Z�ٷ��7+S#���U�϶�w���av%i����_�Hҕ�%��!����KR�q>�n��:g��#f�n&@SϮ����*As��wH�����6����^�.������
֧hSXu�٣�@���F��&�����UZ���/hx7iS0�v�{�u���r�4�Y
+;�
+qX\����>�[`2$+h<�مɑ.@�Ț����k����)�k��@�q�2�7��>X%��(�����n�~���'����C҅?��f�hd!��0�q�� lxe��2Gm
�Ǡ5��6�yJ��\n񼇣�K<���W
+J�a�G�ܬMA��@.�z^�?EH�W~�W��n�B�z�}���ſ��|�`�.�d��F˯o�n��!����J=*��(�NI$h����I=�t5��L՘
sآ�EAWS=Ru~H�
��\�֥\7��I�"CA�%����[�����F�/,�o7�R�s*��8�j¡]el���|�ԣRWb5�EJ"�H]t��0?��}�����j�s�Q�F$O�hKK��|���/�b/��L�ռ�`��R�
CI���P��t��,�
+��^v���
+�ԝ{�n�jmž��^\uo��#���`�ܖ�*#CFbZt~tx��$�T���1�0��V����m�d���Z�F�����f��������S]o���.�7�Zjߦ�>����8�F�.Ց�[j�H�<����Y#�6�3T&M�(�e&���(�ډ.L�g��$&(/�۞����rNW��c�6�I��ش{��:�(4a
���ͽ5\@�(�M��S�GO��x4��!�pA���x�\�Ǟ)\34�(x@6U�y%r���:ynb�п�T�t�<F������-�[�P[S!�2��r@�Ex�/r�u���_��Bž��|C+�~�H��@\�g��߬��T>������5>}gyF��n	#'"�"i�PP*�3��D�"_+"_�Q��b���
+�;���=r~������1<
+B��P،<D�F�B�
+n��P����x�gFtQ�:�4B��q
c��Y��U����{�e=<�_eN��c����8��{��nߑ�LMh]��g8|V�V��R7����U��D���|a�s,5�1Ƨ�E�1��H�Lg`�E�f����ٱh~<M�?�ʈ;N/NЖ�N�����pr�� H�`�%#���Z=&�l��8�����g��3]�/(Z
�Km)]3��b�~�%~��Ғ1(�bd3�7��ᡴrJ���.����=��.��^x�{~�T IDATZ�wn����ܾ�-�A�0D����t:��P9�������׮bI{��W
��,��@:��O�."1lAIh
�a���d��G�@�h
�J�0|�1v��Gl�!�Ɠ�y�����E^�Z��ёT
+�W��_��d��+���Ks��Z��qv�Tc�d���kF��8��aѾ���T�����η-6k�#ʔ=��0?���j�6�UƏ����K|�V��,���~�hߖ����K�*��~���N�9�"�MG�k>�S�KG÷�ĬÏĪ&hoq�g.[�hO+R#���*�c��Ѐ
内��nv�'�h�;����\���}*Tu��?)���S����kcՃ�(���(9|�0?�b�����>Z�S]S���-�bӘ�!%*V����[��]��� �p�*:�+Z�FjD��;ڟ�F�zR��XM���d����LJ�O�����O�ٱ1���d��>kŪ�gf�N���7�����G~�c�����gϞb�x�e�}�#�������O~��n?�9Ϲ��gff~;���#)�P5F�{��q���ε�4����4�*{�yd ��������*c��X.
�4�6hJ[@��4ؤR������k9��ٻ��������6�L���/{dm�ܷ�\7�l�<f����`<�b��2���I^#���1����Ku��U���ɩ10G�������9qsP�T"�b��<RVP�� W૜��8.;��5�xT�Q�$h3ӓ�����.�?2U}I/�KFz�� �M���e�qz5�o'1��
%����N � D�?:�Ar���F|I8���^6�.�l�h��<�G	Ee��Q���`W���]t�@8 �i�"��)��c��h��<����=h
χ���nl�+���8$Qt
�]B"����E�X���[����o������į4 �$��?.��IuA�d)�>um"}��8�E�P��H����>0ŶX4[�
�C�M�Cs�gv��Z6F���R4�d������<��r���E
F��6��۫��a�,O�*p���'�Բ��fs�qb��4D�<
+��."�r�6Bg�p'A=��#kB�p֢� �۠"���+�>���!�e����%����-����cxz��>��NY��Q�C�}D]4N�����n��2�W�-P���:�\��n��\�q��j��F�o��<�%h��
���|��~����͖؝fg���/Y~��c�Sy��%B���JW:���.����������ca�W���[ћj�4���ܛ[�+
+�q��#�����Z#MFP2Lպ\W\~8��(TѺO�� ?-7���r��LQ���6[ ���i��+�SH�������줆�g%�Z��r&`��}{"OYJOmXs]@I�e��Vzr�=�e��c�"��eg�	�����ǯR�쉇�H]��3s]ӆ��ؘ��a~��g;�iU�ѡ<��_����R�}�~<Sc��)t�F�43Ζꕝ��}���=��8|v��F�F��զ0{V�����T�(]R��M�˶S�W���s"�ن��įS��;����Y�_n�]x�[��������@y䷾��W��U��z�?����5�y���W���|�7�p����o����˕R��Mˡ=9�V7;��x��>PŽ�P���ٍ�wW��S펉n�F.%�Q��fP�0����4���d������=M��K
+Y��iz��`�<�c͊:$���������Դ�z�C%�t�_������ڤQ"��8��c��2���%/X0?�(4�}��Y�D�#�e��7M�SX�1>�����)x�N�@�
+�X���iG&Ȫ2n_6vE��8�|���v���=��OT�O���#��0���}��9�Ƣ����x�����`;����WA(�
+�v��P$KP���b�kPC�a�d��h�Cu�z�m�|Mn���v?�8	�«�HTց
+X�P
f�8B���(�A†�²5eP9��ޤ�hw��R
+BQo|��ZK�M2�m1�_iY��l�V�K���kߡu0S��`s��m�-V���Zs~�@��EW�ԥ�E�\��Z��ikV����4��o\՝D[���/Pl��)z�@�nj�1�T�t
�U$�rD
6P�c52К�d&�:�@��|�d��\tn.��t1�x5�;ǹ;��l�!��[�D=�*�;�A0
+�b!��5
+{̃�#��@����D����CU�:p����-!	A�"@@�
+Tc@(��QXs*,�����~�����0Z߷~���}����g(wD!J���mc�Oi�4�1�끐$N.��N���kS���Y~����6,��-6W�����v�3��O�	����c��-�$��;��/�r]��E��_���/��!W<:Yy���T���w��$��I6;��
�P��X��Y3Җ`+.
G��/GҌ�j��^~R/?�^G`�֯�u#��XM�,��uq�'�Z$���H��}�����6c5걕?n�	�Ϛ�ܼ��qAW{��ß
+āq��Kџ��?l1Vӝ�������H�4��u�x�ڕ������l���Z�Su�j�}�����a���� 7NU�-���/�E��b�Y���u��o(�_v��������:��N��ߨLY�B��D_9u�{av����T�r�	�޿��ޜȭ��E��8���|�;����/��ꫯ��G?z�w�q�ӟ��[��k��v���_��w��u�=���7�XMi�a�K9���L|��q��(̸h䆥��
_�X #�#��aQ�̰2�Q��m׸6PE���ME2���&<���'�F!FW��!�c��}���Y '��wqRX6�O�Wu��1��*9� �̜4�"�T'�8��y������ÔM�6���ؕ�Pb0�6U��3�Z
)����F8%�i	���Уա�b֗������آ+S�-[ݎ�+���H�/��_:L^����_s5���L�,��b�����bc�g��4�*���D]$0N�
O^����@��|��Am��F���)�4
�@��h|6!�r��sG>ӞE�����FA�Ȇ(�E�Eo�%0�C�VP^�<Fԅ����_}�<���U���wQ�����K��%��ɥz�F���?��˖{7&ٳ���qv��O������-v���t���í�0���|G7�UBL���H�j_�`5�$.a`G�>��V33�%|^�M�2A_����m
�р�w�Ζy�m-3�BG��@v(?R�DC��Ȁ��s�.(�H򳵩S�j�r�s���n��
����BvI�*��B �������k��`2�T�h?�~	aC���+1Y���;�p�±�v��6Q��a�����.�
+�󨞈�(V��y;@<�HV��5�@�

+�{�B8��@)|�A�����
Ǘ��-Y�a�ZǾW�כ��+;�:|�Rk*�φ�գ�_)|����kr5�ٷ�ٳ8]�䶆�	�-��	I����u����Ώ;��
+��V�74��ӗ�j:������t��V�Ppn�'�l����������k���[�ق���ve��x$�8�2c׬=6ь��<��E�.�vrm��G])��5�g��)��B
^����f�F�7@��v_�=6���z�}�����My7/E���H���H�ǻ�%;.M౶˟�žArU��*�8�q�_v�cK}����|�^�H�R�u�h��xB�bŽi%�hѕ��VJ��Do��_0��h��X�W�V`=e��K��E~�Ӧ�����Q�c����)��V/��ߚ�ojf�Z���Ը���~ל����p}��ueYV(�I�t�Ν�}�s��'''�l���C�&���|]�s]�G�d$ˌ�V�k
_Z�G���\��k�sc��m�:���.MR3�cX�vG�*��M(�74�erB�Mo����%����(�
61b1�Cs�BN��tf�@�B5�\��$1���s���s���G���q����1��
��Ճ�y�&^n�+��
+9/3@l���E��-�(�J��4���@����_(�w�����~�u���a~z���6��5J;�?���g]�W.����ẋY�4�p�r�<_À
+�CT��p'�6 C��	�=�
wD�]���b8@���(���/B��l��l�{F���4�W��.t�@��!<0�`�Ay
+�%�"K���\�G�_�'���A�A8
+�4�~$�!v�Z��	2�=�/������n�Tm������%�Ưs��q���~Q<(�R���J��(?/�E*H�D�]J4M
S��Fyl٧�J'g�zj��Etl�mR��|�������Z���.��Y��y.&Vħ�ϤG]emӀ���
��J���ԅj��.���$}�������q|&c�S
�#��$]�Lcx<��(l��@8��ڠ�@(�{��
+?8:̷QB#51�~/�O���n��n�o��z��v&�|'@��!S�ay�!���,^
QѰaW�1,2�p@��|�����~�䱉�l�4?o�����}�h��������<�,?���-���;�)��mq��a~.%QѾ;�.r��\np�F�{_l�`ߓ�g�?pn�%��,���R2��D;���9O*S�$�jM��I(�}��t��F������[m��+����H���:��X�aG	���#��)���H�f,v�`����`��9A*��O.�g/%ϱi/7eF�A����;R�ȥ޿:|O�>ߵ~9�~��s���.��Q�&r�E�>*�������ާ]Ѝ���_v�?����X�RW�;��cɳ��s-���@<2H^6f?)uѳ6����	I,6;��d�|)|�E;�8��Y J�Ţ}��L��/;��W��o������3��)��jM_N��t3=�'��G�}�C�]w!��n+����6����߄��cW��j�.R�E֋U#�^E��ˑ�*�t!�Zо���/����jCt=�3cI��M�(؊���n�
f%�+EZ�����H
�W�/�4�C=s�JΊ�R��1�ܖ��!e�Lp��s�%S�O���8�gvXC�%����X�I�#�Mؠ[������,o`/t�e���b���|hZ>��4O5r�J|ާ9��O{�ie�Q���3LJ�
>�g|n5zk��.!�h�����m
+�����(W�"�@<@�
ˇ�+����`��J��`.�*x
:��
�'ஃ7��cX��HW�r7����Ip�.��D�/�e���:I/������6��B�H{��Ac��H ��hD=H5C9à��!�����%�j�|�g�}w�}���U-]��<p���	~��~e��y��������]J��\�;��\&�ABTI���iɷ]m�M�`��[b�/'<��!S͇�X�n��G&�*�u�W��m��W{+zo�Mi)G�'�2���De�5D���3`.?Vs����e�.�}d�]L�-���/�^{�m��2�:���Ae��2�ې`W�pT���.���6!�>�	t�C��<�x���>��3|���V�L�\�`fg���|���a�!
�%Z�����,�)���ڦ_�\�Z�鎠(�L#�)��XY|)o.]N��k��sn���Jg���5�^i���R��
mʮ�cA����ۋ��l����+�Z����qJ���������x�T]���<� ~�ʓ3��;(m/
��@5ÿ"$4�|~p�z)C�J�3�O�r�vF�u�扝���
�#����=3�w*H�l(�CѾߦ+;��X�P&�V拉��ոǟ���_ň�fgS��j�z���h�̫Y��me��f=��g�?L/���I=�Hom�/8��8Yzsû�fG�q��[�0@B��n?ˍڈ�u�����T�02��R�/����z�/��[s]��	��i�M�$�E�G���
�����9�<qm��?��G��OP��xP�z���i[�B/�pĹg(7��|w%|�ϗ��tF�x����	�;�{���m�>2Mӫ��j͚5����=�.�Q>;�S��M���
r��'g5�uЕ�#|�Uec0��X���2��5����<2�VT�t|�U�Г����J?��*dUr������퓉5�
+���6��_ذ�����n}C��Oe�.�;ג7��;3��J�'�w����1�b��B��#��#6%�@&��ar��[Ѫ4
:*M�WtԞ�)"5���8���[��v�n�R�t�\U�o�x_�,_#�h�=���m���F߾�v�/TiBA)�y-�!3�7#n#�J1<w�y�2��`�����g2D�,d]���(�F�"p�]�n"�h���Ī�%���?�wN����hE�{m�������X܃�Qh�p��-AIh�B�i0�R��$�WB��a�F�õo+:�'$�r}�\<�!�L�"�D.7����Xn�W���^�_��N*7������$Wf�)��<�{5�(ݞ�In�t�[����pW���S��:����f(M,�V�Z�L#��ծ�*����XX��Ɍ��k1L�
�����wJ]dq6O�PJ����c�cL������K	`�P9�K ��Y�l��P	�c��P	���>�
�(BE�=��H;p�.��Kư?Ή�t�ɞ��L���~�T�.	\���6��9F��	@���
Y�����C��b�` ,d)�!��-W�)�㢳zi�2�"$��G��ցR���`���Z�j}�k�b���=�ϴ�A�x�m�NҋV;���[;v�������0ڱ��\M$�%
��
+�w���]��̓�u��):�6�1�6ng�>��Ö�?���avQ7}~��;$�o=����LՕ���wx�	�����
��|o"OI�T͹�d��Ӱbݻ�^�K_�tׇE�H�݂x����eM��X�]��5����0J"J��u�ޥc���5L^�[wq���}�ԍD�g�OH�t5S���m��U�����2N����"|��F�6	� �p��Ʋ��i��A*Oa�c��w-�ʷ��E�kRM*S�ùS����Ư����%�X�����\��a�9m
+vL����e�&�;�����?h���W^�$�-��bY�Z��k6���L���M�o9��JKu#`Q�Z쩠$f���M�P���d��
���Q�ǚ�f�JF���,�j�#�Ύ��db������eN�����+�Y�M�JΜ���̯��ܡ9`����3G�i�l�� G���X�7O3_�&�?��32s�)z�ٳ�\#P�ɨB6�K5."��=�f&����
+gu��sh3���*��,v,�%�?�����$���q��6��K��P{�����;��wr��V�Q���N�%���9����(��Cjc����k`�l��*�0Y�Z0K?��(���(�̠�����.d��iKww��+�'
<�y�׋�[���(��1����~+M�#Y�x�<kp�����	��PrM�
+�����㓟kw>�y3�[��dJW	�\�6׹��C�x�\��$?���o��z�O-v ��F�H����S-I2]DI�f�
��8�P���]e3b���ܘ������,KD)�22�YOaid>�p+tӾDIc4�C�.�Mſ-Z;��\6��w�l!��s�C�-��k<�� ��R������!�tiQ�0��CepKX��"��<D҂���-�-�MpD��Ce�܅�ay�}��[��h��&NS���f�G��]Qz�k���ܟY?���K�O����(�
��#K���1lF�2%�q�BJ0
��	!�T�UcrcƸ�ؙ��$�,p�#�[��>S,�.�n׺�^���΍���-���[�M�I��`"O�Į8?������(��	r�n�^i ?X��!H����ʯ1�`��q,6���JbO������/Yl� ��.Go
�[�/�x�ӅL7�X�%�ʓ=�S�gMm\��z|��C9])��(����X�A
���q�fRU��5�*ؿ���}�C��#�/ IDATe>Wb��w#cK)[��I׺�����Dn-��R���s�4���y�j|%�}�����Ңˌ�m�?Q3��G���g���P��{_���^�L�3J��Wzd*�x*�����pv4Q'�����qv
@��w	I�)h�����x��Z��H��m�'�O���\nL�������"y�UW����z뭞�=
ڶ}�i��W1�����}��9�߄�������	�a6ѝ|�g�KA�q���
��Җ�rn,�D2P�F=�]�PF����briaV��Ǻ)zq��U&#lҐ.)I�K�6O��!#-��}�E�lv0�jL�+s�4�mն��&#��uMsw��4E�أ>74�f�v�4͏��^�7���U�d��ѫ�4�6D�4���T�����Ϩ9��3��l`+Z�hSJ������}��{��E�y���������qP�`peyA� l"��PD��d=@C���*
a�>��.x�0|
+*�(!�@T�5�}��(�)�������1�4%1^�r�zŖ���XІ>5x��wt�
�㍭��|;�n����:nu��Ja��b��<��GO/7�
+�<�`Y�ZC�z�n�����U�p�R���Qr�j�RM|h����������WF����$W
�Sb]4�e�`s�JY4�
_���Œ��V�
���6�@�gF�����
/7Q��'�
f<�M�X
�)R��b_�q��9a~r`=��<��� ��$�4��Ȳ�z�k���s��v
�[(T����[��Q��D
̂?��fX%P�A���^4D��`��
+�!�����X���M�Ӹ'}e<Ǻ���G�~��|��ҿ�í��wЄʡr�)�a76�1�>
+Oj-���P�@I�8���dd�IZ!�/�E�`��q��Jۺ�h������{������$ٳޗ�l�;)�0v<��N喕�W'�/d�rkk�7�<Q�
+��JW��|߾�ѕV�^i��6���ye��(}� ?��9lo�����|s��Dnj&�rC��E&O�d h��L�1i���5ſ��F�����LMk�+S D�r�/v�l��\��z��Y*O�:?�T��O%�a�f��@�w:l�WGjl%[;T�4{�R�JW)	��
�k:�%��׼O�������u��	��m�T�
>��qS5��}�^�GRU��w'r����i#|�Zs���6L/M�6Ϻ�7���׹]���u���/8���x��X����`�-�'�[{�)Sf��PyU���j�8���Of�d��R������>?�c�3��~O��|�y�G��7�Q.���m�fY�W��շ���_�җ�m�����gqqq�Ν��߄����O�Gb5f@�P(�z�X�+���$����4��-��xjmI*�e‰.�������P@��(��v�$�+w�:����w��/l�C6�x���ph��h��i��
+9%6+�e��xh��w�\�
+��JN[�w2�C�3Ӛ��>��5�5��G�(��9}�	�y�*r��QHCS��Uޤ$��%1��2`"x�@ic۬��')2ڱ�nǺo����Ln��R�+���!M�s0��<
+B�����<��q��	�
+�����
�
+*�\e7B�K��0$-��@�`�D}W�rá�
ҐP�
+y�,�W�
+�͔D��͂�y�/FF?�����p�Q���g
+&eʐgZ#I6��,�^.3�h�<7J_���v׾c��ű�[��aa�Tn��6����sW�w�Ug�������Q~�br^��]j�w����2]���׃:�2�"�*��t��X���t�f���6)�&�0o��Zl�)�)�X
���d��mm�C�q#my4�$����W�o��?�:XS�.��/��f8<�qf~	i�AoS�v�r�V
�"���.B-���
�:���3�{H;�1���=t��[8v�O[�{|W+y1#	��
+��Fem�GH��ukj�j]fl�q��� x\�g~�<_k�sJ�1xE���N�&��/����#3cۍA]f�&W4*oPj̀p�F����B��5՗(5����OE�}��<Y��8�P�1Ζ�	��� �6p���u��ERW�I�./f�6�Y/̞m@�r��w���v��Q��a�l�0�?�<g���\M$j�i��R�(I��o��3ZӲ<�z�[��}��u�̞B�ad�]%�*���c��n�9��!1�؉�؉ �X@A
�H�00}f����o}��
��Y˵\Yg��{ݿ���Z�s_%Vیu8�*S�8��{l���,%�@I.H}�����@M%&h��Z�d)��t���$��8�o
+������2ڗ����z�����1��B�H��
�[�kF�\m�d/���$6�
�U�#���<���{?#}e+K��!�P�F
+G��ӹb}��Q��йC�\o,y�I=�H���L˓)�Z�ee&��=U?�Z?N/X������m]�ɭ%�!�~����!F�����G�}�[p�	W�E���Y��t�M����{�	�����
\z饟���>��q�n���g������V�rm��jz8[?���l#�3)祉�)�4ؾ���v#F�opC���/�X�V'��
+uN3��uZ{B�K�����|	�F��a]��D����Ϙ9b��o�(��G84����p��S�`k�U{ς�]#�D�Q
+}�U
9��	�8�o�ǻfa3����.�{v�5���R`��5j,�8�C��G�l��Vp��	Ɔ��n�(}������R�����M)�Hk)��BD����iT �A�s
T�t&C>@��dN�Ga���Qp*Hf�� j� m!^��`���s�cR�Ӗhk���H(��VD���Q��@ܟʭ�?����{���]�c��og��9�Y�nu��q��,���|���|7��;�(�T�䊇���
+Ν���T��R����1���+G�6E��ȱ�|k}�'��xK�I��q�V�&���Kc���<2nb�GBe�nu##��\��
Xj�e�����ɞ=��S$S����(Xb��ljL��pNd��&�	h.H���RB�Tn��7���֮}?��Itl����'9V6p�by�La-V!��j�k��	�%��d�$@�.�r����(h��
0�A��X6���:1#E�tb�ڭ05��n��%��@<�|8J.��\'����u���NIQ�!N.��g��ųKB�31��N���
�=�ʭkgP
+�ORڮ�~1>��(�sk=�G{���7D�K8;X��E��wë�GHv���j���Ry|��Qk]߹��:�gt%�����-ij%�ǵ���R�ֶ���P�S�wD�L��w��s{�H��laHLw��r3�Q�u�[�9]DIR	�1�������Z��Q��9l���Hm�ؼ�Nn’so���&?�+ F�h�pE��:찶A��S32��Ȕ)IDŽle'e�V�����������/K�67͑�Ǵ���\m*����� ?;�8���ƺ��5�u�s7@F�]W�<7#��*S�;O��p�Ņ����Z_�\��T�
�_v���-�_b�=2�L�����K�ţ����ν{W�!�����'�Jpզ��+�w8]U�V��m$�&��z�c�����u�����>;��Eȧ�)P�Z^��==⑤oA�K��?Pr�؞�!u6HMX�3����jʒ���
r���/$�r�-d$Ԭ���U�W&Ǖ�x�L�dh��W±1f�d˂�]@�);� ggh�v�#�|��Y$����	�IOX2;�dkl�2D	�VM�6�KR;(��y�N�T�pitX&�PVV���2���@���k�2
e*��_o����(�z��Jڜ�t㿨����'��(�~�������b���^��p�9
+M���J�T�
/ [�5 n�/@'���.z�P9�`޼���bЂ��t��{�^�}���k���AX�*�����8�HT����oGY~_��n�-/����/�}�CE�>�7�+Otڧ
J�]YvN?ys��kJi�|Ͻ�Px`i��X���Gz�ˊ�m�4]�c5�LQ��)����,��^���dߵg��z����T���/�@��}�5�de�X��U�	�h�>^#[(�F����t��ۼ�Ċ�u�3
�<N
+
+X��]�@��+��+�6`M��^W�~^
+�^��[K�����S˥뵂��_��:��9 @e�Da
+�Ǡ%�����F�r0�<��S���c�1
�#�q�.ncln�u[O��,�-��!��sSs�2@j2d���99zQ��j�&�y��������H�bc����(:[�}�)��R�ae�����8�y����_](�-s$�Y6AHR(��.�\�	����:F�!��{m��Z���]��B�k.?P�-�:�S���qQ~>#mCiƔ��q������N~ZY<R�M��]�t5W[K��<���J��`��MY_ס���y��é���<}5��^��u��
+:OI?�"y����
y�/$otiׂ&�R��-9U��e�7�<�a�s=I`J��3��A~�������HU��낟���z�	eFg�7U���wC��w�^N�Z���]kE��y+yK������Q�Z�N�����
+�vm 2S�+��j+�,%Q?����Q�L/~�+��1uG<������:�HϹ��O�K\v����%m�B�WJO���,9w�jK���J�;|o��fj�~���o�!{��?r�_���ɯ�?�J,�X�%*��5�QY
+�8I�����κ:�ˉ^V�KҾ��zl�
6��Ti�e�Һ�N���㔐�98F_0LN-���tMf�2�\�;j�"�0ۥI��-Ce�{s�E��#�*9u��ޠ�gvYa���B��A����8���:9〾�J+=�r�sL�z�Ⱦ.m�g���$�'���
+
[���65e����،�~+}u*O�Զ�{S��9Ͻc�^\��5�`-�n0�8�,D�����‘�
+i����ʐ�bx�s ���Apː=���������1؋� �2����[���w/@FP�>�uD�3�x���}��̣�_טW�eJ8
�
:��ƿ���R3��~3џ?���z�6�;\�p��1����\� |be���T=�~��f��iv�6�z����M���Z��?��w�,�����8yx�s�᝭p�1W��}�}߰���:3�#�/��?��7���dF���q%ֶ0sy���Z5�8�]���K�+[�	v�����NR(
+�(%�K#dQ��
g'�n�r/}eA�
�l���Jp�J��4{aw�.�&k9@k������p<X����=(4��>*F����p�Pt
+B!0*Ag��	�c���� � O��]�8�Z�q^,���\$ztޏ�d=�*'��ă�?���gJO)��7�����$��I���;^)�{���{,�p���4A*O"����^�Ճ��^����,?-Wgg�4H_��\7��^�#ݢ{S9���#�ժ?5���mR���I[�I�%�����m�ւ�ǟ�H:��2�&75�̥-i��ɥ����^�9��z�t���{[�׻��@>o��ל$Ugg��ٞ�{jſ����M�=��&hO�ac�Xm��s��bS){7XW<�I�ݱ�P�P����^�����_۰���`������G8�=2���P4x<$U���]��Ҷ�G���iW�mʙ:�����l�W��	N[��;iJl9ߖ�*`��MS��Tm	�[�
�?/>���3u�6���i����Gg:�z�+ꧯbt��գ*��t�w���ė�?%H�~�Ѷ��z�����I~�������f(��4�JH*ؾ��}���^r�������GIS�$6����S�tV�=��f4�i�gުV,��:��kR
4���DFU.��63�l���rYM z�`dT�o�	�B����Vɉ!�$!���v.��F��Ur��ʰҠ[�����+t=@ְSR����o`�ӜF��X?�c��7����	����ezS�������4��=�~c�>��Qck��`�D�QǙvܘ1��r��q۔��xZe(��
�+=��)
+>t�<Bc+�T6�yP	d��@4���� ��I@x�dFA�*e�!�#Vۂ{��m��&zClL�c��&�M#u����+�	�5�_b;�V҇[l��y�X��#�����pE�e�<I_H�k=
x���\���]pؾ~�
+F�ʎH3)�r�Me�����tGlj�u�2���z������0@O�b=R�m�lIYUa\t�fpv�g��ڔ��d`{��B7�$
|҈m�˜K� �B 8��7�-���m�������E����B7
+��a��u:�f�����2C���!t�/@
�@8��]$��*`L�VC�HV�' :�1haq��a����B��н�Gm:V�!)��9A���j��斒�y���ő:�Mi?�'e�4JR)�T���-��w�ʳ
��_SK��A�Z��+��%��
+?��V��2*s�C2	,�&DY��-�����[�=�(�X�5����Ҷ������K��~�(��q��"��I�2=1~��-Hſ:��*S����)A���g�����B��U?{��n~%*��z�y��	l�'<k}Jr�Ճ�OG�,�L��J"���G��TF�[	�\۠��<S��`$Rf�2�����	��
+b�@neDw�pݽ���A�Q��f*�'�Z���)�?:2�KbGz�iږ٫��Ѯ6����Rbs�`$��Z�v��X8Q������-[���J�M��$E���䭩�����b/����w����e�?9?��P<���O��(yCKnp	�uG��$D��Y��A'}9'��e���vc��?$?r3^c���~
+?�R�e��܆<쪀%�
�|�!٤(hk��N�{�,���S�U�jhA���Ϩ�������o
e��v��d۬����zv�C�-M�``f�۲�F8a�E�'CE�Y����Kds['�i���M�J�l�y
+��t����eV(= �	bF������|�&UkS=�������*'i�?)�Ԃ�|��kT�[�^��g��$N��T���GVo�{ed��,������2�N��i�F@�A
�CHV�3tf6!J09�#P	�0�������.AE�
�B����܇SA�k���	-a�k�s��i�T�,3nf�خ��6GM]�h>��ݼ!�{��l�/4/x��=�ُ�������[�� ���G��rp�R�
+�y`��i�!vM��3}��^��)���D+W��||�c���q�?�����W����2-�R��,('z»K��R�&��/0M	�Q��!%&,� a�nYև���K��0k�ӓ�ٶ�d
+�!����Yn���ϖ)�#5
+��?�������]��x-�|��T�uq4����~��m� (BfHhL�a
F#�c��A��P1���� e���$�����x�^�ed)���������[�culHC��@FRY5���ّ��H`�sڍ/[I_7R~g,Ou���:��_�d/��Б��i�^�1Jۂ��>��Pѿ.po��7�����'�D���L�T+}<N/H���t���gE�y��)�-�\/}D����O_���M'{�p�-Q~���K���&�̑�;�V_e�p��]i�Zq����P�d/YM/v�!��j'�Ц��J��\��c+�y%=c���#��*S�`G�^��;^�DOn��*[�$*{7�j�����6�����؁�w��'�#>�����'p����V�ji�^�Lu5;#3�
+?Ғc�t	�L��1�'�:��N��N~�X����%��ߤ�S�jp��5F��Y[�L ~�ّ�����T�	��Dn�m�U�NF��x"U�ez�j��F�##��w��*�˭u{�{
+�u���ՆA��Lm^�8[�q߽9�k���[	�V�w��>*͈��0�-}�ӥ���KS��>c+���e�c�R�-�w�j� �B�ߋ���Z���#?˭ ʀY`I/��p��Lyle�F��
uI�2{��p(Z���@�������i�� IDAT�4�q3;���]U�q`<B(������y6�a���o[��sPa�M�B�l�1���%} $���ݮf+�s��ȶFYݥF�
X4-�!�̬q	
Y��(�m�9G8]u�\??��H4Zz� }M,Ϩ��_�>�G���
|�W����9%Q�~��r���ι�+��,�6c�rd8
�spCB��q������$�ܹ�r�f@��,�h4ND�B�, G{7��P�hN	���>�������YD�
k�G�tn�6���-f��Q��
)Y���`E/H�qK=լ9����ɫJ⩂{��c��-t�W���=H.��{��e%�Q~^;;��<(M���e���.t�as������逑�c�җ�E�US�%ƚ*�f������85���rb�YI�Ȝ����1s�t��&ݶd��8�2�������XMt5�,�	!ڣ�]��M��J�<��_'�:N�
抇�k������ݔ�/w�;]������A�(4���ƨOBe�:wa
��,"�C�!T
+ʰ�����>���c���4=>N^ݨf~���R�j�Vu�ؖO�	��Io)�*�A��%zr$�"!����!��C�.��y�����W|�'tn��e��:������'���k��r��\�R��q��o�C�wJ�
�_�j��w
+��R����;�i���w
��ҥ~�Z飰�|���7��&��s����t��!������m����M F��@M5��R���]��.��FkE(�����
��-e���O������x�`�����ӽ�ª�B���x�ڀӥD��fɹ�H�*�f
[��=y�p����JS��b��뱪s_??96e�<��m�H�롒�������W��hw&zkE����J�u��.
>���O_��J�7R2p�����]���AJ���6Z��R�3�v{rsI<��fp�J�.m=N#F��?���so޻������*ug�:?,�?���L�[��
�;2�Ř�`����&B��v�z2p�O�)c��,�^���4=v��OI3˭\��@<"��\>O��w���Cǵ�0�o�R��9;��;]5�-ɬ�	w�̌�@l%k��
N����Ums�H&��o���΄d\�4Cg�m�L_#�#r��B��f�@䈹�J�쑀�/�{��V��R#.��
�P��v0�u��H���y�D��%Z�V[�a1�Zb�GĒ�b�Mg��l��Y����I���b<�n+}@}6��>�3֭x?
Q�t&S'ZK9]r�ӎ�p<�鼍�#�,����:�<F:��!�!(���Z�qsv������Ž��oЯ����Y��j��f��ZiFB�5��&�� N�h2EiI��ac����Jٻz��|^͗�H��k�u��!S�$.]���L�K��C;
F���i4�+��\F[��W�t���,�O�;*�[
e��4c�����ȷ^p�m��צ �"%�A~��+;ɓ�jm�:��b=20
|�"�[A��v�Փ���|T�\!�#�X�����$��hӧ������I3 ��&!
9`��d��a�)8l��v��&�gX���^�w#g�]��V�wUk������w�B)P
+)�9�2���V@(�
sA�Khn�@��Z~�
+d�s��[M;��u�K,���kS�N�	���sM��o�t����(�!���fL	0���"iF�-��
^)~F����?W��o����aN�]�
k�(}}��ϝ�_��@H���ꦯ�8�e����w����'I~�2͂�Kk�����ŀ�zm���b�+�i�F{��˹<aq�f��(?O�����<����g/���o%��veF����ɭ����έ{V�,�]�Ԋ�=��f��b���2#,p�饯(���G�VV���I��_�����J|�-�|K���Ac�HMU�����
;��	M�:����'��?\d����3������W���)�8�N�)�{�l�
+JrFb�?^)|q�uc�ٞ��b�6`��zs�%�H_�~��p���ձ>]��ye��E�Cͯ�>��~5�.��c�{�����5E�{7��)�\�����
��]_*^��g�w�=R~�r�\A�����~����� ���G��-p�����?���C0�u��9��K����ϑ`�d!I��i.m�j��Ik�&�E��>��I���*D!�5@@}Ҵ�����Sg!ok:��"i�����cfZ��09�cw��1����+��ur�Fڵ�S8%2�jw�Y3ʎ_#�8����^��
L@+fYY9���d�5>�'�22�yn��
+�
�K|z)~�D����?0�Z�J��(���6p�C�����\�B��J:Z��YBr�8>�|�P���Du��SN��-T��f��jk��?��a�$&
��d	F!m#�:�,(�(��Y�9��0ʑŰ�L�0��\�P��)���]���<2�ݼ�)�6�1���?�g�<>-�H���#�K�
����1�vء܌j���<})y]o��f��X�y����G�:J�	���@o�)I|�7#�:����w�����ՖXn���\�nl�Ư]�S�N�U�Ρ}�m-�.��'Af�}3_�C-�Pd�
��Y�42�&��b�S���)�O����"
ˬ�Z�Ru\�Jm�>�Y�Z�i൒w�ѕ8{q��iW�g/��[	8ΎN��x@}��$�i
/��6/�LQ�Jћ!����#na�dt ��(8u�+��
`�>�Fn��vz��9]q��@�ڗ�7���
+�[��~�άj������f�u^��G��t���:e+Ѷ.��b������zƎ4K���k����b���\O��B�Lm���vr�/�\Z�g���\=O�f$O��_J�i��m��-D0��M�e�	�u�ne��ݯ&O1����8]�@1�<3x��wZx��R��$R��l-�G�_�}�X�m�X!�e5���fM�'�3�?�~�"B#�g�-,E�!$X�a�kW:��i�Hw6���Umk�ri�M��-Yqi���b���jm]HSQ��_�u��-�:v)��H��JO����ܔ�عε�56������
� f��{���[H�q��`lP�{C��r���^�}ua�r���'�)�rs���6�D%0󭟯F�H�Wz�"�j����������x��?p~?Z~+%I�<�H�V�|9��������N.��h+�����m��g���U4�qn��f�rS�
�(��v�t8�f{�O�������.f*�\��
Z_�z(wu~H=ݷ�-�W�ҵ��p���߱�)��ΏӋv�o+�3x���-l���:���T�i�C���8qRK=�t��t�@D�/��J�6�|rި�}&�5X�X��C����eA��M�;ߕj#%�+R�+8����9] ����
+�5f���<
�m%��v��ϳyם��,�u����s;QB�BUY�6����e�j66NHX�&/�`�nd-X �Pp^�C�(��S,V� o#��(���"d�CPB{��{z�O_5���Gۙ��$�y�*�R��;�����}�Ob����j����O����.$��%m��΍t�����7�>��
Q�����[��Ѧ�ԽRЮ��4�N��=oR-��=�
���4�뤯,�g�|�X����O���t}Yw]B��R�Lq���Z9F_�����a�4�]��yd���mu�r��u���C�Y����#̣�^va_/���'�9���]�酔��F�+syB��Q�6ë��#�*C�JK�@P�Ρ%��ߜGH�p|�ExEpN
2�L@�YpQ�D�,�(xEtۣF���.+�TfM�\\�~�(}�X1Z�\n*pI�#,G_��`w:#�ă�%�Gܽ���T��4����߉�6A�9]�$��gyޭ��߿zg��ỿ���/��f��w��k��Hɀ�~ѽkb�iƫޏ�����g/��_���ε~�3'�/�������w�K�z���6����ap�+��q��^��Iߴ�����S��{��%mK��r�Y7t\?}��ņ{_����a__�[s��]�M�HAհ{������a��TO�b�Ö�j�l���e}5���U�g���u��
+�kEI<����.`k�����Tn5V�:s!?dA[rbȽ�Ηb�����,8C^soL��N��Qݻ���t�e�3S�����=��)Sک�?��/	����.۫LI۠|����廛C���϶�)�e��n,Ϝo�P	����5�q|s/�D�9�N;��J������{�}����J_>5������G(ikS+�״������������e3���H�����������9����'���*����h(���"
���
%�@y������e��N75�3�
��]�@�D��
T�9E��J���0�>*1���2�c$�bb�F�����)PvH��8�mGv��m`�RX
+T������!�Sb{j$�6�rL���2�)�
�c)�@�yhؽ;;<�ς)�(��<+��(Fz������lz���8{E.��|_��Qm`��%!���t��p0�,��Ak��!c���L�����m�������>�>�+�[#֐�<��n���Pt���"�(A��{��'@&�>�F���sc���k����CWFJ��g/%�q��H����LW�ͯ?Z#��ξ,(�#h�0���Ӗ����%���>'��ܬm���e-��u�3+��J�HOn���Ou���K��n��%z��$��
&����YN���܊�_ �=����M˙q�s8>�pJABe�!6�nj[�|��G3�['\A̲�!��d�)��mn�ǎX�2C[����)�R2���3U[;�w��\V.}�������Iz���{��O�g�1kⰆl�<à��V��2	t�@��.(C�9�q���_}��j5�'�������-�����E�<�����{�J�
�vJ|��N`ױST��Ŷ9Tb��Z�Q��u���io O�g-d��i��T�<~=�/�ӗ�.'DK�%Q�[��W�΃��e�T|�VJ�A~��#�ߨ?
�4?�"�p:��3u�H�M��{��ֶ^�~�G���(;/W����-:�I��ZS�4M_��g9ti����<^���,���{���
q/%�@3�zk7?�~ �^�H�_�����_�?m-/��3ҋ�sb�E��e����__�<ӛ����lu6~y��JM	��<�ODj��@���3׽�%7W�{���
	�CL+{An�#��ͷ~ O��7���L�I�.��ќvء��;��J���{l���<U't�ʌJ3��������n^���O�-|�����Չ>@I ����T.�c1��ݹ�a]�X�v���O.
%Ϲ�w����Y���4?{m�RO���Jut+;G��п^��T�+z7��=���C��L�?i?���~���װ�o_�uPs�)ܞV�ï2�b:ʖ�U��A٥nll@��&.)�iiI
E�`�Sx)�8
+�}��d�F�cX#iЍ�פ�(�̶5R�����Y�>ɈW��<j���GJ;ln���4S�Z��X���>7c���o��gU�_+=*����"آ�éYWvni�>�Kސ꣬-|��'�X�	��g�{���Gi:�r7�E���<��I�� �`%ҧ���lEl������^X��>(Cq�9	���]�q*��{h�`��g�e�5�I|��'P�r�����K�u�������h�I
]�v�uEm��e�pI�Νii\�C��j~�
��ޖ��߭lUق�AI����Hm��c(K=�l�(v
+��鵱Zψ�D
L۰�����|�vd�Y��ln�5�-�dV� �`��g�C��(ƶ�d���5��b@��M]8(�V�6�H<2��C�I����r�R�����R���kJ��_n�
+ڵ�RU	�?�yuv��F�cJ]�~�␅I��Ym�w<Zt�Ŏ5B�!�]h�"��]��
�ϱ�M���X�k@)�A����]R����`��ԞZ��o�K����(.�'|��b̧�8�A�M��6�����@M�.b�"ut��[�^���n��\o��Q#���u���lg�e���������/��z��<�d��xB����}�Av�5���Sz<�G{bc�Q~��wS�����~~N.O�K�v�z����Ee�7��d�:
��xD����KkFv$໓��T�#����@<1�'j3em1��i.d'W�'����0�S=!�PW�뭙���p�+���Kb!��~��HA<]p��Z��{������Xp�V�:��3���k2}�\��z�#J�vvAٽ����٢���n�zc�4�����vvnȏ��@�*��RG��=�s�1���E�����f�"$`��9H/��Ӕ��/��L?��f��i�O_�;�g:צ���2yf����s}�ڑ3�j��NR_�H�Q�s�B*���U���^Sp~wCr���8/�#�#����~��Tjܾ�T�S
u��TV���PF�>}��b��*][�4CQ?#m�5�&�,��>�[����bm�s
wQɰ��3D���8(P�n��X���.�,$#�L�3��Ny�`�nVVv���5!�}���)i�v���|e���S�X�W�2�lq6yMA<�S+�w�=���Tm���m�����!�b��7��*_<���P������?�q��j�S���v/)W��k�����P�Q�g1�� …���(�@H�P)��E���E8�Fu=
+
��A(��k�za	�E�
,��:
+Y*�P�m���m/�?GHV�cyT��4��Vө]H#���T��w48��D��G�5UU=]�-$���R�I['5EɭC��\�:�c���9��AITr)�g,X(v��TA<c�ӓ��T��ޗ6#��]���2�+��H^P����Dk��$
3�s2��JYY���.6�����Ud: ��N|�W�v�rI"-s��IRt��~���X���@�!NWru�R���Z�%��MHB:��%$|�<�5�
�E�zhy����<���_��	@�
!����{JB)�
��BK�	�~AEɛ8;���|rQ��� �E`3�琉md�'C};S$S�V����m�`�6���lu5;73Ų�Xl�F��P�;t17Uk�l��T7��A7}}'�h&��Z^��g�>��>T�D*O����^W���H$�D&O,�?�զ����^������і�ŵh�V^;��O�s�OGI�ВhI	?r2�`0�rm�16���~���6c�"�������,�V�s>q������f����������c�YU��~�F��o��{�qM���o��G����	diD�a6)���:S<��m�wpxC���л}�#���� c��Uw~�Lg9{�Do�l��[>������2m����6�r�������Âc�I�Π�����j�Pm�䍞8<��Gi3���ʺs�1�f�������m���
`,NfՕ�6��'�s�{:��ֶ)؀����#��~�0g�zw�.���
+�or~�u�6fq��w׽=S�G��]y_V^S�??��~�wg^^���-EM����Cyu�/�#��ko�����]?�C勇V6������N�Q�je�V��N ��_���M�FD��ه�����׷�um���v�G`Z�����{����lhOU�fyg������D�fί�Mv���tA)
I�������i<��1�c(��S|��C�s�Hh��;�>Q�
�e�2'b.$\�2�gh$x�|Ԑ3��jb=ՈIJ&a���Y�ۙޣm�P{su!�D�Xvj�i��
	GUzWR��wn_h����C���=�X��oD���|�����tZ��}_j��
+�
T)dc�2Hס�*���@mD�`
�
]�׀�*��
��D U�@g6�h. �&�Hz���I� ��R�TWN��`J�))*l��A�3[�N����k���ݰ?
Y�Wc�
���f��tlj��2D>�;,�(/鹼��4S�X5��z{KvW�(۶���M,���ٞ����
����"5����ν IDAT�e���<��YQC�E)�E�k�
�@>÷�q�@a�Ml9ͷ�R�v��r+cn:�5��������݀Y��VfsE�X/�|���S�B"����0��Q�f�ڽA�U	ӝ��3����Pլ�jA
�
�zk'�LJ�*dC�� ��A6�@� hoZO�P�,��N�Tk0������$�~c�
G�*+�����Q����[��n�[���k�N�-�V#X��k� Gb����tbqH`կ.�r�
��KB�GDNۻe\=C�ͩ�
+���3�n?��������2Lp���A�3͗h;�'��[eX	~�a����C��ŕ��
+��᫹>��:�����?�1嘖z[ۻy\=]���^B�ۣ�!��_/�e�#�Log8\��{X�t��MM�^����_���\��qu�����5��v��}/Ug#�E,`Pfz�%U�@b"��Ϳ�A��{�a���zK��5����ˣ�����ܴz:���䃑s�'�����u���?���򅁼��I������5�i��ם���i.?�l�ak�����V�A){7�˫gxZ�=�|i��.����)�13J�dgy�+���Tf��3��w��U�c��;��N�-�{K�}M��q��@�4����[�)�F��a���mG>�o��~�v��_i��YZ��%�/�G�
q
ā[��)c�Ȇ����ͷ
+��D��G�g6��c��[�S$�����r�m�l�Ŝ�
+��̳'4IieB�	m�8�1��}+���y�!�L��5���3.���<l��b��Zr�����l��X����sw�.i��m7���R�WTW��3B�f;.�om+toglL$�j��p��h�F��YӞ$/r��������K�������St����_���s�[P��TUY��h��l���	0�p	��!
B@ЄIƽYU���jlg��)��5�^�����)�b����[2��X>㜬�ٷ}�nN}y
�p�P��ك�U��<�aab����b�(�qM��lҭ�C��]&,8C�XnlTڎ/N
���-�:PgI��6_��J;ۑ�nz�p�(-�	��Z�\E,LlR��`'�ᔨ��Δ0i��&�HD����h��Dի.l��
[�%�5�S�&���=K���#�K����ĕX;U�=���h�;��[U��V.N!�VМ^�*��-qsd*���pHF!�B���
 �_F��J�93���� <�zE�\!�2������dX��f݇����NY�m�-�T12:�f���	��ӏbܑ�xl�	�+�ŀh�jid���oT>'�?��U��Q+�'ĂhSݽ�0{�����#�w���-��
�7����8��B���rP^;�o����gz�ӵ9�(lX�=�jO;��$�+���:��Y�>����7�+sn��F�R�dX�|�R{P���/'$XN�v*v��M�lM������]����BbR�-#Ӟ�nG���<>aX6�o!+���r��|j���QuŴ�j Ċ�������k�s%+�d�P�
����AR=-W{B��X=��K
X�/���Tzga�Rv1�g{�����%�X�-[��O�W���Y;[�{qB�Ӓ�o���5�l#��_J��|8��z�寳�pı�z���mt�7r_�STW;�̶Q��P��:����#������F�.�f{�����'~�u'\I�~�:��ׂ�/-F^��$k�jc;�Pn�?�X��<fK"
!C�gj*��֜�6�hUw���@�R?�e�Z$�#1�p>d�
���8z.�B�Kh�liL�
�P��g5�C�#�3���83�19����?Y�鱩O���nKd��O
dݽ-�.�l;��ʫ;�nj�[M������?&���������Ѩ|A�ު�6�Iw�׮8h�i6nE̴i;΃R����p]Jdž�rUzaM�[�Įz��W/��&X
~�L� j��`x��h&��
�A�c =����M�Q`@c�&=@�I�l��?h�d�a�c2B��@���'7�g�ũ��UM��Y�jѐ
�a7e��i���?wh�A#�� .�
���H=�I��.q�g�/����I�3W��5�x,N�s`������q���ȮU`:|�k��<�Q���=��:������1i����!o���@q��QM��E	�b����Γ�cX۔l��oz_�B_�_A@cg|���u�����%Q���(z��s��g���?"�'��J	~
�P=q��q��a2�'��k
��^�r�<��ń82L��q��F/��HJ��ʶ|���qi�kx
+�Jg	�,?�C���G.��	����6���^�'�������ӆZD�\]��)U{Z������/Iu�2�c�˞x�@Z�n�l�[^ﰬ4[���$V�ڑs���H>���=uE��j/U �i;���;e��UO��6��Z�Su5Ǽ�}u\>@��w]~,M5ܯ;|e��� ��T,�jj$z���e��3��,8�88�;;���j����
_��K�Z���Ks[��$fs����f��N�.2�H>"Y@��X>���~�W Ԃ/*}����{&�pe����Ns������i�	gc�wH�f�D]�!w�ѩ֧��26��n��ͫ�y�>"_��J�+�A��~�z_<��ϭGM��qc�[�JuY ��Y���L]5[{{^]�Y��>Q�>Q����nmg\����B_4�|Mw��MZ��v
+}�7�G������9F��j����M�䱇ѡ|���us"�ȑ42T,�k�@@

+&Czl����:[L�tN�U󨇡�lB��vهM1Χ�<��)�1��
{h���AK��Ѐ2�#���(ȗ�3�c�����%�S���Tf��ִO3󘏴�Y���ʇ��q�P���E��z�����,����ȇ������ ��,�4^��D���Y�k[�fߘ�"
!�*�h��B����E�U�Q <�>��p�T�� l��a��0�1x
�u j��1�Y��<@���"�	
�
k MvHq8_q�k͔��9ߑ�x�޴����Ɔ����=�]�:�.�a��W
iG�@Ͳs����*qC�5>����jR]M�#�������jWi��U_��8s�8��i����0M� UR:2�О��g��s����#�Clx���qG�;��Ҫ��g^�aE�4��n�٤����\��.�l�l���d�*�9��63����n-���˖���C��վ����1� �����M�{`m�eP�KրY��@�;�@8�
a�A�.!�| �K0
+�:t��B�|�����ꬼ��.c���AGD��N)
+~��6�f:��@g/�a'Dž�&vef�!=.����F�:��@�''u>�6����l9UnbX
+֕�L���Pİ�ă�����u�������{��/�l?}{R>7��D�A��^�F�uK��
+>���A��c�TzG�|Z�|6�	���h��X�M�����U�x8U�H~jP\�XrL���4��
+_<���� {Se��xl��4W��<��|N����'������V�v�m�_�T�u �:�t�y�ڨ�޽��\~��}�I����]�Pޛ���哆��,�ʺ?3��Z����J��zW���t���aw�'��Og&̪+��e��9�r6l��
+���_\�q�p��s[�����>�h�:_����>�v�ws���*/��X�ՓJ}a ~�Ͷ��+���p��x\�Uz��meq��n������H~���(��mm�'�)5�3�n����m�F�f�������������Ͽi���W~�֛IneȢU}J�r�˨�‰��&-1�qꔹ/`�
�邪n���m�8���=�@x8�b�A��|������BUíR*�3.N%ԝe�e����M�88.Z�����,%EՆ��Q����������aa�i����l˻�D~�`k����T��o[����X��R�R��F�qm�Z�/(���N~��1�bCH�����yX�F�-�9�%qQl��T{��F���P�@ou>���)
�@���k`����k��	T~�&!h
�
 �x5�: (2.�I�6��>7����7���v|�R{��8_�6�q�}��5��u�uF�Ț���Ɋ}��Oٛ���S;�T�t̐�l��~K�(
+�b�)9�M�C�Y��y�m&vcb�"� ��0J㐅�|sB�}��7L5/f�t��$�QBՄ�k(3ZӤC�B�9�����g�:����ȱ�*����'�%�
�\�US>.��`k����]�,.�"�Ʌ��s{���O��_�|9/��ؐ��v�U�Q@�y�a�ݎ��fDžͻ]�����9�=�T	��Oo�����=:U	k�� Bg櫂���:ν���l^=�cf�k:��f�
0T�.rCj@��.�ȅ)M�{��	���g0���4Y��Z��U���ԙrʐlKӫ.,�.c[���В��e!ߨ�|�ϟ�n���^ �l,������K�/G��N��>�P�#���0;[�����jR]`C����7K����W����o!�	P�&TzW,NUv���v�[gjo�lP�s\~�PX���P�Ñ8<|��g��t��k�Ze�m�і���{_�ԅ@��Y+�ޖ���*e��w3,�4m�F�NSL*�츏t���ű�X�����&?7u��� +�����U ��ԓZ�z˻1�?l#򾒖���E��ޞ������߭�R����F�.���důe��<y���'�+��m����8yu���܌��^�p��h;�;wjO���2K���н�H��Y�}��q�*��Q�ܮ�&G>��x�$�2�K������{�xiZ^'����给��s����Ϗ���Zwط�9*1.����C�\lpp�΀��p{N���A��dDĐ;k�8x|B���튂��#�NY0
+�Y����+���iAa��lQ�e�g*�����-
R��1�Ys�!���Bp���T��l-����P
�ޔG���X�A��Ng����K~z\>��'*}.���m8��@�_W�8�O�ש2D�Y����Η��ڴ��ƙ�WhE�� 3a�ou	\@���Q�u���I��5���N
�0
I��
+L	�C��
+���6X9��uYZOgŋ�����6ۥx�(����o[�WW��auOkʅx��	qk�K.4+��3��m��k��ZbeMQ��|]��E��o����j
�d����Lie��	M��*�n��
��
�ke4f�x'���gh�O����NMy�����4��;s���Id��!d5�"��sD$V23�����Y�v/����
+��.qx߰v����j�kɟv꿫��4�,ʧ{Ν���,{v�y/��鯭0��g�ހs(�)�*#]� BU��0�g4KG̨RU�n�)׊|+g���ϛ�J�k�8XU�f�Ղ��h�.��4�@/W5���
�Y�^	#E
+�\�`�B�_`H�pP���ԸuX�`5�]]��E�N�I�zX=�@p�o9��c�$D(ͦ���A�TY�6��\�/+�͗���+�M�Y
+�C��)�� 5��(�Tω�{<�Q�^<ך4M9�׎�J`>.�e�
�_G(��+
�]�6T5�;G�B�LQ
�ezs WfK��n8wi;�h�xi��|�_<��B�A�̆|�X
+�j�5{*�q�`:�{����X���M��gz3��ظ������HK���_�=�8���z�k��J}�L�Ά�PO��4����_��و��fm�v�o��H��9���UR��|���tg��(p� �⅑��I��J��ͦR]�_�z�����9‱�p��N���H���|
�(�ޢ�"t��CQ�xy���Ώ8K���.˫gD�]_-���h���r�E���+��?��)L݂��Pg gDbk�SF�u{ �MԌ�7��y��Y�88�RD8�c����1�U�	�
T4�#}z4�F��1� ���P�0�Y����b
楌p��݉-9�U=�wJ>�d��&���/�d��7V�v��ݾZJ���j�~���CW<8wmL�q�y��\�3�λ�
.������j��#s�;���a8��(�B�u��af���Iȋ�
�����?��ƌ*@80\�
0…�!�
+�k!�
 2��x1��s��!X�up}�b�l�`�0(u�� %��:�a�.���ɻ�����
<~Q,W�]�mT0r ��#&L;Xߠ�r:Y���pI8bnI��S�����W����2���Y�0$��Y
��8xu�!�ô�Qnf�tn�53@@
&�y��t��q�g���g�T��X� $�.�`Z�z#{ZH�̊���C��xV�钘!I�e���x|�����D=em�^�j������?]~��x����j���ݖ�;�!c��\����[����`4��yG��2�@�@�MƄ�@�C�����A��_?����"?8����f��u?,����#�n��_�������3:v���y����o���TF'}��)��lx�8m��h�����)}�p�=U��
.�'��D��E�ŵ���$�_�MX�H`�}��:�Ei�h)đ3�ەmK_�p���K=q�X򦁺h��l��ͶAu�	��WO�%��ߎ�9����yY��n�rVw��,��>e��m���5��'�r��6�@�b�L�K~ӹ#��` �ȯ��c�����3��u��N���b𕱞�l0P����~u1
6�C��+3�1�$}6�����͢D��!@�0Wv����M��vu��b�xI�x�%O�V�����YL�g%�<�m�$�)!����h�7�7X�,�A�}"_���ޣ�W�Ӯ�5+^�˟[����v�����������τ�M��������Wz�8=�F��6�w��v㍆jB^K�SV�Y[k��p��������Be���Gk������l��?г	
��B�Lb${���*���4��` ѯ c(C��ԇSX�`j�0����J���Lq��m�!�lNQ9Ƿ!8�*5��S��|�2�9�L�-�fd��p�I�ݤ�]��~��\�XQ<�����B�P$V"���b��I��Q��._�fSavJ�kF��P���nS������cj�GA����ŵ�'�k�`��M�R9������Jݘ
�����S��%H� lB�0F�1�H��`m��=�(�;�@EQ�
5@��|e�y�@�����<j}�
�Ï77p8�U�4��W�W���L���-����yv�){SA���9��%p���҉6;%�!n�eO�0�-X��z�28j~�agF�Q����t��6�֫)�klzF���XS���(��)�.Hb	�q�4��۩Xr#r
���4��)�Pf�>U���r�@�i��/��9��._�/q�r��dS�W��I��Q�c�����'5�����${�1sI�2FǭYS�y�r�֤U9κ�f�$�Dҭ�B}:*7S!�hȓ:�r0~w{곎��
+����[v|4�u�����ե��=�ۀf*��P$�JV��kP.�r�h�:��(aCB,�1�#s�)�Ű��&�elS�
����V,�u[S;��E��X[+���H6B>?�\��o��Y�?CQn�}��y����4����Bq�c鰵��O�7'Փ�F.?S��-����,��6�O��5瞵��R�H��Q�����9���>�����
3�p~�U�k�I�a$�����Ӏw%K\������@����8A +�h��1�Fa�
+�	4�X��;�P
8>?=��>S��y?����<*Y����.��+��ޕ�+l�ޒWW24�s'��tivMG��.���#UW�C�&�ۧԮ��ʘ9�s��>��b��x��UK�����S�U�WN��ɠ*��8�p?}{'~�R06r叕��٤]{�53����
+�dF����J=I�UW�v������R���/�l� IDAT���I�Ca���s���������_R����մ��dA�mN�:1�Ϸd5��=�bӐ
+Y;�������E������NŸy@�9xnN�m�G�2���%
��.���>1Ƿ��#��F��G��P9�GLhB(l��?�V�q�rԑ8�m-���-G����<�CM��̄�L����u�go���T��|�;��F��䃒��l��}��'-^(����fm���z����F�%ƺ\$� =���8EYt���Ϝ� j�U�d�T�g����x5��/�2�C:@�X�k�9��ό!�*A8��D�m�s�(}s|��VQ]���<�y_V]J���w��&"5q�d9w�~&��m�
+�.���܇�{�ڌ�Dd	��.�.��g�Ƌ�;��1î$0u6ՑG/����#�zM�kh�V0�f�=zd�]ڵ8ւ�"�ٰ�\h
���Z���0��l
�ĦK���B��ED��E/����Y�Qu9�B���}ek-�[�NYrc��I�<O<
+�Y�n�fQ^+��q��R�p�Qc��>k�u�(����V�Z8�~�l�eS���'^U��3Te'/��������s(Kt=ʒ�z�1�x0X�A6v�\k����a]
2�_Y�
�xQ'����^�&����+��P��Y�Ǐϯ��*2ص�Ů�x�ػC؜Ú�Z��	����i����&���D�3'}��Y����&�^���喵� 3��81�K�p�byoej�G��1u�3�t�9�]��������*�"��$3Sw���K%�r����c�Y�lT��fz{ ��f63�uy07�5�Qu��W��?J��(��_?:�MX}Kr��-��}yOR^{�8o����,
/�TML�V�a��G��niZ%yMyx��l��zn���l<QK��&3ᇓ�9�NG��%�Wd�m�g\�$��Uf[=��$M�|f��b�.p�!H��[��z�osL�p�xn(Lǿ���[\��Y��0����CRAL�m���w#Qmz�cZ�h�kAp�J�f�2}�L��y��8�\^>c��n:�c��
@�#)��k��'�w� }�/�C���顼�~�?���,�����/�I��J;���&��<�O���������Z���呗�;sF�Oi\�X�cHOhŀ�(EtHkAO�d
����R
�
pJb�Ap
����g!���-��F���-�����Ɛ��bSEVS^c�DŽ@�-{ܐ}�I�'z�!�J�C��Ɖ>;�r����s�<h(b�"�G���B�&��~�f��i;�>^��p�|9-^0��R{-�k�']o?Y^�}	h���<�8g��yAt�h���y9]�t"˞Ӟ�o4�Af5X~�@W�]9��^O{ =0DSP��C>��,��2��@PpC�b@�lւ�?���_t4�_֨���#*u��K����ɟ���?V�1@D0��+m��l�E��G�)j��}�3��8}j����+5?�}m�*�����_��Dь��C��Db��[����$1�
�U���.B�p�>WA��RM��)Ml��-��u6s<�GWbh
��L�{�<,���$�u-%�k;�>)z₶��ꚴxq�!+���ci-���H.P���k�7������+=o����J�lj�󌳓Y��;�Ga�]�M�M���x��}�
��L'����
izy�m��#��<��C���5�| -����'�K~b%}���C�z������`]��1)HRZ!��
(��>̦p����7/A@�oW�<�q�X�"��161���&�e������>e�3,�Q�.E7lW�_�r��־��Qe�5r�)G���~$�4����I���y���)X�����@]�Ij6�����._1��˴z��M���|NE�����ʹ����G*�
+��DS#3��81�[s�!�5�o�|5ջ��w"�O�"xo�vx|<���j�`��
�p��v*QOQ��1VO-���� ח�5^���ŋb�D�{�ْ�ݑs{����f��cZ=��'[�'�[oL�m�j����ߖ�J���a�	��m�|[�?���8}������m�,v�˗4���mG�w�YPf�#-��,���l=��a�g��a�26�f�T���ɟ�{S#�Kk6i��XBZ
+�›�'���~�qx�W<�?�G���C{"�Y
e��{��؅�@��I�-Z�%e�1�4P	$F)���!p#f8��x�@�$V��Ʀ��8G�7�n�T��bB#
n���*KfZ@A�D=0䡓�r����œ�b�1O�4
D��1���8�-��d����Ր�N��1H~?򾱑��/�I�:*��}�&��~:��QV�h��7T�B߻1�~�s�_VW���m�{}ތE���P�F�'n��5FCQ4�hP��0�]�t�	`�
^��E�@8��`҃x
+��g�=�
�!d	�f��
+AYF�Hg
���H�}��[J��R=-�ю߽6�h��|/{K���RbvZ�:�
+2зG�Y���p��V�.��2WD�c����l�;-�:�:`�f	�@'p4�]ZC���q�&t���]�YPg�K���.�<�V�6��P(J%�m6�aV�ZF��!`B��M�����jZ�hb�)��z�c�P��Č�]6F��xܒ�q2Q��>�_�07(�v�Qe��?i<��^�F�)㹷'�k��x��S����_�,�X��E6�z+�ԣ�)��1���S��E��+c:J��X)u童�d˶���裑�Η��i�4"���TKq�w��2���ؒ��V�O��&�0�b6��_��Bޣ�g��άѷZx���9�אf�-X$ ��5�y3Ρ�j�R�e�W\c��[�
�s���¶,NJa1��!簾����Ws��o��J��X�5��,"M5���N���-�o��p��|7���ی��go��vP٨�n]�f��t)��|"�1�[\66$q|��``{��G6�Kj�9
�����1̉�!_Q��n\�^�Iӻ��?��G�,
򗕶a�+��[l�qb�My���|�a!غ�8U9lŗ���kW���k�P�ss��e�?h~�PM���E�m��ݣ�z�apSo�?���s�̋��mk����2;9۰�^>�/�lE�R�q�}�����um�[/��ޛWWWfs�}��
m�z��lE(���V_寊ݛ�8�n�G2i�FE̬�k;%�����~y5��/�����*?�?(k���c��w��*��A���}{�@9��!��pjA,9X�!�P����`��8:�b��9�g���"�q1r��(i������^M�-����UO�UV֘\7G�޾|s[�ir
+۬{f�@dI���Ņ���d��sO;z� y' �%�����iu�d]Ka��d̴#��m��=KaV=��'�J��9?�'����-�o&E~�ӷ
QhlHF��EN�C��0^���9DM�$�
��Az��@�P�0������F��^����ïb08�q�6�����n�l��n����;�}�佈�J�'�vv�pb�1���<`���}�B\������V��������`�|.������߇�-�Y! ��% T0j�mC��~C�Ē��'����љ!wa:�UE��m�j�Khk�9Y(GvC�
�mQ�&��<,6��\��r����}.[�9w���~�hr��q�G��
g#O�8iG�~Q��/*���n��D۹J�$�%�U@��`-X;%(��1���;7mzoM�aؿ�mԢx����q7���u�C����Ո�z��w��˛�?1T/��(��mf��J_�'�%�T[ �c��Is�^��nq�9��{�`M��\t�o~���=yF�$��(�H�A 0�F�`������p��&�&	,DI �2���&�h�켿��7w�:?�[u�-8�*��[�Z?��G���z�^���/;N��VX�`` k�#�̧;�xd�3��3���V�,�j�Dz~~���,�	�<fjr:%'#��It 0�t��&<�%ࡘk�@S�љ�O�Ή���S���K��T�)�'%����pK���9�8���G������1�M���&��\�੩K��tm�V;��1n���*��fwf1ۥ�]��
�܌.��_)���H��D�ʼn�*�ũ����)G�� @����C�blJ9*�}k7�8*v1���f~��O*}z%����Vw�n�#��C~\�:�$�ѦQ�-F��Ov�?#�ё��}p�ۂ�mF��\Κ���\�+�jm�R>��(}��|?-Γ��l�S�x̖OL�^��uaƫ��;��ڰ�5�.I�sz�3�3u
+gs���V�&Ζ��f�K��ʛ5�r3�����������f��\���]3� �r/6���u��hA��.��@r������gЭ��
+2ʅaK	�s��"C6����1�cZΨWe�	�i�U٤�X�������j����/ھ�3f�Y��"�etYZ��uy����	�&�:V�%[1`)��GRu�P����������'4T�g/(�ߓ�� �F�
��Zv�
Ps��:w9ޜ.|����:�EWK�
�s�E�E�V�#s@�F  B��A
��1����C�[�!��`�A��`;`�`�'��~TH���x��(:϶Ou�͊��OiU��W
 ��}5�^����/��*E.����4���(�Оa����n���xqJ6�#8|n*Îa���'Y8�����N=h�܄;�x�q�f�'�i_��dA�y0с}C�KCчC1�p��ā��H�݅�64�Z
+�*nX�e��&0k8(��[&" ��
�`Uyb&o���뉩����8U����2Caž��떳��Q~���Dva&���u�b�CDո8�Л8����k�\�~4˶�g��ds�̋��W-/�3o1Fg�G�^�{;�=A8�m�e����[�CP~p0�N�R���~��zp�}c��&�Y����m�6{��4l�}IqV/a�8��s�3 \�,��bK��0߼O��=ƞ?K�saU->�ʡ���(��N2tC������!�8���l,1aD}�ٱq�!k.3abʊ0��DLy|Q�'Y�H���r��6l��\�1E�×�j=��a�/�-�U����<p"=��y����$fb�IQP�oo�0C"&��
@��7�[�
�hK��u�q~T)̰!�sX��3=,QY,ikS���5yl:[�13(N��U����[�z"ѓL&����$]�b�������#��D���g�^]��@�o�aW�O���Jm�r_+~�g��zM�|�r�R)@7�.��
+���Y��͞}��b���0���M�T]�.�O3֊�*��~At�?
+�q��ܒ����WI~������Ղ�.v�b��^��@�(y�6���of��
��7<�\�l���<�{����L��S���}�ה��&���|�%�,,Kt��P�4i���:�ez,�n�M!���hwi����zyR���3�	p�㘾���
++b���lr\�o�n�6��c��D�Jb�=qB�A Z�8扃�a���4����~���}U���:y�����{C��O�Do�l��~�D��q����1%�����亿�������)Y�S�9/�i2�:?AL��8�!�#-H�+�KA�����n��a�/,(�",�]�8�j0s����
*�2`��U K�ׄ(��v�2
+IB�3��KJ� y-�$J�p��?r�ͱn��H7{�J���b�t���u+���Љb�E9*���7霢q�Bk��x:�0ۇ�;�hvXX�hi���Ӿ��k����0���K{��5mz��g�⢹;�yG
��8�g�ps�f��L�@��
+�0``��m��>�@�M{G�TlVR�u��M���AU�B�]T��Ĕ=/Q�xg���� �+�
+�j�ŏ�����7fX�eF	X��Q�6x���5C�G�����iJ�/��4����̊���K��q,kO�]�l����?_����c�ќ�"FJ�
��ؖ���ye����++���]E�]鵈y�~#��q��k��x_`�O��һ��&L��C燱�Y{�l�eM�B5�����=�>���9�<�W0*.LJ�J,�h�~���ԡ�<�nN��U�ꎙM��m+�#��X�X��$�R>n�xľ�gY��"��1])��D[����n���|O�JILGjSW�mU�ti)߰����"���j
+�d�W���[˖8N�l�j��K�,�c%nb]�p�w�-���-���S5��C�&�zMW]U�Li9߸T�����dH
d�d�n���G>W�m������r����PMΕ��ס�bϾ-��+{7,�o���J��|�a:���k4��J��Nz�B�Z���Reح��*�~��,���,��<��y�0����F�U�����w��������nLŶ,�׷�\��$��R����g���ڔ�����>�O���_�����
`�������)��[���mGާ�:�M�Kl��x��Y��_�c��x�?�����J��_9rL�}��6�
Ѳ9�DF]ca���7��
+�Ӽ��;�gf98�1�S�.�fD`6f���XS�f��*64oj0��ta4��*[��D��.Krm��gQ�#�V!,�#�� O�س5�q<VS4�ޤ�dLX��HW-�L~�'�r�R?y
b6U�.+v�tn
?�I�	�t?^�-{��-q�{�a8�m�=5�<DS�
��W��2�!�'��u�N�i
+q�|����e=��9�
�ٛtA�ʨ���׉G�f�Kk<��ITF���\�@҅���8ژ�!���Ġ�y
+Q��|߿7�&���B'r}�{��͒7&����Y��dZ�X�������2뛨 w�]i!�hȎ�/��p2�- ��O��[���9ؚ��kHpd�6�������C#xQ��=8\ggu��9�=�g�� I
+�.���c�
Oi����/�G9����i��F����=
zEY�!Q�>�C���d$T_�B����b�O��/����w�%W����ӎxZ�!D����j���\OE��Y���~)����O�ũ�:����B��y~�O=�6m���Ao�P�/��q>kL5�o�,�_����r����������^oLM�"'W�k�/,7�,��8~iV�87z�1!����J��Y��:�O1@�A��w*��
�0�LB��k�42��0�Ӳ��f|O��LL�]@߃�+�&}Ja�?�7�XX
+z}��xuo��ʣ���ļ"� ��3��l*dT�nlp%�֐4 9&!�
p��Ö
R&,�h�a�����W��#%V�~��ӕ�Ҝ�kr����j
+S�Y{�i�Ld!�LzN�Ҫ��䵚܂XfF�!O
���X������+fz���ӆ�ބ��
;�i��B��/YM�kK�	��i���0�s��Ӆ�ӫ��\CN�6
+->/�0�Vy_,�FϽ�;xo��>�g�����5��1��h��E�����\m�%����0Ӻ-^��X�)=Y? �t�\+����_;�)W<�;��+��W<��zC�������"H_��
ƄC�{[�_�8k*=��~�����TF�6�V�5��ʒ?
��������s��_	�W^y�G>�gǍF�����]�*�_A1��̙�\E��,�ٔ��u��x�mX4��8^b�6�PE@	NQ�mЂ��
�Vغ&=Qekm����1vN	'S�-y��<��ݷ�3
TE77���jP+�88�UD�Q�)	�d9�,L�c>�����g2�>�����b�-_��ݐ�Ť8��~���1q�_!H)w�w! ��Ȳ��+_/y7���	,������{��(��6�)	yL�X`Y��!��4
/�~�!x�i�^��x��A�cd���]	��g�O��-X��,��ے���/�N�l�`�^��
+��"�|6/v9�ݮ|�L��(S�<�(��OD�so������RcF;F� IDAT
2�1G-уJ#��a�x�~��w._���a��	�v�
+���A���<V��+t�b����
+��!�t��[��#`A�
����K
1�S�T�DȆ�d�|&
�����
+A`�7l
yo�+��rD�y��
+�;[��}�d�"*U��#plq0V�r=5|x�?���z��쟹�����y?~3gM�����^z�e��R��˕{�#I������1C�s���ìӾ’OS�E����T͑�L�>-ΫW����t2�K�y[>�Xwk��N)���W0�:�ƺs��B��9��ZC�2���T�yUVyc�<��U�P��F����¶@�"�f��#t6��Ԫ�`�Lp�kB04�&6�u�ƀ�RB(ОW�!�T�\W�lD����V�:�e��RQ*#p�O�))�W�5]2T^���&zU���`�`^��$��G#��$ ��ڜ�*C����Q�z�S�vX�����XN�/NLV��{�6圂T��5]��q��z�j�B�H��1M���u�É^[���Z'1Uz�R��狆|�]KL�z��[�畝�ȸ8��
+1|Z�q�G����I?��P�O���$�k�?���{s9���NJ��ʟ1�|�[f����5f��8�(3,آG�^-�q)��C���L�dĔ��[yqJ�7��iQ~� �$/Ι����F�/�.�I�~�����8�����%��K�u�������s$����gD����ettttt�T*�>��ߙ�l�.�eܐR��&S�Tq��b��wa܀b����Z�dBCB��!S+�"� ��u=U$�]���@��)vɳ��Z
Z	y@C��l\��?,�Y�R��	��B��&�J�;��+QkB��{�F���U�"�,�w%z�&��~s���\��?M$�e#�?kSg��
P��HCA��[�o�����6���"�N��ŕ���[Z|�`�d�'�܇�i��ȧ����0���M4�*OO�F�d��<lh
��
Td@+��
+���2?��R�-/�GO��E�+���x��3DືH�AJ8޼�~@�	�_l6�)��z�m��?A(|��^�����=���Q՝[!}In��XN1.�ba0m��jx'�{pa�4�gCZ7��>��Á<>���5��
����{�a�2��A��[�t ������g�9�x!l�!ʠ��JN��b�l�m��%��V�����
+7�l��g�"���:3�C��^��E:�S����/`8�ծ���R�&E�������GZɫf�}��V/~���ҏ�b�,�a������^t�k�&K���=�u?����m��c�D��Iqve5�k�����ƈ��f�ʌփ�g�ɶܳ��0�r���_+����N���0��1K�jS�;8ff){^�wT��]���:��3�y��z��q|�"�7K�Q��kp~���/�^-!DdL��K氂����
+�pt���OA��rO��
b �'a� j!ϛJ�<���B>�3���T���y����t�T��3j�Z��Y��3�<�<��$��"[��dh�6��b;1С���g���-���"ô$�ϧ�8��bM~O��Dg���8��Y��<Z�Ac���BO��
�f�c�k� �2�` �k�����H���~L�>fL�0����=%疙����ùޘ�5��������)�ƶd�0T�1�˭�ە�ݯ�-~I�׺Az��Ӷ�x�^����S�Y��JX���|�2����^x_��[�7X�U�|(W[���Tm�_Sb�Hq$d-)E�+�jo��_���_�-�7���6?�X��y�1������������G��_u�U��G�������z9����X���v�<����l�<��_�|��P,О�܁F��2���@
�y�h�ٵrÒ>��pJ�<���Dm���t�-sbLԇ���y���z&�%�S���f���1���E4T�%1��zf�P�Lx�DřQ~�+��S��>��^b�Tmo�/v�3�^_�M���V������/̬�ڷ��%遲�U�u֬��������8�CF9y~�����)�jr��y
+��Q�aٝh�R��+C�AϕB�0i\@P�"�A���hex��`a�b?8(�cE@�j�����		�;�&#q��8}��m=R-}-���v��e�����&o��]�b���Qq
+üd=���ML�{&��������y8٥'
+h�ǿt���g�p�?��m�c �`�ۚp�<�.���i�
+h7��a��X���qזq�
+=��b�;�D���ذ��!�k�z6�9�wD�=�t9p�6�^�%ˆu���y��M��ϴ�SfjT
+�$�|�62�!������\@��%j��ɽ�7���*��R�J��|�W�uQ0H_�9?U�$)ת�l��ʱ'��=��V|��N��3�jާ�s�M�K�(~��j�N6h3����8�Y��]Ez��_f������w�b�P`(�b���SӰY����8�DS�urD���Q����2����v�
+�)���t�*|�(4�LCҡ}����:��"�G;���B������+b�
U4�X��Z��Ӽ��+����b��J��5�Ѷ�T��ĺ^PIS���ց���M��Ұ�km�%�Hba��S�1��K��	��&W�[�Z�:e�56l=�U]~���58���;Ŗ��T�G��
���������oXOU,� �W�Kͨϛ�
�Y��BM�T�/(��su�p���uW�N
�+=�����5��ui~a�6[b� y=��܋ުM#*Ηlі�z�-�����ܛ�[*��k5�_���Ar-莡�k��&�0l)/No���~-�/��5�׏W���+]��^zm��Z�@+z/C�e��ӫ
���"G�ıTms���$�<B��|?��s�#�`����p�9��`0�ꪫ����o߾�_�½����׼����ߪ��+�s�G������>��6�{�߃)C������
+k]:�C��p`��jLsT\���V�����3�
+tK���l�j-�]3��v�r��]ZP�
>��n�n�+�,Y���3�euy����jsf*�/����[jxҹ�a�����n�&F�x�=ڌft�ve��8s���V�#%�������﫾�oZ�-�z �ͤ��牐����j�}�Myj�ũB��EE1ُ��Q�[.@+(ա����㸩ѐ���TԜ�8�jt��n�%�(q��>�7O�ȁ�lGXz�8��_��ߚ绺�-qȘ�%� ����nvyŹ�c�@F�y��Aa@
+Lr�Ʈ[�����*�qI�X;��:�^�����>���1%����X
+spg����F@i�_��U<�E��e��S�W�Z)�K,�0�CATq�
ӥC�|gl"���k�U00]CT�fQE)�8� PV�!�.U��@��*.�'�,3�8@P����gX���zI>�)(9ߋ�Z�e%�H��X���e/,{_0T���;����CK�k�Or���G5Um�4�U	�>I_��w������A��8Ŗ�p"$�C�+���?���u_'z�h����u��M�uw)�d������ו��f�iJoPfس~���P,Ǻf�,3�@]���C���{��M6�K9��
+h{0��"��;8m�S�S���	�:��V,h��Tj"F#8��5��������HAn@��w�qˊ�
+�H)��8��ԠjO�JOK�lF���Tb=��
+��i��d�^Q~������H$�Ԕ9�Ը�Kzi��	E��b��������X�OM�R��(1�Qլ=Oƛ���uRK�Y[/lr�f�*�QOy#��%�5٩�L#]B�fI�LJ�06
+��]F@��e�d�ׯ��x�{C_�[S~G/y%ô�����M�e[�/������ܑ��
 +�ʊ�������f/z�#*�ZCA��[��1W;$?�Kvܱ��Dos�N���q/}I#��B����nu�y��m�|���~`��idu��|9z�d͒���՞u��Y8?b�^���sc7}��v��Vݯ%Ź�x4�/�����q~��矀G~��o��;��Ϋ_��g�O=���͛�U�]w]t�Eܸq��9�7��G�j�!K�[P��HD�]C�@
���`�h����Xb�Bm&W�UK��R��V�(4�>Zckd3���Ǒ�*����?)6kB�%�H���Q5�ʿ)*�h��5���f=^�FOM|Y�V��%�
+֩y�m��)S
�����c��������ɵ�|8*��]r���u��Ss�{,"'�/`�E,�G�X��^���V���<���Ş{sQl���|�&iu�*t�������A��l,�-,�'��x�q�������>�\}L���v=1&��Ѡ����1�j���[�ʊӓ�<G>d�Ǥ|�3x���ub:����zĐ{49�̸ϛ-5��!lZTQ�UR�5���9�Kt����	|e��<ߘ�W�ဂ�q�EC���K��CY�@
1o����o�W��aum	~
+˫؅Чր��m�vi_Oo�>F9�e�S;�j��
�w
+�4��Q3f�$��AِGc=n�~�k�L]�[Emʽ;�k=Z�O�f�YLm����Y��e�CƔ[����[��<�Z�-����Ůu���i~v��
��)�1�/Z���pnv�=���Ir�2Y��w����p��d7�n���Ize�_87��f���;����x�P	1��o
+�[��
+�lٳnϊ]Q~Nh�<ʟWv�^�M���D�9����u�����d5u����O&��y��]�lFp4�M�����s,�mM�7��e�Ѥ�'���E,�a�#І��	t	7h����~yN�#�M�����������Z�ozu"��Xj���&�R��f���{|0���>Vb��\fD<1�<&Ž�'샩m����
�iS�ò���bMR`@-U����c�krb�d�"�YSQ)�aAb�,�X��'zL����l���I�`�'9�KE-`@u�a�,R[��w�ih*ez�����6_���f��8[H�s���k�����ݛ��B�k�Wr�h��Qr5B!Ł�8+/�'���o�<0���O_V�>�̤`�ʌ�{�ݜ��Z�[<n��:��%?�0��S�O_fȗ|�^z�R熒�������6��LV_%�
+q$�.���q������E��\�\8r�o���nO�#�q�~�?;;��xݺu�e�/��(
+���n�������͖�Pxh�X������RL�!ln�#!l�h�@��:�h>ĩ6�5�Ց�Z�b�LG M�����N��<��D��㚰m���XĆ�&D�Q��Vze�XS���+���H�5u�c�������[����܌T�o!�n�*��7��
+~�X����e��G���������3J�馯^����%��r����ʅq�����1%Ǻs���4�����=�:?r��Ѱ8sQ^���zm���Cs��Z�q�����C�s��`��N�A�}uk��Aw,���aH�j�^�,)��O��q~��|c�_����D�k�c������
���۷"&��5��f:�urpc(fy��Se�eF$FPFŢyPA:��	,2��|@��0�߅'
L	N>>��X�˴�'pBC��qve.��a�)�Oa�
G����a}sD�
+	a�����dL��X-�Y�`D��2��tt��E[�	�N��פ@�'9��h`%�����u?���5���g���~i���TO9�a�[��7����-�W_�4�`��
+~�P����/��ɵI�k]�2[�� z9`�;=燾���۞}�[t�}ڌX�Q���?��o����cLŵo�7�a�}�|h�z���Rt�>e��A��N��Z3���n����e�2�c�����BJhF"�8�&
+����o-�]c�"���*pz���.<�j��(M�����Ѿ
�!�`.�Yh��
H��S��)i����".
K��ϪAF�G�V�H�T�$�s�f���ѐq_>n�k�cR��$��d�Ul�MY 
+�
�¨�|
��W���6kk�X2�Y�'���JANߤc�3�DO�*������׸�����ݟDR���v�AG�!�K�2$W>�-.��u���u�sܵ`XL՟�٢O-v����1�ڋz��p�{-��c�n�}�*���;\�6~�=�GÕ?��)F7��W<J �ْ�&���u�k��l�O�ԯ�T�|1��
+�8Ԋ�������x�����c��ٜ�LJ�/���{@S�w���/D�<����;s}�6�Qq�s�a���m�0O����E���C
�ڵk��[����M-v�4
1�.[����!0��
q��e
y����(���*�fo�mt��5�E�g٬j�9�5�Y1)��f���cF�/0C�-� ����܄>o��(�l=T9��Ɋ<�-���b��!�v�_�D�f�m�֯���Y�P�^}�o����җւ�q�`	~"ή��}Jm���|�%����3ϻ�sn�g,���^eL��f>G5�.���Ӛ��K K�40ZC}�Q�� �N��o3Γ��U���(|����zĤT9�gA���R��b�m=��b?}e�N�����^7}��.��dϗ��1�0G�L�d��2�Ɲ'2��A��@��`�@��U���]\57��?)�6E�˰MB��;3XDT5D-z(��-p(��z�~��L
+�1v�
ӥG���Q���	,"'���lì~"��=��v����R� o`��P�<��:k��g"��!K ���H+� 7�Œ�|��ެ�Ȑ��^��V~�âL��L_h�6*�A�5���������F�]d��K��@�Mq~q����ߖeg��?s壽�)�A�	�-K�!�l���L�(�fG>��R�_8Z{y���nv�͏������,?��k��幞\����
�$S�{1��HW+r&�
�jZ?]f�m�)���66|6d�u�|��y�f/��X4��Z
���.Ý	L��VBy��ah[Pk�3S�rCЂ'4M�CS����"�0���`���r'3NF*�A�DO�7�q,t5�O\�?�[1�YUyx����
u����Ynj���P��8
+�/r�����^.��@�"�H�e3ea��%���b!������M�/7�z�K.Ê���|�@���<d!�:���X�RB$Ax�Y�����)�x7�—�Vf*Q'���!��B���m�>��IV��Y'�^X�\'W��7+��{�������%�j�T��ى����I>�̘6#%����W�q"'/N�f8������s�8j[�6�ڮ�CT�$o��_T¿O�v��|f˧�^��
+����j�L�K8�,G�
�
+�ޓ�>���5�п��@�9����FcL�۽�����ַ�w�yo{��~ϑ��lv�J��4����zt؆!��j+L`^C��BA�D?d�ݯH�ئ�9RP:�Ǐ�[���i5]f�}��ֲ[*d�2�]�90�
�����k�W����P�3���$j2#�L�c��Gcurj5���{s��+3T�|"~��w���zO>�����?N�3u���%�@Ύ"���o��g髲�l���m=�XW�g��!�Qzc�����dg-��Z�wE�w���Y]v.��sh�{+������$(2H�-Zk�N�4 B��3,���hX��m�"��"l��@Q��W�m���y��I������Y�3�[|�g�����5-N��x��~�7Djcd��p���'���R�h6��a<�Kx~L3%�2O?��rh���Y�c8�!F`2^
+s�I|i
���Z�_���7�5��RX*�ɳ��
+n/ "05�nTT<��&��a���F���F�EN޾|��'�Su> ;jD"!W�.�C�*S���/��r��5�*S�R�������H /�ü��Z?d�iqa������{��f̱�̋3����.E�
�;
U��8[f�9��*C��2L�9�t�|����J�(.� IDAT��A���U'zwɻ
L���u��i5��`�iq�o�ˀ	��WfҕOfj����X0�X{��Ʋ����ȕܔm�_����k,���K��\����aO����Fp�gh�ᅣlg�K(+������4����^٥��	R8C��ZŁ���F�cnI,	�9�eAj�ޟ�z�CVMM�O�[���sG_mL1$��&�E&���Y��ڬ/�e�@�����d���a���=qH�#Yg>;Y")�q�g���xY�	��(���T�њ��H���L�0~F����ɰ���hIdI��a,�2��j�Ś�����1)2y���8@`�����{�[	?�g�J6�ٲ���j_���/1�ˊ�l�7S�H~,�/u�{��D�U�yV�2�B`y��;_+��I��a����-��w	֜yI�����4������g���$[|�c�~�a������RG2�:�@'}�Oէ�G֡�;��s��o������>��Gy�e/{�g?�Y�q~_��[���͒�_�um:X�Mt
q���R�8Xi�~N
+�ø�EOM򳺦bm�<D`<�hN����$�F�.s@F*�������� �0���܌�ٺY V$�[��e��xey8R���Fř���R����s�>�S�|(U[8�8k�m~��bG��� �����8U�Qm�-F�%�|���XHrC-���8_��,?�wo��+���xC��|�ۮ��30Ɨ2J�͌7m{��m�,�O@?x(K���J��`�E џ9��Y~b�\�GV�]��8'/s�ݶ�P��\�yf��L�T�o�8���|��]�06���4�:�H%��ZY\)N�����f��.�@��� �:�ף�B8�{��l�㤪�9�O/�Y�JW��T#(L�$1�`���F$1>ƨ1�c��.��(�J�����tX�.�;;;��v������K!ɣ�x߯�c��{w>s�~�;�Ν0(��.�v�14.+6��}я���FC;Ī0Z�F��j
+
��_�}��	�m|M?�KH��[��d�y��J
"Dl
����|']3@���5��/��Ye���r�	-��Uʖ"�c�֐��*�7ݱn�8���Wɾ����}KW��|ǥ}�K?	�K%�\r�b(+A]]�k��
+�Q^��k�e��+r���Ԕ|?b<�kK��?������x����i�
߃�l��#i-��o�'��e��ϫ�?k���#:�Ҿ���
+7����d���vY/���Yڬ�Jn)�lP-Cڲ�<�N�(Ҫ$+q��F��MȊ�2�c��%L�LXi��^���K�ǀ�e�G@7�
"`���]ǽ��6�R�:/�$��a4��w�-@8P�D���K�Tǒ��B�����v��*��^�Xу�+[%�K;�RԍIR�Zy��;��%�:?��SV��ʌ=�����=Y�!�L���t�FU�pALA*��Y�GXnN��\�cR>CCU�~�Wt�� }G��bڋYi��,�D��7��3l�D��̬W�!�՜=9M��Ս�h
�qe��"���UW�a�Ɵ��M���~i�������'V�<�qG�:��X���A�<�vN�[0��t�L����*m��G<�SE�ǩ�����>eE��G�z���di��c�������������͉�C�PYq�G{Q}a4��Bq�����?��B��r����ޢ3�'��(
����<��Y�f�4iW4p���f�SG�~dO��/���A���X��~�t��tStDp��HFH�V5��~�iU8�
�
e�(�]Tr�e�6PM
i@��P�H���"$�A6� E[(�(%�2�x��,#��1ne�2PT*��y�#(oG��Q�~���h�1r��h�Ԙ�}�6�=ѯ�)8�0���l��i�l�d�4���
�=��XvN#8Mp������1/F����Tv�a
�R��y���78�(;�@�K�YQ��*��d�okK�I���\>ťtm-`��Q��FIj)���&džry<��nnV�)��+�&U[nǰ�qGB�1��BuܓUe#�!�%K�r���E��u�_�ԥ���nޞn�'�_y����`��4j����2H��e�F��2�d��g
�E��M'�oCk��a�^x�`S(e����@�eaC%��>�P���oAk
�"00��;�;ɷ�2�
+<�Vipb �$P$$���N�`K(&'!
s��L'lvY�s��� �.��fJ7�kpx4I#��"Tp&������$���A����=�ڳ�����0�����lh���dY����nV�wmg2A<��}@}�`U�*��_(�H��:�#���
)�{r�[e���¡C���>�MCyǥ�C��G9��"&��ke�eʺ�ݱ���e}2U�Ѣ�H��D*����G"2�"H�+Nj\v��SܩC?����%	�`i�.dH!���0���-�%h�"Q4����-�V�Y<O�V���A+%#�l
1E��HB��`@-F�xʭ��u$�1�
+���D�ʞ���>e���~�S��
�-��4s���
+�2A�	#�l*�^
+�qn �	 	���kHG�0�-c�B���������O�~R��[B�z��,(�C(>�/�T(��^�B�a�d��_Vp�e=�ƣ�;���a���K+�C_�ؼگ�GpJ��
+�a�Gȩ��S����	�V�n��52ٖ+�.�Gb���?�}���I��+��}Ε��Օ�����p�v%]�`�0�k9��BMY��ek@y����X&��k����gɸ�d����1��k
u�"m˕�0֓��a�)�T�'X����W�?�~d��y�����;Ｓ[�n���y����;���)�
+��$k1E�
yU*ȇA�@w�����	~�
�P���ئ�$$��"��P��e�MQDI��Yk�dBU��7�7��R�\Fqp{j; ��lV��Z�1B �L*������XfUL�!e�BZz��E��8i����ʛ��w-:��d�4����q��V[=[&�ue��zc�A��[]�ʪm��t�zE�Ԗ|��j���0����wt�5J(뉐�h����>!@��9N@�B3��r?I�R�"UF�h�%������;#@��Q�=ٲ&�%:w;!�m�79n�IJ{��d��*�q����.�H=]�EY�B���$<�?�w˸#i~+�4�4:�W��3�Z_B�\�jȟ��'H���]
4+v���q{^l&`���B!��0n�%�G������	�����P�!n�Aӂ0D�DI�H�0�����wD�
+���T�E�&���)4υ%(F�p
����)
H�A�AҖv{p�V�ZK��v���!*Y$�+�0i��S�M����g:�;�}��mz�I���2�Uv&sa��\�;S��e}�
�4i�*��§+o��i��(�l�>TrOa��5���ܟ�
�]!�;�e=0���Ѐ���8?o^d��Ё��-w�E���zU^_��(٧��q�K��o��L�`q��;`�$ ��8�nGA4q�]��?�}�х��EFF���"W��6X���$�+#���M��6xŁt+,����b3'�N�}��=��j���)�4����4��;�"���[?�@���j��!�w�H�2�)�9�e�>���+r!r<���ƀ�Hҏ�ZW��"�BX� �nq�[�[��2��vV������,�&��������F��-T�J��v{d��j�a&p�Ӱ�A�E �j٪U�V�
+�+1B�in1���AY{B��zQ�'俍��T�NCYП��[:sM�|%�
�
+��{	9���uu)��m�?�s�m�,�եy�[��HYwC6�?�-vZ$�KC~;W���.W��	I���r�Ӟ�E m^����ൎ;8_�qDRS��BMe�r���N�g�b�J����'1.d��҅_�M/W����_,w0ԟ0�U��˃��*i<�'m���r���f?���3gν��;o޼�^{���~�1>��s�[��P�2�E��P�@#��&�2F2&�͉�Aԛ
+��#����C�9n�"�UbK�S�FEz���K� [ʑ�
+M�P�'�$jr��J;
vx@�`�Ī
+�k��I`D9�i��'%�����=��36��$.��i
�UM�&�����]�U�+_Yt�D|��1��>m��*�?��1����%{�,(��)�&
���I�_(�
��qOִ���
�
��(��Y
�_��0�B(Ҳ�u���˜B�����:
	�"�+!
+�UG��@¨@Y���=����)@Y]���B��ʖfS^gғT��H�kd�U�"���JB��+�ʖm�1�2���w��O^4�B��(�6t����
�:ԗ`WOtivfac-�z�]����2@����1_MN����@E
+b[��	�8*LH�Љ
+2"H��G5E��A��P��L�Q�:�e�Ra�8
+˩J�̄��Oa�����
��*r8h:.c�����,*dҊ���N���-h<�#f�����윖��֤.�^�JWVv��V�b�e��t��1߽���+^�xMe�{
+>X�q2�+�4qS��1��ѕ��<,0פ��꫺�
+��OI���Y���u^���B���E�̘�P�uv��8��E�H{��Mr���, uSѫ�j5�i��J(P�AT��5�$
+�-C0D�x�j�E:Թ���89�
+�]Q*�?�S�A#��я{٢ ��-����*���{�Y�G
ԣ,2�6����q�</�(l
+GE��0 ���аf`��)��[<����I��02��b��%\�z;+1���g���D{ꤠ�I�R�b��îFRV�bs]�.
�
0CF��<�H)	1	4��q�b��,��2>IG��6��� ]Jč�J�i�_��dΫ������K3}�Ӻ��KT�����"m�����1����,��Ϫ����`4(�E���K�
�3�}J��Bv��n��#g}�k�;\U�jd��g��dψ��([����4�!�.;A��q����n�'2i�H����M��9W�����=��t޺0俷d���y�h�#u�8���R�ۏ<*��{�e�]v�E
>���裏V�Xq�;FCDC���u,
+v�bP:�^��S�0H(����,#_��D�e
BAFr^t��Qe�|=�.�2Gp
���U\����n<D��9����-$��N�`q%,7�<@
.H�Y�;Av���>RpyL%M�
P�W�/(;���HU�^黃����f�yc2w_@~�#����඲}��޵�8�? d����(C[�#��w�Ú��X�
Tվ�y%�)U])@e�"_�8��X��+�����<�
�F���T
R�cyc29[�>��]��O�{���1 ��l�Tg�_Q��=���A��W*d����_��
2����##3i������N�*}I��@l*������'��ݲ�
ueQ����f��(N@͈�E�Y�N3�����!����v�܁!����~�8�_���������
+3���8D��#Ï�$u�w�\!Baܭ������#�<�Vq��K��v��t�J��\.|N�����+���	�2�ΤVZ`"Pv����B�P�M���(�����匥���2�4���E��!�eY��y���ۅL�h:90e�
+�DSb���>�ٰ�H{q>e�BH��%m�ɔ�Y����ɪ���zU^���9kͲ'�tB�!}�qN��1��LJ0�
+��+�a<��o�+��Q�;-IC�(	T�1{�c�( �[�*:��2GdO"7��
<���F`Ł��b	X�G��ެ�*�	����Y�AF�,�O�T���/#h�(i^���F@Z؆٭
+������R�:z�A:j$�(
+�Y�aB@%&YP!\�UdvP�N��F�}~��ȭ�x�#q&H�UL�`k�82\�!yW��n���#�rL�34Z�4}�l��뫔�%n$
+T�l���n�0tҞt�S4X�""o�qQ��"��2Y-jwc����]*G���	i1�5����������U�g�i�L�\,�!$ʻ��XT2��J�R���3���A�Ԟ~�e���0*��8��ʊbi�"mɖ�+��2�w����OU�
�kړ[
+?7�	N��:��G�ڛ~���X�~.�s*`�w�aڋs:���1���>	�Bp����.��@��R��Ð��Q����o?�ض={��s�0���…c�؄	��e�rE�	�S!u~-��TR�T�yVB��"
+cPz*r�p��X-�e�*`tWl>.p�gE�@~)��IeE�h�^��<��e�����E��.r��KX#��JiU�F�k7r6��jl��,��yTF��
+n�^�xO
rP~?o�A���k��Ġ���4ߧ�
+����e'��Ϣn?�a�
��A���"�0��W���u�UI:�ț
H���)�Y.��˗ɤ�v�	���񪥎
�>��|a&�%J���f��f��kڊP�C�޷�����.[�V�T����U�]��|�J]Y�qRQ6�F�R6���S�w:PB%�G��8Q��d����Ew�B�%V�Z���XD��i�%nv��\hYn)(��	�m�Bc�F��j4]s Cc��)��!G�"hx
(�&
+&$�`q�T ��n2
+PO�D� Rq�;FB)JJ�ՑA�"�(���ࠁy��R<��?śt���*�1�R�
+��~�) oux%���8�0b0�����Q����Q������y�"����C�kLD��XCޠ����{��K\�-��0`���w`��5��}�’y
�
�tM��y%��q�h�:E�U�{�h-��/����yT�7���k(�)��ty�&䓶��w�����\�!DL��+!	T� "o�X�-�h2P��@>� !�@U~ԣ v�%�RPU_��me��G}�hx	��p�AQ?���͍�a�!�&�0��W�SL�D./����v��Q�?!ލ��4\An᫅��;��r������M!���6�i-�42�*�<�f���'@�E߫�=}RV'P��H����
+IJBD
+�J�6�0�1�Ϻ�^�3.�	��
DG�D#%�����NP@�UŮN:�4S>*Қ���.x���J(]�.��ɛߏQ�����팱�S1d"�9ű�+�Π��5M"j�ji�U�vj��M}�r4�G���_�@����i�%�H��b�k���2�C����v��Eا=�W�#�]�?t�Ѧ{�`A$Œ�,��	�X���ʛ����ל�[!}�rLU�"�F��l�Xe�� E{�D�n-9����Oe���G��Z��Ex��Gq�o*����84�������H���u@EJ�P?
+Qa����ey{
�Dp�+��0Mh��$](E����7{IâD������g�|C�[a�G7g�/D4��,�M
+�����V��A�+�"R�OJ��'��*�i�F��/�wE���l����`��yZ��X���G��N����Բ����uz��W�i)}�t�i����X��+���7L:�#�WBZ"�_kʪ�u���b/��-�gG7��K�;�vO.Z��ozҥb�����ʋc����7/{���/\�-�+�f�s��Ò��s(�7��3
+�n�$,�l�T"%��{e�O¶�����e��A�_��.[_+�g�o]�2c}�GdFm�RC}U���q���
wD�6��!ͮ $��C~l��Y���e�JQ$!�#Q�F
+�=�F��U)�N=\ \��`cQ���Xp��rb��v�����Ġ�FWT�S0
*�"��`J;���R	�N�#aBc���R���Kq�|��s
�j���܈�^�a��%�„�
+?���+$%������yQGi�L����6=#��LP$�.wy��n/Ϋ	��䌷�@�J�1X Pe��5IDAT@�d(����npi��
�O��
�p�)�=1o~
Ũ��ߖ�ΗIc�5�vG"p%r `<�Wޢ���k/�D��
+�\�=�*�98$o.�Z��+�;�`�*p�(�	���~[�:�FU௶�e)XŠ�C}Q�̋M>h�E�P(`���x������&3+�7�E*�����Ay�F�� �@r;{�Mb�r�-���[�\6[EF+���2Ct�RH�5�X�'ˤ&�c�#exs�T�`���1eA�n�ٮ���V�=�آ�����0$8���*
�p\B,�FS�bP`�_�FGa
Ӑ�Z��M.m��dX�Z"� m�����vZ��u����.��<�����ף�[�P-{2eum�[N��!T�s��)]��m���������oh�f�u��>��P�a�tuS�5��ɘ���?��K������ueE0��'�
!�<����~B�.�Gi�di6�Y�\!�՚��u�U�=)ᶖ����f�*)�*k,g|�|����>e��Si��a�A�,�=%��O{�I��_��9�r��CsƏ?{���-���9����hR_��Ɗ�b��d2yhN2����<˜z[�����&z܋/ƱVUU�z�$���رc����V��x<����{v{���=���������֍7B�����x<��t�̙�Db�ܹ�Tj„	�/�����x��H����x�
�
����x<^��x<�������x=���x<�Gz<����H����x�����~��3
+0j�(��_[[{饗vtt��l�$�\�Z�pa���m۶iӦ���p8|�gpλN�l6;k֬����7r��W^y����ŋ�L��DB���GS�g����
+r���
+�q�x]�@�7�x�裏����㏯[�nʔ)C���~�F�q�]w����<�LϞ=�8�#g;&��z�I�&���`�������Xl�̙˖-[�z���G�X���/��o߾o���;~������o߾co����r��w�
MMM��
+>眇��
+�pٺHu.^/�����#G�q�UWu^onnF����0��O?�1.��G���gnnn���oll���@W�7k֬�S����9ݠA�~��_v^w]c�x��co�ڵ�nB�V��4��u���ٺNu|:^/���qx�ն�7�v�i��uuu���[�f�1��8N �4�p�>��B�K.�d����z���C�9�[�x�aþ�TVVN�8�w��:���3�|饗����G	�ãG��:������VMW+��\]�@��#�����?S�B�[n����B����g���8�?�я�f�>�x�e%�{�gƌ˖-;餓&O�����3tw�qG�=���UU�7o�K/�TQQ�u��g�1��.X ]�:�r���!��_Οw�y���7�|s�I�gϞ[o�u͚5��6b�gL�6m���p�I'���ˏ?��%�\�EΛ7o�ƍK�,���~�'�=��u��y��qS ]�:���Gvu��2���9�X���/*�r�l�s�k�&�޽{K�$I�m�^x�g���������(�


�')t��s�w���o�۩S�:��;���>�h��/��K��ҕ�����#���2;�s�y���_~�0�#g��3�u�Y�7o�����v�m���7f̘]�vu^B�޽�{��]$������_� �8�]$޿������H��.^ ǡ���O<�����L�2x����\g�����kjjV�X��l�>B�c���g��xK�,�$����ߺu��^k�������M�:uРA+V�ضmۼy�!�֭;��2�̆
�|�IX�lن

+����3��O�u�9��u��8\�.^ �g?�n�����ZUU�L��w�����M���ˑ]�v9۱���g�.���ݻ�a�G�^�zu�ʖH$fΜY]]mưaÞ{�co�����V�X���,r��x]�@�0t]�:��+�q���e����x�4�Gz<����H����x���x<��#=����z����x<^��x<�������x=���x<�Gz<����H����x<^��x<�������x=���x<�Gz<_`~���7��I�&�y睟�M��}�����*g�}�c�=�=j�Gz<�'J�СC����CsV�Z���
�m��S�<�?[wܸq��sϿ�����k��F���_e޼y7�tc�ې<^��x�C�$=��C����o�
�e͚5��k�6l��p����L�:�s����%K�|������;v,,_��ې<^��x�O#F���k.��R˲~�_`�o�����t�p�
�����
8p���P*�f͚�D|>�9����ҹ���9�n�6mZ �뮻r���矯�z�>}-Zt�>~�u�ȑ7�t�9�
+�N8�%K�t��G��������X�]t��o�=g��Puuug�믿������O�8qӦM��k�>���������[��o~��o~�0�A��[�nӦM�F����3f����V�6m��O?�mE�/#��|9��円�s�=WQ���~�p�͝;������۳gϲe˖,Y"��5kV߾}�z���׏;v���n��#���ҥKc�B��/8p������5J��+V!&N�x�wZ%����[��z(��E!�<�t����ƕ+W2��o�\~�ر����Ş?��Q�V�\�{��o����*��}⮝��W^y��#F���?��O�7o>������?a„%K����{}�����-��������ۄ<_B^��|�<��s���p
+EQ������f��$u6K!Ğ={B|����w��K.��s~&��$�7��\�r%��y�UWu^����w�}��-Z4dȐO��R��i�G}thɡC�.\����1�׿���'/�����7o�g�y�s���o�0a¡%�-[&˲��x���c��/�G}�0�5k�:��駟��aǎ�v�rgҤI_k��ݔ�SO=�s�w��UUU;v�8����
||�1c�tN�=!�O���۷�
+B(�����ڵkO?��h4��1cFSSӧWܵk�eY�F��q�ƽ{�~b�R������t�I�W:�~|2�LZ�0�u��ƪ����|������믿���&��s�Yg���?�������i�v�:B�Щ��$a�����Iι�8ӦM3f�֭[)�����뺟^�X,@*�����y��}b�h4���>>G��C	?1�9?�X.���|��x[����q(�J͞=�׿���'���?�馛nڽ{7����(JCC��(�^���$I��^�dccc"��߿���z�c�u����m۶��(�����󫫫	!?GQ�C�g����G}����gϞ�`�v��=p�@o+�x=��9>]s�5}�����+
`ƌӧO��˄�X���_s�5W^y�E���ݻ|��K��B����W_}��ի7l�0s��q��
>�p�?�?���w����盦iY���_�c��VWWgFg�ۺu����C�ٳ��ի[ZZ��t$��+�̙�`�������{��k�=ԕ�4iҚ5k���[�f�ĉ�����H��8�dɒg�y��<t���æM�|��O/|뭷Μ9�+�0`��9s:�������ǟ}���ƍ���.�\�p�?����������C��6m�aG�<<����]w]�n�f͚��ç�^{�z��չ�w��w_}������߿�7�����C��8dƌ���[�l��F϶�W^y�����!y��Ч_J{<����~�3���w�}��<��?��믿�ۏ�x<dz��緵��[�׺y���n��:ϗ���q����IEND�B`�
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-handover-target-scenario.dia ns-3.19/src/lte/doc/source/figures/lte-handover-target-scenario.dia
--- ns-3.18.1/src/lte/doc/source/figures/lte-handover-target-scenario.dia	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-handover-target-scenario.dia	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,9 @@
+��]�s�8�_Ay�C�	h�����]������>�d[����8�����'
q6��	9�8Ƣ�V��[��_�/#�Q�4L�
t���4����n����~���e���\�ΈS��n�Ȳ�Ϸ�OOOn���,�n��T��ͣ�ߪF����yK`�3���Gy��p�΄�L���\&�x6(Z���I�H�Gw�O�kp[�����C{��b"��L�cmH����]��4TM���V�:��6e�T5����~#��K*���u��L�%��0���&*�
BH
e
>��˘��nrYv�e��˲��*���a��r�$��q�5�kўO:��}��Ћ�0˒�������7��ԙ;��l�ĭ�h��β�����*�?����$��>����>���ɵ�������hf����n��p&�bVm�@iQ6�=4��v�Lq�f�s�$���L;�
.5�çY����͘$���4+;�ߌ�3.g�g��a��ڀA����?�:Z��)jJn
�*��BZ����h�=��IKu�<�G� O\����+�G���b����<M�x,�Yލ�;��=�Ö����U��z
+QeJĸ:�v̮`�1H:pH��H�9գ�.�8X�i��~
�i������uĥ�Z$����®��"��\߇P	,t1�J���S_}&.>k�y)2>8��g�4kG]Db��H��@�<�3ȭ���m,�)b�
�1F0�H^�Y33�a6�p!���N����]�h��!��#XT��X���i���<�ϭ���b�	�N�(\�������v���Of�4aN�1I�휈A�A:F�(����T�s�O0��<������
P��a�@(���)�ߔ�~�p� gJnw0>�c�L����KԿ��O�L����x�	p��M7	N���+��
D&�g�$�֦�����J�Z �!�'v�4.
+�b��;|F�j�$q���TY�\�*�8���Pȷ���ؒ�S%�
Ӫjk2a.c���M9J��0�Q8��b���ib��vŋNDjJ�'2m4���8�79�a���\k�}4PcA0dn��
iG *'V5j�U��˟v���pK����0�zxh��k�(Ƴ0U#;��|�.�A�#@
�����P���9�x��ׂ��O͑t�V�|�,Ԥ*�|��P�y���o8����`;$]�����h��O��p�C�0��0�a8��a8�3
+����Yx���B	�ވ`PF
+x���޽]z����2��6�!ߢ��������wo��:d�����˫C��NyoJ:��
�j"�6pyɰ�OJU���-�<N��J�ѣ���|`I��JSx�ư�g��RE�!�.Rz�/�YM�9�Ԡ|���+�M:��
�!Z�Xç�(U��T܈ߓ��r�.��,y�0����@^�VB?�Vb�]!d6�E�(�VI�*��N�^���JȇD.���5�V+��J5��X��Z	v��M���6���\)y.�C���q9Y���*2��*Bh5Q5Q�-���6���v�p��q
<���&���j�Ki$��^#u�C�͆��&�ݻ@6��l�A#��jHb����g���P����lu6��2�^"��ڹ��m�mKW�����C�q���c
��{.�y�8�D�x�wVx?`
+�gP�Ԭ���Q�:z���:���es�l����`�C0����s��7w�w�*�b��<����9Ǩ���c��;k﬽끽�}2k�����Q�fc4��=<_�<���y���6��<k�����Qk�zSh�) �=-�pI4L���K�Vrњ��PM4b����b���Зr~���ˮ���n‹���}���E|z�E|r`��u����{r
/��">��">9��o����:��fex�!��!6�c�<6�ӟl书�
���/c���|8�������6���6�ڊ��
+�We�7�{���^�ױ{���k�ɳ�7O̰�׮���3�+Q��J/�I�*����N���ڻ�5mv�5l\C�Ӓ���;��(O�
�#X�@�8��L���tn��Me�?�t�q�����S��ôǑ���M-���9o�C�xCC��ln�^Yt��rB��<��],�L��N.
+\yh�CIp�&�}�|<1p����iD���E�ڪ�S�	utOz��v��?T�	v�`@`���t=V�F�eI��؍��%v#�z��Aк����
+^�I��r�Lz�H�A�צ,ʒ�X��X0�X�b�W9�`[0h������+,>G�Y������K����?�F<h�
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-legacy-handover-algorithm.dot ns-3.19/src/lte/doc/source/figures/lte-legacy-handover-algorithm.dot
--- ns-3.18.1/src/lte/doc/source/figures/lte-legacy-handover-algorithm.dot	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-legacy-handover-algorithm.dot	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,23 @@
+digraph LteHandoverAlgorithm {
+
+START [shape = circle]
+GET_MEASUREMENTS [shape = box,
+                  label = "eNodeB receives measurement reports from UE\n(Event A2 and A4)"]
+CHECK_SERVING_RSRQ [shape = diamond,
+                    label = "serving cell RSRQ\n<= ServingCellThreshold?"]
+LOOK_BEST_NEIGHBOUR [shape = box,
+                     label = "Look for neighbour cell with the best RSRQ"]
+CHECK_BEST_NEIGHBOUR [shape = diamond,
+                      label = "(best neighbour RSRQ - serving cell RSRQ)\n>= NeighbourCellOffset?"]
+TRIGGER_HANDOVER [shape = box,
+                  label = "Trigger handover procedure for this UE\nto the best neighbour"]
+
+START -> GET_MEASUREMENTS
+GET_MEASUREMENTS -> CHECK_SERVING_RSRQ
+CHECK_SERVING_RSRQ -> LOOK_BEST_NEIGHBOUR [label="true"]
+CHECK_SERVING_RSRQ -> START [label="false"]
+LOOK_BEST_NEIGHBOUR -> CHECK_BEST_NEIGHBOUR
+CHECK_BEST_NEIGHBOUR -> TRIGGER_HANDOVER [label="true"]
+CHECK_BEST_NEIGHBOUR -> START [label="false"]
+
+}
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-legacy-handover-algorithm.pdf ns-3.19/src/lte/doc/source/figures/lte-legacy-handover-algorithm.pdf
--- ns-3.18.1/src/lte/doc/source/figures/lte-legacy-handover-algorithm.pdf	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-legacy-handover-algorithm.pdf	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,244 @@
+%PDF-1.5
+%����
+3 0 obj
+<< /Length 4 0 R
+   /Filter /FlateDecode
+>>
+stream
+x��W[o7}��������h��B�PKE��>�+mB!4��{f��|ɢDJ����3g�ϊ4��>�O�Y}�E��St:[��DY_��3�R�o�O�q<��t��7e�s���^���X}�����=^A���xHd�{�l�W�*�-:2��iIY���c�k0�@i���g�%>^V����l
+E��ou<];�N.��k������X�c�u!�lY�M�2�����]�'g���wg�u��J��C�~���Q�	뷻���n0�����p��*��w d�m޼��w�{�O�;�Cl�C�b;����G�q�r���c�k���K�j�W}��zd���
+#�ɡ1~}d��������O��
�G%1&�g�'Q��kE��K�LB�
�l�ꁌ+1U�w'x훮���hy�mW������|���p�t� e-ׅ~�ݛ�N�|�ƦXF��܇d
+1���H��$=�	U����br���*��Y����\4!U�uc��E_BǙ
+�ѓ�>@r���
��j,E�
Y�7�����
+�~V�.���-��`�s�%��.yW~���+��^Jl��9��^B�B�v?�oI����/��eu�����hH�3�K	EQ
+��;�v�Y�w
�g�)5Bb%���4�ΦD�gJ�L4�Gl%��Kl��G�W����b9
E^l�=�:"4#�FH|6H��
������t(������	�(P$T��i� (�#����w>��bD֢`��@x,�v&b�����it�A���jل��û9i#��F�q	jOI����.o_�+`7���[�F0
�����˅W�@d��3�ɍ$:�AՔ{�&tߠ8�	-��doL׉P�y|͂�������L�܁�936��Hj��X�w
+� �&!��G��	I!�b)l5s�xaJ�+c�;�I�
�dw��ւ�(㦅�Nv\�\���Rd�ٵ*o��R(?/��von��V����t����[�俽k/��(t>C��.m����d�A8;���>y�8�V����2X8\����$~4���
4�"�t0�ͱ徽����.�{�W�� ub2u�+p��Ն�
+l;_�q���Ps�i���{�
+0u�U̋h%F@��-�۝cœ�=�����X�4s3�>�_x��5�F�a�X��u�_5�-x[�G�t�1.��x��=����`����hel���
Wҍ0C�.��E����r�A�\����;�6��������i�:w=�:Ȟ�����c�Osdm������7���"�Ol�'fQX�^��R�y��C�������;s2f�\B�3'��Rt�V�#1�����L��X�xP�̴�mGt���dx��oƅݚ�x���B�G;�-x�(��#�8����R���-�
+endstream
+endobj
+4 0 obj
+   1416
+endobj
+2 0 obj
+<<
+   /ExtGState <<
+      /a0 << /CA 1 /ca 1 >>
+   >>
+   /Font <<
+      /f-0-0 5 0 R
+      /f-0-1 6 0 R
+   >>
+>>
+endobj
+7 0 obj
+<< /Type /Page
+   /Parent 1 0 R
+   /MediaBox [ 0 0 773 688 ]
+   /Contents 3 0 R
+   /Group <<
+      /Type /Group
+      /S /Transparency
+      /I true
+      /CS /DeviceRGB
+   >>
+   /Resources 2 0 R
+>>
+endobj
+8 0 obj
+<< /Length 9 0 R
+   /Filter /FlateDecode
+   /Length1 10644
+>>
+stream
+x��z{\U���s̹��O�ؼa�AD� T�tGj�2�u��P��S��'�Gд�43%�Gj��104+�L��I:Ǔ]+1�F�9?{��o���������y?�s�b��\�9ǘc��w�
��#)&@�<9i��-�'ݟ6~ʼ�����ل�VBe��Ǟ�u�����9����o�~�OH��iS'���N�0��O�s������Ӟ|zA}��h<߃�UO̘2��g���營��`&Q�����<n��3{���B��F)��@T�lU�7�D�A5Q�8I�;�x��o<ߘ���}���NZ�@d�Y�Z��l%�PR�v��M$�<��c13�����h�YllL���ݔ�_qm/��2�ѷ޾�S�����H����q%t�]�klil�;�qá�74ڮ�r�v���>t�X�f����%
+I�t‘ؔ��S`uw����
+��1����	I�Y143�{��Ii�ͺ;13#��s�ѝo�ߵ蛿�/���?6�~��tK�7Ѱ������G��yS��zR/��Uzڟ\��S�cû��w�!	�������G�
�[VF�r�(���|CK�]$�zcF:Ze5�ш����DO{����Nb�%6jc����7�4l7&@�;���+���kgZ������"͇��5����{�{��.8����Fbg���W�N���~!��ZFa�A4U��(1��v�.՜֧�|��]��G�:Z�-��gF}�sBhQC�2��#3�bP��0�P�ac�X�k~�Nc�<�f������d����E(�a�������e�����+,��+[]Y/��8МJ��R��~e��;I9��B9��؁��s9
+'n��2��̲�ąv�
+�
+�����\�(3���4f��5�������z�.��ߔ[д�1
Q9� �
+N�n�.
+a�G|�ǒ YIR��$C\Lwڝ
��41���+���fe����5�9�Ѝ�R}m�B�.�ڃf���-�{��;CV/������孫�ee/���u��i��|r�*Q��_�;�l�V�|�
+]'���x!q�H2ӟ�s3�h+��5*j����G�yMT��in�e��
Q���u�`
�jl�]���5�H���]���hя���X?w�H�EM��]�3�:��pψ4L�E������m��8b�����O�E-���ޚ~j�?�^^��hJ�7T�f;Wn����㏟�����О�H��>�eݦ���O�9��@�cT;e��U�Q�74�P�E��j�F����\�ƌ��%�?�
�/֤�_zw�S��Wgj1SjP�4BH+��c���qe���>���-�v�
W��kc��it��:��:�N�߈�_7��oĶ�~.��D����J��Ԙ�k�
�����PuPͶk�~o?O!)T��"��Pd,2��,E֢�"[���Q�i��Q���4��]�����ٸ_ن��74Q����w��å��O_���S�o��F�#*:��=I�}�W\7�HO�'��X]5B[c���Є���;L�3��@=66\�k��]K?�SS8#T�7�8��8�v�WvTW�:��Li;��`��/��g�/�#l�?��O����{�I�}���3�ip�y#��F�$����zH��P�XJˌ���Mszb�F�
+OT7�c��.z+�f`�u�f�
+I��$�S�����;��
o<�@����˯�Z��q����������e;eӍ�����/KW�Y�
+d��g��u����3�?���QB`�����]�I%v�Z�
��Q�p>�aè������Yݙ�:�;N,H�����.�a0$vp���kjz]����3�[�S� ���U�C��#I	]ɭ%���;�	����P2�5 ��Ґ�aa��5��hf��H[dq�ȊHAo�O
X��9�͓'��}y�;'���iW��������^>w�rj���DڗZ������]��B�'�+�"��I-T�d�fk��AK#�Bdz\Cb�™���n5n<�F���^����"�Grß��Q&�0�`�$D�A�G(AKp���д'��9nh�k��*������qA@�hp+�k7ql\�??�Mg�����b��U2MȀ������I$��@
+�ӲH��x�6�`���|����1d�x�V@
+���8LLS��iZ��)+�
+�
+V�U�D)'�t���f�I�#v+U�	�֦�գM�A��{ާ����#�<�e�Q��h�����vn5��Z��E��FVqW�{U�n#��[�jD�fU5W€N�����[������Nn�A�H�?��2F��������{z{�z�Mq$�&�N�N���4W��sh��N�)q)��%�S�����%`L1*&0��6�@DB�6$���Ky4�(�8e]JEJSJ8�cֿ�8��_I\w�$X=|��U�&o�W��׿����������Ͽo�W��t�4j�p��󋫶�z�ge�{hh�/$�lٶ�1$�_�m5��@����!<�(Ѫ�\Ց�z{��)�v-$7*\��
���Gz�4\��o���w�'�&�L\�X��;���
�
�ף@ j��=.�
'��q�f�ܵ�jf�nWMM���������~����항�+[Kٶ/��jk)Ƌ�&/&
�,�8�e0��'{bMa+y-L����Jb�F�x�$��$�-��k@�q�<�� ��5\oA�8�|���H�O�G�ǤǦǥǧ'�K�G�c���8�?!7:7&767.7>7!7yf��Ҙ��Ҹ��	�+���c:�x�ぼ��ؼ����13cg�͌/�)�-�+��p��C{��N����A�Q��b�/�_:�Ś��~�+��i�A��MyGFM=>�?�XfA��9�k]��`һ;��p���morr�������+'����(0�R��j_c���j3��e�42Э�bv0�5d .V���	7v'�bo�c=P�xq���������z��j��}��JVx�b��&��ns<?0��~ϭT�k�G���@�nf:�@z~s�<�'����P�>�����7�{�U�&�}�n2h*S��q{��!����B��0���J�&�(�l�>n�:���lж�\z�ZLO\���[_�<�N��B�b�c��w���m򽵭��o��g����
��Q9�W��:����"��5��F#�?�HXzF�95t��!�G���t��ЈeL�{P��sY�%mmg���Hv�mO�
Ÿ7�����^;���AHq 
'�b����G	5k�)��l�*�F�T�j�%�4��@� Y�u�	����[�۵<I�G��\w�[OOq��4���t�f�UMy���Ok��S\/�N���%
>];��}8�Cm�E
+r%;��C5f7Qf]c KZ��'�"�:��Fu  rb]u�A=�ч�u�E2:ߴX����9��{��K�[yE^�-s�>��	V�<"/"#�L�99_�s0�n~�R��LW+�5���r��f���n��C���.j{;
U��Tk6���/&�r����{����`���XH���nQ	8�4Zm�V9uጺpC�B�u�#�	�.;�*��r�y�X�ݎ��d���e7)�oe߫We�+?Г_]�u�8^9�3D4�%n�h	�Q�2=eα�b�h�p��n#�ƨ0(Ѻ���5BG=���p@�p�o<q"���^o�-��(�g��c�u_$�E�zTN��G�H�4��̍��t�2R�Y�,rY��'Ҏ8�C�eu'=��ۃ�9�B�*�n˰9���I�.y���Ώ���<�����;��������s�;{W�w�=�sf��!���({e��`!K���`�!`R+�^#�f#�R4n�ބ2[�uq�Án���u���4�|Z���t&��8�8�O�%j(ME>�
+��p���A�Z@��E��Z�%�ԩ��g�"�Y���t�D�k��Z2��
+��~�N*�Nf�$���v�Rbrp�Fp�}�߲gf���b���#�nV��PV^�b�r��(�\�J���
+���U�^0O��4>��u�\��1G%�К�I�V'�jB�ED'y�f�_q8���d�=e�k&M�^Ϣ�1s�\ܹ���9���l�V-�ڞN9� +v�,۸s�Ʋ��R6O���C�F��p�����|��Pv5��Ë?<u����}t̛]:{��)�i/
+��^�����s��'�E61� �mz8HCJn�	��yb�h�4:@ʑ�+�6�:�#�'L$���w��B���Z,朐�R� e��k,1��3<���q�b:�p�(lu�d�_�)
/Hh�৓z�;jz�1H�([)\�H�l�G�׿������.��Q���a�CԷ���4�j�D~�ct'�D'ӝ�a�M���u=\ �|��;����n%��L"A�*"�J�Qv���D�U� �q����۲��``n�E�7~�Z���z���t�T���'����(�o![���k�r��ӣ����T�m}� ���f	;�4c���ɸ��W��ev�
+9����멟�B�]�}�����@�4�pHdl$kO�����8�)�H.�����&j�d�Ղ�?�A�.�:��G1��щ���� OM|��A��v��F��Onr�>�}'g���9Kcg9��
�3����(��m:eA�n�ܻ
+�
$�L��&�n�vr�*q���R�ra1n�����A�$E8}z�2�h��i�x�s�l��`�����4�î0&���#����3����t]�Jݴ�̙��9~|v��'|s��w��4h�شdMQ���L]6f\�Ļ�=5����m�j̘�,���ݤS�c��7K�QЋpU�+�
]֐���P�y�]u�����QQ�\��}M�����hv�lծ`�l�
+�hh�PK6�BE�#�)���`٬!춲YG�7P>�*��rf�BY2K��V����b[%��6�r�I{�9 0�N��;�T%U���A�y���9e��6�{a�8�~�~��
+M�+o�f�	��b�E9Z�|?�`�oj=U��Z��[���g��/u�ܽ�5�YPc1Ԅ�ׄTGn����p��	�-�^�:yG=�v�x�LFʄ+|���[,�WM
Kkg�l�m2Ά�1�(Y<�����b�"Fm4�h���FSf2���WF�T��aƻ턘s��D
+�wL��d4h����&�X����Uv�q8���a
+;tDu��No�@Ά��D3��m�汣�O�m���P�`�2f��@���0{X�6��bO��BV��"Q�^d��Fc-��S����
+7	�f2���f�"R�4�Ln�^)��d��>��$�>-ِh�7y��Нwײ��ցl�~�#��_�k�
���M~�ߪ�Zư\����Ps���Q�Ѧ)$�Ne�a*��te���a��1��\2�.dK`
_")E�"�H]�-4
+��LK̥l�Xk�D6эll�/	�B���O+7o��"�h%��}|�xMyMݧU�߰���c�mQmx�Z�އ��#�0P�������wL��W.|{�Z~q������Z�a��nT@y�t��|z	U������.�
B�Yd����N�z�l%��3�V�/��2�l
+�^�^#�U�%"ƨz	�kG�`�WڙEu�W��L�%ӎ�'<HǞ #^�3���zM����߬i��ɷ���
�u��+�� ��W �@�v�0�D G('����K��p6�1�9��"�FG"�/����Iv1.).=�W�����6�7NRAG�<������g߼��oǸH�Эt���I�?�~ӽs�`
+n)7�"�E��}q$)1&R8I�c��}�������,j��ov����3B��y��Ќ��L$����������f�jr�w�^��]xV�ݳ���"+�\�y����+��"M�3�������<CH&��.D��Q�0�#��h��`^7��#x5��ϑ|?����_���e�́�K��%2���!jyn%���%Wp��?C֒JR�sq�����sJ�#[p���ϡ�~��;J��z�8D��z����,�Q�M.���O����[�ND=5�R�g�cM|FCWQ؛��
+�(R�`z�zq]c����Q�@*�g�̂/�
+��{� �6�
�#k��[�g��e��B��l>ϣ{��<O����@��<�F�D��|ņ2��+`�T�MΩCx>�oP��Ԅ̀,2����
+�d-�) ��C��On�_��k�s�r��w�k�kt=�K
B,�g�b���U����}8.�k�9���qU$�ʲ0���-w,f��DT��*��~��]��k���c�Z�o뀼��7r,~�ϰ��\��>��W7eZܳ�g����M�Օ" �����=��g�l�\�>I�_?o9`�m���E4r�ד2��7�~���ev{���Zh�p�R~��Y,$6����d�h��<��-!��j��/r��Y,���k�=<��P�`�UR(����%=��S�&� �����XR%�H9�|�^��S�2��Q�z�d��<�G6�8�rT����a�I~�a����(\l�Q1{pf�ȁ�"zb����i�<��mD�t���C���!�4�^�>&��i����B�
���
�u�x���D�8Ϣ��=�󄸇a��B1���3a����^�-���F����	h����>
#��/���,�����nHhv�?}�[�Z�X�g	�%���a���C�~z�^�k��c946���%|��ˁ��̀+
#ŕrh�F��o���f�&
���K�\�e9\�����.�
��9����?��_����)>���H�TŸ$|"�c	����qV™�(NK8��.NF��P'�}	�IxW�		�H8.ᘄZ	oK8j�����P�r(	o� �z�*�G��G&��������%�Y�$�P%�
	��u+�����a�^��烽x
'�Z3쑰[�.	;P)��V�j��+�P��T��v	�^6�m^6�֗<bk>���&^���h��6�[�&	�(Ç��a����	6X�fX��m�^º�ĺ�a]1_��O��k��y<'a��nb�����Y��{a�J�X傕&(Ŏ�|(AM��`�� a�2�X.a��J(�P$���̒%�	K���|(��>X$a��V�o�yF�+��f����aV3̔0C�S����K�n��G���-���@�T	��H�,aR/�k��f� �a	�%�k�a�~��ˀ1F�ȣs`�FR�#\���xHB�	�0�
�.�
�0��0d�Mq��h�l�A�_��rP�%�Ǻ���!�m�w(�%�������{���{Ч�E��@o���-�g���=��Dt�2��6�2��1�i���L"C�]&HO3�t���[W��f���
��}"5:�8Dg�8�S�Ot��}��3��� Q�WBBģ������1(BL>D[ 
+5%!�"r��'	����
+���z�-�%�)��78$�QV{ؖ@H>X%X̡�"��w�C�$�h�
o�$�.P��E�����d�+P	���x������������P�
+endstream
+endobj
+9 0 obj
+   7620
+endobj
+10 0 obj
+<< /Length 11 0 R
+   /Filter /FlateDecode
+>>
+stream
+x�]��n�0D��
+�C �����E�~�D�
1%����]N�=�-gG�Īy9����gY�6=�9�,�I�t�����}=��xV�p��v��|�Ӣ�^7�x󲕛�{N�H�Jk��(�ʜO������u]?�Lyӭ��u���ކ�}8�nj��!��������m%m��HqItY�He�'R}��u?M{E9���,Z�)~E��ek����A;�nW5/\7�־���<$�	�I4r|�A��^�V͋��f����~��Nj�'TO�'���� ll^�x��0a����ߡ���v��#�Y[0[a�ȴ�i�l��d�:J>8;ᴨ[�[���Y����^_ߋ��r��Nz��(l^��0�ɷ�+w��0$_� �"s�=��Z
+�`�:{2us���c]V骿��
+endstream
+endobj
+11 0 obj
+   424
+endobj
+12 0 obj
+<< /Type /FontDescriptor
+   /FontName /QHYSGU+DejaVuSans
+   /FontFamily (DejaVu Sans)
+   /Flags 32
+   /FontBBox [ -1020 -415 1680 1166 ]
+   /ItalicAngle 0
+   /Ascent 928
+   /Descent -235
+   /CapHeight 1166
+   /StemV 80
+   /StemH 80
+   /FontFile2 8 0 R
+>>
+endobj
+5 0 obj
+<< /Type /Font
+   /Subtype /TrueType
+   /BaseFont /QHYSGU+DejaVuSans
+   /FirstChar 32
+   /LastChar 119
+   /FontDescriptor 12 0 R
+   /Encoding /WinAnsiEncoding
+   /Widths [ 317 0 0 0 0 0 0 0 390 390 0 0 0 360 0 0 0 0 636 0 636 0 0 0 0 0 0 0 837 837 837 530 0 684 686 698 0 631 0 0 0 0 0 0 557 0 748 787 0 787 694 634 610 731 0 0 0 0 0 0 0 0 0 0 0 612 634 549 634 615 352 634 633 277 0 579 277 974 633 611 634 0 411 520 392 633 591 817 ]
+    /ToUnicode 10 0 R
+>>
+endobj
+13 0 obj
+<< /Length 14 0 R
+   /Filter /FlateDecode
+   /Length1 2612
+>>
+stream
+x��TktTW��~��$����0	H�4\�����4ȫ` �
dR��hL��@IKC��"b	G���P�!*���U
+�X��Rh��P�k���uy�=����ν�Q,�"�Y�t��ON�m����s,�tӁ��W�L���y����sf���g��\�Cʅp6ڊ/ܳ|���q��I��1�+�f��a�w	v.��|�Qa[$��`���s��(G�,�*'��2�j�dg��yN���i1j�nPV��ȼp����in+͝4�~%�ݿ�!{�'-��!���W��K=i\^�^d�U1δ.���3��>j��s��Ͳ���57�<w�˽ߣw]K]6�zxN8�r���9��߼������hi�i�twt��d�22�ۣ
٪>\6I��s��~,n8�.��K���ͻ�����~�EW��[32����P#��|��i��OPP�H�]�!��'�9��h��L���-:/�k��i([X���N��b:,>�k^m��f�1�8lL5���VjT�F�Q�ec�zL�5�u�A=�Q�D�tב�F�O�Њz�&Q��Bu���$�VA+�*}�0gT+m�Y!�Vm�v^�;���6�CG;�6�����j�+�^e�A����j�mTi�j���~��g�;�d���y�VJ�b�kk�y��%ڱ}�)�m#����*�m��H7^1�Q݃��������-���ڣ�*�]_f�j�t�(��ߧ�I���T�(H'd-��R�H��$Ө4�Z��,��j���94ONU�@�(!�O�چ�;b�ø,5�i��;Ԋ�CA����D!��v�2�k��g�uk| �7����i���
�L�/L�a�
+_c{{a��M���aX1a�J�����3�O,,��1��s�cJ�+*�c	-���Y4hXY�/
���}�fm��ZsΈL���b����癯'�~L=b(:Z���������
�űӢ�?=����8��u��������
]nhP��~�� ��y�ԏ��)��F��z���F}U^�=FċO-|������c�m��-|�C�e�������ޏௌ�#�|��x׏kW�Ե����"�s%K���,\f��qɏ?y����xۃ�W�&��qQ�/V���X�V�cq��n�<��n8��-�7�_3ZC8ے��2ZR�+?�`�^�V�w��$43N1~�x��s��?e�d�`41��ql���1�6�F��#3��&]ey�RGf��H��Ì��p��cF��#FC?����:��z�:`�ރ����^a�����}�2��W{�����KTv��]�Η�j'�e'vlOV;ؾ�Tۓ����8lal��fFȅMb�)��6ƫ�2�1߉��
M�EƆ��jC6�2�^�T�L��/XX�x��
�y�sP+e֎ƺgj��:�V��
��N��P��3��O��j��n|��������Tu�z�Q]�oPU���,<�X�X�eN,���%TF�8�E,dT0�ɘ��o0��ռ"<�(��\
A�F�QƘ͘5�|͉���0�̘Q�fDP��I�j��1�I�i�(ND�f��.��Ŕ	��F�_bL�d�ɌI&eL�DƄ��	�S\j��q.�e|1�1!0�3�#�7a�D�1��xx�G=�Ũ�5ʃܑ.��מ��.�`g�U�":�TC���PCL�808�.�9��1ȁ�Y5Ѕ,dƪ
&2c�ߏ~}-�/��}<���>d��T�h����r�^	���Hg<��4�3�_="H�RHq��t�;�[]�, ��%��ҩΌ$1JJF"���������Z��0��@<��LR.�S��Ip0�L�2bD-�a���!BCn@"��_�Tz&4���@�z���à�u�u�|��Ư
+endstream
+endobj
+14 0 obj
+   1862
+endobj
+15 0 obj
+<< /Length 16 0 R
+   /Filter /FlateDecode
+>>
+stream
+x�]��j�0��~
+�Cq�s�����l��rfhd�8���d7t0�
����g�k��SȠ?9�
3�@�q�+[��@���6�]��l��ےq��Gն�o".�78��8�Q
��`�h���ux��5�;�HΪ������Lz73���w�����s|m	�R���F�K2�Є�=Ku�z�N!��N����G��{��|�ʮ̒�n�)�sY)�B��SFp�
+endstream
+endobj
+16 0 obj
+   223
+endobj
+17 0 obj
+<< /Type /FontDescriptor
+   /FontName /QLJKQB+DejaVuSans
+   /FontFamily (DejaVu Sans)
+   /Flags 4
+   /FontBBox [ -1020 -415 1680 1166 ]
+   /ItalicAngle 0
+   /Ascent 928
+   /Descent -235
+   /CapHeight 1166
+   /StemV 80
+   /StemH 80
+   /FontFile2 13 0 R
+>>
+endobj
+18 0 obj
+<< /Type /Font
+   /Subtype /CIDFontType2
+   /BaseFont /QLJKQB+DejaVuSans
+   /CIDSystemInfo
+   << /Registry (Adobe)
+      /Ordering (Identity)
+      /Supplement 0
+   >>
+   /FontDescriptor 17 0 R
+   /W [0 [ 600 688 ]]
+>>
+endobj
+6 0 obj
+<< /Type /Font
+   /Subtype /Type0
+   /BaseFont /QLJKQB+DejaVuSans
+   /Encoding /Identity-H
+   /DescendantFonts [ 18 0 R]
+   /ToUnicode 15 0 R
+>>
+endobj
+1 0 obj
+<< /Type /Pages
+   /Kids [ 7 0 R ]
+   /Count 1
+>>
+endobj
+19 0 obj
+<< /Creator (cairo 1.12.14 (http://cairographics.org))
+   /Producer (cairo 1.12.14 (http://cairographics.org))
+>>
+endobj
+20 0 obj
+<< /Type /Catalog
+   /Pages 1 0 R
+>>
+endobj
+xref
+0 21
+0000000000 65535 f 
+0000013857 00000 n 
+0000001531 00000 n 
+0000000015 00000 n 
+0000001508 00000 n 
+0000010408 00000 n 
+0000013697 00000 n 
+0000001659 00000 n 
+0000001873 00000 n 
+0000009588 00000 n 
+0000009611 00000 n 
+0000010114 00000 n 
+0000010137 00000 n 
+0000010884 00000 n 
+0000012842 00000 n 
+0000012866 00000 n 
+0000013168 00000 n 
+0000013191 00000 n 
+0000013462 00000 n 
+0000013922 00000 n 
+0000014052 00000 n 
+trailer
+<< /Size 21
+   /Root 20 0 R
+   /Info 19 0 R
+>>
+startxref
+14105
+%%EOF
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-legacy-handover-algorithm.png ns-3.19/src/lte/doc/source/figures/lte-legacy-handover-algorithm.png
--- ns-3.18.1/src/lte/doc/source/figures/lte-legacy-handover-algorithm.png	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-legacy-handover-algorithm.png	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,194 @@
+�PNG
+
+
IHDR�5��K�bKGD������� IDATx���g\Sg��;	a�,ъ*�"�
*`'��"�8pk�ֶ���YE�"�VqjŽG
eX'�U@E�-���p���È
w����_99��uH.O�����@ޱih	(��P|
@!(��%+++))�������ӧO���?~$�p8mmmMMM555---===KKKuuu�y
��/�����Sll�'O�={����<�����jjj�Z�"��x������"����b�LMM---�u�fii٧Okkk6�
+�\a���ӧO111��߯��211������������077�����ѩ�����>|HLLL�������\==�!C�8888::v��%��/��)))9{��c�nܸQYYiee5t�PGGG{{{==��������_EDDdggL�2e���l�����Ȍ���������ӧO����1bڴiÆ
kӦM3m���'$$\�|988�ٳgfffӧO���cff�L[h>(�2���"00���'%%���z�̙nnnm۶m����
+
+���?sssG���O?�0�_�VZZ�u����LWW��˗��Ջb����s�����<z�h�С?������<�×���۹sg�N�~�ᇑ#G&%%�m��ee�ɓ'?|��ҥKeee����
�����
+@(��(&&�O�>?���)S^�z���N�:��?F���_q8���ϙ3'''�v(QP|
�Kzz�����������W����۷oO;T�###ϝ;nff���_UUE;@�P|
�HHHH�^����O�<$͕W����'O�ϟ��?<��˗�
�
�@*���Ο?���m�̙ϟ?wqq���a455}}}�<yB�ݻwHH�D5�����M�:������������4IUUՆ
6n����w�^MMMډ��#��4�m۶��ݓ��K�p8k׮=���+W��쒓�i'��/M�֭�9s�ҥKoݺeddD;�Č=���ǚ�����w�ޥ�Lu����rΜ9!!!G�qss��YTTT̘1��ٳAAAS�L���PPRR2iҤ���3g��k�%�(++;vl֬Ynnn������
+���d̘1<8��W_}E;N��p8���SWW_�dIii����i'Ņ�Тx<�ԩS=zt�֭~��ю�X,����[�j��?���͚5�v"PP(�-������=""��͛
+�z֬YSVV6g�

�ɓ'ӎ����xzz�9s��ŋ�������M�6���L�>]GGg�������YZ����w�}���A;5���&L�{�ntt���%�8�XP|
ZBTT����5k~��'�Y(+))���/++������i�
����233{��5p��ӧO�X,�q�KOO�ի�W_}B;(���yUUU��?�QSS;t�Z/�}�����������/@����_���O�8���K;�=z��e˾���Ǐ���S�QBBB�޽�����v�SVVfkk�f����o�C;�?_��R]]=`�6��f��:���?�z����]�l�, ��B�\:��ѣ={�������jٲe���˻w�hg
��#��";;������uϞ=��H���++��?~�v�s8
�,֬Y�f�ׯ_O;��SWW߼ysHHȝ;whg
9�#�����baa�w��y����"�ZYY���
+�@��͛���s��@Lw��8p�[��J;�-_	KKK333۵kׂhg�%�����͛�����_	���344�5k� 2fժU�n݊������HRvv����
�/_N;�챵�mݺ��s�h
��#����r��Y�l�ŋ���i
��� Ituu��ҢD&M�8Q__?00�v�O(���ѣgϞ͘1�vY��r]]]1
��/��[XX����"����_�xq��=�A@��HFee�������h�m}���޽{pp0�  �P|
$����>|@�m�)S����a�H�/�dܸq�����̌v�7v�����?y�v�7(�����JDϞ=
���/�A@ޠ�H@AA�Çi�l6���><<�v�7(����Q|%�������UUU���\A������nݺ����"'���?~L;�_	x��
N�+AVVV�Z�z��!�  WP|
$����]�v��B~�X,KK��ϟ�r�����󳲲,--%>��ׯ,Xйsguu�=z,]�����̭,1�fkk�b����_綄磻�Զm����߾}�q�j:KKˤ�$Ɏ	
+��3�4�ݻw���ұcG	���PXXX�&�[��)x���y�nݘ������U�5���f_�pa���
ږDl޼���)))��4URR�������d���������]����[^^����gϞ�}�2+��������BTTT�_'�^���			#F����^�vmC�%o޼)--����p���~��s��%$$HvXuu�������.]���>sP��W���������a߾}�-200x����gdd����n�"�%)			���			ݻwo���B�_�����544���������p�‡z��p�Bkk뜜���ϋy_MMͦh###B����l��/@SiiiI|����B���<<<}AfnÜ9s�1ہRQQ���SBȨQ���&����p8999T�r	S�j„	���G������ӧO?w�`�����I�֬YcjjZ{����{����DII)##COO///�]�v����_�666�q�N�:U��-0ՁҺu�u��-^��Y��G|
�����jjj�={��ӧ>>>�&M255����#Gz��ՠ�ć����8q���!DOOo„	���G�}G�͛7S�3˙��
@���4UQQQ�M�������
+KMMMJJ6lXAA��+ļ;��?|�0!����`f;9r��![���~�mNNΘ1c233%�+
���R^^Nk� P|
��ӧO-�!ss���`Bȝ;wļKxx8s*\'''��&���!)))���u��/����3fL^^��ի%���\nEE����A�h��<0���O2�V���Dߺ}�v%%������d�JPUU����M�\B�h*--���b�kcc���s�����|����}���I�&B��p
�O�f�X���5.6����f�O�>]PPP�����=<<x<�������7$���455���$>l||�ʕ+�����r


'N���������o��3±c���ʾ���g�066�ꫯ��ʎ;&b�5k֨�����=x��;�h��媪�-�]�W(�M�����7..n���vvvzzzGCC�G��}�ݓ'Oz��%��L᯵	�={6��l�v��}���|>�ʕ
߃����e��
 8�/@S͛7�͛7ׯ_�D�kii]�|��4@���/@Sikk�N!o>|�@�xa�?(�MչsgZ�=�c�CjnnN;�_�����,((`�P��$%%��������,--	!�����ȕ��$��_��j׮���vRR� r%))��‚v
+�+(�`nn��+Y���(� Y(�н{�Ǐ�N!?���233���h
��� 
�����ѥ����ȉ[�nq��!C��r�@���cbbh�������SWW��
+�/��������"'���/GGG�)@ޠ�H�СCQ|%����)))(� q(��1dȐ|���v����:`��A@ޠ�H���3��	

�D�=zt���jjj����A��mm�q���"����"""���i
9�� 1���QQQ�^��D�=zTOOo̘1���B���#F�i���ѣ��Ȱ��@WWW.�K;�!_�QRR�2e�����|>�,2��Ç���nnn���|B����s�x���ŋ��Ȥ�۷w���s�f��a	����SSS>|�b�hg�%IIIݺu���?�L�B;�'_	������/�^����D;�,�={�����<y�f��Hh(�SUUu��1___>�ߺu눈ډd��ׯ���f̘A;�-��@�|�ŋ0s�̎;.[�,22��ݻ�s�??�v��M�6�v�g8��$�Q�-[�$%%���yyyYYYB��꫒����h|p�Yϟ?���ٻw�9shg
y���H5*���w�n���|��G�۶m[�d	Őҏ��<������_�: 4+�h������ kkk�޽{?y�$((H��B���~���U�Vedd��)�9r�޽ݻw��@s�_�`�����0�YX�re׮]�[����{�����-R����XZZΘ1c��������_��x�������ϙ3g������AAA"Z/!DMMm۶mǎo���e���JJJ���� �p��3x<ޡC�|||޾}������թS'��>u�Ԩ��Ǐ6_HYt��ɩS����M�8�vP(���Qy���;v���A������ۦM�[�nq8���)����3�|Lr���P�T^�������{yy�Y�F�!eWiii���544n߾��ri�
E�9�����ۥK�%K�><99��?�hJ�%����c���7n����TN���흚���-	G|
���ݼyszz����ʕ+MMM%58��7n�ݻw�ܹcii)�ae��ݻ===����O�N;(_R^^����ر�9*�@ii���SJJJTTT!ˮ�Λ7���gŊ����A���T^??����/X�`���&&&ͷ���B{{���⨨��m�6߆���ӧ�L��lٲm۶����TW^�ׯ_���߼ySSS��H]~~��������
6z�萐6�0

+P|
@ᔕ����۷o���j��+���`ooߥK�K�.�䦩���0`@FFƀ
._����B;((��HYY�����������	������[��Bz�����կ_�����z�;s�̫W����F����D;(._P5*oRR����h屴����mժՐ!C=zD+FX�v����������������ڡ@A����c*�����Q^��W��/��qㆩ��a����/�q$������{ݺu�W�>|�0��"�<z��k׮��ޕ������_�[�\��~�-;;{���?�����1�P5}������ҥKk׮]�j��|�+##���-66����…�kk�O�2o:l6�������]�v������+--ݲe����ʕ+'N�����K���8w�sጡC�fff�N$
'O��֭[NN��Ǐ��K�2e�`�ouuuBBBϞ=�l�RUUE/)(��RZZ�s���۷}����}�]�6mh�˽{��N�ZUUbkkK;N#UVV�Y�f˖-'N��������=z�X��f���;vL��f-G|
@N��[�n��ٯ_�����K�ׯ��Ǐ���;x�������N�`={����۹s�S��[/!�{�WW]]�C��2P|
@��Yy


i�j0����s��]�~�s��[�l����J,o޼qvvvtt�޽�˗/�,YR�j'NTVV��������b�ʕ_}�UZZZ�Ņ�2���d˖-&&&�ׯ���+l�ر���?�����ݝ;wh'���|�Ν666�=
+			

522�o�'�W�9N|||bbb�%�_�M%%%�v�����>}�������߷nݚv(	���_�dItt�����ի�N;��())ٿ��m�>|��dɒu��ikk��Kuuu�6mrrrj,g��C�=~���=� Up�ds����t����Q^�,L={�����s玖�ֈ#z��$
a��򼽽۶m�f͚�s禧����}��B�l�����l��f�7m�t��u�|
@���/Ȍ�?n߾}Ϟ=%%%�z��>�o�޸q�7�t�2c�ww����2�Ͽs�N``�S�x<ނ~��v��5h�k׮�9��.����3t��M�6u�ԩ"�_�
��[QQ��w�}��7�CQp����������Ϝ9�믿���l���z�*888(((55���j���s��iܿ:������JJJ8N����;�����r���8�ēC����[[UUUxxxPPЙ3gJKKmll���
���ԪU+Im�͛7׮]�y�fTTTfff�Ν�O�������N�2�ԩS^^^6lPRR����ׯ߆
V�X!���A�)UXX���gϞ���e˖��֖��w��Ո�����/^���4������������B__��]�߿߷o��CUWW�y�&))))))111&&&!!AII�_�~����������:"{��BȨQ�K6nܸq�����׾������a*��ݻy<޲e�<==k8��ݻw�o�~��IbbbAA
!������\___OOOWW�ӧO�.]rwwg�RTT������������\VVF�С���e�>}������[ <�dz�������\nl�/HT^I���x�����ϓ�����ŋ���666l6������6m�t�ڵ[�n���-0c�N���_~�����/��B%(_�
+;v�ؽ{wUU�ҥKQy%�͛7�;wf�;88ЎS�m۶�\�266�O�>���|�y|
������k�v�������o�y���ڵk�z%��Ϗ�fs�ܻw���R��˗���Μ9��t
 q8������۷��f{{{/Z�H�� @#ddd���VVV�X,''��W��NT���TkkkOO�M�6��rG|
����|oo�:����V�JKK���B�m>;v�`�������TWW��S��;�_�~۶mqqq����_hQ���[�lٻw��������ŋ���h��s999��������nݺQ�$Buu����y<^ll,�%<I�k
+��(�������W�^���///���k׮��*��JJJ�����f�>�k�.�Y@���/4���<___奢������ӧO�%JJJ����9B/�����/;v�x��Y���ig
���͈��{��QVV^�bŒ%Kh�&Va�������<Ox�����ׯ)%Kyy������թS�hg
�����W����o�>??��r����{CCC*��t���Q�Fݸqcذa�����_������K����9rd�ƍ�\^�^*����)66���4�ȑ#]]].\X^^N;�	_�����/]�����ĉ7n|���ҥKQyi)//ߴiS�I.���j�֭YYY~~~����@�	T���PT^)q��񬬬:o����}�v�i����{{{oذ�͛7���<�_h����o޼����ZZZ���s����Р
+!d�޽w��y��UZZZNN���f\.������)++�
�Y=z����/���O�Y@��@#eff�����ʄ��]]ݭ[�v��!===--��۷����;w������&O�3`��Y@���@�	*������*��{��Q�޽_�xaffF;Kc899޽{��b��2s|
�
233���'O����__�x�t�R�^闔����ܱcG�Ai�֭<8y�$�  �P|
@,L�=u�ԦM������ʊ���N�:q8�A�gϞ������8�4�/|FFFƂ:u�t��)??�����K������
���laaA;E����YYY����d�/��ݻwL�x��Ν;SRR�ϟ���B;4Xrr���9�Mbdd�dɒ͛7���
+�� ���.]ڹsgjj**�����rP|	!�W���x۶m�d�/��ʻk�.�(����D���,**�����V�Z}���~~~������LB�����3������8�6 IDAT���$))�"ŗ�t�RUUU���A��+o�Ν�����+T^y������chhH;�hhh�X�b׮]�߿��d�/�BKII�1c*�|��	�.���ܾ};�  {P|
ԫW�f̘ѵk������ʱ��$y*���������G;�_�#��111x����3Py���Ǐ{��I;�$-^�XUU��ߟv�1(�
+��˗���ʫ���222z��E;�$ihh|��7�w�.**��d	�/�B`*o�n�bcc�������...�bccC;��yzzVVV�߿�v�%(�r�ŋ•�ٳg��
+������������H����ܹs���+++ig
��� ���keeu��]T^����c9�� ��w�eff�:u�v�(�r(99Y�����?��
+�����7ρall<e�\�ć� W����L�ҵk׿���>~����Ky-��OO�G�EGG��
�@N*o|||HH����'O���|y��@0`@�~�p^3�/��KJJb*�'O��;y�d6�@?~���kbbB;H3���<s�LZZ�  �� Ø�ۭ[7��>{��������ٓ�b�Ҍ\\\tuu:D;��AȤ��D��&$$��B}�������g��������&
dSy�������?���B�*++�={&g+�Ӝ9s222�^�J;H;�YȌ�ϟ3���ӧ���Yqqq���{���ٙ��2���������[&�Tؽ{��j��✝��w���ŋ�g�>}��>+::ZOO��ʊv��0w��.dff�R
o�����O�������oz�����s�޽߽{w��ه:;;��8bcc���/��l�4i���FHH�  ���	@�ڵk7m��b�~�����j�r����Ӈ��<@����8p �-D]]}���ǎ���D
hZ�v�����|>��OMMe޶=z������Q^h�����o������r�N�����/^��o��lܸ�i�̏|>���~rww�ׯ_rrr``�{�����j�����ӯ_?�AZ���c�6m�2�@��c���?�����B�|~zzzJJʑ#G�={�����p(&�۽{w---�AZ��qqq9q��  �P|
(���]�jU�7�{������诿�:t(�-m���			�������B�hi{����������o����D999			����������m��̙3����B�hQ����������~��g��b�@�ܹs��b
2�v���f����ϝ;G;H)_��s�ĉ%K��X��fs8�ׯ_����X*�?���={���ե���c�޿�������4R�@Q�>}��͍9S������2�ǫ�� ��X�֭[w�رK�.���;v�����dXDD�N�e>\UU�ʕ+�gϦ��K�#���ЩS�RL �DOn�����֭[�:uj�ĉ-�Q�2v�Xee�ӧO�R��#�8�d�����GWW�u����ʴ�@����ݱcGKn�ڵkgذa-�Q�2jԨU�VUVVr�\�Y@��Q|�L���9�U��
(�|kprr��o�ݻgggG;H|�
@~���k׮�1�v��t�bddI;H_���ɓ���+x�%�2�jC��׮]344���/i����>**�9k
+��/���~����#�������%%%<�����8ȍ������q���B�������ݻwi
�� '._��f�njC;},�O�>8�54K�e�X,��̌���^.���>����3&::��1��D"�U^^���ձcG.�+
������^Ϊ_K������<�U�V��H�/���ѣG�S�ti�#��^�
+l�����:==���˃���U%�I$��
|}}_�~]�_��tW�^?~<� ���/�|��EQQ�  E�w��ƍ+++�ub���|>���|�rҤI|>ݺu�CՁ�I;@s���?	!aaa�����ί�P����(**B��ݻwuuu\\�  E���ZYY�~��СCͷ���p8�;w޻w/!$))�v����B�ĉq�f��x񢵵u�h�&&&���(� �����ѣ:::***fff+V�(,,����?�L���_�������b˖-666������666[�n>H���:a�MMM�E����4.�0��Z���|�[ZZ���٦M%������-�x<�>}�hjj���;88\�pA��
+�lcc�b�BCC�S����X,q��x{��8p������r�v�\\\n޼)z����gϞݪU�/����ߟ���7}�t]]]�իW�8�%z�������۷o��r�������_�.�X�HX�g�56�ij��eƬ��ڸq������J׮]>,���'Էk�d())Y�`�������ĉ_�~-X�tun������	B���P�n����Ϡ����>}��ĉi�",�{��ϟ?����v'N� �|�'P]]���V{++���B������v�Jٵk��r�PeeeC��=���cEE�����i߾��M�&MD�0��)))�'O&�,]�T��2w��믅��n�����ɩ�ǹ�i�o�NqvvN5v�XB����8zxxԾ���3��x�<w�\�~���5���b�Ξ=��*:a�ik,d~l��Ԭ;[{�BCC�{4j]?��/�Ѿ}���\�t�=��%�w����ܜ�9�E<��,�o���u�����	!/_�l�
ɖ9s�:�v
+�"
.� ����fgg��������ۗ������}�8~�8!�]�v����Z�>>>��C�}���Ç���&�������+VBLLL��k���O�F������3�P�CC3��K�������m�!������o߾-++����0aBC:>���������rsrr�%���\.���~��A�
���	!k׮MOO�����ͽp႓���]������/,,\�x1!�U�V5���ى���5�ʕ+���~~~���}�2��NXgը��qOS3�,3����
+��Ҙ3�4���"��5�3���Y�b_�?�����7�wL�n6(��Ϡ�yD笓���-U|-ZԫW��ފ����166���H��o���	!�o�^���+BH�.]���oUUU����G(k�IX[[B>,<T@@�f�����?^p�3g�?L
ǎ��CC!����
���={B����ć����Lٳg���ݻ	!�ƍs@�
trrZ�lY@@��/�����X�nj��:���G7o�tvvn۶��$UUU�V�	�l56�ij��eF�~��`���B����蝪S�]?C����]������s�"�7�wL�n6(��Ϡ�yD笓�]n��[YYٺuk�f݊,
+cf��Ң�ŗ9���p8��f��1��\.��A���=JiӦͧO�j�I���B��������!DMM��竨�B�������	��0����vvv����Q
!���������!�9"���3�\8p ��
�+�g���655~�9rdVV��].++c~����s	��3@HHH}sX�D'��U�Xظ��9vV0&��F�a��/B�]?C��������!�/y�~�D�f�r��։��Xee��Š�
+B����gw_-P|oܸ�b�RRR�u+�(!!����@;H�_�����A����㙛�B|}}k�s4��64���r�A�������-�(��H[^^���Oy���˗/	!����I�XYY�����⢩�Iquu�E/�l�nݺB.\���������c�Hȴ���j�ʂo76�ij���/�8��T{M�34�����!�߱F�spa�����ׯ_/LMM%��iӦACէ��…{��ݬ��Q�>}�R
@���`eeE�w�^���^������OD��
+0������/^�H��� �t�ؑr�������M	S�۷o���m�I~�ܹFܷ6ee�iӦB�=�;wss�J�
���lmm��Ǔ'O���B�O��D�
�|
+���cnn�T�[�n�DD�6m�B��H ��Д`ͱ�b��Y3���a��>�G׈���;֔�
��M�r�J�
17I����'O����"����utt233i
�!��)Α	漼m۶=p�@jjjIIIYYYRR���������㙙���"��]]����������Ç������ֈ0����o�f�:���OĞ�~|���o��F���ڽ{wzzzYYYll,��F����̵���ͻt�By���a�������>lٲ����.�.�^����jժ��������P��
+F�p�С��q�ƥ��}����ŋ���5"5�ij���/L���!��Ǐψ�S���� ��m"���ۋ��7��X�s�9��#G�B����o�9rDKK�ؠ����G|CBB�\���%
+���bݺu�S��hp���������Z��yw�����l����qpp`>������S���ڝ;wD=4��ω�bEE�W_}U_�F<t|>�{����=z4(L���ϟ/�.v����Ϙ1���֗��
?"t��&>Mͱ�����p֬Yu޷�:o3C��|	��L�������u&i��X�s�9������#G��ШQ����Է������w�ȑ�Ǐ�󦲲�+V���2S��M�=�-C�Y�d	� -S|�|�͛7]\\����\����������������Kgeee�Νk//++��񱶶VUUUSS���޲e����RRRƍ������7o޼�ߐ3�������ټy�?���� z�[�nevJCC���A�+�
}��|�֭[��۶mkP����9s�t�ؑ��������<O�]g��<o�֭]�tQQQ�ԩӺu� `��ل�����r�����֭|�."O��&�l}aj,,((X�h���	��]2�U����s��������?~��מ>�GW�v�L��c��)������}}}{�쩦����ֳgO___�قkU'��7k�MKKc�ٵO��X�z��9�)+&O����B;H_�=44t�ԩ|�/� ͘���+�����y�f??�w��	�5"�s��)))aaacǎ����������ɓ�
����U@����#G������z	!��k&N�(���rOOOOp: ���
�ALLLrr���{�X,�Ū��"�0�{f�oTT���{����\��������Sp�x��{�8���PYY�]�v...7o��p��Q33�+V6Î6���jYY� -0�
@���Gղ��^W�M���͛����7�y����sc�X�̙3�Ǐ�#�vΜ9̉Dj����O��\�^���ULLsqi)���}��F���������N
�.###,,lѢEu�*�k �J!dԨQW�\)((���HOOg.&�믿�9HHH!d�ڵ������.\prr"�<x����FFF������%%%111}����6m��,;�X***8��� {:���;eʔ��������={vNN��)�u}k�СCbbbLLLAAA������ǎ;v�XBH@@!��?��un���!!!�;w>}�4sf)�� �@��x����Ϛ5�����N�81mڴ���<��������y�#G�444d����#���Ae�K-J_��2��ŋ�޽[�`A��~�z>��p�¤�$��{���"ַ��}��Ett����������իW�.]J�[v�����������}0���[J())5�
+� �p�@��ٳg���:ujн^�zE���iժ��֭[��dkkkkkKIII�ܹ3s�����������۷ocv���%w�޽y󦗗WC�hllL������+((8y�����E�?dȐ�G�����x����S�N��΋X�x1!dܸq


�_�.---//ONN>p�Ӓ
���<X�vm�~�����G+��lmmY,V���k��bŊ޽{kjj2�]�d	�����ة�O�^�}��]�n]cR�|پ}{�~����
���M�6���3_�1b����ܹ���nll��r


��=}�tB��ٳ===߿?o޼�;������ZXX̟??66��{����_ܬה�f������~��a�b>�-��}�� �ӧO��]]���x����{'z��ݼySPyk�t��A

����&%�'���/^p8�?��S��k�"�x��[�v��EEE�S�N�֭�ǭ�.���s���ر#��500�����?x<�`�7o���q�\555++��˗���Ih_%�k �W�}��7����>}^H��֩�I���{B�]����ƭ�z�ڶm��Ǐ?}�TXXx��Ŏ;B%�Z\b��(++�ҥ��B\5n-**RQQY�lYSCC˒����ŋ;u�$�>A4��
�0Lu�m�>}
+:t���:�,PYYLٱc!$88���Bx�G�}���666������cƌaα��]*���ٝشiSVV���o��jjj�����L
++///00p����v���+�Ν;WXX8lذ����Ɔ�b���
+/

e�X666�%G�upp���a&ԮX����Pp+3���j�ƍ���***]�v=|���
+�k~vF�>|�гgυZ[[���?^�t�֍"��z}������۷o��r�������&s_!���&L���400X�hQII��6h����|||֭[׶m���6lX~~����.�???ee�y��� ����#!�3w�\Bȍ7j,���ְ}�vB�����B�L�UL������j��XYY
+o��ã�:����+����a��ф��;w��|B�ȑ#E?��F�%z��1X,�ٳgk� b_rrrڷo/|ӤI�>�G��c���+++��?}W�^%�,X�@�A�H�u5++KCCc���MJ��}
���ʶ=zB޼yScy��S�Neee)))q�ܜ�fIvv6���r�>|��� ����fgg������0�����ފ���
+���ƍG4hP�$��Kzz:��QQQ���������***l6;--���<}��U�V,�Ν;�5jԕ+W
+
+
+***������!}����Sľ�X��bbbQTTޡC��;H���S{���TB������"���~���а����C)��
�0_�f``@��l������΄�={�0?�޽�2n�8�G��[�o��9
~�.]��r��u�
+)))�--�I�ٗ
6B\]]K�N�J�{��ڞ>}��_BV�\���o޼���ܶm[%���h���j��"���Ғr��y�
+gΜ��މ�S����[�vss���h��֭[vAzH�u�ݻw��������P��P|eS�j�[��F8p ��
!�O�f~d�-��p8��f�ق�\.Wx+̵O���56-f񭮮f.C%\=�i��:ub.�*,&&FOO�2��ڷ�R���9E�sN���|�
+yyy��N̝������>OY}�2'�<� $�lٲ6m��8y��k �W��>�+����������W�^�|�����_^^�ܪ��VgS�έ4����t�[��W�x�"��,X������/�-\�0))��������lb�s�D�Ox@戯���gw�G�_W322��շl�"�H
+�k gu�m�g����������i�!G�=z�(!���MYY����ʊr�޽:o��
+��x<���<(�G��0aBII��ŋ���'΅Ә>>>��檪��ѕ�N�	��ܹ#X)�.b���'�D3O:(�_~�EGGgɒ%���<_����MLLl��g͚E9v�رc�?2/^L7n\@@��ׯKKK��˓��8`kk+�&Z�nM9y򤈳��>}��b����h�iiil6������έ[�Ξ=���}���{���r���Ƅ__߼������'O2�nm�n���������K�.���;U߿+j��y��I)� >|x�С-[�hhh�� ���n��a
+k����������ݻ3�{��Q�&OOOу�9`���e������^ݰa�����ÇBv��-z�����D<| IDAT�{�j_bƌ5�|v_z:3�w����ݲe!�ĉ��)H�&��:88���O�)=P'��
�0�m�Ǐ���n��3gά�?;w�y󦋋�����USS���Z�|y\\����رcѢE&&&\.��u��k�C�1{�l�i�-_�|�֭]�tQQQ�ԩӺu�1�����۷Ǎ������7o�<�zl�i���u떎�s:P/^���ܱc��n�h,��Q���ЩS��2�����o��ߟ���OB�ۧO����.\�\�dE�_W+++{��ѣG��'O6G0��5�#�2��ۛ��Ը�0ȟ'N())yyy�-$   55��_�@~��ʼv�����{���׾}�~��G��AA�{����kŊ��洳��ϯRo�ڵk׮�������iG���|�rCC�U�V� WP|
�˥K�BCC�]�&�:2�P�� E��ʖ.]������D;��A��"[�n}����m�h
�C�� -�<y�q��M�6����� �p�@*������:::._��v��#�R�_~y����7p�6�f��@_dd���ۏ9bddD;�ܪ���`���uJJJ�ϟ?f�ww�����(�S�Nm�
+��ӳ�������ȹ�)�S�L�2e
+�(�5s����Ŀ���vQ~�������7o�iӆv9��:�����w�^||<� �z����e�֯_oooO;��C��5d�33���@�Aꖛ����_�9��ۛv���r��b͞=;((����v���|��Y�8��Çq�2�����l�̙.\��&�k׮������(P|A��1�СC����7n���>>>vvv��(_�s׮]{��-� �z����_=g�\�������svv600
+
+��B���������k�.�Y�/�9ee��ӧ<x����������믿�p8'O��r���(_�����������[�hQ||�������ig
PD(� �������
]�����Ç8Э[7�Y�/(�S�N�
+�����|�͆
pYx�P|A!����X����A@]�v���u�ҥ�W���@����B���vqq�lhy>�<y�iӶm�F;��C�E���q�����x�A@�$''�5���6  �%��Ő!C�t�r���A@Qdgg�7�M�6!!!8y�4@�E�b�f͚\^^N;ȿ��|''����+W����Ў����B�9sfAA��h
9������PXXx�Ν���ӎ�B�bdd4r�H|�
�U~~��a�>~�allL;�?_P,׮]KKK��Sqq�1c���nܸѡC�q����bqvv600
+
+��Pyy��ɓ����\�bffF;Ԅ�����N�>�СC��մ��\)))�0a���}��ukkk�q�(��p<<<RSS###i
��|��ɓ'���_~�%�8P7_P8VVV����W�@R����
���޵kW�q�^(���<<<���
+
+
+h
���ݻ!C�|��1**��ܜv����+��		�d[JJ�����l��;wLLLh�
��@�E�����������Æ
SVV�v��_|A;|�/((��������2�޽{�
��׿}�6�� +P|AA
2����ȑ#����9y��!C���

i�
q����1cFpppyy9�  K���7m�4�?��SEE�vh_P\3g�,((8�<�  3|||�,Y�bŊ={�p8�q�aP|Aq�k�n�ȑ������r����W�޵kצM�X,�D�`J�����1y�䴴�:���+++k„	IIIW�^>|8�8�H8�
+������ ((�v�^�=�ӧOAA��{��z
d�/(4.����~�С��j�Y@�;w������"&&��̌vh_Pts��MMM�����Ξ={\\\&O�|��e]]]�q��P|A�YZZ0_qaeees��Y�t��͛:���L;H�/�����ϧ�BJJJ���/]���?Ў��@�M���pBBBh
��]�ַo_UU�4�v�$_������_ט���ѣ��bZ���UWW�]�v̘1�Ǐ���l߾=�D a(���������������={�X[[���;++�v.h!EEE���6lذa���UUUi'��,!dРA_|�Ŵi�^�|Y]]͜ݬ���v.h	qqqS�N��Ͽt��ȑ#i�
��#���^�z���ݶm����/^TVVVUU��|BHYY�tм��
}��533���z
�������Ș;w�kה��***!<Ox_����;k֬�ׯo۶��o�e�X�
@�B��ծ]�6m�B��[�:ȱ{�����_�v����vh	��
+-  `���\.��[KKK[8�����_�uРA���qqqh�����	

�ܹs��G|�Orr���}||._�ܺukډ�������־r劖���^�b�0�W�������(++?y�dƌ��@KC� ���W�^URR�z��F����nnn˗/��onݺձcGډ�|�
�B���<u�T���_����CSSS[[ہjkkK4,4LXXؒ%K���bbb���O;P���ɓ'?{�l�����+ğ�������ؘ�����{��������;&&f������jРA����
211i����WXX�|��C�͘1���_GG�v"�	������/��ɡ��<��b������ǏGEEEGGGEEeff���^�z���-\���ή]�v̚EEE��wTT�Ç�;VXX���ݯ_?;;�A���٩�����)����ŋ���^�~}���c���8���?!	7�Z����4��Z���n�v�������b������z�j�Xm�zP�#�rP
Q����B������,��$�_�ɓg>3`��𙙩\��C��/�w���[�n�����rv�mhh�1W"����TWW������?88X$y{{���)Ohff&��b1!�������t�ÇoݺU ����`cc�{��Ӟ<y���o���o���;�j�ޚ����Ǐ/**Z�v�H$�a7++K&�988���Ӄ��G�nu!�N)..f�tFF�\.����3�D"www==�{�?���;������7�,\���r�cQQQK�,�'P����0�={��ŋ
+���a����a�^������4'&&>}�]P\\r���K��ڵ�������:��H4hР�����HSS�ެ�����XPP�tDxxx:�7��
+---;w��裏������/���4�/�!�B_TTTt�ʕ��t�����Q$��a(((����LGDzzzJJJss3:"Z�}�vppprr�ﾻu�Vccc�+
��l��'(_�A(N�0��ãG{��rG������w�툨��������7�����۷o�ȑ\W��|Ag�{�]�VSScii�dD77�^�a�^�8s�LHHHyy�G}�׿�U �5j�
����:E��aذaL�}��0h���b���&��q�����~;..�w�ٲe������B�6_�n�=���^^^4�yxxhEC�bwDH$���J�鈐J�_|���<dȐ�{�N�<��@�!��/h���zz�6{���MLL��QS�;"���o޼)F�E��vuD��Ĭ_��ѣG~������������/�!��v��~\\
pyyy2���ɉ95M�{���Ǐ����nLMM�J�Z�q�ڵu�֥����/ٺu���-���@�6_�P�{<==��츮Q����edd�����	�+))ٸq�c�|||�������uE�e|
�
�4�r������/zz�`N�k�`oo��%I�����}�!��?�A}�_`C���������Np��P(���6o�\TT��G�
�e�����
=څ����TQQѣ'O�ܲeK^^�o����������ɡB�6_�
UUU����/��a�^r��֭[=�!�H6mڔ����K/���999uc��g!��/�="�hذa\���?�LMM�?ⴴ�����uDܽ{�o�ۏ?������g�����t��w ��/t�OOO�����p*V__��u��ONN.//g:"<<<&M�ԯ_?�W��������������?��h�"���ŃC�6_x&�=����<y2�;�ǏׄKbA����g�ݺuKOO���gwD���|��{��555ݺu�U��B!�U�B�6_������x�irss�r��1c���i�#���6''��_޵k���5�5��B�6_���	&8��A;Ў�������˗/WVV���������2_`C���=}�4!!�&ݬ����Z��A$�������TtDL�4�����A�!��/�z�C%%%)))�~�6_`C��Ӕ{

=<<���jnn��Φ���/_~�䉩����+���������F�������(�0X[[��
4:"��|
�
��O(((`�.z@�ю��q����|
�
�W7577_�v�	����ooo�kxV舀!����P�a0`@`` z��P��������u��
_`C��n�ahSUUUjj*������G ����Q�� �&L�`nn�u��E&�eee�|�ʕ��2tD�����T�0���
+�k��#�~{�~�::"t�/�!�j(�����ӿҢ�
��TWW���Ѓ�����
:��|5�a�I7==����FFF~~~�a�쎈�����RvG�H$����F�4_`C��Ree%s�
�a���	@犋���M�D���������|
�
����������P(���i����4h�@kmvD�o��u��6_`C��qR�4%%=\��x�M�=oUa��
�Ϸ�����^�~��I���
+�m����C>�?|��ɓ'/]���˫�S�z~���C����UVVZXX�?~��导�
+{��@�#������
�	��|{��!33���n�С


�zz�n_���^LL�̙3����������*��ՙ�R[[�dɒ�g�*�ŧN���_�TtD�<TM��l���ƍ��u����Z��Ri^^ކ
Ο?��啒�B�L�2�ҥK...;v����455-,,���=t�3Fͩ!�-:uꔅ�EXX؂lmmKJJN�>VYY9{�옘���+Z����ڵk��(�����u�{�����̸����_���x������


t���qCCC^^�ȑ#�_u�S���N�:�����իcǎe�<''��ǧ����ٳ/��B'��`:"�����⊊���	_`��-SYY���D"+++���_���aaa999���/^��H���d�o��f�ĉ666����
Z�hQll,3��ѣ���#F�شi�/�<���544���8�������x���(�����x<�������iii��Oƌɞ�޽{s��555���~뭷���[M����޽�[566dU�i���Ԕ�7
ULx}����ٸqc��K;v�ƍ	!��ڊt�@ ���X�n�w�}w���G�EFFzxx���Ο?��
��ΫW����nܸ�u�}�:���s�����`'''>�������v�ڨ��G�q]��x�����
��対���S���UUU��t�…�/ܵk!dΜ9�͞=���_�_�<K*E�����ٱ�Z�`���,R�tڴiϸi�*T�'��������ӧB�-[ƌY�f
!���tժU���Ζ�d]���������f1��!���^E��
+���e��XlllL����={vxxxBBBSS��'N��}
+����Ԕ��>{�l�����7{��-[�\�x��������{��T*-//����6m�B�8p�!d���QQQeee���III�������4�
<�̙3555taII�@ 
+�O�<�K��ʄB�P(,--e��)�>2dHLLLUUUQQ�ܹs	!"��ذa!����ʕ+555W�\���WFw��IS��ݻ<x��ؘ��4��NmZ�
+U�I�M	dv�B�����7o{����ʕ+
+
+:;���!!�����b���	!���*
+���srr��۷l�2��fbb���]QQ�u�Z���v������ѡ��~~~&&&� ֲe���ۗ������u�Zo��ф�iӦ����s�󔷷7!$>>�=�޽{���#G҇4��>}�մs��!��ݻ�>���	!s��e�+/\��,���'����ч�?�<!$&&��:����B��߯�����^�ʔ����urr��Ȝ�����У������NM�N𵴴TQ0��ѣGQQQk׮���������NNN����n�;���l}��9Ђ�^ �H��E͘1���D���|>�)���1
�B����>T>v��)B�ĉ�C�V���XɎqr��=����RYY����PF���!�1f6�7������]��beeU\\��U���b����NM�N������UC�0�g��ׯAGD� �[�z;h���~�0@����,�H>��E��ӧ^~�e�����׶������O�w��ݻw	!���ggube��.lZ��/5k�,BȪU�T�J�P<~��bbbҩ�h��֭[ۜ3,,���;�^5<#�L�|Q�_E����\��|
�M���{��6���^@��oee�P(<==	!)))*ƫ����Mf4�����xa��W�Ձ�>C{��+H8p@��.lZ�onn�@ ����y�&!��ظSS]�p�bjj������?��������fG��uu���t��=����ȑ#<hnn.--ݾ};�"""!���(((���oll���ݿ?�à"���BF�E�Y����~���w����GG���������xGGG�a���?'����}���>lllLNN�'�uaӺ|
+Epp0!dѢE�����mے��+**��駟h�uPPP��R(�������=�T����={�Ћ�mٲEE���jjj�?dYXXtD�/_`ӑ���0hҖ��`�lHHH�HG�s��q�Ƶ���*/,))���e@/� �[�T*�2eJ{�wv�Toi{=zddd���RSS��mB�������;5�B�����1c��l��@'��:"����ظi�&zpu^��F�:Z�_Z�����=+99��7�ptt
+���־�����c��bcc-Z4x�`�Phdd�������gff�gU�ر�عsg��ԉ�����͚5������*88�v0@��I��;v������FGGwmӺ|
+Ehh(!D,+����͛7���YYY��|�q�ƽ��{EEE������?��Ì3�����l۶ME��9�#���O(������&�n޼Y�k�j��G�nY|��
z�`�D���/
+'L����A�:h� ����_���^�|��Z4�Ν;7n�(
+���3gr]t���633��&&&>}������ӓ�yN�0A__��{s���Ç���:uj���jnl���������)55��Y�����矖���N�~~~nnn�{�t����_���յ����_ݰaCuu�W_}EϢ��?���O���Ο?����u9�	---�o�fBpAA������}_�(��n�_�@���"��U�~�
�@�hb�-//OJJ�o����Æ
c���ѣ�|>�5�.S�\���HJJ��Cb�����ӷܔ����f�[���3�>|��+����}��]�|���������cÆ
�ۏ���L&ۿ��#G�ݻ���Sگ��[o��cB�=z�����̆��!C�,X�`������94"�*��7o�{�������ۮ��z�7�={v�K�Z IDATϞ=���������?477�.��H$����///z�k-�"�*���x?��s�ov�}�7�EZ��Q(K�.����[=��윔�����Y�U�����N�WN�;"�!	cccwww�.���K���V待�3g�]�v�ĉ��ƥ��'O�|�����RRR��KLLL��������������$%%}��W�ϟ?x���o�9x��/��"((���$33sݺu���������\l7��W�oyy��K����i���sjz4�#"55U*��;"������M*�����{�����'O��d2���а�������1c�ܾ}{ڴiNNNcǎ
1b���s�ڵ��xv�{~~����G�����+
+j��ૺ���ӓ^s�H]]]FF�VtD�|O�8��+���	�,d�$))��^+,,d�͘1����666�`0=pC��B�P(�J�=�}�9=|�^��o߾������d���k֬���ץ�
�8�T���~�ĉ���B,,,|}}�,Y��+��Bn�k/�:;;߼y��z���jhhXWWG/�f�%��d����D���r�ܹ��ڗ_~��������Abe�p"
0z��oMM͵k�$�D"�z�jMM������m�8q���Y�z�L&��ΖH$III���>�������^$=��s\�HH����а����ӧ̅����im�_6��`eeU^^��啖��������[Ϣ�z|���iw�D"�7M��a��w����TYYٕ+Wh{CVV�L&0`@`` ��uuu�w�(�ߑ#G޽{�o��������.^�RRRB�	��&M
+���������

566������|���mmm?��c�X<p�@==�������EFF&%%q���n��P]]���B�=%ICC�����	��$���z�*�5���۶m����G��>y��K�����(�B�8}��w�}���R^^������(�V�X���ӵژ��|-�����ݲ�'�
z�\.���`�Y�����鹻�3�,�
�u�h/��رcӦM�˗/���H;�����������#��]�����j���h��+�ɲ��h���+--��e"�(  ��Ɔ�
+�{effVUU)?�;��=�jjj/^|�ܹ6�U]��'A��


�Yk)))���FFF�n"�h„	�ua���oKK�_|���������X��o��Hn3�^�z�����.]z��a�~�F��bŊ7�x��������;99�~�
6l���˗/wuu�����p|[)..f�s322�r���=,����������ɔ)S.]����c�OOOSS�������C�1���:��͋�����ܼy�y�*���߿���x��!�D��<�_���|�G!�j���Ҹ�8v���M@@�&�0��	�\A�/:"8WTTt���cǎeggwל�輼��#Gvל�:w��/�Я_��W��=�Y�B�U=	�owaz聆Ǐ3=��Ug��C�%�����Ҿ���e˖
:�"<<<֮]{������s]�N)//�����������'��YYY�<r�H@@@�~������q�ƧO�2�������y�>��P(�_O�8���ĉ�WWW�[�#��>��c{{{}}�ѣGGDD�g�{��9sLLL���z�꺺:�$/��2!����:���F�����jnN����򚛛������3`��Phgg�p�‹/��ަ����pWWW######WW��>�L*���]�����ͣ�����j�ۡ����/^��e��XL�����b�-[.^�XUU�u�=����
+���v��ѣ����k�zxx��;;��^z��/�LKKkii�@�T__��?̙3�������%K����Þ�՚5k!����V�:t�Pvv�L&k5F.������:;;3�t�…�+ݵk!dΜ9��fϞM��/�/l�9���z�uEEE�
eee�`��$�����[�n�޽�oT�ڔ�R��;ܜ�v]��)��.���666N�4I��AAAL�eO��ɓV��j��A���?|�0}���
+C�]�l}�lnn����l��vP]]�Ơ�fff�a���z��t2��ܹs˖-�o'���ӧ��w555���L?m��6���Ћe2���W�\YPP��9p�!d���QQQeee���III������2|���Β��@ 
+�<yB����	�B�PXZZ�~a��2dHLLLUUUQQ�ܹs	!"��ذa!����ʕ+555W�\�I����А��Рz?��Q�jk�G��Z:ܜ�v]��B���>|(�J���cbb�M���z���	!�������~�-=���g�)o=���ޞ��˗/�?� Ĩ���B�8��K/�/lzzz�cQQQ�=��ކ�l��v��ܜ���o߾e˖�t"������>\XX�u���}�oo�={������Jsrr���,X���@Wmaa���M����&���dz_r��=B�ȑ#�C��ӧO��yΜ9���{�҇_�5!d�ܹ̀6���%����333����'����0����|�ߨ�J�p�:��hg�uXm_�6mڻ�{���;w�tj�...����H��<HqssS�.�:�_~��'�6���1_�鍁����/����\�%_`��tD��|}||���^�l���b��2c���\���|>_OOOOO��6
+�t}XQQ�j�S�NB&N�H�k�C^��[�r9{���
!����PQQ��f����^�.Wgs��˓H$̷jƌ̯J��_����+---%�)oW����+,,<|�ppp����a���_�lپ}�rrr�B��|
�M���н�-��������̼���Y̾�����d���ǎ���kkk	!�@,���k���g��_SV}��������	-�^�A����/�J
T^^~��=�B1bĈ�������g^��<��֦�������J+++f�+����?l۶�>P��]ب�:ӪS�L&KII��w=w�\mm��/�|��qu�kdd���XVVfmm�(++���122���'���}M߹C��U��f���z
+��������g�f�����/w��mm�y�&]}���IIIIQ�+z�w![�n
#�����xa��*�:��İ���o����\wa���F����7F���h�����륭�f��� huh�ӧO����=����={6zԇ#�����J�<y��K$����\]]�mۖ��\QQ���\ZZ��O?єD��<dkk{������������������3=*
+KKK#��5�^*8==��lg�����	!�����񵵵��񎎎�^EO䲲�ڵk׽{��Ri}}��[�������������ay���G�y��
��m߾����t�^zr�����Ç������"##��\���VPP��0л�9880=ʗ@
�|
�
o����$$$���Ϟ=�~*3׈���f_r�/����m�Ǝۍs�vXXX\�~���H�<��e�رt��q��,����KJJlmm�ЫRf|uu��3T܅�joUl{������ksypp���mll���W�!00���Iy|߹���У|
�
o��d�V|>��`_~ԗ���y�f???+++>�obb2nܸ��{���������E�
<X(9;;��������Y�hǎt�Ν;[=�N
+l�0//o֬Y���VVV����1c��
����'OΙ3���V ����;v͚5���]ި��QŶ��9*^������7�x���Q(Z[[����۷�9��z���]\\

���\\\�o�Τ^�����s��511���z��7u������ѡ��~~~�����b������			m^F������mϮ����V���������lggGO+�D���Mt��_x��e�k
�QXXO�Crss[ZZE"}=z4ml���
���jkk333�gXbb�ӧOMMM]]]�g���?s*:����_���յ����_ݰaCuu�W_}EϢhSss�k���ә�0��	&xxx�:���|�AKK��۷�\PP����y&3�B��R�����GRRs�4��ӧ			�� ++�����Ғ�☛����
�G!��o�+..f�񤦦J�R�#�����ۛ�Xh��g��ٳ';;���|Ȑ!,�����v

+
+
+��K{�
Ƅ]�0p��|{V]]]FF�D�H$�����Hdii�u��9���������������=���|{�#"==��͛��H4l�0�k��UVV2wMS�apww711�Fh�/�!�r����iii�:"��^&L���Qn���3a��08991�I�à|
�
�W#�;"���***LLL����
�RiJJJ{=�����E|
�
�W�Ў���V���\��;�=���uuuVVV����a�
������
��nܸ�|�dz���a�%����MTwDЛs]#�&R�a000�����w���lmm��z�/�!�j1��7LGs0��UTTH$vC���'N�H���?��ؘ���!�������?SSS�g|ZZZSS:"��q�sX777W.��3W��|
�
�W���_�~��0^�t���������_����O�0�/�!��>vGĭ[�
+�~���S^^���D�322������?y�dzjz�
��|������akk�><f``�u��)��7o2�������x�au ��o���ܜ��M���˗�<ybll���N;�'O�ܿ�k��K����Аݶ>p�@�k-��l���;"���x<�5��+//�t�=5��0X[[��C�P�u��e|
�
��@;"�+�766�#zz��!��/t@�#B(����\���,vCjjjII���!s�4ooo�k݁�l��9舀.x����˗�oNvvvss�
��=
��|�몪�RSS����8p�@///�===


����������C&�eeeєs�ʕ��2vGDPP���5�5B�jllLLL�����a�D&L077�F�s|
�
�z툠��]�~�Ju����@ �F��|
�
�z\uuuJJ
+�F�������f„	���"�Z�������S������|�W�;"���JKK�����Fh��a�H$���UUUFFF~~~�a͇�l�����b��aFF�\.GG��(++�r�
+��dee�d2����0�vA�6_�����&L�I=M��AOO��ݝ�2h� �k�4_`C�M�tD������	WWWtDt���&馤�TWW��
t�/�!��h�#��M5~�xtD�O��a�С


tg��
t�/�!�������v�Z{~~~FFF\רY�ryFFsu9�0@���l���d2Ynn.=��}vGD@@���
�5rC�������ח�ooo333�k�
�����C�#��Ύ�s�������5����Ҹ�8v�����I��x�����}�/�!��nb:"������t�#��a�q�����ah��|A��;"
+�������C�r]���{������OOMC@+����}��uD]�r���F{���iͣG����\���|
�
��������L���>}jff����mGz��/�!��GKK��۷�\PP F�E�f@@���}ϭ���>))���k׮���XXX�[�������������
t�/�!����HOOOIIinn����������ѵ����d2GGG&좇
��!��/@�TwD����3�r�P(?~|VV�����~�m�0t/_`C���vDTUU����S�h���%ӭK{ƍ7mڴ�?�����U�����LrssionRRRnn.!d̘1~~~^^^�$55���a��
��i�������I�����=++����Y�����m�<y���,�H$Izz���v��y/<s�̜9s���mmm{�Z����|
�WWW׿����W_}��Zt
+�/�iօ�
�&oo���X�
�e�aʔ).\�
+]����N���ѣ۷os]��B��^^^���C�@�A��� 00��� �h
+�X|�ҥ��f�
�M��B,��Ԥ��q]�nB���G�2d�ŋ�.@7!�h�X�6_����A�L����\]]�u!:�@���▖����
�A�d����ƍC�@O@��,b��
�_�"�oܸ���#�
�5��%  ����ҥK\�k|
4�������|
��/�ơW�U(\�S|
4�X,...�u�ׅ�_����eii�k;t/_������н|
4є)S��⚛��.@w �h��S����\�v��Bt�/�&5j������/���<y2�/@7B��Pb��ڵkUUU\�#|
4Ԕ)SZZZ���.@G �h(�6�x<�������/��:u*�|
��/��2eʭ[�<x�u!��@sM�4������g/d�x,�%


!!!��&W^x�����@�#Flڴ	��
�.�)
+�k�vM�<yРAG�e����K�#ӧ.\x��)�����*��K�~�����uvvNJJ277�
�UQQQK�,�'P8��ѦL����f��`a���իgΜ���Q����o�����UVVV__������u�ƍ��ݵ-�B��hS�N-))���Q�%_}��̙3MMM����	!Ǐ饗������&N���?BN�>�ٚ
4�/�F��𰲲�Ե;��?���$�|>�����>|8!������
h&_����;|---[-Q��mhh`�O��������r�\�nnn�Z���@Ӊ�⸸���&f	
�2�L�H���mBB{���3!$%%Eіg�������bq]]�իW�% ��<y���Q����!���jjjΜ9���=����&�̝;�������


MMMyyy����΍
�.g��
��k�}�����U�:���e���~�m�̙�%���zDD{�ڵk���6׎w	�^����/��5c~��k֬���
+����^���=z�P(2d�֭[����j̞={bcc-Z4x�`�Phdd�������gffv�pG|
��?��t�Ҳ�2��@�6��b�X�P���q]�C����֮����������b�ŋ��@�!�h�X������
t�/�v�4i����K��.@[!�hCCC___��t�/�֠m�r���B��/����O�<��������5Əoee�n��A��|>����]���M�L��������u!��@�L�:���>))��B��/�6>|���#���@����]���e�b����+**�.@� �h�)S�(�˗/�����������sbb"�u
h:
�@'477߼ys̘1����/���zzzr���ʊ��4�/�����ӧ��������F�@ ���S����֜�|
�@ss��͛
+!�I����_���@�1b���<��gMLL|���/�vx��7�N���������e���u|
�FDD�����q_4���@k4h�޽�����h_m�t��_|Q(2K�|���
�%
h_-�o�>333=�����������$����e���#""��{	!<�@��g޼y���
+mx���8�
@�ZiϞ=���zzz2�G|
ԁ�������?�P(
+���w{�A>LJJ�
+�e"�(!!!-n�3� IDAT-�����Z����s�=�u�B��AIIIK�,�
+�}7n�B9q���ŋ���]�=N�Pp]�.p]�u���4��mڴi\��pr�	��' �@���}�/�	��' �@���}�/�	��' �@���}��F��x<O�V������(
+{�����F�3�~��ն�Ħ�9g����~F��[[�y����ǷVXX�z���Ç�7nݺu���]���P(N�<9k֬�������̘1���W(=���������d�u�0���џEV��~���C
�U��F�3�~��ն�Ħ������{g���zy�6÷��^LL�̙3����������*��U�3!���vɒ%gϞU,�O�:enn�a�tu'N�X�x�:�{�������/����ㄐS�N555i�džB������zݱMMM�������ryXX����뫪�\\\Ο?_^^��Ԕ���w�^//��NEY�r�ٳg-,,���ˢ�"�T����ݻw[ZZ��ƾ��k=���G|{���---r�\���-pėp�k�#��=��Y\\<x�`CCÆ����ظ��!//o�ȑ�8Ull�ԩSMLL�^�:v�X��srr|||���Ξ=��/�S9�����_� �J�o����flllll���cǎ��f��"�H,,,�|��={���M�---�===���õБ


!!!����O>qpp0003fLddd�aG�
���0001bĦM���mՔy�޽�s皚�Z[[���[���mvmv�RBH}}��ի������^|����B�)5wB��ۅ%��v�����ijjjll������B�gaa!��钬�,ZgVV]"��-,,x<�C������
+u�<��g���Q�W=�L&��o&N�hcc���?hРE���ƪ�-�055e�miiIa��LE��ƍ[�^B�رc7n�H9t�P�V�q�cN�8��V��hll�4i���.((H*��3��*.\�`lllbb���V�_�…;��Ͼ���f�����r������:gg窪*�*++���c�\�`A�:\)3�y-��sϕ��waW��#VsGI��iӦ)����������	!�����iD���蒌�B���}�s*��)�{��=ֵ���9����}�s*��Ԭb[�+����O �,[���f�B����U�:���-�ɺ6���!$''��b����?q!'N�PgdoR�}�����
+��������������o����nBI�ث�駟������;U��k<x�3gjjj:�|Ȑ!111UUUEEEs��%��D":���t������������$���\�
!W�\����r�
+�qD)��X)3��ޞ�s���C�B6m���]�bg���v��I���ݻ<x��ؘ��4��.��
+c[�|9!dϞ=��)S�������b1]B�>�b�
+�ۥ<�:{��Wua6uvN{Ӷ���pNcccBHXX�Ç�RiyyyLL̴i�ToK{e����fLMMͼy�����W�\YPP�٩

	!


mS__O144T�r_�px;�A�|]\\!����$�����3�Y�ѣG��q㊊�:[��k9}����_�p�Y���O133����	!����Wݻw�2r�H�
+��yBHLL38::��X�b�����~��2f̘N�6����w���+!d����Ouv��W۷�~KY�h�B����300

ݴi���a}}�B�X�h!$""B�v)ϬΞo�U]�M���޴���;�s��ф�iӦ����s�:��^l�������#srr���,X@��B,,,���;5�:����R��|
@����uW�Leee셥���###u0����3f������J��TTT�99��i-���3>�������h�1 
+�+400 �TVV2VTT��T���<=��Nhs{[=�pGBJKK�����i�06��P(�ŭ~��wڥz��9�B1p�@BH~~���R�Y�=�ޫ�0�:;��i���w8�D"a(5cƌ���ۢz����׮]K���*..V���\�XLWک��iupqqQ�r_�p8��o����o�>r�H����y��#�V��(
+BHKK���\.W�������q��B�T��NBRG)��3lذ!C�������?���D$�D"cc����߹s���d�С���]��{�|/��t8����;w$�g�}�h�"SS�s�έ[��k�����v��=k֬���͛7�9j�(��:!!�SS���BN�:����6�ڵ�\.���'�����Q�!�./�믿B���;����|�;���_v{���ٙ�����76����Ubb"�D"�ty���G�iO��@����^���_~Q~���GM


��.���\�p�n�@e2Y��ٞe���WgN�@���q�Ɠ'O�Ka\�p����k�.�@p�ȑ��<�*++IGWLS�j�ʕ��;v�������c�B��ի�P��hjj� �I�{r�����Ç������"##-,,���ܦb{'O���ڱcG����Z�����[[����766����߿�ĉ��ׯ_Oqtt���������gL��R���T�ɓ'B�Ν[TTT]]�믿2D�J�}���33������Ç����������5WJ�����!_~�%]��_B�N�J���oU�=B���ߪgT�=��˳��s����w8�����#G<x���\ZZ�}�vB�����mi��V������_+
+WW�m۶%''WTT�����O��8((�SS)
+z!KKKz�T*}���={�_$�l٢�`��4��a߾}j�(@_��ۃ:|ۤP(�����
+��T�p��?O�8���	!۶m�*�agע�&�^�b��_RRbkk�CO{�Z)}��/��b_άÝ�|�W�BW�+Q&�J�L����wj����;w�0�ܼy�.�q����ݻ*�=|�a%j��,�u�s��g���w8g�˃��UoK{e�Z���####�����޺!ׯ_��T
+����fƌʳlݺ��:۬\��={lmm��4�o��P(���]\\

���\\\�o��$-u���=���>�HuU�%�]K��������E�
<X(9;;�������m���˛5k������Upp�͛7	!��J�����7�x������d޼y�ӹ:�	
+�"""b���B�pȐ![�ne��݅%�Jw��AWgbbȾ�@����+}��!C�Q^��sϵ�jΧO��Y����^(��R����3Φz�(��G�z����7�x���Q(Z[[����۷���n{��^��CCC	!��r����7o��󳲲���&&&�ƍ{��Z]�E��(�\��?̘1c��
LG��/�mV������>spp�
+��eq­2����_���^�|��Z��Ν;7n�(
+���3g��*ͼe�'�|r�ر[�nq]h���c���			��Տ?>p�=u�}w4Pdž
6o���ܼhѢ.���!��˟��)�c\�m~��V@����@�|��'�|�	�Ut���2zf!�_�%gΜ�>}����������7n�x��%}}}��Δ��0��*@S��/莙3g�ߏ}AYY���'�U���_�Y8�l�����=
�u!�)|
@7ݿ_&��1��B@S ��n�w�!d���\��tӽ{����,,,�.4�/���|�6_�Mw��E�6_�M������\W
�tPEE����|
�
�tPvv6!��͍�B@� ����̴������� ������Ǎ�u�Y|
@I$��'r]h
�辨�(�K�[JKK�ܹ����u!�Y|{ܒ%K�.
�o�H$zzz���\���P(��
�OuuuHHȑ#GBBB�o�nhh�uE��aÆ�����L�
͂_�
+ss����oQQQNNNIII\W�_III8��|
��O�����������uE���:--mҤI\�����MLL�޽{w��!��ݻ�uE��]�xQ.�O�>��B@� �����x����������Ǐ?r��A�v��y///KKK�
���������իk֬Y�r��ŋ+++�����~�
�{
�M��m���ϟ?�������uE��ܼy��Ç3f���D����bqff���{PPкu�R)�A��o�YYYyzzr]h"_�~���?��sdddDD�H$����"�+~�������=�
�z���˳���B�����ݻ�.t߃�]��`��

��=���1..nӦM�ׯ_�`��'O��t�/��bnn.��.4nY�!99y�ҥuuu3g���M�'O���;v�ׅ���_�
'N�~��ԩSgϞ�z����z�+]SVV�����/r]h._�%���;r�ȉ'N�<9a„��,�+����ߛ��Ξ=��B@s!�@�z饗222���|||�o�.�˹�tđ#G^z�%CCC�
ͅ���������aaa��ߧO�^\\�uE��rrr���_{�5�
���������������wss��_�������&M��u!��|
�3&LHOO���ϟ�|����Z�+�$�ˏ?�x�b��u-��p93�ީS�V�^mmm}��1��
-�믿Λ7///o���\�
G|
�{.���qtt���	kii�"�&��׿�b1R/t�4����ٳgw������uE�
+
+
+Ν;�z�j�
-������[�.--��������ѣ\WZ`���vvvs������YƎ����r���˗/^������@sI��C��X�B p]h
_�8����w����������㹮4Աc�***��׿r]h_�PӧO���7n��ɓ?���T�uE�Y
+Ů]��,Y2h� �k
�˙
�FS(x������;6r�H�+M���O�:533��Ņ�Z@;��/h4����&��\]]w���uE�)���ˀ��^P�/h�1c�$''�]�����_�payy9�
��ܹs��ٵk�r]h�:�6����W�X!��"##_x���
άX�������ٸM1�G|
@�L�2%'''((h֬Y�֭kjj�"��ݻw�;����#�����������ǎsuu��Uo��֥K�nݺ����	���VZ�|yvvv�~�|||�o�.�˹�zIQQQDDĆ
�z
��|
@[9::��Ņ��n޼yƌ���\W�a������_�|9ׅ��A�-&����ݻ����uEг>|�w��?���А�Z@� ��������Ș>}��y�/_^WW�uE�S�m�6hР7�|��B@+!��.077?r�HTTԯ�����y��u�+��WPPp����������>׵�VB����K/edd���x{{������p]t����C��\���B@[!��N����t��'�|�m۶I�&���s]t�{��:t�>
+�\��
+��ݔ����k�����ݻ���^�xV���{��QJJ���@��t���WVV֊+�.]�x��O�r]t�ŋ���w�܉��G|
@ǝ>}:88����ȑ#���\��������aoo��/�p]h7|u�`����''����>�����늠s"##o߾�k�.�
��#��'(�={�������=zt�ȑ\Wj���9r䫯���_p]h=��>���[�.--������c���\Wjپ}{KK�?���
]��}�رc�]��jժ��zk�…���\W�ܿ׮]���?,--��t
Z�/�p��ʕ+
+EDD�/��u9жW_}5;;;33S p]����hڴi���^^^�f�Z�n]SSS���ry/����'N|��GH��]p��.�Bq���������رc...�g�b���LJ�U�}�L&��򲶶�x�"׵���_�x<^pppjj�P(���޽{7�X��-[���V�Z��o���w�����o�.t
+������O?���?�ő���
�t�X,V(zzz�v�Z�n�5v��O��e!��`���శ۷o���}��'6l��=��q�ҥ�˗K���?�|ݺuO�>��|>?99��ˋ������	�w�ܡ�x��	!D(��ۏ1�r�����B�LF����	x�ȑL����j
+EPPPMM͵k�����ۻ���|��4I�t/K�tI��)P�E������#ʨ8E�dT��q��8�8�8#�\)�J�f`@��x�BiKҽ-�%m�������I���Mۼ_����s>�oN�7'��=н|
���իO?�����w���" I������144Կ�g�۫��u:݅.^����t:]]]��b!������t�Z��hrrr�j�Z�v�&�������HEEE[['$$��Q�TR��[�m۶E��9s���o����/��|���F��(�ɞy晿�����J�e\a�fܨ����4a�u�q�ǧa>_�|����nN�| �rnll�h4,x�w�\-@g|
���.u9��D"�ꫯ�O���%�l���2a���t���V������srr�
�3���i��.����\.OLL���h233=]X�p�c�.\��M�@�����r�����������"##KKK�
�C�L�.�n�g\�+}�f�4�#WiX�V���(
+��ÇO�<y߾}S�N�k#`�B��������^
+
+��r�|ʔ){���}�F�I\�NWSSc��$IJJJ�ϸ�s��+++9���dIII�����W�^���4�R��w�0!�����b������;v��f

����#�H6l���_�������RѨ�+W����2�F�IMM�O�`&�I�Պ�?K�D'������/.���@�f��9sf�޽�wﮨ�`�i��v��\.���F���Ž��K�.��knn&������d�E`���!!!�ٴ>�l6��׋.ګ��b��cbbDW�eee�����j�7|
����8�w��ӧO������ٜ��{��QQ���t��jȸ]�Ұ��iڄiX}�m���������"_�z}yy�������w�ܹ��:��*�J�����[�g�X���D�𨮮f'�Y�/�)|
�������B�S;;�+��222rrrRRR�RiCCÒ%K��?����a>�KI���@�����
�� �@�jii)))]\�2�B�]Y�V��r����Y����Zќ.\0�Ltsf�x�ȑQQQ��z�/|W�\q��e\�R��hD7))���_��l555�C��ŋF���ҰZ���ɉ���w�p�|
`@ѹ�2nXXXVV��������]2�!


�
JKK
�JÌ�K �@��q\ee�(�j�Zv�������Lр��{���fѰﲲ���v"���NMMEᔔ�D��
�_��3.���hFDDddd�.�Gƅ��nG'����z���
+�4�� �@�p8���DW���כ�f"���LOOW�<w2.��͙�@\QQ���FD!!!���p$''��j����!̸|J�3nTTԈ#D�̐q�?��0���������iX�o9�a����=�n�WWW�~����X,D�<w2.l�4��:�\�BD���			��;*���:n�/t'�qEW���E�ȸ�sf��4�b�a_!�@�l���2��O���V�U"�����njjjtt����g\����J���rybb��L��dffbj�� ��gF�Qp�d\�F����P(�]5��e2��Z�诲�4��*�J����?_���`(--eܚ������,��5>>>$$��U�5�Q IDAT�����z�@���*��!�ɒ��Di8;;;44��U�*_�����q��%���H�R�J%����ai��g�����n���KK�������]5@OA����eee�/?v#_�qEӋ&$$��j�����N�/ދ/�i8&&F􁐙���
�
�/�@������u7��2�L&�����ILL�������j���֊~*//��lD#�	(###""��U���kkk���
�cW�Tj4ѐ>d\��s��t/^4��s�OOO����w��B��Z[[ϟ?/���e������lQ�MJJ”F�l6[MM�(
����9
�@<r�Ȩ�(W
@�����_�*))}������%�R>|��K����?�/]����ANiX�V�1bذa�.�/�?�\a7<<<33S��79�����Y4�������\�a��%�@���8�����,�FDDddd�.A�����������z=u��SRR$��������9g�.�t:��DD�����颩��q
�7gf���������
+�Z��H�4]���u����J�I]__o6��(:::''G�I���=af�.\hii!������x�y���䠠 W
}�/�W���m�ϸ�w?B��!�4��u��a��1�a�!�������j��7�����X,D��Rd\�rN�'$$��V�TR���UCoC����2��c�q%IJJ�(দ�FGG��j�JKK�V�E���J��i��H��/
+��VVV&�c����j�%''�>����CBB�]5t3����� :�QUU�p8�rybb��|�F�������_��F�(�̸�^�=�^�z���gϞ嗰+��_��m�f���?�+ӥR�!C��_|����VUU���9r���N*�����{ｏ?��رc}�q���oݺ�ܹs�����������p��_����J����:U��>~x�;vڴi�����ט����z� ���0�Q*���|�����`(--eܚ���&�JU*��������`Wݝ���322���'�|�_أ���,-�򂂂����N��~���yyy����k
+�ͦ������Gٿ��ʓ&MڵkWdd����#�ڛ��V�/�����˖-�������	���b���]�\]]m��e2YRR�p��
�����Ν+***((��ϟ4i�9+�J�j��i�V�Z�aÆÇk�Z����{�s�=�P(:::�{����txS^_k����|���x��Ǝ˯s��ѨQ������ׯ��沲���_�����8n�ܹD���o���X,����w�y�]�9mڴnq@~��>~x�������˗w�3�%�٬�j>�aÆU�VM�6M�V�#����&M����_PPPTTt�ܹ��v���3��������	穹x�"�əL&�������(���]�ttt����u�]���.Hg|}���
+�ihh���W(F��-	

5������鷸�#G����aaagΜ1b���%%%�ƍ���ؿ��>�M탛t�o_><x��o�����A�Px���j���ͰV^^n�و(&&F4�pfffxx���H~
+�?ikk���>��cƌ�S*�cƌy�ᇅ�q-��K�C>��S"z��7E�Yvtt���<8<<|֬Y�Bf����_�"***88855uŊ---�)������7n�Сr�<..n�ܹ��:�n�<���f{���T*UpppVVVaa�h57�pN��._�<}�������/^����C��7;��?f���� 77W�T*����ܵk�
+�=�
wY��`x��bcc�R���.���'�!C��K�ND?��Cg�~S�=��^���V�^MD���w�#��E�7ﻨ�rss�hǎ��ر��rss]��7ǃǃ�e��~��1cƄ��)��_��{���i�=t����k�QQQ��� ��"<7����3�3f̘'�x�?7�����>_�=���,���+��ϸ�����[__��z��g�y���a�a�:g�a<MHH�~�:�q��}����䴶�r���O;?K����<�����/H��p7U755���m�~���d29_�CD��s�}]6�e%�Wco:�����'�x�_gɒ%D��SOmݺ����l]�Trr2����,����D�R�:��Kn�"��wQ���D4}�tᎦM�FDo���sp^�T"�e��ɷ�4Q�nzR�B�<<<HD�/v�
+�Y�V�4����~��W^y��a�ȁn��=����ܹs۶m�����&̸'N��qㆿ���F�ID��բ嬫U*ձc��z�ѣG����h�ʕ�mڴ����㋊����éS�إ߫V��8�}�^��Mi|������ɓ'7�Myl���������֚��3fф	�
++�^"���d֮cǎ�T*�1��N=�OAA
EGG666666~���j��k׺�������۷O��{�(����k׮������3g
+W���|��'E'���=�h4�,�`0�B�pS�7�E޿�޻z��L&���|s����r�\.oll�P�!n�o*�7�x������y���Z��t�ԩY�f��4Q�nz�����D4j�(7��nܸq��	ac���W�Z�m۶s��	C� �­jnn���7""B����۽�BD��X�{��/�(;;��;��?.|�V�%���t�㲲��h���˗/߼ysEE��ƽ)��y��!~	��RDD{���233�����_yϞ=.c���z�Q�Fі-[�Um޼��F���\V�{�n��Ĺ�#C�9}���%%%s��a��(::���iS�$����e���(��}w��ӧ�����_���f̘�������A%�F\lܸ��)_i��������BDC�u�
+�7n��"�#��i��Ejnn�w���/����A���q###E�� ��6���o��M~޸q�~>O�N�I�R�T�Or$��9�;y�$���L�2��ի{S[S�
�p8�/�X�hwl�e�v9�7;��?싿��Iؖ��F"R*�n:��^��C����aٲeD4hР��7�*++�4i{w|ڔ7�e�9{'JN����(��}w�]�vѝw���7�n�Ǿ�T"l�&�Y��C�����xX�Va���4,7�O0'JÇv� _p�y�q���D��q����΂��i&��V���ɓk׮�7o;��裏
+7�My.�.��_3�ǝz�o�/K3��_��	�)иY�"���z���\�BDaaa>m�
B}��W]n�]���sϹ�V�6���Q���.d6�LDZ�����D4x�`�܅��|��4����v�766�}=У�4�_)��q�4��j�]�� �:���q����_Ktt�]w�%���Oac|���D�����O���~;�={�˽�j
���g�Z=��c����οJ�t8O�Æ:l۶M����Bu6l�t:~������@�fͲ�2�L&�����ܼ��ŋD�Ӧ:DD����ϟm����lX��S�Hx����<��s,���t�R7/�x<xsP��=��6m���T�օ���6Ɨ�X�a��Ͽ뮻����iX����
+�7�8g\�F�O��V�Esn#��}lV����������X�6lئM�*++
��d*++۸q#�y�ĉ�1��scc�5k�_����D�}���F
��p��c%��_|�E"JII9~�x{{����SRR�|�_��m۶������-[��o��6v��3f��Դ���ݻ711��/�q���D4o�<�077���_?}��7����_�q���s�O��8�M\�.�b��z��w�;���7e���(��}9w�edd�9k���;᳾�T"��(""b���uuu&�������.4����c�ǁ�:��4<i�$�Z͎
�B��hvF���v��}e�/z�w�`���i��>�fϞM�t]�-]��:��\$??��Vxod���3��JD�_�z��j�+�e2�O;u�?&�i�ĉ������?�;�͕�0�}%�wT}}�R��H$�~�-�ɛBD�������Ӧ8����S�Lq�ZHHHg�q��e��Q�����ȑ#]���9�D,�}���Y�6�}K;[�O�_5����q����{!!!��F����.��|�=���2��o����eܒ��g�ioo���|��D�ٷT{{��E�bbb���fΜ)�]��#G�̛7/>>^.�+�ʜ��^x����8���Ӌ-JII���C�?~��
�K�ZZZ�,Y�R����uV���������z����A����s���{�S��c2�
+
+
+F��P(�J�Q�֬Y#�	vaaaVV�\.OLL|��W���|
+4�\�jM�4������_�뮻
$�J���F����������M1���>�2e�СC����_�uo
+�������}Y�n[�7�=�ͻ��A��b��[��!aaayyy‘3>5��q���ɓ'GGG7����h4����IÓ&MZ�lY�Jøeqb�۫����{��"�92�������{!�[#��dzزe�6n�x��u~�ǀ�~���K����=z�ߵ�oo��Ɗ+�r��_~9u�T��O8���9<:::��Ͼ����*z��l���E���*����� �"*�J*����C���l6[YY����tl��0����F�
X


����ׯꩧ�]Ko�5k֋/������ѱw�ޗ^z�������c<������?��?J��믿v9�c��A������e˖UTT�n�
��a�N'�,
�����&33�M���|��d2]�pAw3�q�R�J�\�Z����瑱Y�z��}����[��YQycƌ9u��(��pP݊�c�N�6�W^�w!���"Y��quu��nwN�j�:''���� ��*��(:����jjjl6�L&�����-2.�K�����w����ׯ'&&Ι3����=?y;@��5�4�g���r����DiX�Ѹ��W�=�`0�����Z6��B�\�Z����_* �Vkmm����L&��ʼnRSvv6�Kb �v����K�.	ߪ�/677�R��h4�����䯡-}��f�����/�F"����U��YYY�\��������2р�q��²��D����
���Ѩ�K�.uttQLL�貨��Lv�t��f���o�9x�`II��˗����V+�lNNΔ)S�������j5���&�Ţ��***�;v��A67#�˓�����X`�0a��W8�����j��of0�H�T�9IHH�'��n�p8���.;a� BCC]�26��-inn�9���d��<��
( ��J8U�D"IIIQ;���q�A��g2��Z�h
+����c;@
�>��3HMM�t��*U�ܧOT__���](�{q�{��>���ٳׯ_NII�0a¯~��q��y�Q+��q���u��s��577��Č3�W������E�򶴴�Z����������8�%��r�5�˨DS8g\�F���څy|{��[���������\�y��E���x�������?x��g��R�����Gyd����/|��������y�?�PX��/��Z�H�ח����*@x{Z>u��i|���-���4,|����1�:���799�����~��O��3g�ܳgOLL��/�<s�̤�$��V]]��7�lݺ��ɓ^n�}�7oޮ]����W�^=gΜaÆ]�zu��ݫW�nnn�;w���o*>>���a����'O�J�.��"_7���***D'��3.�3�K�}��[���i�(#G�����w��1jԨ��LJJ�=�����s�…>�`�����|<���FEE�9s&++�V6�&�9r����;s�̈#��*))7n\GGǑ#G��>�0((��8������y�-B�`Z[[ϟ?/��2�T*U�T���s{Z��٬�j>�aÆU�VM�6M�V��*����~xժU6l8|�pCC��K�
�O@"�L�8�>�~�z����>#���D��$\.Z��?��/~����bŊ��Ѧ���/_�>}zXX����/^̦����l��^{M�Rgee:���ё��?x�����Y�f�k��\PP����T*�Jenn�ڵk-KgU�\���{.66V*�r�裏џ��'o�ѧ�>|�Ljh���.7�z�j"Z�`
�u�8�j������ƍ:t�\.����;w��Ç��_���L����3���L*����iӦ�D�՚�f���}�c�E��ّ��vN�Z���%t�={�<��#����r����?��3���r}/��l�ݞ��MD���p9����`M$''�����%MMMqqq�5�̙#�&{���O��YTT$Z�-�����I`2���n���>�����̝;W�i*���JKK�w��=#z���LD%%%.7~��y"R�՜/�׹K��<V��
��g\�B�4������9�X�V�c�������(�������}��<����O<x�f�	��2	����}�v">|��h䜲ڦM��(>>�������`0�:uj�رD�j�*Ѧ8�{饗�(99�رcz��رc,G�S�KLL,..nmm����1cM�0A��J�b�9z�(�r�J��
+
+
+��@aaaccccc�~ȮX�v�sUέ>���߷o�^�gٿ�Yo��kψ��?�zg��\JD�W�����X,ׯ_/..�<yrת��s~���fG�R�t�V���U������^t4��z�/6�F�4�իW�}��;O����ݻ>���v6��������������j�Z"JOOm����L"*..�W޳g���w��!~�N�#����:{���|��D����qܨQ��h˖-ª6o�LD�G�v�ʹ�‡�w���e���g����}�<y����7o�\QQq+��}v�]�q5
��qhh�(�������n���Zss��B˲����v"
+		����CONN���/kll,**���OϜ9Ö���^�z�w!����O?}���o��6�N��M�����v�-d��D$��-�hS
+��l6777��W���
$�&[�h4��ODZ?I�:��Q(F�Q�T�L����!C��-jjj���U*�,5��T���f7n�N���\]]]ZZ���6_{F�0%%������$''�y�%%%#G�T��,��l��S�N-X�����_2eʔm۶���v�Z�>��pTUU������7��D���)�B��
 �;��U`�����0a„	�����?��'OnٲE��QpppBB�h��J�-S
tY{{��_~�駟9r�f���k�����pMo.��>�<���������}�a���X�V/��p��@H"��t^�獳��:};�y����_~�������-�̝w�YUU�k�.��w׮]l��?~|EE�ٳgO�<y��ك<x��������s�#@������բ9R�"������P����.��׵=�ƍ7Ν;WTT��+���������j�zҤI���{���j����=dϞ=�>�(?nG.�O�6�o�[GG���o�SQ��G}DD�	T~����NDgϞ�rS�C���E�tY��u�uضm�p���$�0l�0"��t�
+_��7�8p��������ܴ�מ=dń���?^����ϳ��G�qS��w��-4h��ղ!������l6�V�gϞ������I�&��j~j���H6V�W^)**:w�܍7�]r_��]ǧa��w�]w�3
+��ra.***))�t;v�I$�	&����v�Z��h����ҜC3K�Æ
۴iSee��`0�Leee7n���;�7��/QJJ������ۏ?��������⶘��m۶555555mٲ�
��/n���{�hƌ555mmm{��MLL������v�
z��7�������t�ƍ�Ǐ�Z�8?�9s&k�;�S[[��>��wٹ��s���K&N�������Z�����5k�Qhh����������=�o���ZRR�ղ���:'**���ķ IDAT���j�q=�_�fl��Ѕ�\�BDr�<11Q}3�F�O:
૑#G.X�����X?9�m���O��._�l�{��r#l5�sss�����̜9󫯾��d�O�ޏ��={6;��$$$����
2������'D����}����tс�N�*|�駟f�O��/oY�S�8?���?�0Zhʔ);w�޲؛1�.G����oذ��j�zꩭ[��l)�O�F���:����������Knx�8V�� �BopN��d���$�_rvv6��5@���l6[VV�}\�������>8}�tcc�L&S��<��…sss�7UQQ������ѣ
+�b޼y˗/�h4C�mll�l��������~����eҤIo����l6����۷o///�H$���,X�|���I[�lY�v�V�6l�3�<���/�d2罸���8n׮]}�ѷ�~{�ڵ�������'.\�pܸq]���qWTT�u��������M[��OΟ?_�b�	�gΜټy�?�񏺺�������_��W�-�^p_mkk����߿����|��G���wbMM
�JA�
+2n�@��iii�j��?{v�)r�O۬�,6� �_�~�ҥyyyG��w-�u�.]r�C�D"III���T~V�v�з�L&�V+���O�111��233�?k�_�f�z��sss;::�����K/������{�=���K���������knn&WW�Ѥ��
+�i�^�����l���M9\UU�p8��4,����7�#Mnjs��)� �#�z}yy�h�0�q������E����LJ����j@��~�]�-��uuu5�q�O���NZZ?�@���w�}���~�zbb�9s~����������^�|Yt�e\�T�R�D?E&$$�߫}�/(�4�b�i�}N�1C��iii)))
�f\a�E��|a�Z���������ų�4�V�srr����]5��+W�\�pAt�5˸2�,##Ct�ubb"?{.�_���ӰN��x�"�;�sV��)))=q�X�9�UVVꜰ��T*5���wC��7��VSS#�p,--5D�P(��`�a�>�9�s�&���BCC���E7))�MS

�����ѐ�K�.uttQHHH||�h�WrrrPP����GUU�芎��z��LDaaaYYY��:�����|
��ݎNx�oYYY{{;���E��"
t�0���|�
������MΠs�݉�93��\^^���(888!!A��R��ۢ8��^]]-:�PWWg�X�("""##CtN
|�����4��_�|����nN���9�0x,�&��3nTTTZZ�h2.�:_��a�/\����BDr�<11Q4:-33W`@d2��'����Z�D���#�nz�/@"J�,_�r�\�a��J������h]
+���jjjؼ�qqq��������sN�:�������:�dgg�����j�Cii���K$����d\�;_�~�d2i�Zљ>
��Ĉ��eee�����j�������D�*�@8g\�F����P(�]5����l���],RUU�p8����	qFFFDD����>D�ח���f�a7(((99Yt1n|||HH�����/��Ұhz Q������HW
=������B����q�d\|
��b����ԩ�����$H��w^ZZZTT����.jmm�|���� �q�R�J�������
��/�D���@�2
3#F�6l�������_�*))]�2�L&KJJ]��
�ܱZ����Γ��L&r��W
��{�3�B�p�8,11Q.���jB���l������ŋ�F#u��SRR$���8�����,�*�J�F#��KJJ�-o�!�@�ihhͰVZZj0�H�P��j�)(�a���y�~c	����i4��Ç��j�~�zVss�蒚�����v"
+		����8LNN
+
+�w�=��pTUU�F���כ�f"
+���]f�@�"_�v;:a .//����s]c�4��0��=�q#""222�
W���
�_�+��3�ɠ����������D�@�RI�RW
p��^]]-������b�Qdddzz���uȸ���4>
󙸤�������rybb�h�cff&���a�����D��kkk�V+EEE�1B4���|
���a��\�B��0��N�P��j��L&���eƍ��s�;�B��
�9
3����\����瑱�1���������f���d\�������V+
+1������D]VVVXX����^���q��%�?H$���Q�MMM����w��u�pL&�V�
���pLL�h�������pW
�������Lp/^��n�q5Mjj*��<�DDf����^t1~UU��᠟oG'���\�����庛��c7(((99Ypsrr���CBB�]5�_�NY,���:�9B�NW]]m����3������H[[[EE��+,�J�R�J%��JBBBpp����A���0
��ef�k�ȑQQQ����kmm=��h��0�� ��3_�n`�ZkkkE�I�����DiX�V���������>�ʕ+�s���+��222D�$&&&��rW
��/@OqN�:���ŋF��\�a��U�*�+,�*�J�F#�d\����f���Ԉ�^ii��` ������TQ�KII�H$�.��pWYY)j�V�mii!������lQ����p>�^�}BCC�h�K�:::�H�P���"
;���*Ѩ�Ng2��(,,,++K4z������/@��nG'����������BBB���E�$''�ZyŒ�Y__o6��(<<<33�O��H�������o��g���r�^OD���			���R��R�-��n�WWW�Rx]]��b!������Q
+G����` ��0�M/_����J7�a>��I�,�&��3nTTTZZ�h�0d\�|
&��QSSs�fZ�������H "�j���B�HMMMOOOKKKMMek&%%��h
+�n��@8������K�.QVVV�����s]����ϟODEEE�.�g��*�|
   �@@@�����

��/_�|
   �@@@�����

��/_�|
   �@@@�����

��/_�|
�'�D"���
+����

��/�$�%F�q�ҥ��v�L&.wގh�'�|�������r�����n
����]�����h�Ν�O��d�Ν�k�.����B�����۷�6���s�ԩ����n
+�;8�D���	W8s�̾}��z��gL>����۷���555�S�N�;�…�ӟ��
���/@�cg|���\����O��޽{�����ݜ�7n�����?~|�ĉ�
+:�.555==����'������!//�ח�?����~`�SUUս�
x��^���-�H$,��W��F�
+,���v�Y�֞)�S�?a��f�y��m��F7��=q�p���":{�,�Jw�
�%_��СC�h�Ν&�ɛ�5
-_����V���۷�g�������f̘�y�檪*��h6����7m�4~��h
�;��
 ���=��S[�n>�f�2":p��ԩS�K�~����B��˖-{��\�_@��p�~���o/Y�D�R��ro�������rybb⫯��q�F�:���#G�͛/�˕JeNN�/������@��_�@ǟ��w!=g|
   �@@@�����

��/_�|
   �@@@�����

��/_�$����U|��믿n���C��@D����T*���~�x�b���3|
��˗���;{V"�TTT����fI�CNZZ������+@"��~��H�0 !�����R�t�…�_@/�P�@����p8D˥R�+W�ꗪz�����ؼ�<�T*\(�J���z
`�B�PO<�
uPmmmC��X,����দ���H?V�sp� @EFFN�:U&���2�lڴiH�0�!��������n_�`��
�Q��L&Ӑ!C:::�(<<���I�P��(���3��K�P̛7O.����y��!������y���j�Zy��гd�.�SQQ��K�~�n����Qss3�������]�0�`@�H$�.
R�/8�0��ر�`�'�O��H$�ƍ�w!Пax�;����/@����
�/_�|
���_ۛ�zϏ���n��ہf�yժU)))r�����ɷ�-���yy>�5�����^[�vmm��G��
���_��������^�[����oD�k�.��ܧ���s�\�]�2����U]]MD�g�Ə��g|
@���3�K�.����d2�p9��V��1cFxx��!C�}�Y����
+D��'����EGG�������\�����c%���������CBB����l�"|��o�y�'�r����'O�|��!熻�Hee�Y�X��,Yb0D5X,�5k֌=:44444t����֭�Z���ѣGK$���"�K���$��ѣ��[ؚ�a���C�����={vUU��M�o�l�w�y���o

���+..��x��r��h��p�w�m��v"
+
+
+�w��^�?_pgg�i��m6�_��;�366688x������;r����;.��~��v�����Οl�ܹsE��ojj���~�̙3ǧ�c�=���������꾒����O��VTT$ZGH"�|���o�ڵk			ne2���n��s�=���7�|���O�.,~ڴiD��[o�P��E2			ׯ_�lS�`�X&O�켂7�{�@��1)z(�
o��y�"��}��ܾ�G����k��og}�r�����cǎ.��_p�(�}�7>>~߾}z����/��%'';vL��;vL�R��¦M��^������éS�ƎKD�V�r_Ig
ILL,..nmm����1cM�0�_��<p�@KK��b���{뭷�h�ر�od�ʕD�R�X��=���$lTAA
EGG666666~�ᇑ��D�v�Z��^�*���r��k��K����r�\.oll�nq.x�ʕ�m�c�x�
"
+�wjkkM&өS�f͚�M�;��%��z���묋���߅��l���U����P"Z�zu]]��b�~�zqq��ɓ��_�%.�i���Y�
��/��޽��ʙ��DT\\�?�g��V��;������]h�Z"JOOw_Ig
9t��D��QDD��ȑ#ӧO6l��i�B��F����hϞ=�
+_|�Q�F�"�-[�kۼy3�=�=�>}:���������hƌ=�-�gggw�)�M���%��7:��c�;��%��z���s&ڲ7���r�����&O��|��͛7WTT��~����u���P����7ܬBD�����7n��ivK*�J�Ҡ� 6Ȓ� ���W�YC�F#���pw��g�uv�����(�BADMMM���H�T���v�"�;３=7n�0E�D�8��}�Myl�R�$"v~Z�c�;��%��z���묋�o~g{�f��n�4�kO�<���,<h�L�r�������ig�Z�-�d2o*��/�G��
\������sGDv��n�;�����5,��ȧJXjaD1���q�>�lYY����n�[L�6m����O���tZ��̙3�~衇س=�-uצ�/�
�o�F��5Eew�޽w����6~������'O�]�v޼y���|���;[РADT__/\�<����|
�+���o���_r��I�V���!��gϺ�Gy��~�.((���`������III!�'N�K���
+W��� �����ݻ����"
+��/ID�|��'�|BD�=�Xpp0{�'�Ź`��<6������r~���=v �v�mD$�zB����u޼��cq�f���Bg2�l���+V�عs�?�@D�9I��p��V���g�
�ϣ���~�_|��RRR�?���~��q>Ky�Baa!
6lӦM�����d2���mܸ���ǔdž�����~���ׯ777��E������m111۶mkjjjjjڲeKtt4	.��8�ܹsD������ND�}��TOt�Njۄ/�؄?���D�~����:��t��ivq��⽹���{�%�3f��Դ���ݻ711ћwʛ�묋�o�O�KD۷o�j�ln�8q�ď?�����j�666�Y���BCC;��֭[�(22r۶m���[�FDDѶm�<V�%u���,���k���իÆ
#��3g�`��8�[�t)u�}%]h��mi.\�M�.�f:��':7'//���7b���ȑ#E{��n�={�p#�ә	_�	�����6��{3���l+	��r�Ny�u�u�������|�I�e�܂�6�lQ~~~g����S�Lq~Ƀ>�F����S��|�?�!0�Po_�����z����A����_�x�����
+�9rd޼y���r�\�T���������J���Ͷnݺ������Z�ꫯ��>}�
�N7cƌ���A���׿����`2�
+
+
+F��P(�J�Q�֬Y#J�ǭ[�����7�pnN�vK{{��E�bbb���fΜ����7�c,˺u��
+aaayyy‰��9�+,,��ʒ�剉����*?T�}��콳.����KK˒%KT*�\.�ʛ#M����Ӌ-JII���C�?~��
l6��]���k����*�J�R����v�Z~*b�^|!pH�K�"�Hv��1��������.]���w��Ѯ����B1��RTT��#�����
@͚5�ĉmmmW�\ٴi��/�L7����
+�	g|
��<��<
Ә1cN�:�OP�q�i8�=g|�?�_�}��=��qqq������+V���?�!�W�M2ϫ�2u�ԩS���
+��p6@g|
   �@@@�����

��/�-�H$�3������m�f���?�k|
` ��x4���@j��0�/�,L'}��@@@��
��5_"��X,�5k֌=:44444t����֭�Z�]�c�����?&''���dggoٲE��O>�$///:::$$$--m�ʕ����`0/^<dȐ���ٳgWUUy�M��������;�
>|��y�9�M[D
�H$��:�.�Z�3��Ç����5xܩ�����ܩh!{h4�.]z�m��d�����`!�;v������=��t��w;?u�=�X,�6�?���O��-**b+8��{���999���3g��%			ׯ_�f����5�iKge�b넻hjj����ɷ���z�o�b�
wY�ܹs=vTڱc:��
+!���eX)(( �������������?�022��֮]�Ӧ�剉���ŭ��5553f� �	&�6m�DD���EEEMMM��ԩScǎ%�U�V�ߝJ�:v�^�?z�hRR�\�қm�����ի���,���׋��'O��-=�:��^z�%"JNNf�:v�J�r7���c�x�{|�����ۧ�������Y�
�W�e�5jmٲE�p���D4z�h�6�/?t��D��QDD{x�w���Dž��j�D����~w{���|��D�����6����h���˗/߼ysEE�7m��	w���ID�����{��q7���c�x�{|w������/�Gۉ)}�IDAT �dǎ����w!}�)��S*�&����iȐ!�¦����X�Ri0����h4*
+��㸠� ~尰0�� �J�%���r��bq�������h����yРA
+��h4z��S�,X �:eʔm۶��ƺiKge�b넻S(f�ٹ]�z<��c�x����B��ƍ111�*�=��#Hп��6�n�G4\=ưd`���v���p8|Vps9�{�9~������'O�]�v޼y���|��绶�^n�ǝv��k4]���0` ��@��f.��� �����ݻ�����o�999Dt��Y�����'����?�ID)))^nS&��?~Ŋ;w�����СC�ؖ[o]rr2}��7���'Ovy���7o�m��FD“�­
�����СC�h�Ν&��_�f!X�|�G}t�ڵk׮mݺ��^���~S���o~CD3f�ؼysUU��h4�����6m?~���.]�����g{{��c�����ӧ{�ͻ���O>�����lMMM��9�w�-�޺iӦѲe�N�8���q�ĉe˖uy���7o�F�a�������}��=��3]��o@A���fO>����d�8q���a^^��l�iS�w�H-]���a���ٳ�+��uyܦ��������Y��:��_�zuذa�ufΜID2�̧���o�b��`L��`pq�G8d
B�YKK˒%KT*�\.���TPP0j�(�B�T*G��f�7��ͦ�Ii�9rd޼y���r�\�T�������}g�c[hoo_�hQLLLXX�̙3u:���<}���E�RRR�r��!CƏ�a����-��q���_^^��C���4(??��ŋD4t�P�v��y�����rybb⫯�ʏ�p_	0��aV�
�:@��~���K����=z�ߵ�0��G��j֬Y'N�hkk�r�ʦM�^~�e���h=��^��W_}��W�%cƌ����W=8p�zվ}�x�����������+V����w]0��/���S�N�:��U@ �_�|
   �@@@�����

��w�H$ɸq��]puuugΜA����`@y���]��;w�� �@@�_�|
  ����i��IEND�B`�
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps ns-3.19/src/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps
--- ns-3.18.1/src/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,5124 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: cairo 1.12.14 (http://cairographics.org)
+%%CreationDate: Fri Sep  6 16:41:15 2013
+%%Pages: 1
+%%DocumentData: Clean7Bit
+%%LanguageLevel: 3
+%%BoundingBox: 0 -1 480 361
+%%EndComments
+%%BeginProlog
+save
+50 dict begin
+/q { gsave } bind def
+/Q { grestore } bind def
+/cm { 6 array astore concat } bind def
+/w { setlinewidth } bind def
+/J { setlinecap } bind def
+/j { setlinejoin } bind def
+/M { setmiterlimit } bind def
+/d { setdash } bind def
+/m { moveto } bind def
+/l { lineto } bind def
+/c { curveto } bind def
+/h { closepath } bind def
+/re { exch dup neg 3 1 roll 5 3 roll moveto 0 rlineto
+      0 exch rlineto 0 rlineto closepath } bind def
+/S { stroke } bind def
+/f { fill } bind def
+/f* { eofill } bind def
+/n { newpath } bind def
+/W { clip } bind def
+/W* { eoclip } bind def
+/BT { } bind def
+/ET { } bind def
+/pdfmark where { pop globaldict /?pdfmark /exec load put }
+    { globaldict begin /?pdfmark /pop load def /pdfmark
+    /cleartomark load def end } ifelse
+/BDC { mark 3 1 roll /BDC pdfmark } bind def
+/EMC { mark /EMC pdfmark } bind def
+/cairo_store_point { /cairo_point_y exch def /cairo_point_x exch def } def
+/Tj { show currentpoint cairo_store_point } bind def
+/TJ {
+  {
+    dup
+    type /stringtype eq
+    { show } { -0.001 mul 0 cairo_font_matrix dtransform rmoveto } ifelse
+  } forall
+  currentpoint cairo_store_point
+} bind def
+/cairo_selectfont { cairo_font_matrix aload pop pop pop 0 0 6 array astore
+    cairo_font exch selectfont cairo_point_x cairo_point_y moveto } bind def
+/Tf { pop /cairo_font exch def /cairo_font_matrix where
+      { pop cairo_selectfont } if } bind def
+/Td { matrix translate cairo_font_matrix matrix concatmatrix dup
+      /cairo_font_matrix exch def dup 4 get exch 5 get cairo_store_point
+      /cairo_font where { pop cairo_selectfont } if } bind def
+/Tm { 2 copy 8 2 roll 6 array astore /cairo_font_matrix exch def
+      cairo_store_point /cairo_font where { pop cairo_selectfont } if } bind def
+/g { setgray } bind def
+/rg { setrgbcolor } bind def
+/d1 { setcachedevice } bind def
+%%EndProlog
+11 dict begin
+/FontType 42 def
+/FontName /DejaVuSans def
+/PaintType 0 def
+/FontMatrix [ 1 0 0 1 0 0 ] def
+/FontBBox [ 0 0 0 0 ] def
+/Encoding 256 array def
+0 1 255 { Encoding exch /.notdef put } for
+Encoding 32 /space put
+Encoding 45 /hyphen put
+Encoding 51 /three put
+Encoding 65 /A put
+Encoding 97 /a put
+Encoding 98 /b put
+Encoding 99 /c put
+Encoding 100 /d put
+Encoding 101 /e put
+Encoding 103 /g put
+Encoding 104 /h put
+Encoding 105 /i put
+Encoding 108 /l put
+Encoding 109 /m put
+Encoding 110 /n put
+Encoding 111 /o put
+Encoding 114 /r put
+Encoding 115 /s put
+Encoding 116 /t put
+Encoding 117 /u put
+Encoding 118 /v put
+Encoding 121 /y put
+/CharStrings 23 dict dup begin
+/.notdef 0 def
+/e 1 def
+/v 2 def
+/n 3 def
+/t 4 def
+/space 5 def
+/A 6 def
+/three 7 def
+/a 8 def
+/d 9 def
+/h 10 def
+/o 11 def
+/r 12 def
+/s 13 def
+/i 14 def
+/m 15 def
+/hyphen 16 def
+/g 17 def
+/b 18 def
+/u 19 def
+/c 20 def
+/l 21 def
+/y 22 def
+end readonly def
+/sfnts [
+<0001000000090080000300106376742000691d3900001024000001fe6670676d7134766a0000
+1224000000ab676c7966cefcdf900000009c00000f8868656164feeb17c7000012d000000036
+686865610cb806680000130800000024686d747866a80b180000132c0000005c6c6f63610000
+b43c00001388000000606d61787004840671000013e800000020707265703b07f10000001408
+0000056800020066fe96046605a400030007001a400c04fb0006fb0108057f0204002fc4d4ec
+310010d4ecd4ec301311211125211121660400fc73031bfce5fe96070ef8f272062900020071
+ffe3047f047b0014001b00704024001501098608880515a90105b90c01bb18b912b80c8c1c1b
+1502081508004b02120f451c10fcecf4ecc4111239310010e4f4ece410ee10ee10f4ee111239
+3040293f1d701da01dd01df01d053f003f013f023f153f1b052c072f082f092c0a6f006f016f
+026f156f1b095d71015d0115211e0133323637150e01232000111000333200072e0123220607
+047ffcb20ccdb76ac76263d06bfef4fec70129fce20107b802a5889ab90e025e5abec73434ae
+2a2c0138010a01130143feddc497b4ae9e000001003d0000047f0460000600fb402703110405
+040211010205050402110302060006011100000642020300bf0506050302010504000710d44b
+b00a5458b90000004038594bb014544bb015545b58b90000ffc03859c4173931002fec323930
+4b5358071005ed071008ed071008ed071005ed592201408e48026a027b027f02860280029102
+a402080600060109030904150015011a031a0426002601290329042008350035013a033a0430
+0846004601490349044605480640085600560159035904500866006601690369046705680660
+08750074017b037b0475057a068500850189038904890586069600960197029a039804980597
+06a805a706b008c008df08ff083e5d005d133309013301233dc3015e015ec3fe5cfa0460fc54
+03acfba00000000100ba00000464047b001300364019030900030e0106870e11b80cbc0a0102
+08004e0d09080b461410fcec32f4ec31002f3ce4f4c4ec1112173930b46015cf1502015d0111
+231134262322061511231133153e013332160464b87c7c95acb9b942b375c1c602a4fd5c029e
+9f9ebea4fd870460ae6564ef00010037000002f2059e0013003840190e05080f03a9001101bc
+08870a0b08090204000810120e461410fc3cc4fc3cc432393931002fecf43cc4ec3211393930
+b2af1501015d01112115211114163b01152322263511233533110177017bfe854b73bdbdd5a2
+8787059efec28ffda0894e9a9fd202608f013e000000000200100000056805d50002000a00c2
+404100110100040504021105050401110a030a0011020003030a071105040611050504091103
+0a08110a030a4200030795010381090509080706040302010009050a0b10d4c4173931002f3c
+e4d4ec1239304b5358071005ed0705ed071005ed0705ed071008ed071005ed071005ed071008
+ed5922b2200c01015d40420f010f020f070f080f005800760070008c00090701080206030904
+1601190256015802500c67016802780176027c0372047707780887018802800c980299039604
+175d005d090121013301230321032302bcfeee0225fe7be50239d288fd5f88d5050efd1903ae
+fa2b017ffe8100000001009cffe3047305f000280070402e0015130a86091f862013a0150da0
+0993061ca020932391068c15a329161c13000314191c2620101c03141f09062910fc4bb01654
+4bb014545b58b90009ffc03859c4c4d4ecf4ec11173939310010ece4f4e4ec10e6ee10ee10ee
+10ee11123930014009641e611f6120642104005d011e0115140421222627351e013332363534
+262b013533323635342623220607353e01333204151406033f91a3fed0fee85ec76a54c86dbe
+c7b9a5aeb6959ea39853be7273c959e6010c8e03251fc490ddf22525c33132968f8495a67770
+737b2426b42020d1b27cab000002007bffe3042d047b000a002500bc4027191f0b17090e00a9
+1706b90e1120861fba1cb923b8118c170c001703180d09080b1f030814452610fcecccd4ec32
+3211393931002fc4e4f4fcf4ec10c6ee10ee11391139123930406e301d301e301f3020302130
+223f27401d401e401f402040214022501d501e501f50205021502250277027851d871e871f87
+20872185229027a027f0271e301e301f30203021401e401f40204021501e501f50205021601e
+601f60206021701e701f70207021801e801f80208021185d015d0122061514163332363d0137
+1123350e01232226353436332135342623220607353e0133321602bedfac816f99b9b8b83fbc
+88accbfdfb0102a79760b65465be5af3f00233667b6273d9b4294cfd81aa6661c1a2bdc0127f
+8b2e2eaa2727fc0000020071ffe3045a06140010001c003840191ab9000e14b905088c0eb801
+970317040008024711120b451d10fcecf4ec323231002fece4f4c4ec10c4ee30b6601e801ea0
+1e03015d0111331123350e0123220211100033321601141633323635342623220603a2b8b83a
+b17ccbff00ffcb7cb1fdc7a79292a8a89292a703b6025ef9eca86461014401080108014461fe
+15cbe7e7cbcbe7e7000100ba000004640614001300344019030900030e0106870e11b80c970a
+010208004e0d09080b461410fcec32f4ec31002f3cecf4c4ec1112173930b2601501015d0111
+231134262322061511231133113e013332160464b87c7c95acb9b942b375c1c602a4fd5c029e
+9f9ebea4fd870614fd9e6564ef0000020071ffe30475047b000b0017004a401306b91200b90c
+b8128c1809120f51031215451810fcecf4ec310010e4f4ec10ee3040233f197b007b067f077f
+087f097f0a7f0b7b0c7f0d7f0e7f0f7f107f117b12a019f01911015d01220615141633323635
+3426273200111000232200111000027394acab9593acac93f00112feeef0f1feef011103dfe7
+c9c9e7e8c8c7e99cfec8feecfeedfec701390113011401380000000100ba0000034a047b0011
+00304014060b0700110b03870eb809bc070a06080008461210fcc4ec3231002fe4f4ecc4d4cc
+11123930b450139f1302015d012e012322061511231133153e0133321617034a1f492c9ca7b9
+b93aba85132e1c03b41211cbbefdb20460ae6663050500000001006fffe303c7047b002700e7
+403c0d0c020e0b531f1e080902070a531f1f1e420a0b1e1f041500860189041486158918b911
+04b925b8118c281e0a0b1f1b0700521b080e07081422452810fcc4ecd4ece411123939393931
+0010e4f4ec10fef5ee10f5ee121739304b535807100eed111739070eed1117395922b2002701
+015d406d1c0a1c0b1c0c2e092c0a2c0b2c0c3b093b0a3b0b3b0c0b200020012402280a280b2a
+132f142f152a16281e281f292029212427860a860b860c860d12000000010202060a060b030c
+030d030e030f03100319031a031b031c041d09272f293f295f297f2980299029a029f029185d
+005d7101152e012322061514161f011e0115140623222627351e013332363534262f012e0135
+3436333216038b4ea85a898962943fc4a5f7d85ac36c66c661828c65ab40ab98e0ce66b4043f
+ae282854544049210e2a99899cb62323be353559514b50250f2495829eac1e000000000200c1
+00000179061400030007002b400e06be04b100bc020501080400460810fc3cec3231002fe4fc
+ec30400b1009400950096009700905015d1333112311331523c1b8b8b8b80460fba00614e900
+000100ba0000071d047b0022005a4026061209180f00061d07150c871d2003b81bbc19100700
+110f0808065011080f501c18081a462310fcec32fcfcfcec11123931002f3c3ce4f43cc4ec32
+111217393040133024502470249024a024a024bf24df24ff2409015d013e0133321615112311
+34262322061511231134262322061511231133153e01333216042945c082afbeb972758fa6b9
+72778da6b9b93fb0797aab03897c76f5e2fd5c029ea19cbea4fd87029ea29bbfa3fd870460ae
+67627c0000000001006401df027f028300030011b6009c020401000410dccc310010d4ec3013
+21152164021bfde50283a40000020071fe56045a047b000b0028004a4023190c1d0912861316
+b90f03b92623b827bc09b90fbd1a1d261900080c4706121220452910fcc4ecf4ec323231002f
+c4e4ece4f4c4ec10fed5ee1112393930b6602a802aa02a03015d013426232206151416333236
+17100221222627351e013332363d010e0123220211101233321617353303a2a59594a5a59495
+a5b8fefefa61ac51519e52b5b439b27ccefcfcce7cb239b8023dc8dcdcc8c7dcdcebfee2fee9
+1d1eb32c2abdbf5b6362013a01030104013a6263aa00000200baffe304a40614000b001c0038
+401903b90c0f09b918158c0fb81b971900121247180c06081a461d10fcec3232f4ec31002fec
+e4f4c4ec10c6ee30b6601e801ea01e03015d013426232206151416333236013e013332001110
+02232226271523113303e5a79292a7a79292a7fd8e3ab17bcc00ffffcc7bb13ab9b9022fcbe7
+e7cbcbe7e702526461febcfef8fef8febc6164a80614000200aeffe30458047b00130014003b
+401c030900030e0106870e118c0a01bc14b80c0d0908140b4e020800461510fcecf439ec3231
+002fe4e432f4c4ec1112173930b46f15c01502015d1311331114163332363511331123350e01
+23222601aeb87c7c95adb8b843b175c1c801cf01ba02a6fd619f9fbea4027bfba0ac6663f003
+a80000010071ffe303e7047b0019003f401b00860188040e860d880ab91104b917b8118c1a07
+120d004814451a10fce432ec310010e4f4ec10fef4ee10f5ee30400b0f1b101b801b901ba01b
+05015d01152e0123220615141633323637150e0123220011100021321603e74e9d50b3c6c6b3
+509d4e4da55dfdfed6012d010655a20435ac2b2be3cdcde32b2baa2424013e010e0112013a23
+0000000100c100000179061400030022b7009702010800460410fcec31002fec30400d100540
+05500560057005f00506015d13331123c1b8b80614f9ec000001003dfe56047f0460000f018b
+40430708020911000f0a110b0a00000f0e110f000f0d110c0d00000f0d110e0d0a0b0a0c110b
+0b0a420d0b0910000b058703bd0e0bbc100e0d0c0a09060300080f040f0b1010d44bb00a544b
+b008545b58b9000b004038594bb0145458b9000bffc03859c4c4111739310010e432f4ec1139
+11391239304b5358071005ed071008ed071008ed071005ed071008ed0705ed173259220140f0
+060005080609030d160a170d100d230d350d490a4f0a4e0d5a095a0a6a0a870d800d930d120a
+000a09060b050c0b0e0b0f1701150210041005170a140b140c1a0e1a0f270024012402200420
+0529082809250a240b240c270d2a0e2a0f201137003501350230043005380a360b360c380d39
+0e390f30114100400140024003400440054006400740084209450a470d490e490f4011540051
+0151025503500450055606550756085709570a550b550c590e590f501166016602680a690e69
+0f60117b08780e780f89008a09850b850c890d890e890f9909950b950c9a0e9a0fa40ba40cab
+0eab0fb011cf11df11ff11655d005d050e012b01353332363f01013309013302934e947c936c
+4c543321fe3bc3015e015ec368c87a9a488654044efc94036c000000013500b800cb00cb00c1
+00aa009c01a600b800660000007100cb00a002b20085007500b800c301cb0189022d00cb00a6
+00f000d300aa008700cb03aa0400014a003300cb000000d9050200f4015400b4009c01390114
+013907060400044e04b4045204b804e704cd0037047304cd04600473013303a2055605a60556
+053903c5021200c9001f00b801df007300ba03e9033303bc0444040e00df03cd03aa00e503aa
+0404000000cb008f00a4007b00b80014016f007f027b0252008f00c705cd009a009a006f00cb
+00cd019e01d300f000ba018300d5009803040248009e01d500c100cb00f600830354027f0000
+0333026600d300c700a400cd008f009a0073040005d5010a00fe022b00a400b4009c00000062
+009c0000001d032d05d505d505d505f0007f007b005400a406b80614072301d300b800cb00a6
+01c301ec069300a000d3035c037103db0185042304a80448008f0139011401390360008f05d5
+019a0614072306660179046004600460047b009c00000277046001aa00e904600762007b00c5
+007f027b000000b4025205cd006600bc00660077061000cd013b01850389008f007b0000001d
+00cd074a042f009c009c0000077d006f0000006f0335006a006f007b00ae00b2002d0396008f
+027b00f600830354063705f6008f009c04e10266008f018d02f600cd03440029006604ee0073
+0000140000960000b707060504030201002c2010b002254964b040515820c859212d2cb00225
+4964b040515820c859212d2c20100720b00050b00d7920b8ffff5058041b0559b0051cb00325
+08b0042523e120b00050b00d7920b8ffff5058041b0559b0051cb0032508e12d2c4b505820b0
+fd454459212d2cb002254560442d2c4b5358b00225b0022545445921212d2c45442d2cb00225
+b0022549b00525b005254960b0206368208a108a233a8a10653a2d00000100000002547a17ec
+9d3c5f0f3cf5001f080000000000cd383c2600000000cd383c26f7d6fcae0d72095500000008
+000000010000000000010000076dfe1d00000de2f7d6fa510d72000100000000000000000000
+00000000001704cd006604ec007104bc003d051200ba03230037028b0000057900100517009c
+04e7007b05140071051200ba04e50071034a00ba042b006f023900c107cb00ba02e300640514
+0071051400ba051200ae04660071023900c104bc003d0000000000000044000001180000023c
+000002b400000330000003300000042c0000051400000640000006d800000750000007f40000
+0864000009c400000a1400000ad800000b0400000bcc00000c6400000ce800000d8000000dbc
+00000f880001000000170354002b0068000c000200100099000800000415021600080004b802
+8040fffbfe03fa1403f92503f83203f79603f60e03f5fe03f4fe03f32503f20e03f19603f025
+03ef8a4105effe03ee9603ed9603ecfa03ebfa03eafe03e93a03e84203e7fe03e63203e5e453
+05e59603e48a4105e45303e3e22f05e3fa03e22f03e1fe03e0fe03df3203de1403dd9603dcfe
+03db1203da7d03d9bb03d8fe03d68a4105d67d03d5d44705d57d03d44703d3d21b05d3fe03d2
+1b03d1fe03d0fe03cffe03cefe03cd9603cccb1e05ccfe03cb1e03ca3203c9fe03c6851105c6
+1c03c51603c4fe03c3fe03c2fe03c1fe03c0fe03bffe03befe03bdfe03bcfe03bbfe03ba1103
+b9862505b9fe03b8b7bb05b8fe03b7b65d05b7bb03b78004b6b52505b65d40ff03b64004b525
+03b4fe03b39603b2fe03b1fe03b0fe03affe03ae6403ad0e03acab2505ac6403abaa1205ab25
+03aa1203a98a4105a9fa03a8fe03a7fe03a6fe03a51203a4fe03a3a20e05a33203a20e03a164
+03a08a4105a096039ffe039e9d0c059efe039d0c039c9b19059c64039b9a10059b19039a1003
+990a0398fe0397960d0597fe03960d03958a410595960394930e05942803930e0392fa039190
+bb0591fe03908f5d0590bb039080048f8e25058f5d038f40048e25038dfe038c8b2e058cfe03
+8b2e038a8625058a410389880b05891403880b03878625058764038685110586250385110384
+fe038382110583fe0382110381fe0380fe037ffe0340ff7e7d7d057efe037d7d037c64037b54
+15057b25037afe0379fe03780e03770c03760a0375fe0374fa0373fa0372fa0371fa0370fe03
+6ffe036efe036c21036bfe036a1142056a530369fe03687d036711420566fe0365fe0364fe03
+63fe0362fe03613a0360fa035e0c035dfe035bfe035afe0359580a0559fa03580a0357161905
+57320356fe035554150555420354150353011005531803521403514a130551fe03500b034ffe
+034e4d10054efe034d10034cfe034b4a13054bfe034a4910054a1303491d0d05491003480d03
+47fe0346960345960344fe0343022d0543fa0342bb03414b0340fe033ffe033e3d12053e1403
+3d3c0f053d12033c3b0d053c40ff0f033b0d033afe0339fe033837140538fa03373610053714
+0336350b05361003350b03341e03330d0332310b0532fe03310b03302f0b05300d032f0b032e
+2d09052e10032d09032c32032b2a25052b64032a2912052a2503291203282725052841032725
+0326250b05260f03250b0324fe0323fe03220f03210110052112032064031ffa031e1d0d051e
+64031d0d031c1142051cfe031bfa031a42031911420519fe031864031716190517fe03160110
+0516190315fe0314fe0313fe031211420512fe0311022d05114203107d030f64030efe030d0c
+16050dfe030c0110050c16030bfe030a100309fe0308022d0508fe0307140306640304011005
+04fe03401503022d0503fe0302011005022d0301100300fe0301b80164858d012b2b2b2b2b2b
+2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+2b2b2b2b2b2b2b002b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+2b2b2b2b2b2b2b2b2b2b2b2b2b1d00>
+] def
+/f-0-0 currentdict end definefont pop
+%%Page: 1 1
+%%BeginPageSetup
+%%PageBoundingBox: 0 -1 480 361
+%%EndPageSetup
+q 0 -1 480 362 rectclip q
+1 g
+0.25 359.752 479.5 -359.504 re f
+Q q
+0 360.002 480 -360.004 re W n
+q
+0 360.002 480 -361 re W n
+[ 1 0 0 1 0 -0.998047 ] concat
+  q
+0 g
+0.5 w
+1 J
+1 j
+[] 0.0 d
+10 M q 1 0 0 -1 0 361 cm
+0.25 0.25 479.5 359.504 re S Q
+  Q
+Q
+0.509804 0.498039 0.509804 rg
+1 w
+1 J
+1 j
+[] 0.0 d
+10 M q 1 0 0 -1 0 360.001953 cm
+36.336 8.949 434.281 293.688 re S Q
+0 g
+0.5 w
+q 1 0 0 -1 0 360.001953 cm
+36.336 302.637 m 470.617 302.637 l 36.336 306.887 m 36.336 302.637 l 108.715
+ 306.887 m 108.715 302.637 l 181.098 306.887 m 181.098 302.637 l 253.477
+ 306.887 m 253.477 302.637 l 325.855 306.887 m 325.855 302.637 l 398.238
+ 306.887 m 398.238 302.637 l 470.617 306.887 m 470.617 302.637 l S Q
+34.246 47.357 m 34.621 47.283 34.91 47.115 35.121 46.857 c 35.34 46.607
+ 35.449 46.295 35.449 45.92 c 35.449 45.334 35.25 44.889 34.855 44.576 c
+ 34.457 44.264 33.895 44.107 33.168 44.107 c 32.918 44.107 32.66 44.135 
+32.402 44.186 c 32.152 44.225 31.887 44.295 31.605 44.389 c 31.605 45.154
+ l 31.824 45.029 32.062 44.928 32.324 44.857 c 32.582 44.795 32.855 44.764
+ 33.137 44.764 c 33.637 44.764 34.016 44.861 34.277 45.061 c 34.535 45.256
+ 34.668 45.545 34.668 45.92 c 34.668 46.264 34.543 46.529 34.293 46.717 
+c 34.051 46.912 33.719 47.014 33.293 47.014 c 32.621 47.014 l 32.621 47.654
+ l 33.324 47.654 l 33.707 47.654 34.004 47.732 34.215 47.889 c 34.422 48.045
+ 34.527 48.268 34.527 48.561 c 34.527 48.861 34.418 49.092 34.199 49.248
+ c 33.988 49.412 33.688 49.498 33.293 49.498 c 33.074 49.498 32.84 49.471
+ 32.59 49.42 c 32.348 49.377 32.078 49.303 31.777 49.201 c 31.777 49.904
+ l 32.078 49.986 32.359 50.049 32.621 50.092 c 32.879 50.131 33.129 50.154
+ 33.371 50.154 c 33.965 50.154 34.434 50.018 34.777 49.748 c 35.129 49.475
+ 35.309 49.107 35.309 48.639 c 35.309 48.314 35.215 48.045 35.027 47.826
+ c 34.848 47.607 34.59 47.451 34.246 47.357 c h
+f
+38.727 47.451 m 38.371 47.451 38.09 47.326 37.883 47.076 c 37.672 46.834
+ 37.57 46.506 37.57 46.092 c 37.57 45.674 37.672 45.342 37.883 45.092 c 
+38.09 44.85 38.371 44.732 38.727 44.732 c 39.078 44.732 39.359 44.85 39.57
+ 45.092 c 39.777 45.342 39.883 45.674 39.883 46.092 c 39.883 46.506 39.777
+ 46.834 39.57 47.076 c 39.359 47.326 39.078 47.451 38.727 47.451 c h
+40.289 49.92 m 40.289 49.201 l 40.09 49.295 39.891 49.365 39.695 49.42 
+c 39.496 49.471 39.297 49.498 39.102 49.498 c 38.578 49.498 38.18 49.318
+ 37.898 48.967 c 37.625 48.611 37.469 48.08 37.43 47.373 c 37.586 47.6 37.777
+ 47.771 38.008 47.889 c 38.234 48.014 38.492 48.076 38.773 48.076 c 39.355
+ 48.076 39.82 47.896 40.164 47.545 c 40.508 47.189 40.68 46.705 40.68 46.092
+ c 40.68 45.486 40.5 45.002 40.148 44.639 c 39.793 44.283 39.32 44.107 38.727
+ 44.107 c 38.047 44.107 37.531 44.361 37.18 44.873 c 36.824 45.393 36.648
+ 46.143 36.648 47.123 c 36.648 48.049 36.867 48.783 37.305 49.326 c 37.742
+ 49.877 38.328 50.154 39.07 50.154 c 39.266 50.154 39.465 50.131 39.664 
+50.092 c 39.859 50.061 40.07 50.002 40.289 49.92 c h
+f
+106.625 47.357 m 107 47.283 107.289 47.115 107.5 46.857 c 107.719 46.607
+ 107.828 46.295 107.828 45.92 c 107.828 45.334 107.629 44.889 107.234 44.576
+ c 106.836 44.264 106.273 44.107 105.547 44.107 c 105.297 44.107 105.039
+ 44.135 104.781 44.186 c 104.531 44.225 104.266 44.295 103.984 44.389 c 
+103.984 45.154 l 104.203 45.029 104.441 44.928 104.703 44.857 c 104.961 
+44.795 105.234 44.764 105.516 44.764 c 106.016 44.764 106.395 44.861 106.656
+ 45.061 c 106.914 45.256 107.047 45.545 107.047 45.92 c 107.047 46.264 106.922
+ 46.529 106.672 46.717 c 106.43 46.912 106.098 47.014 105.672 47.014 c 105
+ 47.014 l 105 47.654 l 105.703 47.654 l 106.086 47.654 106.383 47.732 106.594
+ 47.889 c 106.801 48.045 106.906 48.268 106.906 48.561 c 106.906 48.861 
+106.797 49.092 106.578 49.248 c 106.367 49.412 106.066 49.498 105.672 49.498
+ c 105.453 49.498 105.219 49.471 104.969 49.42 c 104.727 49.377 104.457 
+49.303 104.156 49.201 c 104.156 49.904 l 104.457 49.986 104.738 50.049 105
+ 50.092 c 105.258 50.131 105.508 50.154 105.75 50.154 c 106.344 50.154 106.812
+ 50.018 107.156 49.748 c 107.508 49.475 107.688 49.107 107.688 48.639 c 
+107.688 48.314 107.594 48.045 107.406 47.826 c 107.227 47.607 106.969 47.451
+ 106.625 47.357 c h
+f
+109.121 50.045 m 112.871 50.045 l 112.871 49.717 l 110.762 44.217 l 109.934
+ 44.217 l 111.918 49.389 l 109.121 49.389 l h
+f
+179.008 47.357 m 179.383 47.283 179.672 47.115 179.883 46.857 c 180.102
+ 46.607 180.211 46.295 180.211 45.92 c 180.211 45.334 180.012 44.889 179.617
+ 44.576 c 179.219 44.264 178.656 44.107 177.93 44.107 c 177.68 44.107 177.422
+ 44.135 177.164 44.186 c 176.914 44.225 176.648 44.295 176.367 44.389 c 
+176.367 45.154 l 176.586 45.029 176.824 44.928 177.086 44.857 c 177.344 
+44.795 177.617 44.764 177.898 44.764 c 178.398 44.764 178.777 44.861 179.039
+ 45.061 c 179.297 45.256 179.43 45.545 179.43 45.92 c 179.43 46.264 179.305
+ 46.529 179.055 46.717 c 178.812 46.912 178.48 47.014 178.055 47.014 c 177.383
+ 47.014 l 177.383 47.654 l 178.086 47.654 l 178.469 47.654 178.766 47.732
+ 178.977 47.889 c 179.184 48.045 179.289 48.268 179.289 48.561 c 179.289
+ 48.861 179.18 49.092 178.961 49.248 c 178.75 49.412 178.449 49.498 178.055
+ 49.498 c 177.836 49.498 177.602 49.471 177.352 49.42 c 177.109 49.377 176.84
+ 49.303 176.539 49.201 c 176.539 49.904 l 176.84 49.986 177.121 50.049 177.383
+ 50.092 c 177.641 50.131 177.891 50.154 178.133 50.154 c 178.727 50.154 
+179.195 50.018 179.539 49.748 c 179.891 49.475 180.07 49.107 180.07 48.639
+ c 180.07 48.314 179.977 48.045 179.789 47.826 c 179.609 47.607 179.352 
+47.451 179.008 47.357 c h
+f
+183.395 46.982 m 183.02 46.982 182.723 46.881 182.504 46.686 c 182.293 
+46.486 182.191 46.209 182.191 45.857 c 182.191 45.502 182.293 45.225 182.504
+ 45.029 c 182.723 44.83 183.02 44.732 183.395 44.732 c 183.77 44.732 184.059
+ 44.83 184.27 45.029 c 184.488 45.236 184.598 45.514 184.598 45.857 c 184.598
+ 46.209 184.488 46.486 184.27 46.686 c 184.059 46.881 183.77 46.982 183.395
+ 46.982 c h
+182.598 47.326 m 182.262 47.408 182.004 47.564 181.816 47.795 c 181.629
+ 48.021 181.535 48.303 181.535 48.639 c 181.535 49.107 181.695 49.475 182.02
+ 49.748 c 182.352 50.018 182.809 50.154 183.395 50.154 c 183.977 50.154 
+184.43 50.018 184.754 49.748 c 185.086 49.475 185.254 49.107 185.254 48.639
+ c 185.254 48.303 185.16 48.021 184.973 47.795 c 184.785 47.564 184.523 
+47.408 184.191 47.326 c 184.566 47.232 184.855 47.053 185.066 46.795 c 185.285
+ 46.545 185.395 46.232 185.395 45.857 c 185.395 45.295 185.223 44.861 184.879
+ 44.561 c 184.535 44.256 184.039 44.107 183.395 44.107 c 182.746 44.107 
+182.254 44.256 181.91 44.561 c 181.566 44.861 181.395 45.295 181.395 45.857
+ c 181.395 46.232 181.496 46.545 181.707 46.795 c 181.926 47.053 182.223
+ 47.232 182.598 47.326 c h
+182.316 48.576 m 182.316 48.271 182.41 48.033 182.598 47.857 c 182.785 
+47.689 183.051 47.607 183.395 47.607 c 183.727 47.607 183.988 47.689 184.176
+ 47.857 c 184.371 48.033 184.473 48.271 184.473 48.576 c 184.473 48.877 
+184.371 49.111 184.176 49.279 c 183.988 49.443 183.727 49.529 183.395 49.529
+ c 183.051 49.529 182.785 49.443 182.598 49.279 c 182.41 49.111 182.316 
+48.877 182.316 48.576 c h
+f
+251.387 47.357 m 251.762 47.283 252.051 47.115 252.262 46.857 c 252.48 
+46.607 252.59 46.295 252.59 45.92 c 252.59 45.334 252.391 44.889 251.996
+ 44.576 c 251.598 44.264 251.035 44.107 250.309 44.107 c 250.059 44.107 
+249.801 44.135 249.543 44.186 c 249.293 44.225 249.027 44.295 248.746 44.389
+ c 248.746 45.154 l 248.965 45.029 249.203 44.928 249.465 44.857 c 249.723
+ 44.795 249.996 44.764 250.277 44.764 c 250.777 44.764 251.156 44.861 251.418
+ 45.061 c 251.676 45.256 251.809 45.545 251.809 45.92 c 251.809 46.264 251.684
+ 46.529 251.434 46.717 c 251.191 46.912 250.859 47.014 250.434 47.014 c 
+249.762 47.014 l 249.762 47.654 l 250.465 47.654 l 250.848 47.654 251.145
+ 47.732 251.355 47.889 c 251.562 48.045 251.668 48.268 251.668 48.561 c 
+251.668 48.861 251.559 49.092 251.34 49.248 c 251.129 49.412 250.828 49.498
+ 250.434 49.498 c 250.215 49.498 249.98 49.471 249.73 49.42 c 249.488 49.377
+ 249.219 49.303 248.918 49.201 c 248.918 49.904 l 249.219 49.986 249.5 50.049
+ 249.762 50.092 c 250.02 50.131 250.27 50.154 250.512 50.154 c 251.105 50.154
+ 251.574 50.018 251.918 49.748 c 252.27 49.475 252.449 49.107 252.449 48.639
+ c 252.449 48.314 252.355 48.045 252.168 47.826 c 251.988 47.607 251.73 
+47.451 251.387 47.357 c h
+f
+254.102 44.342 m 254.102 45.061 l 254.297 44.967 254.496 44.893 254.695
+ 44.842 c 254.902 44.787 255.105 44.764 255.305 44.764 c 255.824 44.764 
+256.219 44.939 256.492 45.295 c 256.773 45.646 256.934 46.178 256.977 46.889
+ c 256.82 46.67 256.625 46.498 256.398 46.373 c 256.168 46.256 255.914 46.201
+ 255.633 46.201 c 255.047 46.201 254.586 46.373 254.242 46.717 c 253.898
+ 47.068 253.727 47.553 253.727 48.17 c 253.727 48.771 253.902 49.252 254.258
+ 49.607 c 254.609 49.971 255.086 50.154 255.68 50.154 c 256.355 50.154 256.871
+ 49.893 257.227 49.373 c 257.578 48.861 257.758 48.111 257.758 47.123 c 
+257.758 46.205 257.539 45.471 257.102 44.92 c 256.664 44.377 256.074 44.107
+ 255.336 44.107 c 255.137 44.107 254.934 44.131 254.727 44.17 c 254.527 
+44.201 254.32 44.256 254.102 44.342 c h
+255.68 46.811 m 256.031 46.811 256.312 46.928 256.523 47.17 c 256.73 47.42
+ 256.836 47.752 256.836 48.17 c 256.836 48.584 256.73 48.912 256.523 49.154
+ c 256.312 49.404 256.031 49.529 255.68 49.529 c 255.324 49.529 255.043 
+49.404 254.836 49.154 c 254.625 48.912 254.523 48.584 254.523 48.17 c 254.523
+ 47.752 254.625 47.42 254.836 47.17 c 255.043 46.928 255.324 46.811 255.68
+ 46.811 c h
+f
+323.547 49.357 m 321.547 46.248 l 323.547 46.248 l h
+323.328 50.045 m 324.328 50.045 l 324.328 46.248 l 325.156 46.248 l 325.156
+ 45.592 l 324.328 45.592 l 324.328 44.217 l 323.547 44.217 l 323.547 45.592
+ l 320.906 45.592 l 320.906 46.357 l h
+f
+328.152 49.529 m 327.746 49.529 327.438 49.326 327.23 48.92 c 327.031 48.521
+ 326.934 47.924 326.934 47.123 c 326.934 46.33 327.031 45.732 327.23 45.326
+ c 327.438 44.928 327.746 44.732 328.152 44.732 c 328.559 44.732 328.859
+ 44.928 329.059 45.326 c 329.266 45.732 329.371 46.33 329.371 47.123 c 329.371
+ 47.924 329.266 48.521 329.059 48.92 c 328.859 49.326 328.559 49.529 328.152
+ 49.529 c h
+328.152 50.154 m 328.809 50.154 329.309 49.893 329.652 49.373 c 329.996
+ 48.861 330.168 48.111 330.168 47.123 c 330.168 46.143 329.996 45.393 329.652
+ 44.873 c 329.309 44.361 328.809 44.107 328.152 44.107 c 327.496 44.107 
+326.996 44.361 326.652 44.873 c 326.309 45.393 326.137 46.143 326.137 47.123
+ c 326.137 48.111 326.309 48.861 326.652 49.373 c 326.996 49.893 327.496
+ 50.154 328.152 50.154 c h
+f
+395.93 49.357 m 393.93 46.248 l 395.93 46.248 l h
+395.711 50.045 m 396.711 50.045 l 396.711 46.248 l 397.539 46.248 l 397.539
+ 45.592 l 396.711 45.592 l 396.711 44.217 l 395.93 44.217 l 395.93 45.592
+ l 393.289 45.592 l 393.289 46.357 l h
+f
+398.988 44.889 m 400.27 44.889 l 400.27 49.326 l 398.863 49.045 l 398.863
+ 49.764 l 400.27 50.045 l 401.051 50.045 l 401.051 44.889 l 402.348 44.889
+ l 402.348 44.217 l 398.988 44.217 l h
+f
+468.309 49.357 m 466.309 46.248 l 468.309 46.248 l h
+468.09 50.045 m 469.09 50.045 l 469.09 46.248 l 469.918 46.248 l 469.918
+ 45.592 l 469.09 45.592 l 469.09 44.217 l 468.309 44.217 l 468.309 45.592
+ l 465.668 45.592 l 465.668 46.357 l h
+f
+471.898 44.889 m 474.664 44.889 l 474.664 44.217 l 470.961 44.217 l 470.961
+ 44.889 l 471.25 45.189 471.656 45.6 472.18 46.123 c 472.699 46.654 473.023
+ 46.99 473.148 47.139 c 473.406 47.42 473.586 47.658 473.68 47.857 c 473.781
+ 48.053 473.836 48.248 473.836 48.436 c 473.836 48.748 473.727 49.002 473.508
+ 49.201 c 473.289 49.396 473.008 49.498 472.664 49.498 c 472.414 49.498 
+472.148 49.451 471.867 49.357 c 471.594 49.271 471.305 49.143 470.992 48.967
+ c 470.992 49.764 l 471.312 49.896 471.609 49.998 471.883 50.061 c 472.164
+ 50.123 472.418 50.154 472.648 50.154 c 473.25 50.154 473.73 50.002 474.086
+ 49.701 c 474.449 49.396 474.633 48.998 474.633 48.498 c 474.633 48.256 
+474.586 48.029 474.492 47.811 c 474.398 47.592 474.234 47.334 474.008 47.045
+ c 473.934 46.971 473.719 46.752 473.367 46.389 c 473.023 46.033 472.531
+ 45.533 471.898 44.889 c h
+f
+208.883 36.096 m 215.055 36.096 l 215.055 35.252 l 212.461 35.252 l 212.461
+ 28.799 l 211.477 28.799 l 211.477 35.252 l 208.883 35.252 l h
+f
+215.652 34.268 m 216.559 34.268 l 216.559 28.799 l 215.652 28.799 l h
+215.652 36.393 m 216.559 36.393 l 216.559 35.252 l 215.652 35.252 l h
+f
+222.695 33.221 m 222.914 33.627 223.18 33.924 223.492 34.111 c 223.805 
+34.299 224.172 34.393 224.602 34.393 c 225.172 34.393 225.609 34.193 225.914
+ 33.799 c 226.227 33.4 226.383 32.834 226.383 32.096 c 226.383 28.799 l 
+225.477 28.799 l 225.477 32.064 l 225.477 32.596 225.383 32.986 225.195 
+33.236 c 225.016 33.486 224.734 33.611 224.352 33.611 c 223.883 33.611 223.512
+ 33.455 223.242 33.143 c 222.98 32.838 222.852 32.424 222.852 31.893 c 222.852
+ 28.799 l 221.945 28.799 l 221.945 32.064 l 221.945 32.596 221.852 32.986
+ 221.664 33.236 c 221.477 33.486 221.188 33.611 220.805 33.611 c 220.344
+ 33.611 219.98 33.455 219.711 33.143 c 219.438 32.838 219.305 32.424 219.305
+ 31.893 c 219.305 28.799 l 218.398 28.799 l 218.398 34.268 l 219.305 34.268
+ l 219.305 33.424 l 219.512 33.756 219.758 34.002 220.039 34.158 c 220.328
+ 34.314 220.668 34.393 221.055 34.393 c 221.461 34.393 221.797 34.291 222.07
+ 34.096 c 222.352 33.896 222.559 33.604 222.695 33.221 c h
+f
+232.859 31.752 m 232.859 31.314 l 228.719 31.314 l 228.758 30.697 228.945
+ 30.229 229.281 29.908 c 229.613 29.584 230.078 29.424 230.672 29.424 c 
+231.016 29.424 231.348 29.463 231.672 29.549 c 232.004 29.631 232.328 29.756
+ 232.641 29.924 c 232.641 29.08 l 232.316 28.943 231.984 28.838 231.641 
+28.768 c 231.305 28.697 230.969 28.658 230.625 28.658 c 229.75 28.658 229.055
+ 28.908 228.547 29.408 c 228.035 29.916 227.781 30.611 227.781 31.486 c 
+227.781 32.381 228.02 33.088 228.5 33.611 c 228.988 34.131 229.645 34.393
+ 230.469 34.393 c 231.207 34.393 231.789 34.158 232.219 33.689 c 232.645
+ 33.221 232.859 32.572 232.859 31.752 c h
+231.953 32.018 m 231.953 32.506 231.816 32.896 231.547 33.189 c 231.273
+ 33.49 230.922 33.643 230.484 33.643 c 229.973 33.643 229.566 33.494 229.266
+ 33.205 c 228.973 32.924 228.801 32.525 228.75 32.018 c h
+f
+239.66 36.393 m 239.23 35.643 238.91 34.896 238.691 34.158 c 238.48 33.428
+ 238.379 32.689 238.379 31.939 c 238.379 31.189 238.48 30.443 238.691 29.705
+ c 238.91 28.963 239.23 28.229 239.66 27.486 c 238.879 27.486 l 238.398 
+28.248 238.035 28.994 237.785 29.736 c 237.543 30.475 237.426 31.209 237.426
+ 31.939 c 237.426 32.666 237.543 33.396 237.785 34.127 c 238.023 34.865 
+238.387 35.619 238.879 36.393 c h
+f
+241.402 34.268 m 242.309 34.268 l 242.309 28.799 l 241.402 28.799 l h
+241.402 36.393 m 242.309 36.393 l 242.309 35.252 l 241.402 35.252 l h
+f
+248.73 32.096 m 248.73 28.799 l 247.84 28.799 l 247.84 32.064 l 247.84 
+32.584 247.734 32.971 247.527 33.221 c 247.328 33.479 247.027 33.611 246.621
+ 33.611 c 246.141 33.611 245.762 33.455 245.48 33.143 c 245.199 32.838 245.059
+ 32.424 245.059 31.893 c 245.059 28.799 l 244.152 28.799 l 244.152 34.268
+ l 245.059 34.268 l 245.059 33.424 l 245.277 33.744 245.531 33.986 245.824
+ 34.143 c 246.113 34.307 246.449 34.393 246.824 34.393 c 247.449 34.393 
+247.922 34.197 248.246 33.814 c 248.566 33.428 248.73 32.854 248.73 32.096
+ c h
+f
+257.184 34.111 m 257.184 33.252 l 256.934 33.385 256.672 33.486 256.402
+ 33.549 c 256.129 33.611 255.844 33.643 255.543 33.643 c 255.105 33.643 
+254.77 33.572 254.543 33.439 c 254.324 33.303 254.215 33.1 254.215 32.83
+ c 254.215 32.619 254.293 32.455 254.449 32.33 c 254.605 32.213 254.926 
+32.104 255.418 32.002 c 255.715 31.924 l 256.359 31.787 256.812 31.596 257.074
+ 31.346 c 257.344 31.096 257.48 30.752 257.48 30.314 c 257.48 29.803 257.277
+ 29.396 256.871 29.096 c 256.473 28.803 255.926 28.658 255.23 28.658 c 254.926
+ 28.658 254.613 28.689 254.293 28.752 c 253.98 28.803 253.652 28.885 253.309
+ 29.002 c 253.309 29.924 l 253.641 29.756 253.965 29.627 254.277 29.533 
+c 254.598 29.447 254.922 29.408 255.246 29.408 c 255.66 29.408 255.984 29.479
+ 256.215 29.627 c 256.441 29.771 256.559 29.975 256.559 30.236 c 256.559
+ 30.486 256.473 30.674 256.309 30.799 c 256.152 30.932 255.793 31.057 255.23
+ 31.174 c 254.918 31.252 l 254.363 31.365 253.965 31.541 253.715 31.783 
+c 253.465 32.033 253.34 32.365 253.34 32.783 c 253.34 33.303 253.52 33.697
+ 253.887 33.971 c 254.25 34.252 254.77 34.393 255.449 34.393 c 255.77 34.393
+ 256.078 34.365 256.371 34.314 c 256.672 34.271 256.941 34.205 257.184 34.111
+ c h
+f
+263.598 31.752 m 263.598 31.314 l 259.457 31.314 l 259.496 30.697 259.684
+ 30.229 260.02 29.908 c 260.352 29.584 260.816 29.424 261.41 29.424 c 261.754
+ 29.424 262.086 29.463 262.41 29.549 c 262.742 29.631 263.066 29.756 263.379
+ 29.924 c 263.379 29.08 l 263.055 28.943 262.723 28.838 262.379 28.768 c
+ 262.043 28.697 261.707 28.658 261.363 28.658 c 260.488 28.658 259.793 28.908
+ 259.285 29.408 c 258.773 29.916 258.52 30.611 258.52 31.486 c 258.52 32.381
+ 258.758 33.088 259.238 33.611 c 259.727 34.131 260.383 34.393 261.207 34.393
+ c 261.945 34.393 262.527 34.158 262.957 33.689 c 263.383 33.221 263.598
+ 32.572 263.598 31.752 c h
+262.691 32.018 m 262.691 32.506 262.555 32.896 262.285 33.189 c 262.012
+ 33.49 261.66 33.643 261.223 33.643 c 260.711 33.643 260.305 33.494 260.004
+ 33.205 c 259.711 32.924 259.539 32.525 259.488 32.018 c h
+f
+269 34.064 m 269 33.221 l 268.75 33.354 268.492 33.459 268.234 33.533 c
+ 267.984 33.604 267.727 33.643 267.469 33.643 c 266.883 33.643 266.43 33.455
+ 266.109 33.08 c 265.785 32.713 265.625 32.197 265.625 31.533 c 265.625 
+30.865 265.785 30.346 266.109 29.971 c 266.43 29.604 266.883 29.424 267.469
+ 29.424 c 267.727 29.424 267.984 29.455 268.234 29.518 c 268.492 29.588 
+268.75 29.697 269 29.846 c 269 29.002 l 268.75 28.885 268.488 28.803 268.219
+ 28.752 c 267.957 28.689 267.676 28.658 267.375 28.658 c 266.539 28.658 
+265.879 28.912 265.391 29.424 c 264.91 29.943 264.672 30.646 264.672 31.533
+ c 264.672 32.416 264.914 33.115 265.406 33.627 c 265.895 34.135 266.566
+ 34.393 267.422 34.393 c 267.703 34.393 267.973 34.365 268.234 34.314 c 
+268.492 34.26 268.75 34.178 269 34.064 c h
+f
+272.684 33.643 m 272.203 33.643 271.824 33.455 271.543 33.08 c 271.262 
+32.705 271.121 32.189 271.121 31.533 c 271.121 30.877 271.254 30.361 271.527
+ 29.986 c 271.809 29.611 272.191 29.424 272.684 29.424 c 273.16 29.424 273.543
+ 29.611 273.824 29.986 c 274.105 30.361 274.246 30.877 274.246 31.533 c 
+274.246 32.178 274.105 32.689 273.824 33.064 c 273.543 33.447 273.16 33.643
+ 272.684 33.643 c h
+272.684 34.393 m 273.465 34.393 274.078 34.135 274.527 33.627 c 274.973
+ 33.127 275.199 32.428 275.199 31.533 c 275.199 30.635 274.973 29.932 274.527
+ 29.424 c 274.078 28.912 273.465 28.658 272.684 28.658 c 271.902 28.658 
+271.285 28.912 270.84 29.424 c 270.391 29.932 270.168 30.635 270.168 31.533
+ c 270.168 32.428 270.391 33.127 270.84 33.627 c 271.285 34.135 271.902 
+34.393 272.684 34.393 c h
+f
+281.223 32.096 m 281.223 28.799 l 280.332 28.799 l 280.332 32.064 l 280.332
+ 32.584 280.227 32.971 280.02 33.221 c 279.82 33.479 279.52 33.611 279.113
+ 33.611 c 278.633 33.611 278.254 33.455 277.973 33.143 c 277.691 32.838 
+277.551 32.424 277.551 31.893 c 277.551 28.799 l 276.645 28.799 l 276.645
+ 34.268 l 277.551 34.268 l 277.551 33.424 l 277.77 33.744 278.023 33.986
+ 278.316 34.143 c 278.605 34.307 278.941 34.393 279.316 34.393 c 279.941
+ 34.393 280.414 34.197 280.738 33.814 c 281.059 33.428 281.223 32.854 281.223
+ 32.096 c h
+f
+286.625 33.439 m 286.625 36.393 l 287.516 36.393 l 287.516 28.799 l 286.625
+ 28.799 l 286.625 29.627 l 286.438 29.291 286.195 29.049 285.906 28.893 
+c 285.613 28.736 285.266 28.658 284.859 28.658 c 284.203 28.658 283.664 
+28.916 283.25 29.439 c 282.832 29.971 282.625 30.666 282.625 31.533 c 282.625
+ 32.385 282.832 33.072 283.25 33.596 c 283.664 34.127 284.203 34.393 284.859
+ 34.393 c 285.266 34.393 285.613 34.314 285.906 34.158 c 286.195 34.002 
+286.438 33.76 286.625 33.439 c h
+283.562 31.533 m 283.562 30.865 283.695 30.346 283.969 29.971 c 284.238
+ 29.596 284.613 29.408 285.094 29.408 c 285.562 29.408 285.93 29.596 286.203
+ 29.971 c 286.484 30.346 286.625 30.865 286.625 31.533 c 286.625 32.189 
+286.484 32.705 286.203 33.08 c 285.93 33.455 285.562 33.643 285.094 33.643
+ c 284.613 33.643 284.238 33.455 283.969 33.08 c 283.695 32.705 283.562 
+32.189 283.562 31.533 c h
+f
+292.848 34.111 m 292.848 33.252 l 292.598 33.385 292.336 33.486 292.066
+ 33.549 c 291.793 33.611 291.508 33.643 291.207 33.643 c 290.77 33.643 290.434
+ 33.572 290.207 33.439 c 289.988 33.303 289.879 33.1 289.879 32.83 c 289.879
+ 32.619 289.957 32.455 290.113 32.33 c 290.27 32.213 290.59 32.104 291.082
+ 32.002 c 291.379 31.924 l 292.023 31.787 292.477 31.596 292.738 31.346 
+c 293.008 31.096 293.145 30.752 293.145 30.314 c 293.145 29.803 292.941 
+29.396 292.535 29.096 c 292.137 28.803 291.59 28.658 290.895 28.658 c 290.59
+ 28.658 290.277 28.689 289.957 28.752 c 289.645 28.803 289.316 28.885 288.973
+ 29.002 c 288.973 29.924 l 289.305 29.756 289.629 29.627 289.941 29.533 
+c 290.262 29.447 290.586 29.408 290.91 29.408 c 291.324 29.408 291.648 29.479
+ 291.879 29.627 c 292.105 29.771 292.223 29.975 292.223 30.236 c 292.223
+ 30.486 292.137 30.674 291.973 30.799 c 291.816 30.932 291.457 31.057 290.895
+ 31.174 c 290.582 31.252 l 290.027 31.365 289.629 31.541 289.379 31.783 
+c 289.129 32.033 289.004 32.365 289.004 32.783 c 289.004 33.303 289.184 
+33.697 289.551 33.971 c 289.914 34.252 290.434 34.393 291.113 34.393 c 291.434
+ 34.393 291.742 34.365 292.035 34.314 c 292.336 34.271 292.605 34.205 292.848
+ 34.111 c h
+f
+294.434 36.393 m 295.215 36.393 l 295.703 35.619 296.066 34.865 296.309
+ 34.127 c 296.559 33.396 296.684 32.666 296.684 31.939 c 296.684 31.209 
+296.559 30.475 296.309 29.736 c 296.066 28.994 295.703 28.248 295.215 27.486
+ c 294.434 27.486 l 294.871 28.229 295.191 28.963 295.402 29.705 c 295.621
+ 30.443 295.73 31.189 295.73 31.939 c 295.73 32.689 295.621 33.428 295.402
+ 34.158 c 295.191 34.896 294.871 35.643 294.434 36.393 c h
+f
+q 1 0 0 -1 0 360.001953 cm
+36.336 302.637 m 36.336 8.949 l 32.086 302.637 m 36.336 302.637 l 32.086
+ 265.926 m 36.336 265.926 l 32.086 229.215 m 36.336 229.215 l 32.086 192.504
+ m 36.336 192.504 l 32.086 155.793 m 36.336 155.793 l 32.086 119.082 m 36.336
+ 119.082 l 32.086 82.371 m 36.336 82.371 l 32.086 45.66 m 36.336 45.66 l
+ 32.086 8.949 m 36.336 8.949 l S Q
+20.59 60.674 m 24.34 60.674 l 24.34 60.346 l 22.23 54.846 l 21.402 54.846
+ l 23.387 60.018 l 20.59 60.018 l h
+f
+26.555 55.518 m 29.32 55.518 l 29.32 54.846 l 25.617 54.846 l 25.617 55.518
+ l 25.906 55.818 26.312 56.229 26.836 56.752 c 27.355 57.283 27.68 57.619
+ 27.805 57.768 c 28.062 58.049 28.242 58.287 28.336 58.486 c 28.438 58.682
+ 28.492 58.877 28.492 59.064 c 28.492 59.377 28.383 59.631 28.164 59.83 
+c 27.945 60.025 27.664 60.127 27.32 60.127 c 27.07 60.127 26.805 60.08 26.523
+ 59.986 c 26.25 59.9 25.961 59.771 25.648 59.596 c 25.648 60.393 l 25.969
+ 60.525 26.266 60.627 26.539 60.689 c 26.82 60.752 27.074 60.783 27.305 
+60.783 c 27.906 60.783 28.387 60.631 28.742 60.33 c 29.105 60.025 29.289
+ 59.627 29.289 59.127 c 29.289 58.885 29.242 58.658 29.148 58.439 c 29.055
+ 58.221 28.891 57.963 28.664 57.674 c 28.59 57.6 28.375 57.381 28.023 57.018
+ c 27.68 56.662 27.188 56.162 26.555 55.518 c h
+f
+20.59 97.385 m 24.34 97.385 l 24.34 97.057 l 22.23 91.557 l 21.402 91.557
+ l 23.387 96.729 l 20.59 96.729 l h
+f
+28.273 94.697 m 28.648 94.623 28.938 94.455 29.148 94.197 c 29.367 93.947
+ 29.477 93.635 29.477 93.26 c 29.477 92.674 29.277 92.229 28.883 91.916 
+c 28.484 91.604 27.922 91.447 27.195 91.447 c 26.945 91.447 26.688 91.475
+ 26.43 91.525 c 26.18 91.564 25.914 91.635 25.633 91.729 c 25.633 92.494
+ l 25.852 92.369 26.09 92.268 26.352 92.197 c 26.609 92.135 26.883 92.104
+ 27.164 92.104 c 27.664 92.104 28.043 92.201 28.305 92.4 c 28.562 92.596
+ 28.695 92.885 28.695 93.26 c 28.695 93.604 28.57 93.869 28.32 94.057 c 
+28.078 94.252 27.746 94.354 27.32 94.354 c 26.648 94.354 l 26.648 94.994
+ l 27.352 94.994 l 27.734 94.994 28.031 95.072 28.242 95.229 c 28.449 95.385
+ 28.555 95.607 28.555 95.9 c 28.555 96.201 28.445 96.432 28.227 96.588 c
+ 28.016 96.752 27.715 96.838 27.32 96.838 c 27.102 96.838 26.867 96.811 
+26.617 96.76 c 26.375 96.717 26.105 96.643 25.805 96.541 c 25.805 97.244
+ l 26.105 97.326 26.387 97.389 26.648 97.432 c 26.906 97.471 27.156 97.494
+ 27.398 97.494 c 27.992 97.494 28.461 97.357 28.805 97.088 c 29.156 96.814
+ 29.336 96.447 29.336 95.979 c 29.336 95.654 29.242 95.385 29.055 95.166
+ c 28.875 94.947 28.617 94.791 28.273 94.697 c h
+f
+20.59 134.096 m 24.34 134.096 l 24.34 133.768 l 22.23 128.268 l 21.402 
+128.268 l 23.387 133.439 l 20.59 133.439 l h
+f
+28.055 133.408 m 26.055 130.299 l 28.055 130.299 l h
+27.836 134.096 m 28.836 134.096 l 28.836 130.299 l 29.664 130.299 l 29.664
+ 129.643 l 28.836 129.643 l 28.836 128.268 l 28.055 128.268 l 28.055 129.643
+ l 25.414 129.643 l 25.414 130.408 l h
+f
+20.59 170.807 m 24.34 170.807 l 24.34 170.479 l 22.23 164.979 l 21.402 
+164.979 l 23.387 170.15 l 20.59 170.15 l h
+f
+25.883 170.807 m 28.992 170.807 l 28.992 170.15 l 26.617 170.15 l 26.617
+ 168.713 l 26.73 168.752 26.844 168.783 26.961 168.807 c 27.074 168.826 
+27.188 168.838 27.305 168.838 c 27.949 168.838 28.461 168.654 28.836 168.291
+ c 29.219 167.936 29.414 167.455 29.414 166.854 c 29.414 166.229 29.215 
+165.736 28.82 165.385 c 28.434 165.041 27.887 164.869 27.18 164.869 c 26.93
+ 164.869 26.68 164.893 26.43 164.932 c 26.18 164.975 25.918 165.033 25.648
+ 165.119 c 25.648 165.916 l 25.875 165.779 26.117 165.682 26.367 165.619
+ c 26.617 165.557 26.883 165.525 27.164 165.525 c 27.609 165.525 27.965 
+165.643 28.227 165.885 c 28.496 166.123 28.633 166.447 28.633 166.854 c 
+28.633 167.26 28.496 167.576 28.227 167.807 c 27.965 168.045 27.609 168.166
+ 27.164 168.166 c 26.953 168.166 26.742 168.139 26.523 168.088 c 26.312 
+168.045 26.102 167.979 25.883 167.885 c h
+f
+20.59 207.518 m 24.34 207.518 l 24.34 207.189 l 22.23 201.689 l 21.402 
+201.689 l 23.387 206.861 l 20.59 206.861 l h
+f
+27.664 204.924 m 27.309 204.924 27.027 204.799 26.82 204.549 c 26.609 204.307
+ 26.508 203.979 26.508 203.564 c 26.508 203.146 26.609 202.814 26.82 202.564
+ c 27.027 202.322 27.309 202.205 27.664 202.205 c 28.016 202.205 28.297 
+202.322 28.508 202.564 c 28.715 202.814 28.82 203.146 28.82 203.564 c 28.82
+ 203.979 28.715 204.307 28.508 204.549 c 28.297 204.799 28.016 204.924 27.664
+ 204.924 c h
+29.227 207.393 m 29.227 206.674 l 29.027 206.768 28.828 206.838 28.633 
+206.893 c 28.434 206.943 28.234 206.971 28.039 206.971 c 27.516 206.971 
+27.117 206.791 26.836 206.439 c 26.562 206.084 26.406 205.553 26.367 204.846
+ c 26.523 205.072 26.715 205.244 26.945 205.361 c 27.172 205.486 27.43 205.549
+ 27.711 205.549 c 28.293 205.549 28.758 205.369 29.102 205.018 c 29.445 
+204.662 29.617 204.178 29.617 203.564 c 29.617 202.959 29.438 202.475 29.086
+ 202.111 c 28.73 201.756 28.258 201.58 27.664 201.58 c 26.984 201.58 26.469
+ 201.834 26.117 202.346 c 25.762 202.865 25.586 203.615 25.586 204.596 c
+ 25.586 205.521 25.805 206.256 26.242 206.799 c 26.68 207.35 27.266 207.627
+ 28.008 207.627 c 28.203 207.627 28.402 207.604 28.602 207.564 c 28.797 
+207.533 29.008 207.475 29.227 207.393 c h
+f
+20.59 244.229 m 24.34 244.229 l 24.34 243.9 l 22.23 238.4 l 21.402 238.4
+ l 23.387 243.572 l 20.59 243.572 l h
+f
+25.68 244.229 m 29.43 244.229 l 29.43 243.9 l 27.32 238.4 l 26.492 238.4
+ l 28.477 243.572 l 25.68 243.572 l h
+f
+20.59 280.939 m 24.34 280.939 l 24.34 280.611 l 22.23 275.111 l 21.402 
+275.111 l 23.387 280.283 l 20.59 280.283 l h
+f
+27.57 277.877 m 27.195 277.877 26.898 277.775 26.68 277.58 c 26.469 277.381
+ 26.367 277.104 26.367 276.752 c 26.367 276.396 26.469 276.119 26.68 275.924
+ c 26.898 275.725 27.195 275.627 27.57 275.627 c 27.945 275.627 28.234 275.725
+ 28.445 275.924 c 28.664 276.131 28.773 276.408 28.773 276.752 c 28.773 
+277.104 28.664 277.381 28.445 277.58 c 28.234 277.775 27.945 277.877 27.57
+ 277.877 c h
+26.773 278.221 m 26.438 278.303 26.18 278.459 25.992 278.689 c 25.805 278.916
+ 25.711 279.197 25.711 279.533 c 25.711 280.002 25.871 280.369 26.195 280.643
+ c 26.527 280.912 26.984 281.049 27.57 281.049 c 28.152 281.049 28.605 280.912
+ 28.93 280.643 c 29.262 280.369 29.43 280.002 29.43 279.533 c 29.43 279.197
+ 29.336 278.916 29.148 278.689 c 28.961 278.459 28.699 278.303 28.367 278.221
+ c 28.742 278.127 29.031 277.947 29.242 277.689 c 29.461 277.439 29.57 277.127
+ 29.57 276.752 c 29.57 276.189 29.398 275.756 29.055 275.455 c 28.711 275.15
+ 28.215 275.002 27.57 275.002 c 26.922 275.002 26.43 275.15 26.086 275.455
+ c 25.742 275.756 25.57 276.189 25.57 276.752 c 25.57 277.127 25.672 277.439
+ 25.883 277.689 c 26.102 277.947 26.398 278.127 26.773 278.221 c h
+26.492 279.471 m 26.492 279.166 26.586 278.928 26.773 278.752 c 26.961 
+278.584 27.227 278.502 27.57 278.502 c 27.902 278.502 28.164 278.584 28.352
+ 278.752 c 28.547 278.928 28.648 279.166 28.648 279.471 c 28.648 279.771
+ 28.547 280.006 28.352 280.174 c 28.164 280.338 27.902 280.424 27.57 280.424
+ c 27.227 280.424 26.961 280.338 26.773 280.174 c 26.586 280.006 26.492 
+279.771 26.492 279.471 c h
+f
+20.59 317.65 m 24.34 317.65 l 24.34 317.322 l 22.23 311.822 l 21.402 311.822
+ l 23.387 316.994 l 20.59 316.994 l h
+f
+25.898 311.947 m 25.898 312.666 l 26.094 312.572 26.293 312.498 26.492 
+312.447 c 26.699 312.393 26.902 312.369 27.102 312.369 c 27.621 312.369 
+28.016 312.545 28.289 312.9 c 28.57 313.252 28.73 313.783 28.773 314.494
+ c 28.617 314.275 28.422 314.104 28.195 313.979 c 27.965 313.861 27.711 
+313.807 27.43 313.807 c 26.844 313.807 26.383 313.979 26.039 314.322 c 25.695
+ 314.674 25.523 315.158 25.523 315.775 c 25.523 316.377 25.699 316.857 26.055
+ 317.213 c 26.406 317.576 26.883 317.76 27.477 317.76 c 28.152 317.76 28.668
+ 317.498 29.023 316.979 c 29.375 316.467 29.555 315.717 29.555 314.729 c
+ 29.555 313.811 29.336 313.076 28.898 312.525 c 28.461 311.982 27.871 311.713
+ 27.133 311.713 c 26.934 311.713 26.73 311.736 26.523 311.775 c 26.324 311.807
+ 26.117 311.861 25.898 311.947 c h
+27.477 314.416 m 27.828 314.416 28.109 314.533 28.32 314.775 c 28.527 315.025
+ 28.633 315.357 28.633 315.775 c 28.633 316.189 28.527 316.518 28.32 316.76
+ c 28.109 317.01 27.828 317.135 27.477 317.135 c 27.121 317.135 26.84 317.01
+ 26.633 316.76 c 26.422 316.518 26.32 316.189 26.32 315.775 c 26.32 315.357
+ 26.422 315.025 26.633 314.775 c 26.84 314.533 27.121 314.416 27.477 314.416
+ c h
+f
+22.48 351.299 m 22.105 351.299 21.809 351.197 21.59 351.002 c 21.379 350.803
+ 21.277 350.525 21.277 350.174 c 21.277 349.818 21.379 349.541 21.59 349.346
+ c 21.809 349.146 22.105 349.049 22.48 349.049 c 22.855 349.049 23.145 349.146
+ 23.355 349.346 c 23.574 349.553 23.684 349.83 23.684 350.174 c 23.684 350.525
+ 23.574 350.803 23.355 351.002 c 23.145 351.197 22.855 351.299 22.48 351.299
+ c h
+21.684 351.643 m 21.348 351.725 21.09 351.881 20.902 352.111 c 20.715 352.338
+ 20.621 352.619 20.621 352.955 c 20.621 353.424 20.781 353.791 21.105 354.064
+ c 21.438 354.334 21.895 354.471 22.48 354.471 c 23.062 354.471 23.516 354.334
+ 23.84 354.064 c 24.172 353.791 24.34 353.424 24.34 352.955 c 24.34 352.619
+ 24.246 352.338 24.059 352.111 c 23.871 351.881 23.609 351.725 23.277 351.643
+ c 23.652 351.549 23.941 351.369 24.152 351.111 c 24.371 350.861 24.48 350.549
+ 24.48 350.174 c 24.48 349.611 24.309 349.178 23.965 348.877 c 23.621 348.572
+ 23.125 348.424 22.48 348.424 c 21.832 348.424 21.34 348.572 20.996 348.877
+ c 20.652 349.178 20.48 349.611 20.48 350.174 c 20.48 350.549 20.582 350.861
+ 20.793 351.111 c 21.012 351.369 21.309 351.549 21.684 351.643 c h
+21.402 352.893 m 21.402 352.588 21.496 352.35 21.684 352.174 c 21.871 352.006
+ 22.137 351.924 22.48 351.924 c 22.812 351.924 23.074 352.006 23.262 352.174
+ c 23.457 352.35 23.559 352.588 23.559 352.893 c 23.559 353.193 23.457 353.428
+ 23.262 353.596 c 23.074 353.76 22.812 353.846 22.48 353.846 c 22.137 353.846
+ 21.871 353.76 21.684 353.596 c 21.496 353.428 21.402 353.193 21.402 352.893
+ c h
+f
+27.57 353.846 m 27.164 353.846 26.855 353.643 26.648 353.236 c 26.449 352.838
+ 26.352 352.24 26.352 351.439 c 26.352 350.646 26.449 350.049 26.648 349.643
+ c 26.855 349.244 27.164 349.049 27.57 349.049 c 27.977 349.049 28.277 349.244
+ 28.477 349.643 c 28.684 350.049 28.789 350.646 28.789 351.439 c 28.789 
+352.24 28.684 352.838 28.477 353.236 c 28.277 353.643 27.977 353.846 27.57
+ 353.846 c h
+27.57 354.471 m 28.227 354.471 28.727 354.209 29.07 353.689 c 29.414 353.178
+ 29.586 352.428 29.586 351.439 c 29.586 350.459 29.414 349.709 29.07 349.189
+ c 28.727 348.678 28.227 348.424 27.57 348.424 c 26.914 348.424 26.414 348.678
+ 26.07 349.189 c 25.727 349.709 25.555 350.459 25.555 351.439 c 25.555 352.428
+ 25.727 353.178 26.07 353.689 c 26.414 354.209 26.914 354.471 27.57 354.471
+ c h
+f
+9.902 160.92 m 9.977 161.127 10.133 161.33 10.371 161.529 c 10.602 161.736
+ 10.918 161.939 11.324 162.139 c 13.324 163.139 l 13.324 162.076 l 11.449
+ 161.154 l 10.961 160.912 10.637 160.678 10.48 160.451 c 10.324 160.221 
+10.246 159.912 10.246 159.529 c 10.246 158.451 l 13.324 158.451 l 13.324
+ 157.467 l 6.027 157.467 l 6.027 159.686 l 6.027 160.518 6.207 161.139 6.559
+ 161.545 c 6.902 161.959 7.43 162.17 8.137 162.17 c 8.598 162.17 8.977 162.061
+ 9.277 161.842 c 9.582 161.631 9.789 161.326 9.902 160.92 c h
+6.84 158.451 m 9.434 158.451 l 9.434 159.686 l 9.434 160.162 9.324 160.521
+ 9.105 160.764 c 8.887 161.014 8.566 161.139 8.137 161.139 c 7.711 161.139
+ 7.387 161.014 7.168 160.764 c 6.949 160.521 6.84 160.162 6.84 159.686 c
+ h
+f
+6.277 168.791 m 7.23 168.791 l 7.055 168.416 6.926 168.061 6.84 167.729
+ c 6.746 167.393 6.699 167.072 6.699 166.76 c 6.699 166.229 6.805 165.814
+ 7.012 165.525 c 7.223 165.232 7.52 165.088 7.902 165.088 c 8.227 165.088
+ 8.473 165.182 8.637 165.369 c 8.805 165.564 8.934 165.936 9.027 166.479
+ c 9.152 167.072 l 9.301 167.799 9.551 168.342 9.902 168.697 c 10.246 169.049
+ 10.715 169.229 11.309 169.229 c 12.02 169.229 12.555 168.986 12.918 168.51
+ c 13.285 168.041 13.465 167.346 13.465 166.432 c 13.465 166.088 13.422 
+165.717 13.34 165.322 c 13.27 164.936 13.152 164.533 12.996 164.119 c 11.98
+ 164.119 l 12.211 164.525 12.383 164.916 12.496 165.291 c 12.613 165.674
+ 12.668 166.057 12.668 166.432 c 12.668 166.994 12.559 167.424 12.34 167.729
+ c 12.113 168.041 11.793 168.197 11.387 168.197 c 11.035 168.197 10.758 
+168.088 10.559 167.869 c 10.352 167.65 10.195 167.283 10.09 166.775 c 9.98
+ 166.182 l 9.836 165.439 9.605 164.904 9.293 164.572 c 8.98 164.248 8.543
+ 164.088 7.98 164.088 c 7.336 164.088 6.832 164.311 6.465 164.76 c 6.09 
+165.217 5.902 165.846 5.902 166.65 c 5.902 166.994 5.934 167.342 5.996 167.697
+ c 6.059 168.049 6.152 168.416 6.277 168.791 c h
+f
+9.902 174.217 m 9.977 174.424 10.133 174.627 10.371 174.826 c 10.602 175.033
+ 10.918 175.236 11.324 175.436 c 13.324 176.436 l 13.324 175.373 l 11.449
+ 174.451 l 10.961 174.209 10.637 173.975 10.48 173.748 c 10.324 173.518 
+10.246 173.209 10.246 172.826 c 10.246 171.748 l 13.324 171.748 l 13.324
+ 170.764 l 6.027 170.764 l 6.027 172.982 l 6.027 173.814 6.207 174.436 6.559
+ 174.842 c 6.902 175.256 7.43 175.467 8.137 175.467 c 8.598 175.467 8.977
+ 175.357 9.277 175.139 c 9.582 174.928 9.789 174.623 9.902 174.217 c h
+6.84 171.748 m 9.434 171.748 l 9.434 172.982 l 9.434 173.459 9.324 173.818
+ 9.105 174.061 c 8.887 174.311 8.566 174.436 8.137 174.436 c 7.711 174.436
+ 7.387 174.311 7.168 174.061 c 6.949 173.818 6.84 173.459 6.84 172.982 c
+ h
+f
+6.84 178.697 m 9.59 178.697 l 9.59 179.932 l 9.59 180.389 9.473 180.744
+ 9.23 180.994 c 8.992 181.252 8.652 181.385 8.215 181.385 c 7.777 181.385
+ 7.441 181.252 7.199 180.994 c 6.961 180.744 6.84 180.389 6.84 179.932 c
+ h
+6.027 177.713 m 6.027 179.932 l 6.027 180.752 6.215 181.373 6.59 181.791
+ c 6.957 182.205 7.496 182.416 8.215 182.416 c 8.934 182.416 9.477 182.205
+ 9.84 181.791 c 10.207 181.373 10.387 180.752 10.387 179.932 c 10.387 178.697
+ l 13.324 178.697 l 13.324 177.713 l h
+f
+8.699 190.045 m 8.637 189.939 8.598 189.83 8.574 189.717 c 8.543 189.6 
+8.527 189.471 8.527 189.326 c 8.527 188.814 8.695 188.424 9.027 188.154 
+c 9.352 187.881 9.824 187.748 10.449 187.748 c 13.324 187.748 l 13.324 186.842
+ l 7.855 186.842 l 7.855 187.748 l 8.699 187.748 l 8.367 187.936 8.121 188.178
+ 7.965 188.482 c 7.809 188.783 7.73 189.154 7.73 189.592 c 7.73 189.654 
+7.738 189.721 7.746 189.795 c 7.746 189.865 7.758 189.951 7.777 190.045 
+c h
+f
+10.574 193.471 m 10.574 192.752 10.66 192.252 10.824 191.971 c 10.992 191.689
+ 11.273 191.549 11.668 191.549 c 11.992 191.549 12.246 191.65 12.434 191.861
+ c 12.621 192.068 12.715 192.354 12.715 192.721 c 12.715 193.221 12.539 
+193.619 12.184 193.924 c 11.832 194.225 11.363 194.377 10.777 194.377 c 
+10.574 194.377 l h
+10.199 195.268 m 13.324 195.268 l 13.324 194.377 l 12.496 194.377 l 12.832
+ 194.166 13.074 193.908 13.23 193.596 c 13.387 193.291 13.465 192.924 13.465
+ 192.486 c 13.465 191.924 13.309 191.475 12.996 191.143 c 12.684 190.807
+ 12.262 190.643 11.73 190.643 c 11.117 190.643 10.652 190.85 10.34 191.268
+ c 10.027 191.682 9.871 192.299 9.871 193.111 c 9.871 194.377 l 9.777 194.377
+ l 9.371 194.377 9.055 194.236 8.824 193.955 c 8.598 193.682 8.48 193.303
+ 8.48 192.814 c 8.48 192.502 8.523 192.193 8.605 191.893 c 8.68 191.6 8.789
+ 191.318 8.934 191.049 c 8.105 191.049 l 7.98 191.381 7.887 191.697 7.824
+ 192.002 c 7.762 192.314 7.73 192.615 7.73 192.908 c 7.73 193.697 7.934 
+194.287 8.34 194.674 c 8.746 195.068 9.367 195.268 10.199 195.268 c h
+f
+10.027 201.658 m 13.324 201.658 l 13.324 200.768 l 10.059 200.768 l 9.539
+ 200.768 9.152 200.662 8.902 200.455 c 8.645 200.256 8.512 199.955 8.512
+ 199.549 c 8.512 199.068 8.668 198.689 8.98 198.408 c 9.285 198.127 9.699
+ 197.986 10.23 197.986 c 13.324 197.986 l 13.324 197.08 l 7.855 197.08 l
+ 7.855 197.986 l 8.699 197.986 l 8.379 198.205 8.137 198.459 7.98 198.752
+ c 7.816 199.041 7.73 199.377 7.73 199.752 c 7.73 200.377 7.926 200.85 8.309
+ 201.174 c 8.695 201.494 9.27 201.658 10.027 201.658 c h
+f
+10.527 207.061 m 9.871 207.061 9.367 206.924 9.012 206.654 c 8.66 206.381
+ 8.48 206.006 8.48 205.529 c 8.48 205.037 8.66 204.658 9.012 204.389 c 9.367
+ 204.127 9.871 203.998 10.527 203.998 c 11.176 203.998 11.68 204.127 12.043
+ 204.389 c 12.398 204.658 12.574 205.037 12.574 205.529 c 12.574 206.006
+ 12.398 206.381 12.043 206.654 c 11.68 206.924 11.176 207.061 10.527 207.061
+ c h
+12.652 207.951 m 13.578 207.951 14.266 207.74 14.715 207.326 c 15.172 206.92
+ 15.402 206.287 15.402 205.436 c 15.402 205.123 15.375 204.826 15.324 204.545
+ c 15.281 204.264 15.215 203.99 15.121 203.732 c 14.246 203.732 l 14.391
+ 203.99 14.496 204.248 14.559 204.498 c 14.629 204.756 14.668 205.021 14.668
+ 205.295 c 14.668 205.877 14.512 206.314 14.199 206.607 c 13.895 206.908
+ 13.434 207.061 12.809 207.061 c 12.355 207.061 l 12.68 206.873 12.926 206.631
+ 13.09 206.342 c 13.246 206.049 13.324 205.701 13.324 205.295 c 13.324 204.627
+ 13.07 204.084 12.559 203.67 c 12.051 203.264 11.371 203.061 10.527 203.061
+ c 9.684 203.061 9.008 203.264 8.496 203.67 c 7.988 204.084 7.73 204.627
+ 7.73 205.295 c 7.73 205.701 7.809 206.049 7.965 206.342 c 8.121 206.631
+ 8.363 206.873 8.684 207.061 c 7.855 207.061 l 7.855 207.951 l h
+f
+10.371 214.486 m 10.809 214.486 l 10.809 210.346 l 11.426 210.385 11.895
+ 210.572 12.215 210.908 c 12.539 211.24 12.699 211.705 12.699 212.299 c 
+12.699 212.643 12.66 212.975 12.574 213.299 c 12.492 213.631 12.367 213.955
+ 12.199 214.268 c 13.043 214.268 l 13.18 213.943 13.285 213.611 13.355 213.268
+ c 13.426 212.932 13.465 212.596 13.465 212.252 c 13.465 211.377 13.215 
+210.682 12.715 210.174 c 12.207 209.662 11.512 209.408 10.637 209.408 c 
+9.742 209.408 9.035 209.646 8.512 210.127 c 7.992 210.615 7.73 211.271 7.73
+ 212.096 c 7.73 212.834 7.965 213.416 8.434 213.846 c 8.902 214.271 9.551
+ 214.486 10.371 214.486 c h
+10.105 213.58 m 9.617 213.58 9.227 213.443 8.934 213.174 c 8.633 212.9 
+8.48 212.549 8.48 212.111 c 8.48 211.6 8.629 211.193 8.918 210.893 c 9.199
+ 210.6 9.598 210.428 10.105 210.377 c h
+f
+5.73 219.053 m 5.73 221.131 l 6.418 221.131 l 6.418 219.959 l 13.949 219.959
+ l 13.949 221.131 l 14.637 221.131 l 14.637 219.053 l h
+f
+6.684 225.264 m 6.684 224.764 6.934 224.381 7.434 224.123 c 7.934 223.873
+ 8.684 223.748 9.684 223.748 c 10.684 223.748 11.434 223.873 11.934 224.123
+ c 12.434 224.381 12.684 224.764 12.684 225.264 c 12.684 225.783 12.434 
+226.17 11.934 226.42 c 11.434 226.678 10.684 226.811 9.684 226.811 c 8.684
+ 226.811 7.934 226.678 7.434 226.42 c 6.934 226.17 6.684 225.783 6.684 225.264
+ c h
+5.902 225.264 m 5.902 226.084 6.227 226.709 6.871 227.139 c 7.52 227.576
+ 8.457 227.795 9.684 227.795 c 10.914 227.795 11.852 227.576 12.496 227.139
+ c 13.145 226.709 13.465 226.084 13.465 225.264 c 13.465 224.451 13.145 
+223.826 12.496 223.389 c 11.852 222.959 10.914 222.748 9.684 222.748 c 8.457
+ 222.748 7.52 222.959 6.871 223.389 c 6.227 223.826 5.902 224.451 5.902 
+225.264 c h
+f
+12.09 230.549 1.234 -1.031 re f
+12.09 233.729 1.234 -1.031 re f
+13.168 235.908 m 12.277 235.908 l 12.395 236.158 12.48 236.408 12.543 236.658
+ c 12.605 236.916 12.637 237.166 12.637 237.408 c 12.637 238.064 12.418 
+238.564 11.98 238.908 c 11.543 239.252 10.879 239.443 9.98 239.486 c 10.262
+ 239.299 10.48 239.057 10.637 238.768 c 10.785 238.486 10.855 238.166 10.855
+ 237.814 c 10.855 237.084 10.637 236.506 10.199 236.08 c 9.754 235.65 9.148
+ 235.439 8.387 235.439 c 7.637 235.439 7.039 235.658 6.59 236.096 c 6.133
+ 236.541 5.902 237.135 5.902 237.877 c 5.902 238.721 6.227 239.361 6.871
+ 239.799 c 7.52 240.244 8.457 240.471 9.684 240.471 c 10.832 240.471 11.746
+ 240.197 12.434 239.658 c 13.121 239.115 13.465 238.381 13.465 237.455 c
+ 13.465 237.205 13.438 236.955 13.387 236.705 c 13.344 236.455 13.273 236.189
+ 13.168 235.908 c h
+10.074 237.877 m 10.074 238.314 9.926 238.662 9.621 238.924 c 9.32 239.182
+ 8.91 239.314 8.387 239.314 c 7.855 239.314 7.441 239.182 7.137 238.924 
+c 6.836 238.662 6.684 238.314 6.684 237.877 c 6.684 237.428 6.836 237.072
+ 7.137 236.814 c 7.441 236.564 7.855 236.439 8.387 236.439 c 8.91 236.439
+ 9.32 236.564 9.621 236.814 c 9.926 237.072 10.074 237.428 10.074 237.877
+ c h
+f
+6.027 242.002 m 6.027 246.689 l 6.449 246.689 l 13.324 244.033 l 13.324
+ 243.002 l 6.871 245.502 l 6.871 242.002 l h
+f
+5.73 250.584 m 14.637 250.584 l 14.637 248.506 l 13.949 248.506 l 13.949
+ 249.678 l 6.418 249.678 l 6.418 248.506 l 5.73 248.506 l h
+f
+Q q
+36.336 351.053 434.281 -293.688 re W n
+q
+36 352.002 435 -295 re W n
+[ 1 0 0 1 0 -0.998047 ] concat
+  q
+0.498039 0 0 rg
+1 w
+1 J
+1 j
+[] 0.0 d
+10 M q 1 0 0 -1 0 361 cm
+-2554.875 412.77 m -2398.535 412.77 l -2389.852 376.059 l -2216.137 376.059
+ l -2207.453 339.348 l -2051.109 339.348 l -2042.426 302.637 l -1912.141
+ 302.637 l -1903.453 265.926 l -1790.543 265.926 l -1781.855 229.215 l -1677.629
+ 229.215 l -1668.941 192.504 l -1573.402 192.504 l -1564.715 155.793 l -1477.859
+ 155.793 l -1469.172 119.082 l -1399.688 119.082 l -1391.004 82.371 l -1330.203
+ 82.371 l -1321.516 45.66 l -1260.719 45.66 l -1252.031 8.949 l -1199.918
+ 8.949 l -1191.234 -27.762 l -1156.492 -27.762 l -1147.805 -64.473 l -1113.063
+ -64.473 l -1104.375 -101.184 l -1069.633 -101.184 l -1060.949 -137.895 
+l -1026.207 -137.895 l -1017.52 -174.605 l -1000.148 -174.605 l -991.465
+ -211.316 l -965.406 -211.316 l -956.723 -248.027 l -948.035 -284.738 l 
+-921.98 -284.738 l -913.293 -321.449 l -904.609 -358.16 l -878.551 -358.16
+ l -869.863 -394.871 l -861.18 -431.582 l -852.492 -431.582 l -843.809 -468.293
+ l -835.121 -468.293 l -826.438 -541.715 l -817.75 -578.426 l -809.066 -578.426
+ l -800.379 -615.137 l -661.41 -615.137 l -652.723 -578.426 l -644.039 -541.715
+ l -635.352 -541.715 l -626.668 -468.293 l -617.98 -468.293 l -609.297 -431.582
+ l -600.609 -394.871 l -591.926 -394.871 l -583.238 -358.16 l -565.867 -358.16
+ l -557.184 -321.449 l -548.496 -321.449 l -539.813 -284.738 l -522.441 
+-284.738 l -513.754 -248.027 l -505.07 -248.027 l -496.383 -211.316 l -479.012
+ -211.316 l -470.324 -174.605 l -435.582 -174.605 l -426.898 -137.895 l 
+-400.84 -137.895 l -392.156 -101.184 l -357.414 -101.184 l -348.727 -64.473
+ l -313.984 -64.473 l -305.301 -27.762 l -270.559 -27.762 l -261.871 8.949
+ l -218.441 8.949 l -209.758 45.66 l -140.273 45.66 l -131.586 82.371 l 
+-70.789 82.371 l -62.102 119.082 l -1.301 119.082 l 7.383 155.793 l 102.926
+ 155.793 l 111.609 192.504 l 207.152 192.504 l 215.84 229.215 l 320.066 
+229.215 l 328.75 265.926 l 432.98 265.926 l 441.664 302.637 l 580.637 302.637
+ l 589.32 339.348 l 754.348 339.348 l 763.031 376.059 l 928.059 376.059 
+l 936.746 412.77 l 1127.828 412.77 l 1136.516 449.48 l 1362.34 449.48 l 
+1371.027 486.191 l 1605.539 486.191 l 1614.223 522.902 l 1900.852 522.902
+ l 1909.535 559.613 l 2213.531 559.613 l 2222.219 596.324 l 2578.328 596.324
+ l 2587.016 633.035 l 2856.27 633.035 l S Q
+0 0 1 rg
+q 1 0 0 -1 0 361 cm
+-2554.875 633.035 m -2242.195 633.035 l -2233.508 596.324 l -1877.398 596.324
+ l -1868.711 559.613 l -1564.715 559.613 l -1556.031 522.902 l -1269.402
+ 522.902 l -1260.719 486.191 l -1026.207 486.191 l -1017.52 449.48 l -791.695
+ 449.48 l -783.008 412.77 l -591.926 412.77 l -583.238 376.059 l -400.84
+ 376.059 l -392.156 339.348 l -244.5 339.348 l -235.813 302.637 l -96.844
+ 302.637 l -88.16 265.926 l 16.07 265.926 l 24.754 229.215 l 128.98 229.215
+ l 137.668 192.504 l 233.211 192.504 l 241.895 155.793 l 337.438 155.793
+ l 354.809 119.082 l 406.922 119.082 l 415.609 82.371 l 476.406 82.371 l
+ 485.094 45.66 l 554.578 45.66 l 563.262 8.949 l 606.691 8.949 l 615.379
+ -27.762 l 650.121 -27.762 l 658.805 -64.473 l 693.547 -64.473 l 702.234
+ -101.184 l 736.977 -101.184 l 745.66 -137.895 l 780.402 -137.895 l 789.09
+ -174.605 l 815.148 -174.605 l 823.832 -211.316 l 841.203 -211.316 l 849.891
+ -248.027 l 858.574 -248.027 l 867.262 -284.738 l 884.633 -284.738 l 893.316
+ -321.449 l 902.004 -321.449 l 910.688 -358.16 l 928.059 -358.16 l 936.746
+ -394.871 l 945.43 -394.871 l 954.117 -431.582 l 962.801 -468.293 l 971.488
+ -468.293 l 980.172 -541.715 l 988.859 -541.715 l 997.543 -578.426 l 1006.23
+ -615.137 l 1145.199 -615.137 l 1153.887 -578.426 l 1162.57 -578.426 l 1171.258
+ -541.715 l 1179.941 -468.293 l 1188.629 -468.293 l 1197.313 -431.582 l 
+1206 -431.582 l 1214.688 -394.871 l 1223.371 -358.16 l 1249.43 -358.16 l
+ 1258.113 -321.449 l 1266.801 -284.738 l 1292.855 -284.738 l 1301.543 -248.027
+ l 1310.227 -211.316 l 1336.285 -211.316 l 1344.969 -174.605 l 1379.711 
+-174.605 l 1388.398 -137.895 l 1405.77 -137.895 l 1414.453 -101.184 l 1449.199
+ -101.184 l 1457.883 -64.473 l 1492.625 -64.473 l 1501.313 -27.762 l 1536.055
+ -27.762 l 1544.738 8.949 l 1596.852 8.949 l 1605.539 45.66 l 1666.34 45.66
+ l 1675.023 82.371 l 1735.824 82.371 l 1744.508 119.082 l 1813.992 119.082
+ l 1822.68 155.793 l 1909.535 155.793 l 1918.223 192.504 l 2013.762 192.504
+ l 2022.449 229.215 l 2126.676 229.215 l 2135.363 265.926 l 2248.273 265.926
+ l 2256.961 302.637 l 2387.246 302.637 l 2395.93 339.348 l 2560.957 339.348
+ l 2569.645 376.059 l 2734.672 376.059 l 2743.355 412.77 l 2856.27 412.77
+ l S Q
+  Q
+Q
+Q q
+1 g
+127.172 21.689 225.656 -17.398 re f
+0 g
+0.5 w
+1 J
+1 j
+[] 0.0 d
+10 M q 1 0 0 -1 0 360.001953 cm
+127.172 338.312 225.656 17.398 re S Q
+Q q
+130.965 14.002 32.035 -2 re W n
+q
+130 14.002 33 -2 re W n
+[ 1 0 0 1 0 -0.998047 ] concat
+  q
+0.498039 0 0 rg
+1 w
+1 J
+1 j
+[] 0.0 d
+10 M q 1 0 0 -1 0 361 cm
+131.465 347.012 m 162.465 347.012 l S Q
+  Q
+Q
+Q q
+0 g
+171.246 16.111 m 171.246 15.346 l 170.941 15.49 170.656 15.596 170.387 
+15.658 c 170.125 15.729 169.875 15.768 169.637 15.768 c 169.199 15.768 168.863
+ 15.682 168.637 15.518 c 168.406 15.35 168.293 15.115 168.293 14.814 c 168.293
+ 14.553 168.363 14.354 168.512 14.221 c 168.668 14.096 168.965 13.99 169.402
+ 13.908 c 169.871 13.814 l 170.465 13.697 170.902 13.502 171.184 13.221 
+c 171.465 12.939 171.605 12.557 171.605 12.08 c 171.605 11.518 171.41 11.088
+ 171.027 10.799 c 170.652 10.506 170.098 10.361 169.371 10.361 c 169.09 
+10.361 168.793 10.393 168.48 10.455 c 168.168 10.518 167.844 10.611 167.512
+ 10.736 c 167.512 11.549 l 167.832 11.361 168.145 11.221 168.449 11.127 
+c 168.762 11.041 169.066 11.002 169.371 11.002 c 169.816 11.002 170.16 11.088
+ 170.402 11.268 c 170.652 11.443 170.777 11.693 170.777 12.018 c 170.777
+ 12.307 170.688 12.533 170.512 12.689 c 170.332 12.854 170.047 12.979 169.652
+ 13.064 c 169.168 13.158 l 168.574 13.271 168.145 13.455 167.887 13.705 
+c 167.625 13.955 167.496 14.303 167.496 14.752 c 167.496 15.26 167.676 15.662
+ 168.043 15.955 c 168.406 16.256 168.906 16.408 169.543 16.408 c 169.812
+ 16.408 170.09 16.381 170.371 16.33 c 170.66 16.287 170.953 16.213 171.246
+ 16.111 c h
+f
+174.496 14.346 m 174.109 14.346 173.801 14.193 173.574 13.893 c 173.355
+ 13.588 173.246 13.178 173.246 12.658 c 173.246 12.135 173.355 11.725 173.574
+ 11.424 c 173.801 11.119 174.109 10.971 174.496 10.971 c 174.879 10.971 
+175.184 11.119 175.402 11.424 c 175.629 11.725 175.746 12.135 175.746 12.658
+ c 175.746 13.178 175.629 13.588 175.402 13.893 c 175.184 14.193 174.879
+ 14.346 174.496 14.346 c h
+174.496 14.955 m 175.121 14.955 175.609 14.752 175.965 14.346 c 176.316
+ 13.939 176.496 13.377 176.496 12.658 c 176.496 11.939 176.316 11.377 175.965
+ 10.971 c 175.609 10.564 175.121 10.361 174.496 10.361 c 173.871 10.361 
+173.375 10.564 173.012 10.971 c 172.656 11.377 172.48 11.939 172.48 12.658
+ c 172.48 13.377 172.656 13.939 173.012 14.346 c 173.375 14.752 173.871 
+14.955 174.496 14.955 c h
+f
+177.625 12.205 m 177.625 14.846 l 178.344 14.846 l 178.344 12.221 l 178.344
+ 11.814 178.422 11.506 178.578 11.299 c 178.742 11.088 178.988 10.986 179.312
+ 10.986 c 179.695 10.986 180 11.104 180.219 11.346 c 180.445 11.596 180.562
+ 11.932 180.562 12.361 c 180.562 14.846 l 181.281 14.846 l 181.281 10.471
+ l 180.562 10.471 l 180.562 11.143 l 180.383 10.881 180.18 10.682 179.953
+ 10.549 c 179.723 10.424 179.457 10.361 179.156 10.361 c 178.656 10.361 
+178.273 10.518 178.016 10.83 c 177.754 11.143 177.625 11.6 177.625 12.205
+ c h
+f
+185.305 14.174 m 185.219 14.225 185.133 14.26 185.039 14.283 c 184.945 
+14.303 184.84 14.314 184.727 14.314 c 184.32 14.314 184.008 14.178 183.789
+ 13.908 c 183.57 13.646 183.461 13.271 183.461 12.783 c 183.461 10.471 l
+ 182.742 10.471 l 182.742 14.846 l 183.461 14.846 l 183.461 14.174 l 183.605
+ 14.432 183.797 14.627 184.039 14.752 c 184.289 14.885 184.586 14.955 184.93
+ 14.955 c 184.98 14.955 185.031 14.947 185.086 14.939 c 185.148 14.939 185.215
+ 14.928 185.289 14.908 c h
+f
+189.027 14.674 m 189.027 14.002 l 188.816 14.115 188.609 14.197 188.402
+ 14.252 c 188.203 14.314 188 14.346 187.793 14.346 c 187.324 14.346 186.957
+ 14.193 186.699 13.893 c 186.449 13.6 186.324 13.189 186.324 12.658 c 186.324
+ 12.127 186.449 11.709 186.699 11.408 c 186.957 11.115 187.324 10.971 187.793
+ 10.971 c 188 10.971 188.203 10.994 188.402 11.049 c 188.609 11.111 188.816
+ 11.193 189.027 11.299 c 189.027 10.643 l 188.828 10.549 188.621 10.479 
+188.402 10.439 c 188.184 10.389 187.953 10.361 187.715 10.361 c 187.059 
+10.361 186.531 10.564 186.137 10.971 c 185.75 11.385 185.559 11.947 185.559
+ 12.658 c 185.559 13.365 185.754 13.924 186.152 14.33 c 186.547 14.744 187.082
+ 14.955 187.762 14.955 c 187.98 14.955 188.191 14.928 188.402 14.877 c 188.621
+ 14.834 188.828 14.768 189.027 14.674 c h
+f
+194.02 12.846 m 194.02 12.486 l 190.707 12.486 l 190.738 11.994 190.887
+ 11.619 191.16 11.361 c 191.43 11.1 191.801 10.971 192.27 10.971 c 192.551
+ 10.971 192.82 11.002 193.082 11.064 c 193.34 11.135 193.598 11.24 193.848
+ 11.377 c 193.848 10.689 l 193.586 10.584 193.32 10.506 193.051 10.455 c
+ 192.777 10.393 192.508 10.361 192.238 10.361 c 191.539 10.361 190.98 10.564
+ 190.566 10.971 c 190.16 11.377 189.957 11.924 189.957 12.611 c 189.957 
+13.33 190.148 13.896 190.535 14.314 c 190.93 14.74 191.457 14.955 192.113
+ 14.955 c 192.695 14.955 193.16 14.76 193.504 14.377 c 193.848 14.002 194.02
+ 13.49 194.02 12.846 c h
+193.301 13.049 m 193.289 13.443 193.176 13.756 192.957 13.986 c 192.746
+ 14.225 192.465 14.346 192.113 14.346 c 191.715 14.346 191.395 14.229 191.145
+ 14.002 c 190.902 13.771 190.77 13.455 190.738 13.049 c h
+f
+202.141 15.861 m 202.141 15.018 l 201.867 15.268 201.582 15.455 201.281
+ 15.58 c 200.988 15.705 200.672 15.768 200.328 15.768 c 199.66 15.768 199.148
+ 15.557 198.797 15.143 c 198.441 14.736 198.266 14.146 198.266 13.377 c 
+198.266 12.615 198.441 12.025 198.797 11.611 c 199.148 11.205 199.66 11.002
+ 200.328 11.002 c 200.672 11.002 200.988 11.064 201.281 11.189 c 201.582
+ 11.314 201.867 11.502 202.141 11.752 c 202.141 10.924 l 201.859 10.736 
+201.562 10.596 201.25 10.502 c 200.945 10.408 200.625 10.361 200.281 10.361
+ c 199.395 10.361 198.695 10.631 198.188 11.174 c 197.688 11.713 197.438
+ 12.447 197.438 13.377 c 197.438 14.314 197.688 15.053 198.188 15.596 c 
+198.695 16.135 199.395 16.408 200.281 16.408 c 200.633 16.408 200.961 16.361
+ 201.266 16.268 c 201.578 16.174 201.867 16.037 202.141 15.861 c h
+f
+207.07 12.846 m 207.07 12.486 l 203.758 12.486 l 203.789 11.994 203.938
+ 11.619 204.211 11.361 c 204.48 11.1 204.852 10.971 205.32 10.971 c 205.602
+ 10.971 205.871 11.002 206.133 11.064 c 206.391 11.135 206.648 11.24 206.898
+ 11.377 c 206.898 10.689 l 206.637 10.584 206.371 10.506 206.102 10.455 
+c 205.828 10.393 205.559 10.361 205.289 10.361 c 204.59 10.361 204.031 10.564
+ 203.617 10.971 c 203.211 11.377 203.008 11.924 203.008 12.611 c 203.008
+ 13.33 203.199 13.896 203.586 14.314 c 203.98 14.74 204.508 14.955 205.164
+ 14.955 c 205.746 14.955 206.211 14.76 206.555 14.377 c 206.898 14.002 207.07
+ 13.49 207.07 12.846 c h
+206.352 13.049 m 206.34 13.443 206.227 13.756 206.008 13.986 c 205.797 
+14.225 205.516 14.346 205.164 14.346 c 204.766 14.346 204.445 14.229 204.195
+ 14.002 c 203.953 13.771 203.82 13.455 203.789 13.049 c h
+f
+208.242 16.549 0.719 -6.078 re f
+210.465 16.549 0.719 -6.078 re f
+218.027 13.205 m 218.203 13.15 218.371 13.033 218.527 12.846 c 218.684 
+12.658 218.844 12.396 219.012 12.064 c 219.809 10.471 l 218.965 10.471 l
+ 218.215 11.971 l 218.027 12.354 217.84 12.611 217.652 12.736 c 217.473 
+12.869 217.23 12.939 216.918 12.939 c 216.059 12.939 l 216.059 10.471 l 
+215.262 10.471 l 215.262 16.299 l 217.043 16.299 l 217.707 16.299 218.203
+ 16.158 218.527 15.877 c 218.859 15.604 219.027 15.189 219.027 14.627 c 
+219.027 14.26 218.941 13.955 218.777 13.705 c 218.609 13.463 218.359 13.299
+ 218.027 13.205 c h
+216.059 15.658 m 216.059 13.58 l 217.043 13.58 l 217.426 13.58 217.715 
+13.666 217.902 13.846 c 218.098 14.021 218.199 14.283 218.199 14.627 c 218.199
+ 14.971 218.098 15.225 217.902 15.393 c 217.715 15.568 217.426 15.658 217.043
+ 15.658 c h
+f
+224.32 16.111 m 224.32 15.346 l 224.016 15.49 223.73 15.596 223.461 15.658
+ c 223.199 15.729 222.949 15.768 222.711 15.768 c 222.273 15.768 221.938
+ 15.682 221.711 15.518 c 221.48 15.35 221.367 15.115 221.367 14.814 c 221.367
+ 14.553 221.438 14.354 221.586 14.221 c 221.742 14.096 222.039 13.99 222.477
+ 13.908 c 222.945 13.814 l 223.539 13.697 223.977 13.502 224.258 13.221 
+c 224.539 12.939 224.68 12.557 224.68 12.08 c 224.68 11.518 224.484 11.088
+ 224.102 10.799 c 223.727 10.506 223.172 10.361 222.445 10.361 c 222.164
+ 10.361 221.867 10.393 221.555 10.455 c 221.242 10.518 220.918 10.611 220.586
+ 10.736 c 220.586 11.549 l 220.906 11.361 221.219 11.221 221.523 11.127 
+c 221.836 11.041 222.141 11.002 222.445 11.002 c 222.891 11.002 223.234 
+11.088 223.477 11.268 c 223.727 11.443 223.852 11.693 223.852 12.018 c 223.852
+ 12.307 223.762 12.533 223.586 12.689 c 223.406 12.854 223.121 12.979 222.727
+ 13.064 c 222.242 13.158 l 221.648 13.271 221.219 13.455 220.961 13.705 
+c 220.699 13.955 220.57 14.303 220.57 14.752 c 220.57 15.26 220.75 15.662
+ 221.117 15.955 c 221.48 16.256 221.98 16.408 222.617 16.408 c 222.887 16.408
+ 223.164 16.381 223.445 16.33 c 223.734 16.287 224.027 16.213 224.32 16.111
+ c h
+f
+228.664 13.205 m 228.84 13.15 229.008 13.033 229.164 12.846 c 229.32 12.658
+ 229.48 12.396 229.648 12.064 c 230.445 10.471 l 229.602 10.471 l 228.852
+ 11.971 l 228.664 12.354 228.477 12.611 228.289 12.736 c 228.109 12.869 
+227.867 12.939 227.555 12.939 c 226.695 12.939 l 226.695 10.471 l 225.898
+ 10.471 l 225.898 16.299 l 227.68 16.299 l 228.344 16.299 228.84 16.158 
+229.164 15.877 c 229.496 15.604 229.664 15.189 229.664 14.627 c 229.664 
+14.26 229.578 13.955 229.414 13.705 c 229.246 13.463 228.996 13.299 228.664
+ 13.205 c h
+226.695 15.658 m 226.695 13.58 l 227.68 13.58 l 228.062 13.58 228.352 13.666
+ 228.539 13.846 c 228.734 14.021 228.836 14.283 228.836 14.627 c 228.836
+ 14.971 228.734 15.225 228.539 15.393 c 228.352 15.568 228.062 15.658 227.68
+ 15.658 c h
+f
+232.254 15.658 m 232.254 13.471 l 233.238 13.471 l 233.613 13.471 233.898
+ 13.564 234.098 13.752 c 234.293 13.939 234.395 14.209 234.395 14.564 c 
+234.395 14.908 234.293 15.174 234.098 15.361 c 233.898 15.557 233.613 15.658
+ 233.238 15.658 c h
+231.457 16.299 m 233.238 16.299 l 233.895 16.299 234.387 16.15 234.723 
+15.861 c 235.055 15.568 235.223 15.135 235.223 14.564 c 235.223 13.99 235.055
+ 13.553 234.723 13.252 c 234.387 12.959 233.895 12.814 233.238 12.814 c 
+232.254 12.814 l 232.254 10.471 l 231.457 10.471 l h
+f
+0 0 1 rg
+1 w
+1 J
+1 j
+[] 0.0 d
+10 M q 1 0 0 -1 0 360.001953 cm
+244.5 347.012 m 275.5 347.012 l S Q
+Q q
+279 17.002 67 -8.918 re W n
+q
+279 17.002 67 -9 re W n
+[ 1 0 0 1 0 -0.998047 ] concat
+  q
+0 g
+279.969 17.297 m 284.906 17.297 l 284.906 16.641 l 282.844 16.641 l 282.844
+ 11.469 l 282.047 11.469 l 282.047 16.641 l 279.969 16.641 l h
+f
+286.312 13.672 m 285.727 13.672 285.32 13.602 285.094 13.469 c 284.875 
+13.332 284.766 13.109 284.766 12.797 c 284.766 12.535 284.848 12.328 285.016
+ 12.172 c 285.18 12.023 285.41 11.953 285.703 11.953 c 286.098 11.953 286.414
+ 12.094 286.656 12.375 c 286.895 12.664 287.016 13.047 287.016 13.516 c 
+287.016 13.672 l h
+287.734 13.969 m 287.734 11.469 l 287.016 11.469 l 287.016 12.141 l 286.859
+ 11.867 286.656 11.672 286.406 11.547 c 286.164 11.422 285.867 11.359 285.516
+ 11.359 c 285.066 11.359 284.707 11.484 284.438 11.734 c 284.176 11.984 
+284.047 12.32 284.047 12.75 c 284.047 13.238 284.207 13.609 284.531 13.859
+ c 284.863 14.109 285.359 14.234 286.016 14.234 c 287.016 14.234 l 287.016
+ 14.297 l 287.016 14.629 286.906 14.883 286.688 15.062 c 286.477 15.25 286.176
+ 15.344 285.781 15.344 c 285.531 15.344 285.285 15.312 285.047 15.25 c 284.805
+ 15.188 284.578 15.098 284.359 14.984 c 284.359 15.641 l 284.629 15.742 
+284.883 15.82 285.125 15.875 c 285.375 15.926 285.617 15.953 285.859 15.953
+ c 286.484 15.953 286.953 15.785 287.266 15.453 c 287.578 15.129 287.734
+ 14.633 287.734 13.969 c h
+f
+291.762 15.172 m 291.676 15.223 291.59 15.258 291.496 15.281 c 291.402 
+15.301 291.297 15.312 291.184 15.312 c 290.777 15.312 290.465 15.176 290.246
+ 14.906 c 290.027 14.645 289.918 14.27 289.918 13.781 c 289.918 11.469 l
+ 289.199 11.469 l 289.199 15.844 l 289.918 15.844 l 289.918 15.172 l 290.062
+ 15.43 290.254 15.625 290.496 15.75 c 290.746 15.883 291.043 15.953 291.387
+ 15.953 c 291.438 15.953 291.488 15.945 291.543 15.938 c 291.605 15.938 
+291.672 15.926 291.746 15.906 c h
+f
+295.254 13.703 m 295.254 14.223 295.145 14.625 294.926 14.906 c 294.707
+ 15.195 294.402 15.344 294.02 15.344 c 293.633 15.344 293.332 15.195 293.113
+ 14.906 c 292.902 14.625 292.801 14.223 292.801 13.703 c 292.801 13.191 
+292.902 12.789 293.113 12.5 c 293.332 12.219 293.633 12.078 294.02 12.078
+ c 294.402 12.078 294.707 12.219 294.926 12.5 c 295.145 12.789 295.254 13.191
+ 295.254 13.703 c h
+295.973 12.016 m 295.973 11.266 295.805 10.711 295.473 10.344 c 295.137
+ 9.98 294.633 9.797 293.957 9.797 c 293.695 9.797 293.449 9.82 293.223 9.859
+ c 293.004 9.902 292.789 9.961 292.582 10.031 c 292.582 10.734 l 292.789
+ 10.621 292.996 10.539 293.207 10.484 c 293.414 10.422 293.621 10.391 293.832
+ 10.391 c 294.309 10.391 294.664 10.516 294.895 10.766 c 295.133 11.016 
+295.254 11.391 295.254 11.891 c 295.254 12.234 l 295.098 11.984 294.902 
+11.789 294.676 11.656 c 294.445 11.531 294.168 11.469 293.848 11.469 c 293.305
+ 11.469 292.867 11.672 292.535 12.078 c 292.211 12.492 292.051 13.035 292.051
+ 13.703 c 292.051 14.379 292.211 14.922 292.535 15.328 c 292.867 15.742 
+293.305 15.953 293.848 15.953 c 294.168 15.953 294.445 15.883 294.676 15.75
+ c 294.902 15.625 295.098 15.438 295.254 15.188 c 295.254 15.844 l 295.973
+ 15.844 l h
+f
+301.191 13.844 m 301.191 13.484 l 297.879 13.484 l 297.91 12.992 298.059
+ 12.617 298.332 12.359 c 298.602 12.098 298.973 11.969 299.441 11.969 c 
+299.723 11.969 299.992 12 300.254 12.062 c 300.512 12.133 300.77 12.238 
+301.02 12.375 c 301.02 11.688 l 300.758 11.582 300.492 11.504 300.223 11.453
+ c 299.949 11.391 299.68 11.359 299.41 11.359 c 298.711 11.359 298.152 11.562
+ 297.738 11.969 c 297.332 12.375 297.129 12.922 297.129 13.609 c 297.129
+ 14.328 297.32 14.895 297.707 15.312 c 298.102 15.738 298.629 15.953 299.285
+ 15.953 c 299.867 15.953 300.332 15.758 300.676 15.375 c 301.02 15 301.191
+ 14.488 301.191 13.844 c h
+300.473 14.047 m 300.461 14.441 300.348 14.754 300.129 14.984 c 299.918
+ 15.223 299.637 15.344 299.285 15.344 c 298.887 15.344 298.566 15.227 298.316
+ 15 c 298.074 14.77 297.941 14.453 297.91 14.047 c h
+f
+303.082 17.094 m 303.082 15.844 l 304.566 15.844 l 304.566 15.281 l 303.082
+ 15.281 l 303.082 12.906 l 303.082 12.551 303.129 12.32 303.223 12.219 c
+ 303.324 12.125 303.523 12.078 303.816 12.078 c 304.566 12.078 l 304.566
+ 11.469 l 303.816 11.469 l 303.262 11.469 302.883 11.57 302.676 11.781 c
+ 302.465 11.988 302.363 12.363 302.363 12.906 c 302.363 15.281 l 301.832
+ 15.281 l 301.832 15.844 l 302.363 15.844 l 302.363 17.094 l h
+f
+312.449 16.859 m 312.449 16.016 l 312.176 16.266 311.891 16.453 311.59 
+16.578 c 311.297 16.703 310.98 16.766 310.637 16.766 c 309.969 16.766 309.457
+ 16.555 309.105 16.141 c 308.75 15.734 308.574 15.145 308.574 14.375 c 308.574
+ 13.613 308.75 13.023 309.105 12.609 c 309.457 12.203 309.969 12 310.637
+ 12 c 310.98 12 311.297 12.062 311.59 12.188 c 311.891 12.312 312.176 12.5
+ 312.449 12.75 c 312.449 11.922 l 312.168 11.734 311.871 11.594 311.559 
+11.5 c 311.254 11.406 310.934 11.359 310.59 11.359 c 309.703 11.359 309.004
+ 11.629 308.496 12.172 c 307.996 12.711 307.746 13.445 307.746 14.375 c 
+307.746 15.312 307.996 16.051 308.496 16.594 c 309.004 17.133 309.703 17.406
+ 310.59 17.406 c 310.941 17.406 311.27 17.359 311.574 17.266 c 311.887 17.172
+ 312.176 17.035 312.449 16.859 c h
+f
+317.379 13.844 m 317.379 13.484 l 314.066 13.484 l 314.098 12.992 314.246
+ 12.617 314.52 12.359 c 314.789 12.098 315.16 11.969 315.629 11.969 c 315.91
+ 11.969 316.18 12 316.441 12.062 c 316.699 12.133 316.957 12.238 317.207
+ 12.375 c 317.207 11.688 l 316.945 11.582 316.68 11.504 316.41 11.453 c 
+316.137 11.391 315.867 11.359 315.598 11.359 c 314.898 11.359 314.34 11.562
+ 313.926 11.969 c 313.52 12.375 313.316 12.922 313.316 13.609 c 313.316 
+14.328 313.508 14.895 313.895 15.312 c 314.289 15.738 314.816 15.953 315.473
+ 15.953 c 316.055 15.953 316.52 15.758 316.863 15.375 c 317.207 15 317.379
+ 14.488 317.379 13.844 c h
+316.66 14.047 m 316.648 14.441 316.535 14.754 316.316 14.984 c 316.105 
+15.223 315.824 15.344 315.473 15.344 c 315.074 15.344 314.754 15.227 314.504
+ 15 c 314.262 14.77 314.129 14.453 314.098 14.047 c h
+f
+318.551 17.547 0.719 -6.078 re f
+320.773 17.547 0.719 -6.078 re f
+328.336 14.203 m 328.512 14.148 328.68 14.031 328.836 13.844 c 328.992 
+13.656 329.152 13.395 329.32 13.062 c 330.117 11.469 l 329.273 11.469 l 
+328.523 12.969 l 328.336 13.352 328.148 13.609 327.961 13.734 c 327.781 
+13.867 327.539 13.938 327.227 13.938 c 326.367 13.938 l 326.367 11.469 l
+ 325.57 11.469 l 325.57 17.297 l 327.352 17.297 l 328.016 17.297 328.512
+ 17.156 328.836 16.875 c 329.168 16.602 329.336 16.188 329.336 15.625 c 
+329.336 15.258 329.25 14.953 329.086 14.703 c 328.918 14.461 328.668 14.297
+ 328.336 14.203 c h
+326.367 16.656 m 326.367 14.578 l 327.352 14.578 l 327.734 14.578 328.023
+ 14.664 328.211 14.844 c 328.406 15.02 328.508 15.281 328.508 15.625 c 328.508
+ 15.969 328.406 16.223 328.211 16.391 c 328.023 16.566 327.734 16.656 327.352
+ 16.656 c h
+f
+334.629 17.109 m 334.629 16.344 l 334.324 16.488 334.039 16.594 333.77 
+16.656 c 333.508 16.727 333.258 16.766 333.02 16.766 c 332.582 16.766 332.246
+ 16.68 332.02 16.516 c 331.789 16.348 331.676 16.113 331.676 15.812 c 331.676
+ 15.551 331.746 15.352 331.895 15.219 c 332.051 15.094 332.348 14.988 332.785
+ 14.906 c 333.254 14.812 l 333.848 14.695 334.285 14.5 334.566 14.219 c 
+334.848 13.938 334.988 13.555 334.988 13.078 c 334.988 12.516 334.793 12.086
+ 334.41 11.797 c 334.035 11.504 333.48 11.359 332.754 11.359 c 332.473 11.359
+ 332.176 11.391 331.863 11.453 c 331.551 11.516 331.227 11.609 330.895 11.734
+ c 330.895 12.547 l 331.215 12.359 331.527 12.219 331.832 12.125 c 332.145
+ 12.039 332.449 12 332.754 12 c 333.199 12 333.543 12.086 333.785 12.266
+ c 334.035 12.441 334.16 12.691 334.16 13.016 c 334.16 13.305 334.07 13.531
+ 333.895 13.688 c 333.715 13.852 333.43 13.977 333.035 14.062 c 332.551 
+14.156 l 331.957 14.27 331.527 14.453 331.27 14.703 c 331.008 14.953 330.879
+ 15.301 330.879 15.75 c 330.879 16.258 331.059 16.66 331.426 16.953 c 331.789
+ 17.254 332.289 17.406 332.926 17.406 c 333.195 17.406 333.473 17.379 333.754
+ 17.328 c 334.043 17.285 334.336 17.211 334.629 17.109 c h
+f
+338.973 14.203 m 339.148 14.148 339.316 14.031 339.473 13.844 c 339.629
+ 13.656 339.789 13.395 339.957 13.062 c 340.754 11.469 l 339.91 11.469 l
+ 339.16 12.969 l 338.973 13.352 338.785 13.609 338.598 13.734 c 338.418 
+13.867 338.176 13.938 337.863 13.938 c 337.004 13.938 l 337.004 11.469 l
+ 336.207 11.469 l 336.207 17.297 l 337.988 17.297 l 338.652 17.297 339.148
+ 17.156 339.473 16.875 c 339.805 16.602 339.973 16.188 339.973 15.625 c 
+339.973 15.258 339.887 14.953 339.723 14.703 c 339.555 14.461 339.305 14.297
+ 338.973 14.203 c h
+337.004 16.656 m 337.004 14.578 l 337.988 14.578 l 338.371 14.578 338.66
+ 14.664 338.848 14.844 c 339.043 15.02 339.145 15.281 339.145 15.625 c 339.145
+ 15.969 339.043 16.223 338.848 16.391 c 338.66 16.566 338.371 16.656 337.988
+ 16.656 c h
+f
+342.562 16.656 m 342.562 14.469 l 343.547 14.469 l 343.922 14.469 344.207
+ 14.562 344.406 14.75 c 344.602 14.938 344.703 15.207 344.703 15.562 c 344.703
+ 15.906 344.602 16.172 344.406 16.359 c 344.207 16.555 343.922 16.656 343.547
+ 16.656 c h
+341.766 17.297 m 343.547 17.297 l 344.203 17.297 344.695 17.148 345.031
+ 16.859 c 345.363 16.566 345.531 16.133 345.531 15.562 c 345.531 14.988 
+345.363 14.551 345.031 14.25 c 344.695 13.957 344.203 13.812 343.547 13.812
+ c 342.562 13.812 l 342.562 11.469 l 341.766 11.469 l h
+f
+  Q
+Q
+Q q
+0.501961 g
+1.6 w
+0 J
+0 j
+[ 3.2 1.6] 0 d
+4 M q 1 0 0 -1 0 360.001953 cm
+328.664 302.305 m 328.664 82.254 l S Q
+[ 3.2 1.6] 0 d
+q 1 0 0 -1 0 360.001953 cm
+347.898 302.305 m 347.898 26.25 l S Q
+0 g
+BT
+8 0 0 8 306.585565 328.614361 Tm
+/f-0-0 1 Tf
+[(event A3)]TJ
+-5.111328 -1.25 Td
+[(and h)-3(andover s)-3(tart)]TJ
+11.11322 -3.050597 Td
+[(time-to)-20(-trigger)]TJ
+-30.005711 -7.313533 Td
+[(neighbour)-3( cell becomes)]TJ
+0.269531 -1.25 Td
+[(better t)-3(han )-3(serving c)-3(ell)]TJ
+20.977718 -9.785889 Td
+[(hyster)19(esis)]TJ
+ET
+[] 0.0 d
+q 1 0 0 -1 0 360.001953 cm
+328.664 63.586 m 347.898 63.586 l S Q
+0.8 w
+q 1 0 0 -1 0 360.001953 cm
+328.664 67.203 m 328.664 59.969 l S Q
+339.527 300.287 m 350.016 296.432 l 339.527 292.576 l 341.203 294.854 341.191
+ 297.967 339.527 300.287 c h
+f*
+0.501961 g
+1.6 w
+[ 3.2 1.6] 0 d
+q 1 0 0 -1 0 360.001953 cm
+215.527 302.305 m 215.527 119.023 l S Q
+0 g
+BT
+8 0 0 8 224.653041 272.470881 Tm
+/f-0-0 1 Tf
+[(hyster)19(esis condition )-3(met)]TJ
+ET
+[] 0.0 d
+q 1 0 0 -1 0 360.001953 cm
+328.664 155.227 m 328.664 265.535 l S Q
+324.789 196.404 m 328.648 206.896 l 332.504 196.404 l 330.227 198.08 327.113
+ 198.072 324.789 196.404 c h
+f*
+332.535 102.838 m 328.68 92.35 l 324.82 102.838 l 327.098 101.162 330.215
+ 101.17 332.535 102.838 c h
+f*
+Q q
+412 281.002 7 -7 re W n
+q
+412 281.002 7 -7 re W n
+% Fallback Image: x=412 y=79 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 412 273.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gau`R=\)Oi'K(ZqdPRFe_9)tfqQRh5.ap6GUH[*10o$+1dKW.6E2X216IaM*kX2F*og?]MU)
+ =B)k"p^dXhYoIZGF]:e_2G?4tiYE8'k]E]R0BUDkFGh?KVCi@1<^@Y7H-^TW8GbION%)I+[
+ 1($2Ud]^X:nuGOP&!3NB*DGkMPahkI4^^OGF(r:;:"IDX0o\9AHBD^oc$/mc3+LCa1Z>u0O
+ b?Vt0kqtG*t)R?]3P;<gT"Ti"3LQ2j-O\*O@V^O"1q=BE!;'J"<2f>;")D*Oe,(KTNLC^68
+ j2V`OX@.:m1,FV.Ei%[ipeb-f9Z6ATnFT[h`t"V"K<d6h2!BHJ0HbD1.bMHoDfGY9U8+u)$
+ _3cQ+F$9Wo(/]=9OfieE9$_oV[)+nM5&Z!#7loYJV+3dk(]^*Q#L`Zrr#A\P<La]akY>#4T
+ R=9TX@e\9$nCjj6TpB@aus\fdYn@"Fkp>a%IM0[EVaXq!f1#]r=RKEVhXH?cIp9nFabp7Bj
+ '9$#=<935EQ>a,]-,-/?$Ui/N`[m$n(Ob88[ZatY>K(*!s=p$6%%$SsRU)e7#)(`5q)</XB
+ /r:63hm?&XG^0Oo#CR2b2*ck"cG(`3D0r\TE\T+COCrQn>WZ;b@m3jPT63;>t_M/NJ4*u<J
+ S#/!C2DR-]jh,mc$ra;M*a#[6RUot2'9c9tN/Zg3oB&VWaVDc.(Pf%mA_q3;V#/Y%6aLGZc
+ -8RDH9)NU&CGMCHUeW6Bd8g_91qQW\.G]B9:&RT6mUP_!RSW;L=?XHIOuK#jR1eP"V[1*:S
+ /+a6ZpZ7BBDlZ=LLnXSM_3!b4bSuAT1ViI*R>C@J5_%,nEs.@80JH"S.WKOKY%e/pM[#kYY
+ l%M;RlaTXIkAQ'EOOqTlm(U1#+/Hd0eiFfH@GC_3#<QnWlqbWZ=nG7I&1if+o_eLa7bEcVg
+ 3.qtJ2NK?8HY4/NDV=qt@jZR7:]OJa0"`SZU:ltH1[oZPM8?.b#[L3l_)2Z%RiU&4CUQUrp
+ O`AqpZVLLpUE^O-Q<-a^\ItAj,;;sT`!_05oB[saULCId_hSg8+C=$lMD]/pG[q9Sr:qN@`
+ pg%:CU%at[Vj'U4ZINhVbSBg:R\+H^2cY9L*SR76d;q$_`XploF7:rG-HDL[Y^eI6P1(\ep
+ ?YJ)O]3t`J\1A<8GZ[E]T)rcYleOkTkPS*Ag,1T0A71,c%<[V+KE=+k&P6J=IaBdZZ&'r"t
+ J9M8O+jQS4[QWaHa%,oS`5qgfh:oP0ZV``s4d#!"/JiquBNrdIsO.*1N3rsY<uU9.s3^K^[
+ =$"hr)~>
+Q
+Q q
+421 281.002 7 -7 re W n
+q
+421 281.002 7 -7 re W n
+% Fallback Image: x=421 y=79 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 421 273.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$D(Lu])"j$;2'K?\=:/R9#d)\/ArT6eWQ>Z/bf@l-ej>=-@q@i=1M3D0e`KX`+_3JEZ"
+ 0jL9oNU7_L+eH7&P+N]0.h#S),69Fm]*PhrfI6I6Z>+cFJMnY*B`Ls,M$T0L(W/3<]cu=B`
+ T414K2MP*mSf5,#G%c_'7N1Bjsh@qZ.3PPFZ89BPJQ$k/f8'9=61[T8*n3jc8eV["Fk=Bs@
+ =q=A73HA23A'G[=7!/6+V4EuCb2VI`g="ThqLZNdTmNFG&f<6^Gbsb>9hRp[k03U.*pZ'XG
+ gq&3<."m=)84o'4f^Pjh/Xa5_;-o:$7/6T:`!HV+iQ0,,;\LK)rdjJ":Ji$Q7:EEgq>%OF&
+ P%oAcliSUc:NL8.ks"3Xl^V&^suFZ[+$JR91a*jI&jgs2fBlg#]=O!FB%2cNN6,X>V'Xfpe
+ ad]_38+kESoGP=o@tF3]^)8K"*e15)oO<Z#?69IR6F*ZEluNeFre66;Hu_.%603hRu:']4u
+ MOOZ7e0f%/K]9*KBX\@Nk,!6N?mIilq[6I*KQJU`uGc@9X8?G=@9(Et#KR1U#Q%tB)=\A6B
+ bB")h/o^p_:2_ou=Ko![`60:h2A7ji[6]i&BX/el!f<AkKYqZP&/kAXQq=AQKr]B_fKCJHK
+ V+\=>8'F.X.Xp7dJFm,ST1[#+YrI"A[^NEF&Xf&SCh,FXOR75[(@o@u,tYDJ7,)h"LC`AMp
+ #8H:V1tt!Ibh8=YdB(O),*b5BF%o"Fj)pj^t;c1H#eAffs?i=e95W."Q9(M3bI*\T`J_9UA
+ r"o#m\18=u)2-<;QFuG\/je:Uu5Ro^P4@N+>mfPus!J;(q'-7>1jtm7cXe8$I1jp?[or=BW
+ cAe\OGRs*VsH*42n&/mOKkiNX=@`U)m/k*21k`XNdja2a#u3D'!bqAdt8"0f79^n:Og:V"K
+ _"/emcY-K3rH#d`H9>-^2r;YJ.$$e9^bre/N/]-=l'<F@V)P5p3)2*\$nmsg>o:2e_?G)(M
+ 1(YIcYV>;Go1_C521R19"G;=Q]6Hj$]dm0^HLXJbG.2B74WPt#84^O].pE)<_P,E['HV1$W
+ f))V#!Fb)ksUtrRXb/J:S)A/<#YEps3c5["33>VZUp\d0@k&.I_C+~>
+Q
+Q q
+429 281.002 7 -7 re W n
+q
+429 281.002 7 -7 re W n
+% Fallback Image: x=429 y=79 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 429 273.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$CFGc_(foB2ef5nC.s(P1j]lQ"-#$ROX!s0q-pg[Y#`5rY7QF.7[#HVcQq>[pb[E;bU&
+ @f/(_bYm3Qud#Y.LgMp\if>hiFnjm]KpCo=XgEh=l=\f)trY3&n_A0"/7Zq6LE4>I)Q1Y?u
+ EDHZXp:T<PPMW@85bWA$>h\N,'8.*6Uf_aCN-iUptXe^:),j2VuR_"9Ha<j9'294ma?q\Ch
+ kTY2@'27S!7K=3]6h4$@Ug!M,;r]Xq,dF3`Z3ooA#:fW4p:<^pQ_fZ5capsVAEA:p3<638#
+ K*QYs&fVe$AENO[D1+RqdW##f$4.#*S)*4_:Dd%CgWT#ibgf]UH%N=W`5][C;hZ/LE:]rcP
+ 02`TSnIAL=!3dJPOIDPlo=s!&#JcO#e7CCE9.G4ZZ5FT`lG?o-kb7hr/Ccg99iDUY?mp+:L
+ oQMJtO6V5Hhr#9@AoZ$?UK%@R<IL1<1o,]C4S_g\uZ/[S"Z3QbPaY9n0t&9YcBN7\ZOUc-8
+ S*1mXHsjbkIHT&+tp$&jjX0KP*M@CaRHPt4Ua?+IN)_?F%Fip9h8%h/tV@0(_%;'7Me@Nt6
+ q&[Pr$kKbH>Q7D*(]ZqL@DD"7CiT^aTLZ:/Efh(>a?t<f@Yu*,)F[a^Kng]:c:5>NrWiM8P
+ /5/UVapKIB0JLl!XKN.EA,.R;#6Z/5*p)LXD9@!M?>b`Xf%9HYR:s+/#gq&hobCO*grKb6c
+ =giSI9P44CMjUm&%V'&q.OLU-XkQ$Xc*c4`!:$mOdV'qE4EO?gc=U$$R`hjVc;Th\B\BO@7
+ .2(("_Gq*^,ZeZ`D6As00D;V/i,pg"RH(2R'WUL9PF`=+Vr-kH:qhE5$K)8P-F7$hs,Mku7
+ *lALoKm_m:a$R[Mhl:69jnS`/W47n4:H?BfU#nr035N16s3gc6T/KWS8Z/W5@OSrU<?0fMk
+ Sa%)L1?=#k4pFVsC$q+3b3%_O1g+=oI&h/J4<`ga[`pm?L/pc)hqd1Kl7$pA2$#Mk:%1VkV
+ .t_^%@S)DiK6:a:$&=^p'5'Y;\p[fZg!qCpJMLp6<$Tr=9>l%B0&#',,4O[O+@\i]>M:O>>
+ .;QB+-(8(lb,%~>
+Q
+Q q
+438 281.002 7 -7 re W n
+q
+438 281.002 7 -7 re W n
+% Fallback Image: x=438 y=79 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 438 273.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%>qFNG(eu4rq3Kt@'sbB,[VTETAQi\Z12Fek@r,>GW0itjRokCQMT4e9=_V:s1.b>,+r
+ <Ei'P\$O<_;lS]OUo$dj@-mFlV;!F3a5uT&9ElhrfE:#P\h7[YC%^I/AYp--X[c=BNA*03D
+ Q#lDfT_hnNZ9$H'dFmRBj-JsS.<gPbTA3CU8^[N@]+V[$"iipgL^F`hs%$A4!+r)lC!(?+X
+ b4F;g?$5=8MW+Z:P`Mfn-B.#lle<$)bIIdZ(*[*`iaiOlf;c-SM`^YoG81ufUR2NB?$;",.
+ _S[*n\:E>Cji%.I%@Pn`L'H`$$J!7^$;R3_@Nrt<j[S!;rqTKWp@TpO(GRb"#7on`B@#SY&
+ I$48iUUOo'M&Voju*qKj2YMo8^$["9]5kr;--<qio8nV"",H"Y-&$>7=%"pX/3f%j7K_JDk
+ 0+X7U#50r>ION;U<ETG^.$T<e5l*r;:O$)XcLL7SqiLA!igPqed!Fg?9rr]("d;o^:9^.0Y
+ nl1"h)V.JE4c[l5pG6r&c`S$U"5:/7gMjK;cMp_Vl`YG8d:)ZB.KZEe!t]Y*1d-qZ0L_qr(
+ rI^4;Z$k9%oG'7hE5sTtajR-<AG7(a[%36HUpcI]NF>f<>]8%n<E8h!1*>2tA@;G"HkE(uV
+ 1I_'8oL\,A-5+IgL.Mh1kD0B`4Y!fS(>-),3]`at[BuU)-OR5d&onJ/I/J`-#6lG:)S9asH
+ RIF=L2Yp:?m#q$Q>B,c&oDK.AmJ[Z(r4d+NqW*5<"uXE7GFmJaZ47=dFX/R.bqReQl$]RH[
+ E</^:oh`3UbXrJ-V4)-ZXj%&_u.Q&gHbdXQo+_GWG#g6/sFH'fWXE$,4,O5\k/G0C-`ubfr
+ )_dScC@_8\rVT;B8N?#6%A]m(]<VAef8?CmC57WIQ!gtfqs-kH%Ai'A>BTR\-[-'u-Xfi]Y
+ mbd"F9'm$-%:^jAOgal)t79CE)rGhbF1m.\=n,"K`Qal5..0Km6N?fc?g8m37<AeI\2f?]k
+ oB-]",R%%fq^k(jA'TI;U8*j=M98G9N)YG`jtfWO;4N$*./p8K[fsK!.4N?Z&F8@D6\24:@
+ pREN6n7BqF#5brT'_%]$]UDN'0(:P(qj*IcTAu<"mt]jF8~>
+Q
+Q q
+447 281.002 7 -7 re W n
+q
+447 281.002 7 -7 re W n
+% Fallback Image: x=447 y=79 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 447 273.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%>qD:M(iK/KfMY8g<rQ8i2Ir6#9_*De^mMDS17M:Bk.jceg121:=B`&QcfB"S0q7a_JV
+ 9cNC*U#TbEu:oYgM!Dmk\n>CW4!i8+'Y1n+YV`p"]"a?dJCo^fJLu$C7"IlPG$J_!J-(54V
+ 2r0gW;Dq%JsU(`L8l=6SpId+='Imq%@R\cp:Spec:-5"/tVK%<uppLA"JF)sAtcck>7><I7
+ edS^boiPC.H<)a/!]6F&H<Cc1)?dRVgW[cf;MmP;E3B=%@7SaPlVK?>i+.([g$P=JAa@HJ9
+ YN#P0['elaB-!C)HpC%$DVmos-r-C8&0?inGOX[M9O[Ot]I\)lT9ne]9TL7RqK;T0_Snrp^
+ H[mE:f`=%!D2%A!Z)XAm@/3BFAsNJQ\UqFS2u@6`tWcE+uU54q.O]5Z73QWhm']$!AeM!pB
+ ClMgPa+5EV$'7_U/rr<XP@fV'3<cTsb`??]2?q$,urETTDW4AF@^e1:r2BH1rOR?t-F!IJ[
+ DfMkD1t]-[l$Bb>C"+Q%9hm+AS&XT1M>i'i+j''84G:WM.pE-6ko%1XGthS%:ff?-$+O<6&
+ +AX%(MLkn;c"tD-74%UhM%3_F%l"PPA,dYe@79#LfZ*rM>R7Fm$j5NLi4ag^I6:g=%Wo.03
+ o1"bSE<@@-3.>-+mb\O",O"B+1%QMtA!i_EclkA.+=mqhRAd*I.nL@[SDV)hQo.'4:k6`UE
+ TRZ>*u=O4_9``TGA8l(TO#0?M;"iV!s4RO.,(Ogd1E6n'lum#'MSP#S+6KHRnL0$G7-3b,h
+ j748EN'^KUhH#nreaSBka[pTl7!!S!q:P;c@]84M8@IoVh,^Y`L*RbiIU3^rHN^A4b6b+!4
+ at+EN&-:e:BL.V:Rg4'V,(B2*GgEY@uK[tgNFBRgM,i$3a4&ee$1J=iGJ6hfX)q3cKt6LB+
+ G,tLTn>b">;0G#9H+qK:r>7]!,achlW%lnhDQS-DCVRTa>X^^F*ilW!(7uNE3#Km\YG5Hc?
+ BhW+ngrN8%Xd)qa@]lmN=_;6%m$!X0/Y)Tj?lG6.3_o2$4k/$(APk224K04T+TA/"m)8MY1
+ ?]1`1a_hfE?hq'%uXMi-Fb(bp]J<Y]qP~>
+Q
+Q q
+456 281.002 7 -7 re W n
+q
+456 281.002 7 -7 re W n
+% Fallback Image: x=456 y=79 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 456 273.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%CFkc[(bS7A;A-n"*1N?jC!8,4QAF5<iJ/N;Znr_"bn.<UQD&Hj,>"bKAl_Ib:IiW;AJ
+ U/GTThfAOsguL?2(_>he-NsIeZk9XrlQq^<_#:p\S4II6A[VU@nIHAnE_[NR+6I0K"Q&h_7
+ -M+$VTUjf^!XnE(1O4@)UJR[Y$SIZ48TI/"iFRPBk_iRp#\]la^j[D0N'%j%CU)ad!`7N0e
+ S49c&\kRh^h`2-,:GYpb<-(::lntg/e"uS>p^-:>cMrJ2VB&_Gt"W&d^o3GXhSCEY2V[$4%
+ 3.2]B;$[\65k8^Bd+3qIT/9uR0fh?l>)FOpi9cLeHPFE:i;@lU]-eg%'d7^nYP>0qpMoU@U
+ 8+u/(S%$2":*uJ8Q8cL6b[qNQ34*)73UjK\*34up$4Sd*$HJEE.FLMJpmN8oI*=(nF.S*#4
+ VW*CcGX&U:@\mj*:N+e7i_59-beiO/4/HbS7S!bD,*@UV:'I9qb.mZig-ZGOP%nWR0M3+kf
+ @S$I@;*0JF&ShCNVd6>.dqdns-m]A;-h"8+#HY$1K?.fnc7PNU43M1rj&iU;ipgVjf[[UK,
+ \BPFFtf%#JJTpUKCo^p(Q"3A_U9oUiG0PSN"Fp3!,aG>d2dtT:`)#0$Ba9W_C@.ig(bZhL]
+ Z`Pgl]Q!'G/mfC>iF.-3Lp(19]YQTPm=L*,'<ua7/1b1F/5@G9,%_i9CtpEL2)g;[S"rY_S
+ p6_rrp#cE\nZ5T)<hMMNei4dX1[nu:!h@A[e=1m[;4lD,\Q;#N\]tF.!iM!5t5[4</m;Y:g
+ G*!MNF!QTHKX+I=9dW19a,DX]_ELcW[eQmW+;H%=ER9+"nMN,[l$n#1[0(<`J#$)&['B1P/
+ :p@:CDfnu^T[.X6[!H'`=!oD\\JGS&Q]'!8W]92)<#GFg9<J)]I@fu!pcp*)XW@TV.3Yd.0
+ BYIqrg>f.Ur,j&N=)@?hi+jZd]0f)_QSs:_d)DY62(DlGn.G1oc2d!T/27n&W+@(s>KEQ#$
+ ]NfPX/I'V%;i$Eu2,qN?:G(juJ<,an1b;>K0/XJGY"8Dg(;ob/<AAl%(,@Y,S1NN$%euJL`
+ ebAMa['@/f\j`,`I;EDEY<)2l:_.2*g[!.6f9u]g+&l<32M"k*KL.jr<1D3]k.~>
+Q
+Q q
+464 281.002 7 -7 re W n
+q
+464 281.002 7 -7 re W n
+% Fallback Image: x=464 y=79 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 464 273.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$=\+cc'GX<K0UF=ocj+X62f4+lLa")Ve1@@GQa/:sQVtlO;KIK3NSI-#n0(.uW5q;ie0
+ n%T$>i^o^a(E=,nLMe4IsXurr5B=$pO=1E1ZJ\kKNnnGJF"UbP<Y>.*TuXf"h?'@0(FjR%D
+ =Y,f[l)@"`N3aYCYXINC_&?t]gahkIGU"\'>AQ5h->=jk@sqYS[fJHl]$naN5?qYDI1NY0R
+ CZVjnL2t#Kh=W,B*(NK1%]"0.K1LlA"48Ih;R[[/OJWpi`pd\%Q(`:'<PVLH_p%G,o*nf3P
+ %94Pr"1>Q#l+t]<`]-oir&H5W&JKeFqc#P!:3sdPjH(q?=Z:&rQBH1DU_S0##RQ';LC2(_,
+ :>u"o(B%;ak'7[!G>0T_urP"nbFut]Ko8OFS3EM\@AKql\gZ;,tlPQYjeWdepoR>@;H@)K-
+ G#H7;43FU?(o)D,Og2?>0\OD/I/foLW#P'*HOM#C[dK_NQ@GX$]o'JqL=<#HY%W_o>0MD&\
+ (YjCEPM:S6Y&4&N718nSeN/3BTOhYciDkPXT[FEm=B<WP^t\6.n0b6tJUE,^>u*EK;jf</A
+ 82/?T<0-!b`i>36&Yn7d]CEp]sdSd4tB7j.!X7?$DDVmo]&q#'p74k(pA&-dP)d4hnX6$X"
+ V,ptqb"kgFU3,Or^OIp.=]0jm8F5"S_KG0PAHd-rI:l"dB9o(D]7j$\9+-oj[kr*DH8Tc'\
+ $sNhB4g/U0l5YQ>?e18/`iCgkrZ(N+`V*s3A3JiS:#']U[)Eab#=JpPg81$US.]IDBM,L0!
+ C``/1j<9o&sn)WWFC\(=I\Q[VUMe*tf2s[>(;k@%WXj"\NDcR<p&8(X^XIA0i0Q@/YEIjL&
+ d"2C02KSCrl@iU/=GmR(_VK:>W,XO_-h.@n#$\D])J`gJWgJp-OEdrBPcP7oimL81LNN%i6
+ $7*a)K_N0L<=rND@D@6cNe\i7QS[hbko+;doYV>kLbKeeT?1nB:T)T+&MB"CnVi"YBT8p]3
+ GN(9?.%NSOPa?t*Es2^Ma=QRmqnI^+6\e&E*Y,CPh#RcLa2M@d3e-sWW[d6J2csfE&ef9ar
+ 0!`##bNS]"-5W,&Q4gkmY5VN?bVa@lIduHNK5/7$"T2p't$VieHqc/90%aa5pLhOHt!%Xk?
+ m?d2.$~>
+Q
+Q q
+351 244.002 7 -7 re W n
+q
+351 244.002 7 -7 re W n
+% Fallback Image: x=351 y=116 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 351 236.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gatm9HVBK/(fe+';N&DLZrIsDAr80<bt?[Cg03SnRhX&s`aTcZl`s^!/f)TOg";CK<6NE6A7
+ gYZP$;-LA_g3uP2e[*omM6okVphZ^ZtQbn%@gDcZt)@lK:t8oqA8gmHnS&;nA_+hnGf!+2<
+ 8!H%,>Dn`FGrIZ6jYE<#o.5Bq]+:[mcm>$LOWLQ9G]?241,O!!E-*Se:fd^O,QmThr%LAH4
+ Ds/mU;QS5;?7U[Gq1Qe!#FA<<<9C_/(Hs4!oCm=8Kk2Ol>*''a8Hp"Q<'htX;DY<6-MMlK:
+ $pm8l'Vohq36n'^Gr\'<ee.`F>?ndpj2^-G%2ThWrV[<I/)iKE9ET-N:aSq=FEXCY$5j^@D
+ u^h9_SJNP0/(`6nn#IYJaREDj1rIf*Cp:]Y#Le&.O[PK!d<s_UEaSkPU>erqf2<\mbJPqW!
+ Vu#5':iu#lEnP&C/S@dA-4('so8[PU:7I*?C.*f4BuM[:j8?Dsq%p\Sh?,_hZ=Z7oBunmDJ
+ )2Ji8+m[#ks_c,6huE-"Bc0OeMPlZ@A_-!n;R?(KE4qYaWamcdZtiPGaA*"[XCl`aatk0/C
+ J*bNXkf,g!scd>Kj=br$TSiuT8`9Pl,2MSsF1gh\!VUKG?7UdS8m_uVOE-?uD2%0ql#<NuP
+ BLq3qE^b*>nIaCg/$N^7ZjEdqad+jaqGj8KqaFG#fH@DaQ81GE.;Ea8MPWu-#Hk4=GTNi_O
+ ;TbQ\ao#JU!IFGRZgXf`F8XeXB>WU/!uf9k"IAtXBD:qil*+kqXq/k.4HYqPOr@@EQckNOC
+ r_k0KD5_(DZ']_N$"fk-sKu("rfRI-I9%.*7&'cgh"J2Q!uMN-@b-l-fnIPrfJnN[N%/0G$
+ N`CbfA3**]o3i'Ekt0@<D42DpI[VT:&0'"g'UcCK!rKaVHF1k;oF9@GBObl8<DC:h(c)+H,
+ je$49OeA\r-E<E2>+pCElZq8?;OgufNB&]$5k#PYfaF%'l`0N"7Hr=F$nX6&Ml=+'SiOQ)7
+ ?=neE#?IrF@l=u6f\2@mSXm9BR/G4_[A(\/h2$lK1a$W>TXm,0oQ2':/GJ-lR$51[R]sIgS
+ =ISUh9KWJEnia"+=mpK:>jPHaX@TR+1O[n`5s:_k9nh!7HVR7I)9J."pTr'6p>cf?;)82UG
+ F-Q[$-\"PPL$5B?*a0b;*Lu4=M1(%;>!a(K"/-eX;oD%H:K(aI4#%l6n2^P^f+&RH0$1n:(
+ -TBuZh.,#;7h8kiE/4.V;jq1>OOs0'Sg)ag"Yo3[B3a2`99QEQ.jo`l)ue1L~>
+Q
+Q q
+360 244.002 7 -7 re W n
+q
+360 244.002 7 -7 re W n
+% Fallback Image: x=360 y=116 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 360 236.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\)Oi'_N\+a4)fN!YJ?U6\5``O;.U(EC@Yf6un1+,"0@I'1t\b_#_Lc&Zi>`8h!_9ck
+ 6d$b-;4naAau2a.s\VC\+@rm^)9MTYB3_YB0D?GFuS#hWFsT[uChJ0B:eGbg,56=%lAh0f+
+ I$7Juq3p%:NhhUZq/$q!DGm)5r+C,@m0h)c#R@!W`lX84NRX^PZ?]tJ[d&l5."na%,3)q!K
+ $Yq`eR*l`FgJ&^g+Gk)"5q$K61,a%iqj84%KQrd>XnKVda;,i4%"9h?qr&K(LYdC2:1N1DE
+ 5CA9o1k^Q3E:YFEh*ZNN()HONB'J((:f;ngQf6ns5\),I$7,XmF1SZVPf>fU#RaU5L[8h^\
+ ,\HH"jW^YSNEdQ`o*M7d\!GG=!70$Ti/QRYs!>^)`J<>!(TN_I!m<qAS%#9H;[*$o7'U[GH
+ "JTQ&9ElO=N+%B?n<D<e8_t&JKfP>cBA>.2''"Z_qBqq#uY,197CjrVO[Z_mO:LpP5e"N/_
+ 7TU;i<?nFOP_/',gEcPJ7]g5>Xn'i]j;_%-GL37*J\.1n87nG"_9;\:".A&mNc!,H@!RFVr
+ p,?_Lba3gY[il"6LQfII;@2L(&Ff@?#7^\;9TVFkh9i%)Sn6m;!#V.Fad:1t=#F:Z8E'Uet
+ j+H[L;-Ji9DhMQ"r&EQF\jXH+2O?&4do-bEgBTMj(`I-Fn(nLP;q\Rb_l6SEGS,/gMRLVlZ
+ 15*G2"k3Re)pQgG7MZS_nna#1V@#*[$eJAFmd\58IGtrEjAr9%.%6$@59m$W[\mRnaQknPj
+ U4aQa?#jOt]F$E/!VjcJH7(?,N7C_ig^i7ImNoCk$mj.gp?:#R\G*'9ZlQK_MmZ_>aB?E/!
+ W54`j54a!,O0A7S4Olg&,@B\K@[-n[t]$=[L6(`\eL`l/,,c>[feC2/>N>j!_fQtMG\W$n'
+ >KnV8^W=Vf$n3I7*0,5'Bbhh29GuESgrd1Se#qmsR??eH4?Bq`F/+M_Z2KNK-lpaLg5Rn*_
+ m-+S+EW3V`"WU@JDbE]XLDA$\9IhTg$63FNoW;=g9%"#^X7UL2*TbEkN4Pk01l\'CD_]udU
+ l:p1"+9ic!Bo\n;gj',*m;$8;"*%$[@_]']o2~>
+Q
+Q q
+369 244.002 7 -7 re W n
+q
+369 244.002 7 -7 re W n
+% Fallback Image: x=369 y=116 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 369 236.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%>qD:M(oBd!PZG`NRf>?$;.aZKUWkW-k,7?#9l6sXBkA2b1.8FlMIp^rA4EtHTXBTq.+
+ [r2>+-/e5:+_-FcUf4ZI3sDOaG^%pV"n"4nj$Tf6oe8YX6RZinHCc9ON)^6UM2EIDXVRVPZ
+ %'ZdNWiM!8U^%c[.s4F`Bh:DH!=L6`UfH\_-224;4.Q.MLpn`UQW9,0R:.--qiq#"8hk/g2
+ ?rQ,`.]o1ZN"o7t=n,SH-GlM)Ek0[$_2+`s4YN"P1"nD+2.)=l`Gk4C!AfeCh(:S3,-3hMO
+ .gQHtPq+756Uup#bTB'DZ4`Rn#RnYF6OI('E;hufgqh1#s1gNO-^+8q77ttaNdLM^O8r'Pf
+ \.f7GS$cJ8\qI-7$*WZHi7"LIfD$j!s@cO5u!=qlg.ao3<Cum"ZA:.o0Z--[%OHmoL"=2hE
+ QMhM4(u*p`P`5BTPi`VBRu:%Lt0L<3UR"gtWG]/UaGm?G451[uq9Jqg7u//qD-FX$ouV7FJ
+ (&E4EKre.ar)fXuJ1gUC\mIe`a`2AS5i9#]EmMNBX%aKl-]NA^VEN/Yh_o_5,`:--Zd3-l;
+ 9p0l8gm+?ju)jW$][gp!\fX4?d89pge+VMA9?TL`gP(t5/iB.tT8b(.QoC<G)!G?&4R#&cS
+ oN#@s6?_d]I4[&0m>[nePa'7"dA+dh9R[]R]`26NN.:o\fa0567M7;TjieZ&@d@(YlXT[,3
+ F,SuDV^JtC2HCH++F,i_G#<M&$lrd0#5@,()HHnBpnJeoh1Z02.`scS"qCdg;sXK:Ehr--B
+ !Moba2$b'.tmQs#G-idU4NF]Od#F#W'u]<kuC>b>$*kD&_j/iU8GN8lr*m^l'#g4K?6S'c%
+ uR=knbL969#_NJsY[CmKXg'(?u,iW<V"adG'(P?tjJo17p'mAV#:40l33fL&$bmZ%AS6lT0
+ -dN_f4gfsl0nkVI/!c)Qk4tMm=)2V"Q,]/j3k+`hW#SZ>%\hWMED9sj@DQtDJT/o#*l$Rm>
+ V"CUU*4[B[H`BqLNl4=o%LWr,H?nK%YuQ@^5s[JY)X#Bh.nbOiHWQ4'HL\K1f9)1=_W*7gE
+ N9.:R[,:c]Q$:qn9^^Olg`!U*7:;2g>n0DNk--*_c.PXJF;iZ>C`>2C[n%W(Hq`1mJ~>
+Q
+Q q
+377 244.002 7 -7 re W n
+q
+377 244.002 7 -7 re W n
+% Fallback Image: x=377 y=116 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 377 236.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\)Oi'FiNc1/6+"*)Oi[#n^-q6pLTG.J1e4<"p]P&4Ar=+f-.c.Oe9;^_&/;5TI(+Z3
+ Z@b;Db:,!c9\[/PS[_e_1^Dhkd\$e5qFuF3h)I5'sKHc3#sC?b^&Y!M;R7j%"LlTO;dQ1Ge
+ gs"j>(.T)\JNT?"Qf(`p\\-[>,G_4sL;(r5o+5(D.HH$0t,?D4D-GOD-,:-hel*^@[9kEq^
+ dP'M?lc^s+`?'LZ7aqY*3YG8WG:S6YFHS(YR:ZgWu:#tF\,t5Y<1FOckrVIENdup+j^3:(k
+ "\;0LE3OrXBO&1u3>ijfP*mIN2WELP"9dZ(&I#n_85D`u2$O<cJF0ts=?BQ][hfboEd]#O3
+ '&O.G=R$CMMfd6.GLd4*naMDMi4n:okV3bJbF8d=)=s7=^*CqE^Elq,bI#i67>&*SeBk(bg
+ #+k)n@;<FmBeu1D(<HEUM_fi8?orq]dsul:>bj5Kk&cCAiDQ;@R62UB@p3\8_UR=bqlaV^K
+ ^5Z#_:9mJ;CIHf=+AO:[pG/IJSY6!G;>]/=iAD#'-A!=EWPlo=9c4aZQ7:7d,o#Ae6cAd0J
+ )Cu;C88llg`L,a-;'^4m7<PEDQ[r70khS'^\;*!1FKK'pOI/,OlU>Y;D92"X+#6P(ll"Mhi
+ h$SRYR$b\+!f%8B8@#SLcleJo1MKol24/(Z1e_YOL;S1XE"L_dHUMc\E]pah%X.3#YUMde.
+ i^VtI9KMmp,+ZP(LL=m@.*8FC[2N2nb/8n(bKI2D3H)Bbad`,2isP]B:iMAKU*D<YE9DSo>
+ ??^W^9I@Uk5(19sK&SoEE-BSk6<oIWCTEA2Z?ciPPp1Q(-34B]b88k-KMUZEOlX),_&"0.A
+ !b=XLR5"&jc7>iGt=K!ddk>akWV<I&T:mj`Nj$-o/5;NeO!ZU*?N[tgNFr.L&hGf:Tra[n+
+ )""VGHB\LZRrO0@D/7$4g^SMI23$A;B4Y$G#Gn;S\5KELuVLfj.(l4Or,UZ6QR-g^r%Hbf*
+ Unrp2,9t1br;;4t;c";F;Kt1\ifKNUY04:D`Cr3C/k1<(aStO/8N7fP9l]H_=CPU.F9,UI^
+ 0]loWZXBW;Q#^WPPdMihiGLchZ>b.#fXg(JklSX!EH&q++J3V"%=0Bli~>
+Q
+Q q
+386 244.002 7 -7 re W n
+q
+386 244.002 7 -7 re W n
+% Fallback Image: x=386 y=116 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 386 236.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$CFn(G(p.%@DQ?SgVHdkQ[4rTN:g;,Kq1Qu7>ZP'=@kG5e@n`aG9W#%*ZSJUcCglDu`T
+ 9`i,"@_^DCJ$?FIq%\rdT!gs+`f2m!SV7hX`r"o:5!V^m_O<LsM\J1P:MjN/oLap^qRg=BN
+ B5mqXR_2eH^mjpdnH7r'WDRXV$B)''`Boa:0F$b9lcgrRjnL5-::=ns":<N*#g<u6UHj[>Q
+ V]6EK*`1oi4FUL-H._'gAp%<S"64Thp$k8o(!C]FJ9Z6&9$EdZ%H+DFXLXI_U$J'bj_8/*P
+ 7R9uf$4?:p.6`.+OI<d4/Oab<:7d-.Rt?.jUo0ub#,@rC_7$_(04.+H4=QPWRu7Xji8T>57
+ hhIWNL1QIQ(bf/e'j\Va4IL6/!0.qH7?;Z?BINgWapAL0PkP>\@^e\7HEQ%6!h<l7[*l,\+
+ OEar/cE\\7a.7dXp5_ETrWs\8NJ_lqu^)Lql:/PTjp^QQ4#b<`.ejJ-%(55G('S]mIiHa-A
+ 1EonASCG4($t^&i(c*']If0VkP=U]_2L8FfGDQ&=5$ks,.NVPXJq0?#_,-n`=b3-uDN%O*S
+ V_8lmc>&$^=DO$es>2m<uG^(>T6:R,eq"ChGKJr^cF*U#1:`O*Tl0;:Dq;L6t=_hIJ"+ul_
+ ]"0RRQ;+>J='(nVO.71H2N%BOhDmQq6(N(i\8PfLfYXUd6>L<c$1$hab8)sID/I\WNZCI3+
+ ek0rUnFGKXL55BPETb*oPi5VR2HkJ#n_72[0q_DfX;5M3nV)JNL<:E5tK;Fp[=GGi]o5p\i
+ Oh:emu`r='(;g`lH!S?`&H)OdXBa:**GD)*Gn3m8>7%aN=i;:5HAiB&`f<W<o&j)P948q\q
+ J)G;:se<l<]4HhV"DDO?ikJT"WqI^QDAG0gO_6]mliBg7'*QS6mVGrl]V9CKa8V1"r,3-7\
+ pDf7;5Z\,B^!^?0$^QOm(ioPle+Lr)iZK+L5R&^EEB_Ic!dgbLU9]P>63'.LMR8reCl`jsh
+ p(i:Tq^!O[H7ZI=d,J/ba@N;_\T:*_s4NhMiSu0:i2&g'\2`9S,G)?<cBJbip\K$#'UFHf`
+ PueSKERDWDm\kIEF$_;VQ(Q)P`ZRMpWKeF"k5HRodA[Wf$bj:W+;o[K?X5VJ,ILb$0c-;"9
+ ~>
+Q
+Q q
+395 244.002 7 -7 re W n
+q
+395 244.002 7 -7 re W n
+% Fallback Image: x=395 y=116 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 395 236.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%8M$E@'X\KLF#7J:8R%(*BNQB&<Y@d)BSZg">)=@7daloJ%1+28FU^br+VI0pN%ljtN?
+ SY1U7m<r,)2!(F8HU=r@]hkb=gQSS$P0Mh"uNgIeV_!!BTT4$KpS33l:X[q">.Y4)0j;4r,
+ e/#2&#`p@n+A'4ti14KQQDLbRoSV8`MI\A6Z25(:H.+PPT#kifh/ORVm?@t=*iIf>;R;7*a
+ )\lsZoDhY*U)?]?u'FP<4m`);/aN[_XV?T1HihaWp4#t.L1n'n2=GZ`s"iue'QPosb>qn6l
+ \iMs&N1_9saH3<d)EggFBtVR(!PWrD;O!Cg+TXbj$BQFWJl$N5./L]%i6S%jnH7P#dT#\mU
+ TkD,T->H\GO?jj)2W"Pd+!`J.BKXC[km<q*QY""GHnFt+hbRfWksrI#RQ'WUB7-_85#-nl0
+ FOJYHCK^c9@pp"[4lGf@;1VXf+KSL0W'R'4ti12cmo?$W0dBb*&OW]TKLYO%\h^Snf/\h;E
+ d5>EP!Dod`4R5YDLUndlfNDf<.r_9PfI:J4K<4MB6,I#.]JGt5k0"4u&ZSg789^Lqh?*Ku\
+ cY=D=t_S`3g?!LcQMd*Zt1QrtXn(kUMj<f0N>5E_Y6V%#.57_<9=&pM&<CYW_$+FijdLmlR
+ g6p'EVq9T>_8.nnN-b4.Za6q;[?_-^DI>`LWi-2a*m"[l>Jn;ZVPZ%*f$6sD4M<X2nF`%e`
+ @1.&mVO<6]PAEY_3N<"R@Pp._!/)/P$"$78U*g$OQ!kAg,tp)_br:j[MGF)R$`tRNM^\m1c
+ 1l8)!U;UI"$NB7fHN8Z@`8Gm1gb]>1)[$M?aY''-gANV=KiIqrL2EBhM*>.(b("jrFL*EW8
+ 3b4Q,XfHhZTt1dQjY^!om#bUdm&JZMmi#.B;ac-OS,R@-T@7VjWm_@R8$nFtNDQ'\/,qP5B
+ >,@tHWC"qEBA=f:.bEoMd;GrUDLq#EIT)*t0l5@QCAnZ%HhU=<)$bMr_=C*V3(GG:U\R(ql
+ H:BWT);&>#Flkn%mdT=L/2#(/jA01`kQ<<6B,"iU?\,O>*K0d6ri,htj`8&]~>
+Q
+Q q
+403 244.002 7 -7 re W n
+q
+403 244.002 7 -7 re W n
+% Fallback Image: x=403 y=116 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 403 236.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\+fd&2eMXF3,+H%3O@t_$k%/&98pq=qEts,8-8\5s\'K'PTiBdn5cs>b526TaXmsab
+ >Zb_b<^--pb']F"]?:F9^j`hb2)Yg1/#_rV,o2B?m$8:LLS4>f>D;VPitG$U0$XVb`K;jj;
+ I\:,=[W/?B3KLR=\MW&JYAdt@AfjU;Mq,Q%>sk>,BF8U+bK]tJ)n_4<[2l/84(cHOcMH$0t
+ ,?D4J1e^_0U<AH3<qYFsf\iN\^LR=OIZY-dl%u#^.:R>$Q@:4WKcZR`_@KMT4UTtLM)$gb>
+ FE:A*]=@'b4>qrF<YQ;-j@L=R-u!+`7Lf\hG;k!Kck^K?BeqP3q"8E:=\]Gn6a:tsgtc%fI
+ -ME7S&LANPPFuSN3mmiH%;9WUNlYO?!Sj/6Y\(\+,6O8m-N6+ldd42%CNV-n&Oq%R$2&]n)
+ h)tq!\;O6W.WH]pOB+%NN9mD))nWj@u,*S;`UDE=Qj]m[ZnHe==H6P"k3)_#=/Y35W\U_qu
+ P2:,"C71T6CPCiJA:/mQ2o>6<*b@[X<!'rmIIRlbfOkYVrWg,7["/\7)<p[A+^g"md*%O!;
+ o$qX/3)Y!<o.(MfX[a3M?HhN7ldEuEpRMn;:.Pn\+A9r1;(0McOT!FRn'63%:*^,[gW!][t
+ <RR;j5I:Q?7n3^e_UVYd[^O2qNLHC%'=rmg-1f2KjQE;;8X`3(*!Zp_e*qH+Y:_Cq;A+A)K
+ [oe`fXr*A`gXuUMNsJ!dFfC-No98,fiiJ'\UFIY3LI0.[A)Q!F2_"'pBiEOD/'DF6VV+JAS
+ s-^E.#=37?HienaN6&^OIoDQ,,-/_\EnGEsB[F@Fm-b&tB5ZXC&/fbe#8826jM&%dYFR:&B
+ 'V@UMHU>oC!YD1D@:&e^M.K<.V2Kl>TD,9q@%0#I0W,4fsg%p:IEF7U_"4M[...pC'Q.cq[
+ omMt6G&/6DeLR$:ne7@lG)*2@"$X:CKP^;4N5u(!;6%PuZO^uY"6!%=%,0oAG#RS?Hr?B>.
+ S[+%(-C1;uIcO9e5lZ(S$1d?0aNg+>2`>,mHj)92EW3WCJtfO+*&3Ub;T@VVd]XqSk9n@3_
+ dOq[]6@gJ.>-W$RYVpsK89dQ5E=Z0Xcfn.o@R0uIP`sPV1IFRLT2hL7PA$[nl],d1i&9hiS
+ m:7>?i^hcMnmZJ1?0ZTDOM,p#$s!]F\`H/o?cpTBEc5q$&Fa!nokIs'q&Y$iNK<'E~>
+Q
+Q q
+39 208.002 7 -7 re W n
+q
+39 208.002 7 -7 re W n
+% Fallback Image: x=39 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 39 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\Ma['U8qlUBi&91u^tu"Os@nY&T"'UC]YS%n%QqLgksm@RU/E<%+lN:^OKQ.Nm/iJt
+ ]7\<,+k',-0&jALVKLb0jHDALXQJ)]t+b65i(ZS<(sdHVa+c3HOA3s8ILA%YJ)kOi^Q3%D?
+ n,4Z,+Q<E5S)'lucEAS$(.2$-eNp$28EOY:(_bb(0Cg..3W<9fA\2kFBe;L%_@hYHcR5s_j
+ ;gpr#u&4'uCan=tr'M<Lgnj%7PR<c$E[>_rC3HHOra!]]t44VgO_;;js]6;GVqg8%P3Shjd
+ J^=8m78Zq7ns#[+nrJWa`F33Q^qe/--fCN)@g?Z<jodV%Ngj7)X/cP7`%#ECQFkn\Vg*Gs*
+ ']HKCpnr5;+W$DAmKWTVi6SD9IBIujlZm2GS_1iqXs2tle$")`]?-!XBnU$;])c]B>]K!9q
+ ,#j*QgEg;K2FeG5[9<_tM3r?i0\'"G3),'OaB4C4\9-b?V=3Q@f:WhO\Ut8%5msKUj-BbiR
+ $9NfN$&1I;Y/,"miOZq;X4H!$h=MT*gD"n1+1]\q^I%hI76Pu3GT74q[RBl-S85<m$%JcMZ
+ ,Xf\?6/r[6D!I=7PKDE@"@Q%Fo=9t(n.M\@s<2]&G878Vm9eEo!NHaaA*G9$)Z=VEVQ@KrS
+ iUc1D^_B6h@7SrgceH&W/.DDE3(W[V248_`YQ(\#oJ\Wbo(d3;[-U_h\6HG:Ukkj!?;.c6S
+ AK)V#pYboJ0TO.lRRjOCs:!e3(T,VR<a0r$jAr)4%,eR#mpDD/jOQ!)`QV[[0fp1>$6uUDd
+ $:4gY-*C%S8a+6Ik)*313U!E0-$>Ngf0W5UlqV"Rff/T`9fEpZ(%=S=CEhQ_MtVbkO7F%#=
+ _lG=-:e=fgc`Hm=9T[8l&67XuHa:k$;m8f4K+Qm4"XInYooaZaqJko_XI:&@Enb+J\*00Bf
+ >&K6@t\%Z0T?7lru5&e'BZ]Df4igcS(p@aTW&Wh=mOX!;]/lcl$E.]r51ibTB63^TF6iHtP
+ NXk^HVS'Q#FS`=o!-G-k2/?[K5^q\[[VZSgLdl1(c,J40b@JuSf[.tR]mir4OS[>>J@;MZU
+ T=l,'o%Ae+#ncT75VR\qt?]c5kZsq#]=TNLl%(gO)G[F'*a(tA-C"!m5c:!Do(J/8+4"#'1
+ b34\G5@>g9`]L,B/8k64ip9B(A2]T`:Vf3IMf^"OJr3j#Zf-\-R.g,7eX(B7"?,APs-r`'q
+ j4He&JpE)`h(j\'\%o9do9nUO6;ZZ4lViSap^=fd?*:R(>*l[!m$@tnUboX);XKk_iR!d3b
+ l8/S7t*um+u)=KXZN>E[!GSCEkMU)KS7>tofjtYoOFhPJ@/M17.<=5uJ5Qq/7U8MF6<XmA3
+ ^5\0mL52I&PQdd=!YrKb7P)Bl4Q_,KIK9?Y&-W~>
+Q
+Q q
+47 208.002 7 -7 re W n
+q
+47 208.002 7 -7 re W n
+% Fallback Image: x=47 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 47 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\Mb.(faOe)AGW!7M.@);(s>3`%;lPpn5X:5H$:dC5a&GA(8"b.RdMX-l*YRU*sFS(^
+ 9<28APHrV*N]`dpf!P?"dBqb1b9eS28X9osTD$cKkBg&%=LlSpUJ:45]l1jid[>Pbmj9eU7
+ 5Cro&L@Y"htqdoKJFXK;=@Zj?l8l=tHYD7`Ws.2$?!>)\)dAEGM$UcLO3c(-qMf<;pr%aI4
+ eSoa`bkL:rmq#/F)]F,M_Y$<EeEMGKEX=cC'ZU-ri<n5d8UJd^+5+Jlr?eUM\.9j9ef<8!@
+ pU?(AN>nL+gQo9hBBFaI02J/jAM>r=WKh)#\=CNaFntTdj2]XCm!66TbKh\?-M[DUqt_Z7q
+ Sk0qD@>7oo1N2jio01Q:BLY`$iQ/=85.OTA7XgDW>$:##nP@sGk&71LE:BjbZ_TBl0Z`#\1
+ hO2Jf%;0kkXfVi$[!s/(WH:G0qN'KDG>*,M]>$bG(d3aNX!fCEkY$jRS?l3Rqs>S(kEYNZN
+ VUBiDC:BB8F4N*3LN1M>.lg`iUkrsC\DL:]Ob_]rpASGPsFU]q#iE!_L.D,N!q^U'-Jgu$L
+ &j7,<R35!='**;]c%H%Ye3]5.#jmJp9<%"Tjn`'pP-VV&9lqEm(-/@#c!hKT#U50QSnP'/j
+ b)2'"Xd70nW6rD$ZI2Xl/dMq^h7anb!4DQ+?"koDTh\@IET7=TR5T=G`(,,uY^CiHp[3HXo
+ ;42n%CD[8Z(\@^b`&1JelEVco^(6m$703^rjZO_I[W2+]7t?&OdWH^HkE7W_%0VLb!(!MPY
+ RS+k&sBCYhZIjT1oLlAG<(Rd\<JAQl%e.EQssLM\en.SU5;/2!W#9<m8k7&Mn$lPc-?P%J*
+ XbGT_M9I\<`W8>e6Q%tbFApFi>jm`%`g9*:3C:597d^HZlKfr3LnAfML)JpkJ-3G6\/@q/@
+ t0_@1Z=U<-qgE>Q!&/R5IStV*dD&4@*4<J&2h&g+4X-R5>r'Q&bA$Cs*3@`ql)o-f8Tb,50
+ jQ5o7XP@m[Scf23gC`X;GBXGSI!gD!]c6?D`F_&K\M?@`6R:)/'P*et6#GiS7mCaWS(m8p7
+ 9Nb!5f<rFiU?F.o!0BPmFi@(:@P!P)Y<RJ)HrPFTY&r<1c.\qIl0-]!1`jfWGI%\(3Y!A'Z
+ ==e%L+/0%N12_W_,mHoD-'LeR2/`oN5r-NV04&N+\)q]jY:K_ke\+"jr217cP'TA_4*:[r0
+ `/A99[cT]707Cc%U*k&3&>(S!.uJV8bi*^#6(+b2aCE8`3]`lIg,<)Zt&=<89FJ*@RIO:r=
+ =6/f4e(i?B$,tJ-YR$$@uZEj?!F<6'cQm0=Y1<%r"R)18,A'B00d0a5(dSVY!pf:%-0b,)s
+ itsRYK`.,:!QYk9"Q10qH,(8K,ogF7M_GlD(E8.G!(D/nJ:AB&S$9S3&!+-V-+jV4USlHH(
+ ;RVN8!ju;^#!Q\3QCu(emE"I&+0~>
+Q
+Q q
+56 208.002 7 -7 re W n
+q
+56 208.002 7 -7 re W n
+% Fallback Image: x=56 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 56 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$BhX^n'\*=DJ4^LY9oSBk73k_D[hod.\:d8F`')L9N7!`#>iQIOTie,u\C(F^6tI03&H
+ QOe-;;U)Kd)c`Z?9Y-V%sE&[`k_1jRFrY(&dC?8^k?@^%:[(pR^u2L40Zu0X\?4f%.:Pjgp
+ <VX]2;4Mq(.f/'s)?)Mpj4PNaPI4)/Mh.[Ah%,FKKq]^c:<Gh9*H\9Kb&baE[Q:;&f>g_II
+ `Gr#-dkmnR_n?-*r4#4*&1NTe(O(A6SOn%V29.peq8D1E:q6k,HRlABk?0_j-Rl3Fe\i"'^
+ cA_`!EJ0Fu[e09VbdG!lV%F;"TqRm0%jqSc4k[>"-6OFC`JR1brf<?urt"o%j"&\C?FT@Ap
+ ?aLD*lKpo)2u_6,YH:?`Ppj3pd,lNqnrdDJ7.ds=`S`Viol((UDGJ;RQmDIB'q9TKWk-9/r
+ a/M3[lK@9h5OFq+j[X9m65<Im;&6Os*7bFoJpmBm]P]rG=b`esn`ODsrKbZYk&6OhaYD\+a
+ `HhoL*7fIL#I''+Tc*W7EM]r@gG3\WfSGC9DF=B$PA:+j&*4ald*:1,2c`f(iX*oYSFKt4b
+ m0mPM\L79.ER@^!/B?kn7Cg#K[h7P7>.\8e=-n*HaA@B<?P.A38)9l3KQcG/E_UY5ofRT%p
+ gC6qS`mh![8Wu\!VG%"B^>ADOMd*M7lc9[f#^Och,l5)5]@BM/pU%DRIJKTe0:-^iq.J$Jg
+ rSQI\T8ePmd:d$"FS\A$X^.C?1^<;<5d`PIJg%IYQ(WQ;Yk[3VoPmj6S+*rY6sOd[,>=k*u
+ beP_PT*#]<cm4:g>g`b4jNLbOUm^euGb,cH^m6EQE$AE["H_[fA#0KXO1mV[!I5!s;DHe<)
+ b>3gJC9KB;EWhI$QkTLC";$(%^Po>(DJ-Qtb.7JhheIn7pVr_<H'D5Wp!PFT"bD_ZfnBd4.
+ _O.mPbf%ee5$r^@L8tZrX)[ZrraV#pVlfca:ldt$_4WAq>*:WKT?*u0Rd%R2<0R7C_e=dY7
+ 3gIjk3ZUcqOM,;5>1#5tNQ/df'M=u]KrMf=YldJS!'K<]'";\.S4.F;c"1H,8u5Ce2B*'*M
+ e-`%+$u/qbiZY-mN)L<?a"_Q\i;f7A)BI@(`5.l(^9gB0%$gui5t1=(pM1A;L5)C(>s9o@B
+ WuJ-P>.K&$\L=,`mm=(99>H%uS7s=:fZ/^C0+P#L!_cPU.[=T0EjkPCT0W*"Gm*:u%*B6it
+ 1SZEiCHDiPh?hM-\CiN+'tB>A&H#d_L%3hl8pKESpn7<JA[7'X"973n;l0Y'0)3]t>O#j`/
+ L%1-9-,nLn3)_'*gMZ\A/CW/Zu_WNFjE_&$RQF9jrRrl734)GsLZsS#M$V4G(!W_ZU6sEZV
+ TrA?%TKF=!1>D1SMZoM:"2K/:!?9(9R!62e/pH$Q*WH1W6Oq-~>
+Q
+Q q
+65 208.002 7 -7 re W n
+q
+65 208.002 7 -7 re W n
+% Fallback Image: x=65 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 65 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$GtaB0*%j<qV+j[bA[[W$dT13jlWCQ;X];EE[oHXfQ*"Q(C3C1u6?o;[;0J%gk*:Xh#&
+ -\?MOLK3Qmc8`QD-p%2te*C(LV!_rp8J4#NP]qkP`*?n+f+bGPD.1CNXcCW[]O6'c#9]k:8
+ rpRZAQPg"E[4X?V7u-`8:M=-8hN>>UuW8=I;B2.UUVC-P-T#\^S(*ZhN2SU5MMADGS-SAU-
+ ^":=Ma8S??</mLrXE[@3sPbt;r1:K,"B*JR[+$UgW@n51K9d-Q=5?bKHGgW5dnR1lrf#j8O
+ ldnXCh&<t>:\*VjiYO6VR6.cZd?>q,=0KWS\OGo@a^2UQrdk;>Y-%cB`J$$^Q3i.J>kCgEB
+ $Yq5I!PMLc*@0?-_<AamcPtVEfHGj>)Hd!1BIVsW7V1Wf^%,ESMMX$b*6+o-f8rfp2b9FRl
+ HO\^QXl]Ue,fa(BUI/ICOB5`3sO0,gFe:`*u`CV].C8[^A\*;@::XhGL9Ba,],#G@o'l4$(
+ g1NkK.>7iaC?C1C`ZR]YsOH[?i)8"]>3+\;7nh7SX^Z^AsG%L9*m@W$+>)+qHpm!JJ5T0<'
+ n_ZnV3A(2n[92!Ui_oY9#>TZ(q!856+F4`1haH:_`gVtRbiBg)Op[\/#'2p=ke<cC:\ZV^&
+ Y.,;a.ZB6W,EnmHm=Kke$KZP9=cnIL,n1b\!9B@V,J6O-7ccho`j&RH8iUfWaC%Qr^4g:O1
+ 7<ukRq+9j=3BPhD0QA"KU?id#B+BnP\n?T@=df2lT8MVFG?-F4Zr:%6SSk+jlMs-HD=?bku
+ q%99jJcUT?C\0&/YpUUNb'&#<-'\_5J-,iFjrmpS'`Vio;b/g4k?*NQ.'iTr\[_K::!4dNE
+ \ll-nuVCLA_2K4]$tZ*Z?![^JZo!iJb&cC9U_V38rSOcc"s0RsCE":RN-f'E(<?6C-`pa__
+ ZgRFn?rs.U1))IJ8X6o4dB%0$f@6`!"W?*P"r0pen/JLg%4AeX?ntf!H>_]:0e^g$uB;\7\
+ LKCS8\@JI5qMO=mb5$G/S[,=*INs(Cr!JP:<fL"VWi?+bS=b*(2W>Fm!,qVIfbk'c55j0#/
+ ]c.fn8LgF4q-qo[^K2<eoc-62Z/D?KH[VPGD-+DcXX;lkKin@aNU'&53SATk<@e4mld4JP*
+ jm$?&^:HD/)C/3h<DqAip5W!Xa-;@mu*=_a/lCDVonmrd4bXQRkFc_tJmD"?SRT48ft3Z;?
+ Kd&C-C_88J?9)`QdAJJ:Y3rp/od6'LTX9F(\k?QM<8E"3li&@3JVrP'U'+N2K6L3a\="9NT
+ pPsch3VbjU'"eUkR0om1j.SEDb"9Lu,:2hn<grGK'47lT[;e$#KpWk?`/XN5K`"^Kl5a%?W
+ '+0ja>,BY0AiKqUDidRG#ZV`[!+Z=R6.Cb1fG#AbNu:E=US(1O@jAG/"*FZ^C,Kf6Z^Jl3:
+ Y$%^F:Vd~>
+Q
+Q q
+73 208.002 7 -7 re W n
+q
+73 208.002 7 -7 re W n
+% Fallback Image: x=73 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 73 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\Mau'QleQ.Yo!P'J[U`A,O\eN5cGe->K(1LDhPi%l#PKU+sea.23=s2+Rlg'SM!eJ[
+ Q8\$O*4hO]!V38thK8;MJ4U7c,t\pKboin+WBSO7iutmrQe.leGj^rbl;R_7i*MA#!3QC(g
+ r>'c!hPJYKNYjkI8D5Z(S5>$eA5XDFr;dam%EC:.U7hMr(S9MD%eGNRAPS;.X(n)""`qf_8
+ LS!2m`X`S2g[YkOfacl'-0*FtG66IC,le:';rr/9&J,]Ad'.4t7++C\3:Y;gUPCg>lp\TRJ
+ @u_Z2FS9P1`JZbEm]sL<&NOV`ART"<fL-eBkSUmZqs,h<IUi!3=.;+9!M('RZZYT'D;-9.m
+ uKPY3r.Jep4EVJOH>ck&i-eeZa2\V^*k[soB9'2V+Y49_Vhh;?`mQ'db[1/c7X(d.K]C':(
+ 1P4h8(7DhnFaO(KgG"jn\[N7Rnt_68GmP]3C_d;%XP.lfFDkj94V,FmE_L[XQDc;/L,sXf[
+ #RX9_Y)XjQCJI(@"oD4mG*pti\UQS2u7IpU-*eu#9X,SDkRT3gD[>V'<g8f3LDBBSJ'8$Kq
+ ddaEKY!`'13O4gkqB?pDkZY"Jc=CB3_iBi4;NMJTq("-dTe5U^%@@(4oAf`WCe29*+(Ol/K
+ p"?[]1M<pdXJ.7P$jJDtc'UfT2tQtC(nrWg)ROg5bctXt(Dj$EM8rPCs/oG&bk-irRbCq:H
+ 90Bun+2ep\3ZpM/Q3E:nshe.b`"eNQBn2_R56a;piPq/Ngj6q63><'X/X4feO='k)B?[AlI
+ BWp;,M%@..iIFTs%ga[D#;"i'9acc^BE=Be*6B/s*m3X&j<6opM4/V%P'+4pY"@"?Pi5E;9
+ *2/sMQCkK`r,#G<]j!12e-Dk:+W'J$57Pq*G-D!+Q00V:ZDVkg91@PDJl;Qu;HPMu?CAq,Y
+ 4f9)9;iu+&+bRbF5n5oN$PIQYLnQ0Fc?8]<D9NjEI)*47V<?dQqc^/T1W2Y`rO$B3ua`)4g
+ [BY;,9F.r5O*#J361O43=r'b3:]UO^Pf_!/UQ$1\q5Mb,Q7/7a2Od43-""Cs!MCW%BEB^g7
+ Zl`i;3R6?Wijo22!@mg<:Ms)s/0E(qi*WWm(0+&'d\^Z@bnd@H0>fLj$poL@%Qj'IW06n<`
+ Y8JTl4j.p@P$/->";?*Zc4:(bcm*H[FLsr'4i0C19u0HFmYl!<ba!nq[Q64d^uGaCfa2BOY
+ RolY^F!Yh=^2!N<<fUIPWXb#ssrLsT(5,<%_AZM])9GW9$(PT)O]GT$Q4/uI+`3#nIXoU'W
+ `fWR7p)+TQ0#o$48<O&e_9PeHib]#0#[kThN.P;3L)$)i>GUB(?38!kj+XC/?T)49/CciI9
+ Ug,Od)/p:%L,no2D*t6B;CT=F:ceZ!#iGde:(CE%Wo<Id9RG-"m*k4W\i=aE+E`<;$NVJ)o
+ Jo(ss3glIH=[WI~>
+Q
+Q q
+82 208.002 7 -7 re W n
+q
+82 208.002 7 -7 re W n
+% Fallback Image: x=82 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 82 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/eBhVH.(ku=Kd3&Y?(aC6@(!r>HEK(1_R[C$Nrtm\"@U)`d;56u"V,bIB<47?,<)c*kX!
+ "6-LO_]1Q;SQ6J[U0,/_![k[&$S+c:^3>kI(d/l27*9pW$!LmrQ5)4l>Lb+9+"725&ReA?s
+ L8L(9>:/JP4"C6V^u'9T<+>$Y@e;-2@P?a"0[ltL7Ao_4Qkho4TDUnj(GmdY2N.Llb6]Q>V
+ &gpr9?i512Bi*bu4)^"M'.AK]XdaJ!AC,-Z2Q\L3**BTR,kg6AYqq-IN^M_hoZsgkeMR@"g
+ lHYr7qtF_E3KemkHj,M\e(RD@UCR4ckb;kEE_i5u5B%`VgU?n-X5a6_@f?8cr;C.(r#CFJ!
+ s7I_X\)j-/p5dKbbI[ZrG_M60KE:nhG,DA2)gFk;p-@/hI!gFh35<cAM.-&nF9p<?;+_5M!
+ j@n>Ia0@H$RfN]q^"'R(g9?i8sC_3@@UCDr0P2(l_[$L<`OL)3o,dpT>ht&`l>R=IV66>Hm
+ &M]QoX2Skn.t+1o):C!N5>&!+fBF/.mDJ%g=+b<:2Km;a\arq1&08VsFIMbH$NFF<uX8Xtu
+ s(NN<D7Zm4$A_*qQ1M/b>5!=;9PR!C"'+1?mooY/*`6=V`='$[?C@>KSp$5WJnM2^5rIW;8
+ jF3X0V/@e6X%l26\p>)c6-P.NlKS]^aC18Z&IP-g%9TX")o>(h;8(jR6\!G'J-iVX9bsMOc
+ HgoekUGF!l07\D`kd;OV+YZE5T\RAOTfn$Ct&eD86inn2^kVf7[%jP>qIXSV/jXn-BkP6"9
+ %'3I4>t<W/->R5&hcTc'i<Q?W7XLUe`<^$g`\XU<"th"-I(FMq'EkR'^%<Dt!2BOH%pFQ]F
+ `c_i@p*(sOY1:pQ-(s(1TOkKB/7Ch2ouId#dC%O,;Fil-ouKpOGo`Q$%n8jL`pV1/R.Eq1S
+ gL&NCh1\hiBQcJ-F`J3&US`BVni3?]Pbo@\oGU<4,FNB%[#aoeGm]U!J,#MQiGuI!p-%f'6
+ nKPQ*5!F.6J)]EA.SnA-5<fQ/hX0(7PS>R-V[s-J9-h2C,oHlK]f.]%12&B"i9THEGl,\=[
+ hsX6%Ng^6Z!qg$G^J2`g9_1X'DkD4gejq8JV.R>\+/*.1b`=gletN^*_*0*e+80Ci4t_F.u
+ ?QI'?UUf6,5I%(^gUfctF\@4Pgto*k#6'i*/l%$iq?!pVFZpgUCZr'#L$TE>E2"_n`cJXFl
+ /@,2]#Va\+.HTHG?FhoB0GW$I%YKaBEmnan<]`+e:dF4A(cn<lt?ZFhu+o$<o8$'VfXbuRe
+ C(c3/oaLE8)IK#2+%AOZ?,U?bQ-$adG<REeha@;-n2mTg#=NG+7r[%1_1DB?q7<TNe'49mn
+ *rK#g!<@$j/0r_K>)F>_&\@<K);`@JO'rO.K$T3+.O"^;5muUE=NEKX]ED0l;F!Bb]@hjMj
+ FW9lfO:i23V%Z)IfT*3&-)~>
+Q
+Q q
+91 208.002 7 -7 re W n
+q
+91 208.002 7 -7 re W n
+% Fallback Image: x=91 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 91 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/d=\Mb>'ZN!bBP^pMg_-B6:PtU&\A\\[1_LI])BMT%7-!j2&#)Og&Z%;4!Wk]XN.a(K+@
+ 0O8klaG:G",q,.90a_V(=ZD;V!$b.Aa0<A&pKn>D?k54O-/uReH[*q0L>sh`:Gc\,Xd=1Xt
+ +2CGM;nC-&Dq^3o_&Y1'd[<-SS;Y!]B?MV+NsqLQ(5Qd[BoDCd=i;^g.(@Dt0C'S_>X>eI!
+ rJ)2.&q==+<U?gE(DVm()O0<p(bV;"&A?O%uI!+g[cLKqUNuWFei4r-8pSR<2jUL^tT."/U
+ ?+m728oiR#6KYlWr6gCWJkMI$:7TBbGVF!\SqO4M'=M_&&/b1MoB'`u(s"9mGiDL5Z#A^oh
+ m9UV3Iar-.hWLQGOPNOiBl\#6chE5-j'O8rr2HRf>k(!(UnRi&6KVc2CSM%PoD[Aq=sGfU5
+ 7>G-CP8KS9DN+\aA376V^Ce;H\8+9%MCb8O5WsX&_Zm=:r5oq)r*BW$P)i^_6%t(UJ-nm$]
+ eg5sb8Z7;QgYmN8:%cLGltF*DIQBieqXn.;on6Du_]d3AD'KsLOG^RmIR]=E!:^`m!e+@79
+ />eHGY4:)<C#n&!OP=C0q>RlONg%+t1(VQDDhT!Jr5BA/opMNld>.Tr;R?*DNc5\!VnF;W6
+ ,Z2:ie:f:Lg=Y&4(GCkc?W3.ZFi.Kj(gG2+.T95A;>U:jF>A%4C</tB`/Fj]\$Z"pIJ`Nc,
+ q$0:[Je@pb_:l+2Dd8=gY63pdV\ZJ41#Iu5Ye@O>Js4%Y]G^hcl9)@A7p,<e\PW4*-A_rDH
+ d%?YHb@ATn/W38l'qbldh80`tGgtj3^f/glkkb_6+%L^^'#]Rl<PqI+\Gt4Ughqk(Y8qK`D
+ !"r":Wd8>gnCpL'@(6:0pY;)@,//%O.S_eFVGNnLa@ci2/4A*r`W`1YdGnJl\_B!iP>r$IU
+ j4aAeokK^#;bJ6:'&bu01H$\`i\+hWt*L2mX%@PIY*]Mju@5(1V"pR.Mn8'[0f;GIM^)dF_
+ ZR@09%f$JM_82'd\+h'Mr.u$q[HJ`R]@ArWYqS.#-<"bfSjk2@G^nMU$+Lcl(/9%`+ZG`fO
+ /LN;+\FR6T#^)7YQi-<7u+^gRnHA\EH)D*o(MH;4?n6tHiJOnEA=hFNfT/3,oi#7O*tOAnP
+ _2sZeL1Y)&gX1BIb_X)]n^99mB4K>[>T`/<,V45C40EcCLHCRtq?A*G^W]b_Fe_j./ibUeO
+ p?PtKlZVku?e("$RkI2:$:]A:o`6:6\]'t"EHY>Xnf(hdUq]pQGpW+\L@7O.5]]e'@&2B0+
+ ]/+"FH*=h.#g0Fmb\cq.T#qR@GX`Ndn_qX3l;(N'ZIJq=JSV4DS%q*4;d0d(Bp7IsA!C9Nm
+ !!~>
+Q
+Q q
+99 208.002 7 -7 re W n
+q
+99 208.002 7 -7 re W n
+% Fallback Image: x=99 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 99 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%BhVH>'W&(/+;$mOG=3)X7?"ju82MZ2BT0s@7/Wh-\8,PAK-l:Mg=fRC=c.B!(s=f=!`
+ L@36-:AqKaIudMA-UQ`Bl)r;Kb1"bff#M3p?%C\NegB^3@<_SU9dQDfkXOQoI-qRWR*1>,A
+ O$ZrEesBSq__aQ6>l9h@q"LC`+EZI\U;p=e6h)@[R-A7VJk+lTOgOELSP`go3U2fD;@?V\:
+ R@4E_:E[C\8XUJ"OX9T9mLP4/J,bsCnj^DT$DqoS_nmq*L,Cf.;qom;ZZu+QIjr`?e5Mrm7
+ `W#gU7uo!e4tXHlY;A"t_HA<'bC"\&'aq5Y:C1<4_q(t"F`@^nZ\FWO\EMq(]4%kFcZ\`83
+ IEgNm+L"BYJ92j.h`RFa>Krr3(oR(=7WnCie%KR2f&b'Yp.9B3P``c@+d=8,tj%&=Lo2J!g
+ bS?\R=Mkd#L>6%$X"N&J7m,O[29NONB!3iim.N[;40F%Y58Md?3nU^mdF[Tq*4Ues;ggH[F
+ V^GlgK+_8:n%[qtm+`!KD@-oA<reZ5QkmjQ7/$ACMs':VV_hM'IqX&cKBCfj_=^6Y)!FLi!
+ B7S_k*doeJ>qTYJJZ*f"cEF\!r1HA-@7=9JmDXQ,6$B"0'<@Ts;S*%!/8KJpLKBM1.SMS=4
+ g);s-()B=;7(0J@^(9Vu"Uc*=eph&<<#?<K-^DPqLAH3'146&#oEguE:_<$)Rp2PL'@)NBZ
+ Y%FS+T#;EEUE*6/Qr:V;&$"--S,:-JF.)gV',MTG4r;N@8g`Z1^(YkOO^C/.Hh'X$8Mls;o
+ $6k&36)rW_Q=?f@BQZp&/0%5Vo@h7"R*RW%gLY;ZCh8[b0CV:B`d@6PGcn2&Y):7cV^a%?k
+ 18dFPGhdeh(Gla*pE%>Ni8Ton;B+HKb,D_ajJ(o/6`Iq^_dS^*il+0]]>C5i=]7R__S.Pe7
+ d`Iu<Ep)6k^:<-K]G3k#LIN70@i9t$DP(KA^d*jccAB*]p1Mn&c*prBeG4fT6O/IqnJ_;1:
+ JC-?!cJs!hnUIiY;kf&&N6*W3NE*`=K*_j"%1N^WaO$H?hmM/rQ)[t>=(c*0M8e-V`lh;YK
+ ^77-@q8<\*>id`#'H?%(nl8`\u35iG]7VDnegZ\2h(YTdG3MX;q$hl,8U^7m#eo(_g^ecJj
+ 7D5Z%fC.\^7$CX#5'D_AHmHE>O</Go.Sk_-o.5]J.J."knVPrehTUEB#G)"Kg(Re"IQ^NCJ
+ j41W['6E%o>TcK=9Co^k6u(N]96k0<)t64J$J@;p0q?60T4_EhW%KIHraTC_Xt#UFi'D]^;
+ g\[XY92A@K>D<c[.iZ/7i0R-OAT1<p<C^=QF+^J*5q5R.)kUBeK,m5Y,&!qQg,DGI7&]dgr
+ p0]6F*qDR70+.?^TV+%hWC/!uifunSUVYpJ?]pb3_7i+cl0HBNW0Ab`%9XqjP,61mK5(>_C
+ 7mVTMM?iifWV9Yd$/d3&BG3@aLotK$h/`GqRaA!*?AfJ;i2)*(n4/6(9&*'rZ:W`JQFPA);
+ bX^/c,QPM]$^~>
+Q
+Q q
+238 208.002 7 -7 re W n
+q
+238 208.002 7 -7 re W n
+% Fallback Image: x=238 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 238 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%CFkc[(m_&_TM/cs72B?EKInK+UX5HuEZ.Sf)?"NC[[OQudb:WoMG@VMdUXqf&^_-0c&
+ .`$*LDq`PJbi!FYDLM=)4G3^HK4.I*_Q"f5oj$IGOYp!rnUaCO@*H,P^m;!s<fB:-j@o"pa
+ \k/&oT9A1$]u[s7ffc-<2f'AU8OBP>26#C,c*ppF>`^>\m/['cU5&uDE3DVW%@H[,0RK%Fm
+ ;LTW7/=!K@/R@+DfZ;=RKM7e/2-1f0<'(E;E3,o!k8IG1Y_tio&WBj=@QH\gTMkmno84^Pi
+ m0Y$]OHq5%1F)9f?QX1C7X@*^6Ek']!\Z4;lcKsL[nhYDqf`GZj7?o2pjgXb'GX4-!<I.Y:
+ uLVr?+Y(P2"'.]]S;.tEo?/[aSYfkSidU;AS35G(@0R^`<q0]Q,([?1c]qcHpWV85;^KK0D
+ P(tDp5lmbo78!Yn>Tkj60?nLVqd_VPXDN1VrYDfXOc]@0p%lqtKXIRH2H7qTGV^=E-Ceeh,
+ tD+>FIt2IY]>baUPB\T>#pU"g@sK]H[64cA</0g$QBm`*_R':?A`a;l;"Wl!l@P&F;64?]r
+ c)>*TqWs]pg9egdqSXZ&nN8qrIiQ[jsHF;rjF65;ms2`Em@`=aF>TC1i`O^2rZ%8#LB$C$O
+ k2'G"]SU.=&0)+&GHl_0\S+&V=qrjV%rKNW(D^KK?>S6oH[E#KYq]k8qX#^=5(C;6KFXfk6
+ UN.4[Npi)]@'mTM+V3FVm]V1:38>DY(`^K4MG3S>%BBEMa`Q.F=F;n7C7[P;,STE,r7]W>4
+ bL(X3@1\7jJL57k#Dm-Afk[r(3q+)Ii5GdE9L"MK8-TGalEVj/?/Df,WoRHJ%+^1?Gi`k$[
+ n![>(c[SfS:K6k`nO8[;i]G_q#kDEiNIAnE^FCn*`%GJi/S()Fd2emN`dBrO,]+t`iS!Hno
+ ha`;I8>eGlM$FI1=RCUG:923CNSac<CE5dtdU@Vn99M>T=T7?A2V.Rpk,Kqth"';\#^0](.
+ .<4pS%/.b5q"_bF"fk\?f(M%7`lUtgeS'"&`<-O!9tG22Zk_nOiIXV#)B]1e&o^O'N$-CQ%
+ hH1\ahXFJ1Y\EY'&4jZJ7&O@6^T<8e>Z@p039smk9D8VHhPMuH6Y+?`\I^i/2FEhV@!a!Bs
+ KeinKJ8)W++m'\o^O+3Aodb4E(;tpLDA^KpKQ]9\`V+clk+J3R=3-e']9eSb[0_r8cH5%F;
+ Ki^F7`q@:9L!H\X[]5nDFYHj-_Z?bY%^;o-RI@:g^PYFhshoEk~>
+Q
+Q q
+247 208.002 7 -7 re W n
+q
+247 208.002 7 -7 re W n
+% Fallback Image: x=247 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 247 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%>:e?F(iG$Oac05e294E]@l_eUd?pnA2A7m'XW5?XdTWT.CtbCkR^<qb0H2fg87@n86>
+ `H!%NEQ\8m,o64[&8JDna+Xl+?/ZGL+P6cgU\En,%IgkP]r2Z)cO2_WE2ZI)5(tQBtV0j4C
+ L0rZ0bJ3\kVi?ss)ritrb(D_Lt`P^)^"n)!$`7st32,P1*EGlJi2TB"<D1c-W.fSK6E]R5R
+ ()9H-m@,\:qTsYWsjX;TVU:;$T($OkskU>$5FC\u6qYO,qNB;?'m@"B+n"Q[KC0=`gOdYmN
+ [@sf9QS'FD>_St!Pa(+j;u*e<0fb*eHDIJ!lreR[Wt61!<AZRAG4mTAe<NKp4EuD;AGH#\j
+ @L*ar/dA)b"@VOi7"U[.Zh$uS=@F7KLd:?&(/dDF+^Ts^s5^5jb:3(l-bbC+s-H2r$;;j0O
+ )u>H%UYK<)qns%>9DMd1I-0!_Z1;ZSTJ8E9e;)l9sBFhr;NY&\h@?:MYIa1)%*_ICOP9&J=
+ O)'M]kt_81a*CMW1\KaYuE&d;1l4["&g>+99QT)\R%TO8$TNV?(G4FW7eHsF;iGB_]o_o`=
+ A%ms]2j+r6e9MKO!-la5bj+GOAAL+n"0g@;qaH9PCmL0AhH(cfAaN[.a,[=S^@fnMC*'+3c
+ 4Ul"PaM^ILF6j`=SO-#/,h(Eq,It=_/\`Al`.od::=f+(3-S-[K!\5(ck-*JBe]-G<$9X:q
+ 2#b?m$X9?Xi8YKbh(!p"uAF?feXMWJcbJ7e#2:AZR%2=hn)sBR?)_eEb<V.3:(a;dSf<TI@
+ IXF#>:`OdP,Us7T>VrYIV1tF"YOQhuNK>=+QE[Bl#?Elo*=KNKkP?mB/']8G-(lQ[Q].?n9
+ l?NYoCE;nPDV1\9dbG+]]D,=c8]3V[74a?4'FTWARHc-d0ri*rERjQ%F0"m=4T5L\)A*u?m
+ sa`5I2#CPT*reX?mFbRTFP^2AJfG?IJGE$ofn(b[=Zo"W$#6]hn;g8XG!*W43p[AaE"U9jt
+ `5de^4FDtD@1?i6R9+A#.M<@^73iBN&r$5q_80"ooq.U"`^h2H6F=t#4+`IO%_[&sg"Fe4D
+ Nd;:H=IJ2KU\;7;dERTrqTJ$Htl83'Rrc7NCga*#n@#tn/qsqP106)_X?G#.i,gu~>
+Q
+Q q
+256 208.002 7 -7 re W n
+q
+256 208.002 7 -7 re W n
+% Fallback Image: x=256 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 256 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%Bh4LT'K&]B;iDDp'EiWr"[Z-BL^Z!e&eROMa9<=+;DBpA/-uW(/OVl.'br$[U(E2-%$
+ q+)dPB6+20UR;1c1OokG%aCO$J%VqUO]spm?!^I!>"KHfbA/A*6rs_;ZYNB/)Q_%5TeB=MX
+ J_f%8HGrUifC#7'eq24d$&;j7,sTW8GB5N9j&q6V'VI&<dfgFH6GFUHXMUTmZ[2``F&WtB,
+ _q"u"HD5aR*?64-.2o4[W.bV[o&,>Z^*TkmPo_7D9@h]X8aqZ0I.$0XF#7o21KC@^J@:fu+
+ ]YV:.84u<8!;ud1\9\mdV.aefgmgFL5C]E&"3&68NeY/-gtWURGYuWSll!NcgFXB;5XHr[a
+ c)5<aV/2sikbjY3l9`[!FK2=^Fi$uE`#&k^S:l+Q9qDn.(8P]<*(:j"[5,SY^i,Zbfr**l&
+ #1[Pa(+F$[hf(M$_DPn";q;g=NMF(r4=],-Ccj.><N^%Ni]a6NTF_Y-&$:OmP8WK[*=)$'S
+ Lqq?%n?2UL&'12CPgAYl=U/e7'jbP(]!LQ7CF%tpc*]Y"djL"j(6?7u.-/U7.n_6X:SNW8b
+ iTI\G0kqM`O2BB3jk6F(1;4<W0*8-oHgZE9e_pAslVQdJIR5<:gAS':jA=s"'/eW&P6+)c4
+ LkA],i7^&Y4!tq)0nFn,84&#Ump6tnJ0RSFe#,t"nmrLMTs[l?N#AqQP_4D,ep.$*GOC9W:
+ 7fDOUQV"9T(&[4CM?(9(C(HX\[/V!HU\2\5/aL'inGpe3'Jt7aJQRh"+c"_Fq"6DZCDlce5
+ U#A#X??ZE=NAnAku$^K$[([Y$uoK6Xl!29U[5>3]P21-HtTKp'Hd835T[LjW#d$G^JK!-1N
+ BE8TXK8H+/AGb.co5@Ub"YHXr7A&FPnPb]?_fgRR<D`\N<0S3;eO8DLj,ek-V9/Z'NVhP%/
+ Mr$N[TQqs66D;*XXg01dk4"Gq.*9UPOEH.-$%Lkj9U):cGqj<o/`m!J<_o0P=3*;PDT>pE]
+ P5,<PS@2jAS9&r+oG0J>]o-Ur,,>)d#PH)7:d<pt#RV2-F-!p6e)6(<Kh3/-qbXXLbk.a#)
+ R7QRCtuTJ$;""L'iItmSrTm'gq>5P8):ILP_4]T4=o[jrk6gOQH0GU2rIu`cK-P40>&r?AG
+ ,pOr,)?9m^Tqm~>
+Q
+Q q
+264 208.002 7 -7 re W n
+q
+264 208.002 7 -7 re W n
+% Fallback Image: x=264 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 264 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%8P#.E'Q#!'%@W#Pl9`]t"@Eic5h_$.%O<G8-tjA>$=YD5l6<,pik-!`%0Zi&'+0LM'J
+ p%o*'g#l*&Gj51l'Pjn>$$`[HQd\[.86<pUfn.qsHQ?]FQt\D=-Be#7&o;`V8h'>LUCMVYK
+ tP0fmt7&\`\2oJ?aWnaWC4djGlbL+kE9N=C`l_1)F(dLo#=d*[E!L,6JjMp>(VNad8OLPNH
+ OhVXZO]=Lg?LVgna'G[=U*hPYifkcHSp?NO7`mEM"OqK#dBqVgI/M.e]Qeceg]fl#^j7R2`
+ V^!`d!uVuTWPQ@MIf@hCo?N@9RH;E-ipL(]4FN+XEccNKmTS?7Z&38Vea+iURdfko_Sb?pV
+ LaO/jQ&k,^4+&PQ<"FT?2s[CQd4@]ncb;DGjtk7riidFgq'?!_hUcX7Wl*MOp.qi@XIto%-
+ 5tZKW-EbE,-s2$Lm*_mbPeRl[g'7<:KFoZY)Uf%j*&W.C?fA/3Pk:']=,?HTYn?'jeR?>T=
+ eIJ?q$a?<#n3-%Us^!WioT0-oUY^3bX,*_]7tjgf?h*<-,*a&B(@?u]%3N'iqpK"sX^-6!n
+ kS'/c"(=GQ7^Uh!#3#JWoW3+&.Y[ekdWIa>()UHa)Y7D?_85+]?YOL,k&uMN[1/__]a34rm
+ <j8o_T:[M<REo;K=:k<X"H[u8?uhWFMiO)8^3NYC?bQqsI:[!m"'iBgCY**4ZCU#OqRqA3A
+ cF?4*2W@P)(XuJBW-loM2>&q8bDY>RHZF_PYJ>fKtFs1<+[K6]TLfsHEN>Yc3P`0\/5MY1'
+ O0X@q-sHaa&'l<sLn\o.,#tX+Q#"J^gX<7N!)dLq9i+lkO[*q/_[PgUCU./Vdn537eo])W6
+ .pcTX/)_a?&=e!cm^7rE)U%8jUk?;Yt(E_MGA^co)@-RUl7_SH9Hp)9TZIXYje\$om[X4,K
+ n<[PsSoi!eAEGhpM6"HcZhS0RS0AO+5Ju>LN:Ap,[A4R!#U83coH1I&Z_s589/j!8m;qrEY
+ `hQ&PD/I)SAis.7/XsjP;j!K$Tka*$+mW6X<gK7N)_dHF>fF+@(I%JK5-m7jF/$mBPJRtsq
+ W*\q?mOdCMJJW2YCLN*$<l.*597EG~>
+Q
+Q q
+273 208.002 7 -7 re W n
+q
+273 208.002 7 -7 re W n
+% Fallback Image: x=273 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 273 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$=\)P$(bDejbXA4[b#0HA9G4<u&jhB[%"(q\6P;gV6_kpE,tL]]+0rlI60gs-0dF/j:b
+ :"gP\=(OCt"Ou;)+7AV\sAo]r)+s69Xur0B\l*bk[S#joGEk7e,LD^4+&b-pE.#a,ag@%Us
+ Z"j5]q6h+D;-%Lf#.#C#Uo`XUnh9qeZuO!!E<4+5Vi(`UBYfBDS>[;39okngA#;,`,@G!(2
+ Q>-&*tr8\0e?cU-D3.9M>_EsCVM]Y,bao(B:3]^)?M4>P*5&<\l)G3ZMdXjDrXCPq,g"W5F
+ ,UFTbb_uW/E:P8hC[q>5Q-=Z)BP>2<'*o%95_'_6GN-[UPa,sC1QSM-Hgj;(+$GM;]A_d[`
+ jT`?NQ(_bBPgbi7Rj2hDr7F#Ss[=?&Gl9(Blc)USO6X%!X%EL0!&8)OF5qLA7a`B'l!7+>O
+ d4=1(?%)7bY!tgqKoD*C#RtHa.8uQ7j%TX:X1B&0.d+>dtnn5C0,&;Fm"8(/uqo>2]C.%@s
+ 4F.1pDr'R&hnM[L:Q'^Y4@,tkIR$c9fDP(M\&,sZ$>KJ-Y6:sGI%+9)DlQjN6=bJ%Y$"U.F
+ jeDNGOY^/0sSRH/DnVXG#(,(tEW'F]s6pt_elfujO.p[.99n^96p@@J`R[W:t0eli:='$iq
+ d1Q!4)4;9m_U>8_ZN_@,BL=R3EVVA]4VRFZ#"Vgks&;tUfJ/f3`f6^8Eg#);bctQaZ,-A6q
+ P&h:)g^_0<(^r&2f`mHEVD(()s*1R+!,%2/=Ek=Qq:%aSin$6k@27/3&jI`gUACg)L6W!W*
+ ?a<Q%n3LQ^8pY>K;>IPRNs_29D70><N_6a[\J/.;[h?A^AGZNUn63n",Z0,N(nbVop@MAmS
+ eG[0eEcC/SlkZ=RX8esqeG@-q.Z9F'L]kNAV?8j+o13BKpdA]ON5=#^'T1`c.6H:fIKf:0T
+ LhW,n&nFfn6SBJa$EW\?/2.0hS9dUi%YL7)DoJ`(-IipXf2SsR.#Q4P*CR=*J3AIS@B2N#S
+ AEIi0;j!.a(LhM1+l]+0HhN7R1/__RS?.ILWs7^e=%.T#$r3@VpMqJUcqM5%jQ:1b\7.9dg
+ 96'qS&-JGWk5kh9=jQ/LGK#3=nHdLaI`XFR"'\%*BsT&lFf.~>
+Q
+Q q
+282 208.002 7 -7 re W n
+q
+282 208.002 7 -7 re W n
+% Fallback Image: x=282 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 282 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%>=auU(_ej==p.m'-)$\u73H;GO?cJFksa&dnHss_KiY"GA9fV21e],k++2EJdk$b:,Y
+ @eS"c;=e9hNA5bqua>'rDjR>'C:[IH\ej]^3C[k'UgUq;u$lEQu7qVt'@+`l9\pN1hC>7Rf
+ 'qNaKOT1LhRa\+fXWbo8JsiRp"D2B'rtN6Y0,%dI<Bf%7+hl4WL_ql$SQi9jl5I#(k-nDOJ
+ `J%(O8o4Kf-eDTI`jQ%/>Ru<FB4FW6uD_X:f+`h"_6m,8t$5+#3aNVTigX:cO>IND'a+FW<
+ c:2n4NZL(;j@L%"i9=0fqICajHTTBmE:+\U*Q$[H7K`l<4^I(=;@?i1;sO.eDtrl,c^uFH+
+ 30FPh`gDZ@0@*%HPWHSBPC>1fuJe+nAc'=f@qf_h7JH$$lh?`SNGfi,.P2kqtKEdldmEg'c
+ Ru$s5`6'ba]'h[^N3oiaSE<K>WJ`[UFgHi#qN^cqmuYKSg-0Z(j[<:JC\?Xf'2>(@^l@*^*
+ Eel*U'FeLtiZf\9oT$=W$g@In++qB@[-QS6NBe^^r:Q2/>h#?Fl`p`H/Ak['^5+]DHtCY'+
+ =%PKJ<@cKqZ?4C+CPM\$!MR@6)BbRpm<@d+hE8u\AaC(f8(pbKX`U&,:RE<H<ZfAF2[V]u,
+ `k$:p[0efM-Ho,KkW##Mb80I$NS%>ZeWVBUpe`2HAj6b;Z\sB;<.oo-"9`BSC"KH&Z=U8K2
+ IY__kWkG.EYcGG;H%SuNe6fW41uHm/fsZEKnbW`',.,i,H[LWQ7l<nB$@mh"X,lVB)sRDe1
+ (3cdE6G_M^\j!ID'HHnY4%Va%+TEB$LS%aYOaG"_jqKDa_PS*g@dM=dlOK#&,i:;/M=Cjl/
+ 7TKW&Juj5d!GEh%F@p$7Uq7m;-=<"hDWi9."`A;9!QV#]lM2IWIA=>6Km5$kh*N:#B-bM?H
+ s#Me*ni(#ul\"91s&Ch$o;g50NGraU49UKOZ]KCVcHNaYlh]I4=-o#>=CR7%nT2W*!#8C;T
+ nAGW<\0(l-5g5U`MPj89#8%Ol%h-sRH#_o$E\An7Y"hSU@3Jsl2IYa[ZDpMW:T:O(79Z,e8
+ 5>`uPkW<8l+k/<E,D_fcC>SD&0K>^HqD`?N9GtGs$eCf,FTPhS$\^)Ihhrsr<@R_]t+~>
+Q
+Q q
+291 208.002 7 -7 re W n
+q
+291 208.002 7 -7 re W n
+% Fallback Image: x=291 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 291 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$8Oulj'QkR&WE=nS'e#qjK-6ta)'n2cEs`?m)?sqQPc6(lO:"PhTIH_a7WQ:2.!*6:d8
+ [?(V,jJTPT#]g3D^ob_s(G&Z2ZsZj<n,V3NN&FGIZQ/c92]jN:gY&(#Qc9@0(Fjq"R^;fic
+ Gg.r06_PnhNei8$KeoUrTld+5'[G;hu\nG+l+Q?6PA?H2%O?GFLD-[>.=2]b.N9+,(>_M8Z
+ snO"+)Sf/V<7gCLoOe;Xm"U2D[:HE.ChnJ?lbV?hWK8'RE(*YqK!Ku'cb&nI9F^\lHSFHLS
+ 84u<@L]U.>-nE3ABC_'D"T*K@'R0!'_?IH].hE;D>IVu9N\=`tb,2;Jp[:sdO6g\9L;M>8J
+ MUqXrApsZjWRb%97bU@3^Gp5NN"?=)l:M(-RQ^f+1AV0IJYi\GuCMfpT=pXQ)s/JobC"\I/
+ 8NT@<?XcYu+hbUH!5p()@fj=pdAS&/Bng2t?[J<3i+]_m]R^PRp,8E4-`QH+=p-Hl7B^3-5
+ G\[V9,[,]I_<WDg<K$$geo=][!1m-iPfW1^&tM>r.kBhV3Vcd3>';K2Ih%NgFb%F!)Ya]-5
+ `[n>N2=ru;I(K[et5,hF8d)>.![+R<ar@4j6$'gf#+TXbjYd;6=4YSZ**Yn:4/_I<1]6B1A
+ ]tG!oLZ2cbFp\?5V_UN[pr*Wg0\u*nGoT$Y.kBuA#nmsh)QK27$t*m&?WlFO-Hi!M/)E]!b
+ "QAF]EiqqU&q<ni]0b/0K#+UYW[D_2)@&4PC37N*'#4dIdNR0Rg^rWb4Sc(o&u2QAo+QM1P
+ \Y92GA-dK5GCV)<Ua[2;B*f;bRU;haUV2XN^UTJskB6=3/OIbmF`ldA,@+=!l&dEh.FA;Li
+ Q.4C<Xs]H')EGS-@3-n.G\PPjIJK;p=L6?9@?3A;#bNoAn^l0#h_m,&>#HNfdFSmPX<3O=p
+ j824sbCJBdNR<DCA3B=Ti"m=0fjLi.`l3\=D%@it(=Ne%jdo/:6%nC^uDVU=<"g(Q^Sj/Q=
+ OI88(4cA6+&aDgs'SN\EYs'pUA;CFhbQ@sQ,CB[K(FPN?/sFro=NOUC3hE01R[[kM["Hpm5
+ )u<[]R;;ZaM0)M^Cg,3U9@?f%1Zi`9H*o";?-7_$,4j$2u~>
+Q
+Q q
+299 208.002 7 -7 re W n
+q
+299 208.002 7 -7 re W n
+% Fallback Image: x=299 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 299 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$>qD:M(iEgrP,oh\9L>lCT_[D;bLXlm7[jKE,7>C+Wj-0$/;kbe1U@KAKUS<N@[>`,2+
+ jhc8VTS-YE?T#lQ3,$HOni>n":p"Y+t0.hWq_EqnDLa!Ob@rf\"!C?W^RObRCAG1b_"L+$\
+ heDR$d1Dr:'S,J(MWr4/K6I1'uM@!GdK>[Q*:R44,V$V>+a)B/V7nRE_lruMge=Bj7.H"dS
+ ;K9GN;LU_^*0+&%_?]U3WI/Y\kdNO)=`7qb7Cd`_9/md$mEA=%J6[q=$<chbV=?oq(.OpOG
+ L6)rU>e>aE=t,\R9q7]:;Xj*O;=O5-5^Y[d9@;FLj^i;^fP>B]<#Sd,j9_tr7rU/B*Rd8U(
+ ij]FdNU8T!j!?)Vb6t$XP<Y8^4+&JOJI!u5#P=!l4a^L'\M/Y+YXI/Y"32PH_ld&30X0I:7
+ 1P3,R+JBl4obWEVhZ>SqVq)/1h$+<a.P/&d\lSG>AA;qDCHb_Y<M6SM2uKqYK^P-(:9uEP1
+ c9oC2F,K*.'k"NJGc?pU0'8dYn5;-bbbTa3(^-.S"rg\;k`DDsk.)&j5\<*&#LAbc)[a:[(
+ Y@c'B9g84e,9sh-TSK3_3't%D^.O3(';r1L?oX#2/$!Qc<LpX[n$l:P3a%$9FIm<YpKqY3/
+ R:hqW_o;n9%cR%oUo37h!u^g[;))CBr4[PE:QO]k-O5crE-2oOnok`\(`93>GOEE;h/XNOC
+ Nt3LYZ$##2B@ajXYLR81-_%j9*.CF;MmVajOPU(do/'glcV_AW0nN`+%Kum1,JIa&RN,c]6
+ @`!b2<V4Q\Loq-q/<$KW1sKb5iamq3>>FGUV#fZa6uKEp43/9'".e"PSYep`qTQ)`J<E-`,
+ l&!sdnm/2cUZrDJ6$i]?DL4ffTjPEKHgkp1+_njFs[]q]#aMPHs*mgjVd.ELJcE,q->3T*M
+ KL$SZZ4^MI3*#jfp$q^?\;_`H,n>r]BnX51="9dZ$$+RN;5(niP)Op$qpJ=:hVM?NH9A1pG
+ I9"81;R"7*c:LO9R5N@rB?hV^*&01BeQ]LZ=/TZ-)-0aoGk1EEo;7>9%]g-71h:7Zc5dT6T
+ r(;N+]Y'n.J.R?1X2"75,CScC'0LQLC`ql+*u3Nm9R1+?2OC+"6mJj~>
+Q
+Q q
+308 208.002 7 -7 re W n
+q
+308 208.002 7 -7 re W n
+% Fallback Image: x=308 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 308 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\)Oi'FcpT*;`R]67au%oL$\tEWAD%6A!,e%7LhL"=)>!#B6>49JLNT'L;gu1l?<?o0
+ Ws1KlTGr^aTN<cp0f.=)7CKn*t:WnilnjZ[V>QkH;;?hJ9=dJE&UOp@ki$LRfH%Cg_Zs$U/
+ HH@s8a(J*Y5#Dh%]#oJAa[_T.^h_*Pp,0IA0P["Mf$oOMRBhnNZC'^sqSX\FfKG.`6]OV*!
+ <L7^^'ADZ%Wf<=E'6@D!h9@YF@6ZoeuO,[Rb9i#AeP]_6L)MNlipeZm=*&KKC=V_hHA6rS3
+ ?QUaIOHP4-GI<6f7r^9?]u/WqT$6ftGk2,bH+7o#^:me+\:Mjt3=D='o[#"'F&ORAfI4cN%
+ YgmZ(4L^'8jZMmL5'6n&J[i?2NEZ`SOH>8[#AX1Sej!b>[.D<?AOW]oB4QBR2Mt^'i+=L#:
+ 2uGb*A]<BgHo#+sPt(!IK10R54n'2hZlV6$OTN4Y_MA"j-]2?m@KF+%LgqkdIW(\[dNQ5sP
+ FqS\qF*!crD`J)]0>6q62#;q0<i[2$Bgq#"9M7thU(Nq#>!R1Ze`lA+bRoh+<1muNACEV:q
+ YT8'VUc@-u_=BWJV!NrT8E^dQE<.kc(A?nb3\uI)&<3`_QcIUg2OqP^P_:opSc6<@RS33dg
+ ChO(^$eX1Ma[l\l,,)8\=t'Y2CC!p[E$1oJ_k`$nZ4J(;bElXM#9+To)j=5TS!h+H=uL>ID
+ V`1)8)dCQYGitI9p(k0oO4%02-%Yaq,gf-/PBM[TYnuD/s;_DGUNn_+TX6'MFZ('3L'q`Wk
+ Gq\"U.e]^d+kQlbHG_gsd#b-<fo$MgWJQ9\[Smp[6.*2)Rr[3GSuac;%>>b#knn5saf03BG
+ ;B1GLXuTGhmcieI'fV:SRAaN-Vl\I:.?<\Q=<RS8%=\4oMMfFCQ&kn;e-j]CX\)XrlII)QQ
+ ]+Oa^3e'c0Qkp-?59'4i24F)PUpLW+(S%*nf=0IKJ#YI_jeN,Xn'VV5cl[XH-CP)+U0[j5I
+ 5=T\!e=#C,DbJOi"\k&bZ*?hn`.J:m&B[8Sbg+YoG_&cdq>$aJf)/?,HR;1+nNrb9D<g<rN
+ @BIg*i2WV:tYDQhV)>N*!u7MI_lWk5Cq\:>NS/g+$_!_H2~>
+Q
+Q q
+317 208.002 7 -7 re W n
+q
+317 208.002 7 -7 re W n
+% Fallback Image: x=317 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 317 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$=\+fd'PoM3<>05Ua9?Vk$WD\0$<ndB#Ji8"'pTt3-q'.B[+2D*2Q4\("OUK>_$CVuZ^
+ 9)]['VBLXDHcQ9<2c]0&6]R\dprLR$[^MpHRR2k004q%*&o63/EV;n`C:P5KC*C7_F,*GOP
+ %s1VS:D1@s80\:5SZDP3s8QS+u:d=?#ad+O8R:XS'<AS0M:q_kT^_>3]$W\U6Y)Kg24IN?,
+ 8\rh.*kRj8QEUFg,*5R1."r%m6bSep^USC2CZ7bS$6ULrNT#Bd9aNc\QpMQKaMj>,ab.8^`
+ jIrdh8P+_r1LfB6*'5La8[W]WhNaD,a;$50BTWnsnN-*t7J-9O6ahOHUXH)r6\gbpNeIl"m
+ r(U=3-'(;<i2X!]u'[@;W-01InKV:4$J$g:A4Y;/_&9XgGW>emTb!]#bIX)d\Y%+^sSo<\u
+ SJ`If10l^'p-l26_)&XeP@($#J=KeZ1EO2Ps4aVG.^*!jHi"G3k:rWGO-Vn`/LVYe+,LHP]
+ be9!5fU9?P@B9FM[fJ>4@/N>'<m(YmfMI(<A5\J(l:X33'.Xj)sG![C/Cj+$"+$d"tQ@QSc
+ #;X<MlQb]PQM%_Ui[+V)=m,6rX=gR&RNK=]^A`<E(q;Hr2&d_!"Jc,Z#q!at6>Zlo8!^oQE
+ .t6gN/2<)%AX;$#((Lg8eD2.'(Lu8^*'Pp/Tj43PZ'=.D:E$1TQXpH0L!WZ?S-]uJ9UZ*2H
+ csVk2EGaHA1;o_4<u1[qf\5mCV=dZFd`MY"L#_:,8DXV1'`7f@04H/`L&@s3RTH7aWVg$cH
+ =727"i4,K[<njS7S/oa0W3TL.Obj3!TY&3lj!>B6*,h"`M5ViEKpVe>uo3p$5ISKSg+r%+g
+ STY_2'!fXFZ:bfm/V,eLWsqK26fAVq?r!h[f++iaHX6sWt7o(1rI(G9Ch9S7\U"nV,9%>^"
+ _Z=WmNa%(QJ1Ips*14hadS8Wh(Fh=k3,U\M3]mI.!BHsB?[;ZS[i7(_O`MupYcJW(4Jq>QD
+ o/ZiWA-jG)OdN)1[VV(c:^Io*\`9Uq1<'d?ZMB!YAk5<Y@Ef_@PF79?4IeGYCGH?:1g2+%D
+ ?#'e\ZK)Dqu-f$PBONM%h9XK8Vn3W:QJXj:'rA)/kVG>P],F.d=28T]tI\r`hgeIg]H7Os!
+ N6q0`8VY~>
+Q
+Q q
+325 208.002 7 -7 re W n
+q
+325 208.002 7 -7 re W n
+% Fallback Image: x=325 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 325 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!TT>=auU'SVTt2Btd";%4,%OFi)2K1-;K8q@H!8/=K[Pa8,n'tSuO@n,Hg(F^Rs.]oM81;
+ sesYQVQSh*W_N;R).FRX**(e_4RmUZIH`>Dr+B_jp>C55S]6rIA\FkN=3'P21#"j61t]rq6
+ e.^Z+V55EMA(m@Bg3l1"o2gP_pU]RGk#a8<qiZal]5=_VejPeZpNr;Jic]YLd^IH9neE/V^
+ +oD.?4H[S%Z[KkedCMRqU(:(76mbMY7Rr`^5I9^#4TD.f`?,,7nng3#D4<a;2na)MkX;Td$
+ _._%i8qhr"hQd:i&#,]sO!!E*(D"X6T###+8d^k9K>B7.jH1\-/7.,?I612o_!TliDYAb=h
+ 2V=+Oe%L)lS2m=X\tVaTtnIV<NC)s!(ooSl'&_9^9t*rE>ja\q\E8:,!?qs=(:1-<:rnZ7i
+ S4u@5d0*7;3S:e(P.q%cjhK7SD*E:S6(W84iqD3aJud/T(4JqG!I?3c%?0[FEROikg95mDk
+ 9nq9^FtCh>$FX^`mL.;)ACOrb9hIJ\!Z1*/Q>b#qD.LD,OVa&Q7kAJ>q*0+WgKA+O;#7:FW
+ ?3<R@:^1/B4]+Ye[SstY4,*\GSq/[pJ;D)%KVKo4.d^2)RS/lnj%)u1O?5rp4]]bDeV8b%9
+ r=@OMV0%21;oM+orVX3E0t<T)'c"5t!>Z'//3uf4`f3(VGH;]?C2%W@k04"krT$Nf.h_&2U
+ 'U*eHTUNXnDoG9@cpLR9F(osNFr_ep@@eEpMYqFO<Mlk_TeQpo1&(*+94ED`6uOnNZ^%ggc
+ o46`=U[oo(1%r5$`n"/PWmu.B'80=`Y:\:f`>BkHT@mQ7kaA..m?]QXk%'=[>>U\59>rP9Y
+ bnmaqlHT`Kk$&sun4auE1detZrC?'<kRJ,_!n;&XK=O<b-&k/.EO1.2&b)4@H5)h]1FFNk8
+ raC%Q159KFcfX")BQ$LY!*E?#_"n1.kHUp%3@b`6pohuYXk`(S@NZD$kV+]eN7kn!\QqT2'
+ NQK[2@YCqSA1B.s`ekLo?2R1]iljta0oN,6+g510YcuUEA#Y!/pbci_eJs6@Vr[]7iYBb0P
+ M"s:+tt]k=C`Kq^XUbVAg;B#UdTsV;4J?sr7*<DY>3QR@?IOJ$lf)c5.l5$0W=k[[9A?DV+
+ _k4B71"ZVC$c~>
+Q
+Q q
+334 208.002 7 -7 re W n
+q
+334 208.002 7 -7 re W n
+% Fallback Image: x=334 y=152 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 334 200.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gatm:=\)Oi'K&Ud*"X'[,0cg[W5oB3e0IUR;KDVQTH]8lBW_l@EhJYe+N..t&0YjJqM:$kM.
+ S?!as8?4S;/)h<bq<&Hf$^?4`dsDmQ5XKFnSsbSHhim*^>C9M1WU]M%YfKO:[+hrd9Z`9Fg
+ HZ2gU(^Z]05(k>)KqTs"utSS2lj6WY(uU(l>7ZdIZK"S;,eOOVe<okQ[7+F*ZXnE:I%gjkf
+ \_OR-4gjTJ5dFa8!mr7G"/mhXuodW9q'j>Bgfp#A,is3;G_7b1D/X86n!>V&m/'NbY)+Vm8
+ ks7al.*TcJ_1N*-]bT78e'Qld1c+n$r&KXlE;2,]UW3o]L8e)dk3^o_VId0CiU0u^Ag0D[5
+ !EIqG#i:%LhrE/V0:Rj:UkKQa,Z#%A]k3LQKVHq+93uFkjB50ED1i[qA1q(E96i_q"b_$Sf
+ g6>HhLk'3k2a.B$JbnNq@Em<M@-5bXjNgooGir.-'o3]R5S,EhoO?dj@)\\T9K<Nh5/4$ZP
+ ejmba@0rq6dA*>fgIZIRMUq!^QRiVI[2(ZX!o3M=/Q\@H%f$s6Wq#n@<Zacj5Z;'q+Al&bG
+ GTjDX[/1m^oqtK-p)4@%.cU9[(pA^QJmBLgd@UjE=#]b!+o-QYMPYV3*o9:\CFMs%O=MJ1`
+ PEJaCL:;+$&k^/!S!q4>%PBA9\Pe[\g4d1%4FJ^QckNTTck=Qp(GB=_%NH$CM\\mUdqKe1N
+ Fo'7]QnP'bEn.Re#0#coI=En*&PZIjOVl'"a'/PG411#^DN@:['eGqK$:UEbaEEjK"JYUhU
+ /)XIie(9UT"Rem99DW+g6`<f8uFNj1K,lW8aso"*Lp6R/&<Q)qg7(K1mI.P*7,i8CLJ.`dU
+ S]k&<V;*&hGRHHNjq-&Hq5FNj[6o]ad;mV)9.;3I(d;8=bb=%bp1<EUcZB41/_.9!HiTeK\
+ Rai<"HnuG&[IZt5]9Tqk6MB54fmhu\>`dU$3$;O:5[VZ9[`mU\m/T-lVer@*VC_WL_!MaSX
+ )FQu$mp:h_G+7*O`dSomX=T4fc(!h+B3$Qi/G<IU4?V]#eDM!(kHA.NlRU1@G"=+2IP_?a,
+ B_hV/Y6T*io71N"8r(MS38.1]X6$Kk5p6,(`n\h>Hi%<KK8LohHiA->ISS2K_TEM<lDpaj$
+ lm`#hW[Z+L=_mO=OD>bcb?HUdPiM^G<`f+%JYL6/^/;W)QFM?+;"_*>m-u,4g]Kj&JG/d$]
+ !i+^fsYNqaCiR5?bA/MKAe-bXs2iI%nN~>
+Q
+Q q
+108 171.002 7 -7 re W n
+q
+108 171.002 7 -7 re W n
+% Fallback Image: x=108 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 108 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!$EGt_.>'ZN]P.RZ_@"fr*]6r[Ec#uMArQ5JYJ(q7G;7)^"i(eos9UbDrZ(+@'1%0BI!=_
+ +b`Z79A-Lb+7RQ3#-)ACq6#LR+c5SZd;pSOZ2;R:cGcS+!Q4F+<Z8F1u^%^O2Gjaj\]V()D
+ RTm-Hq%olJ1Q]/A<mAL'XVEk*&!SQ;ekX8DPWS[,&eV5Qp.&h3DB)?k^/NfH:=(5-_A]^Wj
+ -9t@gZ,1/&tL"P$]>2!7d44_kJ->V.H.@9qol-k62p[Yu1?[I*2H[*37I$m@")p)O6c?Nfm
+ lml.D?b\5cp<LF"\+nq"lI]4SB3i0^q`UE#\8`bb_M,@\-^,&_k3h%En*\J@FsaH7#'7V4"
+ F#&<Stq%q]+LQZi^Cf^o/TmU8cf+LbKJ"<9lFqZQWs%A8aaim)<]9g3-OK1W%D5j2f)n"6&
+ *+Mdj&.(,@"M!2f4H-]K+]j/S<%`UdKpcc^_hN8fg.ll^>cu#(Fk?qS;&(4a;K=+rG[Eeuo
+ Ti]@N<80c#nZCfuRX;on7STki54X]pQ"7;UbHFRW\h`J]HEn!Afa_G9BN"u:I5GdsT[=N9B
+ XrVZnkSfi)Z>_8:q&$i\E`lcFpp9V%3=M-V4aV)61fYJ_U`<u*A*]S[4r8?anmAU"\CFbf8
+ V9sBc<M@?r;,P3b[ulX])@[8?U.'N1W\;J@#!R`mSGQMpitZB#8";TcbNhN?34=$3<ha,8o
+ (9jg?Xk>=+4JZr&H:qC81'?2BPYdr\<(,cVG[k*>?_6'&8A%;_%h)A.G,,d[_JG.f'@GAMh
+ .1[k5>._i*]Y>DV$MroYnt<31/ru/M6LS84CbrmB8-JOotnE#mAmEdb-W<2E$IU1G_$PME8
+ U1eT#TG>IRr,hiD9B;CjmkEY0I*hG?f_%HZX<f`O<97RjhC`Rm@71,:XCp!mZmF[#Bl-''.
+ G*^:.piNbG409o-Vqc[/-/7",ALXYLDJP2+7Bm`%sO=V(9TMgVaI30('J+AU?1Gk#J$e*,8
+ LZE3BfchB,//.SF8&m!^\2Ge8PefW>IWtEtoX8TfH[@N3@29a*LaH"*L!kX-2p\(h3bWTCP
+ ESS<IHI3I6_5,56A[cR.PU;KD:+n9.7]Dk)?"Dg%,%LSn-XDmBl/i/#<=adgM@c;XbqQqg;
+ u)n__\M=3YZNnT3qHmH,eOD(a-'?mom++Q@RpKAEnD%KHV1EK=/F.$0+@q_!8i)m<q]'bln
+ 88ZJ"GH@d'MMK]%XS4Zju@(1oPC&<&3PnaZFsqWV^A"csBC*9Y-<6p`RsU>4Ou[r*LV\8NG
+ t?PO7GCKVOl`Wl`'*+j<(q8o86oQp!=frn6%B4dluk[2PBUL4oI9Nc+FO'I]!"Chi5btfZ>
+ >SGA"8BA2Sp`(-)0jDY,&afMBC#h.K;RK(A22R0W;4(rb@>;[`b-u<ZC@fO#^:pb=RYI?&M
+ MMP^D56TOBZSK=A/eOJbTl.hJ5kR]oiYE^,pu%sPu)lu#/9X^)b,p7A5jQCm?,N+JHIXZ$/
+ t32^CWbLD1Cm1\JDi[;6'qd8sN*$=^=b#9.C)\K+!-\5KtFj9/+o?j<P!lNTO#N[<RM"rkn
+ bGs-**pO_75E~>
+Q
+Q q
+117 171.002 7 -7 re W n
+q
+117 171.002 7 -7 re W n
+% Fallback Image: x=117 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 117 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!;bCIjXd)"-O?bfh8*:!G*7N.`eh8bsg/+u6)>kpcrbAlKHVOgfGU]VX**ZtO3W<G#acD(
+ __E9Pp2penXfB3d':phD\Ms%1]"7QMJkEo0^96c?#TK^<c\JrVSZ'a.Q&$PY)n6iqe7YH@\
+ ?,j2j9NRG]T^/'lPF(CD*f^]#RBW+p+g"p_-O*S&\OM2B*mQh/OqkFOi+kO8HKfWgk&`Q==
+ 6J,inP&HCb/U9LlebY3.L#F2j-]H#gM:RlZMkYUueI1LaRd^F'A\3C_XWJhiZR(IOHI!qV-
+ 4j#j1Xun.ITXE<PZf'9.][Nd"I!m+'gmRNsT"K%f_p+2"lC,(g"+pq^f46g!b[O<#[V_GEG
+ Cu2#)#-VGh(m[(X=O[Kc3k+o+$L)Z$#A,14#t8A3lX3?`7itdg=[(V3B5qYB!LLdk07%Up)
+ n[8f<88OUjV-?L:Y!rb^GJ1?XLLH9MZI1]Ct%+n%P^_D&\sK.ot$!Xm&ke1eZ#j,teMW9:+
+ M@[`0lL5_%AA]ng`D9M?Irh,IWAdbdi3rmBTZ;HbQnbCf-tVbX(8H=D5cKuHc-oC,2,_WK/
+ TSMuTPI,Vr3AnI0`(Lp2!\oj).mk;1kV(s9jZ*:I-WbP50VD8\ToY<0*,pgudpL"LW--"4?
+ WhM$r6"7VL@:FgUELkjm[WaksT)&2I6q2XNc#*LMTi[p)+!.:7j.Lsh(0+XG%>uOHEJ&E'+
+ N24#?9Lkt@1fqU_%^K[;jrtObc4YL/hR[I]XVV"<%o/f"b[TSduKDbRITae^q^JW;ShN@@^
+ $rmJ/l^OAHQOt#U^rY42W*n#-+>Rab8U2^-3spBsiW&5pXk\V,trMn1S%f3H+tY6L&PtUs+
+ qRbRC1qB+ih"cg^Kl?A]sO5%\F@*WkUZJe0.D:PDRBr_J4FM8>Qu(<jer`XE(Le)AU+[<a(
+ ucH^F.4*u<BR(dtDV!H7L&a.84rs&H.2_g/Bl]s,\?F^[t7_n&5f-B5t+K<jb9V@"6S!uKT
+ C76F]Bj)F\M<r-/.(;e#g&e6X[cAJore<n+]mQf,s1UuU=*Jg+f[sTqFLk>W>-1]q2)TN)q
+ GbXMMaKkZrQpZL$1?@(TsluW&%Vln$`*m-6B?\WN<^67PJb)In@V(9HlF/gm[(M-CW`MK"D
+ ALDX&i^c>]$^G$\\Ss',2B]-Q?hJ1`@@]p?is4!P0@@U.5g"NuUGGJ)PEF[bC7kX[[ps@cQ
+ @6W<:+Gp[kFE,Qn-6gEFA-K7[hf.Y?THZV^s:.-L3l9^&*&!d&[?U91-kjZGV:>SaHLQGo"
+ T8)sFKdaV7/Wp#G;hnRKt).#Xil9umFXEsLEW+IdcR'!ctXLFn>i0g24^h'bkNl=ctKg7nR
+ f,pU&A"abXR2n*ML[?JmAS#GB<2p056=s(hE99AJ4PbOS?n)H"XiICX)UaS)_O:Gc[(.r@!
+ CA@Obl~>
+Q
+Q q
+125 171.002 7 -7 re W n
+q
+125 171.002 7 -7 re W n
+% Fallback Image: x=125 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 125 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!;bCIjXd(bQ->PfbQ%d`hPrAjli.PR7bTU4P#iUO*P]APj..p;<0-jD%GrflErM=.,cDRW
+ I=@0.G/6c:V`uH#):!?0>d:Xr\7j5!Pfs^Zt;B50eAtF5HA6TD(ACrr)j<]hM4)\Qnb"D/E
+ <SND0%'/PRN,>Cs$k$.d^=Anl@,RYm$X.k?T(,@os5r;7`K-fb&Gl/g)$J,e,5cR,8D@0p8
+ 23@"7h9+)$H\99Hrao(f/q++j7R9;,*AHrC8S36W,n6s_94`T5c7rR0R5VO):=0Yu=-LBT[
+ Gjo,3n`(`FiU_i9];NY"]6a/#l-muPmsj]ibObGiX^99Dnp7NTeH8Un8\g:OfD&QgDo(S\L
+ ]k*59:#ufXJmp5.hlQ7EHuYPg;SsU5d4s$q"!P%A]qT$DIH2)Ea2kj^^TACh;';<4<A@ln9
+ !R%2h$5EBXCZg5V86>"pW/m]#mWFC8um3cO().ET@DVZPP2#F`\%7E4@]B*n/u;%+a4EQtJ
+ 'WGh:%dC@0_f#7dP:\an_YrMl*H`koU?_*Kht:ORXY6,AnS0AkU"SUBc@J,O\0B?Zc2\$67
+ -2=&i;RC!hf#[dl.9KP<UMOYq53g=^WAq`cTT9n/1;.1Fc-8Q1>[UKllq%+G>`ns!ugU;He
+ (PaVFJ-\G-@A[75@ifQn#'kh`$JB5$[8j3menE&m8'/um4[$K<N@e^Qb(PGl^d-<(]b)brE
+ gA8mG.Oe-Q$N(>AE08>9>l]&nN1rhG,<U69gqK6%1NDVD.?$[R2MVNgtRaW5l@Qjda=g#f<
+ )s1]?\\-O2?i,TaE2&["0JI'qZ*P;(702d-JqdA")b#$ED))+tcq8&-*k>Dd7L10JMk[BU"
+ m$D:sr0@;]tFSt8`$lps9`Y)pX!S<QG2O;Ch,Cr)&VYPrhNnJhD<k@o"#aXKMNI5M$>Lk9R
+ V&*,XmeJ33smHuqn0^S0oCi!cc<k#03BKq''&8Q&,T/D*^gW9aP3NfOK<pV,WVKsZo1Xst*
+ ?!#WU?=&tf/*HHLm&1Lk6+`*Y&'iHT5!Gn`Hq'Zu%\\'rf'7B=MKr*f9r='PIV?#[UB.o',
+ g*i@"1jrr*!3u_]AQs:@q&ieT^?Z3JRV?;)h]ujAi#GOq-[h_)@(*_qgsmF*2;#c+b4a]%1
+ \+-kYs$[7gI6Im/S%(JU'@o%$Ltu^p4m9^FtG$6F4^Kf`JW.OE0V#;Ls0_hqjBY=T;H+o"Z
+ %%&3c9k'SM.TZjFP$@$kV?,f+N<?bm\@\uI5:HSLj;\SsiTr]C4W#cYVMaP1g(9dYZ!`eZ\
+ 8K$.d\-;_KgQGpl',48:,-rt0C5jJ37Rh8as7Rjpb=<8Op."stfpU.H*"O9KA@`t15OA<4[
+ Rp6GD1*AIX$uq^EL?UC]c&bkr<ngJWX]6bT1maLPs7h(q4.9WtQB-%])%?<$;8&P0j3SA"6
+ &X3ia8?I.+3VqCCB~>
+Q
+Q q
+134 171.002 7 -7 re W n
+q
+134 171.002 7 -7 re W n
+% Fallback Image: x=134 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 134 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<KIlPr'*l(#3_dEmeQk7X_CK8H>?*`.*8XURK>.[Lp'@$@#q(6>lB5NEWZQW,_[Sc$tkP
+ Rk*go@LE.+[h?7o;[.OA*PG@qOTlR@Ru'20[C7hOjOf?I/A,muQ)`rI'1Pml/&^m8>>Zqt`
+ d"h0RT%2V?G5d+nPlZ*BAIcr8EcY=mJbS8W+'-YP`rWo>+3Xg]d_G?o+c[]ZmM^4,#*e\Q%
+ Q*k&L@C2\UUeb*BjE4K('PC6Y<g%"=)fAbh[%NfTHE4u_j^<@'9o8bBj:!22_1!_Y>kF&"f
+ IE,]8GB8]:`a&l.e--'I%j#Nm%r[JbBh:q.PFmn'dP,k\(#c'uCj+@#4VtcDb-l+8Ed#dak
+ f6sN*,QX=Lj9uX@A[MNR7@qX,'`f'juVl\F`I64_kWC6WqQ2%&erieQM1:=b8TO"M@(>E;c
+ H``rr&+oG*T`=G+RMoWRa7_[L<O#j6g@:lt)\bZ#<Xn61al)[HnQFCbOMHU"nJ;b0Q+j&op
+ ,YiBLgQaQ5Bk?,ad"WN#[]._WNR*??re3$amf";sYr2TTpj.p(as.s]GpQ,<meRX=u*GLks
+ 4gi1&1USDa>B&`<74$#4BpeG0jc0a:k*;7A-]*n#mGXf.##!Vp_EUQ_]f970'30:=gC1d^u
+ %OS?#cSdL0F`k[<fuE.1.kSHlf_Fgi4cS/4lff:%Dso,.^RfQ.U9EHe2RZ-KR)'J$0+ulf:
+ i24ReQAQL?&?OI[3DBE>;H\I93aB)q8\Sd=]t]Nroib(;toaq/lkXV%#f=QIp^67jdiLNJ<
+ OLCqZQcH&#k=HZuTsh<uIr4N>_#$,$e[B*"Q6c^b^*ooBr2#&P70R98:1GGi%%"*$*Q`MoN
+ eML5#m82[%g1?N_CmE'A6nPeG\!lUiU19DmKT%BD3M&(Zj][d3((6pI2Nl#V0kTBbFA3mZE
+ <omSh]3\$_mf'!j*80jdp)=IDtE4WJ//=3h+50P4BAXMYV?+69t%2DU;cpQ+gcr2:UX"Dil
+ !!Y*:GpnHeX[t^'[mi(CprUD>XE8nt-%$sL/E`Xtf2a13AcL^WXSpNW<q3WHcIlp>(_Ht[d
+ /6\`l(FC*`9rVL\fJ/*2WI?H3o2U;e%$XPjls6)ZFeZV&6_g9=rE/:!g0rF$M-OI)png>FC
+ PIm+e_=[>#7LN,%K,`n(T#",H=k,raq,m%.jW>M%KeH)Wi9#E<s,OU]&pZf,9k+U.-rg9gd
+ r/,fPk,"G7/.0,)iNJaQX6%_TbqFOq'e_Roi"3>%Y_U[:5ndKLAuM<aW?pq1^r$NcKj_/_[
+ qM3!g["u+'\#CNAA0td1"o4QY*bMfRK-^54c1,ugAVr!$\_]THQ'?2J7%O$NE/D!?XI$un/
+ 3/oUX-P!7&4tn,j0XQRo[78]FCI9A!QS5&1CU(6c2OZG^i?i)=]J;2Ul>)=!"Ng4B#Y;*c(
+ 9aM@/Jpf9k1i/O94#cbheVCE*m94'po-+"oaK0<_8D&Tf".*4/Iq_mc?5?'ggku=5HdQhP6
+ b%qZSlMp?WXmt/mc.ZipAau(d%adq8,'RnrXNORaO%epHrR@e5XUU4t[<6QTAqb18Z_h;^L
+ .$q!=;Q2_27+92obbTn1_C7)!f%1kHr(3%YdL'YV164KN8:g?)uq/r&!q"cK3b=tB7;'KQp
+ GR=n@1Y$iXhjV5"ZW[g"^!9[&`2Hu<8Y,JK-4QlS;?8Kddd,#74<H.LSKSRIjSR>q0L5$%`
+ ]d4\VWn8):/EoS1Bb@70QQi-f8lt6"k]GIa#m(/N,mDScKn]fAHWS[T#BiZFUnp@j.!U)kK
+ */3[OKUR)i-\GL.r@,$Tb;#&e60ASOKh,_C:mrZHHF;:gt^idpE;F1:7Zu0Qf."#9lj#<jQ
+ &Qm!X&a\Nt8b3_YSEG2f0<>F@<X0WG!2[7%Lbs9Ns6KXj)Q<XIZi,Q.juFLBmVO6UV'QVCK
+ K$BmIrSPJR(db(+I]%NGIU?eDdr2S7,&SJH@(,$d%#)FmK-8Oqp=UWo%P\li[dH'c"93++B
+ mV)]e(U8+!Ye^nT*nW.3k5[kp*74AneAqU,1nnme&5;pJ;DK$M_f\naIrN6bTcP\rcd69c$
+ c9kD>E&\CB"3JY]:]O3as8<(?WXB1X0+Tfo+oN(B\#3=5c/QjEO.KOXI!R&)8TNmuA$JtQP
+ @&a$-96&IZEk]=+3pC-Z81A0Pr5GDE;SR]4YZutj"NBgCn/mM"`)_QC'<Mk)9eZoI\:3W?Q
+ Uma*aZ]XpZ.2%:&I3SnG.-MnNtpP^UeBH)]Sf^`YU<-qBs$tiN?GB+LlLmVtFs>`_d*~>
+Q
+Q q
+143 171.002 7 -7 re W n
+q
+143 171.002 7 -7 re W n
+% Fallback Image: x=143 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 143 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<MHVdX2'ZTm1"NUZJH%]-F#R*Xe!O^IGU4?DOK/5!c5mtC4=95O[8>mp\O""NiTN+HXYc
+ )u$U81*V>I?.e/$2XEJnRFr#'l#],ihBh:RYu+[F>/foD@_;Ic#?FG5'i"_#JGR7n9DbDY7
+ 8Fnt<8XIXQXrV+[@:27Lni>JIc!Ek:[2=i9@L`pZP>N*qL+\:fGdYo(Gn6"BB6X8QmPUB:V
+ \aY0I<f&Odi7&&E&gVr^Q(PT_IdEuSNKu[83q_VQB':Q=I8Zmo?d/=-k74#"CSrJ[pf`e&\
+ /SJro95?+.l#1K!:R4.mgm".,]kPqS!l<ROb>0]r>e4</_48KtZQ`:qA)lH;M=oST`-J1($
+ /R,1^;B6i&VY9m:kiGdTFi9nS=e^5o?[HjF%oop=0#DhLP-Z=o?3U=.%2'Zfeq_ODUo/mK.
+ EM`N<m%^+1NVmGt&d@(0KqlO3)(G(`.DlUQ;YBVn`1BSu`bK]^tgJ/VahdVkd;*s*f64n6m
+ E29\6`dS_oF6:L:me$=obcZ.,XiNW"lSgsqg1o8cS;Nlb9u;%:-\>q[ViW2q!(l7u-V)]?I
+ jBWJ)AR[$mdEFW-Jclk?W[)i?<C]o.O4`_L=B@(Efb[Z#Ac:j;('qh58_ZQ)U`5Gp(a_<t\
+ #1)i8_h[Br._34\`f9Dt\t=k;C:;'I"c")Unoh88,8j@:/FpHQ\gc]p$#che&M7q'<R_M%^
+ qnW-bEjap-R@P.EWg`Qgq<HW^Y_.VX&KSc]o1jOj_)Ln1J5O8Ap_`t[,\?#-I&G1GGgn"a;
+ kr^e;k"$`=]3=M>$iecNP]6UFrBR[%9=:Z%JU<A'^a7-gT8s=^U'*GB[7kXa!XhYnc$fqQ(
+ ;j`@PM3qpW<%U"\j(NsQm#CB3B&4sql33G+n%6qKep[sO%ecdrW`^FtpEnC93g*nTXU17<0
+ -\Dt2eMqO^EIQ)&ob_.C2Zk1M[?UgRge]f9?7bHe$,LnZ8na-sY,LJW9BNG%DOkJaLMN7Q!
+ BZFDt-;C`[#C\C)QuF4$?bFoR2k$'KAp[pWeQEDdZOM2s+H!oO[3ZG]g9nDk.epFoYCA.s6
+ iW[8nD^0q$g'H=#QYV6@p^TJ:+,4;PLI7AC+?d<-1+A]6mF0B))Hl8F%MiKBp_19;2/PefT
+ ADBF'ch?8@[`H)ej=?=5?D'O8NH_mTU9k"jnGLU.26+aCN`D,HW@Jb0Ya[s%[0h!K;%E^H7
+ NP#L[0Z*cQoL2h</6'=]2*ncY:UJ2.h6Kh2JU9lji-1>tpAa/.U7[('aA8N;qKcO2h1&Ifn
+ 0'?7J##mIb:T;+ia1T_=MjuGm>[n[0K3T*X0TjD^eG@\DFfpnING8H[BNJtgnV,:Ff:9\7b
+ 7WHP@-_E=j^2_C'>-9\3dJi,/BJ^C:cRKYlILQ"kT<D4,VCP]N;#'mcG`GBX[_eIsAjP\*P
+ HeXR`c-dt1cBEd9!CpmIug>89&8;4I=6k>$""q]gqF6Bc#BCVQ^jiX$e9L3lR#EUYcZHA1l
+ VYr4u%?<P-3ateIHa@c`+MF0[7l`R^/-gldqi*",;OW,g0`Fe-+=POIr_;($ZS>lCFL</EX
+ GW6V"W4;3]p"),$L,ZIH-^j";qq'VsV+VuPfk]iY[p/Kg0L8B*6]X+Tt`fXDCBXb4+?"s+:
+ %foC,U>,J.MR]`rl]`^uoQ.gtp[@9!:AI9tn#TG\;rr#Yj!VQ-4gH-R(E"FKLTs,)+;^!Ut
+ JqLno)dK<)>b"d=G,#NefjrZT'3I<M.sT>h'_qGg8-hURK1H-#&&Yr!J@fY^Sj%j,V[Uo-\
+ eWetJYc#Uh]I6DBmlj.4^I.jgu6kUL.l">jX-V^226^5!!j$f[;04*2TX0%[#J:,5+XlfUI
+ QIf)2(<f#[l=@#RlC^DeeJ3.0F2'ApY'5nesc*s+R*>&5LOB;ka8'I(mE0)[e`O_QdUtei"
+ Zh^Xf6XY^8;S-,Gm!L4)F/`(KD(^1-n"c^+eEKEXuc(A8]`&gqZ*"d+oO0j;qkSdm,C)"-$
+ @:9_/Bb0$Be(lF4/i'GH+J]nPIhR(\daj3A3dTp)RN24HdYf'+<6:#Ll6&ZR9iW[,5d*jco
+ =f[7=&]"DhfXt0u\2efs+$CV4mEtVk;"raDp2h`iE_hOU\:apJTbo@p6p$.]9D?1BIfeJ(I
+ +/~>
+Q
+Q q
+152 171.002 7 -7 re W n
+q
+152 171.002 7 -7 re W n
+% Fallback Image: x=152 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 152 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<LGu0^V)M_*(G/B](83mE5WZY,lMZn3aCKXP'Y[UlL7AFN&<s5M(Jk?VPdAoMuB[Hl6\O
+ )4+_DMUa[TA^4%b)\1#`=/R&jl<R]dM7E5b7o31XCH4be2j)rQ]c8R02sQ)uP8<QVC1;Cj(
+ #>D:b=?c`4":rpW8olW-qeFlVSqFbR6i9CMY\\E8:;G?V0,DQg#*]QNOCF`gb[:!^M"gr@@
+ -p3*E#TPj1Ir:oH]B5:sdX-h,RIJYL;m:'qeIX0E!gq\PFre[WS9L%h@Ng%1+rsji6g:71:
+ QE]p#4";,,gL#>J-T\j<fWceM-'PN>X./u))qdeS2a]s9D;87QkP*5i2.*u*Ai]Z,[K$/d>
+ m/%l@?4+q_^9A\.,1\RV4ece!>ehI(V74c?FR'g0T`\R96F4`_jm6R=0MUn)1T+X/?CZNTZ
+ G%2_D;#KMnPl%CtiM5*CMt,8B]^P4#P!#o6@-4Gd7eWm#mV;Y-(iRI'=C,IW&iRT@W#]L@f
+ RmE&B'-P+14Z"kN58ehCc!JrLC+oa3hRMPd'dHkg63&S"S^Yd2SrEr+)-n,(qQfu_?so($b
+ SKd.i-k)o(L]O[)po4u,=njZ/@^5GYHS@Jla4LaU0HY[1PONWuR/#RC=bR)i`\DNC>7^Ke<
+ Cfq(8?Hm$?.<i!u]aYE[*`(TSna\"#_1UW_hJ>/k!jCG3.p\2TR-rT"$mZp6-0AC)7LSj-R
+ cT4.:WSAS[FZd&CsLce.1=p-HR'Y.R</E-5[0_"E`1^E(`jarp"/ALpE,pK@keI!oN7_Ba#
+ Vot`)eJBM,ZMP[F%hJ1j6glCG`?*kjOA)Y!27:?*]l<moWU\7HHdM/"X@H,Z6RZGeA#KpJp
+ OC?]&`+B;T<gmu=X^fP2DjV3ATGFNXf0)'R9^$],=1>(seI7j?2:J*"9?E``D?9MlW'_&.s
+ F*upM<,jK">=#<*)_WcDl[J"?OhC7>MVY.Z2C>(/n@N/3."hi>QY;(?:#\-/:G1O7`DfgkF
+ )3so8oJ_+lZZC$X5&(mnNCinmKj:cu^670..8'L%e;e>7?K_'2R'rE/A?F^6#L2gb`"jrCd
+ m/Mo9OarR:-8#P&"S:pj-8@-'4T`P:Mfkcmr6O9A/5FOL5^dBe7"@9]+j(?5UCU;HRn``.J
+ b(>a@J.I+l_L(>`>]L;&R@hh4BCjFOAI"jLpY:fGO;>1+Uj.+#SFrIPsPh$rJ+T&Wr<2,ZE
+ p%5q;^?bOKf>UO$1"o4Xn]^G$=`KS'%p;(&Nb:D<BE#kd3N@P%W&VpRtD#3Z4s<a8!\:JK5
+ 86e&/nGjfcQ2>T!`%F,r6k8`LM-H$sR_>m%A%HAcKO9-Te1q;L*BET]\&-e(!>T0lrN:`?(
+ m[fTc!q-hNFL]$Tnn\/f_kTMH@s6Fe(0$lfmY!JinCILiL'CLKdGgW5nSBcPCYa85N7"A)?
+ JAu[pc.2113760[(X0"d]E6;OsiA3dV#[iJYe$3/>VJ8[7FbY.dB)OR4-V7'UfpG4tmeVEY
+ 4"\:1e,FlgDl@H=1+\Ao;5u)M47jW2WX+T98LIQ[4*325A8&.8h0\M$?O0b=j,&[5B36H4m
+ 67bgA`Mq'KfjMY'+a`M5rMfa1"($o=4XCc7ND6:qT<KIB'*<`1?=UTMlgb=P+@/2NE]clgG
+ Q[,h)[b/K:'rr1'-6csu^\9f$rSBmg9mcoC]$HUJGfN8Ch#%qR&2?lO+>[Ku9)`L/`%3/JO
+ >>!;,)&k)CD8F6t%NL#JVr@JpW36H]D=u<(!EZG>acjMNWm#?u0Rl8gR*4Vi75RBGM=.l7<
+ 6Bl^M-upC`6)!:kQlWd^gKEB.cArZ<A6Hp_q`tG$Cm1XHhXPaX&jqe4a^on?+`F1D8EQQ]h
+ rF9q:HlA^>1"'ZD@nuJPLuk4&qK`YurUp*hHeXC4aZ'Ll@"k0U6q>3`rcs>ZOBs//L8t).1
+ *kfYQ]-B),XNm7'=GkHAtC]DY+UjTPYcY\b=I6pPcJ'Gmf.KDK8!L3)N#/e4VM<)X/6L!Mr
+ 8T_4K@^3mNdW3>BW3rWH(!^>R[pf+UT=L!!!KSQW)*"rG=ktkCb1U"VZ<j8e>EcN9a>F#6`
+ EB'C4:5YNss4;5Frr0eI0;lV#O"c>%A&hL\KP@FVN!q[e"tj/2r-Xd<Y&<q?id1Z4N-HP!K
+ 7In5rdK+^6?OQ#T1_3#iocj6N]LGi:61(OOnJArE@%d.#6_g:k)JZEbrUK,a74YNO*l!~>
+Q
+Q q
+160 171.002 7 -7 re W n
+q
+160 171.002 7 -7 re W n
+% Fallback Image: x=160 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 160 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<LCK+5F(5>$TJOI@D+Bi_XVB\dh!0pE':n^p0MW/TU<`_utXeK&=:q9"2-qHc<>n.4L*E
+ +Vf!htua6r6;5>0rClTLC%^+:J;]EX<mJ_V)7?X/lug2?00=r5a3Y]AMt]cT,>4I`J(CB?t
+ mmRcLqqrENLY;,QkZXK:g3p]%s,G-A-_mbIIbl-3G\b%X[<*NMD1.7GW\Z0Q+(<DR,bIigo
+ +CUNeFq<cr0g"G!;j3(qA8pBXsmc0?]D@rGq(m,UKQb>!teb;n?DoOVhf;@U4`gtp&=hH&f
+ ,V0B&f>Q\7EH-,(=V$FK2$sLM=]SR(.?RjN$B%5;o)8J]qtPQtl':Y@DP-6\?#PP:(Si2.(
+ F2e-8rB\=Y_W8AT$,N<rhA?/DhZ%I#mp@&;U*;(Y@fJKN@ba!$J)DI/mEL(i0!1"hCcMjbU
+ G9&HNXZ;Aks$(PSD:O969h(LL?7obNlgU5E9h;-K[7"`[*Qnoi:[9"'6]l$NgM2l03JHs+\
+ J>GFQM$+If_QQ=mi^:JVX3PQ$D+G`pO&L]8bfB0eeueVK#CBk]QrPDT^L;Fs[PDf'>A.;?r
+ L]b)?I$i.ZWj.O<f(n4Np/L+;"*#"^)dWrkWk6&ok(u)eGSF`YB$Q!+T$)uRjqeg:(-?M1'
+ kYs$Xo$Gj`>r=LAKnX_K;i<SOc?!@&TB!GP[H?pi],!-HbTh>rr.X[K^KLImQJ[.,*]bs%Y
+ j(kqI4YU+Qn\%!iIjZf:KBT-hY5rZXPu_:OV8PJ`&UKBmG\%%Pd=q\H+FsT&sk_T,@Hc2RN
+ E5HKhAkuEgEdY$N9Tl<fX9ZH@JT2OBes?l0-6hTqUGJY-,coeX\6>N&ZpdrQ4JQmr,YjmDI
+ (f0s.f/STLA>2n`?A2qc4<R^_7sMQjr<WAV6^SIKct5rgVal1O]0$+3r"4P\Q^F8`Xbho+S
+ fXHH!AUP%nD/S1R;Rl8P90;bs!!sjt8["MEjBQkk^s67@b$2NT@[F4Mj>@j1P[uZuJ`5);g
+ c#c],=(_ic-bXRPgh$LTqrF$.T=Zk^c8Bmg,icY47-9m7,[artl:/DHmER.P5"@Cnbl;_P/
+ UA*S5f\J8c6Wu:O:#&elp_?]9M4K3L=tXe.FFLpoe`V?N`C:$i'rTo8\$'[As8o+BlqS@Ql
+ UI(GFqZGGbk$DUi?liA4:e^7#.-Bm1cLl5*%Pj8.D1jitm'jN`5nKA0t/VOWLkiO>_G0_dB
+ Ylce)dTK]q[)a\1.N8-aHI3SUZ-2suPEjhU4@VK8nS4."?4a,jMnoPmS$As#Bl&4.d+\8'M
+ RU`Vb+9fffnRA#NfVajHG)eq7g6.5aWU?HBHAET'Sl<tM.R$7KI%9m7LWh-aXL>%BYE3pQQ
+ O5IPo$0%Xs:+P$>kqE.qCl0u/T3o;8\K$'3d!qI]'(8Z2l`K/,BcLqh*0uK(d*>l76d)`2@
+ <K;JB'"&5o_.g=-e.g3qT_k"mg%mn)1$Verd?1HV6Vj(_F1u3SeG?6]er=#2V4BP->"NuJi
+ Zr[ZXiTZ8>s_UR)%S@B'AFYj&Ze&18q:-ZY*_8*\&Fg&dTm9%`N$S1<oG"PK=]aW1_GEcuV
+ 12i%9S2O+bC,RlB<H+2Ra)JC[c2Hl6sF@-:8j$j8LJQu.c?H:sQac.&,M)M*bl>A%fL\!p+
+ &\jAX^`5W^A0ql<&N/p$0GL%u4B:hIhPTb>B@c5M/S6j[XB!66Z*j_=n63iddp+!07GSE3d
+ *uSeV`<<jCnSt>b\iMfj![JE2[LIh?@)WJgKtQZEFl=iXG8fF[#O/nh3:+jj@b'"o>/&eMh
+ n%@bHi,j.\H68N7`eY1OHBRkd3'&fE%q(`JsR:]A<D&?]@,`a@J9pYVKhtQW%;sj@MM&,<u
+ _&ZI:VQ\YmUqJFOV_L\f-SMKu?@jM]k2&KL4=qJI2_1"SaFsYC=%5]5OfIs"pYWqC.!u1`P
+ ;D6ml:fFsSD!FuEU:"NGqDd*cCU^JkPcH#W*eA7\&Q3gH/8:.ZG])uCg6nitSK7J3C,3`a]
+ ?9P.lTr7H/W'O89V[C%gZ+Kc_lQ@T)#l\"BHTsrYCKKneNGKFuu*U6DQ\.K`re?R``9q`7!
+ fS."kK8+qa*RDLDci4!$Rs],~>
+Q
+Q q
+169 171.002 7 -7 re W n
+q
+169 171.002 7 -7 re W n
+% Fallback Image: x=169 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 169 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<LHT9ON*ll$:0f!5o9S8MP,*,-YD:tbMI9[+&.["Q"<M>Fnfpm'8CbFl^:KZ/Y[)jPX`$
+ 8ep\f=n]ANMB!itCI>lX7`f5Nh?WG*[FI3WJR:Gs/o,Ie3BKIdcb"oD/=hi%KAsA[:9]0Dc
+ Y,]BedpC25p"h<V#@HsLpi[p)kW75^./f%0$_glPUH_#=2BVF'^W)qD'eQ#A-%3if<n\D46
+ u\t8fn#G+)JkjDbnQAWX7$47ima4Guu<J?**"9t/43HF/1J%euTVVAT%43sM+:HiQd[(n]B
+ `&&:UjZTLK]oSKUq3;0f<!EN^$Os4tN,6e``(sNPQANTU@b$;K[gsH,G'C^`i/hkePI4tKn
+ cj;uRK(C:VZVof0h7440ZT1Q*bfpOhV:2@ZX^/'eQ"]C+r?SMqtAu&3*TU$l(;Rj$k=o[n[
+ [fGpu@YlBr4qYL2Oj(7h=n)Gd,K^@APU7V4I7<?>'Jr-dh"uMrs/'Ci,(n4E,=Y7)Y:j/EP
+ (g8UGaYe*QFn3Lk,>s$A*2M\[(bqAW5r\fK3[Z&>3ZNHRaASbhH]R[bL;^DK,g$q%r1X]o`
+ 2hd:Hi<)ZC]CJiKk`l9;FPY1KF^Ue]s.5_iY)E)5rR%.`V*i$>mW'sfeEm2UK'l6j[mBeG7
+ OSW%@=uPPdFn;]:9+N([LlMB#Vk7oe#@G,?RZ5.L(-EG[F)u-6,79uI/f5Ksd7b$K4RG_tX
+ XDoT6VeH$d6h\YVAJ@h$0p)P9kL!if!9h0E?mYArP/7cf%I$5``KDBA]Ys1Csk2EJ5iiq@9
+ R#a;ibiqaY5&\=m38F<Tr,6U]T.ZS>.!/nLHP(ZLb^BEi/Y1IU?%&a0mn_LC[#_>!>)/376
+ 4HQM[?C+$!DMcQmE%%G(&jVoMt=$4I27%+M>.L"aenjUTf38!q+4[VP$NTX'B<?OP%Hg=gi
+ @ht+n/Q\snAl"RuP7+^H8[22GU^.OBm4;FM*^/O(/7S9($Tp:L!/jMcK)Q7R+\UGJLhjY>s
+ ^,@[i2<HeE\)kn`hS>57a--c3$>j3DMh6jq2<R**S@8?n^Ho4G,N0$<X2^q>9gXmJir@<*)
+ B.3T52AUUEMTN0Yp)Qda%&4%VLMlLOS!(g$A/m<:e-/=;6pS?CQ=;(URO`/]+R9)UB(u?P0
+ r%dWee\^D/Aj['U<N#Kk@:E'@afcDhprs=JZ-8NG>6?qWP0bHFO/:iaspm>C7%?KcqTO"t.
+ I'Xb6WOHeH1'dl#K6,*MjGZRVE^GHF-t(aeOp6s\!`#98nWU^D'i)B*4\*\Glu_3Odh6UUV
+ r-//clIKeHds6,R$ZA9M066DaPUlL3"Y*+nI+h7ZE%6oc*5-!WE_QXf\>FYCgS(t88V/NUG
+ o=rt/R2MB^KO:4&5A!Rmq+oXHnNP?if%/cY;eB!bU;]][8?,/ACXT(]ZZtepBD:eb4;Tf!p
+ Wh"0OIX@D\N-L+L4KBhl2pB:EG?-dLbJe79lkVAF..1OPqkiV/85Ooa]-C!j]$ekQGCj4jQ
+ a[E$Ki42'>Ac=n*c%:YpF"M%,0IpaV20j,`ReLG^>1j9I3A,$(WPD<=tE#;C+,Q,c7T!(sB
+ lKF_,aN`PKU6fiaJn&#$BGqYHMFV:'X+<>GH$KD]X8jc5@A[Xjr<P:r\%<Cg"36+58o-P9o
+ ('e*-W`aF=^V>S[`Gs[*&J!_<@Ji@V4c1UaKrAl2O6XV%hgOl1C0Gngk9nK]',7>rr5>WX4
+ eL2Va26d?kb%-+#-2@68LBDgI:g")V/PF;##ujm>ji\2S$NU:dj94W-TYF[=8k5\Za_0&"[
+ A[#R5i]*dZaq[L<j.[jfjJ:lhVJeZ#&.dJ>RZZ8/":J4J<Z;oK#<A[fm,c<RAn]S88,YJL9
+ 3PBL,GiYXZ^9pa'6aLY;6bp=Fcq_m,&>i_%7Cf\[g)6Yf&(.6[h5;`5&Wfi9Lc_GJfF]nAX
+ QG4<^3G:N&'-[kRZg^]obfkiR"d>;kt8s%I6G4hneGHfnHK)@G`n:gL2n\ZcVX&g0:V6:0h
+ XYi!W&]#Rh/k/;>G)r7o=BUA,U!m]OjFurC/43umu_J/NYE?;3@MLt22W3-$i%d)h;<n@2/
+ iDtCL0E$pKO,fTd3][+Tcj'_e63a4&`oEe*io<Ed%,Sm\%(LCnIatr2c^u`&.8s/!3XWdB0
+ JiobK7Nt>hY54jH6p8\U>AX2D[0W8%mG1Dht9V<qdd2F^LF\oh`*@m',*&]$\.F$^RZ$b^A
+ ~>
+Q
+Q q
+178 171.002 7 -7 re W n
+q
+178 171.002 7 -7 re W n
+% Fallback Image: x=178 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 178 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<KI5KI<*l+C&1Do.h_Mi8RC`+g>,H5fcXKIcs]dPOF_q(!;8lddS`<pf*X0aHN_CE"^U!
+ O?sEGF7`?F7mM+d'D`#/cCF1Z/)RcIk36pN5j'qjc".Sb)c.ch$s\^Ye5OqZ6WfL3R<B\?5
+ /KmG#>!brn"'FE=uGC2;S)l5irGn,LmVVmtu';=goa-7(5[)Lj>WG]K5,;-hdR=4bFQ^2.W
+ ()uEfB7Xk5/nEujYR6NP#W1]e<+e_(Xp3K]f[68l:56&8X?uP#4K=Tj/':rne*Z6F_2Pcr8
+ 8Nc1Fs&.bk<P*H^gUm3+FEGEo6ar5BT:A,1p?\3YH*Y3bDJ!L'B]s#Ws,5aj-0s-QF*>iOo
+ LN2p,JbupdQ6nkp=J9iA0oW]j,_i@O`%ocDoJVC/hWtA*g_8&Y65'\KSSI2aVef.qk'5tk3
+ (clE<&6#q3AJ%kM+a(IcQg)BLb$<Ad:J9McoaSZRdCgjscFoa<[gg=gk@=*$):%a&<ohEV"
+ T5cb=h^?<MP<41cXgmU&7G(Ymg:XK@O>ruOlF#bW4;L].g"WPp>L%<?YELcri3G(SgtB#t[
+ %`\hI&9Phtsl`@*)n**\.$R[:4)]G<6QJP2)W=B4`G'2&<1)"@P6Oe3fVL.*\>d8r]X(%?;
+ W=O^SV;_,Y;hn:P<b:UKj#Z+-[T?H#hRklIk)HrT1d1f7[C*W\rn$VRYDLnUhUV!t;u/f&8
+ q1m&>-2U!To"X*Xhofhk>"_.V%[s<qJd#2_m0^j\HcVa0l_OK4ar@==#WbTK!ETr/:Uc$>'
+ h[nXCjd:CLs<(mq1CZ<Y:6lke7r2O,?AZ4"d<bg\(7^TPaJeimf?EGLpoaSsEGem<D^aguP
+ 9B=Xk%Y%h;A,oK9+OWCb7WpH<KFH>Am^`("L=4m<<+cu+g=<%nW>SB0eU#,r4,OOU,]chYW
+ 5Vu>7Fe&:S>jUVl[B4oc>o.h19LgYW.pUY_';G0d\I1pN<\W`0BY$Yj0\j7RRdR.M:W9C?$
+ U%;d]>#3&K:lE4_b@C*eA^l3Rl1qH:668q@kKcdHlK4_QH_TS37+Kmqq(_U-_$nTnK:EZ;Q
+ 'PSaY`4SEIkkem#-<V4cFTi97d6Tg*/Rs`T"=aa&,U-B&p4`e,n!PqLT&0%<@pT"pppaeU8
+ &2*ifVTX$7ZrO7r<(l\.nnS$sg5+='=`',Lio[]GEplJ9P.jHe=Aic5]!DTjAbXf0U)Y&W&
+ 4V1pI%'rs_-jF4i2ToXd:*rr6T#3"F[W4YoB0(h<21+,uAEOFUjk[*ag5)PWplJ#mp5MOkc
+ ^?4%U#YL&LrTS,VrVA#SkB_<2TL(+D5pdMc-P)(@ha]4Fa#iER]n,btoTW(s&KD:$nl;:.&
+ Oi`."LPZ=NiX3!>-A/f!*:.8g):Kr/ds>PU(."f=#*C%%C<r=d:+s!4J$PTZ2gFn8p=.pQ6
+ JTX<1SED>+;2N+!-EA"PmYnnNaS?;^kOEr2\?s*Kt='?/],/t=\9j`dI[SXoJufFU7`NYN)
+ W+1<AFJ]$k7c"4"I2qm;VM8'Gec!%nJfG,aKOnBSI/"Y#q/A+Wq4MIZZN[U/)Ajd%o6/RBO
+ )QP9;;)OgVVaB.*1n)Wn"J\9f$lX!'8t*Yp)0ZW_6]$@7q^*O:X",pNu^l=N/t2g)N><5!R
+ SKm_];H$#;Kj@T1?lgWg5N/VG;a2`bSL#QQ4:57\7E,bm_",mZOp%>*pD6XQW7kR]59+pLR
+ L^g:\A#";b$f'QHcQ5&c!m8][\QMd0on!-=QS1^D0#YfJcCNnU#&H1O/S+!U+uA7^I#\U,V
+ GuJ&SVE%R@PMH&[c$*F+X)r3"D?#qeZ7'OX's!s>dsb_.1d-pJUr]t%LulZ,@.rQBZ6KJaI
+ '1g)cs;kS7g++gT]l-Ch6@:Y]6E^c.H.>aFK0biPc06oACa]5-9'eoCDV\0/$G6#+SadSK*
+ <C9;_(mO"Y"(@I4$0iM-_"V>QV%kF=c!\[oYT9b8!AiSfl[!/6-Rd@k!gh/`3?E&\4#^3pP
+ 2$3:1c[mdT6PJCi0jC`@K^"/3g\W//mjSmHFF)$WBcu5s!-Q!U';,Il@#KMiR'$'D0h@hFg
+ J@n"cb(B8-83JRc`gJt.2j"q?S.I]Z,Va&taSsS^?h'.($,/uniX04//+U[,QBaaG,J8K-@
+ ?sLdImNiL7n4:Oa!osC%(r2#n!!IY'YWcEoVp:km-b\(mZZW6GhMSj@LM$P2PuSoO7'28rX
+ 8$)I+e~>
+Q
+Q q
+186 171.002 7 -7 re W n
+q
+186 171.002 7 -7 re W n
+% Fallback Image: x=186 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 186 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<LHW\bI+32]FN%kNXY^o,GKFl'U`?=r0=E5&e6necd&<+,%>Qbc]+Jbr@/0uU=;$%UJO<
+ Q0@LPo_S65_9O?j'/"mP6\.m(Ur:50s.94oO8`?@R?HpA)GKqn18<qu&kV+!-=r1S\5]6Z$
+ ZBc-6?MNVteSp=@bWW2]6c]_PKO@iM>Voui^"n9*25QQ,?oh<;CqSQfIYJ*YZN;q#,IbOD&
+ a'+Z0WKL2d21G8Fifs=DPWOEKQl=4>-7Rktqfi.nLLL4jn/G)[:`:NcOc++`fH=mt09BGMr
+ YM:/gI<^!B<7Hp&pkIkjp?_/'03t#pr"uJnejAu,X=?4))dhL+gtbVnS5-9Zb[0miMJZ%G<
+ EbVe`eRU](OU%_PeMJ4#m^JSa,M'?f.mktDuKX8GON9Ad7;:7bb'CaKBJJ`CQXb:"pC1%\X
+ g(95Ap(1MT+uo9G2QR:'<6Y[PRM^&8KGGD\g=#nh7@k^:7T=RA]4l]6;`F`?B0UAS&&iT&o
+ J`<)hX5FUFsrCa1="=^#F)\A^/r"OY]RFYCBp/_.'o0/(OWJ!0?1>dHAI*?<58]oepf2Z)A
+ ,o=`bYc&I`mQ-iCqN>oWP3%[X\e:`L>3'6:B)5Ss,fg?5Ce3:U4<5"`F?%\'d`U,]8d<bd^
+ %IH?g[B8rg5rj-''_G@)n_2_6VP^T?U?Up)NfLib3b5jGDa]Gg9<S9"r=mjK;Y8`=+q&AE"
+ PhI6O/qssAqc@kUsX#)=PHekokR5aLg1Cs[Z91Y0:n`R.SBnra[_Cgg\cH%Uc.XKZ$YD+j#
+ <b*G5.6Lf+Z;-J1`24dI93"@3b$c?.>6PKD4s(h91ED2.rJ-<;etC7E6dHT>rG)6mBIgaCN
+ U=SRo4:#P-/d`h]%"Ke_RF;[VlJf*jqu*UknQj*l%".LjbJfP_au]0>;VcpQ'U9)=uoo7r(
+ _a2d:N0ihF+PDKGEiTU'?2/UlX,m@L/PH:O'16;Eq>&$cJdg%*Y?j]1'PDJ>q#A_Gh55M0A
+ 0MTi5:+V7CCHh@Gi6U5;Hp0<ePfo1sH/<IA0'3(1\?@sLUF:#&:'gHqL[Jej[;&D*?.sg)!
+ i"j/+;hTh)a^k]L#YtTM)8"(Id?("5Ygj##-8L=&.9Q#$p_!BBO)(I*C,<1\7uLk)hS*RJW
+ L/U)JJ'n$IEJr)XKcO)rR2ci496)WscpR;-U%Of*AtMi)_`(UH/,.2:,b7]'8--Ef1\Z!9j
+ kf/1>chrk.U+.Hk/j*ZZs50?Q8ITRnm&k\#K3$ih)LT^tLd&qC,`V1B$XHJln#0S!ob&nmc
+ U&":F/)3RIT1<^q_=nk/_qu@0bY)=6sJghB;g'[m1%7IEk!IQAa5W*Z=#SZ+A,4r-r"'DOh
+ >pk9gjYo)pWiqunj9S!&Dq<3[_3?BR7\-:c;%sA=*thmP,L<^gKe#m[gmj&&&c<#*_Tob+o
+ SB/HIbktra2.lt*ek1IW[]Vm%ONe&HAYal93I3B4c5%h6r>A;b!_an7n_(!M+ilHDlj]A%2
+ BVJ>\n;B%h9e%E+qC$4s+rl_mVJuq,quZZttqqCq6g6Xs_[A91]9^/'8!bJkV?TFJOX"\\4
+ Or-r?5OQ=$UjG':a:4ubL17!W5C[^X/S.[ZEp$4U!PE)c)f6]/<MMl7cVPrNp!QkmOf8Haa
+ UQ9pq<['WYTH)VDi<9MT.)B.PIHZ3S/M=T,nYc\IB]Ef#iL-'TG7n76#!;1%5?&FT8,pa3M
+ =r=W''!rGn<DKHmXK8(M#E4[tH$QX";SDCmY<'bb_980RIQgG!<%GSl6?@3]Z<V9`-t^mD(
+ fVYG8"d\K2J9r>XY>pPAu]+B#'tX6IJ[Da-G49uf%6st`X_Wp6&%0N?u.A&%YgH26$/$UNU
+ 1cqd7P(G"m_Qoo-K^BHu$(a<E<RU4,&k3gp.*<LVj3!eAeXrJPVjg;=<h*Vbb3`";h^OK7]
+ b_(NaYJ:6%)"#LPRoJV3Xf)cflCLZbaE`F$AlI`"4ggWiE8GNe2p6UG0S$tQ\QBrQFUfYQ[
+ dF6D$r,B4E$=I;.5^]9f&QA)H1q*#`FIG?/+phlPWjsAfsFYP:@JM\Sr@=5`Ao<Df0]Nj:+
+ Im64/#8S,n1M>4XJ]b8SV&>'NdZ^7CMAn\qqt('U3pks!G04W%\gSq1ET.*P/;-G\l7gUW[
+ C!`kaX,)-WOeqR,\fPc"R%(eef#E,53Bt4"-Oh1LkhgVOZ+[/k/j6SW)+A3+!4SA3'@]S!q
+ kUO+!#h3me(t2~>
+Q
+Q q
+195 171.002 7 -7 re W n
+q
+195 171.002 7 -7 re W n
+% Fallback Image: x=195 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 195 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<MCJ[r"'ZZPn5Ti=F"B6(&#H>k`$=ZF/=pqd3LdAk;"[O"o6pVN4BYgR#+qLf-TXGsY&J
+ 7kS.Is?6:r$6d<Qe$-Gc3#*Go6+t4l&Yu\M0S'GN\_ZcIr6sp[%=YHS<1Hg-u3sJ`c)ZCMU
+ P_X.N?jFHr-i;,[6p;;'c`jc-g9[FmE[g!shVjHkJhhl`3OQ/'/IXN.)^lKSRW>5i8T=3>&
+ akO+e-`oQ4'aN0iZ@AQ&/>hcj_Z>[Mh5!(RP8#Ef:o3@@G>SGY`Y)1Kc7fM<Z;WR.nIG6Z]
+ 0+SSsgqWl4C?jh0=/8/+ft$MHor=shX1l<7]Y*gjgiApU:H>LMq-\'P[9plL@G<Bn0u4WFP
+ O)SZqiLIeWCtg4EH&igXM;,N_c8q9lIa_okKZZ=a2uVVf$lN%-/At?a+=\7empj'SlfODS*
+ qE7g$1d`L22/Nj(4`Aa]?lh#`epnbKnV=Q=R1$Omh7+m-e9n&b2JR%l?0BR[*OZO*;g.pu8
+ l-hq?b^E#(mgr[a-GjN6IE0lk?SR9p3("(P&,+#RF#rN]u<>jdZHU%Ng4rLBDGW[bPM7!9V
+ fD/CdUDFmX-fXhqM:G6%E^bu^5I_(B@b?6@?9!ac+.dc8g1ICfZE(MnFS?]CNo_-9dq9,a9
+ m3O(W9hbtOK^AW:X%Q8rs*K3D?!Q/2Dk@GRgI$:.K='IcC@8R[aIRtOP-LpT>=[Ea9OH%#Q
+ uhNp];!PWe/pmPW3EM8U#G+n`sSf1lob:>.8ILMXSc,IM$!_5a-XBVYZLTS!aN,GXXMe[d:
+ 4piPUiA@o)nX`%[nqE>JBfOi1>[5)-rNX0-3<qeZ4qXaj-X>iK;u'6"<Q9qYC%s?HUE-&Z.
+ `UbU=k+dh\2%)+[$TI;7;&oSh%Lq]b3@4R*o2.?o>Zbf.;^?Ut"iKL8+!KnAYB'8aXP,L7E
+ Srg[8_].6&'j-UBQpc?<'#C:q=jfU3SRY65u@Q;l7jZ43j=PrI#%mAnbF"nm!cM@%I[VkX!
+ W2_NW@a[%cjh@2P&(VcSHm.5.gE;EX2B!TVf)9IumA>_0)\#O>M\%[;j.QqL`[XHt-J"O"Q
+ LV4%J",GaT,h97[_a-iC37hg=m5j4<+1anD,>d0.[u?bnFEPLU5?g'N)6u$]"J+"YXS@iBn
+ 7aHU/l+f7^e`imU`)P3N.XaI\)<5n,kj-4nP7rA/HeZ:83f@R\3/l;)=MHYfmAqBq[Kcj,@
+ '^7/^rO_+&8me7jT-0N"GP)V..\1:lZa'D5fnXEgl5^iRnbBUTm0f!!)\eh`ND@8,o>dLbV
+ X%-jN&]'(e!,XdG2K@@_X4cMb/0r,(K.%M]RSSXaFCk_\_l9m<e$@b1$>rXn](&$?ueYjeW
+ c"s.0-@K-W,+cM_<&%<agls[.BeEZV3Z8t-\hJ'8ZU6o7"qq[8deNPWHj)Yrd+G#49G?e%&
+ j!3-R@-ZL9TbpTLdmM%h_^3iO"Onf&96i'5&h?ln!qH[/T,H,p@cAHQS>h;Tt_];h1Lk'+u
+ )Bt`E2200/mJn$lDmRQ;!JdTB;(W3a,FYT%(\\Z$_se>Cc'RMS-$LGjk^E]4(!D&+/a\<<[
+ $]6;05PjV!Ie&e"t1f2g=u$AsRYRPU5'UhM<#kXkr*_T%?"p*Se5,kCN![ME%N@Ht6$Ge0U
+ n3.;ja_SF%kXK93V#,/5ud&"qL1oV6j63\g]d#f40.uXlC>?g$+@Ga7.GnR8cK0+9B/=tkV
+ e-%cl^un'U#^CZI]fhaN&Z2mF1Kbp1_&FWT;)1*dM^?6RS9]d?"*f+-mbNtl#e@KB;Zft%B
+ =N'ldaB6b"p+m8rH_SV&uSGT[$8l!#iD+71=,_1RJ0BpjTok0[5Hq(UiP>+*=a'>N!q*d<L
+ !g"<E)4M!ec<FQ7],e\[[0b,I,I!C2YV-Z>db5@VCqDDo%R4[_`QA9!QCd<TP23n5%blKeW
+ 10V:tjs</?E0m;l)8q"]L87\uHL`7&SY_e%KVC!b]3Kc1q6n,?pOVZ`V4<oSf&W9@nSFps7
+ dV`R\G?re%RAua-2.1,d)Q+T(rI.Z'B4[[UYT;m_SI<KSU&<?AA-%%n=S?10!;;'WAodVdV
+ :-V$,&Uml%SIZ4IoB5W0)6RqQ:E],nOU7V8"e?<*GTt/t^0\doJ4b[kGSD2\4:M"G5cKE\\
+ ,?aDZ$^]~>
+Q
+Q q
+204 171.002 7 -7 re W n
+q
+204 171.002 7 -7 re W n
+% Fallback Image: x=204 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 204 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!<LBi%c1)MV&:$VRh7cmgkE5Tp\Y'V#14La!$J16;p6`F^M`5m<4?/:oDS#).R28jirZ&4
+ r*p$2`_J#T4qIW%dQBOA0;#BV;tUpG]#;Ul36lRB!7aaf4ITX`L*2hL"+#0>JZJ#RFnPUZ9
+ >lqu)M6I<BZqe^`K@Q-W&Qg.J@d?E^o/?e:\"d$.`fk"]7]%u%EP^8ZF!X7BU4'g5PsIC6J
+ 2p%8F3c(f,m;hK_GbljC1F+/R:9MA/okk@A/jaMZf]tB6Y5Kj#t8B1YuA@o?-]9=Kclq'mW
+ O3DSN^@(91bJU+!f=1>?iTf@Z](#3=A7lE02D-r[(Dg;ir";g#f$1><_4b92mT^-XMl,&sS
+ "1a^5!-(?\=_VlN5&[Uk4"+h@IO*6)nVna[Cp$]p@YRo2tlVhEHWu-p:d#`fMu8WDW^)K(m
+ 3V(opW""Netl'"1(O(a$B$B")D?c29n9tUl+seo;nS8d4cT-,^nupA)hrPlYi;`E:UTE0V#
+ [\3jX@WlRXW)ainRWLqpL>jt%aP7.%*"WuX>?a6]&9>LN*glr)&N;*,Z:FH9j5Ao?7_^LP<
+ .DJll&O8k<1g/2*;eC#OPk48hHRdg"I.4Gu4!SEp9Vg"S<jKIY.+Fhh0G1DCH+^kcOVO^u)
+ \"ZAP_u,+P<h?.!WL$\-Ci"Ga6#TKB6q>:<Z]H;95(8IbpJF[\F\(`(O6k<Gl%ILp4_`2"j
+ EO$iW>>>%JhCg9:aY"djr7"'32b'7C2$]1kPm4f%@:V8[Im7$hhp!umd>Q"kg>URDegO1o,
+ W6WoIWEI[a#4G+&Xle8.?L$R04:?h+#]-cZ2S,.=l&nA*[$9/E3S2^)h0+RI':1)]b3d/.f
+ $U8#Q4\T7>a#PB\P.2(WX/b9<a\K2Sd"[8<@BU5B.$0M0TM.CVL8TCYoE'W(,WD1CX8iTJs
+ QbAjuDOcb?s.4MT"\AW">M`peUf3Gh2g%/I58[+7ffH0,_@p8\CdSg<+.>Ej0YhXb,Dlrf"
+ 4#8qA^d#a$bjEk\gWT$19h[1acJemY2]$qj-717=3mKH=A6Xp%.ses&P*oR+*r1gGklhfAI
+ Uet0-J+Aa:$##3An:\<NsW/8r8QZ%CT7?8X!JZ&?j-i7MD?)^TcX_?q'K)5!@lJaF_f@MMJ
+ .s-Q7-EDN#\9uU1`qg-:;m%1Fb4L[rbI<.b%0Z!f?)Gk\-KC3jd:qld=O2keUHp(b\`OY@S
+ 7U6Uk;h%F(lH!IVrFVVPU;g/QEPs4o5]VUWtC3pK[7?.c-2qNT?_/7OeS+T]X'!O/)FHLMn
+ :=Uk&`.gQI='rk2f`%WWg9QHJS9TKNp8;T1#LrSQ('NVnQod`#7*,/GNk*7]5;MFgj%=N==
+ A*gn:e%3+W?!UQ`:^D,`JG[dc?nj0K`ntRS_IQ\;PHCN@9;g$58DN;]E,9gj4@>75c(*U#0
+ Rr#El/^L]lLOaPYCOk%l"Y`6!$``8gC%#H]T`PZLWfU]9oGIa75[Mo4EZc[iib&Zat0J>E)
+ s/GfVlu9grG6YkM3_TeC=^i6h'5tPaNZPq/a@/OrK*Cj@Pr<"&FCkYtC"Z.*n_eG[qF1D&,
+ r>96<1sRL5+P8_DbdNX##+BCd3-J>Z1OGZ`,4kJP2m:g")B)8`%3ToG%nV'Vof#\9n;7>;q
+ I<c!bWN-I0/Tcc!r0YkP1ki3m]:)9.]!g\%S9::&fW3;!BfAZ(!nF_L+4(8)6:f.uVdJ4-T
+ >WKq>N@[D:??#H(j/=F@9I?-r_gqn$*=[:>:fRZpSuac8PsJFd6q)Zf&(oTfTcn*U"DaE1V
+ Aa*4&t>RKK6c4;;%0V%L=-K'PE0qFapQqZi5>pm:PY)GBPj"iF1G+H"Neas)@E(-Y]hafRY
+ 'MqKYHm6#&UfoR]1EJY;*(hERh\X[_7m$1h::8hn0hCCr"R9Jq>+'<YYGf4Xp!N&mVsKVbT
+ NC!4]Xn]fk`7!G6g)[V]1&q>pIhqJV>c-8GA^]e%YW7RsW;m*GUsgVM/FS=N+;0I-d>'@bR
+ 7bZmsEEH1LDk7AI9#7l^iT70*dg+VgM1UD#_X1ag/H`b;)[e(K3mj.i(j*;FWnFdXZ_:j\N
+ \9o0_Rf:27()B53%U?XP(G7sN'#^F$a$asB:J@BA3Z``p";>rlfTmGj$_8&Sbj?k9n^LN8e
+ 4Z,rY6)26]j8d>cf!"Ui'T=b%V'"!Igc&0$kEYo)<AQrk772:%!H^1Ui1H?N`]bJ!YY"0QS
+ 1d#nA:"gd4+3si;Xa?io86+,UO<Dme7[q(G@Kj:oV,-(%L2$Q<C!~>
+Q
+Q q
+212 171.002 7 -7 re W n
+q
+212 171.002 7 -7 re W n
+% Fallback Image: x=212 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 212 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\)Oi'NH]c9JisVViSb]KeiQs782t=;$MVU:.:7BJM2hTEe&1"&4N9Y0JoIFBlX1gr@
+ r?n6,<R^.YKfi<bQ)[)S'#j+apNrY9!gp[+R\4T!d.]GOMs6]mteR*$!3%-'V;nGa@AC.Bf
+ qM[o]?[eYPHW^us#FYV)6-nEQ9.q;k7,4H/N=I/.6Jo"kH3>;aP\26*\b@q5<+a\([hn'Td
+ d;(a@tp%@P;(P$W_1P;T$29L.2W2_=hF9o[nR$b[Q-Q6Qk;&'nBWC[)>'H8!ShnNZC'U=q%
+ jeO/eOb)4i!>)\r[hpq743l^-c%0^]/(5oe`2M0b<)fO&>@7Re03`TB1$f8iPJ1dF5XBrj3
+ AOL'5EDN_p(nqu!iEY4<\,XP0&l8&$k1M)W3/TjQ:C\g#o+2/oQ8U4i:Um2.4-Er\38R"bk
+ (XOYj\Eb\9f$Y0B;EP\bPsne#1q0L9:+<q0:s+cCD`$X2rRu`J!gAKo(hLc2ZSAK*TZM_ZL
+ ,R^tBTPp;#N+4*SQe%^rem/H4^!*YGW'[t%$nEP'NBT]*ErkNA\np[:aj6:,YT&DZ)q8<N;
+ ^r5jjZ+s89>=0;h*ZW$'%=^*[:agZ2URZd?_<Du_E`'gj,St=TL++*`k`srboro?Kh&TINL
+ J-ub(r8ZhC>0ZF.odbcOAE`6LRlA;`hVN3k5sW5ad<I<%eKhiAhlmA]:*Rsg-hu7E4FSh+a
+ n^8Wc:"'6`5ejX"'82h$Gs[<l3[b$"9rTf`Re1r+M2g=SJ-2E\2_7!6uJLgB""SH/"2r=kV
+ s\$/g)tbDJi@rA&gFK!<L?j;=8_e5(O;nnKN!oA0bA_UnlatQ%/K9jlQ&<8P+_oOR@@=+Zs
+ #)*"o!u4r0Od+!1N)NSM6"FH/$_@^[oaO1DeT)A+'PP:(AB./a$`lBFck?r2<$?kP^A_$LF
+ XG"q07l0C-&jsGKF!,6.<:<'hc'U35=%RtQI7QDqjd;2JX#U>]NG3?jSZ!U:fM)*tRNui;I
+ iVI[O1[>emLY,_g29M7<.3<=Q2$kU``6:oh.JP'[n)2*=;D("`Y0P5N")='AEts`o1I#6^U
+ l\-fneGd1RDTnQ6+HON`n=L?FjflOSb@7*QOJp5P;%S[+d$l(XKLQ,iZJ*$qZ0cmHmA~>
+Q
+Q q
+221 171.002 7 -7 re W n
+q
+221 171.002 7 -7 re W n
+% Fallback Image: x=221 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 221 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%Bh26$(fX]sQSR$sboJBo(.\T`#p^c@;@sXBO[Lq1,Rb,M;2fN]cr<o"5V5Yq$+)BC&V
+ ;2UUsMLC.lAQ\;VZD`O.uO./'QkbU;Qo?pUiNDSSu5&&,<'RoJFS.0f4QmDpd17?sisZ,FG
+ ">_La\Q91p*@6Z4WL5KBNhBPLH7oI7A_jM[H(/X\hP`2csQDFRV@DVrI)45\H4J@7?bIVMJ
+ Jk'-:`pp&3.k2P)PA7^20c'rtQ&02dYR*^S5E=q$_\:5UPY9P1kkKYNdEWp[U9%fG%4(_+$
+ Jl>S[(l2+g'V%CK)`Q-tMW*MYj.m0\SX[O'B.,@NfsC2;^u<0<Jq@t7WdN*I&$hDrM;N?Zh
+ ,KH4lL2cG#KY31l-hV2!.4DfnF]4jZLmeN976Shc_%&!b<(dhI/+tOo^q(\$WL0dnn"=R#m
+ U];>:V[R"L55+InP^PO#;lV@WloTAtDZ[8B^EX2PQj0(lfYkPng`D&X]$q%NRlL-o*PS;hH
+ Gnd+O8l_-]0`rqQSD5$Q%pct!"1YV;bnFMrnC=LV&0I_B.dG.>(++9331+>ZrR0/(AZHYQN
+ 5Nm<,&YdIJ=@jB5R1P;s;kdbjg<j.7LT&rgjFg5ZreuTJFf`G)NCu'u>44U9cDi8[&>J>S?
+ Bu;A*%`[A=o%(YZ7Rij-4EU1,TlP=rZ"(:c8NPM\/s6$PZuS3p?1`))"d5$Z(@:C`Ib&":T
+ ZPDU9haVEHCNq4'-mKed_9uOZbTOA>oYoRd_knVZBMW1%jW_7-4`=JQ'j[0KT-qig\^^i,R
+ !AribbOn#DZlk/m=g.cCmm('.FD4'M_\%>"Yp59Te!0I=9dYDi`r!,n)d;*!_XB"<d0.\iL
+ N?+YaT.rXop72G$nbV4jS&TaDQ/:("j$*.1B'cXan3auJi`'%KF-fELt$5$jU:@_6el`sru
+ rD;/H4W<VY6kBtH9qt@kH#A;=QfTqbp^0Y\3eb/brMMid1U8*Fqdh=>d&o5+'MZK?<eA*GZ
+ cF;Thl7-P%LZ@A_jQ)uF>4,bJ`B<3='GlO\#l+53gDfSK;YfnA*\T1:3$D"l+=SbLF\D-^e
+ \t1@Y+RSM7T>U_1';/8@(RX.,na?:dtsdCU!W"2D(WoQ:frOd4NTX=j@[3LOnUO-9Q-#Y(V
+ N9CRG5)*rru;L3fmP8k`pZ[\Xru@+#;S2aRf#uHe2?t28;H~>
+Q
+Q q
+230 171.002 7 -7 re W n
+q
+230 171.002 7 -7 re W n
+% Fallback Image: x=230 y=189 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 230 163.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!#ZHVD^n(mWHQU0>e>[T0nTg+4OdN'D>cX%eoqC*Y9&/&W^&.1@r?9l$LMeYIpo(Mm4-W+
+ ];^Qq$-tfA&C3=gm5^rNptLr8ZW)fC+(Do/uJ%kBYnpY]W*Y%L372kj^b"lYSi][oH:6^cF
+ R;qfdBPGcIM@Y?p20'0LMielG4KU4GFB(4Q7i#Pm[e4F;gK(0nJ+oB1,PK#69s5gIHdO!"'
+ <J,YC^&(/aSb"<?_.?5I'USEBfnt_htUuLfJeOdOs40WcRQ7k1)HhU!NZ^j4nIubO-:f\pq
+ <N?gbJHiEHQ]St1ZNp<N)dL(6r-Y<:+Zs!aA;Ge!D]WfQPSU\\b0;&[04.>]h7Kq*&LL:C5
+ _'Tk.on(eVbc#\MaPQ)2nsd!(GBm`OqM;;+tO/:^)0)kJ7WQNKX5;;0l?aSS`K2[T=91G)J
+ s?>mdap/5)e$mjkI%MiT=b&,O<sVTE't2\9AJNm/l`_9btriXL>8AVbSBs)iGMjMSXr(jCB
+ AD+"fJFm6c$()P#`uA!^r]eGP=_B2D]d!sc&I)cBTH&V8kJN#jQQbAk?K6q8IP$ce<$$VL6
+ iES"r/&njp_G[Sf:,U^dr"M]%MAb3Y9Ls4l!NPj8FLlB9@2;#MWVbc@(/ToXZ,7be%5<mA^
+ .CqETPa'e'X0_e1FAun3)5C-;_12RGQ7^mm(OGd3,J1IAI"G:NV+\(C^PkRaG.BecPi(oa_
+ 2/iXYQ=@Y_oG9(gtgAeY8NaRfoP3Ii%06@<Y<1d95no\1,^54qtHBPclkt:@tkE-qH9Ddh`
+ ?mfbLKVLj#&:Ig9in`9N.)3*5&-LaH)k/oJ$4Z)iI:O<#&j=pD52(AEI@S,`Se$:"+0FRu=
+ 9r9e_lG1A:+iR_qXUB`=)#:J[NmD127_NJgPBP#$$D*B4TD-R(#IRlAN>(GDM^a_YdNb:0]
+ 3Q`(/rd?*F;#7XQU';8btX'eh7njY1"a;fisl(YGq>g<0-M\YfJ/',oOQ7Z4I%!1UKhd>Z0
+ )MO:u`TOI6<\\':^2jB&B($D$dsLt8foIciVj$4OC[]rOeFE'<A',M12[1;>[r9+dX5FeCk
+ HFNto]\[heMR!9K,T9;Au'9GE)Mk[$Op)P&3MA>]ANn5m+F^cMo3]&aN6_^W=3URcCNF,=E
+ @(AQ7P<q$l1Cu.2FO(6A!il[naCZeL"fV=BmCqYbCiP0K]5O9<]I@N]^,b5+8meAd(DHd.9
+ YtF$B3!$`E!Z7lCNpErXUd3nsJEf_>.&s&m):Hr8M6~>
+Q
+Q q
+39 134.002 7 -7 re W n
+q
+39 134.002 7 -7 re W n
+% Fallback Image: x=39 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 39 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$=\+iE'G]4N91olFbe7u985RO+:iX;fThqN$6mDjY/?tO<9F8fM(C1b@$;n&n9FS2U*f
+ EQcdm2/0;quDo83<B#iqNC'9)h7S?I$a<giI,jhE,A#s(YoU@Vu\9itrUuDm'3Pa2Tep.h:
+ :ddLo#>dG9eB%^`YOSimb"G_*>B0f"@"74fb1c_J5s?!V,W5Y[5iqKgi\h)i00FuDLCf<=`
+ *$&XUZkDk/268UU[eLQ%DUh/VD#ru4$-.:7^or<VN1u,j,kKbI/g=_5lBPp:W/hUErGdr>5
+ (Qai5VBu]\rBmq65HqSNn)*[&Rq/h5(:S0)/.<n%.L6?sc'rtQ&3W297V>Uigtq8:QC+)&<
+ 4mU8Z8*[O+Wpb;/dhOTOdLrf&p/;S)kBPDEI1nm_:0/'#Gp*U]Bj@E]=0_Z*`_.[L$32\A`
+ </hEMG<=,]7N.$Q'r)Rl>#!7sR*m;\9lRB4mU$.r]TpCibFCX<X9-+n:W5>&PNJ*uPs58k;
+ 3HP[+.=0pnBF^]9+DRkQ^b]spH8]$Zq1]K@Kr)EKpk:_4>J#sUYa]>N28LCV/="NJHE@9m.
+ JB+?r4B9,"l4=K%Fjp#1"-&<K+G3TTlJh:/2/5MX;3'"gtC9r<Qa;hLALC];qNt:7179Csg
+ Ubg(FNP2nQDjf>&(1j8\`5'7mf%/8Z4IEjs7V!#'m?8hW\@U\T3Fl`Z7eQFG&AB'j;/+_T4
+ E*`CFAYF/*#p4IqtJ:9p%1'bF3$p*0f\b?)N*k4V73G5%)O)PD&b;^pUtni=0BVc[^;8E)]
+ ?a(J'Tnu\[6Q6/1dU%8Kj4<#+;"2Ls5&8dNX9gq_g'5`9G`K(ESD:@\+)MO:uM_6Vd2A%"%
+ %@:7W")M53@a.c6?A5(8`WUS'k?N'_OXX=0.#SQqIbf[r`J/TAd&0%o">pi2faK@j;]\0:=
+ MY"iLqD:J(?C3cVsa\k=f,h:>l;sMFN,hQ1&fU1V1*DW+iE3KT^M&XLts/S'/['Wd>_2OpL
+ 0,4m(PQ^C[k)JXo8mE?6;Pa7>g1o["s58J+ER]9R^NN=6043QRFJCW@,dR/hnb;K0,#c0(S
+ ,>RPW^NMYl:fpFHTQima-T4%M2r^OX\B;)[e4cjq',+;]I^21p*MtQhAI9(Ul\,$#_0!_qj
+ [Ne5%;8H~>
+Q
+Q q
+47 134.002 7 -7 re W n
+q
+47 134.002 7 -7 re W n
+% Fallback Image: x=47 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 47 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\)Oi'Woll9QBn72+o/KLHn`g)TW+S.AWUlEE:FS--OXT6cC`O6c1?$"d'KeZ4E3U`0
+ >otacN_\ZS]Rn//t[te_1ksq]=.CpX;p-p%.T5BAYkR^%MX/NICVSa[s-mM1G^"pFCL^%&9
+ SBpC=O9H?t&?*\UjXiBuD6Mq1op>FV:l'9=6qeLQ%FW2F84bR!J,`XUGI-tmEb<u7GlPum9
+ aY@"'&#7V-PF:%d=$EdW"F0jrE=6jM:_mjamjlJIM)R6OSdaN473pthARl>Y>AuD)dOI(`q
+ +9VfqLl@QL>$@`OIr@Q#?u?J3^>\BZ4F/8Q9hr^"4n/#?E:=u*1Sm\p2331cNqmt2ph/X/%
+ j*J[JWUPO\)[$j6q>/8#9,TOfX2)Y8Z8`/rVP$$W@?'882,NOSf&K23qW,<<&lruEWg8tE,
+ \XhYf"@U=GU1jKRQ9U(a$f]cT42'I>bp-4EuD2[o$0QZ2+3(m93Ur.r]LETgM@D6Zk7I3i$
+ HU2)A5O1Xa.ZMoa20g;_&R0G%Hs^rZmpAhZ!Wo&[VoBdq>OmZ_hQic+#gEcY)_XPmg6P5e@
+ _GHV4l>8#01'l2Ak0itK/M2>2Vku*LFbEg8f'eA>F)nKo-4?TijX+i,^NQDN&.k/=1,,mJ=
+ `qo@1]c-%q0Jq;KbU-Lq^s3E/2IQE*`5dc;FEbnB9M]F;Rl#Tn*.<5ZCKXe"Hs!suCC;XCR
+ $tn-5f5A[-<k;&?uHQO:P=DZr-?\g-VoDE>/]PC/a+lKS<t_hYTS$\&&uVP^=kAM`)89*QG
+ V<XaI/JHgnqH!E3tGG+f3riH4e9G:oQA=bj.rmV>+nufn,J>,qiV4&O=q:k"Tj@+P"I_Qjt
+ !_p+24GQZhj*6_]'rPi4@l7IVZH1*[RQd1O!7Mu%Eq-stakS92/YU?h)`iIX`F23[XNm]br
+ GCC172W<NaLL]!'J.4P/f+Y6<A]qe'I%F\AtGNdSXaN2/R'0(;;kf;7jg*Cc\G8JWD+r6d>
+ 0-9WV`r>oB%[QNZaVhOQBQN'Nn.QE[0<0T<5BcD/[V`TA76PSia,Z#/VPFIu\<PN5%DR&qk
+ KZXs-VoWF6pq<]FWr;-pjD@kXK[9XeCKM]X,Z!I>k`V@rtQ7s/X9X@pN3..8/?)CQ#&q8!X
+ Zkl;&_G.^K^L35]CJZ8V0TB-PfJJ$86l),Ykk[rgT5P"A93="9~>
+Q
+Q q
+56 134.002 7 -7 re W n
+q
+56 134.002 7 -7 re W n
+% Fallback Image: x=56 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 56 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$8OulZ(_'/3,rGp,a@ag`S4sP,`Q1kTb$)/+F$M1mBi-i(B&Gq2O<PQW#eGg'9,u;X"=
+ $moTYM-i78#DDUm)is:ZpaSr8/aAr^A=jBCjunpMdk<%2\fsCL[H>9:29h_utgL'Gqq4bRD
+ 48a83B-b]@iMq\Chlin:Xi['^3dHSIR=c_%JNV@,3Q9Ma^ACE]d^<hQu@rV`+R`6*ribWgU
+ :rHiX/Tr&$>GmZZ]M"Z"SrSrYcb`%dP2Dh)*#Zn2ZOIqTf=p]t@cs\ZW=0G#2H9+A['hD%f
+ 70U97na5'q&2J6IR"BVLq/_dd+s@!Dh?lY?U9IH&d3Ojgn^_&]C#-XX>^?&Rp%?DN`Pm`pI
+ U%H1B6!Mi*^:FP=FNBY>CWe@mdf"c&!@s!(,L+#)F?c0pojgt:*DV8ARuM(a9\Z?nFc*S.Z
+ h8AbJQJ+P.S>M&K_NJ5F@qX_I=H@,UuFWpuI:A4Zn[!T<Pu0Ah,Ol`r5eEEsFXA+=.3=d0L
+ 5:QPU,PK"et7^gIO.2K3l\R5;^PP_?+h'GO)-[&JjEHZlZRTV--)#3+]8*'4@/>F:ena9_\
+ :@IIOq'g4^"S%An8^tK\:%e0*Y5_+HDcn+nTQS00p6X:^QEcBt=:7T+^,I"J*Z*BbNcql3F
+ jlb\M/X`#`7uo>`M"u<6Xdbf;$=U2Z@'\G;[V9H=GLEc$bfm;@^RCRAR$rn9T(2PF@\OPOB
+ ,?8Mr2B$R%eICu1c@r8a2Z!J=4ED!Jf2(UR2&7C\B?ZZb=e14!4'$nak:->G3q.@+EP&m$5
+ j^@Iicn\_F_/2V5qB(RCbTAk_S_IBiPAlg+%/JeVk3d_0GF?=E3aK4?R"c.BRg`TENP6BnL
+ p1T2nlHdh*?Bc-Bb@8O?3R<u&q4?AN"7+.>Z2+!9.ij60?[d`tVA:`K>Ms4l]R\j=SBY2K"
+ jOknH[IV:c':f8L4R"HS,6;#>D%Bci8(Deer)uQJaiYbK+NkW"_0nci8>,hVOe0G]^JhLIH
+ T33,GZ4i`l/MT#;Hu!WUP#kQSKQVH1j`$-`q.)1jR$\nFmfH4tIN@+pP,>-QeS`$F,I7,'E
+ @*np+O2[JSY3Jp#'FLRW9$[gTrP+%IPM7Rio6\_Xi/h+-f@S@(#C5="flrgGA5V]KX8BT~>
+ 
+Q
+Q q
+65 134.002 7 -7 re W n
+q
+65 134.002 7 -7 re W n
+% Fallback Image: x=65 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 65 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$=\)Oi'[90A/[\JCe5@_h1';M?5=/8+;@9cf."e77+ql?Re3IlDY^m!)U;7$?585h/O]
+ 7i)#8"kJ'K&`Z9.`dU=)4RUT.d4bqrl5@qK_h,\*cFqYItG8?e;c*(a$fF&73+@>FU6<G4b
+ H9A-AMgBurJ#NPRoSWiAC*nLR:):g/a2#'>(LrHg,a=]/$+C28s(O8JYd4FAR</M.e\eroj
+ H#ILr!fe[/M+[',Iq=Ak/=:RYlZs.$MW3=7:7lYPo-Vc(GLqqQAo#8mLr;<N'oB7UFbAmJA
+ 6:.nlQ\)ntEV_M4F%$YbRCVq0%roRT06m'mKnXRFJ,hPj/(hEJ@:@7&7U7%3VXX7/^461W-
+ ce;.M0JF,CsC4Ln,P0tfWbPPp'S6E_81c6DuiBrkjQRH\!WNo,Q41')^n$kYOq8YF'Q8-A&
+ kCd[;-MY?]R?sOH>!_*&KOHX%U[YG4Vqf=Y+f*5Qn0e&-J`(@/k[83b%bs"m4t:oL*AkoTA
+ irq%Bl;al$!Zh\S_N!B6pQ+YHO$()SG.Rl8+4'Y:jW4["A151ZigX"/RGET@C#SO.A&Li_m
+ J_D?s9M\_u$bA.k7*b$U'>F:ge`<mG!Lp2dRceGOrK-a0pF=@V-@:TKK$Z+T((Dgf.*7#U<
+ 7=(-qAVf0UMl8%?h[V_0=B]1a.P+d^O-q(n^)Uq>^r?Qg%L<EYfs<G4N"MqZ>-u^3oR'/aj
+ CDl"FPP+M<`W*YX('asbd>F5Q!ut@n(s'!Gfdb@7`e+0NnW]:1odT&IqU!co8M@]NJ3$u=&
+ X`LY\]K/nnm."U7<ZYRtIIOJ4tfg)AEmAT,D3(52o\%9Es5G:HJ*BjEGX]JHIZ+XK&?qDB-
+ 'XAsbA#1,<hH34ur0@>!''O\JM;&9`+)r5l:L@*U"Y@dc:SZ*Cfa;sjpgNTst`Z/?Q[OI.F
+ ?n(]?*9at5cK7\]]Q)`b0^9Y0_(XZ"Tp>P((\Ik2S]Rs28kKeDD"R"(PW#duF9lY@no$*Z#
+ qZLJ3"eY9!2\7ebqneOPUKI5J(\=#.Prj3N'pFWOq>&-](8D2'Z2X_.%[PIRHI,r4C-6p%M
+ \hM?K]m*&LZ@Sq*'UG9G^i.OMXaSC-%ZtsC>Pnj6s^r&h8AX7,5C9C\9(:e>e;=3a!4Mn?B
+ .]ee\rE%4fA\Yq;XsGPFPRN$+Q2rq+"oVnlf.F>/((+otGk~>
+Q
+Q q
+73 134.002 7 -7 re W n
+q
+73 134.002 7 -7 re W n
+% Fallback Image: x=73 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 73 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%CJ9as(oE*ce):Pncs`2[fN;mUjufui=r+Fne#:VkZXk"c0l)p%)R5RFC<<cir5^&([.
+ 6^d@m^kBE_+9F`9"S]f),0ob.^+>FRT(t^$kjRci%,CF^NH"r1E3@`lF-RCVu>`GjrMaUIT
+ S!!q5%,qfaPHJ,P7k0@A:&>ISS5MK&6gE:YFAlga<Z5(0^l1D`6(N1(Yi\qG.f$s^<8j=Hm
+ 6>8JAFi8-V]QQnF*LCP1]Fpo0?im&RWH=^[Mp3%0up+5q)6VNGiUa2HiJa:oVLipPjOk$Na
+ Cu't+CCG%3J:e(q&R5)"nbY7orPHmQ&dBXZ>)ECeY]_T"!t?ecL>BIa(37C?pi15U((MBK4
+ o"S:%$ST?3h/BnKENi3$@dO-5s[QNn`.-!6g&di%\Gt$Mo"H.2nXQsQ52;8ippYkA73Rrbb
+ 'r1dgXHjM=p1sR]8P01n_AsDr.Fa_1T?aIuaF#;,r<+B98XBYV=:g!>cOSe#-^+.\5\^8Q8
+ aMmThr'MN3\tKUb)7$(d:8fs=0e#S4u8`CfIWK[HOu4$19p!FB)7YQ4"?@G<[c-E@'?8!0-
+ Nj;B[](^=$BYf+D4QouC[T'FgY$*^lTYr4KB<fJ(JcGtsaq!j_2&Q>SO+@&h0^>-fY+-_(a
+ Vt="oX%)I2WS[IG^ti;`@rcYQ;5<(5Le3fgm>ZD_&/hJ@?+YjCYN<>2ek2LB[c675q9P0Jf
+ Xt?[VG)QAX-CC,c'`Ec0l@u$S`/]85<m81s*bh.rK^3qj;%j7dC=U/1J80U:;4FdKXHpRVD
+ ;d23Fg'B7jdEe4F;Ig[*93@]Q7i3_$OT)Z8.tdqf[rTlX=5G^k2UKR=t&E59O%D_'7t0@?"
+ f?[E`Y"RX@PXL5oc\EG"@I-F,,pLm><`Ide^,neJ^(4BWo8BbOBBA25tE?5DZG3HW7,Cf*K
+ ]=0@cJG^*n`Bb]nt:Mg:XneH@]QU=*DEMH2h1D@aH@bVkZ\+AdFShA#b_!9HjTfI1i^fduH
+ DUa`]-[`lDk0B7E+sIR7V[J)fdmhPI-Y*Tu(X^Vcp<ZVe=b9)#L'GW=12)*sE7Z^J'D,UPd
+ &Dn[Uc6`@F7%U'#EFZ[)GCteX,CBS?DOD@5@<uccj$]6OqOaS-fUE6h5QS]_:pjq8&J>'JA
+ OY/DKJj!crtqscl\4L0'tul-7G6)dJ"rRE$<$ujQ/6=(@_WZ\\@V~>
+Q
+Q q
+82 134.002 7 -7 re W n
+q
+82 134.002 7 -7 re W n
+% Fallback Image: x=82 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 82 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$=\+fd'Pu/4D:=A?9J+5;X<*UZ$47G<0f!rL:de..bRgLB.EEX5/4)0D,[2Pr7EVn>N(
+ >-h1(qK@U!0_r>Keq3Ba2KThA`9GQX2_sMnf!;h`5c?!<9k2qXEGG?G/[@.p?*b4FN+4:42
+ nkJH78Ge+^fh1cF@E/R6%CeC=kLn)EkI]Qp:%f%KrpMK&GN/mLY1Kn66Rgq/@8G's*pA`Sj
+ ]1c1l2&dJrATYNfa$*IN!F#-"/Znh4DkB_Jp0t(pd>+1$?I%33lV!m/C)>VAf>eZ01HP%9X
+ YV60YWAo3'c0$(eDa/_\BF$hOB^SSh-ne(k(=oWW5_+EA#jg6>DEiKFT+)9>GZ]uU\,Li(r
+ iBbHIZ5:*E;2,MPMts@?XEp$f44]$-%57_Dr7;$)niqBs7_+*DSEBX9a+n:LqGi<7`*n!Y-
+ %s1"-Jb@Up[TScc_YadJ**>7-86G:+U!fG+"a(%YflLk0>igF=ErYPk=<Fgpr&-O7^5k?S/
+ %<Po2Q1>Qj*NZa3Z^`f2HdnRC/*_q#T%VYgXNZR>(i+Z:,#l.E6CqtB!i&[P<PKF.ZeJ--\
+ nl*PK-HH;5nSuq]]S#-ZkS7q%?Bp-%jI6(uc`4U@6`:E"l[E:$70hPr5!9NP#2&$fM0bGp:
+ @*'$4>U]?gPKb:ISI,T,AbYcD&oHH^P:(AM^:6[YZlh99K+%AA+jQWGDD!haJu9udS`/c<4
+ $+0k)O[d:](ts&BT\T/.7oK0H<"]F0t/8`dntm=hSc[/aN-VC&=f7ifSg]Jcm#cTNES&PQ<
+ N8-K?]mjHagLZC$">V&=\83U;PKQKER,6*U1ju1<uM?B%\.)#Jm]+SLn'A;)L3D^n)URaLi
+ PDeL3!amGm35+:Aru,?QioaXhi=./;tq3GK7Dp@-G5W.*658h6`m>AS%:D=$bC"-R,2es\I
+ :EHd2-RtQC21'R")8,ejV=LJV]+]>FJ];,W^YH,ht1@HRaOgCgea2Fq&j9E._7mB3EKdleN
+ h[0:4/.E%'QWV]8rA];`;RC^qW*Po6#>LcHYX)j(?9L3F*oZ(6O&n^$8X;kh1,[qe;l;IdS
+ NA,fe/:H3=iLSuMrW"&d<jP?$ElnCj<9RJR6s-8ifSSC%ZLib7;D:J'0(CYQS+uG?AH>GGb
+ N2tSd'e"V#D$4T.r(k9=iL?gGeLT0@t^Nds_<Fp:fq~>
+Q
+Q q
+91 134.002 7 -7 re W n
+q
+91 134.002 7 -7 re W n
+% Fallback Image: x=91 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 91 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/d91YCH&B+aVe?IGe*gl'+Kieq\+[cNs#!jTE<>7`@d0"\\W')Dh+=eaa?p8R=fY]U]OJ
+ /$g;2^+/9\b;sU4k%ap,N!T7Jf9em([44Qa8_oB("HbF6?/FFaa:mOV.9\X/AH@?TJ29f4S
+ ,@*is;;1bbR]Dq*XHL5%->G[Q&Qa85J0-]oc'o^89A4k'B,WiU:B"s,95&(^NchS*!"UFIa
+ 8k)9E(ja-\u?![<t`KSAQA*W:)mFs[G:0C^0^tcMt(GGFVZR:n*HMUTPANG3@]662Rk`B];
+ Y\K5Zr]rfPRsUiZ+$So9,@.s\oQ3Ml4-5c*_Eod&i1MO0leaT,!`K!ld@,sIkK##HC@>It7
+ QQX$X:ls\>H?AZXY%r\20X#F7E21=HDSZCFoAl]*`RO"_SR:C3H2d8BF'V>YIQ`VIX(m!SX
+ jM4e_Rhe.'S?E`[WB-bEgBQ"s.PcSXqsK1cXNsIDYE9\9qFlcg(:FmG"P''I>#<j$p.S-#[
+ _>_M(p=J`"":WN"Udht20P3uqrP$PrZ\%!M!)_R==8Zq1iA>.IO(QH7BJM\aFXbH6PNa,4K
+ J$Ie#M(H3"?)D"?%D9jfk]W'[kmFbut]4R%SK.V[*1(69G1l7(3aY>GrLPGHcPCEFKZj1Hc
+ KP>/J[;4>1gUE[4o&X&d<'EM6a>!*cd@`mWor@gC_0UIa:StbYjo@P<s3OE.2_-.A!<JK-r
+ T8tGZZr`Xd@`llg"X^g?7q<;f>ZZWlB[[ukYXDaa2F>"#Vp1dl"XR4e"ELYa,[.+e@l.L[d
+ ,Z2E(u>:)*39ADQR8aQ/q05#26olr>gE>k:r,U9(Y7>$Q#nuc->[t9hgrCl-hP>aZ1\;iSd
+ tPeu$CNeHub.!/:hj7=u5$G.-u5D7#J7l_CG_[nVo';+?;2DX1>?fO4N*FmB_VjT#]O!e:n
+ H?BgQXGOF,Qq/p\$,g=huMkhV6`@Y<V"dJ6@_Y;P/<EHe&'0gMWZ1@I%CJ(.cC"$l^5`$O8
+ I#El`6X2W9J$+.m<)mM;\oPbHkKhH^QS+[I074)\f&j\42WA*%?fNjBT$m,t]RY%N"^`Hup
+ 7)(,lR-T)^+]~>
+Q
+Q q
+99 134.002 7 -7 re W n
+q
+99 134.002 7 -7 re W n
+% Fallback Image: x=99 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 99 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$>tg;f*3J<Inkl+#8ErOUOu+tsC!2Cb\nJLjB":0*B):(.)l#:.OJH"uTiIT9<#[>(f#
+ NqWf#SQRN6JM(Lrs__1@N!P,5L-+l.NUn5L+>Ao/j_E"8ncK14oLSo_.:`$Tr]DTVDUm?K(
+ j0$kD:[:MZ?4J&f0FGkr*`%CgKB2t#N;*^7O6kP4faUSHBoJ,:R0%j'[&D-X\bTVtEBNumO
+ FehQd#'MOZ?=)d/PJWhI$rAsB(7sDE^ZXV>CelJ$"Lb1O9^juSIF%-Dn^;Ik>0RrqPqKcD\
+ N.V?I)JUBG$qH=KG$>o7r:gL`>"9n:jm?9;/11ZaGJ_\P^nsiY[h!b0WpINO^8*-+24WQOq
+ '*5J:4#'[MijS`OfMM#=L/4Zd;k_2]R6^Rp%><>'.8l5A!VFePhUQZE:KZ-h7=>=D?enPj[
+ i&OY$OP<1S-bIRl;O`\=-d>lEeNl;-0[L*C#Qi]<G]G(+_/DBFt:IAB<H1W30/P4$0:oZC1
+ q#AmDj=A#?(G/l)*E"_$4J\@Q/GFCE/t@HL67>:.7eI*WiR3eY^NQ%RB^iN]YUJq7dnb[>.
+ 4I,O5q(Dk;dMqPFJXIYpXa(a#`[Y"\Ec,5\j=Lf%`2^0s&i3?PRjUWFiB5ZKiC+?Z1LR4>W
+ `A#N)23-8=<h.s6nQW[FOcbMt7>6IJ)hG\4>-D9`RC0G[#D[rH^S8p/WJ^7?bhUC`$&]UX4
+ <t&$8LQ,hr(,*K1G-oD`^Z2Yin,unf_Y8C\.J8pb7Ng\`(Z*ObRlkEVM;d2EVd&Jh9pnXY&
+ Ugbbbc^d<[s;g%qEWi=\VY<HdS:0-8V9USBAtBm>\%mA7T@kf@4J-R@)[N2fC28ChGNPA86
+ :2L81N.Z^R3<'+,fH7pfUk6m+2r\[f4m94Q,_>ZIVOR?aVDZ+8N7.op'REk0FU/mULJI)8r
+ Afu!o]2iB[[?HpYb_Fg5`bK=eh'G;#i';ONpAW)SjegAtNeU4\+TC=j*+?6RG9KemPPYFeF
+ bhS51p[?]>$4kb,?tgs?i*\;.hCT\QZ]tP)1G.VQibV1]eg3Wl'L*I3%#5I"i94$C\tk"HR
+ !CEOQg8DKIEI554/X2q#3X;W5@8\J2HVM*Css:@dW">sbpFVuIo]WG#5iN.(]I&3hAoP<[!
+ i%MpqA?~>
+Q
+Q q
+108 134.002 7 -7 re W n
+q
+108 134.002 7 -7 re W n
+% Fallback Image: x=108 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 108 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$8P#.E'[>=ZdaWt<Q3/FnJLI7i;OBl366R7=;_/Up/R9Wq-"7FOTgf`a7YEQILh'=WXc
+ u3U`?[1G*%Eh$cmDQOU@eD5J^V;Ij5k*kp[1-#I<RX]p^ag?K^!3`Iuf-]o_'bZo*1tbR$t
+ nOU6a"2$Q'aI:CgW4nFW]QWCbIlN:(Ql%qBKP9BIm7,eUQD<*/,-,6a?tnuobk$!TLgoEh^
+ -Tsb^?"j"e_OIqT&)K^(/HsB>,YqZQp\/:Pcj2(s'Bkb)$&'pk@Y-]u+Ci%%L)i0NodA%%D
+ SO.3HlK[m4m6@g,0B;4kr:kh]hpC8AM@'YL4<-OK$4\.IH9**3`p;797V<e$_=d3mGKeCno
+ 4NIGJ<qp/pF['l&J>.H<sAU&3.G7tcR,>)S_5:d`VT<$.jcVu3%3$P?SAlPI2^u!fY(L?V^
+ G605^'TcO`#94R#i(hhe$NkmN&mMUd2"%D]KF@IJ[DdWPHVIZCRGAqtKX?KfBSP@:hu'`@>
+ Z_eh(.?MG'9I+-3?K*&o(Jk2n?OJ>(pOG3m$$]a+m/A>H`_3@bJ_H"s?2>;i/t1is2Z;'$e
+ 2ZUZKVC5T,t-,[=*CQ@WBaJ,rE3:,ELh;[Q$5<h$UMQt]7glEQ)hMs[AA;").QH@]Yb/^Mr
+ 1@+8DbR?BfE-?u>0B1tZ8_?Zu:(ii!;Ms.De6_DN2<X$lm,&=84'5WW@&24]f$f8.M-PoJN
+ :tmYl&D\m;*U5JDcHnVSo8J2*i@k7S/Dj`DVm(U-C#o6PJ]h,d=HR)EWdg?dUn^sl8AlAdl
+ <qpj\/O$Ge9Uk=BeF]NJo,j<M'$.7;cts-C5&J6qe#l?^Kdu;$eB:6Wmp7][tiC#S(/mU4n
+ <^RA7S(s+$_Hj;)HRm?20EEs>^KaROuh[/fc?@%pa/N\fK$*>7IRE"IJahVMQUrd^VGjHcP
+ c>[27;T]dkHaS@D@QY^FUT9%DuRHpXo.:62EW25iIL_#u:E-GBfZGJ1S:ol(Fa,c-(AnL&=
+ "0%Wa;68Dd'UdTUEFT0OS4qjq@,@hWCl`Z#OIV9a\'`m.NgWMbI`ogJ`J[8XOC.K+faoF)1
+ IL.(EU=Z:9&r!/M'lN@XA$(T5=J#(1s4F)\9SaAKlZ856TfXGB?rtC2=9!KR2pH."e9K<Ru
+ lRs2T1J#O748X&jBWkp:'u)m_QXB~>
+Q
+Q q
+117 134.002 7 -7 re W n
+q
+117 134.002 7 -7 re W n
+% Fallback Image: x=117 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 117 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$=\+fD(elHGe8cua>Zrg4;@>2c'gr?C1I>7nTcukI+qt_H/HqE6&3"X]0IfJD.*WNe+O
+ NU$^f80E.@!dEGL861SW>E&f8GI@LRoL2e,Raaq<!';c2dlk9MXU1:ON%o:S6"bVVoW6r:k
+ i*&^8I4aZMD5c;)$%O6UJmHms=58l/_Br858!C._.]rdK7m.'sL,ir4?0:S+5n*aN'=R*_#
+ ,],Pm8-n3""gIP(?OIM0N9!ks5FAtoqNXi^HJ]pem\Uk2*'I4sF.2j*m0'u,D.nWHSis(*e
+ &.kLbjP91J)[m/Q"5E`9IfG_2s8"$A'boTsAU&O<eQ'H5UI\'HH+D#8RBs5eS!/QLe$@e/O
+ 2^b`i;%HL\V&A/Z#:_-moJB4Ms+hgjbF@U5AEN7P(.ahdaCm_5GP1a%iuiO(.XD#hB$i`$J
+ aGL)N+0/<)neRB_]D09M[=^bX:o8Y]80DmcE0lE-Q_>b8+2^-ua4DM%b]+(YdHhLe2o>QZc
+ bCSdIJ<@^,1M&J9S8kA]Vrp@$&QXY;TM\olBK;dn-%m+EUFSihj&QZ2UIP*1ohU$sU@c'hW
+ \3-\7'+!2)<f.L00A&AKf)8X)gCY(mCB@2*4>u@*NS![UTB'e0$]mJ_sU$sU`K:\bgl252?
+ E9e9kKAl$MmFu&\--JlVcE+2[F*$!d^qi<oM2]BdHY@40n'SK\`b*jY0^3$BT=k^C'O$sMb
+ REghCGN5(SqtqNg;;)D+X'BN'plA<bPfjC2?T.'bj;0]04'<u(G%.lf%=(Se51eo:l:5O<V
+ ALt9X<d-,J8@N(IuBq]LRHmQuhIh(Dd[Ob?<\b3n)r%!U%hs]^-%oAlM3QjL.Obnc=(7(jG
+ F@+<3TuI:PLRDCh9bna'5%!W6DA.T1?5cCMfl(5A;;V6JRT25?Ei*E.R'j6f#M)blm4D3L,
+ 2-C^hAIURQl0BY;V_r"gsNf-8J2P**tHr(p0c1:he2;+PE]X_960Ht0CMQ%)7iHKke%NLQA
+ 3-.P/_SVZcI=7$@km@VAU\O1YM-iJ3.=3@K%>PJSe1!u(Ql$MQ8lVf$k#HlE4@?Iqj+slC[
+ o`s^T9jkuU-oIA`]&]3;]fA]b*,>pMi-QrAYW1%<eRh:A7\>4`Pj5U_qVX;*aZe/Mo4/"<[
+ >]*0fCB@=U@'Oo*I&1bJJ&3OC'#$N^)=%^<c~>
+Q
+Q q
+125 134.002 7 -7 re W n
+q
+125 134.002 7 -7 re W n
+% Fallback Image: x=125 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 125 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%=\)Oi'J7NaV)$)MX:u"]7LbP4JdeA/[?&1-aZ1)-d?(:L"0nReRO;#gZ()AFJ5C2C0G
+ $sb%$?F1XL)fHe_2Fcq_"$-qX(N%c8g*^^"6S+T*NSce^n<f]W!S=^m?]qLB)f%_T.]S)8X
+ Z2H@)P65$ilSE?fr1cis7.:V:t*-Vr+BM7Patek3H^BTNl@nb&rCa=go[iBmXYI9Y^N%4kb
+ _6,%ILT0MXnbY"Kj6Xq>J$?5P]ZEb#XVh(C'?YZ!rcis7BG<C2)b"A0a,FGa@6L6Q"lIG+`
+ _YCVnaPX_R\,#j@aM@6"fXVZ]Q5\hd>LD5bp[@8F8:&A[@@9ni'68.+*K:LIi8K4j$T,pj6
+ ,NZ&=)sMTnZ*O9fbA&hqDAH^;,MlX-a8(bm-S4sX+=h--f`Jmo^iFa]6?U:h\F42_ENI0rd
+ M5`M\o>jKnhO$?t,kl&PDK."mKr4+,5R@p?`7qA808RYcY%+Wkt`63,elShCpb'U.#u2;cA
+ @&83-G4Tqt0t7"$O"GiafDQpu6W1,G&WKWm/sfE!oiXBHo*VTbp"=003/4ZINhQS1u5XH*.
+ Q@AfHT[lFVAMqSFIa3gZlIN::'6F]o@3[:h5$$UU[g4cIREDTLE3]\rUqQIu9L#$"K?Aq7B
+ PIHGddEj!FRU/0Al<oTFL0n(d@HgZ,)+ikQ17epBPNm;VU^R(nM>+'On`%N[<C&pVS>T.[<
+ efYTZ$3BbGjS\%RgY7^I>l.'734:qSXjFL4WT61kjFbi8:RUD1H@/Dg8#rB.G2@?@%!CeZ/
+ DRB=idm[Ycn].c'r:Ed&J@%?pM@i9.Cb.cIkVmjl@O>&men-/Rb'O8ob>gI2EmF.IW@[^q_
+ C9Z]?r'atf#"b8fH]4a^A1E,Z@^HB#.TH>7!YE1a&@6aeEVC7BC>r0Z?=:KkhMWMB[[c3Y6
+ brbuuphiZ.EbGF\S9=0:4gug,-AiiQV_1Q4LiaUk727+Gf^s/?H<'l0ZH[<QK7]>IfYdP<_
+ ."aV:k:,k]%Hbl[GjH9M?58TMpn3>b@=/!dFI@b*+95WS^tBT#:(iSI6B3h21O6o#Rl8+7(
+ D.67]2#!<h7FLCdmCcu?Y%9V3Aa]sW==;3S(P.YIXVP47SJc.4YKV0*)LPn7m(87S@uSTYq
+ VZ?_)YBAdW"7QcCRI=WVQq]P=NabD;n7'F@hj.BsS+(SLIjV-BEM!\Zi+!+=Atq_F[;t)>m
+ dg24NOKa\V[`&brPdIt@SPjn]Gcq8Y)~>
+Q
+Q q
+212 134.002 7 -7 re W n
+q
+212 134.002 7 -7 re W n
+% Fallback Image: x=212 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 212 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!$D>>.t0'SYMb#IQ%MW"EqYJlE%+&0k&H25\3W-;)d$1`-\l'%H]L`i*ShRG&E)N9*qucq
+ qWV+<j0c8sKJ'#ZXKJ%L'5H+CHjuQ3#.A1<!B0AkpWj$:LItB>=)Cp;_[V^\0iu^WmXeW@@
+ 9+jW#A7R5?B-o?+beQa*g`f<<r#4_r0cDjJM6EcQ8)=UeiF-n'o=j"llpR7o`2Q&n:j&eqb
+ i(BZG>eO:f\$kCjdV5\@g;I$s6ikgD41M;T>UZKOWVZd59BBHC(N@2((`!M5sK#3D72sWo,
+ ?B'\5*Zl5D.hjJ9>U_[[[Xc>[*BsD]hS!'#@8?q,#r9QQ=1im(<bU\])&@s[$t>Ho&9(?aE
+ mL46s#K\t:pX,)rUAdl=0EC34IOB#A;5cq^eY"5fY5'f6^%BGJ(V2('G)Ao$l!R9Skc1N#'
+ '14;^b$o3b-Y'aQ1J%iV01FGaHRbGFtKh-Y"jG'Q2XC5BnlR')[QAj:*&])`OX1h@(:CV<?
+ 1*n(g>k+HEn==Z?,\]%S9ns2O1"FQl]kTgL4rA%DL1;99-VG!2_MGcOm8f;uf<LU]H)[[+s
+ L/LpU!;tELl-^d(S0k"j6lr'mll05t$`B?A),h_(I9;<edLJu=bFS_aY9=W02nQ)fG$tA=X
+ )\&4'>uanuVC%Y[8gaT&G5%J"G]"oXW4II#2i^W[Y$LAdbhqg?nbpn4Hp>BAp$3cR(`dLZb
+ O*R!J;cO[A28mKUp"^@]A$:^;(E3jLl&t8Vf(>5Mi@9phRW7JMA;!6ej1G8ZNoL$`'gq(2;
+ $@[#d0+[T([EUl:I>co'TeY7&%>C>oFTK7]-V2$nD'ME%oVa%ipBiHJj<//e00U6ocAgDR\
+ 5+FL8O;^!Ml=A&fkRiCQ_?pG:93kZ-o6/K)C@Gu7Frf[uYfGjpQcP&[fTV=JIq$Dn%,(I^h
+ maddhcP>)Gt-)ot!:S0=/^ZX_WRZN&f'$%q8nHN]qbQXo-7i`)O?>i`@R\\@M2HtLpRb'?Z
+ Z!QBg10,'SPuX_<^Np'Ak2!T.jT\(=0I%E"gn6V`'WWHks*i0"N(kR_llI$afkaEYdFurtO
+ Y#L2W8nX>'>"EdKXHXmoQPBcg[11L,@2rf"GRM8DqJ[f2k/&F?^;$%<3h>!._Bq&,8B.NE8
+ qM)"GQH20f!+Ua5P7IrdILg]ga3f^O83(o]al#7u>HHMS^i\bg*Y3[?1?(j7.+'c;-o',<R
+ $CZ_O:tU]clcaC8^N6kBY`<^1hZ%hJl*+],EdQ5l8m1^)[T.`3Wg8GpD\`u]chRt*o"J\AJ
+ !HC52^`\p2Y#tY!DkN9YT&1ii(qY>3)?B7mj2Br<>$>X9$iPlDijk+A\/<1-W@k79(eU8hr
+ 1DCT;M4]$K5=)M51;#b\Z1JnBGk"P:H7#oRd3;(rX34sl0BD*&!Z'=#1fQ\T.k>U`@nu3=*
+ hFn?V3[D_.f"L>45;prm:ISu_-iq!NCMs&JcBBR?h=AHO8~>
+Q
+Q q
+221 134.002 7 -7 re W n
+q
+221 134.002 7 -7 re W n
+% Fallback Image: x=221 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 221 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!kqBhVH.(fes3@U&u5F\>Os8R18,$cXb:A(7Hea']J=%hhC]`5K>C$FCL:TF/%06nFQkV\
+ %8`;p$Am'cbA*5t.J<5q#B>Te(oGQ8r&mo)u1kM8+EuC"dc<cTU00cZe7(i30h9NK#g+\I'
+ BR_<$t/-C/U1s2N!9"XRu.BgP.3;UV&qjJo;_HC7I1d?'cc'ab8,-Fe:TlhpPpB?m<F35I\
+ (GUuBIG3o%hdsPN[ljFX#DV`/^*@_el=^>A5:I%1BYA`.bj4o(['"2Y8?+95Peug#&f'mFE
+ Ve=GL4ZkC$(Z+"/f<,k/`bI_d+u?^BHWLmrp%S.FRHMkl*'>(IAIHuCS[j,.F4miI2n(2:f
+ >sd]s+dX*D@We[]<g(lJ$sPSA.(%t/dMrii:/imIjQsePfbpiY*;\2l0k6joI+A$VEYkK$=
+ C"[Cu2fY$AC3Ic8V+P(\b1lB;/J06B11P9#g+C'FMHV>0+q?#WGE9j7@0Gc8]qR8na6FZrs
+ _eVb[hl2D&V-e-G^@"G.U5E$)-&-RU<<5&^LR$R6nRoD(A^hY)+JF*DD86XesNbY4Pe?Tp[
+ ?%3%WGc33>/.9$551aui1Gj;eY"9RuWE$)-*#0^bdkiPUlUTU6i:?_$1,W"aJ3m_Uma]U/#
+ 8DLU'D#X?/B4kl[aTuMF"^8L4,C4t,pc^mgo-$17[$o]P6Ve5\)*cN1QHI@m[']bCG@;kh;
+ >A"^W#)iH9UJ(W^-?lu=om?5,tjirfHIbH$-$";V&f7%W86+`:M)Ko%.nadl'e'@F*"/d"t
+ Ue$Adpl<TMQbX,dY0Ih:Xg*`?fil9()]WYd#AuV=j615+U!GgM8P_/Y"5]^hY8qFQ:A^Df7
+ %Te"E,kjRg7(JI6!GA/N[P%V*tD`J[k?*p>Cj95-4<'gNOE_7ef'1;<Y0GJF%i,A9U=>M8a
+ @KVOfnAtrPce:OU1G8#M[O;Js5cWC^=kgc_RJhTIZN#@2N[%/3K3,p-mcA0]:rQrOFnVS';
+ %Ld1OeuacjGESqUD]E4ClEsft8d5+.7</kckNZ%M%ZV/84TnG>Ku2]V&b.&T0KoaFLb^4Xb
+ Vl-Gs"L2Q#L+SoIs6*4>8s)h_5YZ"aJVoJ,8`7>f)d318e_'ubLu7Y=0I^%?-UW]4/9W"NS
+ /-&cTr'&3jlOg,a*k:o?X!sa[dHS]L.ImGOAk9Y^<QCK0_3Ton8=,o0YVs1s4o+EH+<0^P)
+ "/3L_r@5\<VU6`Y9K]$tIWC&W/OPa:*mTj^_m7m*Z@4ILNV#_A=DY+QLZM.B#UNLdVn\f/F
+ l5C/!LKtu"F5Ze&MO:^c7MND>V0Up<H8!Qc&I\PR03ZT6F!&$F18;&=b_mV;[mEf*8TbND8
+ ;H&]<"RqFb/2#N)eKKEY@tm@4[nW]q[JBX@]K?R:`SuWHU:.'OQu/M"cN[ud-l.;NYGo>tW
+ 6<<hJ@;eX!W-'pY]\c@.AGR-0YllHZiGbkUXA'[)ju2jlT_Yj'>s~>
+Q
+Q q
+230 134.002 7 -7 re W n
+q
+230 134.002 7 -7 re W n
+% Fallback Image: x=230 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 230 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!kqGt\ls(mTn9MFnR5&nA<.X\hsF@#S1:83CBKe9Ju$NFIkG@FPWd.8\.gQ)d_HXs+7sO`
+ Hhc(_/ib6H]rh";R/tCq2&mg.pJUSTPoBE)Erkm?a1=0f+7Lk54$0INLfRLS\$$)_s4M',)
+ +cZ'A0`'dD&+d*T$_*YD6e*Nb9YX-Q9pZa8C9.ZD9_FQS=:%,(UVd`\!+c_!unH1L4ij-%<
+ 8a+E@c-W3a29##=2HK@a"QWoZ<U`UGH1Y8J!4M-#'p%7LEUIShgmZ$#1/Sr</+<8/^f8fq&
+ m`(5qBBQf'qk5;&lre"SGQr5!:/6q4:UZ`3"N9]^([gK8>dc3)_'*LVdQf]PE6/_RE)GiWJ
+ -UbNQUbrLRc*1gG4+.l>IR3,!p\7`on.m=k18O$H">uW&!+q-Qf8Mq#[Oo7?uI]#YeY2VI/
+ ^d(Hs9f9r)bM$SK/d@?arq>BbNZdle8`jDf5o1SY'iMl0-@Y<E49LR8B8lj$po%K9'*8n?K
+ 7Wc(+#UA&b9Xe$r>Rd.,3"MJ$en4aXW`S2od>>5e>h4-a9[.P%R%]UU^mcGml5Kn[\Epq44
+ _Tcn[B8hXsqE'BdKaj\]/_74J!gat'>-VQ5c:S5q%2%-P+F:,^olI40b91h&6on:.HBC:-H
+ ?<phGgUuJ90alCkc$U97WZ]W/i^="B_o\,4/J*ka7ISkP]mB?O8BBP;Jj8SdH<XTJ7O+ILY
+ e(hjhj'MET@qi"a6_LpY]qmk$ru4o0QX-eosV-q\$sC+'4"ki$7l736/Fk>VhlP[bQaV5fA
+ GJb;Um*AbO41Z4EMurp$,m"/b5Go(H`+<oDrHU8MK@8?!Rh`4EMFI_cj0NBZO^>;7%(si?X
+ <Vr#@Z)UgqG5:/90[s')fW1g='YTJWDY0P$ESF,I"KG2["?+N6^!/r9YmdkBmbl_E8S$TMM
+ aE.48F_<?Q22h(^>,P!tM]phF^cCN%-#U_"p5Bt^.o)roI\Q2c!j2V6CQBie(FkA$kbmmmg
+ 2U'Q'@`t(9mFu%sMMD8h+TiWWGB7i;6ID$eqa)FH\9JV-?s[db/=)p!h31!Ki6:brYa2"-F
+ \PSK9++EdHtd([@=<6GI9O%ikKTK?AS#ne3;;Q06m$eC_OO/5[cGLA3"pkr;-Sr1J=,:+*u
+ HnJ'^e:GC^CR'G=:b<GBYTbaI4t#i*i^.Z*,h?Z+mDXW2Bm-a9oM<7j]UA+L"SbH$L_8rkG
+ !aK2,<0EtInU"W#\%(Bj93S;]d=n6_\j#[YTLJ<8+?E3RWTKi,&R/l&_!'E#<l2&.3npa(L
+ -@7af1"f\:q9g]"-f#CfOF:]\A10IUN%#u:rP<]uE0SM#2j_t$)[)+4GpHR_Z9M1_7JBoT?
+ ,E]X)acL>mp@`G%@C/?3[2g8+Pm[6&-n0Z^YCl!C]=NHM)*Ju)m6rq-T/b"X6_W^YC4]ihm
+ e=;E.^Pn/7Ylh*!CF!i#6ogk_`pcj^TG6N/7]E.~>
+Q
+Q q
+238 134.002 7 -7 re W n
+q
+238 134.002 7 -7 re W n
+% Fallback Image: x=238 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 238 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!kq=\P#^(_okDLhj)L`[*71d29iNMu+-HdAYG@C>9Fr&D+ET=@#R4$4%-j,#B[dKV9)"L,
+ +I_ciLt7"fgpr.Eb8;;O1`>952S>g>oa@W$?_XQao*eD?$g&T)ZFc4*PZ5^K=3aKiMi$Z@m
+ m/%S%ENo.Df(LroQ9]ShXsNJi/0jaK`mP%SDdQ]qmsNL%dd2Ht;'Ier0LC$3g?S2upWoP!7
+ C_r$+-'.6](T)Id!V$mlqr4p*?52U$-=>C\t=IIdEVms@63.CViW!s\JX&bYHk4WA6H5a>?
+ 21+XimXYJ^a,e!FE$<iR#KfW^*tf7+1n*@f<Ski]nU'uf^J>Y!%X3%)GB!prZm]bL63?psq
+ U*h."](I9M:o0<@U<<P.(XUu&eS!)O[3HZ'aT\"XOdt)@dEg&H[f//1jJ_1`iN=%R59J-bQ
+ sY$h%C-/B08LHaP=>RRl3R:nE.tS$jPeCMo?t(LA^t,Pa",C_._Frqt<=Fs-+s]P:"\tO8!
+ d;U5^*^^t6sG5LLoS6pUg,'"*0Os7GR-<,*;+,L=LNIY'&;9UV)C_IdH<]pj!1+IMC,-I<_
+ QI2j6>mHbmR)F_Hb`ocfY0mJ?QO@(ga%ta?&In1iRRMt3_ju.o[<E9=aM1'gJmdA:6/'nFs
+ &V@i/am<k[lSE]81^?dFL5)@D_HXLFdF!pW"g(d)Il0*GR'g[OB1%;,2n(1Zin#\^@Q&.R1
+ 4MLaM2".$[i_?tes>IZ'M+pNbaF*)r;#!M*&"L9*j;u_\uWBPVlbq8.6=T>YH-tbR7tW^U*
+ 42m`3NsJoB$3MSI1&rB(Q*O$\uMaC$3bVKS7E8U2IBM^Unic[hiit1_P88dfgd6M2)SWW6c
+ Mpf'M>aaN!?u5&&#sBLS;H9AGOJQk[r##I#2aA#[BZ</V::Y7sfg<fRI80B$[M,GP.gm=r@
+ u;9%:sMhKaMgYn$&lddfHgb=J[';SH4>q\9$^jG]e'C>,b-;VViiWPZ"=%9>q'>8B1dY"lI
+ -c%T$96EB\h(:4I]"3r#Bm"`JT"dMibS_[eBu%u4G/e^\rVNqhgqd)M]mZraXFu@U4$-#$9
+ j7DmIan:t;IOP0oC<I-(j>+gZ=&5$Qqb4$OqY*$R@:.TXTbh-UOd,N"%$/q]cMo]Z!mEnno
+ >uam"CJuEVXVVcdo6fZ5&+J.:0^9[^JL/B_=FB2e^IZBO1lF#-'R;1XFAX$5(km@^g4OmDb
+ -Kf[sf8'P/V=;sj&X4\Dsr%2!i2-65*5!!-tP"eUhcO,/m"4mhVYMi2RFQu3%&:GXc0>nc)
+ /?-Hj=b%m3aX^ai0eJ/gA66UA#0-C7=S/I$STbT[2>_05fNZ%$.Ti<pA,e/B]5CZG$4?49N
+ N_L*OehI^-otc*5>Qh7ij\#ZJ<L&kneCXG<FBHQl,GEYYNK#nH:_>t@[OW%/-tK2tb\$;]o
+ m1G*#r:^dT.r#"k7<U"D#`8_%oI0W?N~>
+Q
+Q q
+247 134.002 7 -7 re W n
+q
+247 134.002 7 -7 re W n
+% Fallback Image: x=247 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 247 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!l]I8%k)*641Va-87a.J&WT:MhsEZAbp-4:Ut=A7uj8bsm3<\PB:4GGXJ#WMK1%Pq./Y;5
+ 2O'So=7o;X*gmFa%tpPP=li^]!S`S(ml&]D#KWn%Q!_kPKOLs-fJU[n@m,[(UiiT:5U".B+
+ XX^+(JlI:T,r,!r=[US@8>lM,TDCs'h40.@e(kb+*8hnHc5$Hfo$.I5bLSsrs\ace0/&#UC
+ .UfEJ:*(b?oH0XPcm/6\7CY(%&6b=fteArh2WLmPKfs>'M3cO#nSitK0[ZNI+.W*ou<Dg\)
+ 2E&s+FpX1haTi>g\@V5o4j1CkcLQ!*=Z.s1)'*#Hjb62h5'f&'p[58F)ai2Y$aHuE?Fr+?c
+ 'j![=-LLnW_G"E:i#BQ/R(J84+9<h_M'0<UH1$1\#+mP*ZH/<84u<:nulE@mG`<V$<jipCM
+ qF#[d:/b=b*KNR[,M8]6#K7q/Yn\'mMd\:J[N2\9V!a(=p^iM40p5AGPG&CI(6lEq1^rMg,
+ #>m*;.]b;M(`)]R\&2t-I13O`]Z;Ef0b@Zrs)^@/pmJX2TEj/,?o@V[VL*boVkOsaeGDLp_
+ EIf?t;i+u38#7_4LbQgf[NFcM5S2H3Z@g4BZSfZ)%:rP@Ok#tk4mbe'(aqZa)>>\6nFnJ:$
+ NuE:k>h%3mV6[Bb0sTZVNCV:>aJ]'t`<ZlkT[_&hBB'c;&Y:&TIXULdA&Si\3YiSSq"PFIU
+ QUlU'6k9F,38>gfk_?`I.Lsg"#qnC'UA$eYCFU6#hZqX/($\Omd>!Q*8D@$4PJC7QUn(9+%
+ di&`l6r`AS$J_n7Nd`0fsQO3[g2qM$[!nA-2qk"Ue-j"H<>-IebaR"j%`+),Wr$h\?KMM>U
+ 1M7&O[h3Kpsk?eC)B7*Ih_bVNmp@d<:V(`E.=RW9u3EOCQs:8hQW\$lR!)@T$+niL.U$e0V
+ $mnRR3ob:DUbF&i8T4WlX]2(;KY]ha#R-PT9HW3+:lW24_a4qZRnhr>;V5FPAi=Lo:o38Rm
+ 21X9/.M&ejMm^%7#\]kflkK+-GB[O`@9G9R3!i7hO$Jc*KLn*Y$fA<?mDOij-F4jY]r.l&,
+ SZ:4p1cG=e>88Kd-?.VkCkoVQs#e+!eZID_?A]P^)a?^PA)U"*,KK2+H-a=@FkEO`lQ5t;A
+ bWd,_@,Ts)Tf!KL$bV;RgH/eZ5o3bUgUJ'8mG5%fVltRMm`R''aCMW_Z3;M'Y/B+\kohI'e
+ =^P:$W<p!$i:/!daNgY.>6fjt0b4El"^4%Sm)4N[a.5NV!`]=RtK81kn#H`\bU(3RQR%)O,
+ Sn=SEf"S_t%68pY0,*U9>RI<I/:s(PCImQ\T$_Q<\>DotgDIhGY+KVuGZkOt.97^&8<YgRN
+ k(/0L7Rh;,GBW]1eTJNRN<UV\Iia],Y71s)9K8MZAFu%\^E9?/='lJ>-e7,,#V/@o[.a!2M
+ eG=3W`#Pc/skTG+ZM/6M13p5r#`)6hd$pM~>
+Q
+Q q
+256 134.002 7 -7 re W n
+q
+256 134.002 7 -7 re W n
+% Fallback Image: x=256 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 256 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$CIjXd(bV!>8Q')&oY[tt=@O+oJeAqe7+(sgAOltn=1SYLWECgDe%DTJf/0%a>%ZNR]O
+ 5NDV,Oi=DPGUZgXK,Bk%/G:-W_D1<ORMYFa+a9h`9Tc4m.6cpH>:Hs)<@#D/J5&`>hWY>+-
+ j"\N2qR9l-mWW+*)%8P-=hWT&kqqIe,X.k1aMH:VY585r'V5<j5Ol%p'6?=&[&+6MqGCC.9
+ V*m?fgjQZ3pq57")hmcOIP4GTSNFZq1W[dQ1HfFFPSS:00-G$b,X]tN/CY/OghcCK"Ce<Hf
+ ,BNm6kUF/j'h@If.S8b4M52=X*(qDMhn;*[oB%GKVl5k2,F:'EE-.%@[VQp'*MZZ:^af&^2
+ Jdo,S>/T"(GEL30]$APor1n9o*;fG&UkT7a?=a-ZYpr?`T>s>-)$55LY1@:f\%urD9$)D69
+ N:<p;F+:o5N<ar)9Lc!s1lIM/kf[F'$u'$n@N_/f0@kEU?r\TgLeXd(FWi2E#c]Xm*0)hjH
+ 3O"F\iP4:eg(@Eb>c]kUQeSj!!EQR\c*lgs\3jlL(le7pg4U%!JJmRoT(f?9)[IXU/0\_t+
+ `I<pF/e]l4"r?k=6E6HB2c`r?j?q+m'I!ruukq)r;U,pfU7ktTsGBZZUMUKp30eq##Sk\(Q
+ ($C8rBY-EERQ9uhWH[OL_4e)gmHP$g#X^r>4<A0_'FN[3!6I@Yh[d20lK[m'U?gEn7&1-O`
+ 9VVZc89$c@"]_Gd3<,mJVOJN=.PEQ-_i($AGu!OafO+YL:(29+khO@TPRD"U]rIrI?8*]N,
+ JkQ=:joY&4<39a9[Lln`-eKH8%Ugd9rV\X&pnd?:RBtqY5S!akbdKR5(Sl+3Xk*NG3"YgP7
+ Ff)Xls[H/JZEQ4"2"GUSZ"9^j9UaU.XlDuA[Wn1-D3:?%=JJ,6;ccYkfcCu9+sMMF]r]6jI
+ Q:%34_ZSOAX6jBcq^KPs+'EAdH:(F_?%<HKEVU<aOfGcar\[a#)gIC^0TMfLNlXB.Ok%6SO
+ ;-*BK/rk/7!^6j<<:j7"@V:J!P'?J-H!"096%QVU[_&LFAfDU+qK7uCKjf_CgA]CChNeq:6
+ mBas6t8WcKQu,L0QeWt[t;eid?`N:/%ZORrf.K<SRH&>,%dS^5"F.rpA<Ru+\BacU-7@WG.
+ t_;2$NWr&q>CF:/7-LL,6]d&5:f&!e+s<k99(AMhUHsa%,VJj;pB0$k7&).`1GSdl97791o
+ ^nV&I=ui=u1cU)'Dc6K+1[BUD"j9GS,Vm=S(Zj)SKs7O!oKoB--J!-EI"FuFARf%)B`f'?b
+ -Aq9rf;7Q`4"2?2@Z>1pB`cmQ-^L0M2dBkc?1#e%:R07DQ<HU1e]90qG^LKai5;kEO"QU8i
+ (7BkaUsH,N>0:Y<_G4:BqI;mFWhr6[!"BUdI'C)(@Ll8YNbIHqK2)Yspb`)\1$\Ft)#4+R`
+ u"I7':A~>
+Q
+Q q
+264 134.002 7 -7 re W n
+q
+264 134.002 7 -7 re W n
+% Fallback Image: x=264 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 264 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!kq=\Mau'\,`RJq-c$'o,1VoKt<)@N("iA"o)&NB"kpB]9SY6k^j`p#A=e/OF0V<5FGi8h
+ #AqV6BB[$pIi,Znf!';.q%=KqaO&#R+B=Ddc@]E^:c;iK#?:9lod[lgD+*g?X]WrJK.-e*6
+ GohPI,c;H)*i;,pNBgVh%p!0N)h8gH83)7obD(7!$'0L.BP.24)eiUTX.EmL8t3I*CGkg>>
+ VLSb/A,$oHd/94B#N-A1!V7W4-DC@+i\p<o3WDf5$_5VeU52O$P_3Q['&AO\n:P*M'J]Biq
+ 8G;F<f$i*GMf.@N(5W7,\k(sZjlN[*SA275"*rW"r=?AT's(aan)kM%DB45o>5jsJ,k+Xgk
+ D'&RL(04-oX(86cp#3n]q!:EOHVJ616KdtC3=Z>Z8+15Ids0)^]@ER>Ifp/I!P(aAK5W,Ng
+ CQ==;m1bj25*+K"#K[0JG3Zi5*(LQX@&OlBINfU8"?q5*EI_Y-(MHH^g,d4<t'c9CV\jZXc
+ YW_M)e:&!i\hUoQ!Peq+'&St:-A090AM1i_!AXPi$R)`K7"_E,6?<M^W%mjFMt#(rVVZmIU
+ #T<POIa,VGM"L($P,Mh.BoB/WR\:i+q7=sLX!e.SiHdncYfNn3-'8hU%g?e0%ARumi[C3n;
+ P.A?@]tL<*hnm7^EH/:*k8nKpL-D8HUdrY"94;GXS&]Pn8&;Go505m1rd!J>S+ucu(GFM"^
+ Ge#/NslP_bX6!K\Y[8I=UB'`KS2T33%6+^b:&Fom-9Jk3!C9SNk6u%<%Slp<EGYo>9OEebs
+ jJK6c39Gp,"URI.g7M?t:9<Jl_JkI;rTW$&'7FNq)\Olg(#O&:i=\R7s-5WMp14BZ6q+?7?
+ Rd:sS)eGR-btOGJXaPGg0Op1tA%R^"+($^$7c2Nd=dTi=@p*u"X8YFLuKA5Z/XG9RRZm8*7
+ J/:Q$n9q!9_Z\O-sh7MVJ8Taf]^qfgd2o_t+*TQMrJVDF<irG;PYWP$-1`?k`^:umEn0+>4
+ m31*'1XSicXB*E>Vm5cM<XXt7c0%Hpa;Q.>#A>qZZtgJt=`s1>;b7:m!#gU,+nnJBNFa1L_
+ :2t0&8\GJJk?D;6`!(7.*hpL,JdJiN7tYGcPfN]_9h)e!PKY#$>)iV2Dg(@92?)j$'d!-bU
+ :Gl6e`k?c:SkQ?7lI7S..r=E>T]:SUu-Wgp-5>_;=$\V%O6RYbUe8AEV:R&I@;NfH;C<Q]n
+ ^oknkp#1h&0tSpC)bM;m:!EN-b]X;8uTEIMQ/=E$;CF*#O7h#&[(*;Jjb<<01U7_sT$\f!1
+ HX%TY:l"_Q-dcfmr0elG]ZGX?^PG-X_1`'*omt-2V$OX7=.B[e@E,g8+X8@iFMQKTo+`!aW
+ ZV.2`\"RXdi5=bt[pD::Qr>L%LWn,Rfo3d/lg%Ck$%/nZXUT1lN#==1I?QVb;*=[]fWE`nY
+ hAMn`jEM8q@BMR'7p~>
+Q
+Q q
+273 134.002 7 -7 re W n
+q
+273 134.002 7 -7 re W n
+% Fallback Image: x=273 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 273 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!kqGt=--*6ns[43XGC::`9HU?jMs+H%Wl8\rKH.*>*IO2;/0b@<>NRIaU'RF@[?F66>&RX
+ (6(/$Cf"=<![2k']>Slrf7McYp+*csOIK%(>odo02(#p\^V$FS)1YBi.a85Z#S_Q,U_UO,4
+ ITfch2I+qSfTAR'+A6:+[M;F=3>]V:"pr/T$Nl/e2hmf);>l'15KPFS0c3B9e:O'Q$i:S(6
+ EGODGc7gXh<.4n8r<g/r*iSi*F4U#_@M+<TE3BD2hDS<MfK*M&Cj5];THfN,uh7F=1*<L`E
+ R59P=qF<`A_H\-(TC;+CbejNq^s#us5(*%g0H6K8C[83)X-bD='#7SnO#AmU&7K5G@->h2U
+ IV"<kLqd-V_0KX_YbiG>ne$=Hi89UWDdg6p-mWfhH@LYZ#Cjr_1LV@o7JVHa^A4R@1*>./m
+ B+Oi4qR#m)>5?DaHcS-7?uoM^cluJq@`$^Ebcuo>64VrVJsK0>BYsG/11^oGKGue#)r1RM)
+ 9]RGgYPiBWL$A^$/TW,nPk&";.4S_[1M:?c.Z=de@Dlh;CEMp%G#%N^9?qTPB,AnJb(-9fG
+ h2^_<DE6H>Dcborj3"S&n/uk&umf#+$Zp$"@8L/&OYGX(`2)Kir3[Fs=j67c>XFZrC$O[76
+ R5/=^oAn"i%a@<2k(P?l$5qN'?8,]L:oL=pm:pC10_`ZM*E&j^2n,$nbW(*DZY^XlUV[&ok
+ )`;L`Zrj-:PW-#U)eV_f6feIQjmfBS"'<0gF:@h^:qGOmcG$%E')dIBqh.=rd0";*8d_oa(
+ R@hVOO'MK<PT-e#'LYBAYJ4TC_[OgY.C.H\Vh2[=jo)1(%_PFHC_A0[&<ZX-p-@Ch,p6ebG
+ tdaV#GOlf\U9jkdN;%eE5c,)[V^S+N\ljfNTE,4O/,+_0;3`nf&fannkXl.:k[-6m][T)0!
+ -d9F%%)8^6-d6Z7qej\0jfFL7#iC:h]7Hbj\JA$7"rU&?LGO=CMV:'Jlm+5EBpJicI8PLe0
+ d8JcT=R4OP"rskQ!^]ti5`:a;Lmft`iV/cZG^-HnM_`eHV&C6jkidOKgD_(XH$Q.*86?&;!
+ &cEj85X0S,%_F&[2Bk/!*].lg#&ug(2H=7)BK`GZ#LTeJ1/LQHM-6J"(3@(JAioC,9iq;Kt
+ Ri45\DI9<2ERZB?!hbf>pL\9NIXN=lAb@m,EVZ,f&6J(ScX]a=Ac\9EVtNcs8dd/]]>RH[>
+ 3+&t"4-`!MY0j,?n6'd9jY'FKLe"coR,,C"M9cS&Q*:`kWuj/Z8&)8hih8pODOZ;DS^>ne,
+ X*#,1P!jb?=^nk_O@E_)%4m`m(QdScVTJA6a!+$4]9u(RnXf[=4_amT-#$FM(St,jj%CSQP
+ iF0WkiGEhC6RDmq?4$gC#s:lL[r3si@E_pDWDtEm't9,MQ+o%9%-N]NV:kk2o`K!9'9`~>
+Q
+Q q
+282 134.002 7 -7 re W n
+q
+282 134.002 7 -7 re W n
+% Fallback Image: x=282 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 282 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!kq=%nfT(j-u6#H1Kf^o]#`;2>f!*!pAS(tXBj)E#%aGYj5D)PjG9((+"lUKEBf;(2Pr$I
+ SpK;NRa]$4%@!:eDT/$C"RS[H>eB&^VjgH#qDUr&sedk<%S3hnK',eL-]A1GXjJj$1K%MP?
+ jR+sZ!#L#k+Y,GH;C>Sn2%ic'dbg_([s96PJKD(V0d>9\>3&FfV7L#c11&s"&[FPsre]mCj
+ ffeXi3p[*<Tkg5ORa&C9R8\9<A4d4PI'U"lrR[S8qe>/9U_9$hCAoHNG^1L*,SXftn[Y#0p
+ rQ3>;db^SUj:o(MGJ`=V-qk0l>b@WaB'tdREVrniYG5]oEGsmW4#T!UV+V\,<Zt,%KIgFL]
+ P%lXI+3OXA]7c[N4F6lQr229oB.nYPX5kX\Yt>.XCuDHq!]F08\9$)n\KiT%Ltc4('IfE#+
+ 1n/bfjsoRd+;3/DBID!>ZH%F6;8_[cVD^$8jSVgjg)MaiVuWT?5=UEd;5BqM4tBZR?OEdA*
+ f9lg]2ae>ZDWA+*!Q]T%l_-;5Q?4`R4BPUTQF'Ar''K,-(ufs^;4fs>U2Zqgu7e`^C8N=L#
+ RGC<e(`JYPCFF)*odnu-cIPYU29V)Y6%g)pVQnc'>N?UV*44_m-:r@3fN2(B:m_h\N/Cp03
+ bU/GXAfrl?o_(o#b!6H[V7X=Ymasgt5MptQ9`,^fm_:H:)[BR(C"%%(ckS((*Y_)[9ne;,b
+ ";q4Al^@Go#=.%77Cog;RVo.3YK#O3FkP>:]j.LR6AQNLJ"5YmdLFLSf8AC`TKUDY3'=9T?
+ R45Xi<<P%RT83(s+B_&Sp!mq_WA8P`6l0QjjLu0R`@op]nf`H24b%c%_34DT\OlotUPnM`K
+ 2ec/miqR<7EkSqj(sRb^j4kg9M]"pX:a^SrZ1hE8<.]5&3DR-!R(n.6_o"1[U0GLQN`[u]b
+ _2\Ll&DKq>\KYK[eT54X1[>9!H@W0tR0gTJ<5]dQiL3\=f+>n[M!hMkNcp&'^['jT#g7m1M
+ #7'sg/HcRbSN-$'m&[C/.4M50#RY'Nd]ZqDK9-i;Qj/q"1Ge0n<=)0U^ml^-M%)cp]F)!]'
+ gj8=c_XShH<ON7lfqZsbKEd]?MjL?`'B#*ecNH+<F?#u'14,\Mij3\p@a'O^>YJ71>':LUB
+ Ba^PEV1P)N*HaD:ifOj[oS/gUF)k\g$Mrb6jXG2T?$'<N>#G2,f.(<WeNE@U(Y/F(A&,\oe
+ /8p[?H!nA)E>=''1/r38_e,qfO[<.%E:ig)lD'6nikS:JGkm=mn$.md\g#K2"=5stinK]a.
+ )!i_M=!QZ@QV(O^9];7q\B!_bDcR0c0&/(/dkP*!R?OQ4#SskPKj-NmFo7cU'91s7F,9`!)
+ iX!=Un78"jN8Eg>$u\KEUb2][WbR*lXF9gQL6jhU^nUZ[_gYl(8R#10%M"+'!%iB4M+7.,O
+ :1JTWK=T(V,Gk$O&mpkq6)95eo,jis-N%5lT,_6~>
+Q
+Q q
+291 134.002 7 -7 re W n
+q
+291 134.002 7 -7 re W n
+% Fallback Image: x=291 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 291 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$BhX^n'\-kr'L]o..P?Q]d3%@;iYG6F)RgRXi"h;F6I9E*()&R@:aese6;]3Te,m$50\
+ E'>L*DP.b`oM3Q9hsr:g0`I!i7GR@1Le$5!AudPPI-r-XYU%mQ9mOHdB<BAE:M2T%;JIbfj
+ fc?^?pU_;UX!`Kd[\p7Nrp<go+HR@%+Lp2.K>W$j.DCUHRmp6(T"1n*Xj9u6Mg5@(jbEqV'
+ a`!LdPEop'L`J]=`f7Z=OH+q#F6J'UNA6)5H\PJip?b,aqo]`/=LZ3OHI^O;K&;0G;/JDN.
+ (3mN.=5q&K=I"@2EqZ7udeJ'X8k!:YW2TJ94?Vrd4ch$54W:eXHdoWL/9c<hg9m&BC?1g@j
+ $9G1\\#a&CAn"]D;157*!,H1GOPOV@+;'NlI9PmF(\ca-'qh$V^!A_j2YXl4i:@&Gd_E+F6
+ QRLKu-rtKF!N!F)q^r^-$f)9#T%;G"guWo35TF'&FlL%r*r].bN2?=XYhZM%Mt"q!QW\p81
+ P-/hXsJ(=;6jV`QpD3]I\%O^Mhbi.VP+(GC6J@0<eeIdj"pc2O5qd3b!;.bLXsrDcsUZ[</
+ e83;<m]m2Eiff@.$OZ$jt%l7kp9q+TT7PKj*O@OYBUj@=Jqto!@Ujta:;e,%[-Sj]f(mO4G
+ (9psZhVJQcp)jkO.EKVf2L@?=3FLDh\s!e>R;QoGGOGD)`XU&]k=sX_lKW,_f/,<PA2`Xn>
+ (o9hPsRB"#`=3h@:?*m$dHM=`/K46(+mBSMb<(P3.SRb_ogD*0FW&H>)YopZe9!p3Hdfn:l
+ ?F/]V7?&N**c^iTc;!PF.!bbsNKr<in\<pa8i]'n<*YCRU^-?lU.+[TJ@0W#^CUM=9=t4a.
+ B^L:Rp2l52L)Y2Am96m-)P)!SogEBA@%>)c.7ag@4m5`,p<*J<7a?d]YYa4Cf"_fn5\KRZS
+ Rh^%jkMIaTkVEU=Uh#7,$2uE;7Db/\7:X>@K*hsIG:iKS8B?[R]8d6EW0NV?"_?Z\%7pW@M
+ 8j\-;NY[fb_X;;Uq7EY!SsNOVie?UI/^E4d:rjI2VGeo$J`\8@Oj,mH*ASN#mm's@a^CLK8
+ WQutAgdm9"nLuXXHY"Yk<+3P[XdkKY]ch<_hXr]$8,C_?4P;1[9DJ>LT%(X*Zc@\)[q%`DQ
+ 'J2\#lc=,l/2fP'5dcF@ua_17CJ!5gV*L%sE.A(mA9%P4<)\E.^CO5Y6()d+]M-,XQJCW[&
+ cTStD&Di&No3hk[XtY!3D#`T-&DH%PHS"B$E)E"p:1f\M!CRisBKg0-UU#k+,7\#m`aEsF+
+ (0^@N08!T&9"5h"41hrJK>71dK4Pm!_d)*"@)pl!c*)0ofWNFifW3o[*KL2+lHiQ0uAfDYp
+ ZHs>omHs$bPr:(tfaO.?K.5!dTN`A^_su)t2)L7MbUJf8RA&h3=tSSLOPp'`U8u#B:T5?!m
+ D\MN_/(F<=p0RY")-q+?nu0G*Wc:Z,l7h.fb8<~>
+Q
+Q q
+299 134.002 7 -7 re W n
+q
+299 134.002 7 -7 re W n
+% Fallback Image: x=299 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 299 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!kqBhX^n'\/!i-n7NaBM9,Z,q`%le6n4R'4XjKN!W@V;%r[]RV3l[YZRQ0ZQcH7@;0@D2R
+ S''$NV6UJku_H$PnI4Ba7fiPbiJQ3RC@hm+>JhR9t#V_@OB4o?OuB]^s.`s79-G7%uVY)E=
+ 8`eC7:9aYaA2eZlCQTJeOp':URI95EI+>OqAI"TmNL0ZbmAn:C&scb"3Dp\aj2;l>()EIrQ
+ (Qp(6;jN4LPVfOLri*F$"6DHDY\QZD0A8WhE.(k$olcbchNuq.\GVEk+m^TB'JU%+KZK3#Z
+ IGM@!V2nF+TgMY>F7($TiQ*6lI3`l\8P*&uB`>,<&:g&9?=']jCS#ft5$P]]HI]$/%hB<J-
+ d0sP$Wq2r-LKNPiTgm*_L)#,U8")tEjYfD,kI@kRbFR5ikW@=QS,*V4rh1[F83%PiCfLmQR
+ lPr?HdA0,Jg0P_VO%Q+Cb0;K^IN6be38nb<ePBm5@.82`O>`G;hJ\Ssrs'@_KBpLNDOto6'
+ @c?!QUbk<GLr0A+[72L@?=?md>5ZZF4)KqYZPkQtGkrkS[B'BeJ"<``L!Yckb=O4$p7H?t^
+ g5FN@oIf32XB:>UUPF44Z*#p"qR6i*2qXb*n\T@!C(803F:2+ZdF*>"!]Gq7f=tRiY+I=Ss
+ )IT&lQqZ-W@E/i^K`]qh(GoWV"Z*U)=i+ELRI9M0]mG%VY#WN\ZkjO&2`7Qr3fH*?aZQ:uX
+ //]s70O0$E;Oh$rr#\E=/*f5ojlW)$YJ+_3?^"-Qi]b!nb%>1n0&:B&.8:r4,9%mUVT2N)b
+ *?*!s;0#\1'5?Le?bK4o/XJ`i'V&_A4^)Ns.<LK!E0<)"]=C^J[*ubi;"AW(*O()&XM8"(=
+ oO4Gf+-"pC^I$/XOcba?m""O0lCOt^[++d7>%1B%,EQ6W@[`;C:u8UP`MSY0/A[8$&GSbfI
+ \5Q5s:W_N&V%NHV-hR=#D9D%q4s.=5^&;^_)\^?q;!iAZo!Z`7SJCS(t-kD@TRl862GpVn6
+ q/Xe&fSQE0aAT]P44M`SP"=[,orWq%'p4W^04%%%9O)NM-klYGbeJE:&W3qm1cE4g_nE`Q^
+ #"'+O5hb'Vbnj]-,0]gF_pc`]6=j8n;.IK6pc.h+$DqurWuc-'OnEfc'ZmlK,J#>)n(D(e`
+ Y8gYf-VD#TS)Y"S2%l=;WYAXp-Y&FDqfC@;OB3[`D0S1_-QcD+-nT&J<]/c_?UKhHmoILl4
+ Vmk_=hro"1D-Kso&P/+IZ=(-jbaZi]]b]WM`BIu)QQ3$Y/j.4Yc2cb"27":Pd=N/ko#Sqse
+ X_oL%hbUQh#,^b&H8d_./n='Hp*G&fqD/H`[@')-*I[R:<[MDZ70I$[9B&G[=j:69S=i?c"
+ Kp*!iGP?p4ZDoBNR=Y)<g\"/a(pRqU=Y&]%BZ!n7+q]Pu6IjeiOioK=+*E:J-6-SN5Wh./i
+ 3E%rH9M!#GCojeobU04'6F~>
+Q
+Q q
+308 134.002 7 -7 re W n
+q
+308 134.002 7 -7 re W n
+% Fallback Image: x=308 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 308 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb!krB2"Ld'NKklNMpO+`drspNbAuV7#?LTiX[`'B[fGF+c6n6@PDPkV1Ota;CnT-<JEqsLe
+ r'k>1qU2AZ/EnUr]tZb,1H`WPm-R$'^PHbEqgqIH/!;mQL<O6UUlmW7C1Em-KeTalPXV3'+
+ Vr,,0n2&[L(N+USN)%M'@G7?p#\:_=dVqs%0s70SNO(``J5nn#P9CW_JI8OnfZn)+.amp=i
+ &[kI"8iQ'!"Vk,r7IdUGaP:>J^8^%?3k#44J7n8W[mF`/\I=%opD9.G@)H^4)NaJh,)]S4R
+ D*00nn3:o4an>A19M$B^Mn.Wp<%@q7fu-75^s'6m$<Xj%ASK7iZ%BB2q0`VY!r/d`['[c+T
+ XAP[mHrpE*(W/>3qM&_&Vos<1R#b9]7`I9=N/b)N)THd0>>&;TeD,Z]3p2nRFqjB-s6%EZ3
+ 1t4DV^2:^3"QPo_3j-Qmg5*-WTYo5_/Ym"p5_F1NVeYD\Ef\m+M#6ZYn*Zl"+Dt#;]t"o$3
+ acN-Y$1+0fAb8sAZ(<?;tN3@h/,XGk*Q<*YC)U=RXC?B!^RgX"ZFDJT`E>LTHpkiksB9Hc[
+ Me&.u9hq/d^Euc6^_m_0t9h%UI80kC<+ULqF?/8IX;N[%`TMcF5*Xl;eg;hF]HgY,mcjU=P
+ 0^J$LEl<nGrl^VtS=MI>?7h.nBe1`s8L0jdN?mYhQBq6U3o!rtkEkJn'"W'-&q[Fqm$=@(#
+ \F/@AAcI;'^lB8[gl!TU!k0nn$TQ/c-:\(m3H:T:J\_ld3''q9qG_'']nP7YYcWUgN345&i
+ 0U'[qHAR*4BPp<:MRp:n!m.f?l>"h6#u2-TKLk"Q"BLVRa9)T26O?1CZ'7SOrn+[suF<\7S
+ IZY$FguSpYtH#&9r."_bqDi9!RlQ:N)EJl-ea=54e_QAP33a,'P0no55S@g<$j1W%Ft@r'8
+ r[LQEI$5I*qTC6K)jIraf+N"0dHH3r,*Jt&6Y?qeTL"k:Sa0g2ITrek?(WuP#O[,H*PEH&*
+ )QX.kdPNq6:8^oR#a``GIN=a/+;D7a<^O_&SXi..%VQ&ultgE'/"osO"V=]/k0<+G@DF:!F
+ NMR`jY@\'l05KLT+h_D4`\*=[s*5^6'Ve(q@nf.R10%#_WAYAUNc,ofE>RrBP.pH?([aMD<
+ M$@_85Z0LOON)Adf0DVdP$nBJe@'3e@?:-0*.51*3Xd_Zt#,5crU/X$,rG1cqdnJ*%/g@L0
+ d&i:'`\Bn)Vu"@mZO/'PFY2HJbpOad9lnEe!q!$5G\('`CXW3;g5F0Aj*>[!"?Tl!Z14<L2
+ (]F,!1Q=-(6Z,n_qNd1$E_SXIF<4Fsir5@4KjF"#._UXi[LAO98.$HJ@%gjQ^g6V;MUdCu6
+ `u<;_7+EHGK"P5;-@gR[OA0q'RnaER228LDU&Ik<Igc_o.[>LV;GBJos7uEr$\8uY~>
+Q
+Q q
+317 134.002 7 -7 re W n
+q
+317 134.002 7 -7 re W n
+% Fallback Image: x=317 y=226 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 317 126.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gau0BG>+3I'X\cJMolST\2>J)`Xm-!*"er86_[sF8ts.m\;b/YZ>>p\PfJM6AJCP$5`m?j"U
+ (V8/Pr&.(hJcK/5h4ob4FX\GW[%nGB;4t^@08@SU9h9kLZnEs0(YPkkI:ej^U]30Jl`?'ND
+ m,jEZ#F,n#*J55>!_JqJbc@3r1`<IB7^6paB2Y-3>uA0tWp(4Yj`m+J_-VbV5m*LfYj(`Pu
+ ;3Q!X1I=C9Mb5M2@^:oRn+W7gh,'h(6nBRYe4F&^Skg=poH[W>=n^c0QkN:%Ldq@a,SfVP-
+ cJSd0E(%'iabuWIhn-MP(D`%igt8"Wl'_D+!Uml/I-/1j\!rD<gU_NFg=i]Ff=G^2rO-=_B
+ PM8?U&;$Q%Sh:qn6jc1dn//pB@?$XB!Y#r7db,1rQ+*7A$K@s^(&eFqYJJf<]D[:lEk(.92
+ h%bB[N3scsSG3N47*UQ[<Q(q"2oV'UrNKT'u%u:.T'qr0`NA"VXR)/d`(`2`F64S/j[2eCE
+ qc<:#j6D!'!KU!X]V.ZlWHMREm.fW1t'03ee^+bpS\E43)o8PDf8TANdU91J@<m]OgZ'dk?
+ B@kuFCE!EE2r;"-R12E0jKjm&P#*IImB@>te_23?Xb%OP;Tcn#L(_H1,AgYOLe(dVdQ:[o)
+ V56'&fcU.iP4.6rJPOCSa_<7SdHAf_<_sn`j",qZU:mQV;cD.<=#\.;jGf-nBj;WcgFFaM4
+ rJXM^V?hPY#R"g77Uuo><b2h!Wtb.*S&[@@eCE*m+GbS=I7R=rH@R#\9\mQ!9&t'lCOk"=`
+ 5r2H"_0$^Se!=V55@f/]YgVcI<PcJcIJjcpmhAA5qN\VT)rQdXB";<;4PZX=,?iTr@0J<u5
+ Tn)AjSAA!N/E4Zq.64c2CH0$(iD<Ei\a&2gl132>"gP!Pjo0T,GW^)b`iCo-[lm?NqMDE!s
+ rdc/<N`RsAEUeoEHS.!S3(`C#sFUO+(R?>lWG,bKOflA(0"mI-k<E5Zn>Ihe86YpZ]*But^
+ 9(MQ"iW$c?j9`gB["!T'V+Xt"[TL,`o^q:/&nu^iKZMeoGo@O80f]%+T]E)QM[?[C6"OWKb
+ Yg`X3/(,&_#[FU5(kG\&"$Wm9as!i6KF7G*Zg',@Yq>d2*![NJUo7^At__T5R,lNd4-OYBU
+ E^VO28Y^Yg.9o8YqUq6]LRHE+fiA96iYD*KCJLYue%OGDU*G"EU`gb(:nM)]HKs)_hXS@Se
+ BR351'S+oY_J=#dYW[V_V*2USL'U>^\#p(`@<2\m3&gY*e1J\F<a`8nuab_Lt.OD#b!lK+Q
+ uQkt,e)CB&'eWhL.Tl9KT^W/RUP,"kT$l9Im"PaoW0(rar%B3=N%^,f7!/WrO.oK=)]!(PX
+ 9=f*F*_=j-\q,]3%iHDlC]+q^Q-Eq4*?;9t0Ot5FrUJp^Z*lR`^^uu'U<;)kZ"7=!%+qnAB
+ LoY,+\Z]uaIr0<<E6^t!-!0*&oAeR=W/3?`:T-W#qH!3D\*6p"9N*OO%3OMf(/Cr+[^`U.K
+ "?[-Gq%c(PrM9Qr`+,nHWZpa:lNK@q1,^o?3JM+`\'^9d%'O?iLLrlgjYh\%kcup%\:dM=)
+ a9~>
+Q
+Q q
+325 98.002 7 -7 re W n
+q
+325 98.002 7 -7 re W n
+% Fallback Image: x=325 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 325 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gat=jGtc\"(rq!-E&_.2&7ZG"THqIKW'La[^]ob;3"a!FTHZo\+t?=[%n'T?-KSEba]VdaG,
+ 8FWckUMM)jJ6\9.<:>"^6It'tF[Ye30Ku;d(`+-Z>I2ePDh3q0nt!f5KPI$!UV<`&`Oi@]`
+ ,J%LRoq/h@3ZOi_-gOMtZ`)N?YFm-jC]#Z_\CY-*MCX/`2lTVdL"]1YckCj%=mfohI0iTFh
+ rG*dnO,G!\SRJDEQl7=D'W3)U2*RuEr$AFbkT"V[UVpNaChqS%)]=Wo^OWe7241i/+<srp&
+ I!tm8q;]N?l0/kp]pe#ENfJ<oEe1E4NgCRRgq!'@-_7Ko26f[TJo^YUb;3e:4Zm',\FK<g7
+ u]@Z=Eh5$H+^'<I=+04!]]M_"hM$]OJV'-A8>+BR\M,!m+FV,>q63kk!hi2Za6KVI@B6=rr
+ *F%Ap%&ekMAAqV+\1*a*ujX)mbht]XDZM3d?a/rqu)4J:F1TD5,KFXJs%P'abE[F`BCc$q=
+ Aj8FD`n.7]Cd@^.O4-@2m\+H[7<ljGm:fOH@]^e74#<Pc69EO[DJ/EB\W:bg\OUD++`fZ[#
+ "g"sf+Z?9sBrr"jKT'sP5g9S$\\QfH50:SK],gT7\N<fZ8Q'Dg#adf#shspKoSNEUjc$+TN
+ +?l8Ra5V'"6_U]%F\GJ1EA:jtT0G!Sb\3.UkN9L9`Gc29%HbdDGk!^s>H4O]c^QhpMZ"-@M
+ T4W7p[69cICf4QrMHqY;-i!ZOU+Q&T:a^\0?N;`1G_s:^46?Z,A<WqkYV2kI1b5C,?H*OS!
+ q?">:1FN!(F&8nt\E-GI4\t@<rhI>Z)tl3t^EL2)S3l^B+Md:RqRCTC:J)'+1R/%c"?9#)A
+ ,CYlPYP?bQq_=%>b>VP^A[(3snCG-JNfNQqGM+p-2I(.`Ufn2c#'$Ys0Z5t7Wk#Qu^,nu(p
+ (,0OQ'&YZG0Unf.["mcK`$l>7;Y$X+lBbE?`2\I$'>/hIO<\,de#7]25FVGP>-RG#jM/7D1
+ aBQ+n*?E[4'FI8S&lgrU^7VhL)0DC2874JE[=q%<d&f!:U&kC(!isF$2E'OQiR'`14L_aoY
+ d]CZ8oo#^S2cX^a(MupWg>VHTpV=:J52H<\+amQ%B6<L:!DG*J20&B=-5X.4Q*T^hnPILm4
+ Kt2C2KO:oL[YN>+o2)!dh^mP61n"JUjAV;\9d7III55GW[%O`l?#lTqQF/9HZ/H(a:"3WX%
+ :37YC[),:f$UC4OW%V(bJehS+^+ML5+0:]ph#M*sBa3.rqT"c4MGcQDK<Jj"^F+^rGa%p@.
+ YrIgQYK6d><,Xb)-ZEj&knPL<J@q0l.b$]FnLY$(>W4?.sgsu]$2Mk+.dCd0+8L0Ja\03F5
+ -C@IV>o3*^Z9g;>nKZ6q)MJg,'E#MUTp?HBmfpj02c-Ee\sbp]lB8d&b$\%2cYe[M06AU5A
+ n%Je=]A`=rfJ/n#=b2a<.aPu]tJpBl+1D^:^CY8PrD/:4+[-Z4C/JPUUf6JQVWK,nF"Zl@J
+ t;p&\\acBeHoi<%.AXpcfJn2iI~>
+Q
+Q q
+334 98.002 7 -7 re W n
+q
+334 98.002 7 -7 re W n
+% Fallback Image: x=334 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 334 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$BhX^n'\+<l6pqG9C`9(!->He\U(WI*2(ha91`3^?(_[WA`ZJYlA1:?t$uHQu@`;NDJ0
+ Is+B7LHo(7:dlTLC7r@0"t1:j+7oAI`nGbNGdFcl_jp?;C?lhg=PBHg\H=9ht]&rk$^W:t0
+ &g<q1F?`5M5"KJGHt/38)(ON,8]31NSn=.Yr;+;2)KQVWR#P*tWWEq187b.;R;j3!Xo$Pu]
+ 9T2%Fe@OC$*4e(m(q<$Bg_9JIa"pHGR;mc]0AEGq(i26ej?=18Hc5-]r`k/k'Cu/troVP=s
+ &>*F?CjG1%nabnke8se<?Jt9ZSWkt^hbRj%'T3?5[%'4%&-2Io@J89SX>Od\DJi-L=/LmKj
+ Qb9f_8V,ik(X>H[;4fHm7KEb'!skfI/"Y=V%a3BK7d^sf$[GEp5>PMk4S&q,=e>CfYDHL%X
+ 3#jgY:2D/IPdgKE-GbdVsP[L8/73ZZF'B'lc<Y5S/V@/hF)ma(m.Q(`seG1TM7Jg5LuRa@N
+ "kf?7[E&5UBA7C7aVK<;8.XK2IT/]e9e5G)OtK+4MtG3j)#da"K2p\%&sl\32//(gUprE36
+ )`T:P>Udgfh2E$+e<WNsOraocVZXsg=Rm$Y*\U!,GH,0k(J/g;Y\U*pSBP:[P()$(:.WnoH
+ R<bI=]sG:Rq=ZD'H@>TEFG:8bM"&2I@1JYd(GS8pL6GQqJHM"./1.7)W9@`.D1??%IU[oQ4
+ JL6q[C!;3,gt>tm+]"An([TsW`A!f%O&9h:Fn%Fbg6SU6nD]*&gs;4Q2gWa4=(.O1!nK0da
+ OuCl,_'^@q2I:qYbb$T:b<6br^A:CAmuN<iuj:]K!^TP0E8#Anu0m"GadDY:a-LRSXi(CPR
+ YA6oGm@S5M87!9?I]coH:HG/R'uE1kn<6>E_:5g0d"`6JkTM0*n%m+qQ]dhA#tAMVA,^h<2
+ !i%rXX`)kD,9V80NI$Nu$q0g!PV8W2[%2?T9"CR(>4aUR6%"tR%lVKlL$a01Z1B[R<baF'n
+ 3@kEiTRoruDFCD@\[s56GWaluT1fDb*&=<jpSq3[179mZ>7r!;JUhL0_5DfY7pe><]f:+)G
+ jesaHotZ6Y,QtX7l;3BfdKKP5)r2lf\*6<C2,=L_-,aQ]=8kF!K?%E*_n_:7dTHA85"S.d2
+ KpYh=-n"Y;a:VY=<#_o_*a8X2A)FNt6O;",[(@N$afD(olBH_2aQ'^-7LK$*DeJO,Zm()fU
+ FYW2lsB2]%(=(ZKW+,`o6WGP8.C(lW<CA\(Zj1Z9T4K\]O2$pd;Umj!5^)"JNPB[n`GS2):
+ #\0-$O9NI@K?A->jnfiUBIZKB_6R:s"Y;]apkn]-XWE"4h'c[]1"!F;dJRSgN_<8]NRc\52
+ <L[lcO,UkLD,Mf(?bC9$RZ.;!Si0,j6@9k2We7XFjI#+d]J2YNDhuC"'c"EAN@;`Sf$:d%*
+ =V?7%j.GN)Q0@9dYQ2KWh+qLGTQ#F53Bs_p,;,VBHP/g"tlIHh7qA:"aYY4C]~>
+Q
+Q q
+351 98.002 7 -7 re W n
+q
+351 98.002 7 -7 re W n
+% Fallback Image: x=351 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 351 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%BhVH>'NIGU86%LL0qqNMd(#`g2isu*(o'qA'pi<e$UbZg&reUqAM805'VR,Ga>+G8P[
+ Psb,D/OR!NI`mDJ+VhJ[/u1$F5qKF.ghMnQ9Q$0u)ko8^kEJh=L&Yn%%WSbEr7\J%GKf]/;
+ T/AP#H>naUO-@L<8?-'t[nE%HXb<=&d6.1ln;6mAa,p8PWlbhQ\^jKht7Y?af9F=Hn\q;d_
+ e'94,.3-)q]&s"&+3INs5_^#-NjVPCD]nq]tk2fI-jU;?,Yt]K<E3uYrDsLH,Za1O>c'p0W
+ H>C]iW9r>Lp?b3cU9eL)?b`aOZaFg6RCTf%6cnA"hnLhYE[BuFnRjI,:Y2^YY?oI[[49DJ0
+ l5rD1>%VI\;n2[CY!G_D2R/a+8Oj-&j#u.Ci"`%8S0l(G*XL'(PIIS\:%TBmf)8']ckRcs0
+ -%UPJrHP/6]tsYTS2iHij)"laY,A\hng%=tlj[\<-=?!D9%\:N%[8Vf].(41eH?bb`cc1r8
+ V9b_6E,mHk!fcLeTPo=).#Rm-ciCi'8f[(tA$KBCHJ!jMt?r9EC/a(1os[8JHMK;RL3SPiU
+ UPuSA6Rc3LfC*5Hb)@[t+e#(Nj9R/a7&coS/Q*6/VSd9?j`ud?qP8<`b2%iJZEH/Tc2iQF'
+ r1I)C*;[dkG7RD9#fmU9,eYYNf%0gVAd$AHK6'J_?_;`2Pf1V?+sdE"qPpR@NuuKfr?bHi@
+ j;J86HK91;V^(?'&qh'R(8b.OrVJ(F_]j9=eNa_Ta`DB&JeFGnn":kqmiO,@Mh!Q!s<4GG?
+ \:2<;Ipc!XdoTfR`Ic9h63pP*o/S<1)e*nC5PdP5FY/c(aE8SP%G]hJV]Fl8KWtVrI6f^d.
+ !DI/(n(Ma+b_+c9jVR78-+SiiD@E^j[HF'c9`g.(>FSt6R%?SW?V'*=6orHpHU?-9UrQF9X
+ W`WB_taRA"R5&(B!&`h9#_"^_;mGc"?[>VM2)[cAJKD,"&2E'Dm<i@q7D/B`E1ZlqL(W)`5
+ 36og2LLAH"B<JCJSrn3MD(leF)Etf\=9&,>EEjKR"E"=F5ei['o-$M>gaG4)7dB/<Od`:#/
+ C_FahpL3fBoR#WKRn5fFm8QAa*r/#L--k4p"VR[:?[QMKHjq!`E05m_S\77?@C783guK[f=
+ miJnX2+j+GZq*P\T<#G^G13(T8N:C`j;Pk*C/Q%SkMU<7Io!6cQ>NbhDj96UNZ:qYT5TV$R
+ IChn9tQn0!5D:'.Y&(`0(Bn!Y/2_d87kP_F_eM1RDu5C7W#SN&n8c3B'E3)e&aq\OWFPFIJ
+ S,5R[Pis#PZ%pkUq"U/k%M(tb_GX5<+V'3`@JqN$tAuMGurlWH$/hKMq-cV*1=DP$4#'HWt
+ AVl7UW5[bBK`]8MhG&qHg2<slCFUca!TH<GJ\(dWf#gUpY!ie\[1N,D[2"R9.4^%O'*'UfJ
+ .l)8n6!l8^&G`0=>!omhdA8NQqZQ+m2tT]'[6~>
+Q
+Q q
+360 98.002 7 -7 re W n
+q
+360 98.002 7 -7 re W n
+% Fallback Image: x=360 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 360 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/d=%nfT'ZW'D'bDTV<()."&UeVk`2JX5&I`E=32=J9qOg4i,n:=dMNgse"cCIZ;c'9PTk
+ +Tu&^XED&S.1jatC%tMLV]cf-6#5puK[a"O;5eIHN]TJ'X[QpqQga)JEui8ko7$(WVGkieE
+ 0#%gjfVo:(_3!s:c@L6b7tQH.!G,q&:ES7-u!,^33ej>o;t=BVm]?[dI_6N!f]Z,_mL7Scg
+ OI")&WbL5tCeZ2jHp>#0,hM)5tgg4<IG`nn7r9;\XAnE2U7fGJnqX<&;q<@3@Q0]+V"</7K
+ *]aH'$O_lOqtJtQ#PZg$PN8l"?T;@uloTES/mX>pH8K=0mRNa)q<7)=Cu"6LX39;&JJ9;lE
+ BV!*Rl:T?g(f&2E8nipYH4k`dchJQ$2mRm,T/8p7RZ=L\YWQG*bT@3?spcP]9]^6NQ:>7oM
+ qsI=0*Nu#i^*o\S`EC7jc@0Y.\gu7Y>I.m(rDh?TQif;O*Ds`b!fTi7%V4Dl7;_\1LqI\oa
+ p0WiED21+>U&Vl?^]eC8lOAP;C[j6YO0Mg^$$_58Y%'R"Wh$OT'F-K<S>+>NuKA]YSMil)F
+ mPUQ.cO[91u=#DioF`lTD>8,;Paehlaio<>gr:ES1hbTF*-gX^&POn54j('[@:_OLs[Ph$(
+ ;,a5B>,4E,>.>,G4S@(P%c4gaFlc5hV^La0!fSi`'U%P)iSjduk-hQN??C;#ND7WZ,>;BK<
+ :Z`;#$"f/JW(,5/RJu==rD$hMVc1tc,IXEi7fPe0hEE.)\W_lp@7sWG+PaM_V)7D2/IeTTd
+ C+We="$kV72Hp9(DPlM&Zj+AJBOj$GtH:aLFV^A!R<%aAp/h_KaDPSI7;5pA(:9qWP#T6CC
+ '1'QQZs@1Vi"lVS*2X4Ogu'mOtb-qGL'R2g\TFSPYnq8hOH%DO2_LK.a-n;>mTJ",)4fhU?
+ j.cTAP\\\js#Ve%?g9V#snB&+UP9&0$_P(pRYQ097+\*h)=:q+sda>lcnM`/;rX`T"nGW5U
+ 'VsXuTg/TR@R/K,k2KL>hRF0+D]^s&daF9b*#rUu]-\a)4#%V+h;&EM;cqK<EB%U0Za6j?&
+ c[HFRqZYr;$daunqe&lB#_Q3(B_"?ZkPS,4$#b3"3>4(Z;c]_Mhd$VH@')tlEmpG)@b^C^*
+ SJ)qh@_F9M4TLXi4$ICb-2BWu9!!5*f;!j;/Tkf"agH,tVO(F1f3PZEo=5H=WNFa<VRbDrY
+ k`0eo)>G*m`SddQ!Z.@Q-O:kZSmrZI8^G#_T&Y]H2U[$s!G'f$Vk/63^NLUt`]N/jRq%=*6
+ _j'-_OW.7X0$+DUc@WurPk1Eq[&d^2_Frh1F!Z]h'>SrhV'Q0b8SMo:jYAlW0C2..Yg<@dP
+ X=Unc8kLej?qs[;/nCpq%78d!ZuW\oh/]2!\D9XNqW%a"%VasQ;/gn?.7=aIUOg/\J<(CD~>
+ 
+Q
+Q q
+369 98.002 7 -7 re W n
+q
+369 98.002 7 -7 re W n
+% Fallback Image: x=369 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 369 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%BhVH>'GYRW`MfGpW'nTN)A=E31e(t[iY)!aE?QZ<9[joRdAScKZ5#u9as\8YHO!2T.A
+ 6hY;*`9#)ec'E/3?f[9.<uI^m([[3S;QF7i=*'Ia#"+3GHq8lZr5rHg^hn2YMXu8't1:=dt
+ [Valb1"]T;UQE\:E7'kImiZ*DHi`/<X:.Y46I0<[aB1_1%XR;56cGE3jGHLkb2[;5#n0"j;
+ m2Wa!kH]WRQ]^Y4:/0CMN>IT%h%97%O%/'@YRFOX_S,;r6hVNi?B6]1A`U;Fp]ks5R;-UN`
+ JG:VJb:@#Y^6cm$Vd6q`o'n.9%/c?Y3n2bOAk!r,i*c*2]1D^`_hYd/?8"3QGd2_ro6'AjH
+ [>[uG3oEWHK)!q!uj2=n(ApFI9LaQ`k+a%auGo;Z$:M$JBZdmPq$6P$E;OVldq>]*8t_jbZ
+ _9'l0cii:`.BAKt4`+?n>U+Uek1]mPkclC/s'Wh%1k+hE<<O$)ocpab\%qTn='peX;g\2EU
+ *IS`HP9O]CV>75PesgALb4F6<bPR6sI5]QkYQ/iZ+?FcG(b;g@C2;QA[F:j@>4q8hJ:RJCV
+ c_e4foR?WB!;GNd7#bVWMFq1$"bMUF`Dq[#LcQ!o+B$A'NBF>T//maL,+iO[%X"Gct[B-IA
+ ^>:t79P-2k[HV']Of4X:bOkKtG9?sm6@.Q51]'6p#0rg"k<^$lJu1ejO)]/HUscE7RW#=1U
+ E_!oAs:'XgX>Z'\@@d@aglg]@IN'/eZ0j6aMNX%HU?#<N^:t9@BQcl.p&I%YKi[ho^d^g5\
+ k1Ss4q(eN/j'h+jQb.W2lprnbFm4b@AT>7(.jU(a,mh1N["W?Ok%O)Z27"Z't7Tq`?muAFN
+ \P(4oT'j]V\cUP!LtGPcREbl"&R!-37%+CNH^^17PG!.!T'rKr37-Vql/,7,CmjHKZ0T<D5
+ B>FP^odcZf)r$/.)T_dD!G#I!=5FLD(6JfP2<^8K8/'O'.&@lLR\;(=Fbmg[:F)h?[Vb\DT
+ baB"aisCjQ6dQEI)VZM$^]B%B^g@R+RF'rsNK"dO]'O5i'WoDoiU(VmdO>kI#"+jRi'DWT6
+ >L;7^:O01<bq!f[5".F@!lq5f[4,@DZ3O3,*.c(N^=m$CXrL:FbErH/mKe3#f&@6`:[lQ"5
+ Vec6=dDsN`!,#Bk%Uhn9VKG,nLbQIEFcoio_mt#fQ)^JZU5VLhJCl"=Gr*Xj'96..D>CL4O
+ *\bq5X<Yue35$(urV?XH>)`Gj&l4m\jg@\Bb0.hUCaCL:G-0S,2+QQZOP)%-Bo66])d4`(P
+ FVmNhjO:[KeaF![nf3dRm[t^cWWA.nBFK3l!^kGu*('[;I%,_5WX\M[Db%.`pe<nW"K1=<:
+ Qe.)5Wg"4Q(KQ&eoDUoLgTT4)N>Yq.p?S`\D3;rEb*i\FXO%XriTfmZBHYpVQsh7b%jgOWC
+ >+qF>\@+$<%9<OVpj>Srq;,tHPWq*O2.A$12q$Eq."T8m10s`'X@~>
+Q
+Q q
+377 98.002 7 -7 re W n
+q
+377 98.002 7 -7 re W n
+% Fallback Image: x=377 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 377 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%BhVH.(fa`sO=5uU,YE$rJ4i9T)H#N-NJXBa`&38dpE_P/e>TX\Pbl`8RFX\tM_)0U1/
+ J/`$E+6,aC8:U"BhO6W?>d:%#[C:SB77GGn`?2@?UFD2s3]ApV$1DqnDZma1$!eYQ&os/1j
+ kuV,\lg-t6X8,a*2AYWO,H15*M:M$1:ea2cdY-asd(I'0V1N/gf(X(#R[Y@!Wf4e(EtSU0p
+ Ad\0$bSt;6fi'>HD_s&OE9$a$L\U:q5,ii6Ck32:gPo2W(Y$=O[E<6rsm+`KCmOiU&,7q,'
+ XU0f3dCOIpp$8B^Dbo#p%q7e1'H!c@:H+5D<i)\-A2<]1PTr]6*56"oJ&Mc/ZSQOqEo+*55
+ ;$56"ZC@R$Nqt]52*I4M3h;p\T@RjmoDhG2EcD!(`B#&2s08:&I8a3h>>=K)pGfB`6g;arq
+ miX*4Y_96$)4P^n98t;6Zg*f]'l2[Vef&G3o%LS+<d;aD7!]9UOR,8sCbR`BcdST0EkKd"M
+ ifG'3np[f4aRqqB]t>$I3[Za%?D^TB(?i&WhcD:ntFKktpL;GqRbrqHtH.[;S=?;ug$k[XP
+ I]cg-Gr\J/:dq@rF(6/#qdNfGV.k>Gq#g_VXRtj%;?bBL`j#-#]BdtTS9he*0J]cd>iIb1)
+ +KCEE5BM%e?(>'(^qc\nWQ\$d.jtpq3A\b5*n<g6^H_2\mAdZUcuq9'kVX7lk$L23HWjYD3
+ [e(ll-j*cpWu?e5Rq4!3(>]`L2*C>GV?n5<GBL7(]*sXB4Z4p[/?ZK%efN3NCGDhnA)i$?E
+ ^?0<('7>?FpuZ@u%kM2:T_sE;"+?C"('Ue*.D`]O1cO/DdlKI4=:L>@5,dm-Ph]miNDcqVB
+ %5OU2ACIBtP2J3RIG68PXdRPO!@jN/[_m.[F?LFt3?GONg:FfOC!IEWqX6WHGVKCXZb]i0[
+ ];i>%N@J_ukN;IJ_$@h4NZ+G1I!9TMjGT\gegt_ZW/uU%.c5a:#23UKsGl]7_NeRbjfjOl+
+ cH^*YBYt%rk0995.aRl@7<A-*D:e[Z0IO0f'q:2]6&)%t(cML%NMM13oBtC"EdfJgqbgc3&
+ &VI\iq\W=cbPY=p@dq:ArIu^$W.!t@7umd6l\K?@^Cm.BunT>`.>@(Vh8^`RMd>71,oO?"$
+ .Gl;M!3/E?fAIT((:28ORiKA7)oI(*9V20(/2n)X?VjX[rkJG8Z6K0OQ0lV:(\]<jJ'YGgd
+ uPGgQ%d[nqqlV%T+,QWp8^0%:$ANe0M>a@RN-ORV_7;I*em59_?hP2rBC%W/CsI%FZX8cf>
+ !2C]&>kZ+Z2`]VW(rOJf&+X[M%$KO)fj)T]0I"#?jL8MU'q(ja;oFVRIPKT(u22R.qFolWX
+ \u5mH6^K1?N/mXH1`\'2=sh/MSciL3mt+G>oWYk0DaP6V3pZ(b'aeeX'nMD!>'q[D"cV!MQ
+ jN5tW;-C$o]oQkpul4On=-t8Ifo["'^G~>
+Q
+Q q
+386 98.002 7 -7 re W n
+q
+386 98.002 7 -7 re W n
+% Fallback Image: x=386 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 386 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$BhX^n'Ql^h+<i9bC=K2T&XOma=/%%?0t>6Ah3b.g6t8d+/MS[sZpb<1/X."RTp/.oZ7
+ .#f/8^VGZn4&8b,SGk!Yn=3Ch_:L*P_CWJNE^r?h8<d+5_E.pV)"#4n&:Bs4;b0HM.,h_ST
+ KM:mR7g9hK^L+(*:S^>NsHU,k4+AO;!5a--f4J#0&%MoB%mR`N^![JCbnO`U&%f%ICo-Vlo
+ cI/*^?rV-'RZ\d1a#Le\SbrC.JdJ<D0=0K?rE^*T*P*p[HC,(\Pg':-.V"j^1DVN2(o]3/X
+ @f^68l2g[,bL?(NL(-7`n'hFEOAE$_De4%_qm%t-k0D7%%]AgYc0TN7E%JiK.sfl(erh=1G
+ B]pR)ftOY10AF3pl=1/V+VDS[pqq^Z"$Q^?S2cpP4JE#&dauZd,"Y(."!'WSp09'8eJg`F2
+ \"PiH+1:c(5s<lH5JS1N^VF!fU9gn/]+QoB*;@4HapVbW9gBQpO(fhEHDd7A1h[)g/agJcZ
+ g^?fLPSnAL0q)`QVnE=$W.VG3XUSMVd?i^>Q#%Lt<c8,AH!+k*=I$H]o'rH[X*=[[r@B*Zu
+ <*UN1Xq,gWsQ^`m8.*+P)0DpankQmd7j2M7]*pl1,'S4')@tX.8&J=)3(@9j]E;d?n0sOk,
+ qCIhQX&NVAPJPW>k)H[@!YWZMoAf;rNLM,/\s!fK"3-9C1F#r)K1!`0W=2k[QrU1.*^;9S;
+ WX=7TN*p-kW:iHb^Ch%VPU,aY"kRN;%a_%;PSje%s;kXDFi35H2MoUP7qUS(G:[([->tl$P
+ cN99r4\W+$O@B>E)ggeYr-5)73S#CFh(jO,Sbi@b7_LpVZ.;!D.f!F3oRHGG\19A&/6?o&X
+ O,A1UGM7`+%>)P^VW1)_a/(a9$KWM3V++F?WnMR!p!3VP>)eA#tWhO_e+WlD\Z`%V[3.Y+%
+ J"dGYK-iHqZSb[\1L;;a'TgB8W4++u_r.BQ`&kMTe^:/58g5Yf7Cmj_ZkTJ^7).Gk1"7>H*
+ !'<85%eW<sUHL_I*HCDs-Z%J!\:$H,$Et::hm]bk/uA,s>RkUDP*5C>>ncSXK2,jLd4u)=f
+ <3@XF\5?*/$cKc?G5X&YO<9s?9a*1s"Y.V:=n@ZWDp=@H`+s-&d8NXD:g@>6nVY23"kW_0i
+ Z-1oZqPfUIM)3TjcN,B8.>`+ZQH<CP2C4==b:BX>4DL8cf&9T7S"@C'9.72)R(2a;F&I2OT
+ ;4[a_+&REZ;XKZD:-o0^p`;$8SH\BEWs*7PG<E7QB!J-@;tA7f9Ri9J0HLBt\Q/(s9dOqO#
+ Rhf;m9?F5Hb:TNO8E;(`o^'*@YY>\BYNTeI)Qo1L"iDIM)=jCPA$OqO0?s%sR[k9>;[C-k<
+ (`>,u#l-?77($`C8<Ns&N/1;a@=YKYp-MAYS"!DU.7DTd<(&uS?J_PU^u6GnOYK4PkRhif]
+ "h)A['4$'c)-5N>`bQ!AFAhB)iZ!9#=]qE$CcA=!?uOujT~>
+Q
+Q q
+395 98.002 7 -7 re W n
+q
+395 98.002 7 -7 re W n
+% Fallback Image: x=395 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 395 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/d=\P#n'S\IXQW/oJ<8;?oQO>MtM&Ok\j+Tst0k`8tW/37oNCG438S'=.#SmXV=WA9O$k
+ -T5.%*p>%NQ-M&BZIP>7kgHJ?lBG0MeU159C&s%Ms1D?f!X,3U_6?rc?A/rfN?Cc[U&JR[Q
+ ENA<\DflJgi^@U]\>U'ecTm/]oU6kP>De(_?[mHpY=n"lkqH@)^=SkV@jlLFE)5C%K!*^"*
+ H@)=:K=;4@?&ippL7--'_?.OuSW@(Ig+$$(L]/P'5p5$t_,;sB?i>X_9L"->3-@DPDc+\J0
+ 3&]>i?S<n<<*&-1Q-V'g8j./<@K6>*/R(QnXpnO?-=lf7&/U[@B4hfYYX8\%\*i5+Xmh/kp
+ 6ANYq;_j9'p[NhCA9lmYA_GVo/n8n-s*KH/mj'Ol-d?n9*,k\&qL3JhOp,a8NZIh+ejGWpX
+ dC'<GOES#(rl0g"?'cXem>2?=$3Y%u78os6]a[\*)'0T/4M`-M*cc9*?$s\*)#JZZ+lU%3(
+ Hn4J$nF'h1[@_8cD#Rh#/![-2RPbEJ-2I!ehP*J9EShsB$RR5;TtE4@c:M?kaKI7HfGWAtt
+ EWZiac+YSnV%WliMb5E>$L@Xp#bfi#^_<GUXI.-LKo9,9OUSH0-kr-\A))K>On(hQuU3Gs3
+ .Yt+Hb%doSkg8XNH@&(lIWg2>gf.BHXe&n16G)IrJ^fAFCm;3[=g3E;#J7Jkm+Y#ZkY^r`G
+ EfJD[FI)n-n:^ALBkH'gM:T*daGK0"]IfT^0@up@.@]5RES]7-Gti[cD..)EtjN+:S/7]f[
+ DY3hetE@,[$"C7:&g;Zce\64?]Iqh5-VVj?.Rb#V=U[3BK=?I,sP6a:Tre8.bBTO8bB)cM#
+ h&bIE33+<R@0+"]8AbJ+Z3qcuB(2@hc"iqD`D,'N_KR%6;\DVGrcjqd+E8rpK"%%d4#Bn.o
+ Bh@:$S>bI8o?9"'bDX`K,<mm*Q[F-lgeCW8`XK24r;Smgq#n9n,4%C"](-"<Wn\_M8>j)$h
+ YhBmH$tX"O+JO\jqN;n.@$nWFK)p"6;3=VMb.N%cKgU/Og.4FL32!g*NJ6%j>\qpU\\COh_
+ `%5d@5]q)N+KcO8EO_$Xe-\&ot]*X"P9:E;l*NY!)3/UREak#PlK>7lO7lYl<h9$+DI`L;b
+ 7R'o'bJV$cbm=7nrMmh^t0X5!J</F^?%3Y`u(cG\pK7]ukbOCm_6po[ij*rI!RUKO6?<`.B
+ !_GBjhD_ZL"R%dJ(TkYuFb!-f4qBEa]JXVNR[8LQA`]Q`R'X-NF"=]1E9)NBLG-JjS,m;%L
+ Ea%C1HoVo*gJD%*McB^_LgT%=E_O6@ga[GI,R[[MGIO&utP^iqLAMEJ<ZuHV-k`ZkD.KU!$
+ HY!-ZPrKJ-~>
+Q
+Q q
+403 98.002 7 -7 re W n
+q
+403 98.002 7 -7 re W n
+% Fallback Image: x=403 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 403 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$=\P#n'X\M]W/.rl6"5e)9AFM5/dX.M8PBhn0dLKj`b;)h8UM[1!X1,lSY7h*";o_,hu
+ GQ0*MEtK2GspiUJNkJ:mM/o.>9C=3MfF@[ntNC@@lWDU_!KTHbTC5F70")VZ)YV3X2%B^D%
+ C3B4M9H;[#`a[INc/@q'8*+<a%<S6VDH-HaJGk&S(KCXl$'Onicq=\1kDiSD,\hRo8'm994
+ [9:6SKfE0@[bJ3iLkMNlDgV%rF1n#gSH`XuSaP=eqrUK7-lg*0=q=Ek"M*=+ChVPMapB!'r
+ p/o-*g]29]Un^H/c^i7iEWtO:^qb\`N%ql5a=OHrY+X7%.23JXG32KR^4!2nCgh8=bkCU:H
+ [8/!g11C`:HV.aX0#T'""FO-$EK2GCb.,:%1X#=]Be_bM2?]d"Voh'PBQY9oWDIN%hGPL44
+ DH6Z$(!&RPcEG>[<b.1<\MPV2*+7p$:WK*p!+l'gI(J&J7m4T&0JGrP\30R=Z'nQi-b"2Od
+ @5Un9l4@U?-<&\`X<R$1J4OsMqT7j:9d/e*#J7KS"g.blZ>lIF=5!9e)q:h-ZdOAu)L_Zq0
+ =*4.bAgU8eKB,W`M*.mSE!Z*CAiAl`/Ci:ETkSUaE)9ChK*.[8:,l7#4VFKFpW)9OMbf[Z6
+ Sq[G@;%YGRqSj!*1WX,)&`n]t>%GGhinsf?qWcV4FmDqQI>]./p_Xt);-r,Rq(jMMWRXE!M
+ 3/B4PZCf#aiHmLNuL$PaY-n(^gk2S>J(f$J.ReZo"hI_>H_-kdab04(mrffM9IqM4Z\J4Lc
+ ?Ab,6+P]4+>hd!Kr"ha;d_pKfV6Q7W8VQR-3pF:8^apg_#q_1SPm3T@3%@j5MV?<^:6g3T8
+ =.eBDlQ$[6Rs7a33A#r=HB>`"mo]tBMh*sXeW#PCeRAsLRAoq,UV>d(*412R0ES:kY&7^[9
+ 2mGr=$>+@\;IoB.7Zp:q#0D5C7N.hhNIChd2='$7-q8.hNOI_pCp@b^OC]aj9GOLRH^H]QT
+ -gB9gPS5E<4L972G%(Nm*c,]4YX@hN-8Y\qm=`B41#N7taT+GnHKl4=d3JEb>$20<_62f*`
+ M?7AD+,DVVpSo;7sfOrmHk`=C_H0ra5DME!96+lLLD5FPq()$0ogud/r/?VPEYSlj"8E.Z*
+ CLn9hjX&>V*mrM\i.4mPFqc`j3R+Rbth"mHu#;)UaS(C"6t3?9\tl%0(EWc*k93=34p&#7W
+ C2l,]"En)$Vc3r+0Z1ncLk`'EWBm.bV7H29APcd)_FH*dY5N'1Z*a>O5\8[hOk='hJ,0I[\
+ LhE6)#O,B)7(\]jGc**SD5khKPg.G"l.4HAE.N&YfMT%ou*>K;V*?FaPAhC5kTY!l?JGgBA
+ 1\#0;6HnEH\6b:'(A^4,W2&_HKgWTEq5kqh@%.1X-i<OMYcSB6q7#&q"6ug!MW)iUoL(#?@
+ Wm^oWNRCWBn>/LcL587R^T\3Vo/;&INia05s+D>IfkBC'Uf~>
+Q
+Q q
+412 98.002 7 -7 re W n
+q
+412 98.002 7 -7 re W n
+% Fallback Image: x=412 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 412 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$BhVH>'NL"p;*ZrM%;q"1&pN,?r8AQ(9O&3i7&.bX(bmN>1)dPPN29.G+9buB!G'h4dt
+ %i07>mol<M1lY6mrTtV(D!6ASIj7APOY!dl'I(qI>!!bt6CY]mJ*"]mJ)=ht[!Hp7Ied['W
+ "IlW[OrF`MLKQWq;b<3Y'L_;Rqp>_LV(VUk9^X[P\7;Q7cOZt-=58B;;O('Fj@IeiPMJ,bJ
+ VVpeG5ZjXBTq>9b:>nUDS-G4Io*#7"kQY.3UZXb\$ZZCbNI_0P"rlKp*`UD[.naePh]m[L%
+ -=?/m&[uOWd_UQM-Ve3C5QBmBp!SYP*s.!&1\+@1-KbO9]fpWMbV-GA@;XZ4o'q"1DV^5YC
+ MaWrIXSSa%if%;D[&#dm+L/52ai]J+Yt\l4rCDinJ,D5XS;JXj3uqF=Q]299Q0BUA]kos?K
+ "PC&ATM+,J:^X.op&EU]Uks(G?Q\]D!U4qE(<&(Q3/$r3NmM,q,Y>hZO.8),YKO:V);dD8?
+ :BX6Yspo*F8/bfu-]E8f87Mm.Qfrr%G!J58"j1c'3q$?jtN[YdI$G<p1eb0ctl%WciDip%F
+ CG:qFfM)&i^JIj1V/CN\,&+f;+a^6&KP(3@PH#,%KPnHZ,9?XieABBcFAQ>!P,6QWE4EC]e
+ %/9==lKJWG&/**BR7+n9?GQYBJ3641+$t)U=#VuG.$Z,pk+SB<^:#rQgUC`fB(hK?EBAA6Y
+ $R)iS31o=*%PW6B:>;/Z4.'4[V_s9nZuk&66X2N]=N*4I5]:RX`e5_5k4LtlC3:d%^O.Gom
+ OPp-'F+'[q*KJ-iqa2j6OnE[kI44:%Sf3%H70B@Dg1-A:qh>=lPL(&BHX"q!j\T[m$ED1X4
+ `="D=;hRfL`m$:6##X&d2Ug@X^9@q_'e'T*?bj^A/["=Vj9e)?qo9Gp9jrm>/9XoFK\ijX8
+ BW6l5k-klhPKC.iW$8PJp`J]4cEM8Od82!5NFq/Y7_'32OR;dd764dftAMZtLLP?pBF^q2@
+ U-d#_IABaq7Ue8nA1V$/5atOL4$rG2a,_Bm\A9%+UP"3JN9<d]lZ<]6VPE1tk2tgC_Qq8(S
+ :H.b4aWpSX<GRqU^k4NXN:eVi!*h2Dm)I)S!hrC0^,oJSOPE:<\)>9WtH'RmbUZ%Hl/W>!2
+ PWuY)JE[(Q75VB7qCHAnIFPCdt1'-EH>$dHhaK:*o8_9)r^Vs53ptQ`?_[DJ"+)[$K8rQcn
+ 7!__m#%6"1/]>eQ"o1^\rMXf_V\OKcRH:@r?s8kK\LJr>Qf-@Br6;VUB\ReCpFR"nY@cC11
+ D\[f5k9#AJ=)%8;T0QAC]80gRYh2X5UqYQCiH!+9;:<p?@FD/mWL@"9!,paCqOG%,fd'cE;
+ kcUrg&#MAggci5-O:&T<T$AHUL^I(iVnQJ??&d'qJ\A9IXAV?#N\R$2#GI1BojablIm^E[U
+ 02CjK`;3RHkbi~>
+Q
+Q q
+421 98.002 7 -7 re W n
+q
+421 98.002 7 -7 re W n
+% Fallback Image: x=421 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 421 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/dB1u6$*5to3C-\P&..2d-=&abPN=omR6j73W)WHPp1ldq?1r_jNJPm(G<a.I[OFeSU.N
+ i,l%&HccW_gkeKSgm`PuZPt_;b'oJ=n"^jNRu;n(n!"^#u!ersfP<+9-"&jDo6Dg5"nUd`=
+ sFBIKLl.LHHKO;Nr9i*\iqGZe!FAR_Bea(ql^-^2/H>&rHTPHS4_]Qc11m+E1&:U6$$R>>=
+ 4*K.85J*GmQFSTssSND3G;d*G-6[n@\!\EO,l0!g3L$[S4BOML_AW'"YRlBYHpm$O:bM#")
+ hnEbc]D-I1?Ji?ehVZ)QW/+.8Bl/:]l^Qks#WV_Fd@fm]T<28VZ[0%*W`@p<k2%UiP3$1kN
+ otYF3IjWdh]I()9^;<:3NfOSUoD"s9^Zb905%V:F?90Ybnha&YcOpt/7.\RE8fjQoBGl/dH
+ AgJ0Jt/0-[:Z\R,bYa6f`e#Y:a,'EcNXAYs^#iXWe@Fgu$X.ic532@9N?nF6r93QBpr.7db
+ ?[\B^Q)C2!B]`XK-o)&V;Bg[*U\K9a?fP\\kX]tHWV,Rg6:7&#s+St:\R_Q)\X4?>Xq_M'+
+ JCH#X6c33=He>^`W-Tb%k7#7k@k;%J^,==hG)MUZ7g:k+E[ko;'/ggm)F>Yq<aTHs>bo]1$
+ kN?>F0Ed/_c-f9ZYVnbF;l5Yup_L(j,9qF7T95ri2n-r*,[b1@28*jDA?orXTX1o.V6X"?i
+ FGe6a:brG\S)T"f_D.kJ[78fA_JtC!US8M.me)hOB"\8P+.@TbF=t9h;)VI>,CMNbOJi-Oc
+ ehkRGd"R:a#i63L6d7L.*.1-=0?3qQ4*8PLCNm&W*\+'f[bSW`1AP/>'c*kae=f*()JKGO5
+ H4CX'*[VhWf>B(g?BEh##Aei*?h<>6@f+[fY_85Xh,k?lAf3PU?."B%^a;+B$E['A1B.apu
+ dmmr0$h)h]$HU;ObK!oN+>$Cc@g4[%d]O1akV'=?6H;o<@aB;jlPsR8aoiefJGMP<UNbN&>
+ ]OM2,jqm3Ya9b/#,<RsLqLSdU7l6XTK*S#"=Y`t:AnDr9[r+o"J"Gi^J]dge>1tGA,?+cY]
+ jj"c6+'mU1j4BG#'`d@PqYBcRnAZ'Finpq>""_@87B,SU]6uC9ChXa[C%Eo^5`\DfL?mK!'
+ "#>^07(qRIB6kmY>KODqml3lL<akp[3HcM>8V8p;gd#0hPQE<;rJj=o$E@WMCgd,p=E[G'J
+ g,9F*5.8#(LpE]^*qc.m<,3Wkp@(`.rH!UVi.pi/X"2f?D<oH3Gc:RRXpX0*59V\]L@VVSr
+ q)BnaFMV-QN5$t5`9RLq=1c,m\<,ag9)bE;IeHcrLMqCm6BBS07OX7rL-9E.s`3i?2Pa[KQ
+ Y-"j%Vl`[@@'a^X[8MPUn=%Qp6F\8eD\4lqipXtPX8"^1r_cdOMBE$QN'cC@c1%)&d8MN7.
+ 4G)j[A6WtPtJu8gq8%?&>Krs~>
+Q
+Q q
+429 98.002 7 -7 re W n
+q
+429 98.002 7 -7 re W n
+% Fallback Image: x=429 y=262 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 429 90.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$BhVH>'GW@jW2MF!C5e$`i[u.+d24_q'%aYP%N=@Kf*%)e%TBUuBraqNU*(Qm":IoH^.
+ FGu&6Xlm$Wsi@Q<'k7Kbd:KURf'1.1F,`@t)[ho:rkb^%6-f3VU7=JcF&GICb\98P4jg-Di
+ ORZ90\>/0q$UboR2J#7#a'nY.3OU+/3-S=JA6<2=5F,r9a'2!!%tr$th]c_$7_FXm++Om)c
+ @7fr,;_so*M-G$c8?b2L#kYZVM\3_bG$aWg$6_X!S?"8p:NSLl'q:;[<%3%:mf)tA^lNY7K
+ $29*jfb1Q:2u%[]c=OMrQ%at$f@5nM<R&cW$qC*,HTW+2=8V]F3''6/^78bQcW[c9AS9%g\
+ s*V&^=Vc>T<;9.]P1</P>f>d1T@j$(&7Q'a2KLnlH%1a\K"cZl#cp4CYV:4Ji7N=?a.=qrd
+ ;J+o6bCkI-/Wr!u9=*2.5B0o`&[phHqpCIS6G%n@J8ahj^(UbZ]]e+qVQ"9K+ndN;L;#c(`
+ OOnRU?1cRDdT-;>Zd("BpuXhAAn%U?P"qS7[S]6?mL"6!YZ+:!$=<E!=79gZ^$&!)CmV]d0
+ r4f;&O9q:E2DB*fC(c"oRrJ?dSh:ao/eZ-,ha)\+XjJoJXT`*n@`/MpAn*35:R[[OPll#ig
+ eZeGqrG?E!&pg<IQsdr3oD%jK`DpRalKFU[iBgs<5]'\.>BMeYVH9h?b^DOCWhi-j;,J2GQ
+ 1a&9Ugr-35tPbL0mU&B1E,tU3Rc=*(2gkA[4CqDD(+1;;M#a!4$*4aHH=>/"p<S6pn.B[Ho
+ h6!M%f6`C[iOkJgP*RGSba</7/7tlI@To&*?chOAR0`kVX:*K'Ib\O;WqD9EYm5caRb$rTM
+ qhe?ai4)4jl08.N:"R,=Dsqp*Nk4u8C=S674l62:QQ\qL;+#&X-q*HB,\BAUCaD#j=(_[)Y
+ Z6c!lda2S>>Ji<#ASK]CZS<O//H9+-C@AXJ09c<5%8-S-NE8q-HJY?in$5KtV&=Hp\X_%jr
+ \J#<[["B><!nXM^^qmR&&\O_e/ZE7#')\]@G';/RG8J6<2WX$GCatjS\%@"Fmn\F?T2qpZ-
+ JLp4BjTY7Cc32aSk'+kLZmFIdPC(H7G(n4OWgp0`&>L=)t`u8R#V(CpetJcm@B5rX]8@F/i
+ W+T6OYVXac_0CMo`IQ&m1O,dSdHGBku1se`^a-AtosA7^-;+#"OiFMY2[37rA?:(t!N&PLC
+ m#&+\^T*Fc,!TrVUh$%<l-<ngka>fu$`Erb;&KT-NGF7^b+#9oOQr^T`S61`/1p.Y2?a&q[
+ .a2*>J*e!m,]GGq]?ZH(egtUR,(4R)*MHR$FRl>mW/hZ3aMtqa@dRJ]Da>^**5q#.U:`FZB
+ l\iCf-47H"U"F%G%0hesNeGnpA`:60INW1mAqE&"fbqehJf.m)LOZA.s&rG-nh8\LJDg9HJ
+ f1$hMN*ADBLGJ?2PTlP]Gtg<2jDK3Y9pYN2@=%04#DNHaGC3?@AJJta''PT\N^)41*<:~>
+Q
+Q q
+438 61.002 7 -7 re W n
+q
+438 61.002 7 -7 re W n
+% Fallback Image: x=438 y=299 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 438 53.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gatn$GtaEG(rq-fPThP)<=k/@#jUKt`<iI[8&jN;`/>aQS?S[a0qCoZ;%RDVTh)^[76i\-&Z
+ !4BP=lIO@giBXEld3-!L6k+LKs9%FhW.g,0?i\^1l<qrUoc/T',irTD/<]R3Kf+fUi_cas/
+ *B>l4OFbLMk%Vs`70"j,;OM%hs\rd<fM*E?+)EH,Q`Td<%a4W^fbbaJCXVkkFUIY:P7:L$j
+ qTtgVUJY;)Z\ao7Z>-[kKU8"p/5ruP&2`LX/nVi)*e!ut-G3l`IA]n(84,Bf68WdL`Xcd%e
+ 9>#,rNSV4qp[-.EF1W5"nG)kQOksD*\b5CH4E#-p(<`pGhTG-#lIA]RMrj],+[S?*oB,0O/
+ 1f(N=NKr;=L7/\VG50:\))4H\TQt(Ys@e(/T%;eO%t.,<ecKP:7d[i3,m-Y!Ioq_2ND%N/6
+ H8OC,Jdm4bCS6C$AON_Le`Jb7cgP7#fX4LC8KX.kb4FcH[JXqj("FXJr0k9J#2nIW9SHk3.
+ W<77K`j6c7hBF2/4Z+T0/akN:"s0e`kj1(%<o.,NZ=e]B8ldhB1f,;lmr_1Qr!6Zd@pe#/1
+ 'Bgk_>SR]^eA>Bp8X"2QE&SPt/aZMF<^8@cXaUH\H_#iTN\abuOP5Y8h*>XR\dT;JNNK9%F
+ aTF2&[$?m6mTgp,)nU8^Y?2C4V^IipRm1[(Qbf=5,27gfi+Zk48!&AVlpMd3WOmL[=BKW>:
+ <18-^!4e8@q0WO?X6rCF`gE&mZ`HZA0*cG[rs@7J\mNg=&i7OHr`lJ=>V:>nR<3"j69]pq=
+ ;^dMOp]B_2aPtnSpT--H*lijlI"+?2F6XdA5$Vd1CC4Ic.6,Imd=75qU.nf]\SNdGuK([lu
+ #=fV-p#8,N1]-7A%gCkVe02`AN2"[5+h.1?CkJABdb;TLkS`Bm!I#"m'\Fi?/b>#6p.dk`^
+ >$I8;91k<'3\*;%+\saVS9lP65ZF(,r2&1-k!]HOgACAU!$q>c%#+*HmZWLl5on?&)LeQ(1
+ XfS;blsh"T.G8OAU!%VMj`WEfk@Gu)/6mFQbs'.qojfgRWN5nN(t=c5s7$oj;aCba7>Lsfb
+ 6_<AL`IXc#]V*M"<kL4SG=:TpEns669GNn-"K4`:5!F2`.8JHRM9fAenVnsf5%j`RI==aEZ
+ \rYO+rBRl0<Q?ddgC8nPrSSla3,7M:jp2qWrhB(HEA&m.e`qH]'c=I:Kg%rC/h?U!M/V'!s
+ \O3]894po9\T7H_>r)`@s<0B$V\s!p'6='&pE(?;nN_>UU*a1i3%SfS]?,u2"9-)I@NAgpD
+ ;gtgf\m+JGng8=4Q$rp!*"D_f#Jd&H8r?$`73,hWqQWMFs.ijn?Yg_A#G0Gj.WMrZ(Bpn^'
+ CcjTRD/JYT'ibPH(p+X'ZJf;&,$1kFl-6ngMtm4)XK:9EQGLjA$o^.HDRN=Ep76U*DL?[G3
+ PbH5l03nNIOR@&ap4eKQRj^C[=4$k_N5!9o*71FR[BHCWt<@b2*\iT,f8jIUQX%?>?_NjlD
+ 14W2)R2Qq5M01iC.H0)M49LHmmgi"i<b'!s@j7P-4Y-jiF2!"3:fPUn-]174J8dWN,agQMg
+ ZpelLnRBHW''ZbjT5jQ,mQ84pY;`n"d7id>/@-*RXp2hlKgF`g>`*fa.$HASF@1D;F%mY1r
+ @;`QU,1A']<*7A.r#oc.UMi/`d?U'!%d+3qp.7],Tn6ahUVn)WJP:)T6E;e+T_`9EKEb'I:
+ cKIKUa6-hp-iO>7[IW8~>
+Q
+Q q
+447 61.002 7 -7 re W n
+q
+447 61.002 7 -7 re W n
+% Fallback Image: x=447 y=299 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 447 53.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/dBhVK-'ZZgiK+Yu[_P.77+=2WVLnM#G66]fHOanB&7\W1B-qd6.$F1,Yl3tiYS$E>+"j
+ -fH!`I0E&-:IXlqlAnJ08'YV14p,oeC<WiCgrXk+>6-]Q8PrhK."+G@fn9_*;,OdpI,TALp
+ l=Ve70*OamE1pC7ZPl3BgL3$Y5hc)q<\D!#d8.OnJbQ`9&4!<LLt/@];(8XD(X(`LEZlc5M
+ W\"V^aB7t6-?dGs`/GJgSc,a!n>,%01K7gM3X?_MQ[#WG,j2XO;e=[@QePK8rOJ><;IJaJJ
+ RT^Q!%_!gs]&+DDJc+<W)S9n5cK6A'5CH_R?p(p(_?-IXSdeRujr?G#;,H2lbPNA@&4"d^K
+ .u:`TV>o"M@.GH=0D[0b[f;D`qC/ao9!651FkgZo'PhLm&2^Q&C0.EQR+6^5Z6$Cp[/8cmF
+ fC?P%)PSYkRMe+6:oj2j!O/YV;lI^T*/EcTdb^2Q*@8H@)RI]GYkg1]fhZ`&pFUgir*m$4/
+ G$1fEbr[sJAgH]!],91\jGhiH8u>$@5sfe'2&]d4u>[']=bL[48Q$4A@O6aLWG@eK@)i[$2
+ e!jJh3\%3+R.>E?QN0r*f6GcMn0(/Z5gq.c;7mnI1J5#V/0!?R^GB^s]R$_"6jHO=enk_o7
+ /L0;hF!oNIe/IndD4&^`f.NjLkj[Ql.p$[Tf^D@@,9YG[,CJR?dF$(M^5h"(+'G[%F7V).F
+ W;ClN*QNS-+aHjHARJe?C^%#%1QjOgu#js5C]uR+-?;t.DD;B@=EZ6Au>UYX6R`dER6[5XN
+ ++;(<^:q$EbQ$BJ:V@W#nu9[]OC@<7F0U28TAs>Z`,:62Ce]!jo=^<RlKX'g/:fgr77g6pq
+ m)4E&pDVZ[-1`$_Fl"Phr%X%)8cBi@#S;:i]5k<FEpU4.,cCZL[#72H6HKHRuO#]kU%,RA1
+ ;pmN<F#f;EBLK,Q_h-P4[>n+?KQG\p[BA0/'2,>.;Nu9Dh\YT#"RB51\8L[k@;0s5+;*]Z]
+ 2`)Zs0ej%bkqD-^\YQ1r\]PKd]"3pa8LfLnXGe].l%r!eLrc@l:;"2/PgrhY7RhjIe3,''h
+ 1UJH8jigQP`bLfcjVciH"(9Mi8KsFH,tu$HBspljmY[?OC+o`h[^10D/UMtWG+t"/p)5))a
+ Oq+FE*Xm69G&3g9i+O':3U@[W\aYoDS/4$KLT$o:"C&SX>c_)OfmSl-.=<Tr-_Y'n5-F\eF
+ oN:D'L"U#2R`G8CtO`W80qmMuA\-SI&(_?VTH1O;]2FEEP6*I:I/SPBN9+4n%U->'3bG(+H
+ Ec3Q_oqIJk.lfc,';;gf2E:ID5Q56GfA)dV,Q_2^SE0pSfNB4;mc5/,`31S2SGECGk;cB:W
+ 5Tgf_'tV6DaHH].Dp$5fio5jNh"'mh,?=*uh@Le/VS!ldhAdF#"l0]m:N^nASfq"8,9o9jE
+ eYMOB#hnL8&c^HU@8r-AS%Q,o$kP<@P0L?nZFJahr`!>oVmCmOlg7l]Vh\6NL_H@Knj/QE,
+ `]5rho9pD@ZQ_0o`WMN\iVUHJ@!Tj6ZR9L,HWh=C*!uJ'm`Ys).`=O8Kj2~>
+Q
+Q q
+456 61.002 7 -7 re W n
+q
+456 61.002 7 -7 re W n
+% Fallback Image: x=456 y=299 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 456 53.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/%G>+9'*5*g7)+k_abL"<\9!NsN,Ud%H@7[@4.tUTLQ(l:nLOrXTar[kI!?qfj&7gEDb-
+ D^p)6uXBW5u"*]pCjSkOF4Smj4gKJ,2rZ:;4BrHbXXJ4hpO#V5=44hd^tWpf2-HR@diCVe;
+ -M97ad)riKDj_(W7*L!IuY\\"4)pf)s$2*H:EgsSN#T'5D>>Pe0e.E9@6Vbb@ul:,Q(Xp5J
+ [FQ2ucOphfKcCN.hI_@3f[(E2iNOcM7;DTq183VAY:00A@:$nObr4R^fJRCLK?s-Vj?q*nO
+ \LK6SG5-$8Q<'`o5#gXuf[N;Wo[MHt\M6'G&KI<jo4E`fq4j-$Ys2Xbh>euRIi?R=;UU'@*
+ ]@D\7`-_LKIA66G+,BZ"N->tPa)0e7On#RaN3]BGV!E5]*:4^.k,b%M0Y#:HL9MP\RUDMLk
+ mDngUCZ6X$5P&\,rbT]QC.*eb*KQ<-)C&E,-thH$4QTPI8fc"h(in,ZI(gNhE'"[V`2Fr%:
+ )o:>FXM<,C7Ib/]9;lj8oBN]V5)gVO"nDL2/do>QXXXtD3qLT.8uMMaX(Z@;Q=H>I1/VQB,
+ -/<"dYG^5i<Dg'd;_4H`g3-'#t336T8h#dnF$k*L0m-52rhNsQ%2`/<P.eET)m,6X-J!Q<u
+ LPNbY"PlR7!^=+##XBO<1Tg^]GQKgs!MLt8oki"!"mtONpTn@><9Ao1H)/JGA)j'>A-duUF
+ UHamh6dWoj5Te!bW*dO8-lSE.B-tiN>r<6k[F>7h*!nX1d<c`AR8VD^s$=r?d&'(La-AgTE
+ ji<LG2#c_o@[8Als`PctP>t*YJcOTP(L.l,3-M@r?18_4WOgBcdQ]2)P8s%t!dFo$6[Z0#G
+ KN!Wl-0]T1e&9[+82E,dl^XBW0F#RS%uM0\*(MMh%9l7<PX:aOes4K1QDY\/Hg%BX2T'Cm^
+ uqLk4Info<E$+WOH:P@@uE17CX67`DQ6ARWFVM#d!U.:$b$4-se<7HGn7oV>U.=EcqY:$[6
+ i,bk>`$I#DMcfQ?s1E'pD$m@hGch;ZR=-Ds,Y@l.>36c,3@tERA'.;D,TM&lq#nc2cZgH,-
+ mdr'U:5'BSO9oTH'"?#f,$3He;96I$%@?=6W0(roW(gKmpiG9&j3jjmKTRX`FPjAYt-kD1%
+ uNDRF0EeNXfT37p/u;6q!'3jhp-!Oa]h6B"]iB>X]t1il+e[5Ep#'?/8%uqpaOH.cR(i1c+
+ l&N6',Gc;#'K6X&3INfJs/c3281d$OV?$SgAh\Q2`a,9o9#.j8D;?smk]!YqsUoAUrP+L/0
+ bqcaF8b5D38m%K1E0q7G8d'@U7c5gY;7`/Z20iY9kbYaY]e^ZMf*b8Wk)QBk\TrP[21jOIs
+ :fC<Z/RlE;$qB-D2s@aG(o<[gTE1o,)6o9AD%/#BJ'`O,N>\'ON%.1]n?L'HEFTaI57QlAp
+ i^U5T61Y=L?N`DQe/.4Q3RV[dHR]V*>d=.=GTF$2`^[_b_qCCrV]:%[\=rK$b!:dOI?N3+W
+ 0B_['fQ__a`^%n#KOW`PiDA?<"j0=&met]6?4N.Ih,r\1Cr.Bl!%<Y=CEN!WV[C![b+A_uI
+ l?Z,DZ`PQ1=N$^*.[@/~>
+Q
+Q q
+464 61.002 7 -7 re W n
+q
+464 61.002 7 -7 re W n
+% Fallback Image: x=464 y=299 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 464 53.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+GauI4#u"<"'S`4u[53GK(e##j&I&Xh!fC@o/hdK&6o/9sMkWOg&.gB,!J)][4;a@b&LN#2Be
+ <n[?"G_k7?F@q#*h&4Pspp+&.eutl-G;3O(i*SR,7b/9^_l*p[1-;h"0[j^?)j:IY6^D&q*
+ ^Js%OP`p[1IZ@T>fa7;-@;@,N8Zs'f?mV$PApJ,ht\2UoU$4F`Lkacf?bDeXL\l^M["PA+T
+ NkOe!Q;q"-Ej/"1"q!g0s1INBELjbN61#onF80neZH<%iBh6XT:0K2c_0hF&Q\>c5*`G027
+ 91s&_['_3\2tuZi'7N@*[Bg5r5/oPYJTQ%0P(u(ZW^WXkDspq8gLO73q#1(YlKV4t<hua1U
+ l%e*cCKlhU4T3i2)TX<p%;6YS3U&9QWM6W1VVsRd`mD:*pMsi9hn0h$=$ia31RLlHc$R5_\
+ <f<>IOt$jb90_09WtqfX>YUgUCNk;M$]i_a.7I84_rIC]4JVdUQ.G8,N/^Idj!W+T^=eT(0
+ t>Rl1GlapJuE5T24^h)_Pi,ES#ohRG:.:+g/QDYT.&]k_NA$F=s;4#lfEY#<C%6UREpeP/%
+ a:BZ9NF6DP)FV,qPYQ5;Um91Ps:kb<&3dmUDA7Em<f%,Xlb0CL/m)F7[9O@CgOs`GAl?i?4
+ XgI_79MD%AdqqH>]P6Sq/_G6^qXm`sb[;JP\ZW%3lf#bNrtuj5>#H"$m6eHliVRYpjJh\>O
+ m_Y/g0/#+YD,CVmFm7ZljDL2-IZXqa!s3M3h5#aUnmGAcQdZ[+)iin8tMTAR2d1Cf\+rJT3
+ ioVA6N02U2]rg7&3e>*6;OG"@['?n>)[:K:CD]QT*RR*YBrna85BnNrImg.M;PkKYDo&L1\
+ Me*J$mrJ?1:nUL-B[=082(1OL1CX=QKMb0!$[bm6I\OV+)4e%_cl%g`8>C,6LuMtQO'<:Lb
+ (;Isjd&EI=(6'VaBE!X=N+KPmdNZahu_OVg^$0#TT\DeBMnL?Za`I<h,<W\E"P,%UlK0rTY
+ 3FH7-:X<!5kEL^uV(0Yh;9>6J]L$7M=0Lbh=gK4]3o*r!M,ap`QC3ISr.m*j?iU8q3uUBrQ
+ ^f\ihp82M0B[6@n&\_;EHd)p8UfIi$Q"qNTt39VB93P,A7V?0ghSeeX72p=KkJEF+mON"/d
+ Mdk$6U-#'M:78RAm0jJH>D)pPk/LAS"YI@gcOIIq,g)O`B&#6Cm!l1;\1R.QkD(NIr5lLmj
+ p*"G+O$JQu>\.8?D*`g%G/miUi]m&dIp920iukD-JgBg)ns3I.p_`s8Y.F`ee`^4dY+M#@[
+ +G'4X^7U_>g&*$m@;HR$E']S[U)WlXuNLp=Y2]!/.$Rbk.6L7dpe1isEqPL:XYIM)i-`:;]
+ *i/(mK*.Q-7n(D8aG<gFP/q-C?-f+mVko[Rqr::8=]SQ94lUM0"M/>_nFRHWd7N1R2'F.,2
+ FX4/<8edI-@f$dqYYUBjQVMX_7$d2Q'Ddr)1P%C;:Uc"hGITCd+SiQ$HT0]q<h<khtm+f@o
+ h04d"g"&;&-uS?'7fa2L0Upm)''E%.+XT)eq#VP6gt+Gl8Q"-E4B6P0m?NoHQL^JG1rY:^&
+ E4;/bs*JGb*S*cm84Ab*UUd`KZQ$fld;*e]?%~>
+Q
+Q q
+143 16.002 7 -7 re W n
+q
+143 16.002 7 -7 re W n
+% Fallback Image: x=143 y=344 w=7 h=7 res=300ppi size=2700
+[ 0.24 0 0 0.24 143 8.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 30 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/$D+IT6(bH"D%+E-g/+#\Z7E[+D"8sZ;5u:&D,=s:4rM+c`,.*W7S"!cQg6X-jiC\*YL!
+ rFa?%1=)l8!G(e@'BXf6"UgVH[[Np3*dMU7XRg`oXns4aZU<c[2hJr4THZ5:Rrlq6O`)f%0
+ T?c2Bt;Iq,6J&.67o0'lS]G&$mMVN"&3fIX)+DIbL+0en``U<66$i.m"$+$F?H8ranos']F
+ `p=:T;FmsX>=tQ`/?!^hX(C/[-K*Ss!GNT29hZsY'Z#,sFg]ScS0L$rkI,9DVf_[Wd<g8q0
+ 0fhoVpX[hVA[<n]UJ&J@mdAhRCWDHO?f.nJ5$'[\bjtJQg9BN@G^Ep@GJO=OmbYX='gtPNV
+ PHb?M@=!)UbZO.cHh!'ORVc3l,*Drd8IQRB=`jgg8\.e.p&UZ\WO["qWcV@S$?SMorVH700
+ aTZma<C</?Q!1l?&im?q89'ZEgp/S>u2D0p(28Roq?rb[ns7NfFMQLEq4n'$1Un9ID3bZSQ
+ CmE\K5*b-P_bZa6>Zd*uUUlUbZq9\.hBd)k=u?+a9]j@J^9:!$`G0/$RtY[@K[hE2EQ\\)T
+ QdZPou9:(65FSKf,NJ>,CJ3BbV-V<DsKjq:"*RE/uO\m/3Ogf*BHc6?aN9pppG#W$7405>>
+ 41!buDXH6Ti8i"WZo"aI!!RL`0?&(FiF,H1^V$[C>Yn7BmMoPWk5+bMmd:K2Vo6Q4.EZ<@l
+ aR<4-R;*!jpWU7^81u?@nPkTe.em@iTN.f@@=3tZkVug?>+#4^OPCWF_k.27!j9<18]^2B<
+ 5AH%Ye4YVb;o*<H$_Z_(\&j2OW'5hbrr0,\et`XLW</IV@rQ/R,B&H!r%EE;KM.,k,.l=4^
+ ,!YM=X..+cDX[r])>K<mV':.WaG@ePEI4.>Q0&\mr[s+44FrOG*\R5WYKl]5OEF3]]9FllZ
+ SWRV\rPtK[r+VqhnYCFOS2_Z*Hn8L?F`PmN6Z@[T(30I!6;?A3?_c!IWE,\jur):Fh81JRd
+ GfB:;0=b?+(BOgG"(8t`gtB"=+X"LI)u^'Ur/$OJaoS3#BmSJm0`gfaPmU_,Xn@O-3:&YSI
+ c')P&)9Bk#hdbIkGtCV*&6plH9Lt*;7;:M9^!H*kWaR:PI>"5+kU^NhbKn&4<,Mpi'd`U>5
+ 5jr--Mt1=U)b%?m*N^&ifk-"cbD#o3l.f]]71k@!nE3MGG&q+cD%O+FbqTq9KFW#bUb?etR
+ $6JAd@t!fR1H6&B&TPmrH[\Qg9joi+o'i,E9.[fBOHTJQ`QPUNuFn6X+iL/^<!pu9JsW^pO
+ 7BR&mm-gOP)<P_+C.G>j.mRDs3P&LV-_)a?8'#h:/RnOY)*!-5XJKucNf'.,iUq]b*?iR.?
+ !4dq!T)~>
+Q
+Q q
+257 16.002 6 -7 re W n
+q
+257 16.002 6 -7 re W n
+% Fallback Image: x=257 y=344 w=6 h=7 res=300ppi size=2250
+[ 0.24 0 0 0.24 257 8.801953 ] concat
+/DeviceRGB setcolorspace
+8 dict dup begin
+  /ImageType 1 def
+  /Width 25 def
+  /Height 30 def
+  /Interpolate false def
+  /BitsPerComponent 8 def
+  /Decode [ 0 1 0 1 0 1 ] def
+  /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def
+  /Interpolate false def
+  /ImageMatrix [ 1 0 0 -1 0 30 ] def
+end
+image
+Gb"/ch(RB"'Z\t^U`pPQAPlM@Q`P/JA4(+\>fgMTR5#N:P&,DMFk&tC+l+u.Y,oW:9-.\^=q
+ d&,Bu[$J;5/9<1R<JSXaU5"5'pYMchj6Yk<+-PjF2RWe@0Amr)jC8qXD<)0^r2rf!`*emB!
+ I*IU3[$)B.%f-\eNp2ZNr@ou@S5TodOCBOjM:?#"9.K*RlrJ]G@-i[E=Nn!]bG:QOr$=':s
+ 6b;[huV!`,I(caW;bKG5)9'u#GWDQEN$`^9#k`J>)[C#!C'JaFOd%J6B,q$<tTKr2C)B@8Y
+ YQ'JFj6-k.s7Amr]t/>Z(G@6^_?Cep\oGW.?X,E6HG&#C,^BuTmSG=;-n3R>o*PqL5t[#lM
+ q-Bj)?p:,?>bB]f04Z5qtD!N=+A!QgeiO7io:afUn^F=EVd'4=OBrmoQ[nU#$m^fe(C$o]M
+ N7=.P!*;W$qK;)%IY=!";!@a,`)3TJpf5$fCXKp9!<HC\@A"UI4eD=jo$0;I#`P+.&n'G4+
+ ,g$kKstfqM>n/q*H;I+O!eg\)^a_<Q:>:;ataCp[VG9N5u8!X#QE]6:`CWB<:D1^OK"HIY1
+ _?XnE9r]"slnXi$I?(LQW'H=)_a)pO,p?o?^\V5Wda,1(4DQ[_ic$*pFShrNE@;0LGL!nFm
+ lBM5F[;V[\n!8`aHRK_UX9T:$j@Rh\`JfonZV<]n&E?_hUiY_cGBeC9,'[t^mN)^I`stbtg
+ Y7tVnKLKS,C>@MHhbrO.BfRE@:@m)hm1n@a7R%':Vcc#fW0CJ9pq5V2<!T)[+L&HI&X`%<E
+ a,nI--C)_sQ>YfHWm#&>6pr>lXtfQ2cXQrKSnq92_S*o!s%pHC(%6)_!i%Y2f%":)H;a>d-
+ t47=u49?E?".YY=g[K[%eC>+3a.<D8>q,<%jq[c4b2-$m5n]lqXY5HB=R94Y?Rb0ktO8kjF
+ 2Pj#)#^+=$A`F<Ou[;t*;D$@#@de2pdJ<IS7_KW][?bY.s@pGE/FsH%`(30J@kjcNV#V=O+
+ a8,N7D\FKK~>
+Q
+Q Q
+showpage
+%%Trailer
+end restore
+%%EOF
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-ue-rrc-states.dot ns-3.19/src/lte/doc/source/figures/lte-ue-rrc-states.dot
--- ns-3.18.1/src/lte/doc/source/figures/lte-ue-rrc-states.dot	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-ue-rrc-states.dot	2013-12-20 09:44:51.000000000 -0800
@@ -1,23 +1,38 @@
-digraph LteRrcStates {
+digraph LteUeRrcStates {
 
 
-IDLE_CELL_SELECTION [shape="box",width=5]
-IDLE_WAIT_SYSTEM_INFO [shape="box",width=5]
-IDLE_CAMPED_NORMALLY [shape="box",width=5]
-IDLE_RANDOM_ACCESS [shape="box",width=5]
-IDLE_CONNECTING [shape="box",width=5]
-CONNECTED_NORMALLY [shape="box",width=5]
-CONNECTED_HANDOVER [shape="box",width=5]
-
-
-IDLE_CELL_SELECTION -> IDLE_WAIT_SYSTEM_INFO  [label="eNB CellId enforced by upper layers"]
-IDLE_WAIT_SYSTEM_INFO -> IDLE_CAMPED_NORMALLY [label="rx MIB + SIB2"]
-IDLE_CAMPED_NORMALLY -> IDLE_RANDOM_ACCESS [label="connection request by upper layers"]
-IDLE_RANDOM_ACCESS -> IDLE_CONNECTING  [label="random access successful"]
-IDLE_RANDOM_ACCESS -> IDLE_CAMPED_NORMALLY  [label="random access failure"]
+IDLE_START [shape="box",width=3]
+IDLE_CELL_SEARCH [shape="box",width=3]
+IDLE_WAIT_MIB_SIB1 [shape="box",width=3]
+IDLE_WAIT_MIB [shape="box",width=3]
+IDLE_WAIT_SIB1 [shape="box",width=3]
+IDLE_CAMPED_NORMALLY [shape="box",width=3]
+IDLE_WAIT_SIB2 [shape="box",width=3]
+IDLE_RANDOM_ACCESS [shape="box",width=3]
+IDLE_CONNECTING [shape="box",width=3]
+CONNECTED_NORMALLY [shape="box",width=3]
+CONNECTED_HANDOVER [shape="box",width=3]
+
+
+// Network attachment
+IDLE_START -> IDLE_WAIT_MIB [label="manual\nattachment"]
+IDLE_START -> IDLE_CELL_SEARCH [label="automatic attachment\nby cell selection"]
+IDLE_CELL_SEARCH -> IDLE_WAIT_MIB_SIB1 [label="synchronized to a cell"]
+IDLE_WAIT_MIB_SIB1 -> IDLE_WAIT_SIB1 [label="rx MIB"]
+IDLE_WAIT_SIB1 -> IDLE_CAMPED_NORMALLY [label="rx SIB1 and\ncell selection successful"]
+IDLE_WAIT_SIB1 -> IDLE_CELL_SEARCH [label="rx SIB1 and\ncell selection failed"]
+IDLE_WAIT_MIB -> IDLE_CAMPED_NORMALLY [label="rx MIB"]
+IDLE_CAMPED_NORMALLY -> IDLE_WAIT_SIB2 [label="connection request\nby upper layer"]
+
+// Connection establishment
+IDLE_WAIT_SIB2 -> IDLE_RANDOM_ACCESS [label="rx SIB2"]
+IDLE_RANDOM_ACCESS -> IDLE_CONNECTING [label="random access\nsuccessful"]
+IDLE_RANDOM_ACCESS -> IDLE_CAMPED_NORMALLY [label="random access\nfailure"]
 IDLE_CONNECTING -> CONNECTED_NORMALLY [label="rx RRC CONN SETUP"]
-IDLE_CONNECTING -> IDLE_CAMPED_NORMALLY [label="rx RRC CONN REJECT"]
-CONNECTED_NORMALLY -> CONNECTED_HANDOVER [label="rx RRC CONN RECONF with MobilityCltrInfo"]
-CONNECTED_HANDOVER -> CONNECTED_NORMALLY [label="random access successful"]
+IDLE_CONNECTING -> IDLE_CAMPED_NORMALLY [label="rx RRC CONN\nREJECT"]
+
+// Handover
+CONNECTED_NORMALLY -> CONNECTED_HANDOVER [label="rx RRC CONN RECONF\nwith MobilityCtrlInfo"]
+CONNECTED_HANDOVER -> CONNECTED_NORMALLY [label="random access\nsuccessful"]
 
 }
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-ue-rrc-states.pdf ns-3.19/src/lte/doc/source/figures/lte-ue-rrc-states.pdf
--- ns-3.18.1/src/lte/doc/source/figures/lte-ue-rrc-states.pdf	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-ue-rrc-states.pdf	2013-12-20 09:44:51.000000000 -0800
@@ -1,206 +1,170 @@
-%PDF-1.4
-%����
-
-
-
-9 0 obj <<
-/Length 82        
-/Filter /FlateDecode
+%PDF-1.5
+%����
+3 0 obj
+<< /Length 4 0 R
+   /Filter /FlateDecode
 >>
 stream
-x�3T0BC]=#e����U�e��ɁT�1�32�47
 ���Q�
7���@fcS��k�����
ҁ��8i�"&�
+x��Y]��|�_�Ǚ��I6?��bG�.��b�0�@�Y��;�:Kp�_���~�v�p���@�����tWWWs�����O����� �x�I-�U���Ѽ�2o��|cެw��l��7��<���}o�u�j��<3�vx�u���C��f��{�0����u΅ulw%Rm2�9+�F)��f���ʭ��\���:�B?�V"���i���|���iU��)��Fe�������O�'�;}�C\\n_
��N��m=�?�����
��6�}~`�x�A�i%�?�q���1�̈́VmKŴ�,�pMKռ4�&[6-�on���A��ˌq��9�=��[�m��,� �j]�t�
��k��u9`��$
#����0��}s�}1�8�����N]��d���pJփ?O�9�:�i�M�)}~�ku�kFD��q
+y|��w�vo�+�'������L�a�i�0I�[7�[��P�Љ�&i{�M�!C�Q�se��&���GS����
f�"0�W^nA��gS�Q����������Yq�R31[��җ�˺�e�@_"
+����%X�gŖ�K�kv��Ae�s��*�Jޖԍ���>g�$���EY�Tn�;~��C!v����@�.���A���۝)�v1N�Rb��a��)u��k��#�m����l<n�ςo@@���悘1�A`f�K޳
��Ȁ	P��d�B��d!�$���G�i
�p���x��H1��������䥒���E�v�����ſ�U�W�!e�
A���8;�<��N@P�dr�8�ae�K)6�bJj
+�!�LG�+DIA!
+�x`=��Q���A2G$!��*A�)�͌5�d}�,n)��*F��I�7a�Y��Nm�צ�<�rϣ#lJ���'D
�J%���Gf��0ѭ'����o��/���/ֻA��2h(2� *��M�D	�%%��'���8�Vd�☂�����T�ؠ;0�
+B���((2�as��L툙u&?�NZ��M�Ű���KMr�KjG�o���mN��pݍ�"*:�G^
+�Ϫ�x�U�Np缚��UH���*DkKP5�ۮ�y�ۋ/L�A����.t�GiʃW��Zbk��-�K�Xٗ���n�M2�������v�5���
+��Ժ.N(&�/��m��Z*�Ghi
��aF��#+�(�Y��II��9I
Q���jg�@�W ��FR�uy�Pm�D�t/��8B��௏G�Ie�.�m���P���H��_c;A�{Bu���J�#��RH��	��1!�3fB�ʻ@R5��e@�L�
\
�Ae5�������I`͐�4U�^�,W�Jn
��du�v�^ĝ�4M�%�4�}s��0�#N?��a�K��E��uo����Z6ݡG�-wow�����_9���"V�O+�5%>`�b� ���RO8J	(W�݉Ȼ��v���#��YKG�#|;;����O����~���Y�e-��}C�a��}��-�C����d�����̂�%*x�c�B���N�ʴ�>q����A'
+�T_HDS�n�zZ!��(K�z������>�������B�UG�������:�d��U1{�P+����7���}T�){=,�֗ǣ���������p�Ͱ+f�&�v�Jϻ����颠�s9��Ǫ���91���n��y��$���!����<i<?���32�_����#H�J܂f�
�Q#<4��@�t�B7�컄a�1�𨞾Vv2�.�h��m$vxPX��/3���Bx[��y�
+��gz�M0�P��q
f`���113��R	D$E�zA�,�����	�s�Q�9��h_ցIh+j����F���,׃���E�Y��@g�%�l��� P��b�v^]�P�q�0DІ62�ף((�E�j��0"�0�4u�ã�X�������xf�z!A.�(��7Xx'JO������6c�%4e��FaL�����Kٸ���=���	�0��8�gUzn�W�@�v�ߑy<��wߘ�a.��ٸ�'}'��s
+bf7��eU�#�{ú�{�;��ֿ���<�r�	���O�wI?���.�e�%搛�i�ӱhm��	M�CY�-$�h�ǎpb��
�U�$�d�!v�"�n��N��F�-����FSIҕ�l���)*]�cBNS'�f^3e{T�QJ��j8J�o�kAg�J�ʲ�TC���i�h��m����v|��~v���.���{���<7�����NlU�g女ҵW]�����j+f�����
�W���ɟ7��fj���H5~)D=2f`T����WvP$P� 
+^��n�5=���3j�>�%�~�S�s\���A]:��֦�M��D��ԨV-�z����?��_
�

�R�
 endstream
 endobj
-8 0 obj <<
-/Type /Page
-/Contents 9 0 R
-/Resources 7 0 R
-/MediaBox [0 0 198.425 177.092]
-/Parent 10 0 R
-/Group 6 0 R
->> endobj
-5 0 obj <<
-/Type /XObject
-/Subtype /Form
-/FormType 1
-/PTEX.FileName (./source/figures/lte-ue-rrc-states.pdf)
-/PTEX.PageNumber 1
-/PTEX.InfoDict 11 0 R
-/BBox [0 0 735 656]
-/Group 6 0 R
-/Resources <<
-/ExtGState <<
-/a0 <<
-/CA 1
-/ca 1
->>
->>/Font << /f-0-0 12 0 R>>
->>
-/Length 1668
-/Filter /FlateDecode
->>
-stream
-x��XۊG}����rIu���0�!�B��{q�@���~���]3��K.,vwWI���H�ߕ�:��1:S��!䠿<��o���}����Z�����w��Oe�;��U������^���kXsA��꓎�T��O�yҿ�!���OLs�'�E���q~�8��E�Xk����=1'(SNA��+ٻ�o>�7�{���yT￁4-Nr���9�q�a��ˁHnV����xc��Mi�M�!?+��ĥ^�ؐ��j�@�Z�]>ܼS������P2��ž�_>B����xVWۯ�y�~쌅�{��gU���9T�G�z�);O9�=��I��JL���s�&ڰ=�7���ݺ�%WwE�r��r[y�J<�� �齽(h�z�//��r�����
��79rK���-j�'�U��@S\�����"BG�Ie�yR���l�[�؎"��]7|����x�� W�Cc�aa�����l
-ywU
-őB�^�Z�zX�
�,�f�TVk��ȅ�L}���0�h��$������Ӭ��8k|<��/��:��N�f��Y��}u���b��2A��`���M4	0�Ie¶Z�l�~�@�;G��*�������W!p�Qؑ����16�#�a�	ɧ���F|�l>�������$vڕhr*(U��xDa=���j.��r)���<��d
ٲ�FQ�R�hd�B��Xw�+�U�&;�G�3�A1�yK C�qR��X�.�b�>i�	!��p�>չ���-��E��T<(z\!v9��U��N���Z5U���Mp��|wb�qqe6���m���<,Olg֟ɻ�Y
����T>v
-{���M�-D�<�h�+5$��X��.$���s�`ÅM�Y0ƆJ�B2��,��ք��y��DK�U��ПF�|�����
��y<;����%\��s������G�,�q�NK�@�\�8z�n`�����EB��
-��w� ^���~j!O��7���6�C���,c,�.����1>�G�2�
�n��$L���0L����h��V4F���7�Ru	���g��j8�3[W���R��Q�P�Y@��xx�Bi5|�w!��b������+�`����:�Y��b���%H�JQ��Q�qb����(�O��-�^�'���	C0G�;*4��V@�$/2v�k����<��Fj�8�3���
-'mLq&i�<���BmH7�
-%���b�uaaL�����k�F{��;qݞ������w�U]P�М�|;�b�tn�~��(^3� /:��������<s�Sz̧�n�8&�ƍԉ��qc��>n�g*}����q��T7���1n�2�2��vz��zI�f�x-T�?<����>��z��B#o�'�i0����<��&��\��e�7�#�D�]�$��
F��/�L���lC	ن:�(4v�I�	�y^�K���|^gTr��
RBQ�ER�K���Q�,H�LW��g���4���V�e�Q�A��w��*��z���o�{Ǻ�����T��Jn=C\�y�B��x��D6&�1Ű:iUG��c��mn�N�op��`�E��
�I6Ր���Z���t`�-�4Z~���m�[�QKu� �ʦ��W�»s0�2E�������ũ%���σ�	MIƔ^�wz��-�W��������1�.5
-endstream
+4 0 obj
+   2409
 endobj
-11 0 obj
+2 0 obj
 <<
-/Creator (cairo 1.10.2 \(http://cairographics.org\))
-/Producer (cairo 1.10.2 \(http://cairographics.org\))
+   /ExtGState <<
+      /a0 << /CA 1 /ca 1 >>
+   >>
+   /Font <<
+      /f-0-0 5 0 R
+   >>
 >>
 endobj
-12 0 obj
-<<
-/Type /Font
-/Subtype /Type0
-/BaseFont /KBXRUU+DejaVuSans
-/Encoding /Identity-H
-/DescendantFonts [ 13 0 R]
-/ToUnicode 14 0 R
+6 0 obj
+<< /Type /Page
+   /Parent 1 0 R
+   /MediaBox [ 0 0 663 1052 ]
+   /Contents 3 0 R
+   /Group <<
+      /Type /Group
+      /S /Transparency
+      /I true
+      /CS /DeviceRGB
+   >>
+   /Resources 2 0 R
+>>
+endobj
+7 0 obj
+<< /Length 8 0 R
+   /Filter /FlateDecode
+   /Length1 12060
 >>
+stream
+x��zytU��9g�SU��Nuso��&!�0%&������i� 2L���@�B��BTD&!"�	�9�Lm��ݴ��*6�눴�vHNޮ�	b���{���zU��\g��o�ߩK(!D'�H��{��}R�m	!i�	aS��@�ܝT@H>Dei�]���3!�xN��uϢ���<��{	I�a�i%�o1G�>���3�^Y������{X���X�����M�̾s
��'���{�-,�[�9�dm��p��3��������RY�K�v�J�-7�L��T���S�����S�9Qf���j��r�:Z��5���o�W�%Gq,�i���+d?���s��:��I
ؖ�2֓ݜC-O��D�(��6�L��3ӏ;&N��@����:�G#&�m�H�k��k̯��%�.�6_j6p���Ԝs�8�ҩ���OR3R�}�.�|�"?��e!�F�9S�i"��K{Ӟ4f��$+僲�V��>����a�Y5Y�i" \�F��kα\9j�Z	��S����ԣ��Z��1���Q��ðG�Ts������R
%���rO55�����/�H����*�����xv�����z�8�[����n����2��^���7d%����PE4��σ��(��_O��T���Ѹ�y��k��d��T���$�Fr
+Qz:�1����dcƣ��nɺ������8o/5.��������������9�����͘����&�~��xر��v��
+��rJVv�/�`*
���iJ(�B�i(�SӺf�'Ӽܾ�}�f�.��t�ˍ�#枸㹗�X���'���o*˛���jK���h�ww�Il�_���w�H��q��3�����a��oIJl�7�>�ՖQ��+ԁJFY^%�Heo	��\�9����:�N?�547������f����(�J!~�g)��e��\�\��`�&�LU�7m��]@������m_�������Ĥ��L!85uЉ��+u�\�/�L�5�F!
���2�pi�Q���?�c���s���_����i�C��v���B�1���|d�O��Z�R��p�h�&�I��}����l	����*��U�g����L%S]4���tH�t�(/�Y�%+�`U��No[�k�A+�2���q�Q$��h��8@WL� LΡP�$<T�
+V{�\(`�Hb�W�qq���<���֦f�3�׃.5�#��+��1-+���(*����	� ���A2h�
+�JW����N�K��at�)��ybA�*e���򸚂CEk��J�޴�u���,�a���ם<�ƨ5���Q��P�j�Xu�c�1���LZQ3�m�8���b�h�P��C+l������D��#}�x���}z�I�&�xu�W��!9A�=�fǛ��B�A_BJ���Yn�~!h�Yz~y;������Kg}�+��\LW�q+��O�q�<"�(��#�����{�m�mx'���6���Z5{��e���$��h'4��1=<�9P� œ�g��Fk�_ǎ��!f�=�JZz�(e�A9bM/^��A�̸#��%�b��^�r(�!��\�&1�qiF
+h��]����ssMG�M�.��$_�_0�P��}9I9�9)9�Ԝ���V��l�Xa+�J+J*J.J)
+��e�e�H�J�J�
+W��H{$�6�bfr竝/u�P�\�R.N-K.K)��V&W�T�+Sc����B���3��Q�i]����K�M"MQ�C؊f��w���
���W�=�v���7�<~��S��"�+-�>����ۖ�.���3���Xӻ����V[V�PV�PVQ$HZ��"�J��\���`��4�0�����ȹs���G�g����D�V�����t��_������^���{�}z��h��m���Y��ڽ�w^���-�Î|+�b�[q^��`�V�V� 8��
ﰠ�uP�r;����f[U9����kCb0z 
�2��t
-�+F�}����TU�����m���l��
+^O�#f������$:Ji�w}`m�+����X'�G\��>8���+j�V��+�rw���[��W��ڸ�q�U�CMe����fo�܍{�Toػw�E�.�]~CM���ѣ���ޑ�����f��<Bh
����"DM�>��)VW%���%I
����P���W���4���|E��Z��t�{Z[QG�
:���1+*�KQ��.�t����.�vi���;�B�rl�'y!�&������7�?o��������0�n��=�z���>o��m}��׷�U���<�ƳmU�x�]ӗD��d�tr�	_�/�F&���0
U�+�s˰�\��c�p�n?��z\x��Z%��-��G�đ�VYIWq�J�*���
1�6�<dDp(۹N`��K�ߡ
+
_�?�2ᑄ�A�J�:.�������^:|���������6��E�	����=z|q��=z����
: �SW��E�Xq?zS�{�Nы��xc�rs�mTك�;�@qĎ��{��F{
+_���a��������`��%�t�q�#HH��c�k��J�vQ�য�6��kBLid4��&:���X�-�s~�:����uY��ʒj�~�t1I&��`6848A�T��lWO}6�Mg�١�	��sl�:	ԏ�!/���XU^�z�}�YG����_�Kh�Y��S��=�jK���>��#}���ޓ��:��
�M�m�"K���T���^�简Rq�}��3⟕&��-LF�,��
�#����s5Ć���6ő@`x�[A'sr�H��v�,r^.N�L�Ml;ҰcU�o�XbSf�_>��c�ۥ��^,?A��O��8���e?�8vs�4�(��qZ�N�
%�ʉ��b�k�T��L��MC'��5}��1�b���ݦa���'���׼F���q�.���>��?eg����"92lr4�.h%���MMf�c�6�1�iW%~����NN��E�Mq�'Z���=�|�H����}�^��l�t��0����b~�1z����L҅vaaYZ7W�������t�v���~$���#��}�����o�/Ǽ�X�bX��b��V������Y�x2��e�����u�v��}�1�=�;�Wd��R6S��{���,�z�V��]+��՞��վͮj�ڽŻŷ�������3�7?5����	/fl������h�0f�
��8>/U|��Nog�{���X9��i��D�Џx��
+��(X�njy�ԴL\J��?��wg#�A��$�;�Ը*5�G*����W�V�ژ�Q�#��9A�Z0mh7?f��~¥$��A2�S.�I�H���ޛ�'���=����@c���0j�������u���-%+���%s���X�^�	أgL���
/��q	�ȓ\��Y���ȪȪ�z$�6�bV,�xο�6%�%m}ѹa͘�SV���qp�s���w�)=<m��{�=�������}ݺ�o�L�v߼�ɗ��_�ϟ<vtQ��K��{�#���v�nZn��p�.�� ݊�S������"���2��6	q�
z�~Cs�KS�M��x��ND��F�ϻҏ�ʖ�ז��
+SC�!z@�&��a�:v����7��D�n��,�Kq�^���
+�DT�J��U�$����+HP�BU��Ru�u7��C���8���"��հ���gao�;�
�|�'r���c�;�;�����}*�j�fi�k�~���Z�Il�6�]�-ew�4>]+�j�V�*�K�d>-ga
@,R��2m���]�]ɪ`_-V�6�{7�m���[Q�Q�3�l���CN�
��{sR���]���/���������BI�uGް���$fb��(	��$Xw�*��~�@�����ȯӑwx�	[�͈���߫
+uS��f"�����QzW�U
�]QC}�|�n������J�\]�?¢95 �&@:�	��n}� @��fh�\�E�etT�' h�?�/�-��a�(fKi����8.+���V
~�q��NZ>ñ�3���1g&7X�q�ZwU��j����XT\� ��h���o��Fh�){đ�������"iu�^9����Ou�N�S�:�٧�zV6�}t�4?�R���9y�r�_�ѶO�֬]�J�u��S���W?��?����|
+�W'�*�Z�j�2�Ժ�%H
+5��uf�"�kSr[+r�����~����p��$%7���������#�ٰ�|F!n�$�
+*蓦
U�zW��+��6:y(�E�N؉����mQv&��ӈ�2���748�"�w"��_o;�ID�B8�M��>�x�"OY�ɀ9Y��"��Kh@	���?;���0�v°b���uQ��{�M�M�ƫf �x[(X4�ʆ���04�	Z-l�-ǰc�P'&ޠ���;�bZ�J����Z�Qi�7KQ\>M���nd[���m3x��֏7섌��r
+�+$'�o �`���z��&�A�Ɔ�
ch��T��^ɉ�~�]����i'GB��3��^\r���_�b�̎v��	^f���yg�4:�j��&CI�x ��"��Ao��	SQnW���Q0¯�O�K����Q	.1
q�SD�7]#GLSܝi�o����1n̈f�J�-5�j2;!���_a�Z����<�wկ����-�$�T�O����:�\�̷�M�c�#�����ϩ��z�\`,2�E�odAW���n�=��O�Qm���ab�k�ay&��t2��`�3󞉮�F�g�g!��<A7�{�v����SO�'۞nc6�:��K�/��3�<t��$�?C�h/n���-Z/G�Q,ZΡ�;���:w��+�V����_א��8�`Ӟ.F�&"1ǃ���RB�Cw����cW0�#���`t�\�e�:ٟ�w�R�~Y�m�?V��_|���m;;��}Yd%���نP� ��	��y_�]��{A��
+:�ƿ�bz�aczN_�_���w�R���
+u)!��#�[�$e�[Y���+�t����;>dw��~V�$/��B����?k��?���r���Έ��\C��TH��Q{�!Ηq!�ӽ+s
4��J�632��l!�l�p��-���U�0��*�H�(���/�����4���.o�[�6y+�N����3wߊ:;��l��
Lg��2a���f'3Z�-@��� ��R]Ό�3������Ht[��2��Yf�����Ʋ�b�6���m`�h)zW��h����LXe�6݃�'�#��3t+}�L����t�V��m[
;�Ӳ��~p��d+Q��[ۥ�*�ɫ4�,J%�Kh�qc�������x�pgJ�)��=�运�'9�e+T�
ٟ��hd�==?��3�uw�D��������7ͼs}k6�~��W�`�jP��Pωd�����FĞn/�?mn��外�Ψ��%��bA'�ƛ��7���7�4;d~���1M��	|���.�����8���y�H|��W���Mx q9Y�<~y��ĝdg��ΰ�/�w�z2�۱]!t5{��ƹt]޴��_yLJ���Wzk���{����
�n����������۞+K��̧!G��̧%�묄N�\�[��Z\c�Ü�#��*R�ϝ�ϖ++����
+�����Q�fw�6�Ǩ1���
+�n�wU�(�������m���#��c�޵�5hL�6܉fW����5�K�2�d��'�.fW�=����w��S��Wq{���`F:��נ�$�+LD���j-�/T�}T[��H�ه����d.ε6]����.�S�fj~���Ιzs�>G����_j�3r]Co����Z���kE��y�>���b����KG��������[�sq{�,u���Њ2Q�EY�F�_�1}��o��"���^�۫��y�=�=�<ηW�!��G�����+��[6�o/��yۑ�
�K�gb��1� �ڻ�E��D�?6y}��&m���܎/���)Q�1���+3�H=p|�;o�;.?E��R~�����~xִ�&�ʏhw���C�5��beb~��.@�w�>"(%���~b@#BP�����f�f�t�a8.��Rx�U�q;�Y<��IWڕe�,�����$��A|�觌 C�P6�����J)���-#ߚ��Eb�R�=N6)Y���F�F��������ƨ�UK�����NͲߋ��:bgH"j*�W*N?
+S��XQ[�1�+��m�l�MD>������
�����\z�ͥ'�oq�7�
���h���
{eo7��v>=��ӑ�uZ��1�V��cG�4=_�F�aȶoe��	z�~�O�ꋐq/B�]�6���F��5�߲#�H�
+7��.ܹC,�Q�	Z�+h����t�	�<C�)ij����;�Hw@_�W+�97
ø�;f�� �b�|{"fwY+nVnV��q����NRBg�Y0����Y�}�i�]���yd]Ė�B�T,V*��j��9g��\�o,uW�U�7�D7�
�$B�_&7kVv�{�w�A��������]�m�{��7�Ex��*�]ox��;p���@�M7h����|y�/_�ˏ����3���f��r-Դ�r���T8�l��ӀxIi���4��>Hc���p�pNx@xojZ{��RKo��xi��(�_p���/�8K��'1��Jk;�ø�G���Q��m������!��o8f)=%)��p�D҅d�[�qD%�Ho��g]�zW8��!
�JB��q��{����&>ҝd��2����FbQ�����zr׷�n�$݁g�xy^�e�
+2��C�c���� ɇ�d9�9��H^%�`�Ob4H�]>��7�z~��$��\~��4��,�. ���z�)�K�W��|��O�$�&_b+�?N֓�����I+g7�#�$ق�l���C��!�9M�F���4��8��<�YW+����N��[�\d_��N$�װ���tg���ig��^VNƓ�J�Tӱ[b;�;�Y�@jɇṕ��
+��w�d}DPL�c�[�w�R��Y����^Lw��x�:�~��y�݌#*%�X(~�@�VcO��I�:�g��X��GM�l�'���#H/�!�&g�J?�=��$�Ǽ��cߓ�0���_@Y���Y�+j$d��a�YRg��~orj���r���:RT�Y�oo/�����:�XZ�H���n~֫��IẶ�C:jZ<������^��C�8��F�D�Fׅ�~��p����3�"����E[��
���h�
��?�k�������@l|���l�{e!����Q�X���\�A-e���J9�瑣‹{��,�����"�X��k�\4���<)
��Ѳ�$s���+ o�R2��A�
+�C��̱�X�!�H�u�� �կ��<ֵK�F��<2	����
���V�ˍh�_���ߓl|�ƾoץ䑹���19`��o�g��y������R���Y�)���-�?@X�1���y�(.ܻb��:"��)� �Z��ܫP~aB����ݏ�
�/
+닺��T��w���:��SOHl,FP����,9���4g�뤽&���R���?JG;��x�
+3��lm���C,���UZ�%���C.�����w.I����������׋o$\���k�����C�W௅p^�_r��s�ė5p<7��<[|��g�g�,��\�� |Rg%|�?-�3��%|���N�.N/�S���ć>H��K����%�V��8q<Y��p<���Q	�W��p"�
Mޑ𶄷$�)�
	�KxMB��W%2�ae�h�P�
+�^yy�x�Ux�������T�^��o2ࠄ�j���%�I�/a_	����{2��س; �d����N�j�����C�s
�.��g���\x�O�@->R[�$l}�-�Jx�
O>'�,�'���q���ux\¦��$����Ru
l����/<��>�xT�#맊G^�G*��_g��Sa���
�$�]�[����7<��|�zX�����ʀ*�PU+QR+3`�	����rS<$a�	�$TJ��`�?�t�xP�ҥ���LJDy,��H�B/,p�|�Ix����-0��$̖p��{R�f��b�8�[�̥p��J�!�D�K�6�[�v7L�p��)&O������-�q�\�(a�<�Ƈ`��q�psƎ�c%�	cn�1n�ÍF��F��QQ02�#F�a��KVCk`��X/qC�
+׏K�`	�]���A>qm
�AV�z`��	��E����/��o�!��!߀>ɐ��k�+�r�
��lz�r��~�傞�У{��Qݳ�{d�[f��v=df@�Ct�A�
]$�KH�A*�35�Hi�dBr	$y %�(!��!O�$Ė@J*FB4�!	A	Q�@@";�%�B�/_	x%x���#��O�������%A��4	j�d�~��B�WAb�����ZOKV��=�_X�����%��"

+endstream
 endobj
-13 0 obj
-<<
-/Type /Font
-/Subtype /CIDFontType2
-/BaseFont /KBXRUU+DejaVuSans
-/CIDSystemInfo <<
-/Registry (Adobe)
-/Ordering (Identity)
-/Supplement 0
->>
-/FontDescriptor 15 0 R
-/W [ 0 [ 600 294 770 557 631 500 698 634 610 787 748 988 684 610 862 575 615 686 317 277 634 633 352 611 411 549 634 591 633 634 612 520 603 694 591 837 636 392 277 634 974 774 294 731 751 684 817 633]]
->>
+8 0 obj
+   8545
 endobj
-14 0 obj
-<<
-/Length 16 0 R
-/Filter /FlateDecode
+9 0 obj
+<< /Length 10 0 R
+   /Filter /FlateDecode
 >>
 stream
-x�]��j�0@��
-��bK���ai/9�niv?������Fq��u�jH�yf�y��|>��aQ�k��1.�Ɛ�e�&UO�Xh��������\�k��vY��0�S�߫�m
^�tS?����R���BL�xR����:^��#�㸨�hb�.������\�xk|Xn�k�W����ɬi�O!^���Ԏ�X��iԾ_���c��:ʺ޿�)��5���OM&m�
�-TCu���,�
�	� Y�L�k�ud:��P &}Fb
�!�IW�,}j�3~����i�,}j�,�i��쀟�A��d�,�?+1�?'}��3�,�?ǚ��L�_�?���3��F2�s��3��cw���[9?�������FF�Oz����������++w�~y��9���:y�4��`�����|�ʿ���"
+x�]�An�0E�>�����cSR0�&�v�f��Dg4��8��~D�����-���
+U?��iZM���p�ՌS��/�56G>M�ڴ&Na�|�g8KU������y�ƹ�{S����5���c��|_c��9r�����}:`�p]�>sZMS�v&�X�^��u8��5�a��i�=���?��M�� �9�e�!���fg�q�U��o�E�q��\����6MY�&h��hm�����Aw��k5w�����oe�$����$ޣ��Z�^<�:��"t
~'��N��FuY�>j9�'���Y48�pzxz��989��z����|H|:��i_���?@������ӂ�
+?����p��N��>N�V�����
�^=�O����_�ӊ'A�h�ܲȀ}N���܉�ל����ѹ���ݭe^$K�
7�
 endstream
 endobj
-15 0 obj
-<<
-/Type /FontDescriptor
-/FontName /KBXRUU+DejaVuSans
-/FontFamily (DejaVu Sans)
-/Flags 4
-/FontBBox [ -1020 -415 1680 1166]
-/ItalicAngle 0
-/Ascent 928
-/Descent -235
-/CapHeight 1166
-/StemV 80
-/StemH 80
-/FontFile2 17 0 R
->>
+10 0 obj
+   442
 endobj
-16 0 obj
-425
+11 0 obj
+<< /Type /FontDescriptor
+   /FontName /IGBVUZ+DejaVuSans
+   /FontFamily (DejaVu Sans)
+   /Flags 32
+   /FontBBox [ -1020 -415 1680 1166 ]
+   /ItalicAngle 0
+   /Ascent 928
+   /Descent -235
+   /CapHeight 1166
+   /StemV 80
+   /StemH 80
+   /FontFile2 7 0 R
+>>
+endobj
+5 0 obj
+<< /Type /Font
+   /Subtype /TrueType
+   /BaseFont /IGBVUZ+DejaVuSans
+   /FirstChar 32
+   /LastChar 122
+   /FontDescriptor 11 0 R
+   /Encoding /WinAnsiEncoding
+   /Widths [ 317 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 636 636 0 0 0 0 0 0 0 0 0 0 0 0 0 0 684 686 698 770 631 575 774 751 294 294 0 557 862 748 787 603 0 694 634 610 731 684 988 0 610 0 0 0 0 0 500 0 612 634 549 634 615 352 0 633 277 0 0 277 974 633 611 634 634 411 520 392 633 0 817 591 591 524 ]
+    /ToUnicode 9 0 R
+>>
+endobj
+1 0 obj
+<< /Type /Pages
+   /Kids [ 6 0 R ]
+   /Count 1
+>>
 endobj
-17 0 obj
-<<
-/Length 18 0 R
-/Filter /FlateDecode
-/Length1 11376
+12 0 obj
+<< /Creator (cairo 1.12.14 (http://cairographics.org))
+   /Producer (cairo 1.12.14 (http://cairographics.org))
 >>
-stream
-x��zy|U����<3g�빹7!{B6–4!@��QdP4@�HU��hE��ETD�)&���V�J՟UA�mDj�ڐL�眛�׾�_���e�2眙g���<���T I��Zʖ�=�����6}��I��|B:�A�%�w�7���Y���=�s���J������7��3�_9�^!i�����:e�[x�:�6}�.�����Ξ>����	IO�����.,�O*s��k�O*}`Fi�ox��㉙��Y�K�N�V%1��_!���r�IV��_���M�f���l&�p�2b[��j����(������
�����"�q�s˨Z����8��w��ՔM-O��D�(��v�L��5S�;&�4w#H�#jq����"U�2Z�ט� "ړC�t�4]n2����rS���J�P37��~����3)�p���D��<.�v��V˙�PNYW�N�'�N�v�M�B�ZV#��:�,�_ {ݬ�,�4����
-�5e[z�Z�V@��&?9�|��S�]��35�c��1\�
-�*n�U�Au�3n,�tc�M>�￘�?у+�����vj[cؑ�|�S�@q�F�i��Ʀ��I��܋����<O	�~{,
%��������뉳��m_�q�D��V��)�>�ʤO�}�*�Qsm��!�A�M�-�s�z~��}��ː���4%�ל�}Bޫ7�"����6"/Q?%�/����7�����cW~+����NyD~$��#w�uj�p���t&�>̡���K�4ҕA~m
���4��KLL(0\	�<DI���NU&�"Ӑ�.	�+1V%�c��=��`�.�O�Z�Ι��>�
-�9�6��G�������e�iR��>T�)3�2�	��uVB��D�@CA��9=#/�����땞�:��+57'��{�g_^�k�������(kz���ʭe_�Q?��g���>�+�O����������Ð��~}���N=��s�\�-�fԍoP7T2��*a�P',��O�k9�*q�)'���5�M|
��BfiDk{��٧�$+���O�,Q��^�o��)`�L�����Z/o����|F8�d��,��E�H��TH�����Nz�/�C�N(��vѣ"�ζtss�cFX��2>��>��R��	�G�U�|WV�E�fY'�˯dNch,�S�.����v��N�߳�%rq�:Yd%�&e�����ȋ�P���xo
�p�2Д��.H���P��.��ݛ�U��a�=�D�`�Bu%Dc��t�r��̠�(���a��nU���S��	)G��Ս�R�Fq�J"�����J"�9�u��e����y��C��2Xe.�����
-�MS�	̍o����@���4���5Ep`ԥ������th��i�M\;�/q��k��{�)�Q���E�I�@6P�2����-����Il����(2�X9["�E�QͪD�Jt�
�/�.
9�Q�T���0��!Ң�~oOIJ�����F�+ɛ���A��Zo=�5ȝ�J�ґ��CЅ��
-4K����-n�ky'�	�$w����
S�4Q��EZ�^l�����-��A�HY�.�J���rw�w%��U|�X�?�Z��ķ{_��nK*W��?��Ӕ�'P��'�j�z��D��E�5w��K��w��Pv���u#1)�3SNMb2`����ݩ�`h��j�e��5U��Fta����R;w�)pMj�zA�ewUhIn[h>�c>է��D2����DW���y$�f�DV�F����l	<���J��U�7�-Pͣ�	:M�9ɐ��E�&�γ�V�޵��Fþ�n�\.s�B��N��hu
�Y7e�>
C��
-��Ʀ0�[���;^'�DҜ�����dy,�e�Fe����ac�m�
����4�t�	}h_�\,�Rc�����#M�S�,�F?�z�8Ӻ���|�Q���J�m{�
��Ff�����Q��^`���l��Bi������zO�s�e�ؔc�{S�E�:�5
l����a��t5IMG����%�L]dT���r�ɩ"h,��u�{�
�:���f��E�U�A}���A��ji��lzХ���xW����qZ4�	�6��p���U����L+Ў���h0 !yl��s]R����RV�Z{�F�kZ���0�l9/#AKJ�T��Jm�=OE���ک>P�^bZH#�X�7$΁W�f M���/���E�ȶ2ŗ���C��x1���ؠРX�]�Ҳ���l2��f�C�c�)sl���k�
���[����w�|e֑i���+yY��-_P��=�jk���9��#�z��ڝ����7�O7ط� ���Ԏ��MVJ4�2��"E�Dӥ���DA�q�":��N�<�f^�Xԇ0lt���\��@�d'ܧ\�HC�
-*�	R��:��'�|F6�n}t�t1~��bIճ�ҕ֯���O+׬]�J����)���K��&��ޟQ�o�p)A���+d���8��-����K<�V]��gS��&�~G�Z�1����Zo�Q�hl�p
�w���c�y�rc���b������	� c3%eЙ92����0�AI��uu�^Zr���_�R��{l���{�;�ٴ�x*L5�
�*C�/\8�
�teP�z��2t^�Tz�:w���JF{t�54hs�r��>�(3��x�(�~�ƕh��!��

�6�*�[��jo}}����:�v����m�����J^�oF�w8o2�'�G�d�	?uk�+��l�*
�P����s����N>\v�1���\#��4��e@cc�Q�s���9x�MZ��Ў�
	��xU)y�y�z粟j��B���kk����Μ��%��~��{��4�a㬑�����]g㬀oBC:9�����A�e�L)W˵r��(w���=��r_���,숾m"�d�U��R���nܻ�j�޽.р�x�o�;j�g����{G�yB�'��hT�h;A���/(3�4�$�
-*�ILTz���P0<��
-=�����'l�?P�=–V$_U�L�������Z�3�㯷�GA�L™yp�h2Ȋ%+�*�]�Yeԛ�>��N>2<8��sɇ_^���
�����c+b��+�u �ÛtnOB���'_>|���'G���V�!zZe��<oo�n_�<�e�n5��t ����`�C(���C��MA�ۧ�w
-����n�&���NnE�j�TNX}�6u�g6V^�"j�	b)�;��Gp��9�����Ke'H[ۉ����׳�vb�O�
�'�5L-ލ�Pr���������&Uc�I|��2�yM�yL���'����DZ�q�~�������z܆��S�q���?m���Zm���� x��0�?�cg�f~�?�R�mTΤ�Ժ��):x"�(�ߓ���0~i��L�'��JO�g�'�8UW\���|Q4���/���+����2H*MeI<IdbM3R]��OWoW_�ه�QD<[�5z�z��z���l�FbQ�`!j�K��}�1�3�;�g���:���B^(&(��	�m�m�x�x�$�$_�YBK�L��=�"�L[�]�[M�W�V�W{V{W���U�*�V�V�N�N��_������f��8.���C)�eFo\��ޛ��&����;���|o���+���-�^���>Ա����V�5�֠
�:7�Ǡk4zʡ!�1��E��&g�޴�d�������>�M�PWw�K��z��O�]�S�o}'+��co��K���sԧ�H�;Z���λ��
�7�9�:M��;�>,=��I�tJ�U�oW��\�W������ݭ���:=�� �ʐG=�>���+#:��{��QJ��LZ�x(�>�D��DA';�$�����8�䆳��s�[.ۦ�خ������	ى�I��ٝeX�V��h%Y�V���„��¤���΅�+�+*+�*�Wt~$cGƥ���O;>���(�(�(�(�4�4�4�4�"�"�"�"�Ӕ��
�O��접��j��2���]6{K}]ݠ�U{��^��ME��x}��/�ܒ�is�ȼ�uYM�Է�~��@���=k22Zl_:}��U��^/�^.{�\�>v5���d�ش�k��[c5��;�b���?������v����K:�%$�����q�8wOy�]�����FW�+�$�5w1���Fd�B]#�$tI�L�LN�Xi�t�t���h��b(.p���?DC�B��3�2eޕY�Y��H��K������kaFI���VX3z��ի�m���?>��ν%��._;c��g�_~_r��ץ˸qֈdo�-��8���z^ޤ1�
-�|�U˷�M뢍)�9�2���:�*�]z�
�q��8ȴK��0�����(�PbhP�Ћ!� ����#r�0�n��n]'�����Փ+��j}��ʕ�����O�h��^���G���d�a
-�bar
-'!�*=X�Y��B
qm�W���4��ܱb�.Rg�A���@~�g�]���Jp���TA&�*jP�Y$�4�F�X:d(�j���'%����P:����<� b��JݬlVQX(����I����I6t��
-Xwc���g��f�'��{��<ԺZ>VU�k�|��r&-��ֺZ���u��/[/V>��
-[���La<tћ���.q�j�0�gLƨ��7
S����3F��|sDN�F����i��#$���nצ�`:�Q�.8*Np<�hv�k�S��_SJjm687bx�H7n�0���ԉF�1�.����u|���o��njG�]�y�"V}��a����
W�DH�qeB�Hӻ��<�h>��T���
C�}���L"�$6	nØ7	c�}���3۳��{��=t�Z�y��͓e��]Hqj*�X��֜��䡳�e��Y�I3yQ�g�o�:9��d�r]o��,��ǂ#zH�L��'T,�I���4����
-l�tύ��l�D�%����h=����!x������1�Q�#�%�����cb�S
-����S�Fώࣜ�`�o0j�E�A���|i�,���rjz�M��~a��+�8zN���|���.�����h��cx��{��W��̍}0n9Y�<fy���dw���JÕ��&}��8�sB���쭖���u�Soyn�]�.>=�kr{��\SS��>��M#T�t�9_�}dz���&�����6�sD�^���yb���p�7�h�x���IRr�w8�B�(�_��Udr0��������I�2�b���^;�te��&�^ߺc���?`E������������U^�/�&���P
�c�۩ٵ�B�H/�E8%��o��uu���%����"����<����u����E7�;(z����|q�_���	)�.Q�µ�Ь���ͽ��������[�]�����ǎ|G�G�:��V��;����ܕ�IP���ȧiJ���
-�:!�Oq\hzxG�`�����VDvjaji�#�;��F�g�m�:R�������Kk3���������~W�����T�h�X�d�_�I�SO�I.����o<�$�wO[rm�f
�J<ɷ����U[��2�����jk�3{��N�.�]�:��xuG��h�M�c�
-�ع�Q����w�A�'��!����z�cT�]ڲF^��b����3��]��c��-�>z?�2|��*�����ߧ9��jY����H��bD��d���|����^�0�pj�Ξ���z�<�=�=Ξ�_	��N~yˠ���3����k��v������IJ"5f�����ɲ�g��)o\��v�9�;���'F����ٮ"��v�����y{�q���J����3-�.�:u	ִ�!?��+M����יּ�Ԫ��,3�D_�vl�8V5�.4d�/tv�r�d̛v����c�Z;gZ�`����?{�:�B^�20�)�(��>g&ƻ��Eb��T��U��Bn�f��i��0>LL����?S����� ��1�+I��,�g�4%I�Kr1���>�p2�a#�1L�����{�=b1�O�E|���Th��&%hr�z�F�>E��?�zD��ſi��O D�����F���=����=���G{,o��=�px7�(�����G��Z7��i�����5C�6�"Y��l�#�1԰����b�Qh���%�"V��rQɶ��b������x_����]��\:��!
���X-V�Bn}��H�i���YM�2�T#ٕ�·޼��o�Ű�0�[��=#�6��}�	�&�B>Fܪܪjc�q�
O'�t�3�,1K��ޯOu���G��El),�K�b�\Y����Ez�^f�w-uW�Ub�w�D7�
�\بo�feU��{w�]t'�	{���G��~��;���_u��F�����"gO'���h���L����ٯ��ɏ��������f����n��Qctj}�~^c���k�M����p������
-�l�f��H	���5���$	��KYmmx�l�O��P�,���&�{no�a�Ո�������x���$
�*"�$�t"�$��b�'	$�I�x�BR1'N�l��$]I7ҝ� =��'�#u�8��"5�	��Jp�9س��'+�<�y�G���v!����Jrj���${	9+�LǑ8F>
�|DՄ������_�'I>���E|.ͅ���[>����I���%��ȅ>�{�gpj�y������z���!-A:���2v+�'�V����'�6z
-�;D"g�f�l8�F�ຎ��C0�����?�c��﷒���3� �u�>���㡇8��.�r�y٩�)A5g�9���C��
d9w�����)|7Nև9Ed=����F)��y8�2{t����
/R�����+�9�[qE%�
�ŏk�OW�j��~ON�#y~�#�KqՄ̆<ԕ��|�Oz@5Y�#9�U����'����t�����(�~y�*c#�W԰�#ݓ��,mDq�5fb�{��{t���$��TK
-k=�����
-'"�T+�j!M��i)�������>�pbRm����)�}c'�}���?d��̞�V��E�I�g&=�8�����z����[l�t�̻|~ ��c&ǟ߸����[�y���F:�	��}2�����y����k٨�%�rT�$G�<rTx�LښD5�+����֬܌�-��
,?��(�ؚ���ek��|�~3G�!�G��ϓ90��%��s�
��s�/�2ލ��p��8N�@{�"ՐB�t��'��\2���V->&�Ѽ��4(k�{��uƶ��V���'Hу���b�k>���r�=d���†�|�U��P�ܽ��E�Ḟ�	�N�v��o���!���D�$�8�
!��	�����h�3���
ߍ�1�p���������-i����d�8�O3��ٻ�[l)���3�cV�	�A�g�������������{�o�p)
�{�F񝄋��m545�_��H��|]$|��ύ���xn,|�E����Ȃ�%�E�g9�_A��>��q��ξ
-I�_�p)�9=L�Y
-����b�)	��%�A��~/�d5�8� NH8��r਄�+Lq8ލ�F	�Hx[�[ޔ����%�&�A«�P�2M�K�{㝄WN��
-�T���K�Xmp��K�^���^�P+�E	���/�ݓ&�Þ��ؓ5
x�~�vKxN�.	�`��g���gr�i/<U;�հ]¶'ݘ���nx��h�D1<��/���~�b�f	��=b��jT�GUհq�Wl���X3<�ȫ�Q	���"y����&�O���m���vMO�Vš��0.��a�*�X�U.�Ď�bX��Z�+L�������!	�MX&�BB����K��_KX��Cٸ�(K��IX�n�o�<	6��fx��4C����po2�J�,�@��H���ƛ	3$K�.a�������t�	�K�,a�DCLj���-nˁ	����`\�R��	n
˜�b��B�R��[�b��[�p��Q�d���#�bd����~�a�VÐj,�&�C������0H��b`n�7`@�`�����IȗзOP�m�>���Oz�Do?习W�z �.�#�.��r�ld��g]��C��@��i�[1t���i��.i�ˍ���i.��4�JH���ɸ��$Cb3$��!�q��8	��S�x-�S1D!��$D�G����!!�/$f=�Y���+��;Rx$��mw$�$~�%h��&A
�R�ى_pԀ`/H�Z~�z��@�h�u�����5
�˿��	���.
-endstream
 endobj
-18 0 obj
-8287
+13 0 obj
+<< /Type /Catalog
+   /Pages 1 0 R
+>>
 endobj
-6 0 obj
-<<
-/Type /Group
-/S /Transparency
-/CS /DeviceRGB
->>endobj
-7 0 obj <<
-/XObject << /Im3 5 0 R >>
-/ProcSet [ /PDF ]
->> endobj
-10 0 obj <<
-/Type /Pages
-/Count 1
-/Kids [8 0 R]
->> endobj
-19 0 obj <<
-/Type /Catalog
-/Pages 10 0 R
->> endobj
-20 0 obj <<
-/Producer (pdfTeX-1.40.10)
-/Creator (TeX)
-/CreationDate (D:20130503000710-04'00')
-/ModDate (D:20130503000710-04'00')
-/Trapped /False
-/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009/Debian) kpathsea version 5.0.0)
->> endobj
 xref
-0 21
-0000000001 65535 f 
-0000000002 00000 f 
-0000000003 00000 f 
-0000000004 00000 f 
-0000000000 00000 f 
-0000000305 00000 n 
-0000012116 00000 n 
-0000012181 00000 n 
-0000000179 00000 n 
-0000000018 00000 n 
-0000012246 00000 n 
-0000002298 00000 n 
-0000002427 00000 n 
-0000002573 00000 n 
-0000002959 00000 n 
-0000003460 00000 n 
-0000003697 00000 n 
-0000003717 00000 n 
-0000012095 00000 n 
-0000012304 00000 n 
-0000012355 00000 n 
+0 14
+0000000000 65535 f 
+0000012816 00000 n 
+0000002524 00000 n 
+0000000015 00000 n 
+0000002501 00000 n 
+0000012325 00000 n 
+0000002633 00000 n 
+0000002848 00000 n 
+0000011488 00000 n 
+0000011511 00000 n 
+0000012031 00000 n 
+0000012054 00000 n 
+0000012881 00000 n 
+0000013011 00000 n 
 trailer
-<< /Size 21
-/Root 19 0 R
-/Info 20 0 R
-/ID [<552026DB78C544153E75AB9B07581754> <552026DB78C544153E75AB9B07581754>] >>
+<< /Size 14
+   /Root 13 0 R
+   /Info 12 0 R
+>>
 startxref
-12621
+13064
 %%EOF
diff -Naur ns-3.18.1/src/lte/doc/source/figures/lte-ue-rrc-states.png ns-3.19/src/lte/doc/source/figures/lte-ue-rrc-states.png
--- ns-3.18.1/src/lte/doc/source/figures/lte-ue-rrc-states.png	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/lte-ue-rrc-states.png	2013-12-20 09:44:51.000000000 -0800
@@ -1,123 +1,238 @@
 �PNG
 
-
IHDRt��B�bKGD������� IDATx���{\��?��p]X�� �"�)�X�E�Z�`y7į�����;f��&�&��LM05M�8y�bi*��L��y��%��o{���=���2;������`?�ϼ?�ٙ}���Y�eY������K
�K���x���[;
-����u�ԩ֎�cpC��edd̟?��Q�������֎��̥u��`�222��ӭ@���\�h�\�h�\�h�\�h�\�h�\�h�\�h�\�h�\�h�\�h�\�h�\�h�\�h�\�0��p$I�N�}�ѹs����Y]o��ɲlNNN|||@@������[xx��9sN�:e҆F+<0-7oޜ={v�޽���]]]����͛w���M���Q�7�F�Z�˲���cƌ���srr���=z�W_}Ų��h���
-�n���h/X��5k�Z;
-�?���!���PUUſ���[s������mDȆF+00-�Ν���0�S��o���4�՚n<uuu�G�ֻʨQ�����F�y�f�r�F������K���D�PTVV�8qb���$77711���趦E�S�N���o���V�Zu��Ֆ�����K�.mܸ1**J�
�҂jjj"""�����ʖ��������GFF�V%N�F��������|��AOOό�����LVZZ�v�Z//�C�%''�]k�ҥr���n�'�NhC�����=�Ν�Сegg�,��C������˗�k
-�P�F���BD��ŭ�AH�����6����D$�J
-
-�jH�R":|����aaaD�a������0s	`�
����Ν;-�ѭ[�QjjjHH��6j///"jjj�v Dm<n���D�p�����k-�߿�…�u4����D�lٲ���C�H.
L3n�8"ҺC�Mqwq۵q���D4lذ����[�(�JkӦ�v��I"?~�ޥIII�4=��s�������6mj��l
�K���ٓ��޽k�F�k6����DԣG���P�\�2>>���>333999""���{ƌ7o�l�8y1u�L��_Q�޽�.�����O�r;;;n�r������m��!�0�J��v����-77���0---11�G����YYY,((�vt6a„	!!!�n�ڰa��c
hH.
L�M��������o=Y���O��6ݐX���RSSsrrnܸQTTS]]�hѢ����S��$���Dt��5�K���EvvvK�,!������ƶ�
���\�&77���>[��:T��v'88x۶mDt��qo�MǍk<''G�R����k�ĉ����o�^�~}[�`]H.
L��o��X���&M�d�����D�bŊ��b�mTDUUU$���"j�q�c���^XX�����0==��f̘�w]{{{n�r�ʕ�`uH.
�P*�UUUyyy.|��GkkkG����h����Ǝ[]]=t��5k�\�~].�755]�reӦMÆ
�X$F
0 --�ԩSUUU
-��Ν;�3�hȐ!�M�-66��ui����qYY�\.///��O���А����SOZ}���AAAf����tLh<����<�L||�ޟ�9�Z���m��===��W��)pܴ6��5��2r�H�-������G͒��,�H�Zp~h=�\��������+�������zzzZ8ww��fgg?�����R����s���}���?����6l�������T*
�?��h�x�t����:�k׮��8_____߸��]�v<x��͍�)S�z�@�ư�"ddd������[;���
Z3� k���Y���ЎBk��%�3�V֎&��Q�`-��� �� �� �� �� �� �� �� �� �� �� �� ��8X;�Tcc�ƍ��M~~��Ch��\ZGuu��ٳ�h�v�ò��c�v,###==����ځ�M�w.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
�B�a&((H�P��p����v�:f̘��<![aY6'''>>>  ������-<<|Μ9�N�25T�/���FZZZRSS{�����h��	g����A��ò��c�v,###==����hM����͛gΜ�U�y.����0LvvvRR�&�����o��V�R�;���_
-i��,Y�dٲeꗶs>7�}ˌ��� ��
-3�`iK�.���F��,˲�B�����Y�}���W�:u��~���jժ�W����444\�ti�ƍQQQ"�oCv��ID999---�Q�F`�Z�ԙ˰���/nذa��ٚ�3��%�o����wrrjii1����~;j�(�S�N�����!=
��̥���R�T�T�vu3�B`�~��K���ۣ��===������-ZTSS�U����&�e˖񤉺��a�:[�n%���T!���P��q�FBB������Ϝ9s�����<�R�t��=z8;;���fffj-%";;;���d2ي+������:`����t�yb�fSS�ܹs����r�B�v����������FGG�۷O`��u��gϞ������>nܸ�7o�O?��0L@@@SS�f喖�.]�0��?�mM�W�~_V�vV0:�Fب'NL�6�K�.���;v�������E��Č�
-ſ����C�v�����)00p���6�,@+�Y�&00P�RM�<Y�VSS���J�Jehh(}��'��mj�(��ׯ?��sD4o�<�H�w�ND�/_�Xx�z��}y���.]�h6�����CJJ�V�ݻw�溚����[>b��L�٬�WWY���d����+
-	Ռ��P��t�ҥ���eY�;�V��\��?&���H�6���k����5�B�m�a���\n��11;6���F����%��6m"�Ν;�޽�Ν;���'O����$���T�����/�$������&�pr����=55��f�!����6y�����-"��ݻ=z����ȑ#ݺu��xC׮]���WSSSRR2v�X"z��E���FD���[�l����������;t�@D+W��\�s������
-W�ZEDnnnk׮---mnn>y�dBB��P��:ݵ-ZIJ�C���S�N���\������@"ڻw/�����5ZA���a!
�5�СC���2����l͚5��L�csuu%�w�}���L&�UVV�۷/66�'r~H.
�U��rȐ!Dt��1�E׮]#�>}�p/��J���r�f�VXrID}��ݱcO$�K�B���7�|�.�����+�1|����
-ׯ_'"wwwC�DDDQff�f��7o&�
h����=��CD�q�F3B5���0t�
-

�^<����Ҹ��]hh�J��o����v�+�q<I���>������k^I�H$�
-�cbvl����}���7o�|��U���Cr	��%��䇽��������-@���ё���Q�}�v"���khh��	�J�ݻ���?6��6o�l(���M
��Kggg"�����?��f��R��#���;w�hn�����\\\4W�w�f"���0#T3��Cw-u.���KD;v���kjj�貲����_ht����8�6�]�ݕ���?&fǖ��ףG�-���ݾ}�h����
˲D�T*�����n�ާM�8188�����ׯ7ڸ�����ù��+V�0Tm�СD�}�j[�/rD�%���K`Mk
�رc#""*++׮]�q��[�nu��M�w
-�to�ֺ�����������,˾��KEEE��(�������ٱEEE]�z5//o�ʕ�Ǐwss���o�͛gR���\���ˆ����z��[���~ɒ%D�r�J�6TZZjh�/�@D+V�(..1T�z��IDǏW��������'88��<�Y��~"�۷/ϊ�����f�jF��t��Z#"�a�w��ի��曎��<������ݚ��.�6�qD�]�NKK��G�{S<���&6�����fgg���oD��Q�z߅q�ŷl�BD����6m�q�FcccsssQQ�ƍ����:�(��� ��"�����cǎq��y��`�[^���?��k׮�d����˗/sQ��*�K3�h1#!�p	����֭[�ܹs�Ν��LOOOҹ�G��իW�����u���ʚ�����z���7�p� "__���F�Y�}��'�h�ر%%%�������ڵ��3���w� ps���ŋ+++���v�����ZM�ٱ=���۶m+--�����
WWW!]��%�
-�\�,;w�\}����3����,�:�5u���?~�'���ڸ�8�0����y��1c��F�������6���^o�2�쩧�2	��yѸq�4W�|$g۶mܢ�K���њ�%�9	߮�
-��8�A��֝Ÿ>}�ަxƤ5o*-/����.��ZE�\�,{������w��������%,,�7�8�<�T��M.����[�\�sN"�͚5�ʕ+F�Q�T����n�Ri����̙����YͤP�_�,{����c�J�Roo�Y�f�KI���%$���洴����D����b�
-�G8
-L&����s+J����h�;��C5��\�����3gzyyI������ׯkU;u����k�a�c˖-!!!���]�v}��
-���ٮ����q<����P(���������ܫW���{O�EI��Č����gΜٳgOGGG�����>�L�P��^��Gh�?�`�������pO�l���w)E���E7o�<p���������y
-`1��.�=�_�~�
�F`L��@r	�H"�DGGs�j�	�H.
��ѷ�6k�߶���4�;� $� $� $� $� $� $� $� $� $� $� $� �eYk���/���T*��*�J�R988p/�IHH��/� X����vfРAnnn���*�3ƒ��M�eq0
�03f�pttԻT*����[8$�H.
�dS�L���厎�III���!
��@r	&			

�-���'O�|<`;�\�9^x��+����111V�l�K0ǤI�
-�f�����ɓ�����$�`�nݺEFF2�.��d�&M�bH`�\���O��9Oٹs�C�Z1�H.
�L�?���W����O��9�	&$�`&__�#Fp���&$�`�iӦq��}��
�v8`}H.
�|������)S��������[;
-q����?���n�ƍ֎@���S�N�v���>>XLFF�����X^^n�(�1�\ZN^p�hiiٽ{��iӬ�222��ӭ@���\@�8;;�"�!�����-
@
�%��%��%��%��%��%��%��%��%��%��%��%ܷ����kF�D"�ԩӣ�>:w����|!�뭠���z���0����5���F��Y~��9�az���HTT�0C���h�&�}���ٳg���������5<<|޼ygΜ�N�0�a���h�e5�R�TO<��0'NҎ�h�tG]2j�(ͨF�eR�uGU�$((H�P��?�,�fgg�3���������o���_}��֐�.,n͚5���֎�����9����W�۾هՌ3�h͚5��\���FD�H$���f��իWQJJ�f�.]Ro����D9�;w��Ãgݻw�����G}��"@@@ee��v�G+�;�KGGG..T�D`����V�7oX�P�uuu�G��[gԨQuuu������z�����W(���'N�X�`�D"���MLLdM��{\	Y���<r䈺��ٳ���}��	knn>}��zWMk:���?'"ggg�����)�`�������������������h������\��;nڴ��/^|�������o��m޼���[H;�F+d/������{�r/��ݫP(bbb��Z��K���r��xBMNN>x𠧧gFFFII�L&+--]�v���סC����E����=)C����-C�n�=�ܹ:Qvv����+�+--%"OOO�Rɕ�X���f͚�ꫯ�|��+
-.���r��2��S�ND�駟���OKK�����Ņ����������#�<�P(�r9�2Μ9��v�D+�#\���L"����
-�z�)"���2u(����ˆhÆ
Fkj��~ "�TZPP�����@*�����
-f����0s	@HMM%��;wZl�]�t	
-
-���>w�Wr��Q"���~�'�����Ϟ=[[[�^}߾}=��K/�q���o����c���"���&�jk֬�޽��ӧ�/_�|��3g����c͚5��#���''�#G�TTTTTT=z���)!!A���~�m"Z�lYKK�y-p��…��ﯵ���.T�
�eH.
��ƍGD�J,C�ʸR����#�����Ç�ɓ'�k�\�'�|Rs]�:�̙3���2�z���D4lذ����[�(�J�j:t���d�����������tww7�qyzz�9R�T����ٳG�T������{������R�
f8y�$�?^�Ҥ�$"�{��m�����],C����f�\\\�T֬К���/�$�ѣG�,�}òO�>ܢ��P":y�$˲���D��/�)++���wvv�nO���tvv���+))�_����:./T�СCrr�7t+���k\�y�浦!���۷o'���;v�1<�+n�655��4�D"!"n]]������(���
Z3�DD*����f.�?�P(�������"��q�\����=�G�bff�R�7nw���wBB�J�R������������%&&��ѣ��6++k���Z���Ҹ?�/_ޚvD4v�X�Dr�ر�Ǐ����;V��'L�r�֭
6��2@;������͛D���k�z��&p]���к���g�r�%�S�Fry��醆���0��n����f8ܕ�,�[7[XXXjjjNN΍7���bbb���-Z�U��kG���B�^pww=z�J�R�T�G���$";;�%K�QZZ7�($Zu9��k׮�]�+7f�!� "���%"��p,���<|�����Ic��#//���X�!DG��~�:��ƪ���]:�~��泍, 88x۶mD��o�v��0a���8qbpp��۷ׯ_o�C�%����K�r��-Cr	@�����I�&Yx�\��駟���u�ܙ+�������4�y7��;��GKUU�~�T�v�=��3R�T*��3�-ڷ���&/W�\i��c,���������}[��PJ����*//o�…�>�hmm�#-Ftt4�0���1m�ᮌWTT��٩/�WWW�ݻ�a�{_JJJ������[]]�F�0 --�ԩSUUU
-��Ν;�����OP�i;fpuu������wuum�ML�<9((��ݻ��___?|���?����L.������'ÇohhHJJ��	`�Zu;�w#Z��;��@������<G�X�Uxx8�����5˹[����V�[��4���駟&�u��
���P===��W�[���H���<-����%�wV�����ڑ#G��N\\~��p~h=�\�������'22�W^����������J$��SꝹ��ᒻ�y+�&�i�]?��[o�5l�0ooo{{{�T>��.8���ج)᱁� IDATS����ی���:�k׮��8_____߸��]�v<xP�;��ö����%###==��
-��g����%����
ܟ��Yj�W�c����f.
@4��h�q��=�,.�@�a�D��D��D��D��D��D��D��D��D��D��D��D��D�`�P���7n�v�7����
��Cri��ճg϶v�-00��!�o˲֎
ڱ��������rk6
߹� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� �� ����רQ�4�G��^�[_o����w��u̘1yyy��͛�g��ݻ������kxx��y�Μ9���ϟ?�hѢA����9;;���+�����p˲֎
ڱ��������r��/�a���/ooo"������gF.��湋��[��lvvvRR���j9�|tttMM���������ѣG#""Z9�X0s	6*&&F.��ݻ�{�w�^�B#��eY�U(���{bb"˲���I1�N1�[�`AMMMDD�w�}WYY���RTT�~������<p��U�V�;w������f���={����z���M�@���%�J��\fffΘ1#&&�~ �����1+++99��Mj�ܾ}�����ɩ����H��']]]���������cR��|���!C����466
-���a���M�555͝;��������Ə�0L���U*WM�R��ߟa�	&�7������t�ȑ�������G�:99%$$�������@^^^D�������ܯ_?"���h��Ă��4mڴu��UTT(�J"Z�~����ŋw���Uؾ}�ŋ;u�~�z��<==G��T*srr��٣T*����H��J�7^}�U"z��L�	���hذa)))[�n-((���$��ꫯ�h������X�VX�fM`` ��빝;w>p�@]]��¶mۈ�gϞ2�L&���ٓ�����Ӧ��}�v"���~�'�hǎ�Ku�k�hrwwOMMmii1�w��'����R�C����7n�=���B�a�?nR���Kh��Ro�8f�"Z�~��u�h����m�s���Z�Dbggggg������%�DԷo_.=5�i~FǤ��0---11�G��*���.\1���€�"��?�a4KBr	���\޻wO�NYY���������@@@ee%���Wbb"�2))Iw���{������Æ
#�͛7�t+�KMEEE��qqqb|��I��L/���J�2)����\���;Z�x{{w����ѱ��������Mx���~������ÿ��K"Z�bOM�S$O�@�����?.J�����w���ٳ7l�`ғ�,�%����ԫW�.]����Dž�,Y"|�g�yF*�J�R��z�Y�'m���Ȕ�i�8+++!!�����_���O�Y�
Br	m�����֭�߿�ԩS_��nݺ�^���ѣWwuu������wuu5;�����ǏO�<�����l���v�ԩ��*�Bq�Ν��\����!C���7����3f(��^{m����,
�6�!��*ꇨ�}�xUUUxxxyy��}��y�"���/�L�ҭ[��~����So���.�rC���������c�	읩Q7�]OOϟ~�I�� ���&�ܹ�֏�3�І^~�����aÆq�%M�4)22�����_�X�$((h֬Y�Ν�Y�����o��ְaü������Rixx����/\�`��(-0��0s	��?��f.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4H.
@4˲֎
ړ_~�%&&F�Tr/U*�J�rpp�^2�����_X/@�&k�̠A�������
U3f�%�
����`�af̘���w�T*����pH`;�\�ɦL�"��u����$��C��L�[.��'O�l�x�v �s����Wƽ��cbb��$�`�I�&)
-�''�ɓ'���[+$�H.
�ݺu���dF]"��&M�dŐ� �3M�>]s��s��C��b<`�\����y��0899M�>]s"LH.
�L���#F��&/qM8H.
�|ӦM�&/���n�p���\����㹙�)S�X;�	�mq+(((��Ϸv�;�����ƍ��\]]�N�j�(�1F�}|��������[;
-�#00�����Q�c��������Ҳ{��iӦY;ddd���[;
-��
߹�Vqvv�5DPCr	���[��K
�K
�K
�K
�K
�K
�K
�K
�K
�K
�K
�K�?1���׌�DҩS�G}t�ܹ���BV�[A/�A�,���������>gΜS�N�V���bfȐ!��5J�|ԨQz����!00��;{���}4iT�q�)
-�r��,�fgg�3���������o���_}�˲�F�멿�||��c�U8�jB���^kN�0�a���h��T�'�x�a��'�	`e,Xܚ5k��}N���s$$$TUU񯮷��S���qqq�t�zQaa��x+++�»w�r%G�����6��<utG��z�͛7�k���Ս=Z�FG�UWWg��vvvh�r����*�{����?}��G��W�&���u� :��
Z3��`���
-�����ĉ,�H$������,o��Ӛ��N�:��o����Z�j�իW[ZZ.]��q�ƨ�(�ʟ�99;;���+&&F.��ݻ�{�w�^�B�ss��-���~�m3�(�.]�T.��THNN>x𠧧gFFFII�L&+--]�v���סC����
�������`�ȑ*���w�խf�
-�/��ر�M��h���W�\�
-/_���[o��͛���������SA(���t�ކ���Ν�Сegg�,��C������˗�V��d�:u"�O?���|||ZZZ�Ɠ��ID111\�SO=EDYYYBF�����\]]y��2iT�4FD6l0��~����RiAA�VR���>�ayy9I$ݭ@֔�b��z����#�<�P(�rydd$͜9��5h=��
Zɥ��e
“K�e�-[FD�4���+��3��
-����CD=�˲z36.���*'''{{�۷o߾}�����ɩ�����%�oT�4�k�."�ڵkss��ML�<���}�]��p�S�LቐK.}||t�.|YS���^�]TSSӽ{w"�����}"�ѣGmm-Ok�z8?�.�иq��̙3�"w��]���3g�T�k�
-����ȑ#�JeNNΞ={�Je\\����2���~{��h�����y���sυ�����rׅu�<y��Ə�wiRR�wxu�d���BnFP���I(|���C����ü���|�
�0������"n�MX;�}������y�755�����ʚ�>�$	555�YVVfoo������QYY���lggWRR��w۷o'����'�x��v�ء�;z#7�����*?uS_~�%r㣵	��kllԻ+�DGG߽{�5h�~1�kC^{�5�μy�x��Xp~h=�\�J��veff*��q��q�px{{'$$�T*�
��;V"�;v����...cǎ5�	{{{�����'O>\����	&���ܺukÆ
b����g���;vԻT���_̖�����|�rq[h#H.
��͛D���k�z��&dE???�v���n1��r�+�YYYz����>z�h�J�R�F����f4~�B���ٳG�5q��h�����-Y�����Ҹ�HM�3z�]��w]�<  @���֭[����ݻwnj���mA���_�������Cr	@���D�ݍkC�Uo�Ǒ#G�_�ND����Gy������׏9�w�	&h�a�Չ'߾}{���Z����n��ŕsut�]�v̘1����룗�
4o�<(ľ���;=���6�?�<�М={��,�?�QD���EEE<ո;�
�<y��x�R�T*mhh0���[SG祥��_|AD>>>Z��}������(���"��7i��/Bzmv�������e
��B��w�މ'�|�M��#F�T*�Ս�o*��|���}�ѵk�d2Ycc��˗����,[UU%�H��q�ֺ%%%vvv�D�8��X&�4:�&mN�P�36͚���D���v����R�LVVV���{yyQRR��^���D4~�x���\*�~RA`�������e
��)��������^+e��׭[G�����OѺu��W�h�G(��<utGU��4K4o��,���9r�ލ������G�m������0s��!��Ԍ��3���Pl .��
Z߹�������Odd�+�����������i����<���������;88H�����ϙ3�{L#��D�[F4͘1��~�b+�>�S�L�ݻ�n�����C�v������������k׮�����	|���X���?�ajT�n�XÊzc#��������L���
Z3� kpb�g�x�����%�3���T���3� $� $� $� $� $� $� $� $� $� ����TVV^�v����?���J��v8�Cr)>�RYVVv��5.�T�Q]]MD�������@|H.[��?��x������������^����WFFFzz�u#0˲���...�l�K�d2���^TTT\\\\\|���k׮ݺu�[���ۻw�ѣG�����C�566nܸ�R��#'''**��
����������E�T��W�P�d2�����[9����
��cX��v��������\�R\\|��M�RID�;w�۷o�>}z��ݫW/.�tww�xFF�����,v0_```yy���hǐ\��r�ŋ/]�t�����R�\N׵���֫W��]�:::Z;dK���G��T*���nݺY;0nÆ
���cY�;������s��ر�b�
�}�K.kkk/\�p�ҥ��b�����=z�			��.]�X;^�y���?\]]Ͳ�[�p���(**7n\qq1w�E/�a��ٓ��h����v�'�r�����K%
-
-n޼ID�������۷oppp߾}�������/�ͩ��<xpII	7
v��ݎ;Z;(���y�…�֭c�g{''�{��I�R�����*�T*�W�\9{��K�.^�x���?����\\\~�ᰰ0��v�~��,@;�P(���;���Z[[k�7�������ܭ<�����^^^�;w�2e�ĉ�v�j�
�~Ҿ�K�Lv�…_~�������"
-�߿DDD��������뇇�����__�n��Eզ�&�DbŐ�<���III�.]��{{�7�x�޽{999����?���ɓǏ���m�P
��kgɥB��t��/���o��d2���������p.��e;��۰a��/��u�P*�vv���v���yѢE�|�����ݟ�٩S����C��رc���*��g��9s�ȑ#�s`[O.[ZZΜ9s�����
-�T*:t�a�
4h� \��O?��u#���ϭ!�.lݺ���^R*�
-�b����O��\Z[[�{��-[����w��999yƌ�{��V���bry�ƍӧOss����kmm���C�~���C=��o����>hР���T��ɩ���ZQ�X.]����XTT�bŊE���e˖m۶ݹs'66��7�|ꩧ��p���Dr�T*
-
-�?~�ĉ'Nܺu���.88X�M8�����a<���###�����#���644X%*Wcc�����ϟ�SM.��۷��O?���CBB�Ν;m�4777��	�ՒK�B�����ѣyyyyyy���C�:thTT�#�<ҡC�� S�T����~���m����j�GVw���O>�d۶m���)))���j�^���(�&�*�����?��ӑ#G�;V__߳g��<******,,7
-X�֭[�������~��cǎw�޵|T`#jjj�lٲnݺ���)S�,^�888��A
�ͱDr��_8p����G��w���O>��ؚ���/�����?�}�������񀀀[�nY16�*������ޯ��:f̘w�yg����
-lH[%�,����ؿ�ٳg�������{��~�a<��ƩT�;v̜9���J%�0J��[�n��C��T*���e˖]�re„	~�a�=���/C���
-
-<xpFFF�޽�m�VQQq�رŋGFF"��}vvv.\����믿>��A�1���l���V���O�<���`Ϟ=�������?�g,�
'��eaa�={v��}������	&<��SÆ
spp�}�����.]�̝;��w��J~����G������u�T*7o���;�T�w�}w��٘Dx��6�ljjڹs�����g�v����矟4iҠA�Ċ�b�֭�f���?��uuu˗/_�z�C=��矇��[;"��˫W�~��g�������ƍ{�����q�7����G�ڵkvv���v�ڵk�f�:~���/���J�RkG�fNrYXX����������k֬Y��ɝ:uj���*Ξ=;x�����'��v,��(��5k��������SA4�M4^�p���衇�]����]\\�h�"d���
6���!����ۿ��.\pqq���<p���#��\��ս��k,++۷o�/������ߙ��TUU�رc֬Y�ڷ����Ǐ����>��y�tM�W�n�>x��K/���аiӦ3f ���}��D4m�4k힃�CZZZ���_��{��eee�.r����?���g�}��.]�������>�R�>�䓩S�z{{[;�O̙3���999S�N����p�1rC��ŋW�^�~�z<��A���_�?�ʕ+}���v,p_�����nj�s�N<���Ɨ\�[���^���NJJ�dL`-�=����Onn�����_����[��ڱ@2����Ǐϟ?����'2K�ĩS����;f�@�����O�ٳg�ر�z�z�7���3����?�p�޽��|��
���ϗ���:u�ځ��lŊ�/���}��g��	�7����;r�|�Ν�}f�0nQF��� \�vm�޽��Ϸ�����YKKKKjjjϞ=���8[k�SSSgΜ9eʔ.X~�`
zf./]��u��)S�X%����Cu;k�8��#I�|�͛�����b����]���,Y�dٲe�f�Vv�\{�ƍӧO�g8�?zf.�,Y2`��ɓ'[>�cYi���������z�_��o�ܹ��rrrZZZ��l�t���g�GG�q�Ƶ��X;�vrY\\�����;��*��#++���.%%�ځ�P���7����ڱ��cǎ�|��ŋ�[P���233�[�ncƌ�*W(k׮<x������ktt��}��E2�lŊpuuuuu0`@zz��/}q��Q*�K�.�ѣ���shhhff�f�B����ۣ��===������-ZTSSc4Hu��h�,Q� J_tqk555͝;���O�o�=�q�FBB������Ϝ9s�|kJ��g+
-��_���СC;u����`� IDAT8~��Ç�!����g����qww7n�͛7�觟~b&  ���I�rKKK�.]����yƍ��{�w�+����>~'N��6mZ�.];v�����s�������S����?�裙3gzxx�w��G�+� ��j�x����3f����X�v-ݻwo�ԩ^^^>>>o���,�Ѿ��x��2�]#|��������G���ch@�nf���
-

�ꫯv�ܙ���_�������x�
�B�L�w�����Ç�.1b�L&Ӽ
-�;)�{�n�&��Q�Tz�ԇ��������qͿ��.���C�����ݻ]�t�\�����V�z�n��d���:BN�.]*++Y����"�U�Vi����Qdd$�����5Z����}B�m�a���\n��11;6�}��G}�����_iE��e����j��q�4+����~�G4K���C]6���	Ϣ�n����j�=b
�?
��cꩌ����������o�&�;����0���_kUZ�j����]���������ɓ			,�r�����ܲeKEEEEE��ޡC"Z�r��n����v��o߾�������c��c�=�q��i�&"�ܹ��ݻ�ܹ���x�����H"JMM��5p��*�/��ҹs����	�ѢE���{��G����;r�H�n�L�<0�WWW"z��w���d2Yee�}�bcc���Pu�]�h˲�"�N�:���s�����h�޽�m��o�h��ch�		xԨQ������deeek֬!�d�蘘�>��������_JC]��+�1��~0��~���y�嗉���C�dذa<;��/<��E�9�L�k���C��������2����;t�p��U!�
����Tr��"�=�z�!"ڸq���D����Y�y�f����� "���^]����D����q�3d�":v�憮]�FD}�����\��C[�ʢ��($$������ү������[���}���7oެ��
���>�Fʽ<x0���q/�)���P�J��&����W0:>���'$�Ç?������W%������>ղf��iK�.����Z�a���Ͻ�u�ޒN�:�t��/<��E�9�L�k���C��������2��r��a��������S����Hwn��Ņ�***tחH$Dt���Š�
-"rqq��mQSS���J��{�������������Ύ��W��ё?HVXr)V_m�޽{��F{���LDUUU�U�ݻg��ѭ�����у4���ݾ}���Q7Z�g���;v���kjj�貲����_ht����k`�
x׮]��ߦ��?&f�ƿO5qӖ������f��{�s�}W?����6�U�0�n����|³�5���9�{��
-�K�:��ʄ())���IIIXl��N%�|��	ZM��R{�&�׸��P���ɥ���+푐�;�kN��o���e�ry^^�ʕ+Ǐ���FD'N�5�>�$y*����Z�t)w�E�n��ߢ��h�l�����1u�����GD/��RQQ�l���k5�?&���g�j���puu���?y:�&�GzW�,1�����y�e+7�{Mo��;Z/�nf�Z�0��Nh�v�9rD�Is��
D�i�&����ƭ[�jnٲ�t�aio���$���ӧ
��'H���M�\γ	���Ko�=rY��ߟ��_��.���L7-��,oooq��m���4˲�w�&"//���"�����4�;!�� d|�Fj�䲨��j����ߺM�X�i�S���F��_]`�Bzd�xY���PH�I}�9��,j��&pG��f�SO&��pL�5��J�ҋ/��)����&�����iUZ�z5����[�������9??_�//��[�޹s�Ν;���������{�
����}����oڴ�ƍ������EEE7n:t(�,�r?��_j^��ڄX}�3��*푐z�|�I";vlIIImm�����v�jҸ=���۶m+--���+V� "WWW�q3�G�kX�U*����\M__���F�6��N�v�+C��g������h��ŕ��UUU�w�����m�gL̎����]�Vﴥ�f����
"��SC!%&���|³�5����f��f�SO&�FU�U �\��c������r���o�	�J��啑��UI&�=��S��e�����\wQtt4���H�%˲s���ݐ�O�,�&''�-��[���e�{$�QD��d5�h"p+z�_|�E�q3�G���h>��m�6n�ҥKyFLx�n�h����}���{�ʕZ�M�>]oS<cb^lz��)����K�.���ю�	�O<��BEd�a(�Ĥ��O�O5fn<���#3���Kᇛn0Fߨ•�����L�4��
�vh��ƍ����L���!�H�Ritt���VsssZZ����%""bŊ�
V��e�Ç�?�s�Ύ��...�S9ϟ?o4����9s�t�����Q�Y�M��]<�{t����c�J�Roo�Y�f544�6�e˖��GGǮ]����{
-�¤q��ϟ9sfϞ=}||���>��3�B�?n��X__?s�L///�T�y��s��)"rww�����3�]!���៑�5
-Ezzz�>}���{����{�nҘ��>�������n�2�5!=r�}W�q
-)1�/<��E��������A3��'�Oe&9x𠝝ݖ-[�Xl
����;w�>}���ݸ
-���$k`������dff.X��{X`��1��Ĩ��Ҿ}����;�����"�I�x�M�6�9s���.�/��esss�=�O��{�l���J<n޼9dȐ����/r7��^{O.�bL�JII9v�إK����R�}O&�EGG755��?�������mq�D���]���W@,���ٳ��b���ˢl�U���ٳ[�n]�l>��f999egg���,^��ڱ�ɴg.�H&����><++�!
����0�D"�����y@T��?�����������[In��� �%�4MsɌ����f�k�L�RP1CK�T�pI�ܻ��WS��PC Aنa����;˙3���aޯ����y��y�y�p�ѣ���^ta�G.[iL��3F"��={V�3�
�Į]�f̘q��ɐ��s
�).�hϞ=/��rfffxxx���$333***;;�}e���2eʹs�_����"t.���⒈�Ν���q��ծ]��qN��Ri߾}�g��s
६��o߾���_��й_����������رc�������o�x㍼��=z�_G�����駟Ə/t.���⒈��򂂂BCC���Ǿ[L�Ç���3}���k�
-��n���/_�|��
���`��WԧO�#G��>}zܸq���m�ܛo�١C�O?�T�Dt�q�ƚ���>�H�D��⒈BBBN�>]\\ܿ�]�v�MN`XLOOONN���:�yyy}��g��ɗ/_:Ў봸\MM�{���7�:tݺu�
j��� =zԧO����}��a�#F466^�x��B�a�������_�믿Z[[<8>>��_m��� �.]*�J����N@"�(%%�ڵk_}��й�:��׿�S�Nedd��矃
3f��ݻ[/9h����͛7�Y����M�\Z�O�>����\VV&t.���iqU'N�HLL�駟����̙3w��nݺ<9h���������ԩSx�uuu}��;v�7�|#t.����%�Ν;_���m���˃��g̘1iҤ�;0?��o��o߾�ׯ�ٻ%
Z�N�˗/8P�\@�������G����9rD$�?>&&�o�����AR=���������:C1bDss�s�p<�8������ڿ���O�:%�H�ӳgOC���믿��������\�xq�С���ĉ���0dq)W[[{���C�eff������':::&&&((�����EÌ?��?��r劃����ޔ)S.]�������
�V).��3�:t�PAA���˨Q�ƌ3f̘�����/�9[�nݒ%KΟ?�G�B{��lܸq�ܹB��Z��T����ԩ�'O�9s�ѣG^^^!!!l�ٽ{���
�ݻ~���!C.\�b�
-�s
hE			?��S~~����й��h��R�����_=y��ɓ'ϟ?������;f̘Q�F
6��ϯ��
h7***�{�g�y��ѣx�	�o��W�=V�^��[o	��
�KEuuuYYY�N�:}�tNN�T*���:thpp�aÞ}�Y�I
-��0���W�^�r劇��������ݻ������N�\����T$�J���ϝ;������u��]KK�g�y&88x���#G����:G�jժ�?��ԩS#G�:��P\\�����_���B����Jnݺ������}�����<�L���4hРA�
0����8q�g��ҥ�AЉ'���W�X���@�y�w8��XYY	���-.UWW_�x��ɓ.\�r�ʓ'O�bq@@��A��r�_�~z�,���^�h�|СC����
���=��}���駟p�%������ݻ������+B���4�KE2������_999���666���cj>��s}���Sk����Ν;���:tX�b�ܹs�bqt
���Rixxx~~��+W�Z,0CӧO��ɹ~�:^�`$L��T"�Joܸ!�5�_����dmm�_����҆


�������-,,���V�\9}�t�P`B�x㍝;w�;w�_�~B� ��ׯ0�ȑ#&L: jť�Dr�ƍ���k����#"�ҥ���0`@��ݯ_�>p�@�m-,,d2������F�!Pt������������9		qtt<|��ЉQ�+.UݻwO^h���ܽ{�aGG�������?2�L)^,K��	&$%%ᡛ`�~�����?�pٲeB� �C�������={�:0��RIuu���ׯ]�v�������Qm�X,ffΜ9�~�)�c#TTT4hРQ�F����B0s���=z��<y��.t.`"��?����ö�q��7npw_$�����Ǝ17�Q���o?��[[[�s
s8l�0as��O6l�PTT�o��L��>w��Y�,HLL6����w��mϞ=�&M60�'�v򪭭urr��666DĞ"�������۷o@@@@@@�>}|}}q�@���`�S "�ܹshhhjj*�K��LqiXyyyleimmݫW�
�ud@@@�n�PJ��iӦ͞=������S�\̚��O=�ԡC����ӭ[7KKK��
���8q�o������U��2�Ctݻw������Ce	�>888DFF���	���3��ڟ�S��;w���D�D��Kh'Ə���x��!�
0k(.
�����	

�{ 
���ڏ���ӧO������Bq	�GDD�D"���:���//����S�N	���Bq	�JHHș3g���|���v%$$$''���J�D��KhWF�AD��@((.
�]qss����p�Љ�)���H$�D�KX���C��?~vv6�����S�,�X�����/��
6l�H$<x0GS~~~R���:
1������imm���9a„�{�2��;��#""tE�g3��Ȉ��������vtt�۷oBB�үj>a|>�{��͛7�G�666���}��]�`��K���'@�s�=�믿�Y���0��5U���:�6�g<>���=M��T�i+�C�ш��@#�>|��Bga�T`8~�bcc����7W�~K~J�nkaa�������'�q�GS[�n5� ���L�0AmpDDDMM�j�b���ʪ���]X^^�.�id�w���:<<\��3�cp؀�W�v�ؑ�>1  㜟]]]e2�a�U�s�:��	��%R�sC=f�e��i��Sj�#1���G#��
�&㜼̍�/3�o�TZQQ����h�"[[["
-		Q�ٵ~-[��Ul���177w���D��h�""���!��jj��|}}%	G�:
B\\9;;'&&J$����'%%���Q\\�j��T�e�vaJJ
-ɏe�:DZ;MD..._|���۷kkk���RRR�
�k��$njCD���;v�XEEEccc~~~rr��G�'d��3{<�޽{�m��$�'��H�
��m��x|"
2z|�⿕�c�jRo�1j�9y��_�W�v�Ё���ӵ��#���b"���U\(�H<<<�諯�""77���F�M��͛9v�N�8AD���J����Dt��I���m�FD����±c������.�?z�(u����͛��cx|�vvvDt�֭ƀ��s~foW=k�B<'�a��DJxn��l����J���Ӕ֭�s�z3�Q3������e^�bM�8�O0�=2dg.777ŅDԿ�a���G�[+6���FD�;wnhhд��0u�T"Z�l���e˖ѴiӔZ���������,-----������~��å��S�L!��>����a����LJ��]�������^^^k׮e��sXWW��[oyxxXZZ2�=������777�5Ӌ/���M����0�_"%<7�o��?��T����iJ�Vz�9�K��ƨ��eVt�2���u�ܙO0��2T<�2}�t�0�:����3���DD���j�jnn�ݻ7mذAS����ח4\��0Lnn.u��]�娨("ڴiSrr2EGGs�W��ڵ+i���g�$����q֬Y۷o�~��T*�#d���ȑ#_�u�?�l5)��|�����+�����;v� "��jj��$�5���H	�
��m��x|"U�1z|�⹕c���Jf�4F�h'/��ӗ���������+��S�JF�]^^.�)**������ao����������(,,T۵ݻw���O}}}��
-�mGU]]�����؎�5��v��Ž_��t�;C]��iMMMLL���:̜9��ݻ�F�Ā��v~~��Wnj����S�N����7��ܹ���u�&�H$I�n݈h���m�d����)1ȗ�c��?�i�TՒ�Sj_Sb[�1�|:j�ƨ��eV8fU����&/���'>*rss���V�Y�|9M�2E�d���D���Kmך������hݺu-�����j[[[;;;��������}qɺq�ƪU�&N��n!"gg��ׯ��0��y�ʕݺuc��s��j���$����7�ԩS���3��	3�����5R�ޣ�:ohJ�c+�m�4F�h'/��1˨���߈�K�.|�y�aII��o�MD���%%%�B�Lֽ{w":~��|��ǏQ���5���8���d�E�A����L�8����O���g�����������PRw��N1�f�v~ޱc����L&c+++Uc���:v����������-�&Z'�a�yZ��7��;R��ǧ)�[�x[�CԡU<x������J���;)))22���r�ҥ��3g�ܹs������O�
#�;w�9sFmSS�L�իWii){�#J�0t�P"b�Q�.gcT�G���g�Φ́g�~z��Ş�<{�lKb����w����Q������aeeUWW������ȿ}���0��D:}I��m��xzύ�{��U'.P&tuˋ��elVT`4����O�������#���|�X,������A���1��RSS���ͭ%�p��1"rtt��� �kkkjkk���ώ���pvvf�K�a�&)��eoo��hF;?_�v���/P3�|"ڱc�ʕ+�h����mj�dx���)�aKfF��#R�ޣǧ)�[�1���`��8���e�J����YYY���1<D]��^#������*[[[�H�z#Haa���������:JMI�R???y5�i�Z��1���%))��������h����5֩�j��q�!î��k׮-((�H$uuu7o�T�u�aZ��߿�ʕ+���+++������8�^��?d����H~`^5�ĉ"�(00�������K�.gΜ�h�{��)��H�
[2��c�O� IDAT�#U�d��6�g+]�ť�LcԌv�2+���j��Ĩ}��Z<�Ȑa���b;;;�H4s�LRx��q���ƍ55%nyK����}���p�/dө�j�w*��x��Q�Zgg�+W���

�����@D�R�e����ԩ>|�]�k�."�ҥ���V�ڦ�̥K������[8�p�x|"U�4zܽӔ��1�i��t
-�2�Q3��ˬp������܂���|��s��iڜ�+�gj�5C֒%K�M�޽[���c5������=z�p���diii������b����=<<<--M�%��}�?2��q6������(///�X�������tS'�0��iNN�ҥK����jii���зo߅*> �OȘ�g�X����~Y�Gj>\�D&��WH���K��d�����]S��K��l�=��T���q��w���J���N�1���4hPbb�Љ��0���cǎ_~�嫯�*t"`HW�\y��z������':
�V��'t`02��֭[.$���`��
�P\�i�DkM�|����emm-�H����Ғ����͢E��M8�9��>577��h:t�0nܸ3g����W�\@#�Ӏ�o08j�d2Ci?0י
-|��}‘KA�������Y,�	:����ڧ��j�-�ЖP\@;TWW'�H����N�져�v�ѣGD�������v�%�PP\@;TZZJDnnnB'`vP\@;�����yxx���Aq	�Paaa�Ν�_�
-�
�%�C����ҥ��Y�#��ݻw�%� P\@;��o���9Bq	�Mee�_�էO�
0G&�����ܔ���������SP#//��P\�d��ӧO�>}Z�,����9::v��Y�D̑i�YYYB���F���ᑑ�!t"&�ʕ+�s��k.
�ży�~�ᇒ��
0y�ϟ6l��Y�)��bҤI...۷o:�V]]��o�
<X�D��Kcacc3cƌ�[��d2�s
0a�.]��dC�:3����$$$ܻw�ĉB'`�Ν;׹sgooo�
0S(.
�H�=F����,t"&����cǎ:����,Z��ȑ#�S�@W���/^7n�Љ�/��%22�g�Y�~�Љ�������͡��B'`�P\�H4�������r�s
0=gΜ	���:����̜9����;�Cfffxx��Y�5�F�����W_MNN�H$B�`Jrrrnݺ/t"f
�%�1JHH(++KKK:S���ѥK��� �
0k(.
�Q׮]gΜ���/
�۷o_ll,^) ,�F꣏>�믿v��%t"�!//�֭[���B'`�P\��]�N�6mŊR�T�\L@jjj�n�F�-t"��%��Z�t���{�n�
0v���;w�:u*ΉN�0��9�F�������o޼)����x?~<<<<??�gϞB�`�p���}��w��ٿ�Љ��;w<�%�1@q	`�z��=iҤ�?����I�\�Tee�����O�.t"@�����Z����p�ƍB'`��n�jee5c��
"�����w���˗/���:���ܼiӦW^y���Q�\��%�I���-,,V�\)t"F租~*,,LHH:�?�[�4$&&.Y�$//�G�B�`Dbbb?~���?����������?88x�ΝB�`,nݺջw����'
-���&c���ӧO?��������(̚5����ׯ_dz�
��KSVRRr��U+++�s
Xaa����֭[q�8�Q�
=�dӦMw��Y�v�Љh'�p0ɜ566.Y��[�nVVV�t��ILL���y饗��Z�KS�������_��s�йpY�|��ի�ݻ'�J[���nݺu���8�`lpZ��H$�g�}�s��G�:.��'�0f�G�w���������fmm�s+�?6�/���o�޽ۡC�%
-�����dee�9���7�;dQ\�9�X���,��t�:��MQQQϞ=�/_��{�(Kh8-`z���g̘���o����j�������{zz��bvyVV���ӟ~�i++���z*,,����677�駾��666�{�޶m�b�ݻwccc�������.�H>���
������0`͚5�/Lg���ɓY�fu�����;))��*++_~�e77��K�r�Z�"�J���
���hoo?z��Çk]ED�}���ѣ���mll������Ǐ�7ܴi�СC=<<���}||���O�<ɽJw�ڋ�I��?0Ddaa!O�Ox��Ϟz꩷�zK�

�-0`�����v�.��xn�~���┾��ӂH$:x�҆�g�V
-۷oP^^���O+��ReF�������D���^xA1�СC�?�����T�}���D�ýJ&�M�:UuU@@��Ǐ�Q���Tq��Pq���NS��.h�QRPP`ee�~�z�0
-�KS��/�XZZnܸ�g<�k�S�N���555��G�}��D")**Z�n)mعs�Ç?~����0::�����ـ�����v����?��Ԝ9s�K�.�UªU�������o�-+++++��o�K�V�^���
\�v����o��u��Qi����9��ݗ/��������߿���p�����X�U[�la�m߾}>���;�|PP-Y��a{{{"Z�lYQQ�D"���8|�pXX�*U��Z+3c�j†*.�Ν۩S���:�0
-�K�����^�v�O0�k{���J�O�<���%?QND���J?~\���W��ɉ����?����(V	���#�m۶)�w�֭l5�����l��%%%j�xxxp���/���'����
9V�����_QϞ=��{�w�n�z��my�*U��Z+3c�]+��/_���عs'G�%�	kjj2dH@@��8����JŅiii��xSڰ��^�D&�)����QUU�<���R1��֖�>|��벲2"���S�KCC��.���D"M��;;;"*++Sݖc{|��������‚���m��ʊa�s�����*�.<<����{�*�`�����N5a�]��($$$((��� ��P\��?�����i�…Z#����ӧ�������l����>�����N�������/v�&lLSSӹs�V�^���HDS�LѺJG0[�)U򻦌�w���.��JQff&�������%���ꫯ,,,8����6[>z�H��СC��<O��رC��o���TN�s'�]yh�ˀ
�h˖-��r�4h��?�Ѵ_%�9eWWW�Vi
���"�;w���;f̽S���vA�VrMMM���쥢`�P\�o������ŋ9b������#�?�������j߾}�����<o�qqqٱc�Ç>|�m�6gggR���;a��Rk_���K"rrrڸqcQQQCCCvv6[�p�b�`//�-[�ܽ{������!???%%e�СÌ1b�Ν���ojj*++���ω��ޞ{�*��1c�Qtttaaauu��#G:w�l̽S���v��#NII��������F�%@{ �J#""������4Ũ���z�j�_3f�е���(�#F��ѣG766jڋ�ť־H$��cǪ����a���竮��]��k�q���
i
-����Vɟd��S��.p|ĥ��...���5}�`<P\����={�|��4�ܣ�׶T*]�fMϞ=mll�w���'��lν���;w�DGG;88���Ν;���V)���aժU����������ׯ��.�,���]�"�H֬Yæ���0z�h��|�UÜ<y2>>�S�NVVVvvv


��nNN�0���s���֭������۰aþ��k�TʽJ���o�������ʪs�Ο|������;���.h��gϞ���[[[�����?����C����JMM:����>|xzz��+�h��hW:4q��5kּ��B�`2�lȐ!NNN�N�:�E�=LGLL�ʕ+�{�=WWי3g
-�@K�[�����W�^:��%@{�������͙3���楗^:�ݼys�ҥ���?{��-t.�N��C�$$$l߾�СC�Ǐ:}03z��'O�\�xQ�}�`��uh�D"ѦM�$ILLLZZZll��
�,%%%;;�ҥK�,
L�\�[2��7���o�o�>m�4��
��������+��[�N�\@7�s�ݲ���ꫯlmmg̘QZZ����T0��k����~��B�:Cq	О�D���ľ}�&$$���~������B'�ŗ_~y�ر��l�s
��8�Y8q�ĤI��{�������ŋ#F�X�|��%K�����\ܸq#22���133���W�tԨ��}���]]]��gKKK��
}X�������g�ZXX_�xQ�t�13k֬���ݻw��0](.
�H�.]������?bĈ�k���������?��c�Ν������(%%e�������w����::x�`\\ܖ-[fϞ-t.�"(.
���˗'O�,�H���,t:`�~��爈��s�_�^�\��pZ�L
4�ʕ+�		Y�l�L&:#0SYYY���������B��#�fM&�-_�|���/���W_}���&tF`^rrrF�=|���ZYY	��K��ǏϚ5K&�}������B���?�3f����ɓ'����N��
����n߾��/��ƾ�����Bg�_nn����{��y��iT��	�K "���OJJ:v��ŋ<�����f�A�t���Q�F�������x�#@;����q��]�zuܸq'N�={vii�j̅&M�$�J�>=hN�>6`��������K����;w�<t���ӧ���7l���ܬ����:th֬Y�b��}�����q��=z�,
�%��FTT��۷?������O�>Ǐg��:u��ٳD�{���#��a��̚5뭷�ڳg�����
@�@q	�YYY-Y��ƍݻw?~|TTTaa�…ٗ>�d����?�P�4�4<y�dʔ)+V�HLL���/-,����£�@�av�رx��:ܽ{Wq��D+W�\�d����q��ĉkjj���7b���
�օ�x)++0`���&
�H�y���^{M����>|x���ݻw����֭���@�É	��ȑ#�����2����ݻW�������ϟ??&&f�ĉ�ΝCe	`&p��kll���}����KK�ÇGDD�eV`̲���O���ظ}����0��
���#���֭[9*K"��dqqq�/_n���h555}��gcǎ���t�*Ks���hnn޻w/{�8Y[[[[[+�0#�HBCCo޼��	��r����?�r�ʵk�?~�S�NBgm
�šM���fgg�裹�����T��?~LD"���ښ�/�������?��SB��p�Ž;z��5}�t777��
���ۿ���Bg
&�%����ą
-�����S\\,t`��B'f�W�WUU������-t"�����5k���(.
��\\\�N
�z�`P\�����Aq	���%�K0�`0(.
�`P\�����Aq	��t&�D"��������ǐ!C�ϟ����gs�
j�O�a������oookkkGGǾ}�&$$\�pA),===22���������s„	{��eFmV~~~R���h����S�p4��ZKR%"�T���ߎ7�����ʪcǎ�?�ŋ�|`��6�n�:����R�=8&���ت�*��նߒ)���:<<\k#555&LPQSS�6��[��
��Ij�G#J��$Շ2Dk�`�0?����%;�H�Ҋ�����E����<xp�ĉ�H�5%<�}����'�/�����ۍ�����yyy)))Æ
��͜9��tvvNLL,,,�H$���OJJrqq9z��̙3�6�駟655�I�g$wO��E톺�w�2���_�pႏ���͛�ݻ'�H�<yr�ƍM�6q�`�ZT����������ի:t ���t����=z��:v�x��M��'N���Cnn�Ҫ��\":y�RV


D�y�f�lu�ly_x��w����'"OOϢ�"�i������#�Њ�d�"ڳgO��tǎD�d���m۶��ŋ�V.^�X���?&�+V466r��?�Ͼ���Tw��ED~�a�N�Z/
hP\@�z���ҥKm�G�."v�Ο?OD���j����ɛR4iҤ޽{߿˖-������/-�5U�㋈�h�4�}@q	��[�nDT^^��z�-^ZZJD����a< �=z�]�.�믿��[XX���V�\�����>�H����KiM������t�‘v�f&�%�.�L&t
-6y�d����͛7*Rp|Ret�+��Kh]���#"www]7T{�8�
===������EDjײ˽��UWYXX|��GD�jժ��:�]����)Ͼ�w�l���ڴ[;70-(.
�u<x������l�C���WkXFF�ڵ�r6FՔ)Sz��UZZ���̽��Ij�Ap�ʦq���6HL^k܂�	u�>���擜��QD����`�
����8;;���s�;v��uz������D���u4�G���m�*��SO=UPP����`~C��K0���檪�s��-^�xȐ!���!!!'Nl���ã��=z4t��u��ݹs���������߲e����ٰ������'O��9r���EEEMMM���6l9rdmmm\\�رc5�e�ԩ~~~|nT��w_ES�l�^�n�,������}��Ն�
L���-��e�>���LLL���?r�H-��x�����z���jc���վ�Qq�����&�k��$��c����Z]]�6��۷��#���`(8r	fmm�����o�;w�������m����ӏ?�������%�]���t��Ѵ����pwww�X��������?:::r�eڴi��d�w��}1M�:999r�~���{��mll����t�҂��W^y�����1���Pbb�5k����N��g0����n�_��1�‘K0��c��G.
�`P\�����Aq	���%�K0�`0(.
�`P\�����Aq	��F,t`v���RRR���Gvv��)@;���ڣG��͛'t����G��=1#t&)11q͚5���B'`Dp�%�K0�`0(.
�`P\�����Aq	���%�K0�`0(.
�`P\�����Aq	���%�K0�`0(.
�`P\�����Aq	���%�K#"R ����bbb~�������Ȉ��������vtt�۷oBB…���!�0��鑑������֞��&Lػw/�0j���J�����Tu�޽y����������޾o߾,�t�j;jq�U��GS�����ϤI�~��W��0��n�:ö�v��������5���:<<\�ɟ�555&LPQSS�6�[��.�/R�իW;v쨵���ņq�UjMS><�hee�����;�G.
�;A766���?^&�-[�Lװ�_~���~rqq��/n߾���X[[������2l�0����p�̙?�����sbbbaa�D"��~RR����ѣGgΜ���O?������ ��d-Z��������;v�XEEEccc~~~rrrPP�j��߈����OIu�


W�\=ztSS���_S��`e*��i�#��K�������V���G�Qǎo޼�S<7<q�988����E�� IDAT*����upp ��'O*%@D�7o���H%vvvDt��-�����#X�*M=R\r��}"�����i��K��b/�����?����X,&���x�H(���0�L(�&O���.u
-۱c-Y����_���p۶mD�x����@�U����/��(b�խX�����;
��r...DT__�3Z	�KØ>}�ƍ��ʚ���(99������~۵k��w����o���|�H$7nܘ={6EDD����MD/����������(>>^�ڸ�8yS�&M�Իw����oٲ��}��r111D4|��ٳg�ر#77�� ��D"�v��+��BD�
:��!��SS%?-�N��:u���T��e�ΝDԭ[7�D"�H�u�FD����hS�D=z����r��lmm����^�N�ܐ;��������ff���D����n������������С�̙3�޽��>�_�;忉�}�h�P\�I��T[5FFFQrr�ƍ�h�ԩ�m�V!nnn��ٺ�mq���̞p_�n�Y\j�T�ƍ�V��8q���/�������ו��������򊋋�t�־�(�zR*.+++Uc���:v����������]QQ�ݦbiRRR���o���kII�Na]�v%"]���![�ݸqC����\"�޽�ڄ���;"�������(.�Fj���JD���j�׊#������Iq�D"!"�X̳�v	�\{C�WWW++���:www��尼�����"##+++�.]�S�СC�����:v��lXFF�ڵ�r6FՔ)Sz��UZZ���S��j��Ջ�2��ٳzl���Օ�؛����>��S��)��0UJG.��̟?��v�رr�J"Z�x1w��M����b�X����?�}������V|���رcD���ӣ���MMM%"777Վ���#//����?:��<n�8"�ꫯnذ�����x6�.��@OZ��'N�O#jnn����ҥ���ř3g8�T��k��FD���:�EGG����ڵk
-
-$I]]�͛7�g�s��sC���������K$������׳Gp���8�%�J����������+W���ή��ljj*++;p�{�fHH��i��}�v"�СÎ;�����ʶo������-���v	?�z�..+++;u�DD�f���$�ҥKUU��6�6U\\lgg'��w��	k��?VWW�?^mLxx���?*.a�3��%G�ڡS���|���aj��iss��Q�����d<
h����'��rʔ)D4|�p��Lƾ��^�Ԧ�Bdɒ%D�S�L&KOO�����������			���+ṡL&KKKwww��������iiiJՕڄ���z�������$''g�ҥÇwuu���tpp�۷�…U�oyq�0Lcc��ի���oggggg׿�իWK$�
hD���I0s���k֬Q�����nq0�`0(.
�`P\�����Aq	���%�K0�`0(.
�`P\�����Aq	���%��a�s0
�/_

mnnf�+��d2�X,f�+�bccSSS�K@xb�0�=����cqq�����ȶ���8_"�h֬YVVVj�:88��ĴqJ��%��M���Ԥ����*..��ֶ�S0*(.
t���߻wo��MMMS�Nm�|�
�Kݼ��+�g�]]]CCC�������K/�$�J�X[[O�:���R����K�t��%((H$ɗH$��^zI����K�͘1C�8e�N��*`>��%��^|�E�(���g̘�x ����Й��{HH{���
�������ك��<�L߾}�N�X���GLL{�rڴiB�`D�nqhS������Bg
`


999)))B�`���/����Y��ɯIh���.:P��ǧ��X�,����%�5L^�n466�۷o���B'`���k֬:hp�%��lllp@	�K���JP\�����Aq	���%�K0�`0(.
�`P\�����Aq	����0������mmm���طo߄��.(����GFFzzzZ[[{zzN�0a�޽�(5(�D"����T*U]ޒH���������Nq������ǐ!C�ϟ�������4�����^^^111��򋦰����jYnذa"�h������k���'O�D�G�V�L&5j�H$�2e
-G�`��6�n�:��0S������Z�����	&��������QlS�j�֭��[ɑ�־p4����q����VUU���j�>E����ab���ʪ���]X^^�.Q́���'o�ƍ�:���J��˽���h�ڵ�˿��K"����gm�3
-�KhS��MD..._|���۷kkk���RRR�
&���#"gg������B�Dr�����$"���SlS^s���J$��-�4H_���gw�1R����"++kѢE���D"�ɸ[Pj��8��A��nll���?~<���u��-[؅)))l��i(-ZDD666D�p�B������Ç����͛7�%yyy�*���0?�����6��K(G�%��;���u��	"rpp���UZ������@D'O��/d����"ڼy��r��u�ly_x��kq���ի:t ���t�2�:�}�a���lݦ��m۶Qhh(�p�رD�}�v�ݔH$D��W_���[cc��Ni���U�g�&��^*�655ќ9s8Z�V���%�)L^Ba/_��ϸæN�JD˖-S�vٲeD4m�4��hHKK#�Ν;744(.W�V�Ȗ��g�-).�Y�bM�8Q�L���~�b[\����������Ҳ������������ѣGj����AD���g�_�~j+���?�ڵ+-_��_�����VWWs���3
-�KhS�������z���ח4\W�0Lnn.u��]��-���{��MD6lP\�����-��6[X\��#v��Y�L���~�o���ӧOWۑ��("ڴiSrr2EGGk�&{������IJJ"���p����kMkO�>-�������D"љ3g8��փ��%�)L^Ba�c���oIX]]���ɗȋ�ݻw����-G��3R-���v�Vq�{���z�1�	�8��A(=ztyy�ڽ��wl��Q��h׮]j�YTTdiiicc��[SQQacccaaQXX��Y�������fc,X��
-�3
-E0y�d����͛7*�$�d2�6l�qpss[�r�SO=�vmtt����/��r��Y;;;�)U۶mknn~�\]]����566V&��/�4�U�V��X�r�a[�����,xzzѽ{����G��]�.���V]eaa��GѪU���j���T�װN}�	�i����G�q��`�.))y������###���/�-899M�0A&��d�	&8::��0�����sÚ3gm߾����dgg��0](.
��СC�����|��{8T���US�L�իWii){��Ij�K�`�`�q��8�����NJJ������\�t���O�<Y�JΜ9s��"
-�?b=,,���ܹs����
��j���������qvv����;v�9::�����T"rssS�^�Ի/<��3j����aE����뗉�qh��0L~~�X,�Ŋ��V[[������P[[����uM�N��u|����V���dhS���^W���v�ڂ��DRWWw��M��������KRR����%IQQ����>��a�T����oW�#[�>m�Z�H����ʬ����{O���1-� X���������ڪ�*[[[�Ht��]����B[[[���P\����P�M�6��K@<_�X]]�>�FUxx�ڷ*.Q�գ%�Z������;����=^��gZ�A0S\\lgg'�.]��u��nܸ���dܸqD�q�F�
9Ɛ� k�
��g0|��Ma��L&KOO�����������			���Jaiii������b����=<<<--M���jA���ԣG��Fr"���i�:�Nq������[PPЛo�y��9�mr�?L�>֒%KH�F�.��8��v�ޭ6�}����7�C���)7h���PD�A�������f���!`<0?���nq0��	�"��c-N
����K0�0� �Bq	���%�K0�`0(.
�`P\�����Aq	���%�K0��	�٩��KII:Cb������K�D@���ꪪ*�D"�J����A&�Q]]�d���"�J����D���4|��~ZЬ���-t
-�N������ѣy��	��F�O�:a�����"�a��
��8p ==�…���aaaQQQaaa���B�������k2�����#���rĈgΜi������������۷�…������������<==�N
x�}��/����ϞW���299gWZ�%��������{��={���1&&&>>~ܸqvvvB�:khhx���7l� ���gaaQRR�?
Z�%��=bk�ӧO���DEEM�<9""���V������s�J�R�C�"����a�ر�f͚0a����P�4��#++k˖-���Ä��O�<9**���A���~�����؂���R,O�<�������nnn/���Y����� "*//OMMݺu�͛78gΜ�S����������7�|s۶m�%"�����駟.**���v�ܙ�����0e�\��K0w?����_}��
{{�iӦ͞={���B'm�a���׿��{"�H*����/''G1�ҥK�7o޳g���ݬY�^�u???��0xC�)�D�s��g�}6$$����~�mIIɆ
PY��H�`����,www�a&O����7�/]��~x�g��Ï;��2P\��)**Z�`���Ǽy�F�q�֭3g�L�:7��������FGG��ũ
pqqy��w�����G�H1p��]�vq<����8�����O?�t˖-���s��y�w�v�*tR`b�_��f͚�{����,\�p�ܹ���B'`DP\�Yx���ڵk���Kgg�7�xc޼y���B'&���pݺu[�lqrr����>o�<��0
-(.��������/ׯ_ogg���s֬YxvJee����׮]kkk�hѢ���n1�����������w�]�h�����I
@;TXX�|���۷���{ӦM���Bg $���SAA�رc�̙]PP�l�2T��J�t�e˖�~��S�N#G��1c�_�%tR�Aq	�Mcc�|лw�����W��_����]����ի�ѣG8������a�����Ю���̝;7//oٲe.��Bgf������?���BCC�m����)tFm
-G.��`f�ڵ�vqq���]�x1*K���ݲeˮ^�ZRR��3��ٳG���Kh=z�dɒO>��رcݻw:#0w


YYY���ӦM{�����������8���w�FFF����߿7i��ٹs端�:~��={�888�@�Cq	�-//o�ر��Ι��8`	���ŋ111����;w:�օ�LXNNNXXX@@����0f���������gϞuqq:�V��LUAA��a�x��
;;;��
Т��<88�C��O�vtt:�ւ�LREEŰa�:t����?�&0��������������=.�2��w���\�2�����]Le��4|)����Y�Z��j���L�
-E��t���!^@C�R�]Өuw��K�b���EE�a��7{Ι3g�������^�s�s���g�_�m��sqq�w8�O����8nΜ9Z������,
��<����:z�hrr��c
h/H.�������yyy��ޱXf������+V�����n�X�.���9w�����W�Z�x�b{�`���~�̙3gϞ�֭��c
�1��'�`��aÆ���k6߲ˆJ��h4���'O����qyyy������nnn^^^�NJJ���o�Ð�"�q{��8qbPP���[PPP\\��ݻ�.�P���������b�xj��k;�۴�iC̱���山��u��*�
-��B��hcs֭��ܼt�Ұ�0WWW��oܸQ�ӽ��˖�h{�1���X1�Iz�pΣ��@�T�;w�=6.�Q*����ڝ;wbbbL}!%b��b}}}\\�h������zр322���մ���� �`�]��m�T�5��R�T���555������X�M��HwGfg͒91�؜u�-[�̊�r��!"����-m���c���nKT�d����:x��iӦ�����'������&L �aÆYZm���D���nݺK�.577744\�pa���QQQ1�\q�ԩD��㓚�ZVV��j�]�����^�7u�Ta�DԧO�V+�Kk�d�y�#�9S�Z[��a[�la��7o&"ùL��g]}�GX���m߶���~�!//���٢�O�ޯ_���&K[�-$��9�&0�K�N�8ADgϞm���'ׯ_'"��9r�����/^�hQ2W<v������bޢ��b��|aa!/���p"ڸq�DG���z�xd$�n�\fee����Y�q�h۶mN�\��Z�%�d/�����XZZ������[��m!���Y7��\Bg��K/EFF�
-��nll\�`A``�����9������VV����%ӧO7�}S鑿��E�f̘AD~������̙3�h�ʕ�KW�\ID�>�,/���\"
-

5�#1�Wɩ)d���8� H�n����%=��v��Y��B������DTZZ*l��/��t�V��ݻ������333�Cbk��չ�����ܸq�ƍ...nnn�n�v���y���C�������2dHJJ���nCCüy�w����5e�C_��&�Q��Ǐ'"�F���hXSSS�=����P��ʢ��:��s����&̎��믿���_WW'lT��_=k֬=z�T*??���z��/��-s�ʕ��x�Zݽ{����744�z-sJ���?���ݺu�h4�������<��>>>ݻw뭷���}iiiIMM}��G�j�����ѣ
-
-�.�8nǎ�G����vss�ׯ��ŋoݺeXqÆ
#F�puu
�:u�cǤ	IW�"a��������:�,-p4���!!!+V�����ͲI�D������#��۷�j���Dx��MSMO�/�������Z�޽���Ӗ�W�ӧ�?^tiqq1��ۗpkk�A���O>v�ҚBV��(��Ec������5kְ��SRRX���OD�{�m���ݰhΜ9��{�쑈ǰ�I�&�_��
6��ɓ�ljjz�'�
�;֐L�����w�z��i����M���:ED�֭3�Hzz:�zg����Ec�;t�7�D��3�uuu~~~�V�6j*<c
-����2��8����gϞƋ{�U�?%�+|��g�?��q��,��L�E��FGG�H/����/O����۷os'ú���+��h\�8�3U�lL��e�Ďp/^$����W�&w�=>l�ǎ;�(,,L��j�ڰ�0"��ϗhB�;6f̘��j��yxxѽ{�,�����566���'/`��rrr�($$��+<.ȯ)Ԗ�3޾��hl�<��sD����>�7��:t��4K�fϞ-�G�#�<44�����o�.++c�������ǰ��;w��0z�h"���O�m�^���|||233�������n��^�cH��*�{�����V__�ĉ^�zђ%K�tGNg�U�����wﲒ�������k+�ke��
-����^�bT���曁���w^�
-/66�ȑ#�n��j�����1���f�]�d���4�/J:�ܹs�o����HD��޼����7{J�/�֭#"//����k׮555}��7S�L�^�e�6n{��y�fc%тDBIDATc�7�|3l�0"Z�t)�q]�t!��+W���k�ښ���FGGK/��,:��w���DL��e����H��߯T*x�lr�f�'N$�
6�_���fΜ)�	���YZ�a����ց��K�hb���գg�P� �)[�n%���D����ݗ.]�d�v�711���/M�6k�V~��QCɕ+W��k׮��v���R�T*===Y��k+22����������ADC�5ޠ����ѠA��tGfg{�1"Z�z5��2�A��K��\
-����^�bT��������ܹ�lx����&M�h4*��0?��l6-��½i�_��0|�+**DK���ٗ!C���͛�+J,>|8�<yҸ����D�����?�)##�ҥK�j���+��:�BG띩i/�Su~Y$Z
-�h6m����+,g����V�������[��h4���`�%<S��'���
-���UTTXT�1/���g������wYYTSȊ��P� ;�q���������/��8.((���\�b�S��r�J�כ�и�ኧ��y��,i��.RUUEF�9[������Z2���#�� ��ݻ���߻w���ܶm�eq��X���ajJH�+F�'!!��<�hx����^+(?Zwwwѽi� JN����(
-���鋧�'UUU	וX��Ϲ������?�����rw��iv�0����q��"!���Y�+t��	6�Su~Y$Z
-�h���5��\br766>�����ݺu���4���ع�^x��j�Ƀ��d��⑹�3�<CD����RSϲ����t ���飉tM!�G�ǡA���P"*))y��W�jusssSSS�.].\��?Q�^�$Z1ը���Z�w�f
���Vw��R�׳sf��~ZZ4�M~�Vm[�r9{��Q�)((P(ׯ_�h���"���痔�����ݻr�k\h��Rb@LE"�/֥_l�)�NKK��ӧSRR����hƌf	ITf9���L�r���N���vAt��_dj�Jff�����\br������NNN&�ŋK7!�TII�J�R�T%%%򫱻�|||�גC�_~�%yyyY����۷�����$j
-Y=z<�62͚5��222
�
-ccc����Es���q�����Y�`�Fh\���A�V��j�-%��Y>���m����Lj���:�qܞ={����788��nc�,�Z�elE���+F���P�{�W�兆G�9���Ϥ#ʼ,.gJH��H��e�Сd��Vc������?L���.;���Y��le�FC�{����we��k��"�!�{YIee%����>v�B����hmm�w�^�^��J�'$��Լy������Wcw����}��G�/_�j����/^��u�+��dz����v���t���>�t����ӯ��)Ԗ�s�A��ݑ6v�X"b�d�8�=���SO�֭[%Z	$����=�����P�o){z���7;;��͛7o�������v{��Tg9�3<�OD


�7ɜm[�r9{��Q7n�3�<#�(��o��VMMM]]ݞ={��e>�#gJX1n����?����v��~����򦦦��"�\��"�k4�-[����666655���l޼y�ȑǍ5jǎ׮]kii���Z�f
u��Ez��t�'�|��&O�\VVv�ΝC����;��2��]���Cee�B�0�k��ܵ����xd%�~�)��Ջ�29���~�����B�8s��j���w��a/������C�Û���c`���E�g�w5r\�tɰ�.��~��P����W���^������P�oiSSӨQ��c8f�Ý$�����^E$�Y��灈��}^�����Ec+Z.g/X1�B���!!!�n�0`o*��DX(�UD2���&�/Z�����Gz��5+Q��Cмy�	IWf�^3�	�1{g܄�.H�b$��4����_�ˆNnv{����z�����pb@���d�ҥd�K'2�����{���T��III��yd����ssscbbT*U@@@LLLnn���€[ZZ���',�_SȢ�3udt�A����*,�ٳ�t<�n�JJJ�ݻ7﷿E�1�t�Ҧ��իWGFFzxxxzzFFF�Y��8b�ܽ{w�ܹ���j�:>>^��I2;�|���DԵkWѿ�L����h���`Ũ
-��g/cmT�ӭ]���pww�۷�����b6a�+W&O��V�������?�l�9%�GIz��V�]�v-C�V�3�p~Ab�q������=z�puu������؏͝;7,,������?**jӦM:�Nz���ʙ��tuu


}��wu:�#�Ntg���.Vp��{Ǒ���v�ڟ����Й̙3'++kѢE�m��������.�
pRJ{ Wbbb]]ݮ]�����W�>|��~`�~��},++�w m���F߾}gϞ�|�r�Vk�X��
-EXXXUUU\\{O�����p��y!�g�lٲ��
-��d<<<bbb�o�݇XZ�RL��{������w���K�,����=�N
���#��Ng.�ɤ�����Θ1����ޱ�Luu5y{{�;��Br	N���#++�̙3��:�����ˋ���SCr	��G����x�
�[^
��w�}�裏����;��Br	NiѢE/��rBB±c���
�:uj�������upV���3f��ꫯN�8i�p�w�ԩQ�F�;wG3�p������Ν;}��'�x��ѣ��z[�ly�ǐYB��������#Gf͚��{�IUVV���ݟ�K���ʕ+����Jell�R�|�7����|�I��88�������fdd���N"''��_�ӧϮ]�"""��,'O�3fL^^^BB��c
�
$��y���͞=�ԩS˖-{�w�J��
���qĈ���_}���c
����G�^��;���o��qqq�.]�wDR�̙S]]���c�@l	�%t**�jŊ_�uee�����/_���h�Dlݺu�޽[�n�h4�����\B'4bĈ��)))�|�Ixx��;�C��P��󓒒�-[k�Xl�%tN*��W^)));v�/���~�a�`�ΝӧO����{�={�`{H.�3
-
-�����"##G����
������̙��/~�����] �����ܵk�ٳgCBBƏ?jԨ��|�^o����q\rr�i��ϟ�~�z�Ba���K�_<8??���Ӿ��ӦM0`@zz�ݻw�+��)MMM�>�����?����td�Љ!����ȑ#
-
-Ο??f̘%K����.^�������t�����۷wX���\�x1**����������
h_H.�~4hР���������0 &&���@���S�N���O�gϞ={6^l���+W�2d�F��������@�Cr	�����U�V���O���S(			}��}�����ʌ���绺�Ѯ]����Ϟ=k�x
����?��������y睃�;"������իW322���+**�x��{n�ԩ]�v�h4UUU��J�R(k׮Ņ-���Ԕ���f͚���M�6=��c���� ��z����0;;{���D4jԨ�G���(�I�&egg����#Fp\�����曕���V�Z�`�������PH.
�ݾ}{��ݫW�.//oii�-uuu
���>|�]�t���7�x�_������׭[׳gO{G`��@�����y���܄�%���ܸqcԨQiii8��'ON�0a���AAA����sss�Y�}�%�I?��cII���:����e�…�'O�������A�������1b������;}���C��j��	�šC�;
-�
-������O@@@RRR�=: *p�ϟ߷o_ee�C==p�@{G�V]�t�5k������:Tjj�…��		�~�������wp�q���q������J����[�P����KD������RSS׮]k�(�3@r	 N�P̝;��Q8<�6��l�%��K�$�`3H.
�f�\�� ��Ar	6��l�%��K�$���qyyy������nnn^^^�NJJ���oy����;q�Ġ� 77�������ݻws�۠B�P(�����t���%�/�mMNsƅ���#F�x�嗋��,��J�QTT�B�>|��-X9��3
y��B�k�.�-�ڵK�P<��#���J��h4���'O��>8
�}���!!!���>r�Ν���_������8�:��������4,�������D�f�"����4'Qgʔ)uuu��o�f�/\�`h����V��
��2�����h���7n�_��l�A*���6
��g�$�Сp��`�'O&"__�u��]�t�������…�7o���2T�:u*���������i��k׮�������ԩS��i��O�>Z��Wޖ�6鋜m�iθ�N����9u�ԢE�<<<�h�رz�^zf�3U�h�""rww'���Z�ҁ5��Ӡ�����C�P\�z�Xii);EjH[-�������	&ѰaäW���l�%t(�:ґ#G������ŋՎ;FDj���������X�VQaa�������D�q�F^����l{_dn�Ҍ����߭[7"ڻwo#-�j����D�׿���������EWl��
-{a�4�9s&�X��W�w�!��3g�
@:��ׯ�����`[8>����K�N+;;���.]:p�@�jYYYD�x�∈ޢ���ŋ�[�|9}������aȯ)Af_:�СC�.]JD�n:l��VUU
2d����������5�2��^X4
�ΝKD۶m����jz�~۶m��m���e��@Cr	�i��6��}��7D���(��]*>�1mڴA�]�vm˖-�ۗ_S�̾tƙ3g�c�[�n�_�3�_V"�Ɓ��¢i0v�ذ���~�����:���eeeaaacǎ�"F�՞?~Μ9Dk�v���}��/��ґ�}u���kK���F"���4�999D��R,�)q�����M-�>$J�~��=ޘȉD�A��������ݽ���㸚�www�RYVV&�5���l/,��V�"���~�P2}�t"z��d�]�Θ1c���M
)���Vp�����O8���b�ƍ������VVVVkkkBB������M�2�p�Y�-��^���...���%�����>�L�T>���m�,���ܽ{��o
-:�K�N+((���^�*]M����˗E�����`�"�R���o��իٙ-Sd��آ�XD�9i,����66'��njd��ݍ����f{a�4�ѣDŽ	���?��S"ڹsgsssttthh�pu9C�
-+**^y����'������K�Nk�ȑDt��
9����D��rVGhƌ�q�Ɔ
�[�_S"H�}�,�a�v�'N��r�
-EGG^*MDW�\9q��ZV,�VL��fff���Gy������&N�X[[�lٲ6n
�ÊK�V�==�����ǧ��D�ڗ_~ID^^^����q���D���/<�X]���ܦ����:gϞe/�ٷo_#ᕳ���"�~+V�K�
�qZ����ܴiI�5IbpD디��T*�J%wC������:^��x���>�|��V�mll�x�"������D��뛖�v��5�V[^^���.�u�G�N׿ѿW��ٖ��٦��N����=u��믿�N/Q7������W���L�TJ��\����EӀ���w+�g޼yD���(�.���`+H.�C����d���;w�o���Ĉ���q���&m�i6H9}�hݢ�$��������S񩧞"�o*W�b`���h0����P�V�~�����B�8s�蘀������:^O���ݻwҤI�F�R��ꈈ������"^���ܘ�����J���+<?'LZZZ���g*��_S:��S�[Ԝq��������a�^z�ӧO�nS��H��~�a"����{���?lj�rVN/�Ov#��?.�w9C-\����T�
6��3؊���t$�M����]����8��V�8،��
81�B!����>�3�`38s	`=�����K�$�`3H.
�f�\�� ��Ar	6��l�%��K�$�`3H.
�f�\�� ��Q�;��466n޼��Q��(**�w�I ���v�֭_|��Q_HH��C��@�q��c�N�\�� ��Ar	6��l��tη�*�IEND�B`�
\ No newline at end of file
+
IHDR8gq)bKGD������� IDATx���i\��7���%aS@DpEd����-.EЊH�V�Ri�Z�Vm�؞箶E�z�h��
��KQ\����q��=�E�@V�%$��Ŝ;w���%����s嚹~3���\�0,��F�w����P<
���������Ǐ��dyzz��Ӈ�`�LhF>���}����d�5j�޽|�c�#O���
��|�wh0�	@(���	@(���	@(���	@(���	@(���	@(���	@(���b�a��H$ruu�ݻ�̙3���tY\m�tL��ѣ�>��K�.B�������o��ٗ/_�s�j
+

e&$$�δ���nnn#F�8�|��-�e�������h�޽|1
+��⛘�
+ :::11���Q��jׯ�.�ׯ_+++Ӵ�.��|�?���G���o߾���KZ�@���:t�P��2[x}��p�	L
˲,�J$�������y��D�������z��:�,8o޼��2��Ǐ���dgg�[�.88X횵4��͛�H(���%mMMͭ[��"��.\��X��<
4'��X��#O�okׯ_�w������;j�(��\��lmm����߿���K-����zxx�_�~���...O�<���־�ӧO���E"QUU��c�3��@G8��/000..��v��m�A����H�p����Ԃ�����iӦ����|��СC:.koo�������#G�|��
�1������m۶[�nI�����;O��'����r授�b��۷ccc�(22�~��&8mМം"�O�Quu������Meee��;���;gEE����<(oiѢELL�w�}ױcGMé��ɓ':t���|�����sqqq�v�jkk=z���=mXXؾ}�Z�j��Xf�/��<
�Y��d���>%%�������111;v,//ߺuk�^�nݺ��z�R�ȑ#�������9::Z&�mݺU��...K�.U����P<
�Yx���n�Z���m;���o\\����sss���\ZZ:�|�GOLL$"��;s�u�V�$\��O�Κ5��˗Æ
{���i
@(��,�����2
����NJJ"�.�ș3grrr�(<<\~5���p"���9s�ڥڶm�z��aÆ��������7n,[���Ǝ�o����g����������---����߿�{B��'0MR����$##�믿�ݻwyy��
bbb 000>>��ŋ%%%������P'i��%���`&77W�a^^�@ 8p�@ii��Ž��ccc%	>
4.K�42��;1b�֭[U�R�Y�|Z:hr�ƍ7n��;::�\���ʼnh�Ν��ՃV�v����A�N�<�s��3fhZ�w�}������+W��2(�	G��4Y[[���Ϙ1####%%E�������~�m߾}���-,,�������̙s���^�z��TqE�'O���ܵk�n֬Y,�.X�@�-�p�'��ס
h:x}��p�	@��PZ�?N�x7�IÑ'=��@}����‘'=�x��'=�x��'=�x��'=�x��'=�x��'=�x��'=X���������w
+�������w
+hP<
43/^3f�)LӨQ����ò,������3u��.|��WK�.�;4������سg�Κ5k��Ŷ��|'0��
"�����_�zu��%TN&�}��'O��駟6o�����w"c��	��ѣG���,Yr���^�z��0S�N�}�v�.]���-Z$�J��?OP,ˮ^��G�R���ݻ_~����ߡ�Ixzz?~|���			�{�~��
߉x��	�VYY9q�Ĺs�Θ1�ԩS;v�;4��'fffVUU��������O(�@?>

���ߎ=��� 
+�N�����嘘�#F���I$�
����ȑ#AAAB���իC��;���ͦM�6mڴf͚A�={���D<@��Z�jՈ#>�����Ϸoߞ�8�������������z�ڵk|�
04OP7�X<y�丸�
6�_���W�^ׯ_�ӧ�Ν;��`P(���_����NNNNNN����;�����?~�ĉ?��#�q?�ڔ��
6,;;����!!!|�
�bmm�iӦ�ݻ���ϟ?_�l�0|�hr�y��ٳg����:u�T�N�����СCcƌ���ٺu����q��'P���p���eeeiii]�v�;�cǎ�5*22r׮]���|�
hB(�@��������>}_�eff���{���߻w/�'0a(�@��ׯ
������t��@sr��́<x��S�o�
�_H��	&ܿ?55�����?--�ʕ+#G�����;@�@�1w���Ǐ9r��Ϗ�,�,:t(==}ƌ|g
h�T
����_�֭;|�p�>}���Xhh��Ç���۴i����8����ѣG�̙�dɒ����@����ooݺuܸqm۶��/��И0a��?~��o4h��ݸ�!4��\��ĉaaa|g
h4(���R������.]�dkk�w0,˾���YYY׮]sss�;@���q��^�v��_E���a��۷;;;�9�����8������Ȉ��_�t����Y�������/7o��������8p���UUU������#%%S���l߾}��ɧN���'0
(���W_}�m۶?����Ņ�,`�&M����v���V�Z��AP<
��+W��������O������,  ��7�8p��Y����߿?˲�ϟ�k�#w�����݆�8q"""b���cƌ�;K3��kӆ�	�L<x0&&���h���[��0MҐ���V�)����8p���)֋1?�f��9�J�


~~~�w�n�5�[</aP<q4e{�����_HHH�?�L�1?�fȼ��g߾}���.�;�;;�u�����/�;@=�x0G˗/;vl�n����'L����aeeժU����'N(v`F�r������Z�b�e�mmmmmm���u����<yr˖-۶m�z�j"*..?~������˷�~������Z�(m�D"Y�zuPP������mXXXjj��]W�A���s��O*�.^��cǎB����'11Q�
�k�ю;����Ba׮]�ϟ_VV��N-�j�^"���9r�9s���4�����1�aW�/]����9~�8�0�n�RjW}`&%%E��ڥ4����������V�k��
b�Xqّ#G*v8x��[o��ز}�vky�S��X,��SU��3��j���?66V����d����X�L6n�8�}}}���tW��r?~lgg�p�BM��)�+�n���.��0���;����	���Pm���<v�Xii�X,���_�j�;����'>>���l�RPPPPP�y��-Z�����q�FYY��ND-[�Tj�۷o+��X������W�^������������hM{�Q�}���q����LMM-++��ˋ��"�~��)����ݸq#���'''VVVfffQ\\���jڍ,�&$$�����k�Ӹ��9V�]��X�����yy��!�0�V�+--m���nnn����?E"��C��'"JLLTlܴi�I��`VVw��ӧj[\]]X�����
T���(��B���'N����������R�wlHH�?^q�������㪍���ݻw�R�6��{��cW(5��y��#
`^���OOO�T����/�h�yy]>���DDTXX��XPP@D666�VWWs7e2���aX���Ɔ�
+
+
+4��F�K���\��x\Ϫ�*y�|�)��}�r?maaaaa!�<������jٙ,�r��Ν;��[ci��X=v�bcC�W�L0#R�t۶m&LP�*���ϲ�iӲ���O���
+�>�_�n�	�B�Pq,���nt�>h����M9�>�u߱��R�T*��d2�L~������ދ���5k���0��x�i�u�pxy2C��X���ѝ;wT��>?JKK�-�o��[��܈(''G�r��q�>��Dmm��ʹ�v۶mSlܲe���S젽E��j�(�'00��6nܨ�OT5dP��u�P{<�o�J���ؠ� "�t��uW�~Pr��M��[�j��(��9�ˮ��S/x$�ȴi���յkW"��o���JJJ���۴i��~=p�@"������+//?|�����RWWW"ڵk��n¸��Ӷm�
+Ie¸b$�-�VFi=+W�$"��k����WWWgeei��ӐAն׹B��x�Z77��7���VVVVWWgggoذ�O�>���i?����uww����ޭ��9�ˮ��S/x$�Emm����?�����˗�_M�8Q����ѣJ}��Ж���㏕��,[]]ݿRVSS�-���.�ՆQZ�X,4h�j�z�%M��m�s��㩍�ԨڧΖ�3g���︚���?��S$�^�ZS�Ƣ�����eW��©�@�<���ٳ��˲�$!!���K(v��yѢE�	.�ݶl�ҽ{w+++OO�E�I$�>���ӧO�С�����]���������"�������ٲe�ʉ���M����(u��			\6;;����C��{/iTm�.+�O�On}w,'--mԨQ���VVV666���s�ν~����j�j͞=��ͭ��RK��k��.����S/�m;s��m���<�;��gϞu��%!!aƌ|g
��m`.N�:��Z��k۶���l�2�X�w���x0���׮]�&���x�b���|
��'�������;��w�<=='N��t�R�| ���	�,dffv����Ņ� -X� //o���|
��'����[��
�M�ΝǍ�d�C^p�P<
�>�Lv�ʕ7�|�� u������>v��A�A�`�rss���P<���ѣǐ!CV�^�wmP<
��۷o3�����������Ҳ�����'�w��=;;;���mذa;v\�~=�A4B�`�����w��c�a��1��<M��nl����ԩS�n����k�����v>����{�����7�)����s��O?���ٹsg�״��gr�m{
	���{��Qǎ�N
M���R�S4&�Q�F�Y��ĶL�'W[[��ٳ����@����;w������'����Tj�See�g�}������0r��G���ӧ�i۶mUU�b皚�aN�:�vm�d���AAA������aaa����{w�����(
+�v�:������ŖH$?��S�>}\]]���۵k7jԨ���z�����풟a(��� ��-[hkkkkk���P[[+����J��/�ر�P(���ILL���i"}�����ߴi��]���&L��𰲲jժUxx��'��j�QZv��R]O6"Ҿ3��***&O�ܲe˶m�r�b(..?~������˷�~�t�M���Q��B#`
��eddQ^^��w����7���"�eCCC�hŊ���Y������ծP,����}C��d�ƍS���׷��L1�R<M�ccc5�y�;V���l��JCTWW���۪= ���nWrr�j�[�f�����W���U��a���M��5�P˃��3���#G*v8x��E��o�����y�e\-�
�]	`�<HD���<f�޸;t�p���W�^�9s�;6�|�e��I���VTTp����۵kGDP��+V�����ի?~\]]���Ͳ�ƍ����=99������233388������(����֖�.\���/����RSS����1V���l��������D���e˖������͛7�hт��/_�����355���,///**�����W�ci@VVVIIIJ푑�ǎ+--������V����ٺ�(�W�˃�}gr}oܸQVV���Q˖-�Z�������y�˸��v�v+��۲e���=��7�C��[~��W"����nQ||<w�;����#��Ԯ0  ��6lؠzWHH�?^���ÇD��奘G)����U��ÿ���M�6=x��c��_�viɩ��]
+511Q�w�+00P���'�rrr����A�N�KdddDD�RcZZ�������,--��TD"����œ���hߙ\���,��ӧOն���r7u^�2����@ح&.!!�C��f���KJJ�-��Ŋ�O)))DԪU�W�^UUUq���nݪi�666DTPP�zw�������B �T+++�<J�4������]ň��/^�c�:�k�.-9�E"*v((( "��UUU���մ��c��gϞ�[~��Msw�}�*��\�.����ݔ��wPja�����J�q�Ɔ„q���+1������/**Z�z��
�>}ھ}{��>�IJ,I�R�T*�ɸcW�]���u��������˗�5������~�={v=�j�l
��Y��Jmcc�g�y���ϲ�iӲ���ҡ���!C4�
+uٙB�P��R�P�nϓf� �$O&�����ښ�DD.\���ܹsDԩS'�&�0��߉h�ʕܬ�������JӪ�u�FD�t.%���Dt��%�/�/���ehh��_�w��7n�m,}Ǫ�������t�H$Z�rWC=z��b��Ç�+o^���F��x�L��U||���7W:�~SӎR�^�
+�?(M���ú<a��t>F�Ҽy�����o��Fӄq�T*����z�nݺ��R�
+W�\IDk׮��ϯ��������nٲ�����6nܘ��[YYY]]����a��~Pz���fؿ����Ǐ���,[���lmm�1V���l˲���D�k�.œ5JCp����Ӷm�
+Ie¸��H�>�W޻w��ٵkW"��o���JJJ���۴i�^ӎR�^�
+�?(��L�>�[��Vۨi?@��K�̙3�~�m~3p��J_Ֆ_�@.))��k����W(�
����3g�ޥء��6��J�N�Z����׾]�q�CTWW���_u
aaa555Z�W�N��X,vqq�N��,�|�r�M�8q�RxM;Jm{�+����3U��٢��Jm���
�]	`�>�����{㮨���O����s1999J�.^�HD�S�5��			���"����.,,L��|iii�F�rww����������;w�����(��4PVV�'�|ҩS'+++���П�Y"��o�:�kٮ����ӧw��A~BS��������lll����-[&��4m�1�~��g�
+J$���///�Pعs�E�ɧ
��k�Qj�uY�����'V��j���
ǰ�� ���ŋ#G���n���������㮬�9~�xDDDNN�|��0a�ĉ�b#�0�ݣG��
+O���l
0�E�ܴwc��	�ĉ�b�K�'�a:u�TPP0t��=z�������!C�~N�G(�L�P(��|���H$����~�@����Ϟ=[ZZ�w""c�{�������|��&_�vÆ
cY�ĉ�G��;�<
�:[[���J�S4���s�~�p���'gccSUU�w
+��>|�ѣGq�l0(�L���
�<�	6lXqq�K����	�����nݺu�ԉ�UA~�x0q���8m�a���gΜ�;�'Sײe���r|�
L��
.^����k����C�`�����bqqq1�Aj���b�8##�� `�P<
��6m���_�	�Nm۶�֭��
�P<
�8777"z���A���O�>�w
+0w(�L�������<�i0`�իW�;-�/O&�aWWWO`���d2�����f
���kӦ͋/�b��۷������#==��P�Ѻuk�~ᇁ
LSQQѽ{��ݻ���-�o߾b�
+�L�݋)��|���fee���'q�8� IDAT�}��I�&�@ ������U�Γ��?O�*$$d׮]���a���0A�ƍ�ܹ�@ ��db�X�rjӦ���3_��w�ޕ���n��;�/O&���rժU�t��y��7
	����ѣE�/^�;�/O�)**�o߾��5���{���K$�F!�|�����|
��	�d�\�R*�*5�� ^�4�޽{�x�x0Y!!!Æ
���RldY�š�		���.))�;�)O�lŊJ��Ba׮]���(���Y��z�*�A�L�x0eݺu�4i���'#
4\�v�ڵk������'��?�}�[YY��Qܼy��`�P<
�8ww�ٳg�>a��???\�	���	��-X���Ɔ�jkk�U;0
~~~��ݫ���;�#O����q�����{���o�F���/������?�,99���F���[�h!N�<�wh���P�S�{����ַn���`x�ҏ^
4�0|G0e{��=z4�)�������×,Y�w0;8��o��I*��۷o̘1|���'����1gx�9O������__�;w����'h�z����VUU���'h����d2YNN�A��x�f�K�.����|
���	�%�H����	�4W^^^(���P<
@s��	x��	�+O�O�\yyy=}�����|
��	��Ν;�,���#���yA��U����?��;�O�\���;99=~��� `^P<
@3����	���a�~��Q �\]]{��=s�̬�,]W�A-�C�,���#F�m����������o���/^�k ��LɣG�>��.]��B[[[??�ٳg_�|YuwHhh(�0!!!Z�r,--���F�q��y�n��=MC�#�W���yyy|�3�4*"ڳg�)4R}�kyuDGG���h_\���Z+//����s%��cZ�)�v�Z˖-��R�w�ݻw�wݾ}[SZ%��ȑ#�>z����!�A������������N
�G�����R"����ϛ7O$�����İZ+-kS���Ǐ���ߜ��V�X�������ׯ_߽{wÆ
����8P͛7����������EEE555����֭V��K�͛7�P(��_-nٚ��[�n
2D&�-\�P~�^{L�<
Z}
��_ƪO{M/�k׮�hт����[gg�;hw��1"jٲ�����.5iZ"��~3p�b���+�_���\\\jjj�\Փ'O�H$q7����]��__�HJJ
+�R��� `Fp�	@������8"ڽ{��ݶm���u���`�֏��UUU5��RSS
+
+�M��������C�鸬��=��f���yxx������'�F�IDJ3��7K��ȍ1������m۶[�nI��z��;O��'����r授�b��۷ccc�(22�klF{Q�v�����|
s���/05dܧT��Z^�a]:+v��kM$QUU���} ��LիW���I�E��qnn��9���-,,�BaQQ˲EEEB�P ���չ�����/_re��{���%%%D��o����<
h$����`����SRRn߾ӱc����[�����֭[z�*11Q*��9��ٙ�������e2�֭[�/���t��V�Z�{+�8::
+�B��CB����Y�[��wA���`�6m��6�@����7..n��������ك.--�?��9Y�MLL$"��;s�u�V���}���Y�^�|9lذgϞqw5|���`$Z�n��		��F)))D����M�O�>�q�oo襤$"�p��K�9s&''��������'����3gΨ]�m۶�W�6lXqq��~�56�
���ZXX�w
+0#(�Իq�Ʋeˈh�رtҤID�lٲ���l�F��>�����������---��������ԛ���/�N
f����J�%%%_�u�޽���c�QQQ���}��Y�jUNNNmmmUUս{�6n�طo_�%�S```||�ŋKJJ$Iaa!wMQ"���*�JKK8�0��4s�e�����JKK5-���+�H��O�h�A�jӦ
NہA�2�@wd��R}�kyu�1B�ϳhy)5����?��Di5-�������a�ڵD4x�`�C���D�v�Z�U)�y�䉍�
�0�/_�w�iڨ:��Gdܯ/�|���AAA|�3�#O�������%88xƌ)))�������p��ѽ{�>��������ήgϞӧOW�[�|�~����~۷o_ggg;;;??�9s�ܼy�W�^:��;+�8U\��ɓ��3w�ڵ�5k˲,����q�jժ����`F_0�F�0̞={F��w�חZ?��������G��ystt,//DZ0K���a��kTo��(*@˖-�RiEE����Y�,��4o��D-_�h\(�G��7�N��(*@˖-������ `.P<
@�#O``(��y�'y�A�͛�����eyy9�A�\�x�f�������|�s��	�=[[���J�S��@���'0$O�����VUU���'h�lllp�	�4{8m���	�=O`H�a`h999gΜ9}�4�A�Y[[��b�S��@������ӧO�>}�̙3�=��������H �d2�S��@��)**⪥ӧOggg[ZZ���L�4iРA�{����b����j�H�w
+��B����	�ƲlFF��ÇSSS�޽kee��;�L�<y���


���Ϣ��,^rB=�۷o����O�
4_(��`�e��FJ,�?>55����999-[�:thDD������p�	�I�ٳg���|�0:cǎ������;�ye���\�t�ĉ����ݻ���:�_�~VVVu.�r��z�jPPP``�k���� 8m���	��ŋ����޽{��������+""��Օ�h�T����0̍7rrr:w��w��C�����ܽ~�:55uϞ=����L&2dHRRRTT���=�Ѡi�d�m۶�,kmm�����w����P<�!�"�f�����_���]]]Ǐ����u��=��СC�ƍC�d233�?NDb�x˖-8�
+��'0$y2;W�^ݰa��ݻ�����~����(|�����/VVV���D���w�ʕ��`�C
��'0$O梲�r�޽7n����ԩ����'M�����w.��D"ٹs'W9����Ν;Q<A��		��L_ZZ��ѣ[�j5c�__�+W�������G�d�Μ9SZZ*�)��o�.�Hx��(���P<�,�D�gϞ>}���o���?���ѣ����7��;�o���J�())�OB��		œ	*//_�re׮]ǏߩS�����w�Ν;��Ņ�h`jjj���+?gDZ��ڱc_���0nR�={�y�f�H��_|���J�:x��ȑ#U_�666/_�����%�^���;z�h"�����d�ڵ���������9r�̙3��	�	�MDIIɏ?��f�KK˿��o3g�lٲ%ߡ�H�ڵ���Bu�SMMMjj�1cxI����Hkkk�X\QQ!o,++�������f
G�������k�.Y��e�9s�̞=�E�|��UQQ���RSS�z���Ő!C�9b�T�u��1�_t�ܹ�Ç
	��<5o{���޽�����L�:5''�������	�;v��ʉ��R�ɓ'KJJ	�~��}��,--�L�b�<`>pڮ�z����3N�:�p�Bwww�A�PXX���o����NNN�:u��ܻw�O�>|D������Qm��d�����i��G"�,]�tɒ%���6l		�;4co��fxx�ҥK�P�p�T*��XZZ���G��1�<��kf<xЯ_�%K�,\��ʕ+���������5j�R�T*���Oy	��Ss�e˖^�z���+W����)]��������V����W0(�������?���O?�9s�ŋ}}}�N&B �x����ݽW�^�OVVV�'O����0a�x��eLL�������?r�H��I�i;h�>����7or,�������;�>y2v�?�߿��'O���P9A��i;h���}�r�z�y0OF����}�����JOO�;4������˫k׮D�0�ԩS��f
œ�z��yDDD�v�Ν;׶m[��i�i;0
�w�,,,��B`��d�^�~��{�	���T'''����i;U���|G�888QPP�ɓ'��u

����;E��x2R_|�ENNNVVV�֭���œ*�h�233333�N
u۳g��ѣ�N� (�����۷m�v�ȑnݺ�L�<�eo��f͚53g�T�k-`TL�1œ'�s���3f|�����|g
Ӈ9O`�����T�f
œљ9sf�������f
���4�8��i;����'Ofdd�����N�
�������3g΄	����w08m�/OFd���%%%K�,�;�����'cQSS�r��3f������'}�x2������s���;��y��'� ��V�Z5v�XWWW���y��'}��vF��ٳ���߷o�A�����p��(l߾=88��Ϗ� `vp�@_(������}��}��G|
s��v�B�Ŀ�ǏWWWㇴ�8m�/O�;r�H�޽۶m�w0G(���Ǐ��w�N��0��Ц
�MGi�4m)�<����@$������{�̙YYY�,���Z���ԩ�0ׯ_Wl�����0`���k׮1өS'�����2�%a�i��-��S�jף�Q������6lXFF�.�_P<��?�x��Ixx8�A@=��C�)s����jjj
+����]�644t�ȑ������GgϞ��H$��`��ŋ555�Μ9CDT\����}�.]�s�AR�����S������EEEiiiVVV��G&����=z������o��hP<�,==���.((�� ƈeYijNۙ=�&�H�������͛'�RRRbbb���`��eA�x�"�իW+**���|}}���/]�$���t8j���D$
+���=��F]<��������H$������������-�}q00O<�z�j�^���
+@��i;�XXX8;;���wŊYYY-Z�8s�!~p������Bϝ;GDaaaaaa�D$�Jϟ?O=�T[[���DD���?�())I,,��1c�hϞ=�M�?\�^,,,�t���O?Qvvv�f�Ƅ�g׮]{�74�+�H~��>}����Z[[�k�nԨQiii�O�f�m۶UUU��kjj<<<�9u���)'�T�x��;
+�B���D�!V�^doookk�����A���UUU3g�lӦ���/�*��-[hkkkkk���P[[���.+W��}^Ž;����Ba׮]�ϟ_VV&�7777::������e��镕����|Dաu�@U���&L��𰲲jժUxx��'����h�X��
+���#�ݻwlP��]����^�v�k�Nᅅ����;�P<]�z�����ۻ]�v��SSS
+
+�M��������C�,|tt�����3g
+
+
+
+
+
+Ξ=kmm]��q�3...����C�`����v��͚:���jz�BCC�hŊ��׬YCD����M���J����b�X�t+��y�������~���UW;`��X��ʕn*�ҥw�L&7n�j__߲�2�e_�|���xWLL��JԎ���6�aRRR4����Թ�����(cƌ����ٳ���O�9�����]"���ԥ���4e�"JHH`YV"��hт��<y���"����^_���D4m�4�e�JDk֬aYv���D�{�z��/8|�p"�駟֭[GDQQQjW��E"����|��D4{��z�1~���B�ħG�QVV�����D�p����|�X\TT���β�cLj��յ����\]]��v��
��{Mzzz���������EEEQ�~��+V� "{{�իW?~����:333::Z���}��ݏ9���+��{ksttܲe�w��͛����˗�r�{�����XZZ^�x�kٸq#�$99������233388�����X��?>u����ٳ�^�:s�L�����y������<v�Xii�X,���_�j)T���<:un�jrM[:v�ؑ#Gj�f�4��U�U<qG�mllt��A-�ڵ���ʲ,7���ˋ���LJ�233Y����P|����-,,�BaQQ˲EEEB�P ���鸽
/�v��A
+��v�ܩv��Z988�������#��3���'>qG��={��C��݉(<<��/�ܴiӃ�妙���s7��N>>>2��k�^�'N��/���ý2��


D�a���׹����\����Qbb�b�M��(00Pߕ����urr"�~�A��}9����=>|(��v�C������:~(5겁���҆���&?�ID"�HS-�N���\Ӗ�7nĈ�2�'�xsW�����ׯ���ӳgϸ7���ڄ�"�2e
+w״iӈh�ҥb���Ύa�/^������?��p���{�W��j,//�D�@ ���pL����nݺq��1���'>%%%�D"y��*##�cǎ������[FJJ
+�j��իWUUU�a��[���������g�p7mll����@��u..�S\\���H$"���B�Ƃ���b�W�������7�$�~��I$y;w������‚{���O���bY��NII�|����n���l��_~�E�%4
��ѩscU�k룏>��/��i�����\������u�c]pG�.^���{�ю;�vn�UDDDzz:���S��L&�ܹ3���1nBa�Ν�`�$�wx��3
��}M�������ܹs}��%�M�6�#��3��&��)??���]�e�BCC<x����|��Q�F������o�g������/**Z�z��
�>}ھ}{թ0�'=��,�eq�8P=�#۬Y��^�ڲe�;vXXX��Y�%"�T*�Je2���ݥ}�ap
O�6-;;�++**꽶F�X\����6��������.�=;�222N�<I�H��3g�������/vp��rrr�}���_�����䜜��~�m��e�'46O|z��e�ߧ���

������{��
"�E�a�����D�r�Jn�W_}��U�u�FD�_~M������ѣ�����Xo۷o߰a�_��C��w���ѥK����@D�ň�wd���;Zp%�D"Ql��r����㽽�����F�Z�:7Vw�T
��q���=v�X�UE�ׯ/++�ڵ���;���������ի����_/R���Nu^����{vvvvvvÆ
k�>~��Q���)g���L����j�п����Ǐ���pog����R��;�MD�[����T\\�C�ظr�J"rppX�vm~~~uuuVV�҄q-�k��UrNNN۶m+,,,,,LLLttt$�	�z��֭[����ǫ�-[�����ƍsss+++������7l�ЧO���]]]�h׮]�gu�@%]�v%�o��������$99�M�6�G���Թ�u�L�I�&q�sA�Lⴂ*��b�D")..NOO�ꫯ��~��
:��ұ�.
+��?��SŻ����@ �O())�D����*�*//O �D"��z-	�^�����ږ������s���z�zD2r���B�ħ1c��O��E�L�:U�w]8"Z�x��ŵ4���A������TWW���_u�aaa���c���MiY��9s��\�z\��eُ?�XuU�l���˗+u�8q��ѵ?:�7�Ν������Z��"�xsW����"�#F(N��Y�:���㖒Ox�p_g#�7�xC޸v�Z"<x��Uq?�v�ZM{@��ё�5�s�U666.\�G$#G&��B�ħ�C�N�4IK����O>��S�NVVV...���?����,i�e/^�HDJ�t�n�X,NHH����Dvvvaaa��鲸�7������xn�666���˖-S,,�r]ޗ���F����neee��� IDATcc���;w���ׯs����DEE���9;;O�2��>��w�����ӧw��A~>T�
T"�H����Ba�Ν-Z$���et-�N���#�z93gol[[[���Ϙ1###C��Z^�uv�ѬY����������͛'o�ի�ڵK����C�z�Ҵ��N���,�i���ȉD��]�N�2�޽{��c�L�����|���l׮]O����&&&Λ7��,�^>���Ǐ?~�� F�a�={��=�� &�4^_�0޼=z��ȑ#��R������eYw0V�i�C��ѣ�a��B����Z$��$l���0P<�I H�҆�A$���q?�
P�T
��P<�����իW�^�y�p�ȯ��t���Us���9O|jѢEyy9�)�����P<�e˖(��_8m�/O|jٲeii)�)�����P<�]�v���|����v�B��'ww���ʲ�2�����i;}�x�S�v���ӧ|
��v�B��'OOO"��`�����P<�������5;;�� `�P<
��ϼ��<x�w
+0_���/O<�����>�)�|a���P<�����Ν;|���v�B�ij������'O���N�
����|�M�@p��e�����i;}Y���988t���������|g
s��vjeee�
��'����œZ���?������'���w,�2�w0;��
+;��sww�={�����&s��TRR���C���9œ'0=���W�\�;�2O�����Kx��v`z�����
+M
+��lmm�z뭓'O���'0=���������|
����(2������8m&&88�a��W��L�'���ɓ�w����<��qvv�ԩ��MœQvvv>q��A��x��9�ФP<�A�)OR���<`>p�L�'hR(��Ő!CΝ;WUUŲlzz��i������G��$?}���ӧ|
ӄ�d�!C�TUU}��gϞ}��)�0���|�Ӈ�	L�o�aaaq���#F�L�<���Ç.0`�۷��S	�g`(��$���{yy]�v�� `�p�O�ϟ��N�>-�ʳX,�ߋ�40�ySիW/O�Dp�O�;w����Y��J���>��p�	LU@@��7�N
�	��<<<N�<iee��^|��
�xS���L�'�����6mR{>��p�LU@@ݼy�� `�P<�o„	_|�@��X�x��'0Um۶mӦ�����&œQX�jU�~�����x�'0a�����M
œQ������_���,-��G0(O`�0g��'c��윚�jii�0ׂ�40�yp���K�4
+OF$  `���H��'0a


b��޽{|
S��ɸ���̟?_u�8@A�&���G$a�84:|H�ŋ���;��v`8m&������Ӟ���ezr~~~ff&_Q@>�y�fiiirr2�Y���=���#O`����nݺ�w
+05)�233nj�WP�����x0$??��'O�L��/���H�߿�����;4���d#��q�L���ϳg�JJJ������s��*'0y�֣G"��q�x0kͱxz���g�}֥K�Phkk���7{��˗/+�aF~�4��������a�222�V~�޽���޽{�5��V��:t�`ggw��]���I���
�Z�+��_�VVV&o�}���۷׬Y����d�������cǎ�ݻW�(���O#'^	oo�?���� `Rp�	��5�9O���+++���?~�xQQQMMMvv��u낃�uY�eY�e%��󟘘�e-Z�ءG��}���۷�&>�G�(��q���YkvG�����h߾}^^^\����������J,,,�t���O?8p ;;[�;w�4bZ0>>>�6m�;�y0k+���;UUU3g�lӦ
�أF�b�gϞ�_2��gϞ�h�f"������F�DD...
_Uzz��	<<<���Z�j~��	����J��/�ر�P(���ILLT쓛�moo���2}����ʆ"�ѣG^^��ׯ�&�U�g��h,���ڹs����
��pg�,���sggg"ھ};�m۶mD���ZXX�v=ӧO'"{{�ɓ'oݺ��͛�D�p�Z$INN�|@D�g��X��S�0LJJ�R���X�n���\��/_zxx(��WЄ;gw��U����@�` ���ڵk����
��ww�#G��z�Jޞ��DD�:u��b��S�NDt��
M�y��Ո#��-Z|��ǹ���é�(rpp�������Xǭ���<v�Xii�X,���_�j+����355���,///**������u�?>u����ٳ�^�:s�L���Q<5���Z�P����w0(��8__�w����VEÆ
#�u�֭]���ƍW��n߾ӱcGn͎��7o�TN5��nݺ�ܹSK`�.--m���nnn��H�H$RZۉ'�-999\
���޽;:tH���_E��X|}}����S����q�f�	�aaa��?������?�@Dm۶�׿�U�z|}}}}}��߿ƌiii���?v���Rr�֭o��棏>�����O��E{��;v��n���Vj�߿���\����+�fnn�R�¡Q�wи0a��q��6�ڟ�pvvvuu������lݺ����^�������]�pA�$o����]��hٲez�����gYvڴi���UUU,�VTT��)�����/
����ɄF��	��qᆬ�T���=x�`���,�y�����w}�PRRB
؊Ǐ�oA�Ç�(>>��ۛ+�N�:��J��^��߹s��
+u��-''G"��L�'��O<^'3--m�ڵ={�?~��_~پ}��+W�={VS��������/���H$���”��i!!!��[ZZz�…q�����C6��ӓ��/_^\\\ZZ�w�ީS��n��̙3ϝ;WQQq���ٳg7$(��򪭭}���A�T(N�2�	���3��֭[���|������,��C�;Dn�µk��­!,,L����'��;*��O�>D��[oiIXgZ�b�;GDD(�GDD�]��GA xxx:4==]���rss�N�ڹsgkkk��={Κ5�ҥK�2���t�Ґ��
�a<�/E ���ڦH������ݝ�RSS���;wQ���KJJ��G�������e8M���\�p��nZ6m���J�'N����ڕ(6�RM�����~��7����h�œ���h���:�q��M�x�'O&�U�V�[jkk��ÈD���j�]+W�$���X�5(�}�}���=�%�^������VVVEEE\�˗/�M�\�E	�0����%˲׮]kٲe��P��[�x^_���t���H�#��Q߾}�-2����n
+���ׯ���}��uvv���������3gN^^��ᔞ"��k׮S�L�wn�<�$IBB����P(�ܹ�E�jkk��R��Ɯ����(;;;gg�)S��/�ehН��Ӻu��N
&��O��%IQQQzz��y���dZ�s�zپ};EEE�[.^�HD^^^={�$������z���H�#���#"�PHDs���+a��srǙ6n��5nذ��"##��s���������HDj��Q�V�a2S������b�`�����Ν�w
+0Ͳx����y\��7�+!절�₊"� ���[\JQ\PQ���j��V����=�n��{J���V���7�\P���¾����ǼO��@�F�d~�?�����o&$���{����4k֌����l�y���NNN2��]�^�3{��O?����-[�.�J�l�����%���+�_����b��4}�W<�w�>|8�pذaD�m��z��YYYi���֖�<x�IT}6��IC�&"�13��;�;��`&L~����DD����F�h۶m===���SRR�%�����@vj�e2ׯ_/--���jݺ�����񹹹=z��;w���_~~>�f���VVV			������gϞ���
+

�mm���iޘ�Ϛ��vFЩS�G�q�̄�OD4n�8"�z��17:d�"JHH "�L���HD����&���$v�ۀ=W��y�f"b'�c�e������o�-����۷w�^�L\�8$5d2��Ǐٞ6�a�`o�1`���3gnݺ555U&�g�P'O��:u�����:�r7T�9���Mu�ۍakk�Ic�
5ع�F��0̕+W��s���C���D�^DD{��Q<1;;�����ښ�]PP`mm-
+����G��;v�R?{{
+M����Rw0UM��d��t�_ʎ=JD�7�0K�	
�:3��'N��a{�.\� �J�����3w555����@�����2�lܸq��䝝�CCC�r�bԑ�3�������.\���e'��MYY�����ݫa{��*ߘ���4&&�gϞ�����i��P($�<
t�ԉ�p���'v�3m�Xg9��s��ܼ����ʮ_��O�Q)��+W��z���LJ�n��=s�LŪ�3w111F�stt9r�\.���#G���n�cUXXx��9�X<m�4��<���DDD�۷�������Ç/..f�*�؛�Zp�x�u��vvv�t�z2�≽֚�Ƙ�ΧӧO�wTPt/��ILL<uꔢ+!!���zPP�����222�
R�1y��Z�сA�����x���
�C xxx�x�0���֭[�w�)S��i�*Z�~}II���';Q2���yyy����3(�W�Gb��Q�F�����ۇ��d�������N�
xzz�x�0��I&�%&&~��W}��---2d��VF(rrrH�ۉŞ����
+���y�������G3���)
+���_\\l��vvv������vvv:�D���5���N�
`�0�
��~��2v�ؘ�Շ�l��%�`��b���/;�Y�xڸq#����3�Ν;������O�����a�N�:�s��O>�D�\Q=n����]ht�֭[�n�.wrr�d

n�Vŏ(�c���J� 3B�g������_��Wlllvv�T*�ds?�|+�;u�Ď:ГI�<YYY�� �O>�$11����NNN�$Q�g����>��=+�<T\{�<����;XJJ���5yJ}7&�}�vϞ=u�P'>�ybr��e˖�Z��ɓ'R���|���QTTTRR�u0yM��I�/!��6j����Ҋ�����R]޶m[�MܸqCͪ�L��<lKMB�ë�&�\��֣G�=z4�L�M��ohC��'U�9�M���7j�(+++M���IO���D����ô��L��	�o'n���O�Ѹq�4��@m۶%���l����C�T�Z\��[��Db�����RiTTT�޽�������v�����dmm���h�"��}H��_~��_�~���VVV�[�;}����R߾��R�B�����u�H$+W�������������_�z5{�%��2�l���:t������V3�Fў��B�bs/^|��ڶmkiiٲeˠ���'O�>Q�C������P�X<o޼��
+5�2KNNN(�����j���0>͏X��D27�MS�|]�x���>}��7�����r���Z|||JJJؕ�z}տ��
��a[
��H$��W}jm�����ae-C��H$��U�+66��#PߦU
+���w`�l�P����.
+�+��-1#]�v����N
&���4��{O���D������UUU����0{�h�6mbcc���***����9i#""ؕ��RW�Ύ�x����l�DRPP�öl�������R�Syydd$999mٲ%77777w���͚5#�U�V)�www���/))���doy4p�@5G^u�#F�8~�xqq�D"������KD


�=E�C���߾}��gϖ��%$$�k׎������?��C�S��C�`$M�����DDݺu#�
6�6`��:���Bv�A�Ͱ�*��v�JDAAA.ܴi�Çu�V��٫��/59�����EGG+7شi���+�?y�
{#
GG��B�[?}���ѣ���D������Ʀ��hu(��~��aţ�a�4cƌ��`�S��C�`$M��u��%���rssU�EB����~�ZZZ�m�*�kMu���K��`{[[���KMN������Sn���KD�����+++
S?�wT��{����3������5)�^XX���������:�<��3CD2�L&��7�f��k[yд�����������U�V���988������:l������Y,.�X�t)�0s��MOOg���r͟ޤESֶm[��x�5�k�cǎDt��!�>>>Dt�ʕ:���m�"����_}�U\\;�<{Y���j�}�.]��/ž�����ˋ��;���ȑ#��
+{�-22��ˋ��Μ9���<���o�;w΀�ME۶m����*L
T�x�5��

%��?�|ݺu999��՗.]7n}���D4f̘M�6=y򤲲������7n�߿�[<x��;�{�����ݻ�����t�V���{�����\\\�(..��z��K�.\�m۶����������?�\񐡰�7�Z�������8..nΜ9�?��C��a�?��s����Ϟ=����
�z�P��i��0M��u��u"����a���|�?���Z&��-��\Ϝ9stۖ���D�~͘1��MTUU
4Hu
������j�W�APm�jժZ��>}z�6�T(0U
+??��N�:�u0m(���i��ػ=|�P"��^����������>00P�ʬӧO����i�������������?�y�&���/�Z���g͚���aii)������o��w��a[
�W�_������k߾���e}��0UUU����lmm���V�\�����_m�'�T�z��Ν;[[[w��qɒ%��J�=E�C���1f�{{{gg�ٳg�z�����0vvv�.�Ж�Q�C066v��Ɍ��@�����y�fϞ=�����=f���k����}��A��a������7m۶����:�6O���`���'^C�|Ӻu�gϞq�L�'^c�'Ō�f��Ņ�#@g(�x
c��o\\\�	t&R]k�f/99��u�i;��X\UUU^^����u0UuO�'O6~�N�
߰3����x����ݤI���q
+LFrr�������?� �H��cb�z����o�b1���c�@k}���}��?������p�t��v�7(�@(�@"�(<<�������1b��ѣ������i;�GGG���<���	C��kժնmێ9r�Ν�ݻGEE�d2�C�vp�xH,��	��	�r�Ν�FDD�������\'-���'��'0[[�ŋ���������O�>�����P�O�C��	��	�s��'O����>qℏ�϶m۸N
Ø'�!�<��P<�!	��ӧ߿ҤI|���!C�߿�u(Pc���P<��P<��h�"**�ʕ+���~~~_�uUUס�n8m<$�q���4��_=99y��տ��K���O�8�u"�N�
a��	�4"�tP���=ztvv6ס�op�xH,bj��'ht�[�޶m[|||ZZ���/��jRp�xH,���"����B�F2j�(v:�E����W�\�:�x^jٲ%pL�'0;;;v:�-Z���>*--�:�a��P��͉����� `�P<��yyy�:u*::���]�v�tP�˜'�f͚QYY�A�T�x��A���O�8�>6lXzz:סx
+�퀇�=ߠ3O�v:�s��������s������\�����Dvvv(�@g(��cLIIY�bŚ5k�w�~��)��N�
?5k����pO1T�=���&M�����u(��i;�'O�O�T�i�&..����W�\�ҥ��2��~j֬���P<A�2z��w�/Z��O�>׮]�:���i;�'�<�>P<A��Nu��Ukk�~�������ƃ�v�O������\�S��	�(??���y IDAT�/n޼y׮]���x~�������:�*O�t)��5jԌ3F�����C��y~�������:�*O��9;;���ogϞ}��I�n�0�aa�𓭭-z�@g(��4<X1�����ӧ�Nd&p�����=O�3O`2,--���oݺ���4}����<�CiD�F���|Ĉ��T�׹�@`aa������h�l��v�?���Ԕ��`X(���t����ѣ�:w�;��|�D�3g��?�>}���R��������cǎ
4h߾}z��i;����4��`X(��$��A͙3��/�<xpjj*׉6|�𚚚����?�߿_*�>\�50�0�T*}�������Y�d���p�����<5�w:�'0U������׮]��d�z�j��AM�<����������]��N�:���/D����g*O�O�7�i����P<�i�ѣGRR��͛w������w�^��yPYY9���^{M$���	___ŹB�\���+�p

���JHH������={����Uhh��وH,���Z�2�S��bmm�^���6'"�|��!1f�ŋ���@ `��2�:��Ȅ	�/^8;;Ѷm��6[�n%"WW׼�<��af���D��/��[���ƌ���j�:�H�Ҍ���'Qxx���)
+��w��`B�o�nii���6g�,��`@(����={��������￯���sm�Y�6m�=ZVV�.ܾ};yxxH$�D���AD���op=��ر���|�M"ڹs'��G�2GGLj����a�]�v��{�n�@���6g����	̍D"�������޽{bb�>�b?�T?.CBB�hݺuk׮%��S�j��aJKKmll�B�P(���e?�u�H%�.]���z���ܱc���
0!�)~�TZ�ۜ1�w:�'0O�=
+��^nn�n+a?�
+k-���n޼������[�V�
+
+
+4Y����dz?N�0A�Q
��;wn��
D�i�&��N���j���z���:t��ܩ���{��
a�8��N�:?~�СCgϞ�ڵ�
]/(kѢE�%��ή�����...��M1�T��o�#
<x׮]D�r�J���R>y
���K��'շ9��;���ѣG��������o�y����6""��Ç˗/��?�q�����N��5�����ޞ=#����,=� 
+q��
{U]MM��6f�NC���RRR���cii�`��1����9u�{
�L&���l׮�P(LHH�v=jmpIQQ�������7�xC�ݩ���]tt��+
0-			D���[������`@(��/d2�o��ּys��G�j�Տ����6m�Q||<�d�ΝDԮ]���"�ף���������p�&�������-[�\	�i�p�������4�w:N�
_��9s�ܿ���!!!�G�����v%�qNN΀
F��.�2eJ@@@ff��l����������={vJJ����\�<
�wu�Y�����	|t���y��eff~��W�|󍕕׉�Լy�5k�|��\
0����
dgg�=LZA��Q```JJ�W_}�r�ʀ����d�q	=O�C��}�x����Y�xqjjj�V�0}����|�Cq��{�8m�x^�����?:���ХK}��2]��x���t0 O�*00��ݻ\'2*�<
o��	t��	�����)**�ʕ+UUU������^��:���x��<�����իWrr�ڵkcbb����?�u"c@����'�
�'��QL5`���#G�=��1O�C��
��	��Z�ڶmۙ3g>|����r�J�L�u�Ƃ�'�!�v�Lm���^C�MII���/����޽{_�t��D���D"!"kkk���IB�����-;���;TAA
ס�퀇������w��xhX�ΝO�<�{��'N���n۶͜�j��<��<�xݠx��ĉ���'M���:�޽{\'2O�C������‚� `�P<
hA1Tyyy�=���몪*�C��퀇$	��@g(�����'''�^���_~���=q�׉�'�!O�O��D�������߿pp��ѣ�����#O�C���(�@g(�t׺u�m۶��ǧ�����FEE��tP(������@���Q�Fݽ{w�…


W�\�:�v0�	xH"�`�'��'`���}����s�~�>����R�Ci
+=O�C���\�S��	�`���N�:}����]�n۶��f3f̸~�������	x�իW(�@g(�I L�>===}�ĉ�tP���Wnp�̙�[�N�0���������z�@(��E�QQQ�Ν����ի��ŋ�{ATWW��B�0;;;,,���.G���'��'��2p�����+V�Y������ɓ˗/��ʒ��2��������\g$B����	��	���Aݸq���cĈ+V�P�6�d�u��mܸ�ۄ��	x	c�@(�]�ΝO�8ѵkW�@P�y��]�p��T
+B���
z�@(��a�����ݓJ���33n�8ng'0|S^^noo�u
+0U(�]~~���|H.�������TVV9�N�
��	��	����_�*))��@����s�����J
�퀇�������N
�
+�@㪨�())iݺ5	�B�62�l˖-�ׯ7z:"����H$���-[��:�*�
̜���Ν;�����/_NJJJLL�q�FUU{_R�DBD�̟?���g���FN��v�7�����\
S��	/999++��MT�޽{��-�ɞ>}�����޿???��d2�ȑ#W�Z%��������������(���ݽ_�~\�0a(�@O��o�ĉ{���:��
+����:�	�x��A��={֪U+���IB�4
+|��L*�������r���'r���	��	�i�D"ޘ���������ښ� `�p��Kaa!��@(��_���P<�>P<
������V03(��_p��	��ˋ/P<�>P<
�<����^�:�0O�#ü|�=O�O�#555nnn\
��	x����D��	��	x�ŋD��v�O�#ϟ?���iѢ�A���x��v�?O��@���ecc���ڷo����'''k��:�I�x���͛�����52DyyJJ�@ ��𨵒����>}��I�`Z�b?y�䣏>�ԩ������]�����ï^�Z�vU�naa������Xk���ߏ���۷�P(�0�ʓ'O:t��u
+0m�y;��������._��v�������h'''�2dHtt�ٳg����%R���'��K������OHH ��C�*��޽{l�w�ʕ;w����4v�7o���(������������h��\������}��񸸸	&(���6pb0/O�>E�zB��.�aF*�\�x�/����9x�����5�j��M���-�U�������;w��񩪪�r��!�Y��͛7[`���<���j|��%%%~~~'N�(((���NOO_�n]@@�&��8�=b���%K�t�����OKK�dm�C�y��S@aaaaaa\�0շI}o����f͚Q\\\��5o�^VV999�d2v�ʕ+�h��ٟ~�)-[��].�J�x999��K$WWW"Z�~=�����j����֖�<x���&G��l���ʀ�>sz�\.���۲e�A����	�0���#""����7�F۶m���Y\\����.9{�,���Dt��9v����KKK���Z�n�xz|||nnn�=�Ν��痟�������^�TYY����!Mb�X�U
O���UTT�oߞ� `�P<
̸q㈨���Ʀ|�N&���LDIII555Tπ'�<ݬY��6x�Ncǎ%�
̜9s�֭���2�Lە�d�Ǐ��k'N4|J0SO�<!"��=�x0�B���|m���ek����ƍ����;wnݺ������wEEŵk׈��?���x���9qℵ���iӈ��wߵ��>y�${*��Z�j�ر������3f����svv����o��G$u���?����X�jU�s����RM���iC�`0r���e�.H�R�$]`` ����]MMMbb�@ P<DD���2�lܸq���D���*��cbb5���������"##ǏߡC���Ҙ���={���j�������ݻ�����y��i�֭---��
����}'...�>��
�>�����ۻ������l���L�T<]�r�իW>>>��pv����D4s�LŪ�3w111�o]g>>>���{��qzz���Ë��-Z��ǧ���ܹsb�xڴiF8����ӧ�ڵ�:�<Os��A"��{b;�N�>}��R�yb����x��)��9������"
+
+
+R�(
+
+"��������k���D���P�-�k�."b�1hЃ����N
&��aܺu��
+�2e��7�VE�ׯ/))���lӦ
������˫�����@y�����w���=^�=N�Fzzz�.]�N
&���d2YQQQbb�W_}շo����!C��?��1ANN)u;��3w���B�Pq:���x�������ǵ�fff
+�����7RZ����K�.I�Ҽ�<vrQ"��1u*..�p��ԩS���ϯ�҂9������B����YtQ��pcǎ���Q}���ʽ,
6PO,������U���7�����6�;w�>|������Æ
;u��Ν;?��
h�֭[�n�R]���f͚��z�lmm���zG<�?F�M�Ç�A��C����bq@@�'�|���x��Ac��N�b<S�=O��
O�Y9���>��j�3w7o����o���laaaoo߽{��>�����={��|=666����g�NII8p`#�s���.�:u��u0y�5�NZ�u3���Ζ-[�}��pLz��0Z�@�U����NAnd��x�
+�'0àxC��vM�)I4���999eee���\
s��'0)))B��G�\
s��	��͛7=<<�����[�n��	��?O`@(��̕��edd�xCA�f.55U.����s��'0s�n�jѢE�v��f���[�nu��s܃��x3w��MxB�欲��ƍ}���:�O`�nܸQSS��	���˗/���k;v�:�O`�._�ܧO�S�Yq�Svvvll,�)�Pvvv۶m�NaJ.]�4w�\�S�YA���ҥK�'O�:�y
+�:��������Ā'0,
�0\g#ٰa�W_}U\\�	o�'���?y����b{{{������'IMM�֭*'��˗/����r�B��#���ݻw�:��\�t�7��:�O<��	x�իW�.]2d�A�ܠx��gϞ�x��x�bMMͰaø��_������/�A�$!!�����Օ� `nP<
�Ejjj�V��b1�A���?�:t(�)��x��;w��	�����ƍ��
�_<z���ˋ�Fr��y�a�f�_<}��}��\�0���ggg���B��555Ϟ=C�����4O����#��P<
O��奥����\
��	��>}JD:t�:�19r�����A#A��O�>���ń7�G�2dni��/<}�����>�H$�N�
+		�:�-O����S���8�|ii��ѣ�f�/dee���s���=���ۮ];����B�����nnn\�0�Ç�5��`�P<
�B~~~˖-�N
�����3220�	�'^����-���9Ҳe�~��q��'�W^^^UU��'��cǎ���[\
s��	��Q�-�и�={v��ٰ�0����C�`���ˉ����� �k�����
���{��a�e0{{��5j���
�A�̡x0l��'0o�������'O�:�?O��y����:@#ڷo_����~�m����C�`�jjj���ښ� Mȓ'O>��N�:Y[[���u��=<<��ի�mA��

+�XXX������$&&�Z����###���+
+9����^��={��;��`�a�������Ǐ�H$���\gin޼XRR����G"[s�.�E ���M�0��f�~̪�Yz��Iǎ�=:b�����C������D$����}��%%%~~~'N�(((���NOO_�n]@@�&Og�a�T��ѣ���3�d��ݺu�������'>�!66���y���\
^@���ۻw�ĉ�r9ON�4��ή������;wVӬ��'�%/_�tss�������d
��2A@@@��ݷl��u��%
+`��/N��<���������D"QXX�@ ���e;؈H.����
+��.�b����4H"2ȭo.^���{�m���Ҳe˖AAA'O���-�@ �ɖ/_ޡCkkkoo���h�6�?

upp����ͫ���?Xӗ��r�ڵ�3grx�
sw��!"����:�
�\��^�x���LD۶mc�lݺ��\]]����\ɼy�����>����}��T*�o[�-�J�'N$���p5i��5e�����������l�����m�*?4~�x>|������\�1�w0�v`q��R�M�6G�-++cn߾��<<<$�D"��� ����׷�����c�*͚5�1c��ǏU���D���cDDDuu����ڈ#�?^\\,�H�������Q@@@�������Ǘ��dff�3���6X�h�o���ٳeee			�ڵ3�⩢����i�ʕ\
1�w�.\�@DϞ=�:�
���ja�ޑcݺuk׮%��S�6�����������w�Ё]�����۷kmKu�t��e�Νj�j�k�O�=z����H$R���Ʀ��N�<�X����p�]�v%�Ç+8p�싧]�vYZZ�x�� �#0`��_�޻w����cǎ\g�;ƨ����}�srr|||lmm�6iii�<
=x���O>9}�tpp���Ǖ���?`���(55��o�ILLܴiӬY��L����={�L�RgK�Bvm����ۏ0�^Dɶ������.**rrrR$d���>���QQ&
��?��,�<��V�DD��ή�����...����ˋ=����ic����v�"��+Wj��Z�.]�0�ܹs���+++�ao��J��m�q�>���?��S�lhT(��{-X~~>�AQDD�Ç�/_��������}���k(**"=zh���t{"믿�"���H///�<:s挶+a{)��Ν�'Uӷu��֭[s����svv���0������k׮���}��w.\خ]�5k֜={����������.]***�J�yyyd/L�ӧ���-..�p��ԩS����O�]pww'�U�V���͙3Gە����ϟ�ܹ���gφ��듪���d�������(1c�f��X,^�n�)@������M�6D�.ٹs'�k׮���<trr�q㆚m��D[[�.4�L�~�Z��V��ӧ�zV�+Q^ȷ�
+�;&��ӹ���'^�����������0`ԨQ�)S�dff~���u>��͛�~��
�>9{{��ݻ��g�o��ٳ�曶������={vJJ����ً�?�|��՝;w����ر�%K6oެ�JZ�ly���1c����;;;Ϟ=��e�V�^����u�\m�o������/���u�HII�ի��ӧ�
�u��<
�Bǎ�9���O?�ԣGTN�	O�������c�S����w�޽`���O�x���O�*n�`�֭[���<m�4��O�x�����WWW?��� �z������?��#kkk��O�x���gw���:��v��QQQQߥ�F��	�\]]۴is��
���a�����	suu�:�fe��=zܺu��z9p��ݻww���u�5�<
�����͛7�N
�;�\���s������\g
^C��~~~0�72 IDAT>,//�:�����w���%K�p��_<X*�^�x���/A}?6�Ltf���:""������R�C��q���K�,	

����#&�
`�_�jժK�.�Ν�:K�~s�FU�[�l���
������۽{w�m@C�y������g�r��4��N�:�)���߉h߾}���?tr����3f����a����G������:::|嵺p�Gǀ+Gϓ��D"�L&�˵:ݩ��߿XX؍70T��<
�H``�\.W��$�J���z�����`gg�xtǎ���NNN��֞���-*))�-�T*��_������jeeպu배�ӧO�-����/�׼@���$�ʕ+������������W�^]SS�h����d˗/�С������wtt�����@��y�t~)դ��!ž�P(T��d4�0�?�0b�TN�T0�'�
z����|H"���)!�˧N������OII	��Z)�?afΜY�'���j�����/C�MTUU
<X��!C$�r{������� �w���/}^J5��{���
�B��'���X�@p��e��������NNN쨔Z������CTTTVVVUUURRRhh(�07n$�6m�������UTT$%%QDD�t�����h���������� >>>((H�m5�^�~�ɩ�<22������lْ������y��f͚ѪU��ۻ����Ǘ��dff�3����A�/��B5���K�&���
R<�z��m۶����6F��	�_?~,N�<��P�=�hÆ
���Ӈ�Ο?����"�Ν;�?j����k/((h�…�6mz����j����R�Sy���EGG+7شi���+�W>�D����A�/��B5���K�&���
R<�X����>;;[M#C��;~~~s��U]nkkKD�����]B����~�YZZ�m��RLLL�С)	~���j����R�Sy���
���)7���%"[[[������r�\�P_0�j�K��RM*m�_<=�������g}
8��	�w����:88(�)4�e\��V_�����$&&�Z�*,,������y���`{cO�����0[���rE㊊
+�׶x���I��!՝mp<D���kݺuYYY�G�(�x������n�������2mܸQ�)�{�&�+W��Y�V_��������u�V�����_�555j6���ۺu�r�-[���i;5+i��A`��͍�222
N�8��B5���K�&���Tw��]��Y
+����7o�0*�Ѡx�3f����Z�f�"rtt\�vmvvvUUUrr2;ʘ-���6n����㊊�������
6��׏}�V�ӠA��oߞ��USS����r�J"����a[
�W�_ø��Ѯ]��ϸ��;`�E�[�n�����ˋ��vrr"�
�vS��0�СC�h̘1������G�qwwW^�����T�J}`՝mp���#G����2����O|���V��D"6l�`�?��C�
�*��\Ϝ9stۖ����kƌ
n���jРA�kT\�X���s�;V�!�L

�^���jR���	
wA�!b���;zB��S�z�?~|���d���~~~666�������V<z��鰰�6m�XZZ������|���7o�d��K����<k�,�&�b��������T*�m[
�W�_������k߾�����jkm���*22�]�������ʕ+�g|�s�<[�l�ڵ��������%K�Ri���/�_J5���sg܅:�%�H�w�>r����p{�:v�XHH��˗�x�
����ҥKW�^}�Νv��q��(���o߾b��ȑ#\
�?����ٳ�?����s��n(�����á��׮]�ի�Y���	|����˗-,,��P7O��0L�>}�����W+@cؼy�y�^��N��4	���6mJLLd/_��˗/-Z�`�TN�ġ�	��>��m۶ݿ��Ņ�,�kS�N�|�rjj*{�&�ߕ��x{{�3��_�:�י3g�z��;��,
@�;eʔcǎ����\g
>***���ػw/�Y��	���̙�w�ޔ�����s���a����{���7�
h�P<
QUUU߾}�5k���D"������_��ŋ1_+�
+\mDD666�v��~��ҥK��<r�ҥ����_��*'0!�y���믿Ο?��ѣAAA\g
�WTTԷo_WWׄ��w�	A�3k֬�{�^�x�{��\g
s&�H���>|x���m�r@(��od2Yhh����/]��۲B#���'O>}�tbbb�nݸ��OP[YY����Ribb"�~����O?�8q"00��,ZÀq����q������S�L����:���7�Z�***
+��(OP�N�:9r$999,,L"�p���͛�Ν��7�̝;��,:�i;��͛7����:t��Ɔ�8`�~����X�"""��,�C���������ׯ_7n���������RN�A���Յl���	L�'P���?>>>))),,�իW���ƍ���9�Mӎ;�RYY��p�ڵ.��o-Z�U0CA�
�ׯ_RRҭ[���훙��.�1cFAA�Ν;����m<hR�<y��Gݿ��/�`�0�`���K�._���x�1O��gϞ�9277�ȑ#III���r���������:t��u@�^MMM@@��;w�R)�ٳgԨQӦM;q�Ď;Ə�u@�@�����=z�ÇKKKkjj؅"��W�^III���}�������e2	{{�Ν;ggg>|�o߾\�0O�����/^�],�%K�|���Ν;wnȐ!��)"������
�1O��e˖=�\�r""�L�������\�Ε��N�6M (/�J����'O��*@#A�h��ѣ�G���C��¢M�6iii�����{�����w��\e"��ʕ+={�4~*�F��'�Haa�̙3�{T&����|���ƌMġC��m�Vg�DD�L�2����ȩ�'�����5k�0�P(�sl�L&[�~���Ǎ�
8��ŋ3f�:a�`aa!
+���׭[g�`���@yyyǏ�����?���E"���'�@ЬY�{��jՊÐ`4r�|РAW�^���dmm]]]���8v��1c����p��P<
�.*++�=���%��H*�
+��#F9r��`k֬Y�h;��w���oĈ�F��ׯ&����	��dgg'%%q��o���SRRnܸq��}�{t���Ç�:4�������Z1�S׮]{��իW�6m�pM_�&M�:4i(�LLll��ɓ�N
`���ꉸ�h����hт� �X=zTZZڳg�����(�q�@��'P9�7OOO�#pSh
��P<
h
��P<
h
��P<
h
��P<
h
��P<
h
��P<
�@ �KX666���}���?~rr�&O��A�4�0̾}�Ǝ۪U++++��ݻϛ7�ҥK�����/���>ψ#���1��`ʁE"Q�֭'N�x��um�Q����OOO�T���Vc�a���BBB^{�5++��^{m�ȑ{��a��#���رcϟ?__3
��&�K�{]k��ɓA```�ݑ��o���@ x�wԬ�0){��������W�)ZTT���u�_�Ϝ�����`
Wr��]�Ciii���D�������|v��G����ܹsZ���6�GU=�7mڤ�\yIYY�ȑ#���#����S�Px��Q} K�ץ����0??��͍�~��G��k֬!�V�Z)�� �/0{�
01�Z<���J�/^��/lll�hȐ!r�\��\��ƌCD-Z�����������W�^ݽ{wÆ
�������/� "kkk"������Vc7ndnذ��'�����7n������G���&�"�:H$51&L�@DNNN?��Sff�D"��ʊ��jѢM�0�����թ��o��6�6���4|]�k�����Ddccs��=v�ݻw٣Z����'�~EL��'e)))͚5#����k�@��ǏQ���_�jH$WWW"Z�~=������:�DGG����مÆ
#���M�FVV��٩i�J���ɪ|||���_�o�N�""{{����ZkHMM���'�ӧO�I�����%�[��2ڼ.
�u�͜9���x�
�TZSS@D�f�R�6M�xM�W���xb����7�?^��6P����?h�x߾}DԣG�a����H�<EEEVVV/_�|�򥅅���Uqq��'����ɪv��MD���UUUunb�ԩD�x��:W�x�b"�6m���l�$�U���
d�y]��:*))i߾=-[�l�ҥDԡC���R5k��'��@ƍGDW�^5�����v�y�f"�5k��_v�*''���~[&��۷o�޽2�,88�y����/�Hnݺ����Q�޽��ut;�'N������ڸqc�
����(,,��G�3z�
W�H$iiil�N���,��毋n�5k-�.]�l�2�@���h�Mԋ��
�c�����J"���դ�r�?s��+���
���ζ�����f�X[[�����:�nǎD��o�Ν;�ܝ:��<`���GU=Ūv��ED�[�f�O�M�?tu�������s�}]���,X��m�������@�4@.�s�^���2�lܸq���D���*��qj3f�������/\�`kk�KW������m„	III�6Tr����ɓ�v���ٳ_��Pa����+V�lٲ�G5<�ھ.:���d��b�
+î@
OЀ'O������O��/6M���k�)��~��f�L�=CS�G�)���r�ȑ#�/�J�?�w��:��鼏:U�P��w�Qdd$ۓ������������V�Z�Z��~��ق���CBB�?^�49�:�.:�����#@�
8x� �W3G�~��U#!!!##�����S5QFFFBBB�Ϛ<yr��pB����;�xyy�|�rݺu�b;X[��m��U�VQQQ!!!����~�m}[o�����C���e�1O7o�d/�߻wo��5o�;U���Szz��f�e��:uj�y^�zeooooo��ի��j�_�6uU�V�m�6"�ŵ��8q��t�� ==]$�D"僯�
��u�d�un�9�yM�W��g����‹/~���N������?���_�����޽{�I2���lll��Ǐk=733S(���(��V��8�S�GU��I�ROOOEE��r�رDԢE������,�D������?78I�œ9s�(,,LÝU~Ԁ��&
4l�9O�	����ߞe�رuޞ�N6hP��gY�v-)M�X�[o�EDk׮�o59�j��jڨUM6��Dy�����Rv�pU���uޞ�ֶrrrlmm�իW59 ʏ��9�����i�hc��6+++�X��'�$&&<x������;7z�h777�Hdoo���;o�<v�"v� �!��>��2��Bz2�Q�6mZ�N�T�;::?~|������..."����%88x���ǎS?F�պu�0��C�T&���@���hl����'O�;�1���@��D\�j���8 �=OZ@��Rj�

0-�y��'-�x��'-�x��'-�x��'-�x��'-�x��'-�x012�����G�q
L�u�Hff��9r��y"����:h��o�]�x�����7���Ӳ��.]�p�u����u0
�a��uc�ƍG�=z��k׬���
���i�&��
�3|3�z(���Tz�̙�{�=z�������!!!�F�:t���-��@�g�޴i�̙37o��I����WVVZXX�d��͛>�]�v�D0(��
+�L�����8p���0  `�ر!!!=z��:袲�����իW���yyyB!7cL���&M������B(��Դl�rȐ!o��VHHH�6m8�`�P<
pL"��8q"..����eeeC�}��F�)���z����5k�\.'����4��$�����^SSSk����T*����F�3f�믿�IBӂ�	�3iii[�lٵk�˗/���&O�<i�$OOO�s�a����ʕ+r������O?]�f
WI�������>}*�J�4;p�@hh��R
�.O�VTT�k׮���k׮yxxL�>��w��ڵ+׹���߿������M�6����{�n�^�����|���r���
@C��	�H$I\\�[o����dɒ���_�v-##c��Ũ��OLL��
999�o��0O�n�֮][�C"��U�VQQQF�`�P<
4����իW{yy���;�DGG?~�8**
+�K�UMM�ƍ��YZZ8p��HD��N�:U$�=��L&۹s���='�LN�
4�{������϶m۬���̙3o�<\��

�����㓖��U$���'�Hdii���oo޼��ٙ�x�=O�'�J�m�ֻw�nݺ���DGG?�|Ŋ��xb�ƍ�޹s���ǜ�Qpppسg�@ `�D;v���?�ܹ���}��qn�
�
+O��0���{��9c��X|��񤤤�'ZYYq
�����ǏW��M$>|��H�^��e˖��N���͛7�������AAA!!!������M�'�9~��o�1~�xoo����?��#88X�W>������|��r�޽{��G�W_}5t�P"��/HD���۷o���ٲe������/�34i(� ..���/$$����Ν;���>>>\�nlذ����ryrrraa��#�"
+cccǏ���[y���ӯ]�&�J{��k�.��
4}(�����1bĈI�&999�;w.66Vyv����d�nv8����������L&;z�(��Z�h�<��K�.���3f�x��w�O����+N�
4q��@G555?���ҥK۶m��O?�1��D��'O�<z���������6oޜ��3c��TZYYYUU0a��c6����3g�tqq���������д�x�ř3g�Ν��ŋ�˗��'�s���ٳ�>}z��I���"##cʔ)w�����gΜ�u�&���SQQԡC�7n����r��TUU���r�BG;vLJJ���/�̙ZRR�u"����RSSv�ڵ}��S�Nu�ܙ�DФUVV���p�Bw�/>|���
����
4	(�4��ػϸ&��
��$�Л(���(���
+l�`���]{Y+��+vQY
+��*���b
WQ�Ul�`Y� BBHy?�{s�!�B&���3g�<3�<�s��؞={ZXX���L�0��p�`��j�<�=zdll���q��a��A�z�<!�8>��bŊ��йs禥����QR��<
���mzz�…�O�>e��EuDQ	�j �.�;eʔ���C��Y$���c�����DDD���̝;��� >>�M�6T�5��	!i���&L�p�ܹ��̜��4��Ih�ԩ����߿�����ʢ:����B
?��Cjjjjj�A����K��{��<�ٳg�>}6m�Du8Q�'��v���Ǐ�:u��ۛ�X�Z���	���ׯ_�jժI�&�(�m0yBH������922ۜP���TR~����������y��RL���͛7�&M�8q�ܹs���1Mmy6l؍7>}�Իw��AHI0yBH�Ǜ<yr�֭���Ku,H����2���{����c߾}ϝ;Gu8)&O�������8t萑�ձ�,� ��:
+�%4��diiy������#F�]��LE�yB�JJJV�\9o޼>}�P�~�ɥ�7���V hC�t:}׮]nnn�����iLL��7�!m�-O�êU����~��g�Q�@�U�a���U��� IDAT9�̙3ϟ?���SB-�'��'777&&��611�:����IKZ�������Ҋ�����!M��B��nݺ�]�����m�r�������FFF�������.��i�&�-[����	�%��x�������3��.]���Ĉ�_�2p��1___333&����VYY�h��QM��-�3(�Z�#�b�X,�����ё�r
+
+
+F�adddii9gΜ���h%ت�QJ-\.��_�ի������n۶mCBB�^�*���N;�'�����?�Lf�^��ݻGu8�
BH ���p��Y�����O�{��f��۷�����s8�prK��]���U4Z���O�0�~E������҃����YQ�RYf�����^Nii���ˣF��V,x�����v��4����_���#y�,k̘1L&�ĉTǂ��a���5jT�=�|����[����Qdddaa!�����1b�@ ���33�Ç:t���ۼy3y8��ۮ]������ʷo�
@�޽�U4Z����`kk_RRRSS���������҃4�g�mWԵ4T���mJJJUU�,�:t�q�FUUUZZZ����M�����֮][TT��p��ʒ�������4�ݿ�={֜��5.�;o�<� """��!E��	!�@ x��5�NOHH���{��p��������
 &&Ftctt4xxx����������^�ccc�F����n޼)Z�˗/
�S�N҃Ȗ<)�Z������-�^����;wN��̙3�&O2����hѢ����ϟ7t�������o�6�$`�Ν4m�…<��XRL�����:p����ȧ������"������n$2���'%��Y,���ϗ�H)C����t:�N��h4�p����@��IQ��P-����-�^���O�>	)//�7yj��;w���ۃ����[�M�ݵkפ��h�Ç3��������XR0����C��������Bt�pCC������x<��'��]���C�k����\��B.��<Lb��6Z��������ܹ�y�搐##�K�.���2�(-���!���gϞMHH3fLmm-�� �\�<!.\���SCÇ;w�gϞ����ٙ<\t����G)���+dggK�Hz���<���J�Bi�2\���ܺuKxHzz��I���
�����-��e�ttt����/_������CHMM%w�rӤ�ڧ�$
+�y��;w,�X%Bj���W������6�w۶m`ll�gϞ��"6����):`���<..������$&&����
�;���F�>|lll<XPPPSS�f����8ЫW/�A
++++8~��h��X�����h�rd0>`�
+
+z����ϟϟ?߮];�nZ�>}�=ZXXXWWW\\�i�&000�~�dw��1�����<yҮ]�=z�GRG�<!mWUUe``�o߾�
+p8��J�Ã�fK\���ח\�C���I ,X�@ʟ@R�S�N��]�gE]K}H�Y�*k$�9d�E���3gJ�i����622��(���͛Ν;w���͛7TǂPa�]||<�N��ე2g˖-���zzz���������lvDD�K__���}ӦM�lC���I \�z5$$��֖�`��뻺�.Y�����YQQ1gΜ:0�ӊU��k����/�իWAAA���3f̨����Ç���0�v�ڭ[�N��&c-���ӧOwpp`0���������>4��M�ݞ={Z�n-�Q��ݻwnnn���TǂPS\�
+i����/^�
�A*H�7޶m[dd�۷o�D�����6^�v��ɉ�p�G�.55U���5�����
���HKKsrr���y���� $L��V����������i���ZL��044LNN�޽����ݻw�!9`�Zzz������'Ձ 
�b�p�'����{�������PB���	i����o��FGG��@P��q�TG!6��-O�"W���
+�w��� $L��V���?��	�L�dd``p�ܹ�={<���T��P�0yBګ���ɓ'_�5Ձ ��f���NFzzzgϞ��������'��0yB�+//���yxxP�L���\Fbbb�^����?~Lu8I���^���zzz���T�4v��KWW711�k׮x��	�� � L���z�Ⅳ�#����"�ۮ	���:t�������+��AH2��@��������J�� rvlm��7
��������������T����<!����k��@�������ի</00����T���8L���z��-�Q ���Ss�m�6==���dȐ!555T���?`������c�6m�i,�k&;;��/>{�l���\.��p�L���*++���Sf�TSS3k�,KKKcc�#G�~��_�ND�6mX,�h���Z;;;� �]�&�l��m$�X���رc���fffL&���),,���R�,k����ֲ��~���ɓ'���1�V�Z��������d�'-��`�S󹺺���\�~}�ܹTǂ�
BZ�|�ѣGJ��|��5J��gggWVV&���
`�֭���ڵ�����S�F��6Z���O�0������kee��F���G���D���D�m��(6�bff��~%W�����utt���SB��'�����
���@	u���:t�q�FUUUZZZ���
 ,,L \�x����|�B�g��m۶�ӧOK?����m����
���6>>������&##������E�`kk���RUU��M�p��Ŋ�
+�STT�c�I�'����������)�^��w�^� bbb�!��'��Ȯ���R%�E~��;wN��̙3ХK�Wr}����W���K�.|>_�9�ol�^�z��	7o����˗ЩS'�3HI����իÇ����M����~O���A�<y���5ҿ��/]]ݴ�4�A�'��Ξ=l6[	u���>}n)//�����U�VUUU,�lb���m���76Z��@���t:�F��h�
UC����2���'N44瓰��{���Z���ٳg)�]SM�2���X9��I�Ƒ�b���d2� ((��ݽ��,22����߿o߾��1=Bd� <$6���ȓ�x<�����&rW]]�hIsss����O?	�ٳg���X,�@����2��I�Ŧ(�gW���hOOϠ� �<Q�'���|��f�u�����tN�IĚ5k`۶m�l�2�!�l��� �d���e�Wz
WWW��Ζ���W� �-""��ٙ|��C���I�Ŧ(d�O�)��HHH`0Æ
�ɟ�Z�=!�w��1a�NK#�kRn�ץK�d�֭kjj��s��
����ϟ?�?�]�vbo�F�^����`ccs��������6�������^�z��A��@�����V�*++���S||<���J�=Qll-�LJ�Ps<y����<$$���Q�R�<!-u��&�����o�#G���":e��ѣ����7z�.��!4m�4�ɓ�z-�`�	r��Ҵ�i���bg�2e��SI�'
+��%<~�rss�
+@�������
6P�R�<!-u��q�����o�/_�L�>������088�իWbŲ�����Xt��vqqa0�ڵ[�n�p
+f��%��W�������2}}}WW�%K�<x�@����g.��e˖N�:1�LGG�u��	*�uO[K�w�<���4����i4�ŋ�i#B��R�3gΌ5���HZ�LӦM���Y�t�֭[r�����-@9���������),,����:���?��������]���#-E�䭭��:�����디�}Cj}Oȇ�i��g��Q�F}����X�v��	i)�[�|$�rA888v�ڕ�pT���|�N	���N�:UVV6u�TUn@E��'��,,,�����@�������?��"��=��I9ڷo�ĉ����۷S�"�^f!aii	����;w�:��u��iU��uU�M,��`��t��|X�v�ʕ+���[��AZ
[������$�����@�fb����4�V�����0a§O���iL������511��	�6���ŕ� �#G��h��'�{�%R�<!�eii��j!,[�������ѣ����w�:��0yBګu�֥��TG�4v�)_�޽׬Y���Cu,H�a�W�֭��	����Z�S�������cǎ����:��0yB�����ÇTG�4v�Q�F�EGG/_���X�&��	i/''�/^P�L�mGGGǽ{��߿����)
+&OH{999��$�H�`�D�	&L�0a������Tǂ4&OH{999���ׯ_S�@,�<Qh׮]�h�"�A�	�'��:v�H�ܡ��-O�jժ�����=z���cA�'��������1yB-
�'�}��w�����;�p�<!�����������+W�lذ!88�ĉT�4
�0�
+v�����,YBu H����H���=x� ;;�������QQQ��N��x�Y�fQ�8U�*hժ�Ν;'L�0y��R��<!���̟?�ѣG�N���r�]<(
i�S�Ǐ?~�����>|���Ku8HC`��._}���ϟɄ���	3'A����D�4&O�#**���hӦMT�4&OH�0�Ç7���SA
+��v��]�v�V�ڸqcAA
ձ 
���:>>>�'Of0�wa�RlyR)K�.�С��ŋ�iL��6ھ}�����F:�޹sgJ�A���S)����w�>{����穎iL��6jժ�ƍ	�ݨ���-OHQ��N�4($$dѢE�"j>L����5kV�=tt���)�����H!�|>����I�lٲ����QQQT��&OHK�h���|���-OH!ȶ
�S5���K�.]�~=�9��	�'������~�At�8&OH!��	[�Tвe��t��͛��7L��V���022"?���v��Q��<�,SSӕ+WFFFQRc�<!�fnn.9nee%:
+�&c�X�ɓ��7o��������1L����9s���'899Q�8�I�����������~��)ձ u�g+[fffaa!�Q�9r�ݻw�tz||<ձ��j׮]�^���
��T�ԩS�o�������ɓTǂ���:���3�ԩSTG���
+		IHH�6�۷o��ӧ����֖�HPCN�<9a„��ܮ]�RR?�mG���
R1���.]�:
+�\!!!T��
��N�;�[�nk׮�:��0yB���|Ȑ!TG�4v۩>� ֬Ys�ԩ��\�cA��'�R0��'� �BR�=����_~�:�~0yB!c�X���4~��4� V�Z���Gu,H��{!���f�'�0v�خ]�FDDPR3�<!�����l�h4ڊ+N�8���Ou,H�`�B
+�b�����b�,X`mm-�����ۓ'O���c0�Z����KMM=y ��[�~���=���ҥKLL�h����#FYZZΙ3���F,��i�&�-[���Չ���˗��PSS�6m�DFF@yy��I����---W�^-�:�M����r###===���|}}����ǎ���533c2�NNNaaa�������^�zYYY���m�6$$��ի�wI4~�x'''���C���Z'$$�*@�����kݺu�;w�7�=z��Gn��b� ����g 7N�6M�X||<Y������NtרQ�D�`��}���_Q���9�h-#G�-p���o��Ftˑ#G�\��k�p8~~~��H����'L�P���kee�@ �g��J�Ր��X:����/�4�Z��B
+&6�)+++%%���J��T#  ��ŋ���hǎ�`Æ
b�r�Jrrree�۷o���`׮]�͛7u���ƍUUUiii����;w�y󦙙��Ç������:dbb����s�Nђ>����;w.L�2���nٿ����~-�v�JMM522���,,,d��#F����СCǏ������/))���������z��1�Dt��	X�vmQQ��)++KNN&S1)�2i�$GG�M�6I)��?P��i��!��"�ŋ������J�O�+p����Ç��؈�E���',@nIMMny���������s�Μ9#�����111��FGG����h-�����߿�����J��J���ݻ���(eWϞ=
��͛�_�|	�:u^���ߢE�����?.,&e��b0/_���0B�<)��|�#��T��5g�___�����rѽ'N�hh6&a�W�%����E�0�L��铰@yy�h
r�UII�h�������/Z���BlA
]i��B���?V�.���t:�F��h4a-C ܹs���^�:����[�.)8���Ì3�C���v!�`b�v���{��'�@0{����|2=�����>��r�_�y�hb[
��Z�B����x<�������
����ϟ?�s���͛CBB���.]���?J�%��X�bEll��ׯ�?�x�<!���	�����~���pvv&�]�vM�*�֭[�-������
�…�ϟ?�;w����4z-d]gϞ���]������-�~�����������>|§���"44���G>!Y`�B
+&}��v��
��͛���+**fΜ)o���������ƍb�+��j�-:r�Hiiiiiill�%K����k�<y2,Y�$**�ݻw���YYY��}Rv�Ճ�����_�~�b�jkk�={v��Aooo�۷�cNJ���\nIIɩS�࿫�H�%��;t�Л7ou��RV� �*2&C!꿄D_ZL&�u��={��?~FF�,�K,���-9�!''Gt�p�_rH�����
���^�$�z��o��FJ��F+W�3g�ttt������wss[�p�؟���<�F����}��h�����˗��W������;v�;w�۷oe�J]������?44T���|���b/�)S����x��FY�*�ӧO����ommmC�ȲE�k�p8��^��K ,X���.a
��gΜ)}W��l���ݼy�d)��&Oʦ"�
+���D#F��*�p��o�ӳQ���@>8M���322� ���b��m�`ڴi�g�믿�5���I�R��=윜SS�F����q��)�e���>|�h`�BE�_����;w���9��ݲeK�N��L����u�W
+�H<Pl�W����

-,,f̘Q]]-V��fGDD��������뻻�oڴI�9I�E�-�^��ٲe��������!A)��իWCBBlmm�������%K<x 233�O�����`0,--��������r��Ů]��LfQQ���v��I�T��]!��r�ܲ��۷o/]�����߿?9��=�\�9AAA�-YYYЩS'777���Æ
��G���a�ҥ�����/�+¦?`�pww�|�rYYYmmm~~~TT���������/^��ݺu��ѣ�֭[srr���+++ϟ?O���߿��q�,y���sɒ%TG����b������T�T&Oʦ"�
+!��999&&&����ha�HWXXfff<��B�1c����
��&�s�\2�w��	�p8VVV�w�^��������<��ֳgϤ�����tuu���?���5�����w�j�*��@M�c�===�O����q�������+�R;;;''������rˍ7��׷_�~ �tҽ{�>����ܶm[��������ݻw�={���{ii�s�Z:f�v���S��[ZZJ)ӵkWh��5.��f̘all�{�n�A��'�$�C4w��Uf�������4��xw��
___rͯ��r|Y��2:t�L�>]�/��E���ϴi����rssy<��'��xd�ژ1c��<y�$��ѣ��"ɤOU�T����ҥKw��]ZZJu,HEa򄔄^ӄ#B�M��߿����N�:�tQ� IDATm���ʪK�.555�r`ׯ_&�{�����L&s�ĉ0i�$&����Jv��͛7��%&&f�ԩ������2N�G�GG�K�.����J����K�.%bժU
+��&�DjgΜ9������+Ձ ��R���D�C�n��r�d'���/�K�sWWWw��� �� &&���9���,,,F����ccc[4`##����������Q�F�����966�G����r����*))��䦾Ǐ<���rŊ�{�VD����Nݙ��̛7/22R!�#̓�R���u���(q�������t�ҥ���޽{d�D�L �<eggWWW�������cbb`ڴi�S�=w������d�����቉�����
���k�@��)//OOO����8qb�����̾}�~��a�̙6lh���j�m�
-Z��pȥ���R���$���Rr�d��իWɅ,��K�w�ܹr�
+���.--�\����O�Q����^�";
������ѣ�υ8enn޷o��Ǐ��r)))�
*//�5k־}�Zn�4�������0yRw�Z��>}��m�8ձ ���R���_��}����&���{�VVV:99��ڒ�mll������șDG�K��a�b>}�Rg�Nt�Vll�#jjj�Ν�w�^̜Z��y�˖-+..&�zAH&O���x�O�>ݹsg����~���ϟ���/\ABi|}}	�x���4;�Ȟ���b�&�Ϋ��8}�4Ab}�o߾��h�O����h�h=<<"""���>}�D�̕��D޴�={�~����[�n�K������l���r.\��S!�'ly�vvv�&MڸqczE���B
Q�I���KH�+-88X��,R^��z�v�֍<�رc�ۏ;Fn�ꫯ�����
�x�����={�Rn�,�^33����K9yC���ߺuKz())�7Tդ
+�/��OlaA�a��aaa���:::2��^NM{�j��O��h���x�A�[�PK��յ�����7oޝ;w������(�D8�Ib��s��+':T\�^^���=x�`���>>>t:��а[�n�/~��\�1���999͘1#''�S2j��~���͛7�~����R���ܹ��ѣ7l� h�'E�!��d䤅			T��R��W^^^�n�?~LN�d;v|��Ubb�a�tuu�p�?��>|أG�.���SR��B�D혧7o��ȑ#��9���w�>dȐ�7RR!�<!u%q�qy� W2u�ɋ\�P���*"�6�h4����ۓ'O���c0�Z����KMM����J�H��b�,X`mmM�";v�����̌�d:99���UVV*�z�i�ʕ7o�$�wB��N�T�[A3H�6T󅭎1�Ux]�r��ϯ���\�Yi$������̙3�B�P��N��Rʌ=:11QX�@ �4i9٘(WW׌��&]%e���cff���Lu H%`�RW���::��1f$/���D_E�/�����/VTTp8����;v���Y>+++%%������СCǏ������/))���������z���/�����[ڊ+RRRrrr��L�BH�X,A�3��ҥK��W;;�ŋ��K%�b��݁��FFF���&�����1c,--���{��u��	8}���koiC��ѣǖ-[��L�BH��l�����b;y��������?~�(:y
�<�XbS���Y���utt�t:�N��h;v���t�v�/_���s�A���	!���f���,?���@ �={v~~>��_�|����<�#���E���x<�����“������3f����mۨQ�'�R$6��:}v/_����ggg2�k׮�ukkk�g[��kT���@vv�ƌ���/>r�HII	ձ �a�B��b�T'yj׮l޼������"!!a�̙r����sѢE���UUU)))?���,Ν;������_�~�b�jkk�={v��Aooo�/E%L�6��Ԕ\�	i3L�BH�T�ێL�~��V�Z����;vȐ!r�aٲep�ܹ��ۛ��6�\�Q���,����3���:w�<s�����&\�*`2��g�޻woC}�HK`�B��R�vK�,ٲeK�N��L����u��]�1  ����...�]�v�֭;p�����ڵ��ի!!!���C__���uɒ%<��RT�ܹs�|�r��Q�AT�I2�M&�CHS���k�����GFF�1�5s�����'O��h����?!�I�Z�PKX�t�/.^�Hu �2�<!��"�X,��ZB�Ν��c��A���	!�	[����ŋ�]��փ�Ps`�B��ɓ6<xp���w��Iu ��<!��"��T��,\�������Ձ 
+�P�6***����:
+�4PQQ����1��$���L�8q���QQQ�ׯ�:�l�<Q ++kܸqTG��f
+		�6��L&sΜ9���+W�444�:�T�m�l			WzB����N�6�N����Q���|5L��ǜ9sX,V\\Ձ e��	!e���Z�f�ԩSqUv͆�vڣu�֓'O޹s'�ϧ:�T�<!�<k׮ݸq�e�V�XAu,��`˓VY�d�˗/ϟ?Ou H�p�BJnbb2�����]�vAuDH��i;�ҹsg�;vQRL�R�9s����r8��{���X[����ŋ|��]///�cAJ���Q`ҤI���[LL̤I����)�y�6tuu���_�)&OQc�رIIIIII�F�b��T�����r�\��*A,X��ĉ���Tǂ��'�(x�ҥ�7o~���p��y0�<i�)S��߿��@��`�����{�ڵG�TVVRj.L������ԩS�����r��)&OQ���3==�իW�fu�b��'�4w��w��%''SRL���������KJJ������;��AMG�<�'-ԱcG??���(�Aʀ�B*�s�ηn��r�}��y����&�n;m6o޼k׮���Qjq�<!�*:t�p��M##����?{���pPS`��6ttt�a���'�T���Mzzz�6m������C��Ar�n;mF��~�ᇣG�VWWSjY�<!�Z���/_�ܩS����geeQ�v�i��ӧ�X��'ORjY�<!�rLMM/\�������Iu8H�<i9++�ѣG�۷��@P���	!Udll|���o��v������T��d�b��`2�T�(3cƌ�w����PjA�<!��������'L�x��a��A2a��L&� �A����uvv���f��	!�E����߿f͚~�a۶mT���f�q���#b���G�����:�R0yBH��v�ڝ;w����X���pP#X,xB��}MMMbb"Ձ����Bj`�…qqq۷o�;w.�ϧ:� 6����������:�Rt�!$�I�&����7���"..��`P���)44tذa/^�prr�:�x���>|��K�.\������A`�"
2���.66��@P���	!uҷo�۷o?}�t���eeeT���a�Ht:}�ԩ111<��X��a򄐚qss�z�����KJJ��v�!�)S�|������T��'�ԏ��˝;w���{��]PP@u8��i;$������Gu H�0yBH-�k�.;;�������Ν;T���v�!Q����ӧ+++�Y)!BGG���&88��͛M+&���۴i���kddԭ[�9s�4��
+�����C�Z[[���Z[[�<yR H��ɉ����޴�M'@��������$''S�����'RR����Rf���i4ZJJ���>����߄�A����%�	����pttt��M+�d�<!���|�ҥK�t��}���	��?PR!�Ǐ�ׯ�2kMjkksss�^^^�
+
+ss�[�>�����������:p������d<p���`ff�s�ηo�r8������Hsss=zt��
��ޞ��H�yK6&Oi��;wNu ڮO�>��ϧ:
+�B���i4ڛ7o�Vc��ݻw���'W��/����'O�
+@��\�������b�rss



��իb
�����ߊ
%O��l2�&���ccc�o�>m�4�n~�L8�	�����������-I��a�X,������			!���M����wss#bܸq�Fbdd$W1r�{xx����\�x`LL,_����Ml������˅eD��_��
6���JC��M��!�
+RSS�����������EKu���_���Q ղ`�ww�F��_�dO��Ǐp�����XYY���H?��h��ɓ�*֡C���I����
 //O����\ptt���u��v��]�B�-�d�<!�Q���[�nݳg���b�c�FNNN�ׯ�:
+�Zn߾-%K"��mmmSRR�c��=
+���888��ӧ=�__���R���m�,K���@��jjj@___,`�@p��qh۶-ylCɓ,%����(^^^���eee���{��
��h�C�y{{w��!>>^�»w���M�4i�С<p�@AA��	F�)W���7nlժ�B�Qnܸq...�߿߷o��J�M!)BH��y�k׮�۷�?�(KK˨�(��@*gٲe;v�^��R.//�^TTdjjjcccccӦM���2Y�C��������������*���v��ǎkk�����Ɍ�%�[��@�۷�u떽�}�>}pue�ƑD�ƍ{������-I>�/�����ʊ�`��Դn�Z�qߤ6m�DFF:���|���r�ի$%%�^�\��%�%��e�?~������%��K�G!)BH���͚5�N�c[������~���(�*�ԩSXX��
})/X����6n�˗/�^Q���������������^��q���L�(Y�x��˗
���H��
+��9r,--�_��%��'�49�…y<ձh8��
�EZkŊ|>���گ\�B�V���X,V���i4ZZZ���$�g�̙"W1r�K��۷�|�������<y�D�I2=088���###9NQQѮ]��L�)����:99Il	��d�a�拋����
		iƒ3����`�̙���������nnn.���-�Ї)�F����޾}[�LNN���˿��+CCC]]ݎ;Ν;��۷�����g�p�Bs.i�{��
��{�*P�u[^^nkk���~��7h߾��O�d?�@ x��>Aw�ޕ�XK/����gr~�����%.�"�%66V��IJ�&��	!�p��5333ooo)�è���SS�F?��"� �S�NI/cnn���C�+..��ׯ7�J�Frtt\�jUC{�nǏ>>>�-|>������;��C
+�A��U���'$$>���FGG������mΜ9���R�U��|��'���[�n���Ӻuk�'N�o��p]]]ǎe�h�d�a򄐶����С���ӳgϨ������/_.++�����Ϗ����hW�-\.�ŋ�F��nݺ	����c�֭999��Օ���ϟ'���߿���sC4������ŋ�v�JuH
Ao!�4χ���ݻ��dOOO�Ñ���
��z��Y�N��#D?��o���mlltuu�,ݐ��ݳgO}}}r��F={��s��999��G�&==�����ӧ�;w�:�,8U
BZ�M�6��鞞�������ʬZ!�v��HY,�B�
�p$�ڵ+4�QX����5�w�ޭ[�n���H�`�v144LLL		=z��Ç�\��ɓ���S\\��񢢢,,,?~L���cǎ=~���ʪ�Y�gs|||�M�������䍁��̟?ƌ#��ɓ'
�G�2����0yB
���Æ
��IP�m�������CDXX�r�0 ?p��nWUU�?	���L�:����~]���266���m����<SSS� nݺ%�5޸q>~�(cy������(,,�:�,�<!��
���***Z�.2e��
:������&Lh�Tyyy�F�"�w33�G���U�v1�;wnhB˼��6m��ʕ+e��K�.
�n&R__�|���?p�Ձ�f��	!����cgg���&�x�pd���u�����4�����_��������t���;gFF���̜9Sʔ���9s�l�\���ͰaÂ����5�yBH�yxxdee���zzz޼y���S�]���L��ݺuK�0���{��qشi�讔��A����Ϛ5k߾}�r��l��d2e?i!��W�Jy��>L��v���������~~~d"�L���ϟ?_�~�ʕ+=z�f�y����'��4r),,�;bĈ����s��ݻW��	�l6�G�
+�����Ƞ:�t�<!�����̙3�-����W�X!�;��]�zuϞ=nnn�&MZ�hQ����m�F�����#"""++�ӧO\.���$))���gϞ��[QQq�֭	&���;�q˖-���\.w�…QQQ�fN���������39B�+��
B*d���c̘1555�=s��&����瘙��������Ё���‡�|Nʸ�����۶m+�=AZk�…���J�H�eL�ӭ�������ӥk(I��m%V���:u*((��Ɔ�`��̞=���_�I$�ME�bL!
+����������Ç
+<m��&������իW���XXX��tCC�nݺ-^�Xl��F?�������f̘���ӆʈ�1y��_e)��܅�(**j�$��i4ZJJJ����G���$��
+�RNR�l��gA���~PP�������q	���?�ILL��ˣ:��X,�����ݻ�M�֢�.L��p�={�lٲ˗/{yyeggK,&˩d?*88�ܹs���W�n߾=��}����۷ccc�ܹ�h-�	�'������F���ɉ��#�F���_�v��?��:��������;֢���E޿okk���'��Q%O�.]
+055���rqqiZ��	�#�$����x�b@@�رc7o�Lu8�
�#�
0����T�.� M���2fNj�'��d���������5k�^YYIuD���f���SR���������ϕV#�����#;
+�Pcff&�9R	u)��
 �T�̙3]\\BBB��铔����HuD���ba��������azzz�N�Z�.�y7|}}w���h1R�=hR����
@���&��'�P#���K>T���u����Q]�m�d�`0����0��KKˍ7�j�J��jL�B��رcfff�����3AB�m��ү_?)S�*�t����.\XZZ:t��>4TL��'�x���5�~�Z�W�0yB����(!!aÆ
�V��8q��:���vH.���+,,TZnѦM���ȡC�����^�Z	5�������P��a��A����ΝKII���y��-���Cr�����ӓkM��۾}����ѣG�={��u}����i�&%ԥd�<!��3t����l�����feeQ�
+��	�EOO��ӓ|$Mi����M���r������TQQѫW�;v�z������b=}�����>>>-@��I2BMQRR2f̘���}��M�2��pT�����ѣ׭[Gu Hm,[�,--�޽{-t~�sN����ɉ�fggg{zzBȎ��64I������Ǝ��*��3�$!��Z�n}�ʕٳgO�:uΜ9���TGD=6��d2���//���\%� l۶�…�ʕ+e<���	�C_�p!!!a���666:::���s��Qr��ba�B�YRRR�L�Ү]���Ď;R����.]�x�b�Aj�իW;v�s玷�7ձHs�������cǎ/^��:��-O�f:thNN����W_}���Hu8T�1OH^����k��>����S�O�޽{S����	!�\�۷OOO�:u�1cV�X��񨎈8U
�A���w�ޥ:����.]�ܼy��d.]���pT&O!`2����G�ݳg����e�
�<�&���R�'011<xpZZZ�nݨ�EU`�R��'���%%%��r�����H^_e�m� IDAT��˗/Uv�m�@PYY���J�x�H�<!����%++��ǧo߾Z����lyB��޽�@ ��ˣ:$L�B
+fll������O�W��1c�Uh<�YnL���:t�`bb�ɓz��	!�xA�\��ʕ+����|�6|1�9"v�!y������c�Ar��	!�R������Ӯ]����c�ڵ|>��Zvۡ&sssӆ?04	&O�dffv�ĉC�mݺ�������TG�R0yBM�-Oj�'�P��2e�ݻw��ʺw�Lu8-���W ���V\\\\\Lu HV�<!���K�.���&L�2eJMM
�)�<�&suu������@��0yB)���^dd�K��\�������C�#R$L�P���ؘ��>���@��0yB)���߃���������H�Y��*@�ѱcǗ/_R�&O!e���NII���������#�)�ͦ�麺�T�Ԓ��ëW����
+�'������]������7�\�|�ꈚ�C����ɓ��	!D�޽{?x���


3f����3�5����	5�<�L�BT233����|�rjj����3g������	5����O�***���'�����<z��cǖ��Q���l6N����
��I]`�R	&&&���x�bVV�����&����Y�f��2/�򄚣}��A�y��@�L0yB��!C��MP�F���v����������	5�������f<y�
0yB�SSS�	*33S�	��������nݺ���S��<�f����Z�&O!U���'l�z����I�� ��;V�Re�X8�	5���&O��'���"��N�8���6v��w�ޑ��A]]ݰa�T��$lyB�dmm���S�	&O!�6nܸ�'Offfr�\�F.���ݻ�'���qL�P3a�F0yB�4��|�rM�ê���ҥK�3x�*@̈́c��&O!��o߾�6;	���u�֝>}Z�QՇ3��f�1Oj�'�������+���M�:���@i!5��P3���UVV�NO4��'������vuu���]]]:�.V@ ����Ç���P��`�j&###�@@�+��'���
+
+
+��ʪ�����۽{�w�}ױcG �̨����ٳg�}��@ �0T�C�ddd_�|�:�8�ڏ��D������TG��>|���������ɓ>A�����*��0`ĈT��Ү]�^�zQ�?���|��WϞ=�ԩձ�F`�*3f̩S���!����@u����sgg������у�XP#t�!$�
+~�������oߒ�zI1f��C�����yBi���R_�<�L�B!�Ok�X,�A���	!��9�>DV�<!�B�#0yR�<!�B���I�`�B�
+L��&O!��J �{�:
+�8L�B!��ɓ���	!�R	�<�L�B!��x<��d2�5�'�B�z555```@u �q�<!�B���I�`�BQ�'5��BZ� rj>�-$===++�o��v������.��DrEH��ѱ��	�y������A���Sʩ����\�����&�@ HHH:t���������u``�ɓ'���6  @t{@@��wF��'#LLLnӦ������Q�n��̙���%o1Y�O_�~=k֬�;2�L�nݺ���w���K�2Z�'u"@�������%TT�s@��ň#>}�$�p��o·��ci4ZJJ�Xɿ��KX //Oʩ���x���%����f�QVVFn,--%��ugd��ϟ?���7�!c1)7�,���cjj*�$��i9J{�%;;
+
+
+�5[�B�\.�������K�.���KJJ5j�@�G�%~�4�������C����k׮+s��! V"n�������d��ћ0u��.����ܹ��۷���022�����ŋS�N��A���՝>}������\.wРA��$Q�>iҤK�.���oݺ���絵������ׁ����-&zs$��.]�����������eee������QQQ^^^��e)�m��I�(6C)�-O�K��䘘�@BBB��e/Є߽{zzz�9����ݻ,--kkk%�������'�
+�o•+W���077W�pnn���!\�zU��1110h� r���
 66�	����x�"���>y�D�yd,&���T__�={��2-G5[�Ο?���T��-O!�xxx������Nu,FFF��&''w��}�������Ν�x���/ذaCmm���ֿ	d�|�r777��nnn˗/�5b�]]ݴ��������7n���1B�x@�������p)瑱�,���
��b5���)))144Ė'���BHV#G�
+��r8����iӦ
�؀k��j�����3fL�.]
+<؄�nBFF���H,<z�h�?����lȐ!</11�ԩS<��߿�1@�5z�d�d�R�XL������3mڴ�����\�ׄ2ڦ���u��TG�dCu�BH�d;����,�E4��GⱾ������2EEEt:��d�C���ʘL&�F{����K;~�8�mۖ�b5�&���
y���Q,�رc���ׯ���o��H�����2��VUU�������ԩSE�B�R��f�ݲe˾����@2��'����|>�!XZZnܸ�U�V�-111<o�ȑ`aa1b�>�/E$fܸq...�߿߷o���+�&���ݼy�֭[���AAAM8���FFFIIIyyy�F�������slll�=rsse/�m��I�`����ׯ
�	���tk�޿�p����ҡC�~��A��TDv�����X��h�5k�@DD�8$;��`cc/_��X��ަM�������|>���%/���Z�2�]�����kxxxbbbAAA~~��A�***����-�=JJJ0yR�<!�d���>LަM���ȡC�����^��ܘ�����+���������^�JKK�x����;;;����QQQr� vz��������2��7N���x�d�d�R�{�E�����˲��( xEECAŔ��b*rIQAQ�J+�:�����}���y=�S�!���-)�Bj���f��((��^���1��~��evv�]x>��y���y�߫;/ffgy��N�Ν�m�FD�N��KL�V\\�~p�'��ҥKK�.%�	&���ʕ+e2ٶmۮ]�F��d���Ņ=��l�2��6]�1N˗/�|��Q��˗�/_ND�'O6;�K/��P(
+E\\��xN��W_%��K���e	ϰZ{��q�q�Ӏ=x����W�,���Fu� 7�k�����ӧOϞ=���x���:�������!�0S�N%����G����K$��o߾-�J����7J���}3������)))���j����h������/��4q��*��+W޸qC�VWVV���O��w�f5�=z,^�8''���T�������?�~��q�V+�˷o�.v"��'G$z�dV||�ٯg����j@-2d�Ν;��=�ڤ�aÆњ5k,
excu����|���f�����~=��ɚ�f����g��������?�,����O":s�؉/(���Or����7""�w�1��^��(խxb�}X%k�Νf���$�ٳ���4Mǎ���t������h???�L������nx��{:|Z
��ٓ���333G� ��
+EXX����srr�&b5��kz������0������E�Pt������7|���q���ĉDt���
^$Lc����ƎKD���b'�9����[����[����D�\�:�0 �[�n�m�������4^܇�F~^�Өܺu+((H�,�/�y�'��	D�}K��ى�Өܺu�]�vbg
|�x�ӧO���O�1W�P<
�)??_�Ӆ�������	@L�/_����?r�'1]�r�g�qqq;�����\��kv����._�*v �'�<~����œsA� ��W�Q׮]�N@� �s��5o޼C�b'�x����#""�����hΝ;��sω���	@%%%7n܈��;��8Ο?�0L�>}�N�����WTT���!v
PQQQ�֭�΂��ܹsAAA~~~b' xpP���IIIbg
�0%&&������qÓ3B���233�N
���V*�_}��رc����0�ϟ�5k�؉�`��	�6���;t��>����W�޿?22R�D@0O6��	x:v옗�׳�>+v" �'�	

�r��Y�s8~���
\\\�NC�`3]�v�v�F�;pt:�����;�
O6��h~��w�
Gw�ʕ��ON
+���<��3...�rV;v���;<<\�D�6P<
�>p<?~|���R)��N	/�-����…bg
M�ӝ:uj���b'���	��z��u��y�����?>|�0&&F�D��P<
�R�^��ݻw��]�
�u����;v��E�D��P<
�ҳ�>+�Jq�88p ::Z�,��P<
�RӦM�����'�
u�Ν�/��Ɗ���'�ݻ7�'�����x“SC�`c�z��e;��������b'���	��z��u�����"�
��V��=�kv�������S*��`�̙3�[�١x���M��������b'g߾}]�v�ر�؉@��x����<yR�,�����ddd$%%����'�8p௿����c�
r���{��xjP<
���e�O�;p {��	

}�g�N�
+������t��W�@�a�ݻw'&&����'��mO`(77�Ν;cǎ;�
Ov1p���~����B�D�!�޽�K�.���b'6��	�.
��jsss�N��0Lff&��5(��"  �cǎ�rDt�…���1cƈ���'{������o��B�D"�H�΢�ټys�������Nl������]�t	_r�ȩT����I�&����'{������8t�؉��:TVV���,v"`3�a��
��1b�L&����N�/��
6���PQQ��w߉���<
�Qll�ѣGU*U�G`oB����1c����L&c��>}zҤI�[�vuum޼yTT����XSS��'����u��%--�0�?�5j�R�����>}zee����j�ҥK��Û4iҤI�����˗k4��<y�d���͚5LII!���҉'z{{���Ο?���:�V���һwo�R٤I���Ȭ�,�MD�}����H///77����s疕��;~�����kѢ�\.oٲebbbvv6w�P%%%�~�-��54���۷��ﾫ��{uBB�������D"ٷo�Q�)S��edd�
>lݺ�a���`l@uu5�=3F�V�
�2z�hÀo����3ܲu�V�s�4�Ze�ݤ���^)

-++c�te�}9����/�J�'Oj��'�
+{��jݝ=l�j������111�z���Z�.**Z�jEDDulӦMVVVYY��۷G�ID�?�<0w�\"j׮����+**�;ֶm[�*aɒ%D���iӦ������76mڔ��-[f�����K�.�������DԬY3�-��#�\V�XADJ�2%%��������ٳ�F��nڰa�n<���<{�lDD͛7�a�&M��…����juIIIVVVTTw�P����4iR-:�#C�`_s���ԩS�����޽{��ggg�1"  @!����ݍ:���y�&yzz����������
�{��_�w�NDiii��MMMe�%ý��䰿޽{��-Zp̑{.=z� ���כv�h�ӧ�<y�p�7��}9��GEE���{���ׯ_ׇq4	r��
�Dr�С�u���	��~��"����kם�$JKK
7���[z�QǪ�*��Ng���FD�=�������уw]\\LD�{���6څ��Dbi�V����AD��Ŧ}9�سG......R�T*�������0̙3g���w}��}�&A,XвeK�F#�#88�0`_�?����w?p���m��?��O�a�M�VPP��GO�<1ۑ-�X�{�%[���hc��q�s��cMMMMM�N���t���������3g�,[�,11Q�T>|��w��n�O��lذ��7�4<�
���@#��o��իv};W����Ǐ�[����H�
7�l�e��6m�D&����>�X��`�
6���h�ݻ7�;w��~��W�|||5q��̔�d����z�S��'�;v�O?�����j�6m�Ѳe�JKK?~���9u�T�����Ϙ1�ĉO�<9~������j���֭[>|����͛7���&��:�s�|��ڵk�ܹ�R�rss���q4�7��9255�֭[UUU*��ڵk6l�߿?
8p���EEEZ�����w�&���j�&�������X��3B!v���i4??�ŋע����e˖�����+F�f;n��^x����R�,��AsQ��C�1{��hbfƌ�M��ۧN����ӵk�$Ɂ�w
'��	�>L�<�w�޵�h���j�˗/�ԩ���[�>��c��+�;m�y��ȑ#
+���ϛo����S�����%K�t�������ã{��K�.�WNf��g�й����˗�i(���H��F�&�a���[�j��������\�x�a�����_�}��������������/�Z-wO���
+
+���������>=z4***??���0�Jպu�w�}w��b�v�{��Ð!Cڶm�y�f�
���o����x�
�
{A�P�R�I��m�VSS#v.`_���111


b'���	���������Lh�~������iӦ����y�?}��			ٲe�؉��L�6��ɓW�\��#IAt8�P�z���t�N��)))ٶmی3P95l(��τ	
+�<5T7ntww��W�N��@����8q�_~��]h0�Z�ڵk�L��~'14`(������o޼���ߋ��ؾ}��ܹ��M�D��p�8@}�߿@@�޽{�Nli������xY�y�o�g�޷o�o��&v"NF�R͛7����wdK$�z�}�…�N��9s��w�g��N�{�g��f��sq&,X�h��W��/�r����7�����������y�oR�t�̙iii%%%b��L���+"ڳg���b���ݻ�cǎ�3g�rj$P<
���^suu�W�	����ѣ�r�ع���+W����	��'xzzN�6m�ʕ����ۋV���/���עE�\޲e������l����@F�ZmJJJ�޽�Je�&M"##����6����###�����܂���Ν[VVf5+KMlV��J�R}�|�`o�?^�n�{����Vo;�1 ��zzz�Z��~��2e
+�;�٣��F�Ze�;G�N�KNN6m
+

-++���R��x�S�cCK�,���*//��.�����8�7o>mڴ�K�VUU�i���D�p�¢�"�Z]RR���e��1k����}��R�LII),,���>{��Q���6nܸs��V�Zedd<x𠲲��ٳW�\���O������ج�0ۯ�p��իV��6m����ع@����Ds���:,]��NOV�ҥ�o��յkװ��A��[�~�pcxx��K�֯_��o���Էo����ɓ/���~�͛7;v�ةS�k׮qd%4a�S�c+���3g���?����1>8��>��y睶m�VUU�c�3g���GGG߿�m5{0����AD��Ŧ#s4�_N������"�J�[��a]]]�����)X������Ν;O�:���#Ù'1=x����z����_�՞;w�̙3�Ν;|��'OƏ�~�_*�2�����MUU[����&M�TUU���
k��R>��Yq4��C�:��le�޽㢹Ί IDATƍ�v�Z�l>884��6`����===�ݻg�ݸq��|||�_���͛��#G���ÉhÆ
�Cq4��ݛ�Ν;W��8�L[V�`���DDD$&&�cdpp�a@d�f�R*���ζ��n߾���H��>x�`���D�8B׮]����+,,���8p��o�a�}ҤID���]��Ν;*�*77w����Mo��6�9255�֭[UUU*��ڵk6l�߿?wV�	��:�9u�����g͚U?��"v�̚5k���nܸa�a;����9x�Q��I
l�Z�2d��G�03f��8�pdŝ��.xN�l/�x���n�a�)�x�Z��ڵkll�m����y����o�����߿��_~��j�
�6m
+		quumӦ����j�J
�Z�|���ݻ���+�������[mb&;;;11�U�V������|��ŋ���N�ldu
+�(�N�<IDgϞ����,p�8�C8w�\�~�v��1~�x�s
+���j���{�
q�xpo��Ɓ��󽼼��,:s����?�ر��H�s
q�xp���!!!�'O����-v.`Q\\ܓ'ON�8!v" |��Q�h�bɒ%)))���b��?����,;�<
8�#F\�r��_U*�b�����KJJN�>-v" &�yp,7n|���~(v"`�…����K8��p�o��ꫯ�<yr��
b��'!!����ܹsb'"C���/\����?��������/�{����3f�ع��P<
8�'O�<��s


G�uqq;�A�1��xLh�p��#R*��Ν��?�!v.@YYY�N�Z�b�؉�C��'Ǖ������w��Q�F��K�V��}�ِ����
db'�?>;;���_					;�Fj��ŷn����;p8���4�K/�t��圜��mۊ�N�s�…~���Z��o��ع��@���***^x��Fs��iooo��iD4M�~�\\\Ξ=���A7�8:OOϯ�����d„	�F�t����_�re�ƍ����''о}�����>}:99Y�Պ�N��o߾+V�Y�&,,L�\�����8{����Ç
�k�.WWW��i��޽>hР��L�s
���	���>}:::::::==]&�'��B�REFF���O^^^b�������?��W_eeeM�:���ư���࣏>+��a��'<x����Z�̈#���Ǐ����m۶��r"*//�����?F�!v�N,%%e�޽�|��3�<#v.�p�	���=���;r�HTTTyy�N��0a­[��h��ɸ���222fϞ�dɒ�^zI�\�q�'g���?��Ĵi�f��
k֬��tD$�J-Z����]��Ϟ={����Ν�駟��84ON�ʕ+,--5�(�˯^�ڱcG��rFgΜ���;vlZZ�D";ph�l��T*Փ'O��:��+%gt��ɘ���Ç����r�P<
8������t:�kZ����OOO+1������Q�Feff���.�
8%�N���m��p�D������7mڴ�ss"LLL|饗v�؁�O8������>|����<z���?�笜����G�5f̘�;w�r�p�	�Y]�z5###--����2����D"9u�Ԁ
DI��-\�������������}N �'���O?mٲeǎ���...�'��d�:\�|�U���̞=;%%e���f�;p>(�����n۶����Z�V*�j�Z�D��PEEń	�;���6n�8��
���	�RQQ�ٳg���A=}��ܹs'O����g���uժU~~~b�%>�N7��Ǐϙ3�C�b���P\Z��	�RFFFRR��Y4d�,�-���͝��~��U�V���b'�
�pC��������@Á�<
��	@O�x��(�@� �'
P<
��	@O�x��I$�Db�����ޢE��}�Θ1#''�Ow�
f�O�a�={������r�R٭[��ӧ����eff��������r����]�v1c6���`�V�g5�GZ�)�\81�.��V�ݴiӰa����\]]�5kֳg�3f���f^p:�ڵk�S�����r�!�5�ѣG��͎_��������h��TTT��ƚ�������0�Ujj*���ɑ�չpb4Z]R}��A߾}�f�Ȝ���Xp�	@�[�V�-))9}���Y�������7f���1�t4#<�N�8�������+V��~��J�z���իWׯ_߿}�k��v��A//��>�����j����0%%����СC������?���F�'
���3�:���w�:�nܸq���-[�\�nݭ[��j��'O._���_pU�L�Tz
��Y�26}������/�4mڔ�233���v��!"j֬Y~~>G�ѣG�H�P���5���)
+"���6�*44��֭[Ǒ��Ⱥυ瘵Nu�޽D���_TT�3
�,��Ă3O!<<|޼yD��W_��N�l�BD���		�KKK#�9s愅�5���͙3Gc裏>"�E��T*�4�Gr�9�:���;���?lժ���q�xp�G�&������ٻ���r8{�,%&&�mMHH�eh�ر]�t),,ܰa���#9�KYM�}�bbb�����h߾==|�Ph�Z�����D�v��="�ر��Vv�_�e�]*���i/^\]]�1>�H���KYM�����ڶmˑ�]3�z��	�Q�t:�S���������w�[��V���*#��p"(�ŭ[�����OhG���������/���"�q��Vv{``�i�T*]�`
-Y�����c<#9f�s.uǝ*�Ɵ�i6m{�����طoEDD�����߯հ={��me��1�Ə߹s����]��{/�#9��:��H�M#++�����#|��,�6}����{��E�Q�w��?���~//�����#G��R�����[�n%"___���?��s�9f�Se�h޼��7�ѡ8��/�`i�)9˛;�1X�Ֆ���>}z������D4x�`�N�����B�9��|||V�\y��
�Z]YY����>XROD���)))���j����h������D������V�
6�G{�#�2>c�%U6
__ߕ+W^�v������<??�ҥ(�,
8%gys�t6+>>��׳��3�*�_�R^^>|�p�1���f���p��͛�&&4�j�|�±w�&�������ř�A�Pl޼������������s
r����7""�w�9s挥�����*�N���9bĈ���L�P(��¦O����c������'�����������
O�Y��F��?�.�Vg�s.�����?U����Z�n������ٳg����߻w��������������222����`���
��@&v`/���y����'
p�	��¹%{��'
P<
��	@O�x��(�@� �'
P<
��	@O�x@&v����!v
+
PNN��)84O�Ē���N
	�0b�
\FFFRR�8�0��'
P<
��	@O�x��(�@� �'
P<
��	@O�x��(�@� �'
P<
��	@O�x��(�@� �'
P<
�S���d


���'O��]�0{�쉏����J��[�nӧO����N�gG�a233�������r���ll�]��1�ppp�V�5�^�HS�n�z뭷:v����֤I�nݺ����ϟ7�,�V�0�|,�H�b�l�r�ر?���\D��ٮ]�l~�1{P�J�V^^]�%ώ���fcbbb***�&���j��v�F~��f͚Y���y�a�F�Yʇ�]]]O�8�1����	��~���J����>|8EDD
9r$y{{�X�����*���ӧW�^]�~}���9r��1!!�����>��۷o�����”�ooo"JHH0M������j�ى�4��/Q��ݏ9RRR�R�
+
+
+֮]˱tVq-�؟��������H"8p �4��'�;{O�;w�������C�Q�f����%���ѣG�H�P���5���)
+"���6J844��֭[�1��F<<<��ڵk��xbQ�&Mx�Q?p���v����3f����d2"JLL�H$aaa:��
��taaa�$))I�.�J���-[�Ѽy�BBB�gǴ�4"�3gNXX�QSXX؜9s�1�>��#"Z�h�J��N��{ƫ���g<�z��O�=�����{������֭[�x�.iѢŃ,�ix3�7i�$Aa�ڵ#"����w
+
+"�˗/�m���#�:%\SSӥK"����M'"4����ӉH�TN�<y��Ϳ���V�5
T'p[j�4#�g�Ju��E�
+#.�
@�cT<�j�����7Jo۶��ڷo�V��ju���h�޽c�=#���CAa���DTUU%tR<;r�UVV����Q���ܹ��Z�l���(5�F������7\��M����k����f��i���n��Ȩx2[����ڵk׬YCD����c�e}}}srr��9l�TSS�^\�j�Y<Y�4����K�,3f{n�����~��W���*�\\\Ο?ou.��؝Q�TZZjSTTԬY�������������1
�w�ޝ9s&���ܽ{WP�c^�c޾};���?}���x�iUAA�СC�(::���Vq�w�i4Íj���d2�A
+n���ްl��ǧE�������~~~<��f�����ŕ��Ο?_PX�~��h߾}'��#�g����v6�����;w�|����k�r��Y�;wf���:u�ݹ�7��r�cm޼��wWĮ���3:�d6fƌD�e˖ŋќ9s��4���@&��d����a����{����#G�H�T
+zT��׭[������D�G�q��U���#xذaD�����p��NDQQQ<q(N�"8;���ѣG٧���TUU�m�V*�;v�cL�CM�:����Ϻ���Y�r�7�jueee~~>χdZ��ޝ��흒�RXX�V����V�^��L��Z�688��)��Fz��x�✜���R�FS\\���_�wM
<�{�,�޼y35m�t˖-�����ś7o���dke��8'H�w�TZZڪU+"���b��ر��ڶm���#Kc��Ν;�D�1�0{=Kyy9�|S���f���p[|X-�8"�.�)//����j���9vZSScv�bbbt:�A��Ύ�x?~<
0@�E��EDDф	,�i�@;o�<":t��0�N���9bĈ���L�P(��¦O�n��=#<;�t������h???�L������nT=�MX��t�ؑO�d)��ŋ�ϟ?`��Bѭ[������ۦ�׽xbF�R-[��G�=z�X�l��W���qH~��PkIII8�@ÀO�
��	@O�x��(�@� �'
P<
��	@O�x��(�@� �'
$È�44���=z��h4��h�ZWWW�W�DҧO��G��� @���N�6m�t����6�]�R�?H$����R�+\���<y�����&�D���\���
+�'��q�ƙ�3���e���


���M�x����<x�ٓO�&M��|l��ˤI�LO>���$&&���M�x{=z�L�_�L��d���M�6+%��C�����9b������f�ĉ"�Pw(���^~�嚚��M�41b�����'����X�B�����:f�wwwqS�#O`Gnnn�����5
�
�'����d�{Z|||�*v:u��	�k������D4n�8��
8#�#�TTTt��Y����{�#G�ddd���5n�8�SpP���ppIIIbg
А�B�g�����݉lڴiʔ)bg
���n��	���ɓ�N
�6P<
@}�H$b�`(�@� �'
P<
��	@O�x��(�@� �'
P<
��0̞={����r�R��֭����sss��233�������r���ll�]��1P"�H$���`�Vk��.�f�� F��ٝ�Fww�-Z���wƌ999��_�:���%�����O�<i),&&�p{LL��E��߿�D"�ӧǤ���pKRR�D"���4��N�4h�D"?~<ǀ`�ڵk������ˣ����mVTT��ƚ�������0Sߔ��j����IZ�� F���G̨Q�=z��U�w���{!I�����d2WWג�v�Ç�-�9��^�����˖&euֆ[>|@D+W�4��������ِ]�5XpJv}s9r$y{{�X�����*���ӧW�^]�~}����a			D�����g�ݾ}[�V���x{{QBB���cjPP�Z�6�^�H�̅Ϙ|vg��jKJJN�>=k�,www"<x�N���h(>�P���Y�R���
>��"""L�غsÆ
����׳����5k������Ͻ>�6ژ��ED������얫W��KjT��
+�'nXpJ�{s?t�5k�L�2��ѣD�P(������
+egg�7����P"Z�n��v��B#�>�c
+-����/M�6%���LA�X]�ڽ�aw��aKӽ����СCٍC�!�͛7���Z�nѢ��?�!"___�JevRVgm�}ʔ)D��s�i�Z�FAD���:�Pu���������;H>��S���d"Z�p��օ��/������Ӊ�M�6��Ն�
�
+���\x�Y��a�E�ј1cebuj�Bưœ�����=z$��]\\�߿��}�\���c��ܳg��уa��ݻ��k]<����k׎�������$������r����7,
8%�����(��j�����}-����Q��[؃bMMM�.]����?7�n�Whd���s�:O��@mڴ���u����lx�nҤIf'2b�"��/֮]KD#G��4M���իW3���BD���f'eu�f�~���D������*�H�;�1N�x↥
�d�7w�V������UVV����~����s�N"jٲ%ۗ�$�i����ݻ�&��qw���2Z��p�C�^#���>4���۷�
�
"�;v��fQQ������{�vII����T*�}���a��ڬ�3g�
��.� u��UP����BBB�޽�n�:[E:�NW���^__�ŋ7o��l�ȑ#���O�<y��)�|Siii555�G����!"�Q�F�t:�
R6�d���ŋ�pX
+�����'�[�nq����q��Vv{``�i�T*]�`
-Y��=/b	�H��� ��Ʀ���'t���P��M��ݻ3g�|��a\\�_�evOO���X�N���bcc�J�i�0���mݬ�_��6o��s}����0�
D��	���׏�����'��G����15~��Ν;߿�����H�$�Υ~�i��c��B�����ŕ��Ο?��ޓ���~0r�ر�7oQTT���QQQDt���cǎq���}�ؗ�U���UPP�v��"R*�����֭[��������֑���1�5,�\�x�}T��ݻk���u���0LAA�L&��d��d���S�B�P(�>}jv��$''[]��y↥
�T����Y�r�7�jueee~~�у%������;%%���P�V�^�����j����f���ud]��gL�œV��	 IDAT---=}���ٳk��L���P��5u�T"JLL�9Y��G����K$�?���(����R����]�huO
���#|=Kyy9�)wS���f��p���u���$��p�]��8b���k��,|֡�/�0w�����H$�ϟ��F�k֬!�i6l�Y�ư#����l���������u:]ff�#d2�B��>}zNN�QXzzztt����L&��󋎎NOO7=�bz��h4;v4�.4��@+h.��.hw��r���oDD�;�s���cr�L�^ּy�Ƞ�Q[{��ID;w�4�>g�gϞ�9֐g���l�7	c�O
ԛ�����$��
��q���4:���'<�����8��
������(�@� �'
P<
��	@O�x��(�@� �'
P<
 ;
�����;hD.]�TPPЧO�v�ډ��}��䈝�CC�N,))I���ٳg��)��$È��ӫ��Y�f͂Z�n�m۶޽{���ŵk׺u�V�e2�V�
HNNNLL�۷�D";;�'(���ڵk�����̙�?��?���bgv�������돞r�\�V7m�4>>~�رÇ����f���	�N6m����v��a���={�;�;�N7`��.h�Z������F�P�5*>>>66V�P��$��'�Z�w��k������`���d�����r�Jxx�Q��VQ>>>�O��ҥK=���*����������_=t��…Q95*���.tqq1۪�h\\\���Q95T8� �ڵkg͚��/�ܹ���O�t@555�{��|����'WW�^�z�:u
+%uC�3OTVV&''Ϙ1c��هF��h����ܹ��vR�T�Tfff�rj�P<
�U\\<x��C��߿��O>�t��.]�|��GF��>|x�V���
+�
�'^.]�Գgϲ��.���Kb�������?�����{���~[�Ӊ���'�rss�p�ر�;��8
+�L�����Ir��O�>���G�پ}��ѣ����N���'N�6lXDDĉ'�NKDD��ٳ�H�Ӌ/��o߾~�a����F����i;.���KJJ�0a�ƍq��U]]���~���C��o��ɉ�����۾}�T�S
+�'�������ıcǦ����S�����^^^F٫�			�7o�7�5$��
�;q��رc'N��e�TN�ʹr"��}��ڵ뫯��?~����p�B�sp8gϞ����0aBjj*��@�u��9  ���{```�^��Nl��������?�|�=����r����[�p��ŋ�?ޯ_?�s
@��_=zԷo_oo���l�R)v:�03~��'N\�p�u��b�u��	�����!C�ܻw�����;h8�<yү_?�Ry��q777�Ӂ:��|��3mڴ�����,TN`[J�2##��ի�y�
@���KKKۼy�M�BBB���.]�lذaժUǏ;�\� "*((�ի�̙3?��S�s����_>q���˗�>���'��������������`��������#FlذA�\���
@,�}�6���y��+V�ظq�?� v.PK8��ݩS�"##���^y��s��⥗^�~�z^^$�P<
@���ɓnݺ���s�޽b��Haaa�.]>��y�扝��Ш���x���ڵk�N�6m�̝;wѢE���ع�`(������[�z��hۑ%d2Y@@@||�ɓ'k�0̞={����r�R��֭����sss���ّa���̸�8�\����k�.�Kl����Z��t{�"M�b��8�"XJo���^^^�-�^����u���4J:�n��
}��������f�o�R������GGG��=�gNJ����X�1111fNMM5�^�Hۮ�������}�v���|��|^��J
@#�{�n�Tz��{nx(R�TyyyÇ'����a#G�$"oo�+V\�~]�R=}���ի�ׯ�߿?G<;&$$����g�}v��m�Z]XX������MD			�	QPP�Z�6;��6Y=G^��jjjz�葔��=�z��I�4F��S�N/�����7=ݹs������:t���5k&��ώG�%"�B���gԔ���P(�(;;�(���P"Z�n�D�G����q�E��5�0�v�J����g(��J
@c�q�F�\~��-���!����o�[�-\\\�s�����{555�sܸq�Ʒt����6~�x"���O�N�g���d"Z�p��օ�a��&���NDmڴ����4���j�zFd�����BCC_y��������N��8qb�V�d2���ϰaÎ9b�Q����_�j׮�\.		ٴi�a�͛7���
+E��ͧM����S�TU*Ւ%Kz��������ѣG�e˖��f���x��ך6m��g�1SRR���/{yy5o���?��ts�:�F��g����K�Pxxx4h���V��ٶm۠A��5k&��;v�8gΜǏ�;�]��o߾~~~������			G��n2~u8f� UWW�i�f���M�!�-�X���c�$x�֭l̖-[��E�<���C�ᅧI�&	
+k׮�����������f[���C�F	���t�҅�>��sӉ�4U��3�A�{��lݺU&����
��H$���3�8e�����6��Ç�[�6l3f��.���h������'v��ѣ
����{�p���Y�sQ��QQQ�1�M:�����������1c�2��Mƙ[}Q
���TWWכ7o�6�Z�:p���6�m۶Q����j�Z�n߾=�ݻ�cf߂###>|((��ݝ�����ΑgG���J"���0J�a��;wQ˖-پ������z��;�"��͐J�jٲ��ٳM��Sd&&&�СC�?V��EEE�V������ئM�������۷o�7~=���l�ܹs��]�vǏ���8v�X۶m
s[�d	yyymڴ������x�ƍM�6%�e˖�%<<�ҥKeeeo��65k��hˀ
8V�{.+V� "�R���RXXX]]}���Q�Fq7�_zӪU����TVV�={6""���͛�0L�&M�h�…EEEj����$+++**����'htz��a�n'��`Z����ڵk׬YCD���ܻ0=d������
s�⩦�&$$��V�Z�pOV#M�z��j��f�_������J�2�k�O1;;{Ĉ


2�L?���`���N���͛D�������lx��믿6̭{��D���f����T"
+7܋�E�{���--Z�0;_>s�ѣ�_�޴#GS�>}���ɓ�oܸAD�:u�O?**���KMM�~��>����'h\N�8AD?����V������h{QQQ�f�KJJ��bx(�{��̙3������ݻ�������ۉ�����A��j�zf9�"p�믿\]]��Ӎ��SLOO��4&�����N�3�qss#�G��JKK
�j��tqq1�l��~/�.��H$KS�:"*..6���Ğ=rqqqqq�J�R�T�WWW�aΜ9þ�z�������n2��	�I�&����R���]eee�N�ڴiӴi��ݻ�!�9{�j��ɂ��[�/^̽;S<;N�0��>��c����f�j��;w&�e˖q�
ܑ�j�zFj�z饗bcc��v�ڕ��M�VPP��GO�<1�4��p�
�'��rO��\jW<�M��1��̙3˖-KLLT*�D4~�x�M�55K�hx*++===׮]k)�����3�h˖-�/&�9s�p��t����L&��
+
+
+�������2��ώG�!"�R)�S��_�n�JD���V���j�zFm��������k�}ٺG��1�a����H�
7�l�e��6m�D&���'�=}�s	'�
6���h�ݻ7�;w��~��W�|||5�x�F$33S&������ѣG%IXXXMMMUUU۶m�R�c�8vdv��S�Qbb��0�n_��+W޸qC�VWVV����|H�Վ���D�����{�޺�z�j��C��j������ji�.��ȋ�������]_�������?,))y��QFF�������
����[�ly������Ҽ����q��rO��\�������5k������srrػ�9��"/  `Æ
��GeeeuuuAA��������0�/��m۶��B�FS\\�t�R"jҤ	w��zZ�@����/���
�o�����Z�"���,vˎ;��m۶�>���0̝;w<<<$���������Y����
����6��$�[6o�l6�������9�"p>|�رc9��/���+F�f;n��^x�t)"##���L�{�V�V��b�w���b,���:u*w��zZ�@�����,ӷ{���O\�t:���&L�?k޼yD4t�PAa:�.33S��$�B6}�t����Q�ӥ��GGG����d2??������t�'�&��h:v�h���)A�g�阋�mŊ���}�Z����;u����֡C��?�X��E��h���͛#G�T(>>>o���������K�,�޽������G��ݗ.]j�a@��rO��\�j�����4
+Edd��j#G�0��ى���Z�ruu���

���.^��0LNN�믿޾}{WWW__������Z���Ɉ�����`\�~�s��999}��;3rss���w��u�����b'POrss���{��)v"��������ܹsb'V�x����ի�<�����֩S���|�
+P<
@cq�ڵN�:�����`����P<
@cq�֭:���v�����bg
V�x�Ƣ���}V
�����*++;��4O�<a�o
�a)�J�����B���Z����bg
�E.���j��+P<
@c�P(�pLO�<a�M�'h,pA�ӧOqq��x�Ƣy��<��J$�Db�0��$ILL�����}S-���k]0�gϞ�����@�\�T*�u�6}�����Z�i�lU*ռy��o��d
7o����:�ڭ�
�5�_��Ĕ)S��������)����5��R���e2�D"�w����H$����i5
���U�ƍ;|����Z�o��,X�h�"�dle����<�̺u�l;�S�ݚ���8��Epp�����y��ߐj'C��h4{��eݻw�V�:t�=��=[Mv�ĉ����^�b����U*�ӧO�^��~������}���ꫯ�hϞ=���|�?��O#3b�5��y����o�9rdqq����X9���SZZ��ɓ�z��Q":t����y���^{M�u<�S��X����i֬YnnnHH����]z2����F�����Ç[�hq��
�밍\��g�l��^�J��N��]�[�nI$///�N�n�t�{_ťK��-:����K"�ܺu��bx��f�I�����O�����ܺt钖��'�Q�F���cǎ?~\.��5�4R�V/]�4<<�I�&M�4	_�|9{u�Pee�[o�������9z�h�\��}$V'��?H$������*Î*��u������߲e͛7�O�D������jƌ���2��c��-�
+�V"�J��=�\U>Μ9#�H�~vM��~�����kѢ�\.oٲebbbvv��D��m�j�)))�{�V*�M�4�����ʲ�DD۷o������rss�;w����YYj���|�`_@�ѽ{�ٳg׺{�v��_~a]�t)�~�l�2v�/��BD�ڵ�w1|��xf�2e�QkFFG>�F�AD_|��ڵk�h�ȑF�f���z����	<X�V8f�À֭[����N��WK�e+�+VNd���D�_���|����b&$$��n)y����=�YU��͛׵kW��L�N�cL7��ꨨ(��9�t:]rr�iShhhYYwV��,�[���[A��Ȝ9s:u�T��
+�^���uȐ!={�:t(��-^}�U}�o���6m�dee���ݾ}{�ȑD����s�m���D9h� "ڱ��k���?�f`p�x~
�:ÇBŶ��I#���<Ǣ<���Mt�+m�]i}H�6|��ee�T�2���"M��'�a��|�7g~�p�ޙ��0������~�ߙ��p�;w�1?Vnn.����{T������%"C�ǺDGG��G===gϞ���"�
6����VUUQHHHoo/+�h4��{/���{�)�J"�s��ą,fDD�ɓ'{zz��'�U�cU��<yrNN��^�ƌCD[�limm�j����III�`^�}�v";vl^^ލ74�ŋ�����
+ٲ���������_�x1!!��6n���؀�<
��/���������o�>"JOO�8������{�ƍ6lP*����ǥ��Qqq��������ӆ���"7nO<�Ѻ���J�\.���>>>,c09V||<����PTTDDӦM3�ĉ����?�(66V�tN���"���\�O�q�����z�y�K�x�[�$�
+v��@MMMD�����e��3))��_,**�|��q���c�ԩDTPP`>2OլY���ܹsƅ���D��b�Jl�H�F�^����1�G�]	BCC9�{��������m����8�

%���CQɓq�`�Y��q�gmK�,�x,���������FD>>>�]���
:;;�H�T
+����VTTQ```OOϝ;w�m���RV+�c;��Yygg'{k�d�W��Uh۶m�������zYt�…	&��Z}��-�S0/���!���6�y���#��v yzz�G%6`�S���Y�<
�{ټysHH�F���{dd$555��P�T�f̘1k׮����(**ʸ�����
��G���I�q�g]�;y�����k������ͰC(33���n��3q���;���I��O�8q͚5»��p��������t�����LV�rv�����7��}����fT<U毋�)X��DH������)�J��Y�{�g����(66699�.\�0..�}��|�r��&gpv�7�� �mθA__�J�b��g�;�W���o<Bqq1
��v�&�q\YY��������62��6E���555�̝g��L�����Ν#����»���������?z��)�yM�6��
+͇�b��~����E�Se��؜��^N��	�Nff�̙3��˶�<��D�k�.V��oт�h߾}��M��!!!Dt��a�==�'O6k��f����������������Ѱm�6Y�ㆆ�bccY���`�c̀m�عsgss�V����olldɴ9�H&OBVU�+V���o��G9x���7���^�u"3f��7o-Z����������׿��Tüv��AD�ƍ۳gOkk�F����e��y�X�VXXx�����~�F���TPP�����毋�)X��DH�������d���*;�?�����^�t�Px����&gp��Jc��
+o`R��hy�23w�\��fC�ŋ7��Q<�e<�
+_{�5�Ȼ���j�y��,��h�u��%dUm��<==��j�⺭\��ղ�z�O
+`
�Z����-�<O�q�W��xhր'*���!p
+{9�'pGiiiӧO7�3!����(22Ҽp���&�M����Kvvvtt����q���ͳ?�Z�F����T*}||���_�u�k<���ۛ�����R�RSS��8Y����q㌷X������'�x",,L�P�T�)S�dgg�����ڲؼ�
+y�XU�֭[m�s��������b��4gΜ�{��t:C����I�&yzzFFF���:��d^Z�v۶mlR*�j�ܹ�sy�8����NOO��������񉋋�����o������bs
+Ú<��Y����͜9�ĉ��0�{��u�ֱG��_~�%&&fӦM�ׯ�:
+���ŋ766����[���v�ڬY����.]�4y�d�Ñ�K/�TPP���¾b.
�mnj�Ν?��î]�����d���������d7ϜZ[[w�����/�h�IDAT#sr-H��M��Ĭ^�z�֭���R��v�J�Z�f?���rss��y�
q���������y����0b�N�������^�:��������䊊���T�c
�2o޼���O?�T.ǧ@.����K�������c�	�����E�}��쁫�Z�<
���u�V\\\ZZ{z8�p���}��f̘q��q�c
{�V!�����C�8p@�X�-�_����/??_�@�N��@D���SPP��_L�4I�X`4���NJJڿ���˥���	��h`` 11Q��}��g>>>R��S__߃>u��)�L&u8`'|l@D���}���+W��W2`��Z���������KC��?qqq���o��6;á���СC���QQQR�QH�]�駟�y�fNNNHHȲeˤF�������?����͓:p�<
�Z�jUqqqMM͜9s��F�۷o'&&FDDTWW+�m��<
��j�j������?�8q���k������~��jϟ?���+u8���`�����ދ���?~ss������lmm=q�2�Q��~~~~�����~����N�p�U���9s�رc&L�:p$O�����:u*&&f��---&��o���/$	\�q/���޽{+++���J8�'�|}}O�<2����&�+V,Y����G���.��/���9rd��R�N��	�O@@��s�bccgϞ��G���������͛k֬�4:�q�aÆ7�|3???--M�p���m;�t:]vv��JKK'O����088Ȫ>��SOI�=�z}vv��}���ݛ��%u80,�<
���׮]��[o�������:���d2٘1c.]�-u� =�F�t�Қ��������Á��	@����ӧO�̉���|衇>��	�uuu��������+**���
{��������2Μ�hpp��>۱c�TQ����￟={��+W>��dN��<
���?������O�
+����nڴi#H�̙3S�L9v�XHH�����Ý'A������y��\�l����H��ڼy�…��ӫ���9�	$O�]�r������r����y�Nw���M�6�xh �������ݻw���xyyI�|l T�ŋ+++�����'//���A㳨L&����׬���'���������ɓ'K�($O��������'OVVV~���2�lppP.�744H#���ޜ����¬����<�J%uD0Ґ<
�Kjmm�x��Q���_��W_}����j4"�5kVNN��q��hmmݶm[__�ʕ+gΜ)u8�k�ҥR�p�B�.���,##C�(F3d�(��~w�ɽ��#00P�(�?N���v·�	`C� �'�<
���	@$O" y
��H�D@� �'�<
���	@$O��q����SSS��ý��Ǝ��dgg��&����SRRBCC���BCC����=�q�ɀ2�L&����:�μܑ�	�� &�	9�q�R�		�={��իkkkE�����ќ9sd2٬Y�x��Bf!�m0c��L���Z��wߕ�d3f�0@�R+�������s��Y����=��3Xww�Z��y����INN��f�…===�c������l��͹�b2����IKK����*��l�����p����?�:�ck>�o�={��c�=fq����'�={���?H�\~��I�������e�4���~r_�h���o߾����}}}


s��14[�d	����ڵ����Z��ƍyyy���D�d��1
��	&h�Z�rGZ:e.B�r8�6:���������֭S*�D�裏��z�l�Z��u���ۛ�֮]k��؅�9�o���.�R)�ɮ]�f�իW�-.CZ&v�����q"JHH��(�'~XpI�=�WUU�=��������̙3D�R����M����U*UWW
+٥...�����Mʍ��m��\�)��n�믿���%���r#�X��jCBB�����&������
�YX�Y�z,[���6o�l��W^!�e˖��?ț7o�R���(�'~XpI�=�gff�_��W�f�B�e���[�l!���~�P�.uG�!���H�Fc\n�WlK��"pLG�'����ѓO>�`$ˏ?NDS�N�8.>>�b�攅5����AMM
EGG

�

EEEQMM��xڰ�)((���XH��ai�%9��MD6o�L�0����8�����~��Jإnhh(66���|�M�r�b[:>�c:�<�=I���Fb���:ڽ{7�qyyyD�V�-vtpaMf!�m���cbb����ӆ6�N�"�����.���v˗/��(�'~XpI�=��}-w��q�Y?���J��Çѽ�����\���H�\,�Z����߹s�dM�Db�ǵ��zxxx{{wttp������-�˯_�nqj�_���6���LD���K�џ��'�s�o3w��۷o[[R� y�G����I�&�������j��z�0�\RR244�x� "
+HKK�������;�����g���𨨨���$������r�|Ŋ��mݺ500��@8$OJD׮]�oFD���kYyxx�y�\.饗�(77�ݙ�F`K�
���(<����v�p�
JJJ���3feeQii��؄�6g!�m������;Dt�С��������H��B�����k֬�}�vJJ�O?�$jF� $O���HDB��}��X9kc.33s�ĉ�n�z뭷��"�%O�6�22X			���ٳ---D���dxhdRR����={�b/��dv�
XbW\\l�/+qDxxx^^^JJJgg�M�
ı�>�
ǣ
+������x��}�cǎ���?8@DAAA�_�[�=�c
+�RXk��7߰/�;v��HL���ݬ����k>�o��Z-�q�w�^�}���Xl��ԤP(
+��[�y⇥
�4L�عsgss�V����oll4y�djj*������ݸqC�ն���޽��!���t�����߮v�td.B�{E��t����ϟ_�~�0=$���ɫW��4�~��\.�y����9QoF��<�X��+WQzz:_Q�<����K���Y���ٗ�ͩ�j�?�b\b��ّ�6�2���:O���T��<�o�,X���~�ĸ�k>QoF�/��\j��7o�����duuu��H��ai�%
��]�ח��?��aaa
+�B�RM�2%;;���ّ֤#G�jupp�B�V��G�1��b~�����]�����
+�����:�q���WPPPBBªU�.\�`qL�"1.�>}:>|���ӧO�6���2�o�j�̙<s���}7n�H�J; y�'�}c�RVV��#u ����o�
���:p2���79�������#
��`���'�<
���	@$O" y
��H�D@� �'�<
���	@$O" yA!u�+++�:�Q���V��jH���eddH��qR��2��	@$O" y
����-��=��IEND�B`�
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/ue-meas-consumer.dia ns-3.19/src/lte/doc/source/figures/ue-meas-consumer.dia
--- ns-3.18.1/src/lte/doc/source/figures/ue-meas-consumer.dia	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/ue-meas-consumer.dia	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,10 @@
+��]]s�8}ϯp�v��M����L2�y���Jw?���8�`H
N:�}%p�	�A��亪�e[���sttuu���?���^$iG�Cd�Á�&�4�f��������8�i���Y���/�T}:�f�ݧ�Ӈ�+|L�,N�0XX�8�����,t:�86+�����[~�gY��D�\����Y/��(�,7��8������M��.�9ݪ�@�w�L���U]�-_�פ�;��V;���@����Tԣ�7�,K��P4��p�|(.i�ź���l$���,��ۑ�&,n�8�X��q�fCO���͍�m.춹�����.N����&�q
+?*Z͒�h�N:�C����a�M�eq����az�
��+�=��$��V��Z�iv{����*j4T�}��P�]}e�U��N��O'g���k������a�����lLEZ�Ͷ�T�t�,vZw�w�{c��v뼉�ɲ���az�|�K���,���qO���$[�5󣩟L��õ�
+$���co߬]�de����]��RxDЮ���QU�x�[u"/ޏf�XWF�!���_O�$����ן�ƾ!O�A�Fݷ"��fՕ7�{'S��]9����j���3*>ެ��6~�.��G�I�p��퍻?�����m��#���ȓog�Y6!"�MbAâc���1��Bv�B�g#䢆�"���G��ٗ?6��m���V��t���`�"���.��Y$���NpL������˜�01cW�+0��|@��0��t���Wq
+Hn��.p�0�4��s+G��qck^|�I{��es� VM��4^v[�X"q�f���mAD��q��z꧷��f�	��^����|�,:"5)��6��%:r�Q�в	t|����7�)y�+xs[�V��FVm(�	7nmZ
�o�xcڞf���&�x�䬶��M�&��o����T#��&�f||ӵ�x�ě����̸��]{|�g���Ԡ�TH;i��ap������o�L�MU�$ʐI�57⨱����9&!G,o��)�����?!jz<B��x���G��t<ra<z�O��� *��p�rM:U�͈�dq�Xcč�����?Þ���h���δ���#N�����K{��V-F|�7���3bt��!F�k?I����X��k�W_O��KVҎ'��0+a�%K^�<4�J;��8�J�f%�;���R5+�GGI5�MNOT���&�H�0#m�R^�*���ܦ��28	8	8����#��YNb9%�N(	�Q��$���һ'�r߭����1����vr1��X��mc�}?�
��'�iG��#j4ͱB9�.�g̢���Z���A,��5�.v�T=�<9�V��<B��g�r��$�n�y�$���GYY�����?�Gy�~��x��k񧿊�^d���TϿ�=����o�%��F�;dU�$a���.Tn&�m���0�EsQ�4K7|��R�~�y��/递9x�X�$���������DȲsfq1��?��~b��Z�Q��<��4d����
�TG��C;N9�e"A��VP.;�c����Cv\�q:ô�Ȼ!��W��_Dh`[[�Y��WB#Ola^hx 4@h�/40ja�լ����pꮄ&E����M�����
+���F�An�Un�q�E����ov)�]�
B����
�
r�� -D���r��W�)*��x�S��"�Gz�g��٠9Lk��G�ZJo56�9��P;��6�:<�!���c�(/u)��ZLR��g«�/�/��wr%䣼	f��W���;��;o�$`�N��%��-x��r�d�&d�U�����p���O�P�O�:T	��o�ӛ�'���r�̮�c�z���A����c��YΚ&��x�|���O����e�`xs��R��_h>�B��a
+�c��0!�"��g�B6g�3��^P�*R�w?�g�XJ�$\Y�v#����B��[H�h��Fd�E�$���
ғ5�_�Ty���\>��B�υ?���mN]e_��9lb��w7s��7qu�u�WVײ�:��B�]]}QK�Y,{�k�wEL��ysJ���[8(�%&�
+_?���R]���/������'���(I�������Z�Jf)	�|F')�%r:���\/�s�G]J$�Oހ���G��.n4��p�%�X��?�tyw>*Oӗ<r�]�l�Erzw!���e4w*�<B�9aײ]�����h��������DQ�T�v<1������ahty�m!�ԭ��9�%gԦU�2��g�0q�|���݆�c��|�77�@�����V�N;���Cxy*�Pw�۶��w�OC��-8
�g}ܲ1�s��e���T��ד��,�<��_'���w�$z����ЙA��W��f�e��k�ϰ����ܨ\��'7^��=x/^�{
��&���ņ��Β�܂�Tꠜ�X_�*K����"�`��b,O� `��0������umz&ӑnW/��|?v�£ίڶ�����S՝�q����*�(��s����Q\#���.�M���{Ǡ����DuGpx7G-<�٪����f�d5gOzu�w�
+�
�]���L0
+ng�k�<��\{5�v�p��
���Z?
+��6:�ӊ\�P��pgF��3�I͙Ѹn�VV085N���JҎ�d�C��b$�i�9�gl�Ք����ڶ��wֻȯWJ��.�%���f9[��hw��cZi
`
`���mĹb�����^������0�m�*R�C�9����cm��v�?���?��h��������F����e3^#иlޱ�������f�
� ��:rg�7H7�A�x���xo�A�������v��#��8[n�-��a�5�-+
�mj:�}��-�����Y����2	���˱׋T�{~p�g�;�U��\��߭H�~�\�EV�D-�ƴ?�����
�d��*{.0�[��F�HPi��0ڜ��������VR������U2�񋹸0�t�e$YP�t���	��0�2�c���ye�����"�8)>��ğ_��P����
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/ue-meas-piecewise-a1.dia ns-3.19/src/lte/doc/source/figures/ue-meas-piecewise-a1.dia
--- ns-3.18.1/src/lte/doc/source/figures/ue-meas-piecewise-a1.dia	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/ue-meas-piecewise-a1.dia	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,12 @@
+��ݏ�8������+��_��v����'U���=#r
	J�n�����N؅HX��5k��
+3���e2���~�#랥Y�ķ=`;=�ţd������~��>�]������tn�Oęxvۛ�������Ã�2�'��K;c���(��\�wweY�
+�4����4��p�̙�9��
���4M��WJ��FI���=�n{o&ţw�Vs]�Ӡ{A�l�2���j�?�������Ir�|��9�G��%��ʸP<�{�~S�����}z�H>��4�w��ʉ��!�A?p<��9y��a��nͥݚ��"I����a�D�ƥ�<]���d#qk��(&a�'-�?�Qv�ʗ�����;M�qs�V$hy��l�C�t��W��߇Y8�ؾ���l�W�Q_�v
+zo>.�
�������#�?=L��e-nV�9�i��n���ܱS�T;Y&"�b�Z���Ӵ����ı�(��m�I2�����`��4�tl����yo+	�Y�����S�����6�Z$O>E`�ԇ��C��ú�=��{R�m���dcL��F�N���Yhq���!r�AE��F��H$��ʓ8�gL�nM�<�V��h���,_	7�If�я,�gy8�����#��p:�{<:��T��3Z��C�gC ��TERC��8r��	��������z*���8�����a�9�k�%xN'�%QЇ
+A��>�;�86��l@���5��T���~�@ �r��K�Oa̶�	�s�>RH l�S�E>�!��}d#��%q<`������68u���-��]�<G)��f��Rnw>7xU<8'�:��
h�&
gOYՃ�����Y��E:�@��#�u�c0�W#6Bg~�?9�a�<���I8�@�F  �'���ĉ�c~��mj�����Iŕ�*Nhr񗜋��@!�8p�����0W&_>�>%4R
��#Da�H_[]�=�H$*�I� Q�D��A"`H�
��%dH�5��3�($� @�<�h��<n
�:!0$ҟD�<�<� r׍#ܘ.=#���Y �.�i�Ձ(����j(Nx�R-�hR�6�QM��әn5
��@�q ��j�;��5�S�6
k�P��f�LG
+I7�O-���|�(�
+uC!�PHw
+I7�B��B��B�UH
+��B�\�
C!�)$�<,	Uւ��:.|�k��ڐH��u�"bP�;��ۨ�ڛ���"�h�"sKcG(2�4j�"�Fj��N�@EX���E�X�
��)Vk�"�Nj��X��@zD��YVd*���T��G�|+�ڊ5
+�Q��f(2e��M�Z{��R�-[cTA�fekh���Ȕ��G�t75V[���6��fekh���Ȕ��ߊO~_�>P�(wslGX��*�4��<h�7+��;켸��(���%@��
+���K�`�
���^�|��l�Dcs"U���p��_����
�z���8�n���qy�l��[�3�?���.r��ꠄ�К<��)w�;I��H@������Jݴ��w�{}P�gX�	/�`����m�L��&S2P��D�)]��9n�j�,2%蔙�e��ɔ�v<�dJ%W�ۈ�l%�TR�))&rD�'鄤�I�:�r��cIeM�ǮX7�A�u���A�qe8{w�j{�F
�]�����?u1�X���NHN&Ր��K�g��Jע�%�S+$EH�C�6��A�9B]�KgXLT�R�	�uY�֚��!���LY��0=��s��*�>�����ֆ�_�4
+xG4r�#M`r�����3�v���ܠ\���8��m(���A������R�]����Ԉ���Y2bˬoiXx˞�nz�m�zD�� 
�F���&��}�&'���C��S�p���k��s�Jc�����D�w
	�;��n��AQp��(�KeQ?	��(�q��l�<�t�}�&�x\73L��Ѹ4��K��K��a���M�p1�%i�o�4j܄F�0�A(*�ʌd�a�ճ�#T	����q�Ml��K�ܼ����@|�]6��o���] ���ŚOA|�.��З���N}]nhl'p}A�@�C��|���߾��o������X0�5�挗�:�x�x�x��V�K7�bQ��R��u�F����
^�nкx#9u���Xc���5��XzwU>�Ӕ����3ܪ
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/ue-meas-piecewise-a1-hys.dia ns-3.19/src/lte/doc/source/figures/ue-meas-piecewise-a1-hys.dia
--- ns-3.18.1/src/lte/doc/source/figures/ue-meas-piecewise-a1-hys.dia	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/ue-meas-piecewise-a1-hys.dia	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,9 @@
+��ݏ�8����@�˝Ħ�|�l��VڻYi�[��=#r���a�o_;�HB�8�#uK�M�ϕJ��Ï_W���%iGC`��
���,���}��w���ǻf
���-��oD�x�0\f�������g+ܦ4�+6V����aH�y�����`p���fT��Y��M�]���N�,�x͆E�]�i��������5��us_ꧡ�5]�I����m���K�^����j�
o�m�GMj����Z��Q�x��/��8�݁}_�N�VH���"����	����!�A|Ϸ]삗9y��I���~�%����:N��ٱ�I��F��,ٰ��Srk��(�A��-�?�az��ï��V�]$���pK-jzyf�r�U�t�o����$d��>��κ�v�}�������6��.3�F޾<,6���-jVnS��r��m֫�Ν��Pe��E�t˒]�?�����g@�Y����`N����4�
���F3���
>�����	����vy����qM�:~�)G�:�cx��=�T�N���h����@��Y����\r��L�B��W�ԑ;�
J�*nD�X�#�`}u(���0q|0�� ��s�Q:��V�	w2��~b�˂)=�淟�����s��Ѷ<����в���!�DNRI
~�m�	��"Z��?'�6��T�)�$p�fO�)U�b*��֊�x.'�%�?�
+A�Z
��#�-��Y�@
0�=��*5 R
���]���!�@�; ��#�����B��p��?`
<�9��L�4��1�f��։������t]|�j�-���i6�/��s�Pƃ}����oL�$~nX=e��,Z4��Ȋh�/ҋ��n���n�>���9�C���O�X`�c��:�X�!Tj��x����'�������3����f\q�1��_�=��5 "� �#�+ ^��(����Ϡ_��
4R
�\#D`�Ho-.�t@"��� $"�D�$�D=��!C"�I�v@"��D����
+"�	�>q�5$�D��Hy�$rՃ��%�pa��� 2g=�ȽƤ���/"8*��P,x"R-�h�6�QM��ҙl5
��@:q ��j�;��5�S�6	k�P����.���N��Z
+�
+y:Q�1�B�����N��@-��=�D��>����"�B�SH:yX$��!˱��!�B>�!�H�5(�EĠHwI�QC���{�"dk�"���'�=�ڣH:���S#PB(r�A�	V��"d��ڣH:��
V#"P�^P�i���uO(2k�Q$�J�6b��Ca��Lغ�4F��E��j���P�Y���uO(2ak�Q$�M�Ն��{�"�Y���uO(2ak�Q��sL(-L�Ď�|�+q, ��i��5[&,]��̰Hy)"��W�����C�A�t���E�6W5A$bA�廭]-j-�i�8����\��8�OC���s������ND1�p�NDC:��>8�'l����wP���+�'/�-[H����t>�i�wo��s.,�]���~����Ⱦj��������~���Fo���J'~�Tq�]T�/t��
�A}A����#��+p��$STP��ou%��H�7��TN�R�ߡ
+���^X��s�^����U�H���c
+���:؁d�w�/�m!��ѥ�ϻ迉��`!�����b�^�W���+.���xX
+�$ x�&�L)���I}�a
W�Ԕۃ��A5����^%Q��8JJ5�h<�+���؁�nA.yJ�3���R�&O�
+�:�uC��z��HR�d�tJ����~��m�}9�C�*��D��(O���\�֚�¸�f\i8'��}@c��A�Z?��fa~_�j�G&9��M���9��PaV�i����%��"|�Q����6��7�T�p!2��8ǯ�En/��-����fu�[?o&,Bg4 �
�3_j3���R#����•�n�hV�ѠQ�19�A�aa���v�X�b�[S�տ��,|N�\_N��S�8����e
p)��p5�gs�Z�B�|�h[,`L�S�B���L"�(��\F��
���.��}[���R�m%W����l��Y"����e�<���Eo�YU�$�CF�BP�l��}�=��o��2N�?�(�a���4L��CS&$�LR�=��B�_:��S|��{�p������L{�TM~yɯ�<���2r�s18����ױ��̗��oN}]����z��@��!��S��g����e0�+a��������ϻ���2��ւ٧�[��y����9�ys�#{dn�J{X>�T}����*ˆX}��sM`��?r����9X�⫭�jG�(��*�Q��n��o�����t���nY�xW��������3����
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/figures/ue-meas-piecewise-motion.dia ns-3.19/src/lte/doc/source/figures/ue-meas-piecewise-motion.dia
--- ns-3.18.1/src/lte/doc/source/figures/ue-meas-piecewise-motion.dia	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/doc/source/figures/ue-meas-piecewise-motion.dia	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,17 @@
+��[s�6���)����e��N��ӇNۙn�ꑍ����
r�K?{�%`0��h�3ɌA>���$ė���@{dq�G���Dc�2��pu3����O�����ϧ���*�k�"L�w7��4�|�N����`��4���06��
��B��핦U
x4�ٱ�(M��_<�L��Lt�cG�7)J��Q��#
n&�w�k2-�Lkv���[Č��6m��bz����&J|^$�n��t���Wʔ�^(\�^����K*��j��N'��+?����&(��7q״�
^������u���O�(Nc��.Q0^�����'YҀw�C�P�;?M��뿣ArL��;��U�����V��ʓ���gA�UX�
+���'�"`mW����o�c�����~����PX�<�F�><�|�%=ݬ^���}Yl����r�6Lq�1X�.�eqi���aZ+���8]���˻J�D��2-+�gJC�ƞ�I����v�>���f������8��k���Q�����2�X4-���i�
+Xa.ѡa!�0��d
�4��(�,��
+]�����j����M�o1��6��ߞ/�2
`�_�4g���4����/��V�CM��׆u��^}����NW x�
+�,p
�dF�LWn.��Y��2�;����=�
�R�p��N
+�4���\�Ђd���F��NӬzf{�2]��|y\+�XI�����qǂ��,�kI�i���vG�~��F�d�%�6�.q����,������_�=�W���P��N]����
;:�
!�d�����@��4�9���U�f��fe&q���y�ۄ�_ҁI�(4B�i�
+�4��;;���HAh�
+BBx8���E	2L�
����2w����o�Ccp��"�8$5��8d�0��`���gD��|F$��L�h���H�HjY���:)�0_�e�Yl��e �͑�i%X�y~«�d�H��T�
F����#{0��П��yXF�20&:�%T��k� ����#Ɗ�K�9CI��P �l�
:�gD�τ�3I�C�4�u�@$D���B΅ܡH(��0�� �4
+��PAHB�����K!R��#�,E�q(d+
+�N��������J!e���(4
+��PQHF
+
N��~��ň˴��,�ȑ�D�]
+Ec��(Ɏ����Pl|�U!S2�(�H(Raj�Q48���S#PC�Pd˃"�EH��G���j$6X�H�"�"G�Y��X��"��E�Ӫ�؈5r�(�P2���Hwy����(�T�ņ�1��H��5Ta�P���ңhpV5��vED��5Ta�P���Ҡ�(�v�Q������&4�7�ܣ��Gᆷ���
+ɡ
+
�=��j������
5���@�f!(�q�,�Z���ID
+�Q��4��DI�%�p��
+��!�m��W�5���.SP��������Xc��3A�_@�Q))t�{3D�Q�܍Q����>D��e$��]%�K�>�MB�JΣN.'���x=�*՚H�w�ԭ[���9C���ma&&=_J�mըVkFd
���HQYgH���B�U��B�H)��C��Hu���ϐ�,v�z�����`7��)�g ��ZM]���3��\M��ORx�+�z�Z3��ΫXߥ=��gH#�-�.�3��d�4G����U��q���U���{{U{"���Wh�5�
\ No newline at end of file
diff -Naur ns-3.18.1/src/lte/doc/source/lte-design.rst ns-3.19/src/lte/doc/source/lte-design.rst
--- ns-3.18.1/src/lte/doc/source/lte-design.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/lte-design.rst	2013-12-20 09:44:51.000000000 -0800
@@ -1,14 +1,14 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
-
-++++++++++++++++++++++++++
- Design Documentation
-++++++++++++++++++++++++++
+++++++++++++++++++++
+Design Documentation
+++++++++++++++++++++
 
 
----------
+--------
 Overview
----------
+--------
 
 
 An overview of the  LTE-EPC simulation model is depicted in
@@ -34,9 +34,9 @@
 
 .. _sec-design-criteria:
 
------------------------
+---------------
 Design Criteria
------------------------
+---------------
 
 
 LTE Model
@@ -61,7 +61,7 @@
     The reason is that, since packet scheduling is done on
     a per-RB basis, an eNB might transmit on a subset only of all the available
     RBs, hence interfering with other eNBs only on those RBs where it is
-    trasmitting.
+    transmitting.
     Note that this requirement rules out the adoption of a system level simulation
     approach, which evaluates resource allocation only at the granularity of
     call/bearer establishment.
@@ -114,11 +114,10 @@
 The main objective of the EPC model is to provides means for the
 simulation of end-to-end IP connectivity over the LTE model. 
 To this aim, it supports for the
-interconnection of multiple UEs to the internet, via a radio access
+interconnection of multiple UEs to the Internet, via a radio access
 network of multiple eNBs connected to a single SGW/PGW node, as shown
 in Figure :ref:`fig-epc-topology`.
 
-
 The following design choices have been made for the EPC model:
 
  #. The only Packet Data Network (PDN) type supported is IPv4.
@@ -157,18 +156,18 @@
 
 
 
-.. _overall-architecture:
+.. _sec-overall-architecture:
 
------------------------
+------------
 Architecture
------------------------
+------------
 
 
 
 
 
-LTE Model 
-++++++++++
+LTE Model
++++++++++
 
 
 
@@ -391,6 +390,8 @@
 on the actual models used in each case. 
 
 
+.. _sec-fading-model:
+
 Fading Model
 ++++++++++++
 
@@ -439,12 +440,12 @@
 Antennas
 ++++++++
 
-Being based on the SpectrumPhy, the LTE PHY model supports antenna
-modeling via the ns-3 AntennaModel class. Hence, any model based on
+Being based on the ``SpectrumPhy``, the LTE PHY model supports antenna
+modeling via the ns-3 ``AntennaModel`` class. Hence, any model based on
 this class can be associated with any eNB or UE instance. For
-instance, the use of the CosineAntennaModel associated with an eNB
+instance, the use of the ``CosineAntennaModel`` associated with an eNB
 device allows to model one sector of a macro base station. By default,
-the IsotropicAntennaModel is used for both eNBs and UEs. 
+the ``IsotropicAntennaModel`` is used for both eNBs and UEs. 
 
 
 
@@ -455,9 +456,9 @@
         \clearpage
 
 
-----
+---
 PHY
-----
+---
 
 
 Overview
@@ -476,9 +477,10 @@
 .. _fig-lte-subframe-structure:
 
 .. figure:: figures/lte-subframe-structure.*
-   :width: 50px
+   :align: center
+   :width: 300px
 
-   Lte subframe division.
+   LTE subframe division.
 
 
 Considering the granularity of the simulator based on RB, the control and the reference signaling have to be consequently modeled considering this constraint.  According to the standard [TS36211]_, the downlink control frame starts at the beginning of each subframe and lasts up to three symbols across the whole system bandwidth, where the actual duration is provided by the Physical Control Format Indicator Channel (PCFICH). The information on the allocation are then mapped in the remaining resource up to the duration defined by the PCFICH, in the so called Physical Downlink Control Channel (PDCCH). A PDCCH transports a single message called Downlink Control Information (DCI) coming from the MAC layer, where the scheduler indicates the resource allocation for a specific user.
@@ -725,7 +727,7 @@
 Therefore the PHY layer implements the MIMO model as the gain perceived by the receiver when using a MIMO scheme respect to the one obtained using SISO one. We note that, these gains referred to a case where there is no correlation between the antennas in MIMO scheme; therefore do not model degradation due to paths correlation.
 
 
-.. _phy-ue-measurements:
+.. _sec-phy-ue-measurements:
 
 UE PHY Measurements Model
 +++++++++++++++++++++++++
@@ -776,9 +778,9 @@
 
 
 
-----------
-HARQ 
-----------
+----
+HARQ
+----
 
 The HARQ scheme implemented is based on a incremental redundancy (IR) solutions combined with multiple stop-and-wait processes for enabling a continuous data flow. In detail, the solution adopted is the *soft combining hybrid IR Full incremental redundancy* (also called IR Type II), which implies that the retransmissions contain only new information respect to the previous ones. The resource allocation algorithm of the HARQ has been implemented within the respective scheduler classes (i.e., ``RrFfMacScheduler`` and ``PfFfMacScheduler``, refer to their correspondent sections for more info), while the decodification part of the HARQ has been implemented in the ``LteSpectrumPhy`` and ``LteHarqPhy`` classes which will be detailed in this section.
 
@@ -821,9 +823,9 @@
    Interaction between HARQ and LTE protocol stack
 
 
-------
-MAC 
-------
+---
+MAC
+---
   
 
 Resource Allocation Model
@@ -832,7 +834,7 @@
 
 We now briefly describe how resource allocation is handled in LTE,
 clarifying how it is modeled in the simulator. The scheduler is in
-charge of generating specific structures calles Data Control Indication (DCI)
+charge of generating specific structures called *Data Control Indication* (DCI)
 which are then transmitted by the PHY of the eNB to the connected UEs, in order
 to inform them of the resource allocation on a per subframe basis. In doing this
 in the downlink direction, the scheduler has to fill some specific fields of the
@@ -914,6 +916,7 @@
 MAC headers specified by 3GPP. 
 
 
+.. _sec-ff-mac-scheduler:
 
 The FemtoForum MAC Scheduler Interface
 ++++++++++++++++++++++++++++++++++++++
@@ -1003,7 +1006,7 @@
 
 For what concern the HARQ, RR implements the non adaptive version, which implies that in allocating the retransmission attempts RR uses the same allocation configuration of the original block, which means maintaining the same RBGs and MCS. UEs that are allocated for HARQ retransmissions are not considered for the transmission of new data in case they have a transmission opportunity available in the same TTI. Finally, HARQ can be disabled with ns3 attribute system for maintaining backward compatibility with old test cases and code, in detail::
 
-  Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false));
+   Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false));
 
 The scheduler implements the filtering of the uplink CQIs according to their nature with ``UlCqiFilter`` attibute, in detail:
 
@@ -1081,11 +1084,14 @@
    \right)}{\tau}
    
 
-For what concern the HARQ, PF implements the non adaptive version, which implies that in allocating the retransmission attempts the scheduler uses the same allocation configuration of the original block, which means maintaining the same RBGs and MCS. UEs that are allocated for HARQ retransmissions are not considered for the transmission of new data in case they have a transmission opportunity available in the same TTI. Finally, HARQ can be disabled with ns3 attribute system for maintaining backward compatibility with old test cases and code, in detail.
+For what concern the HARQ, PF implements the non adaptive version, which implies that in allocating the retransmission attempts the scheduler uses the same allocation configuration of the original block, which means maintaining the same RBGs and MCS. UEs that are allocated for HARQ retransmissions are not considered for the transmission of new data in case they have a transmission opportunity available in the same TTI. Finally, HARQ can be disabled with ns3 attribute system for maintaining backward compatibility with old test cases and code, in detail::
+
+   Config::SetDefault ("ns3::PfFfMacScheduler::HarqEnabled", BooleanValue (false));
+
 
 
 Maximum Throughput (MT) Scheduler
-----------------------------------
+---------------------------------
 
 The Maximum Throughput (MT) scheduler [FCapo2012]_ aims to maximize the overall throughput of eNB.
 It allocates each RB to the user that can achieve the maximum achievable rate in the current TTI.
@@ -1122,7 +1128,7 @@
 
 
 Throughput to Average (TTA) Scheduler
---------------------------------------
+-------------------------------------
 
 The Throughput to Average (TTA) scheduler [FCapo2012]_ can be considered as an intermediate between MT and PF. 
 The metric used in TTA is calculated as follows:
@@ -1255,6 +1261,8 @@
 metric (:math:`Msch`, :math:`MCoI`) by weight :math:`W[n]`. This strategy will guarantee the throughput of lower
 quality UE tend towards the TBR. 
 
+::
+
   Config::SetDefault ("ns3::PfFfMacScheduler::HarqEnabled", BooleanValue (false));
 
 The scheduler implements the filtering of the uplink CQIs according to their nature with ``UlCqiFilter`` attibute, in detail:
@@ -1264,6 +1272,8 @@
   - ``ALL_UL_CQI``: all CQIs are stored in the same internal attibute (i.e., the last CQI received is stored independently from its nature).
 
 
+.. _sec-random-access:
+
 Random Access
 +++++++++++++
 
@@ -1347,9 +1357,9 @@
         \clearpage
 
 
-----
-RLC 
-----
+---
+RLC
+---
 
 
 
@@ -1441,7 +1451,7 @@
           in the receiver peer
 
 
-.. _am_data_transfer:
+.. _sec-am_data_transfer:
 
 AM RLC
 ++++++
@@ -1667,7 +1677,7 @@
 retransmission are not performed, and there are no STATUS PDUs.
 
 Transmit operations in uplink
-------------------------------
+-----------------------------
 
 The transmit operations in the uplink are similar to those of the
 downlink, with the main difference that the Report_Buffer_Status is
@@ -1857,11 +1867,13 @@
 
  - generation (at the eNB) and interpretation (at the UE) of System
    Information (in particular the Master Information Block and, at the
-   time of this writing, only System Information Block Type 2)
+   time of this writing, only System Information Block Type 1 and 2)
+ - initial cell selection
  - RRC connection establishment procedure
  - RRC reconfiguration procedure, supporting the following use cases:
    + reconfiguration of the SRS configuration index
    + reconfiguration of the PHY TX mode (MIMO)
+   + reconfiguration of UE measurements
    + data radio bearer setup
    + handover
  - RRC connection re-establishment, supporting the following use
@@ -1901,6 +1913,7 @@
 .. _fig-lte-ue-rrc-states:
 
 .. figure:: figures/lte-ue-rrc-states.*
+   :scale: 70 %
    :align: center
 
    UE RRC State Machine
@@ -1938,11 +1951,173 @@
 .. _fig-lte-enb-rrc-states:
 
 .. figure:: figures/lte-enb-rrc-states.*
+   :scale: 70 %
    :align: center
 
    ENB RRC State Machine for each UE
 
 
+.. _sec-initial-cell-selection:
+
+Initial Cell Selection
+++++++++++++++++++++++
+
+Initial cell selection is an IDLE mode procedure, performed by UE when it has
+not yet camped or attached to an eNodeB. The objective of the procedure is to
+find a suitable cell and attach to it to gain access to the cellular network.
+
+It is typically done at the beginning of simulation, as depicted in Figure
+:ref:`fig-lte-cell-selection-timeline` below. The time diagram on the left side
+is illustrating the case where initial cell selection succeed on first try,
+while the diagram on the right side is for the case where it fails on the first
+try and succeed on the second try. The timing assumes the use of real RRC
+protocol model (see :ref:`sec-rrc-protocol-models`) and no transmission error.
+
+.. _fig-lte-cell-selection-timeline:
+
+.. figure:: figures/lte-cell-selection-timeline.*
+   :scale: 80 %
+   :align: center
+
+   Sample runs of initial cell selection in UE and timing of related events
+
+The functionality is based on 3GPP IDLE mode specifications, such as in
+[TS36300]_, [TS36304]_, and [TS36331]_. However, a proper implementation of IDLE
+mode is still missing in the simulator, so we reserve several simplifying
+assumptions:
+
+ - multiple carrier frequency is not supported;
+ 
+ - multiple Public Land Mobile Network (PLMN) identities (i.e. multiple network
+   operators) is not supported;
+ 
+ - RSRQ measurements are not utilized;
+ 
+ - stored information cell selection is not supported;
+
+ - "Any Cell Selection" state and camping to an acceptable cell is not
+   supported;
+ 
+ - marking a cell as barred or reserved is not supported;
+
+ - cell reselection is not supported, hence it is not possible for UE to camp to
+   a different cell after the initial camp has been placed; and
+ 
+ - UE's Closed Subscriber Group (CSG) white list contains only one CSG identity.
+   
+Also note that initial cell selection is only available for EPC-enabled
+simulations. LTE-only simulations must use the manual attachment method. See
+section :ref:`sec-network-attachment` of the User Documentation for more
+information on their differences in usage.
+
+The next subsections cover different parts of initial cell selection, namely
+*cell search*, *broadcast of system information*, and *cell selection evaluation*.
+
+.. _sec-cell-search:
+
+Cell Search
+-----------
+
+Cell search aims to detect surrounding cells and measure the strength of
+received signal from each of these cells. One of these cells will become the
+UE's entry point to join the cellular network.
+
+The measurements are based on the RSRP of the received PSS, averaged by Layer 1
+filtering, and performed by the PHY layer, as previously described in more
+detail in section :ref:`sec-phy-ue-measurements`. PSS is transmitted by eNodeB
+over the central 72 sub-carriers of the DL channel (Section 5.1.7.3 [TS36300]_),
+hence we model cell search to operate using a DL bandwidth of 6 RBs. Note that
+measurements of RSRQ are not available at this point of time in simulation. As
+a consequence, the ``LteUePhy::RsrqUeMeasThreshold`` attribute does not apply
+during cell search.
+
+By using the measured RSRP, the PHY entity is able to generate a list of
+detected cells, each with its corresponding cell ID and averaged RSRP. This list
+is periodically pushed via CPHY SAP to the RRC entity as a measurement report.
+
+The RRC entity inspects the report and simply choose the cell with the strongest
+RSRP, as also indicated in Section 5.2.3.1 of [TS36304]_. Then it instructs back
+the PHY entity to synchronize to this particular cell. The actual operating
+bandwidth of the cell is still unknown at this time, so the PHY entity listens
+only to the minimum bandwidth of 6 RBs. Nevertheless, the PHY entity will be
+able to receive system broadcast message from this particular eNodeB, which is
+the topic of the next subsection.
+
+Broadcast of System Information
+-------------------------------
+
+System information blocks are broadcasted by eNodeB to UEs at predefined time
+intervals, adapted from Section 5.2.1.2 of [TS36331]_. The supported system
+information blocks are:
+
+ - Master Information Block (MIB)
+      Contains parameters related to the PHY layer, generated during cell
+      configuration and broadcasted every 10 ms at the beginning of radio frame
+      as a control message.
+
+ - System Information Block Type 1 (SIB1)
+      Contains information regarding network access, broadcasted every 20 ms at
+      the middle of radio frame as a control message. Not used in manual
+      attachment method. UE must have decoded MIB before it can receive SIB1.
+      
+ - System Information Block Type 2 (SIB2)
+      Contains UL- and RACH-related settings, scheduled to transmit via RRC
+      protocol at 16 ms after cell configuration, and then repeats every 80 ms
+      (configurable through `LteEnbRrc::SystemInformationPeriodicity` attribute.
+      UE must be camped to a cell in order to be able to receive its SIB2.
+
+Reception of system information is fundamental for UE to advance in its
+lifecycle. MIB enables the UE to increase the initial DL bandwidth of 6 RBs to
+the actual operating bandwidth of the network. SIB1 provides information
+necessary for cell selection evaluation (explained in the next section). And
+finally SIB2 is required before the UE is allowed to switch to CONNECTED state.
+
+Cell Selection Evaluation
+-------------------------
+
+UE RRC reviews the measurement report produced in :ref:`sec-cell-search` and the
+cell access information provided by SIB1. Once both information is available for
+a specific cell, the UE triggers the evaluation process. The purpose of this
+process is to determine whether the cell is a suitable cell to camp to.
+
+The evaluation process is a slightly simplified version of Section 5.2.3.2 of
+[TS36304]_. It consists of the following criteria:
+
+ - Rx level criterion; and
+ 
+ - closed subscriber group (CSG) criterion.
+ 
+The first criterion, Rx level, is based on the cell's measured RSRP
+:math:`Q_{rxlevmeas}`, which has to be higher than a required minimum
+:math:`Q_{rxlevmin}` in order to pass the criterion:
+
+.. math::
+
+   Q_{rxlevmeas} - Q_{rxlevmin} > 0 
+
+where :math:`Q_{rxlevmin}` is determined by each eNodeB and is obtainable by UE
+from SIB1.
+
+The last criterion, CSG, is a combination of a true-or-false parameter called
+*CSG indication* and a simple number *CSG identity*. The basic rule is that UE
+shall not camp to eNodeB with a different CSG identity. But this rule is only
+enforced when CSG indication is valued as true. More details are provided in
+Section :ref:`sec-network-attachment` of the User Documentation.
+
+When the cell passes all the above criteria, the cell is deemed as *suitable*.
+Then UE camps to it (`IDLE_CAMPED_NORMALLY` state).
+
+After this, upper layer may request UE to enter CONNECTED mode. Please refer to
+section :ref:`sec-rrc-connection-establishment` for details on this.
+
+On the other hand, when the cell does not pass the CSG criterion, then the cell
+is labeled as *acceptable* (Section 10.1.1.1 [TS36300]_). In this case, the RRC
+entity will tell the PHY entity to synchronize to the second strongest cell and
+repeat the initial cell selection procedure using that cell. As long as no
+suitable cell is found, the UE will repeat these steps while avoiding cells that
+have been identified as acceptable.
+
+   
 
 Radio Admission Control
 +++++++++++++++++++++++
@@ -1990,109 +2165,493 @@
 based on UE measurements are planned only at a later stage).
 
 
-UE Measurements
-+++++++++++++++
+.. _sec-ue-measurements:
 
+UE RRC Measurements Model
++++++++++++++++++++++++++
 
 UE RRC measurements support
 ---------------------------
 
-The UE RRC entity provides support for UE measurements; in
-particular, it implements the procedures described in Section 5.5 of
-[TS36331]_, with the following simplifying assumptions:
+The UE RRC entity provides support for UE measurements; in particular, it
+implements the procedures described in Section 5.5 of [TS36331]_, with the
+following simplifying assumptions:
 
- - only E-UTRA intra-frequency measurements are supported;
+ - only E-UTRA intra-frequency measurements are supported, which implies:
+   
+   - only one measurement object is used during the simulation;
+   - measurement gaps are not needed to perform the measurements;
+   - Event B1 and B2 are not implemented;
+   
+ - only `reportStrongestCells` purpose is supported, while `reportCGI` and
+   `reportStrongestCellsForSON` purposes are not supported;
 
- - measurement gaps are not needed to perform the measurements;
+ - `s-Measure` is not supported;
+ 
+ - since carrier aggregation is not supported in by the LTE module, the
+   following assumptions in UE measurements hold true:
+   
+   - no notion of secondary cell (`SCell`);
+   - primary cell (`PCell`) simply means serving cell;
+   - Event A6 is not implemented;
+   
+ - speed dependant scaling of time-to-trigger (Section 5.5.6.2 of [TS36331]_) is
+   not supported.
 
- - only event-driven measurements are supported; the other type of
-   measurements are not supported;
+Overall design
+--------------
 
- - only the events A2 and A4 are to be supported; 
+The model is based on the concept of *UE measurements consumer*, which is an
+entity that may request an eNodeB RRC entity to provide UE measurement reports.
+Consumers are, for example, :ref:`sec-handover-algorithm`, which compute
+handover decision based on UE measurement reports. Test cases and user's
+programs may also become consumers. Figure :ref:`fig-ue-meas-consumer` depicts
+the relationship between these entities.
 
- - time-to-trigger is not supported, i.e., a time-to-trigger value
-   equal to zero is always assumed;
+.. _fig-ue-meas-consumer:
+   
+.. figure:: figures/ue-meas-consumer.*
+   :scale: 80 %
+   :align: center
 
- - layer 3 filtering assumes that the periodicity of the measurements
-   reported by the PHY is equal to 200ms;
+   Relationship between UE measurements and its consumers
 
- - in measurement reports, the reportQuantity is always assumed to be
-   "both", i.e., both RSRP and RSRQ are always reported, regardless of
-   the trigger quantity.
+The whole UE measurements function at the RRC level is divided into 4 major
+parts:
 
+ #. Measurement configuration (handled by ``LteUeRrc::ApplyMeasConfig``)
+ 
+ #. Performing measurements (handled by ``LteUeRrc::DoReportUeMeasurements``)
+ 
+ #. Measurement report triggering (handled by
+    ``LteUeRrc::MeasurementReportTriggering``)
+   
+ #. Measurement reporting (handled by ``LteUeRrc::SendMeasurementReport``)
 
-eNB RRC measurement configuration
----------------------------------
+The following sections will describe each of the parts above.
 
-The eNB RRC entity configures the UE measurements. The eNB RRC entity
-sends the configuration parameters to the UE RRC entity in the
-MeasConfig IE of the RRC Connection Reconfiguration message when the UE
-attaches to the eNB or the RRC Handover Request message when the target
-eNB initiates the handover procedure.
+Measurement configuration
+-------------------------
 
-The eNB RRC entity implements the configuration parameters and procedures
-described in Section 5.5 of [TS36331]_, with the following simplifying
-assumptions:
+An eNodeB RRC entity configures UE measurements by sending the configuration
+parameters to the UE RRC entity. This set of parameters are defined within the
+``MeasConfig`` Information Element (IE) of the RRC Connection Reconfiguration
+message (:ref:`sec-rrc-connection-reconfiguration`).
 
- - only E-UTRA intra-frequency measurements are configured, so only the
-   downlink carrier frequency of the serving cell is configured as
-   measurement object;
+The eNodeB RRC entity implements the configuration parameters and procedures
+described in Section 5.5.2 of [TS36331]_, with the following simplifying
+assumption:
 
- - only the events A2 and A4 are configured;
+ - configuration (i.e. addition, modification, and removal) can only be done
+   before the simulation begins;
+   
+ - all UEs attached to the eNodeB will be configured the same way, i.e. there is
+   no support for configuring specific measurement for specific UE; and
+   
+ - it is assumed that there is a one-to-one mapping between the PCI and the
+   E-UTRAN Global Cell Identifier (EGCI). This is consistent with the PCI
+   modeling assumptions described in :ref:`sec-phy-ue-measurements`.
+
+The eNodeB RRC instance here acts as an intermediary between the consumers and
+the attached UEs. At the beginning of simulation, each consumer provides the
+eNodeB RRC instance with the UE measurements configuration that it requires.
+After that, the eNodeB RRC distributes the configuration to attached UEs.
+
+Users may customize the measurement configuration using several methods. Please
+refer to Section :ref:`sec-configure-ue-measurements` of the User Documentation
+for the description of these methods.
 
- - only the RSRQ threshold is configured for both events;
+.. _sec-performing-measurements:
 
- - the reportInterval parameter is configured to 480 ms, so once the
-   events are triggered, the UE will send the measurement reports with
-   this periodicity;
+Performing measurements
+-----------------------
 
- - the filterCoefficientRSRQ parameter is configured to fc4, it is the
-   default value specified in the protocol specification [TS36331]_;
+UE RRC receives both RSRP and RSRQ measurements on periodical basis from UE PHY,
+as described in :ref:`sec-phy-ue-measurements`. *Layer 3 filtering* will be
+applied to these received measurements. The implementation of the filtering
+follows Section 5.5.3.2 of [TS36331]_:
 
- - the hysteresis and timeToTrigger parameters are configured with
-   values equal to zero;
+.. math::
 
- - it is assumed that there is a one-to-one mapping between the PCI
-   and the E-UTRAN Global Cell Identifier (EGCI). This is consistent
-   with the PCI modeling assumptions described in :ref:`phy-ue-measurements`.
+   F_n = (1 - a) \times F_{n-1} + a \times M_n
 
+where:
 
+ - :math:`M_n` is the latest received measurement result from the physical
+   layer;
+ - :math:`F_n` is the updated filtered measurement result;
+ - :math:`F_{n-1}` is the old filtered measurement result, where
+   :math:`F_0 = M_1` (i.e. the first measurement is not filtered); and
+ - :math:`a = (\frac{1}{2})^{\frac{k}{4}}`, where :math:`k` is the configurable
+   `filterCoefficent` provided by the ``QuantityConfig``;
+   
+:math:`k = 4` is the default value, but can be configured by setting the
+`RsrpFilterCoefficient` and `RsrqFilterCoefficient` attributes in
+``LteEnbRrc``.
+
+Therefore :math:`k = 0` will disable Layer 3 filtering. On the other hand, past
+measurements can be granted more influence on the filtering results by using
+larger value of :math:`k`.
+
+Measurement reporting triggering
+--------------------------------
+
+In this part, UE RRC will go through the list of active measurement
+configuration and check whether the triggering condition is fulfilled in
+accordance with Section 5.5.4 of [TS36331]_. When at least one triggering
+condition from all the active measurement configuration is fulfilled, the
+measurement reporting procedure (described in the next subsection) will be
+initiated.
+
+3GPP defines two kinds of `triggerType`: *periodical* and *event-based*. At the
+moment, only event-based criterion is supported. There are various events that
+can be selected, which are briefly described in the table below: 
+
+.. table:: List of supported event-based triggering criteria
+
+   ======== ======================================================
+   Name     Description
+   ======== ======================================================
+   Event A1 Serving cell becomes better than `threshold`
+   Event A2 Serving cell becomes worse than `threshold`
+   Event A3 Neighbour becomes `offset` dB better than serving cell
+   Event A4 Neighbour becomes better than `threshold`
+   Event A5 Serving becomes worse than `threshold1`
+            *AND* neighbour becomes better than `threshold2`
+   ======== ======================================================
+
+Two main conditions to be checked in an event-based trigger are the *entering
+condition* and the *leaving condition*. More details on these two can be found
+in Section 5.5.4 of [TS36331]_.
+
+An event-based trigger can be further configured by introducing hysteresis and
+time-to-trigger. *Hysteresis* (:math:`Hys`) defines the distance between the
+entering and leaving conditions in dB. Similarly, *time-to-trigger* introduces
+delay to both entering and leaving conditions, but as a unit of time.
+
+The *periodical* type of reporting trigger is not supported, but its behaviour
+can be easily obtained by using an event-based trigger. This can be done by
+configuring the measurement in such a way that the entering condition is always
+fulfilled, for example, by setting the threshold of Event A1 to zero (the
+minimum level). As a result, the measurement reports will always be triggered
+at every certain interval, as determined by the `reportInterval` field within
+``LteRrcSap::ReportConfigEutra``, therefore producing the same behaviour as
+periodical reporting.
+
+As a limitation with respect to 3GPP specifications, the current model does not
+support any cell-specific configuration. These configuration parameters are
+defined in measurement object. As a consequence, incorporating a list of black
+cells into the triggering process is not supported. Moreover, cell-specific
+offset (i.e., :math:`O_{cn}` and :math:`O_{cp}` in Event A3, A4, and A5) are not
+supported as well. The value equal to zero is always assumed in place of them.
+
+Measurement reporting
+---------------------
+
+This part handles the submission of measurement report from the UE RRC entity
+to the serving eNodeB entity via RRC protocol. Several simplifying assumptions
+have been adopted:
+
+ - `reportAmount` is *not* applicable (i.e. always assumed to be infinite);
+   
+ - in measurement reports, the `reportQuantity` is always assumed to be `BOTH`,
+   i.e., both RSRP and RSRQ are always reported, regardless of the
+   `triggerQuantity`.
+
+
+.. _sec-handover:
 
 Handover
 ++++++++
 
-The RRC model support the execution of an X2-based handover procedure.
-There are 2 ways to trigger the handover procedure:
+The RRC model supports UE mobility in CONNECTED mode by invoking the X2-based
+handover procedure. The model is intra-EUTRAN and intra-frequency, as based on
+Section 10.1.2.1 of [TS36300]_.
+
+This section focuses on the process of triggering a handover. The handover
+execution procedure itself is covered in Section :ref:`sec-x2`.
 
- - the handover could be triggered explicitly by the simulation program
-   by scheduling an execution of the method ``LteEnbRrc::SendHandoverRequest ()``
+There are two ways to trigger the handover procedure:
 
- - the handover could be triggered automatically by the eNB RRC entity.
-   The eNB executes the following algorithm :ref:`fig-lte-handover-algorithm` 
-   to trigger the handover procedure for a UE providing measurements in its
-   serving cell and the neighbour cells the UE measures:
+ - *explicitly* (or manually) triggered by the simulation program by scheduling
+   an execution of the method ``LteEnbRrc::SendHandoverRequest``; or
 
-.. _fig-lte-handover-algorithm:
+ - *automatically* triggered by the eNodeB RRC entity based on UE measurements
+   and according to the selected handover algorithm.
 
-.. figure:: figures/lte-handover-algorithm.*
+Section :ref:`sec-x2-based-handover` of the User Documentation provides some
+examples on using both explicit and automatic handover triggers in simulation.
+The next subsection will take a closer look on the automatic method, by
+describing the design aspects of the handover algorithm interface and the
+available handover algorithms.
+
+.. _sec-handover-algorithm:
+
+Handover algorithm
+------------------
+
+Handover in 3GPP LTE has the following properties:
+
+ - UE-assisted
+     The UE provides input to the network in the form of measurement reports.
+     This is handled by the :ref:`sec-ue-measurements`.
+   
+ - Network-controlled
+     The network (i.e. the source eNodeB and the target eNodeB) decides when to
+     trigger the handover and oversees its execution.
+
+The *handover algorithm* operates at the source eNodeB and is responsible in
+making handover decisions in an "automatic" manner. It interacts with an eNodeB
+RRC instance via the *Handover Management SAP* interface. These relationships
+are illustrated in Figure :ref:`fig-ue-meas-consumer` from the previous section.
+
+The handover algorithm interface consists of the following methods:
+
+ - ``AddUeMeasReportConfigForHandover``
+     (Handover Algorithm -> eNodeB RRC) Used by the handover algorithm to
+     request measurement reports from the eNodeB RRC entity, by passing the
+     desired reporting configuration. The configuration will be applied to
+     all future attached UEs.
+
+ - ``ReportUeMeas``
+     (eNodeB RRC -> Handover Algorithm) Based on the UE measurements configured
+     earlier in ``AddUeMeasReportConfigForHandover``, UE may submit measurement
+     reports to the eNodeB. The eNodeB RRC entity uses the ``ReportUeMeas``
+     interface to forward these measurement reports to the handover algorithm.
+     
+ - ``TriggerHandover``
+     (Handover Algorithm -> eNodeB RRC) After examining the measurement reports
+     (but not necessarily), the handover algorithm may declare a handover. This
+     method is used to notify the eNodeB RRC entity about this decision, which
+     will then proceed to commence the handover procedure. 
+
+One note for the ``AddUeMeasReportConfigForHandover``. The method will return
+the ``measId`` (measurement identity) of the newly created measurement
+configuration. Typically a handover algorithm would store this unique number. It
+may be useful in the ``ReportUeMeas`` method, for example when more than one
+configuration has been requested and the handover algorithm needs to
+differentiate incoming reports based on the configuration that triggered them.
+
+A handover algorithm is implemented by writing a subclass of the
+``LteHandoverAlgorithm`` abstract superclass and implementing each of the above
+mentioned SAP interface methods. Users may develop their own handover algorithm
+this way, and then use it in any simulation by following the steps outlined in
+Section :ref:`sec-x2-based-handover` of the User Documentation.
+
+Alternatively, users may choose to use one of the 3 built-in handover algorithms
+provided by the LTE module: no-op, A2-A4-RSRQ, and strongest cell handover
+algorithm. They are ready to be used in simulations or can be taken as an
+example of implementing a handover algorithm. Each of these built-in algorithms
+is covered in each of the following subsections.
+
+No-op handover algorithm
+------------------------
+
+The *no-op handover algorithm* (``NoOpHandoverAlgorithm`` class) is the simplest
+possible implementation of handover algorithm. It basically does nothing, i.e.,
+does not call any of the Handover Management SAP interface methods. Users may
+choose this handover algorithm if they wish to disable automatic handover
+trigger in their simulation.
+
+A2-A4-RSRQ handover algorithm
+-----------------------------
+
+The *A2-A4-RSRQ handover algorithm* provides the functionality of the default
+handover algorithm originally included in LENA M6 (ns-3.18), ported to the
+Handover Management SAP interface as the ``A2A4RsrqHandoverAlgorithm`` class.
+
+As the name implies, the algorithm utilizes the Reference Signal Received
+Quality (RSRQ) measurements acquired from Event A2 and Event A4. Thus, the
+algorithm will add 2 measurement configuration to the corresponding eNodeB RRC
+instance. Their intended use are described as follows:
+
+ - *Event A2* (serving cell's RSRQ becomes worse than `threshold`) is leveraged
+   to indicate that the UE is experiencing poor signal quality and may benefit
+   from a handover.
+ 
+ - *Event A4* (neighbour cell's RSRQ becomes better than `threshold`) is used
+   to detect neighbouring cells and acquire their corresponding RSRQ from every
+   attached UE, which are then stored internally by the algorithm. By default,
+   the algorithm configures Event A4 with a very low threshold, so that the
+   trigger criteria are always true.
+   
+Figure :ref:`fig-lte-legacy-handover-algorithm` below summarizes this procedure.
+
+.. _fig-lte-legacy-handover-algorithm:
+
+.. figure:: figures/lte-legacy-handover-algorithm.*
+   :scale: 70 %
+   :align: center
+
+   A2-A4-RSRQ handover algorithm
+ 
+Two attributes can be set to tune the algorithm behaviour:
+
+ - ``ServingCellThreshold``
+     The `threshold` for Event A2, i.e. a UE must have an RSRQ lower than this
+     threshold to be considered for a handover.
+
+ - ``NeighbourCellOffset``
+     The `offset` that aims to ensure that the UE would receive better signal
+     quality after the handover. A neighbouring cell is considered as a target
+     cell for the handover only if its RSRQ is higher than the serving cell's
+     RSRQ by the amount of this `offset`.
+
+The value of both attributes are expressed as RSRQ range (Section 9.1.7 of
+[TS36133]_), which is an integer between 0 and 34, with 0 as the lowest RSRQ.
+
+Strongest cell handover algorithm
+---------------------------------
+
+The *strongest cell handover algorithm*, or also sometimes known as the
+*traditional power budget (PBGT) algorithm*, is developed using [Dimou2009]_ as
+reference. The idea is to provide each UE with the best possible Reference
+Signal Received Power (RSRP). This is done by performing a handover as soon as
+a better cell (i.e. with stronger RSRP) is detected.
+
+*Event A3* (neighbour cell's RSRP becomes better than serving cell's RSRP) is
+chosen to realize this concept. The ``A3RsrpHandoverAlgorithm`` class is the
+result of the implementation. Handover is triggered for the UE to the best cell
+in the measurement report.
+
+A simulation which uses this algorithm is usually more vulnerable to ping-pong
+handover (consecutive handover to the previous source eNodeB within short period
+of time), especially when the :ref:`sec-fading-model` is enabled. This problem
+is typically tackled by introducing a certain delay to the handover. The
+algorithm does this by including hysteresis and time-to-trigger parameters
+(Section 6.3.5 of [TS36331]_) to the UE measurements configuration.
+
+*Hysteresis* (a.k.a. handover margin) delays the handover in regard of RSRP. The
+value is expressed in dB, ranges between 0 to 15 dB, and have a 0.5 dB accuracy,
+e.g., an input value of 2.7 dB is rounded to 2.5 dB.
+
+On the other hand, *time-to-trigger* delays the handover in regard of time. 3GPP
+defines 16 valid values for time-to-trigger (all in milliseconds): 0, 40, 64,    
+80, 100, 128, 160, 256, 320, 480, 512, 640, 1024, 1280, 2560, and 5120.
+
+The difference between hysteresis and time-to-trigger is illustrated in Figure
+:ref:`fig-lte-strongest-cell-handover-algorithm` below, which is taken from the
+`lena-x2-handover-measures` example. It depicts the perceived RSRP of serving
+cell and a neighbouring cell by a UE which moves pass the border of the cells.
+
+.. _fig-lte-strongest-cell-handover-algorithm:
+
+.. figure:: figures/lte-strongest-cell-handover-algorithm.*
    :align: center
 
-   Algorithm to automatically trigger the Handover procedure
+   Effect of hysteresis and time-to-trigger in strongest cell handover algorithm
 
-The simulation user can set two parameters to control the handover decision:
+By default, the algorithm uses a hysteresis of 3.0 dB and time-to-trigger of
+256 ms. These values can be tuned through the ``Hysteresis`` and
+``TimeToTrigger`` attributes of the ``A3RsrpHandoverAlgorithm`` class.
 
- - servingHandoverThreshold, if the RSRQ value measured by the UE in its
-   serving cell is less or equal to the servingHandoverThreshold parameter
-   (i.e. the conditions of the UE in the serving cell are getting bad or
-   not good enough), then the eNB considers this UE to hand it over to a new
-   neighbour eNB. The handover will eventually be triggered depending on the 
-   measurements of the neighbour cells.
 
- - neighbourHandoverOffset, if the UE is considered for handover, and
-   the difference between the best neighbour RSRQ 
-   and the RSRQ difference between the neighbor and the serving cell
-   is greater or equal to the neighbourHandoverOffset 
-   parameter, then the handover procedure is triggered for this UE.
+Neighbour Relation
+++++++++++++++++++
+
+LTE module supports a simplified *Automatic Neighbour Relation* (ANR) function.
+This is handled by the ``LteAnr`` class, which interacts with an eNodeB RRC
+instance through the ANR SAP interface.
+
+Neighbour Relation Table
+------------------------
+
+The ANR holds a *Neighbour Relation Table* (NRT), similar to the description in
+Section 22.3.2a of [TS36300]_. Each entry in the table is called a *Neighbour
+Relation* (NR) and represents a detected neighbouring cell, which contains the
+following boolean fields:
+
+ - `No Remove`
+     Indicates that the NR shall *not* be removed from the NRT. This is `true`
+     by default for user-provided NR and `false` otherwise.
+     
+ - `No X2`
+     Indicates that the NR shall *not* use an X2 interface in order to initiate
+     procedures towards the eNodeB parenting the target cell. This is `false` by
+     default for user-provided NR, and `true` otherwise.
+
+ - `No HO`
+     Indicates that the NR shall *not* be used by the eNodeB for handover
+     reasons. This is `true` in most cases, except when the NR is both
+     user-provided and network-detected.
+
+Each NR entry may have at least one of the following properties:
+
+ - User-provided
+     This type of NR is created as instructed by the simulation user. For
+     example, a NR is created automatically upon a user-initiated establishment
+     of X2 connection between 2 eNodeBs, e.g. as described in Section
+     :ref:`sec-x2-based-handover`. Another way to create a user-provided NR is
+     to call the ``AddNeighbourRelation`` function explicitly.
+
+ - Network-detected
+     This type of NR is automatically created during the simulation as a result
+     of the discovery of a nearby cell.
+
+In order to automatically create network-detected NR, ANR utilizes UE
+measurements. In other words, ANR is a consumer of UE measurements, as depicted
+in Figure :ref:`fig-ue-meas-consumer`. RSRQ and Event A4 (neighbour becomes
+better than `threshold`) are used for the reporting configuration. The default
+Event A4 `threshold` is set to the lowest possible, i.e., maximum detection
+capability, but can be changed by setting the ``Threshold`` attribute of
+``LteAnr`` class. Note that the A2-A4-RSRQ handover algorithm also utilizes a
+similar reporting configuration. Despite the similarity, when both ANR and this
+handover algorithm are active in the eNodeB, they use separate reporting
+configuration.
+
+Also note that automatic setup of X2 interface is not supported. This is the
+reason why the `No X2` and `No HO` fields are true in a network-detected but not
+user-detected NR.
+
+Role of ANR in Simulation
+-------------------------
+
+The ANR SAP interface provides the means of communication between ANR and eNodeB
+RRC. Some interface functions are used by eNodeB RRC to interact with the NRT,
+as shown below:
+
+ - ``AddNeighbourRelation``
+     (eNodeB RRC -> ANR) Add a new user-provided NR entry into the NRT.
+
+ - ``GetNoRemove``
+     (eNodeB RRC -> ANR) Get the value of `No Remove` field of an NR entry of
+     the given cell ID.
+     
+ - ``GetNoHo``
+     (eNodeB RRC -> ANR) Get the value of `No HO` field of an NR entry of
+     the given cell ID.
+
+ - ``GetNoX2``
+     (eNodeB RRC -> ANR) Get the value of `No X2` field of an NR entry of
+     the given cell ID.
+
+Other interface functions exist to support the role of ANR as a UE measurements
+consumer, as listed below:
+
+ - ``AddUeMeasReportConfigForAnr``
+     (ANR -> eNodeB RRC) Used by the ANR to request measurement reports from the
+     eNodeB RRC entity, by passing the desired reporting configuration. The
+     configuration will be applied to all future attached UEs.
+     
+ - ``ReportUeMeas``
+     (eNodeB RRC -> ANR) Based on the UE measurements configured earlier in
+     ``AddUeMeasReportConfigForAnr``, UE may submit measurement reports to the
+     eNodeB. The eNodeB RRC entity uses the ``ReportUeMeas`` interface to
+     forward these measurement reports to the ANR.
+
+Please refer to the corresponding API documentation for ``LteAnrSap`` class for
+more details on the usage and the required parameters.
+
+The ANR is utilized by the eNodeB RRC instance as a data structure to keep track
+of the situation of nearby neighbouring cells. The ANR also helps the eNodeB RRC
+instance to determine whether it is possible to execute a handover procedure to
+a neighbouring cell. This is realized by the fact that eNodeB RRC will only
+allow a handover procedure to happen if the NR entry of the target cell has both
+`No HO` and `No X2` fields set to `false`. 
+
+ANR is enabled by default in every eNodeB instance in the simulation. It can be
+disabled by setting the ``AnrEnabled`` attribute in ``LteHelper`` class to
+`false`.
 
 
 RRC sequence diagrams
@@ -2101,6 +2660,8 @@
 In this section we provide some sequence diagrams that explain the
 most important RRC procedures being modeled.
 
+.. _sec-rrc-connection-establishment:
+
 RRC connection establishment
 ----------------------------
 
@@ -2118,6 +2679,8 @@
 
 
 
+.. _sec-rrc-connection-reconfiguration:
+
 RRC connection reconfiguration
 ------------------------------
 
@@ -2351,9 +2914,9 @@
 
 
 
---------
+---
 NAS
---------
+---
 
 
 The focus of the LTE-EPC model is on the NAS Active state, which corresponds to EMM Registered, ECM connected, and RRC connected. Because of this, the following simplifications are made:
@@ -2472,9 +3035,9 @@
  #. it removes the GTP header and retrieves the TEID which is
     contained in it;
  #. leveraging on the one-to-one mapping between S1-U bearers and
-    Radio Bearers (which is a 3GPP requirement), it determines the Radio
-    Bearer ID (RBID) to which the packet belongs;
- #. it records the RBID in a dedicated tag called LteRadioBearerTag,
+    Radio Bearers (which is a 3GPP requirement), it determines the 
+    Bearer ID (BID) to which the packet belongs;
+ #. it records the BID in a dedicated tag called EpsBearerTag,
     which is added to the packet; 
  #. it forwards the packet to the LteEnbNetDevice of the eNB node via
     a raw packet socket
@@ -2483,7 +3046,7 @@
 end-to-end IP header, since the IP/UDP/GTP headers of the S1 protocol
 stack have already been stripped. Upon reception of
 the packet from the EpcEnbApplication, the LteEnbNetDevice will
-retrieve the RBID from the LteRadioBearerTag, and based on the RBID
+retrieve the BID from the EpsBearerTag, and based on the BID
 will determine the Radio Bearer instance (and the corresponding PDCP
 and RLC protocol instances) which are then used to forward the packet
 to the UE over the LTE radio interface. Finally, the LteUeNetDevice of
@@ -2515,15 +3078,15 @@
 
 The eNB receives the packet via its LteEnbNetDevice. Since there is a
 single PDCP and RLC protocol instance for each Radio Bearer, the
-LteEnbNetDevice is able to determine the RBID of the packet. This RBID
-is then recorded onto an LteRadioBearerTag, which is added to the
+LteEnbNetDevice is able to determine the BID of the packet. This BID
+is then recorded onto an EpsBearerTag, which is added to the
 packet. The LteEnbNetDevice then forwards the packet to the
 EpcEnbApplication via a raw packet socket.
 
 Upon receiving the packet, the EpcEnbApplication performs the
 following operations:
 
- #. it retrieves the RBID from the LteRadioBearerTag in the packet;
+ #. it retrieves the BID from the EpsBearerTag in the packet;
  #. it determines the corresponding EPS Bearer instance and GTP-U TEID by
     leveraging on the one-to-one mapping between S1-U bearers and Radio
     Bearers;
@@ -2580,7 +3143,7 @@
 
 
 
-
+.. _sec-x2:
 
 ---
 X2 
@@ -2597,8 +3160,7 @@
 
 For a representation of how the X2 interface fits in the overall
 architecture of the LENA simulation model, the reader is referred to
-the figure :ref:`overall-architecture`.
-
+the figure :ref:`fig-epc-topology`.
 
 The X2 interface implemented in the simulator provides detailed implementation of the following elementary procedures of the Mobility Management functionality [TS36423]_:
 
@@ -2617,16 +3179,30 @@
 in particular, *lossless handover* as described in Section 2.6.3.2 of
 [Sesia2009]_ is not supported at the time of this writing.
 
-Figure :ref:`fig-x2-based-handover-seq-diagram` shows the interaction of the entities of the X2 model in the simulator.
+Figure :ref:`fig-x2-based-handover-seq-diagram` below shows the interaction of
+the entities of the X2 model in the simulator. The shaded labels indicate the
+moments when the UE or eNodeB transition to another RRC state.
 
 .. _fig-x2-based-handover-seq-diagram:
 
 .. figure:: figures/lte-epc-x2-handover-seq-diagram.*
-    :width: 700px
-    :align: center
+   :scale: 80 %
+   :align: center
 
-    Sequence diagram of the X2-based handover
+   Sequence diagram of the X2-based handover
 
+The figure also shows two timers within the handover procedure: the *handover
+leaving timer* is maintained by the source eNodeB, while the *handover joining
+timer* by the target eNodeB. The duration of the timers can be configured in
+the ``HandoverLeavingTimeoutDuration`` and ``HandoverJoiningTimeoutDuration``
+attributes of the respective ``LteEnbRrc`` instances. When one of these timers
+expire, the handover procedure is considered as failed.
+
+However, there is no proper handling of handover failure in the current version
+of LTE module. Users should tune the simulation properly in order to avoid
+handover failure, otherwise unexpected behaviour may occur. Please refer to
+Section :ref:`sec-tuning-handover-simulation` of the User Documentation for some
+tips regarding this matter.
 
 The X2 model is an entity that uses services from:
 
@@ -2833,9 +3409,9 @@
 
 
 
------------------
+---
 S11
------------------
+---
 
 The S11 interface provides control plane interaction between the SGW
 and the MME using the GTPv2-C protocol specified in [TS29274]_. In the
@@ -2875,19 +3451,23 @@
 various components. These objects are:
 
 
- * LteHelper, which takes care of the configuration of the LTE radio
+ * ``LteHelper``, which takes care of the configuration of the LTE radio
    access network, as well as of coordinating the setup and release of
-   EPS bearers 
- * EpcHelper, which takes care of the configuratio of the Evolved
-   Packet Core
+   EPS bearers. The ``LteHelper`` class provides both the API
+   definition and its implementation.  
+ * ``EpcHelper``, which takes care of the configuration of the Evolved
+   Packet Core. The ``EpcHelper`` class is an abstract base class
+   which only provides the API definition; the implementation is delegated
+   to child classes in order to allow for different EPC network
+   models.
 
 It is possible to create a simple LTE-only simulations by
-using LteHelper alone, or to create complete LTE-EPC simulations by
-using both LteHelper and EpcHelper. When both helpers are used, they
-interact in a master-slave fashion, with LteHelper being the Master
-that interacts directly with the user program, and EpcHelper working
+using ``LteHelper`` alone, or to create complete LTE-EPC simulations by
+using both ``LteHelper`` and ``EpcHelper``. When both helpers are used, they
+interact in a master-slave fashion, with ``LteHelper`` being the Master
+that interacts directly with the user program, and ``EpcHelper`` working
 "under the hood" to configure the EPC upon explicit methods called by
-LteHelper. The exact interactions are displayed in the Figure :ref:`fig-helpers`.
+``LteHelper``. The exact interactions are displayed in the Figure :ref:`fig-helpers`.
 
 .. _fig-helpers:
    
diff -Naur ns-3.18.1/src/lte/doc/source/lte-references.rst ns-3.19/src/lte/doc/source/lte-references.rst
--- ns-3.18.1/src/lte/doc/source/lte-references.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/lte-references.rst	2013-12-20 09:44:51.000000000 -0800
@@ -20,11 +20,11 @@
 
 .. [TS36213] 3GPP TS 36.213 "E-UTRA Physical layer procedures"
 
-.. [TS36214] 3GPP TS 36.213 "E-UTRA Physical layer – Measurements"
+.. [TS36214] 3GPP TS 36.214 "E-UTRA Physical layer – Measurements"
 
 .. [TS36300] 3GPP TS 36.300 "E-UTRA and E-UTRAN; Overall description; Stage 2"
 
-.. [TS36304] 3GPP TS 36.104 "E-UTRA User Equipment (UE) procedures in idle mode"
+.. [TS36304] 3GPP TS 36.304 "E-UTRA User Equipment (UE) procedures in idle mode"
 
 .. [TS36321] 3GPP TS 36.321 "E-UTRA Medium Access Control (MAC) protocol specification"
 
@@ -40,34 +40,39 @@
 
 .. [TS36423] 3GPP TS 36.423 "E-UTRAN X2 application protocol (X2AP)"
 
+.. [TR36814] 3GPP TR 36.814 "E-UTRA Further advancements for E-UTRA physical layer aspects"
 
-.. [R1-081483] 3GPP R1-081483 `Conveying MCS and TB size via PDCCH <http://www.3gpp.org/ftp/tsg_ran/WG1_RL1/TSGR1_52b/Docs/R1-081483.zip>`_
-
-.. [R4-092042] 3GPP R4-092042 "Simulation assumptions and parameters for FDD HeNB RF requirements"
+.. [R1-081483] 3GPP R1-081483 `"Conveying MCS and TB size via PDCCH"
+   <http://www.3gpp.org/ftp/tsg_ran/WG1_RL1/TSGR1_52b/Docs/R1-081483.zip>`_
 
-.. [TR36814] 3GPP TR 36.814 "E-UTRA Further advancements for E-UTRA physical layer aspects"
+.. [R4-092042] 3GPP R4-092042 `"Simulation assumptions and parameters for FDD HeNB RF requirements"
+   <http://www.3gpp.org/ftp/tsg_ran/wg4_radio/TSGR4_51/Documents/R4-092042.zip>`_
 
-.. [FFAPI] `FemtoForum LTE MAC Scheduler Interface Specification v1.11 <http://www.femtoforum.org/femto/technical.php>`_
+.. [FFAPI] FemtoForum `"LTE MAC Scheduler Interface Specification v1.11"
+   <http://www.smallcellforum.org/smallcellforum_resources/pdfsend05.php?file=LTE%20MAC%20Scheduler%20Interface%20Specification.pdf>`_
 
-.. [ns3tutorial] `The ns-3 Tutorial <http://www.nsnam.org/docs/tutorial/singlehtml/index.html>`_
+.. [ns3tutorial] `"The ns-3 Tutorial"
+   <http://www.nsnam.org/docs/tutorial/singlehtml/index.html>`_
 
-.. [ns3manual] `The ns-3 Manual <http://www.nsnam.org/docs/manual/singlehtml/index.html>`_
+.. [ns3manual] `"The ns-3 Manual"
+   <http://www.nsnam.org/docs/manual/singlehtml/index.html>`_
 
-.. [Sesia2009] S. Sesia, I. Toufik and M. Baker, "LTE - The UMTS Long Term Evolution - from theory to practice", 
+.. [Sesia2009] S. Sesia, I. Toufik and M. Baker,
+   "LTE - The UMTS Long Term Evolution - from theory to practice",
    Wiley, 2009
 
 .. [Baldo2009] N. Baldo and M. Miozzo, "Spectrum-aware Channel and PHY layer modeling for ns3", 
-   Proceedings of ICST NSTools 2009, Pisa, Italy. 
+   Proceedings of ICST NSTools 2009, Pisa, Italy
 
-.. [Piro2010] Giuseppe Piro, Luigi Alfredo Grieco, Gennaro Boggia, and Pietro Camarda, A Two-level 
-   Scheduling Algorithm for QoS Support in the Downlink of LTE Cellular Networks", Proc. of 
-   European Wireless, EW2010, Lucca, Italy, Apr., 2010 
+.. [Piro2010] Giuseppe Piro, Luigi Alfredo Grieco, Gennaro Boggia, and Pietro Camarda,
+   "A Two-level Scheduling Algorithm for QoS Support in the Downlink of LTE Cellular Networks",
+   Proc. of European Wireless, EW2010, Lucca, Italy, Apr., 2010 
 
 .. [Holtzman2000] J.M. Holtzman, "CDMA forward link waterfilling power control", 
    in Proc. of IEEE VTC Spring, 2000.
 
 .. [Piro2011] G. Piro, N. Baldo. M. Miozzo, "An LTE module for the ns-3 network simulator", 
-    in Proc. of Wns3 2011 (in conjunction with SimuTOOLS 2011), March 2011, Barcelona (Spain)
+   in Proc. of Wns3 2011 (in conjunction with SimuTOOLS 2011), March 2011, Barcelona (Spain)
 
 .. [Seo2004] H. Seo, B. G. Lee. "A proportional-fair power allocation scheme for fair and efficient multiuser OFDM systems", 
    in Proc. of IEEE GLOBECOM, December 2004. Dallas (USA)
@@ -76,40 +81,65 @@
    competition and proposals for the award of 800 MHz and 2.6 GHz
    spectrum and related issues", March 2011 
 
-.. [RealWireless] RealWireless, Low-power shared access to spectrum
-   for mobile broadband,  Final Report, Ofcom Project MC/073, 18th
+.. [RealWireless] RealWireless, "Low-power shared access to spectrum
+   for mobile broadband",  Final Report, Ofcom Project MC/073, 18th
    March 2011 
 
-.. [PaduaPEM] http://mailman.isi.edu/pipermail/ns-developers/2011-November/009559.html
+.. [PaduaPEM] `"Ns-developers - LTE error model contribution"
+   <http://mailman.isi.edu/pipermail/ns-developers/2011-November/009559.html>`_
 
-.. [ViennaLteSim] The Vienna LTE Simulators http://www.nt.tuwien.ac.at/about-us/staff/josep-colom-ikuno/lte-simulators/
+.. [ViennaLteSim] `"The Vienna LTE Simulators"
+   <http://www.nt.tuwien.ac.at/about-us/staff/josep-colom-ikuno/lte-simulators/>`_
 
-.. [LozanoCost] Joan Olmos, Silvia Ruiz, Mario García-Lozano and David Martín-Sacristán, "Link Abstraction Models Based on Mutual Information for LTE Downlink", COST 2100 TD(10)11052 Report
+.. [LozanoCost] Joan Olmos, Silvia Ruiz, Mario García-Lozano and David Martín-Sacristán,
+   "Link Abstraction Models Based on Mutual Information for LTE Downlink",
+   COST 2100 TD(10)11052 Report
 
-.. [wimaxEmd] WiMAX Forum White Paper, WiMAX System Evaluation Methodology, July 2008.
+.. [wimaxEmd] WiMAX Forum White Paper, "WiMAX System Evaluation Methodology", July 2008.
 
-.. [mathworks] Matlab R2011b Documentation Communications System Toolbox, `Methodology for Simulating Multipath Fading Channels <http://www.mathworks.es/help/toolbox/comm/ug/a1069449399.html#bq5zk36>`_
+.. [mathworks] Matlab R2011b Documentation Communications System Toolbox,
+   `"Methodology for Simulating Multipath Fading Channels"
+   <http://www.mathworks.es/help/toolbox/comm/ug/a1069449399.html#bq5zk36>`_
 
-.. [CatreuxMIMO] S. Catreux, L.J. Greenstein, V. Erceg, "Some results and insights on the performance gains of MIMO systems," Selected Areas in Communications, IEEE Journal on , vol.21, no.5, pp. 839- 847, June 2003
+.. [CatreuxMIMO] S. Catreux, L.J. Greenstein, V. Erceg,
+   "Some results and insights on the performance gains of MIMO systems,"
+   Selected Areas in Communications, IEEE Journal on , vol.21, no.5, pp. 839- 847, June 2003
 
-.. [Ikuno2010] J.C. Ikuno, M. Wrulich, M. Rupp, "System Level Simulation of LTE Networks," Vehicular Technology Conference (VTC 2010-Spring), 2010 IEEE 71st , vol., no., pp.1-5, 16-19 May 2010
+.. [Ikuno2010] J.C. Ikuno, M. Wrulich, M. Rupp, "System Level Simulation of LTE Networks,"
+   Vehicular Technology Conference (VTC 2010-Spring), 2010 IEEE 71st , vol., no., pp.1-5, 16-19 May 2010
 
-
-.. [Milos2012] J. Milos, "Performace Analysis Of PCFICH LTE Control Channel", Proceedings of the 19th Conference STUDENT EEICT 2012, Brno, CZ, 2012.
+.. [Milos2012] J. Milos, "Performance Analysis Of PCFICH LTE Control Channel",
+   Proceedings of the 19th Conference STUDENT EEICT 2012, Brno, CZ, 2012.
 
 .. [FujitsuWhitePaper] "Enhancing LTE Cell-Edge Performance via PDCCH ICIC".
 
-
-.. [Bharucha2011] Z. Bharucha, G. Auer, T. Abe, N. Miki, "Femto-to-Macro Control Channel Interference Mitigation via Cell ID Manipulation in LTE," Vehicular Technology Conference (VTC Fall), 2011 IEEE , vol., no., pp.1-6, 5-8 Sept. 2011
-
-.. [R4-081920] 3GPP R4-081920 `LTE PDCCH/PCFICH Demodulation Performance Results with Implementation Margin
- <http://www.3gpp.org/ftp/tsg_ran/wg4_radio/TSGR4_48/Documents/R4-081920.zip>`_
-
-.. [FCapo2012] F.Capozzi, G.Piro L.A.Grieco, G.Boggia, P.Camarda, "Downlink Packet Scheduling in LTE Cellular Networks: Key Design Issues and a Survey", IEEE Comm. Surveys and Tutorials, vol.2012, no.99, pp.1-23, Jun. 2012
-
-.. [FABokhari2009] F.A. Bokhari, H. Yanikomeroglu, W.K. Wong, M. Rahman, "Cross-Layer Resource Scheduling for Video Traffic in the Downlink of OFDMA-Based Wireless 4G Networks",EURASIP J. Wirel. Commun. Netw., vol.2009, no.3, pp. 1-10, Jan. 2009. 
-
-.. [WKWong2004] W.K. Wong, H.Y. Tang, V.C.M, Leung, "Token bank fair queuing: a new scheduling algorithm for wireless multimedia services", Int. J. Commun. Syst., vol.17, no.6, pp.591-614, Aug.2004. 
-
-.. [GMonghal2008] G.Mongha, K.I. Pedersen, I.Z. Kovacs, P.E. Mogensen, " QoS Oriented Time and Frequency Domain Packet Schedulers for The UTRAN Long Term Evolution", In Proc. IEEE VTC, 2008.
-
+.. [Bharucha2011] Z. Bharucha, G. Auer, T. Abe, N. Miki,
+   "Femto-to-Macro Control Channel Interference Mitigation via Cell ID Manipulation in LTE,"
+   Vehicular Technology Conference (VTC Fall), 2011 IEEE , vol., no., pp.1-6, 5-8 Sept. 2011
+
+.. [R4-081920] 3GPP R4-081920 `"LTE PDCCH/PCFICH Demodulation Performance Results with Implementation Margin"
+   <http://www.3gpp.org/ftp/tsg_ran/wg4_radio/TSGR4_48/Documents/R4-081920.zip>`_
+
+.. [FCapo2012] F.Capozzi, G.Piro, L.A. Grieco, G.Boggia, P.Camarda,
+   "Downlink Packet Scheduling in LTE Cellular Networks: Key Design Issues and a Survey",
+   IEEE Comm. Surveys and Tutorials, vol.2012, no.99, pp.1-23, Jun. 2012
+
+.. [FABokhari2009] F.A. Bokhari, H. Yanikomeroglu, W.K. Wong, M. Rahman,
+   "Cross-Layer Resource Scheduling for Video Traffic in the Downlink of OFDMA-Based Wireless 4G Networks",
+   EURASIP J. Wirel. Commun. Netw., vol.2009, no.3, pp. 1-10, Jan. 2009. 
+
+.. [WKWong2004] W.K. Wong, H.Y. Tang, V.C.M, Leung,
+   "Token bank fair queuing: a new scheduling algorithm for wireless multimedia services",
+   Int. J. Commun. Syst., vol.17, no.6, pp.591-614, Aug.2004. 
+
+.. [GMonghal2008] G. Mongha, K.I. Pedersen, I.Z. Kovacs, P.E. Mogensen,
+   "QoS Oriented Time and Frequency Domain Packet Schedulers for The UTRAN Long Term Evolution",
+   In Proc. IEEE VTC, 2008.
+
+.. [Dimou2009] K. Dimou, M. Wang, Y. Yang, M. Kazmi, A. Larmo, J. Pettersson, W. Muller, Y. Timner,
+   "Handover within 3GPP LTE: Design Principles and Performance",
+   Vehicular Technology Conference Fall (VTC 2009-Fall), 2009 IEEE 70th, pp.1-5, 20-23 Sept. 2009
+
+.. [Lee2010] Y.J. Lee, B.J. Shin, J.C. Lim, D.H. Hong,
+   "Effects of time-to-trigger parameter on handover performance in SON-based LTE systems",
+   Communications (APCC), 2010 16th Asia-Pacific Conference on, pp.492-496, Oct. 31 2010--Nov. 3 2010
diff -Naur ns-3.18.1/src/lte/doc/source/lte-testing.rst ns-3.19/src/lte/doc/source/lte-testing.rst
--- ns-3.18.1/src/lte/doc/source/lte-testing.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/lte-testing.rst	2013-12-20 09:44:51.000000000 -0800
@@ -1,9 +1,10 @@
 .. include:: replace.txt
+.. highlight:: bash
 
 
-+++++++++++++++++++++++++++
- Testing Documentation
-+++++++++++++++++++++++++++
++++++++++++++++++++++
+Testing Documentation
++++++++++++++++++++++
 
 
 Overview
@@ -12,20 +13,20 @@
 To test and validate the ns-3 LTE module, several test suites are provided which are integrated with the ns-3 test framework.
 To run them, you need to have configured the build of the simulator in this way::
 
-    ./waf configure --enable-tests --enable-modules=lte --enable-examples
-    ./test.py
+    $ ./waf configure --enable-tests --enable-modules=lte --enable-examples
+    $ ./test.py
 
 The above will run not only the test suites belonging to the LTE module, but also those belonging to all the other ns-3 modules on which the LTE module depends. See the ns-3 manual for generic information on the testing framework.
 
 You can get a more detailed report in HTML format in this way::
 
-    ./test.py -w results.html
+    $ ./test.py -w results.html
 
 After the above command has run, you can view the detailed result for each test by opening the file ``results.html`` with a web browser. 
 
 You can run each test suite separately using this command::
 
-    ./test.py -s test-suite-name
+    $ ./test.py -s test-suite-name
 
 For more details about ``test.py`` and the ns-3 testing framework, please refer to the ns-3 manual.
 
@@ -161,7 +162,7 @@
 Inter-cell Interference Tests
 -----------------------------
 
-The test suite `lte-interference`` provides system tests recreating an
+The test suite `lte-interference` provides system tests recreating an
 inter-cell interference scenario with two eNBs, each having a single
 UE attached to it and employing Adaptive Modulation and Coding both in
 the downlink and in the uplink. The topology of the scenario
@@ -195,16 +196,247 @@
 
 
 UE Measurements Tests
------------------------------
+---------------------
 
-The test suite `lte-ue-measurements`` provides system tests recreating an
-inter-cell interference scenario identical of the one defined for `lte-interference`` test-suite. However, in this test the quantities to be tested are represented by RSRP and RSRQ measurements performed by the UE in two different points of the stack: the source, which is UE PHY layer, and the destination, that is the eNB RRC.
+The test suite `lte-ue-measurements` provides system tests recreating an
+inter-cell interference scenario identical of the one defined for
+`lte-interference` test-suite. However, in this test the quantities to be
+tested are represented by RSRP and RSRQ measurements performed by the UE in two
+different points of the stack: the source, which is UE PHY layer, and the
+destination, that is the eNB RRC.
+
+The test vectors are obtained by the use of a dedicated octave script (available
+in `src/lte/test/reference/lte-ue-measurements.m`), which does the link budget
+calculations (including interference) corresponding to the topology of each
+test case, and outputs the resulting RSRP and RSRQ. The obtained values are then
+used for checking the correctness of the UE Measurements at PHY layer. After
+that, they have to be converted according to 3GPP formatting for the purpose of
+checking their correctness at eNB RRC level.
 
-The test vectors are obtained by use of a dedicated octave script
-(available in
-`src/lte/test/reference/lte-ue-measurements.m`), which does
-the link budget calculations (including interference) corresponding to the topology of each
-test case, and outputs the resulting RSRP and RSRQ. The obtained values are then used for checking the correctness of the UE Measurements at PHY layer, while they have to converted according to 3GPP formatting for checking they correctness at eNB RRC level.
+
+
+UE measurement configuration tests
+----------------------------------
+
+Besides the previously mentioned test suite, there are 3 other test suites for
+testing UE measurements: `lte-ue-measurements-piecewise-1`,
+`lte-ue-measurements-piecewise-2`, and `lte-ue-measurements-handover`. These
+test suites are more focused on the reporting trigger procedure, i.e. the
+correctness of the implementation of the event-based triggering criteria is
+verified here.
+
+In more specific, the tests verify the *timing* and the *content* of each
+measurement reports received by eNodeB. Each test case is an stand-alone LTE
+simulation and the test case will pass if measurement report(s) only occurs at
+the prescribed time and shows the correct level of RSRP (RSRQ is not verified at
+the moment).
+
+
+Piecewise configuration
+#######################
+
+The piecewise configuration aims to test a particular UE measurements
+configuration. The simulation script will setup the corresponding measurements
+configuration to the UE, which will be active throughout the simulation.
+
+Since the reference values are precalculated by hands, several assumptions are
+made to simplify the simulation. Firstly, the channel is only affected by path
+loss model (in this case, Friis model is used). Secondly, the ideal RRC protocol
+is used, and layer 3 filtering is disabled. Finally, the UE moves in a
+predefined motion pattern between 4 distinct spots, as depicted in Figure
+:ref:`fig-ue-meas-piecewise-motion` below. Therefore the fluctuation of the
+measured RSRP can be determined more easily.
+
+.. _fig-ue-meas-piecewise-motion:
+   
+.. figure:: figures/ue-meas-piecewise-motion.*
+   :scale: 80 %
+   :align: center
+
+   UE movement trace throughout the simulation in piecewise configuration
+
+The motivation behind the *"teleport"* between the predefined spots is to
+introduce drastic change of RSRP level, which will guarantee the triggering of
+entering or leaving condition of the tested event. By performing drastic
+changes, the test can be run within shorter amount of time.
+
+Figure :ref:`fig-ue-meas-piecewise-a1` below shows the measured RSRP after
+layer 1 filtering by the PHY layer during the simulation with a piecewise
+configuration. Because layer 3 filtering is disabled, these are the exact values
+used by the UE RRC instance to evaluate reporting trigger procedure. Notice that
+the values are refreshed every 200 ms, which is the default filtering period of
+PHY layer measurements report. The figure also shows the time when entering and
+leaving conditions of an example instance of Event A1 (serving cell becomes
+better than threshold) occur during the simulation.
+
+.. _fig-ue-meas-piecewise-a1:
+   
+.. figure:: figures/ue-meas-piecewise-a1.*
+   :scale: 80 %
+   :align: center
+
+   Measured RSRP trace of an example Event A1 test case in piecewise
+   configuration
+
+Each reporting criterion is tested several times with different threshold/offset
+parameters. Some test scenarios also take hysteresis and time-to-trigger into
+account. Figure :ref:`fig-ue-meas-piecewise-a1-hys` depicts the effect of
+hysteresis in another example of Event A1 test.
+
+.. _fig-ue-meas-piecewise-a1-hys:
+   
+.. figure:: figures/ue-meas-piecewise-a1-hys.*
+   :scale: 80 %
+   :align: center
+
+   Measured RSRP trace of an example Event A1 with hysteresis test case in
+   piecewise configuration
+
+Piecewise configuration is used in two test suites of UE measurements. The first
+one is `lte-ue-measurements-piecewise-1`, henceforth Piecewise test #1, which
+simulates 1 UE and 1 eNodeB. The other one is `lte-ue-measurements-piecewise-2`,
+which has 1 UE and 2 eNodeBs in the simulation.
+
+Piecewise test #1 is intended to test the event-based criteria which are not
+dependent on the existence of a neighbouring cell. These criteria include Event
+A1 and A2. The other events are also briefly tested to verify that they are
+still working correctly (albeit not reporting anything) in the absence of any
+neighbouring cell. Table :ref:`tab-ue-meas-piecewise-1` below lists the
+scenarios tested in piecewise test #1. 
+
+.. _tab-ue-meas-piecewise-1:
+
+.. table:: UE measurements test scenarios using piecewise configuration #1
+
+   ====== ================== ================ ========== ===============
+   Test # Reporting Criteria Threshold/Offset Hysteresis Time-to-Trigger
+   ====== ================== ================ ========== ===============
+   1      Event A1           Low              No         No
+   2      Event A1           Normal           No         No
+   3      Event A1           Normal           No         Short
+   4      Event A1           Normal           No         Long
+   5      Event A1           Normal           No         Super
+   6      Event A1           Normal           Yes        No
+   7      Event A1           High             No         No
+   8      Event A2           Low              No         No
+   9      Event A2           Normal           No         No
+   10     Event A2           Normal           No         Short
+   11     Event A2           Normal           No         Long
+   12     Event A2           Normal           No         Super
+   13     Event A2           Normal           Yes        No
+   14     Event A2           High             No         No
+   15     Event A3           Zero             No         No
+   16     Event A4           Normal           No         No
+   17     Event A5           Normal-Normal    No         No
+   ====== ================== ================ ========== ===============
+
+Other events such as Event A3, A4, and A5 depend on measurements of neighbouring
+cell, so they are more thoroughly tested in Piecewise test #2. The simulation
+places the nodes on a straight line and instruct the UE to *"jump"* in a similar
+manner as in Piecewise test #1. Handover is disabled in the simulation, so the
+role of serving and neighbouring cells do not switch during the simulation.
+Table :ref:`tab-ue-meas-piecewise-2` below lists the scenarios tested in
+Piecewise test #2.
+
+.. _tab-ue-meas-piecewise-2:
+
+.. table:: UE measurements test scenarios using piecewise configuration #2
+
+   ====== ================== ================ ========== ===============
+   Test # Reporting Criteria Threshold/Offset Hysteresis Time-to-Trigger
+   ====== ================== ================ ========== ===============
+   1      Event A1           Low              No         No
+   2      Event A1           Normal           No         No
+   3      Event A1           Normal           Yes        No
+   4      Event A1           High             No         No
+   5      Event A2           Low              No         No
+   6      Event A2           Normal           No         No
+   7      Event A2           Normal           Yes        No
+   8      Event A2           High             No         No
+   9      Event A3           Positive         No         No
+   10     Event A3           Zero             No         No
+   11     Event A3           Zero             No         Short
+   12     Event A3           Zero             No         Super
+   13     Event A3           Zero             Yes        No
+   14     Event A3           Negative         No         No
+   15     Event A4           Low              No         No
+   16     Event A4           Normal           No         No
+   17     Event A4           Normal           No         Short
+   18     Event A4           Normal           No         Super
+   19     Event A4           Normal           Yes        No
+   20     Event A4           High             No         No
+   21     Event A5           Low-Low          No         No
+   22     Event A5           Low-Normal       No         No
+   23     Event A5           Low-High         No         No
+   24     Event A5           Normal-Low       No         No
+   25     Event A5           Normal-Normal    No         No
+   26     Event A5           Normal-Normal    No         Short
+   27     Event A5           Normal-Normal    No         Super
+   28     Event A5           Normal-Normal    Yes        No
+   29     Event A5           Normal-High      No         No
+   30     Event A5           High-Low         No         No
+   31     Event A5           High-Normal      No         No
+   32     Event A5           High-High        No         No
+   ====== ================== ================ ========== ===============
+
+One note about the tests with time-to-trigger, they are tested using 3 different
+values of time-to-trigger: *short* (shorter than report interval), *long*
+(shorter than the filter measurement period of 200 ms), and *super* (longer than
+200 ms). The first two ensure that time-to-trigger evaluation always use the
+latest measurement reports received from PHY layer. While the last one is
+responsible for verifying time-to-trigger cancellation, for example when a
+measurement report from PHY shows that the entering/leaving condition is no
+longer true before the first trigger is fired.
+
+Handover configuration
+######################
+
+The purpose of the handover configuration is to verify whether UE measurement
+configuration is updated properly after a succesful handover takes place. For
+this purpose, the simulation will construct 2 eNodeBs with different UE
+measurement configuration, and the UE will perform handover from one cell to
+another. The UE will be located on a straight line between the 2 eNodeBs, and
+the handover will be invoked manually. The duration of each simulation is
+2 seconds (except the last test case) and the handover is triggered exactly at
+halfway of simulation.
+
+The `lte-ue-measurements-handover` test suite covers various types of
+configuration differences. The first one is the difference in report interval,
+e.g. the first eNodeB is configured with 480 ms report interval, while the
+second eNodeB is configured with 240 ms report interval. Therefore, when the UE
+performed handover to the second cell, the new report interval must take effect.
+As in piecewise configuration, the timing and the content of each measurement
+report received by the eNodeB will be verified.
+
+Other types of differences covered by the test suite are differences in event
+and differences in threshold/offset. Table :ref:`tab-ue-meas-handover` below
+lists the tested scenarios. 
+
+.. _tab-ue-meas-handover:
+
+.. table:: UE measurements test scenarios using handover configuration
+
+   ====== ================ =========================== ===========================
+   Test # Test Subject     Initial Configuration       Post-Handover Configuration
+   ====== ================ =========================== ===========================
+   1      Report interval  480 ms                      240 ms
+   2      Report interval  120 ms                      640 ms
+   3      Event            Event A1                    Event A2
+   4      Event            Event A2                    Event A1
+   5      Event            Event A3                    Event A4
+   6      Event            Event A4                    Event A3
+   7      Event            Event A2                    Event A3
+   8      Event            Event A3                    Event A2
+   9      Event            Event A4                    Event A5
+   10     Event            Event A5                    Event A4
+   11     Threshold/offset RSRP range 52 (Event A1)    RSRP range 56 (Event A1)
+   12     Threshold/offset RSRP range 52 (Event A2)    RSRP range 56 (Event A2)
+   13     Threshold/offset A3 offset -30 (Event A3)    A3 offset +30 (Event A3)
+   14     Threshold/offset RSRP range 52 (Event A4)    RSRP range 56 (Event A4)
+   15     Threshold/offset RSRP range 52-52 (Event A5) RSRP range 56-56 (Event A5)
+   16     Time-to-trigger  1024 ms                     100 ms
+   17     Time-to-trigger  1024 ms                     640 ms
+   ====== ================ =========================== ===========================
 
 
 
@@ -573,24 +805,52 @@
 --------------------
 
 
-The test suite ``lte-phy-error-model`` generates different test cases for evaluating both data and control error models. For what concern the data, the test consists of nine test cases with single eNB and a various number of UEs, all having the same Radio Bearer specification. Each test is designed for evaluating the error rate perceived by a specific TB size in order to verify that it corresponds to the expected values according to the BLER generated for CB size analog to the TB size. This means that, for instance, the test will check that the performance of a TB of :math:`N` bits is analogous to the one of a a CB size of :math:`N` bits by collecting the performance of a user which has been forced the generation of a such TB size according to the distance to eNB. In order to significantly test the BLER at MAC level, we configured the Adaptive Modulation and Coding (AMC) module, the ``LteAmc`` class, for making it less robust to channel conditions by using the PiroEW2010 AMC model and configuring it to select the MCS considering a target BER of 0.03 (instead of the default value of 0.00005). We note that these values do not reflect the actual BER, since they come from an analytical bound which does not consider all the transmission chain aspects; therefore the BER and BLER actually experienced at the reception of a TB is in general different. 
-
-The parameters of the nine test cases are reported in the following:
-
- #. 4 UEs placed 1800 meters far from the eNB, which implies the use of MCS 2 (SINR of -5.51 dB) and a TB of 256 bits, that in turns produce a BLER of 0.33 (see point A in figure :ref:`fig-mcs-2-test`).
- #. 2 UEs placed 1800 meters far from the eNB, which implies the use of MCS 2 (SINR of -5.51 dB) and a TB of 528 bits, that in turns produce a BLER of 0.11 (see point B in figure :ref:`fig-mcs-2-test`).
- #. 1 UE placed 1800 meters far from the eNB, which implies the use of MCS 2 (SINR of -5.51 dB) and a TB of 1088 bits, that in turns produce a BLER of 0.02 (see point C in figure :ref:`fig-mcs-2-test`).
- #. 1 UE placed 600 meters far from the eNB, which implies the use of MCS 12 (SINR of 4.43 dB) and a TB of 4800 bits, that in turns produce a BLER of 0.3 (see point D in figure :ref:`fig-mcs-12-test`).
- #. 3 UEs placed 600 meters far from the eNB, which implies the use of MCS 12 (SINR of 4.43 dB) and a TB of 1632 bits, that in turns produce a BLER of 0.55 (see point E in figure :ref:`fig-mcs-12-test`).
- #. 1 UE placed 470 meters far from the eNB, which implies the use of MCS 16 (SINR of 8.48 dB) and a TB of 7272 bits (segmented in 2 CBs of 3648 and 3584 bits), that in turns produce a BLER of 0.14, since each CB has CBLER equal to 0.075 (see point F in figure :ref:`fig-mcs-14-test`).
-
+The test suite ``lte-phy-error-model`` generates different test cases for
+evaluating both data and control error models. For what concern the data, the
+test consists of six test cases with single eNB and a various number of UEs,
+all having the same Radio Bearer specification. Each test is designed for
+evaluating the error rate perceived by a specific TB size in order to verify
+that it corresponds to the expected values according to the BLER generated for
+CB size analog to the TB size. This means that, for instance, the test will
+check that the performance of a TB of :math:`N` bits is analogous to the one of
+a CB size of :math:`N` bits by collecting the performance of a user which has
+been forced the generation of a such TB size according to the distance to eNB.
+In order to significantly test the BLER at MAC level, we configured the Adaptive
+Modulation and Coding (AMC) module, the ``LteAmc`` class, for making it less
+robust to channel conditions by using the PiroEW2010 AMC model and configuring
+it to select the MCS considering a target BER of 0.03 (instead of the default
+value of 0.00005). We note that these values do not reflect the actual BER,
+since they come from an analytical bound which does not consider all the
+transmission chain aspects; therefore the BER and BLER actually experienced at
+the reception of a TB is in general different.
+
+The parameters of the six test cases are reported in the following:
+
+#. 4 UEs placed 1800 meters far from the eNB, which implies the use of MCS 2
+   (SINR of -5.51 dB) and a TB of 256 bits, that in turns produce a BLER of 0.33
+   (see point A in figure :ref:`fig-mcs-2-test`).
+#. 2 UEs placed 1800 meters far from the eNB, which implies the use of MCS 2
+   (SINR of -5.51 dB) and a TB of 528 bits, that in turns produce a BLER of 0.11
+   (see point B in figure :ref:`fig-mcs-2-test`).
+#. 1 UE placed 1800 meters far from the eNB, which implies the use of MCS 2
+   (SINR of -5.51 dB) and a TB of 1088 bits, that in turns produce a BLER of
+   0.02 (see point C in figure :ref:`fig-mcs-2-test`).
+#. 1 UE placed 600 meters far from the eNB, which implies the use of MCS 12
+   (SINR of 4.43 dB) and a TB of 4800 bits, that in turns produce a BLER of 0.3
+   (see point D in figure :ref:`fig-mcs-12-test`).
+#. 3 UEs placed 600 meters far from the eNB, which implies the use of MCS 12
+   (SINR of 4.43 dB) and a TB of 1632 bits, that in turns produce a BLER of 0.55
+   (see point E in figure :ref:`fig-mcs-12-test`).
+#. 1 UE placed 470 meters far from the eNB, which implies the use of MCS 16
+   (SINR of 8.48 dB) and a TB of 7272 bits (segmented in 2 CBs of 3648 and 3584
+   bits), that in turns produce a BLER of 0.14, since each CB has CBLER equal to
+   0.075 (see point F in figure :ref:`fig-mcs-14-test`).
 
 .. _fig-mcs-2-test:
 
 .. figure:: figures/MCS_2_test.*
    :align: center
 
-
    BLER for tests 1, 2, 3.
 
 .. _fig-mcs-12-test:
@@ -607,15 +867,34 @@
 
    BLER for test 6.
 
-
-The test verifies that in each case the expected number of packets received correct corresponds to a Bernoulli distribution with a confidence interval of 99%, where the probability of success in each trail is :math:`p=1-BER` and :math:`n` is the total number of packet sent.
-
-The error model of PCFICH-PDDCH channels consists of 4 test cases with a single UE and several eNBs, where the UE is connected to only one eNB in order to have the remaining acting as interfering ones. The errors on data are disabled in order to verify only the ones due to erroneous decodification of PCFICH-PDCCH. The test verifies that the error on the data received respects the decodification error probability of the PCFICH-PDCCH with a tolerance of 0.1 due to the errors that might be produced in quantizing the MI and the error curve. As before, the system has been forced on working in a less conservative fashion in the AMC module for appreciating the results in border situations. The parameters of the 4 tests cases are reported in the following:
-
- #. 2 eNBs placed 1078 meters far from the UE, which implies a SINR of -2.00 dB and a TB of 217 bits, that in turns produce a BLER of 0.007.
- #. 3 eNBs placed 1078 meters far from the UE, which implies a SINR of -4.00 dB and a TB of 217 bits, that in turns produce a BLER of 0.045.
- #. 4 eNBs placed 1078 meters far from the UE, which implies a SINR of -6.00 dB and a TB of 133 bits, that in turns produce a BLER of 0.206.
- #. 5 eNBs placed 1078 meters far from the UE, which implies a SINR of -7.00 dB and a TB of 81 bits, that in turns produce a BLER of 0.343.
+The test condition verifies that in each test case the expected number of
+packets received correctly corresponds to a Bernoulli distribution with a
+confidence interval of 99%, where the probability of success in each trail is
+:math:`p=1-BER` and :math:`n` is the total number of packets sent.
+
+The error model of PCFICH-PDCCH channels consists of 4 test cases with a single
+UE and several eNBs, where the UE is connected to only one eNB in order to have
+the remaining acting as interfering ones. The errors on data are disabled in
+order to verify only the ones due to erroneous decodification of PCFICH-PDCCH.
+As before, the system has been forced on working in a less conservative fashion
+in the AMC module for appreciating the results in border situations. The
+parameters of the 4 tests cases are reported in the following:
+
+#. 2 eNBs placed 1078 meters far from the UE, which implies a SINR of -2.00 dB
+   and a TB of 217 bits, that in turns produce a BLER of 0.007.
+#. 3 eNBs placed 1040 meters far from the UE, which implies a SINR of -4.00 dB
+   and a TB of 217 bits, that in turns produce a BLER of 0.045.
+#. 4 eNBs placed 1250 meters far from the UE, which implies a SINR of -6.00 dB
+   and a TB of 133 bits, that in turns produce a BLER of 0.206.
+#. 5 eNBs placed 1260 meters far from the UE, which implies a SINR of -7.00 dB
+   and a TB of 81 bits, that in turns produce a BLER of 0.343.
+
+The test condition verifies that in each test case the expected number
+of packets received correct corresponds to a Bernoulli distribution
+with a confidence interval of 99.8%, where the probability of success
+in each trail is :math:`p=1-BER` and :math:`n` is the total number of
+packet sent. The larger confidence interval is due to the errors that
+might be produced in quantizing the MI and the error curve.  
 
 
 HARQ Model
@@ -782,6 +1061,58 @@
 
  
 
+Initial cell selection
+----------------------
+
+The test suite `lte-cell-selection` is responsible for verifying the
+:ref:`sec-initial-cell-selection` procedure. The test is a simulation of a small 
+network of 2 non-CSG cells and 2 non-CSG cells. Several static UEs are then
+placed at predefined locations. The UEs enter the simulation without being
+attached to any cell. Initial cell selection is enabled for these UEs, so each
+UE will find the best cell and attach to it by themselves.
+
+At predefined check points time during the simulation, the test verifies that
+every UE is attached to the right cell. Moreover, the test also ensures that the
+UE is properly connected, i.e., its final state is `CONNECTED_NORMALLY`. Figure
+:ref:`fig-lte-cell-selection-scenario` depicts the network layout and the
+expected result. When a UE is depicted as having 2 successful cell selections
+(e.g., UE #3 and #4), any of them is accepted by the test case.
+
+.. _fig-lte-cell-selection-scenario:
+
+.. figure:: figures/lte-cell-selection-scenario.*
+   :scale: 80 %
+   :align: center
+
+   Sample result of cell selection test
+
+The figure shows that CSG members may attach to either CSG or non-CSG cells, and
+simply choose the stronger one. On the other hand, non-members can only attach
+to non-CSG cells, even when they are actually receiving stronger signal from a
+CSG cell.
+
+For reference purpose, Table :ref:`tab-cell-selection-error-rate` shows the
+error rate of each UE when receiving transmission from the control channel.
+Based on this information, the check point time for UE #3 is done at a later
+time than the others to compensate for its higher risk of failure.
+
+.. _tab-cell-selection-error-rate:
+
+.. table:: UE error rate in Initial Cell Selection test
+
+   ==== ==========
+   UE # Error rate
+   ==== ==========
+   1     0.00%
+   2     1.44%
+   3    12.39%
+   4     0.33%
+   5     0.00%
+   6     0.00%
+   ==== ==========
+
+The test uses the default Friis path loss model and without any channel fading
+model.
 
 
 GTP-U protocol
@@ -910,6 +1241,7 @@
 instance of this scenario defined by the following parameters:
 
  - the number of eNBs in the X-axes
+ - the number of UEs
  - the number of EPS bearers activated for the UE
  - a list of check point events to be triggered, where each event is defined by:
    + the time of the first check point event
@@ -917,9 +1249,22 @@
    + interval time between two check point events
    + the index of the UE doing the handover
    + the index of the eNB where the UE must be connected
+ - a boolean flag indicating whether UDP traffic is to be used instead of TCP traffic
+ - the type of scheduler to be used
+ - the type of handover algorithm to be used
+ - a boolean flag indicating whether handover is admitted by default 
  - a boolean flag indicating whether the ideal RRC protocol is to be used instead of the
    real RRC protocol
- - the type of scheduler to be used (RR or PF)
+
+The test suite consists of many test cases. In fact, it has been one of the most
+time-consuming test suite in ns-3. The test cases run with *some* combination of
+the following variable parameters:
+
+ - number of eNBs: 2, 3, 4;
+ - number of EPS bearers: 0, 1, 2;
+ - RRC: ideal, real (see :ref:`sec-rrc-protocol-models`);
+ - MAC scheduler: round robin, proportional fair (see :ref:`sec-ff-mac-scheduler`); and
+ - handover algorithm: A2-A4-RSRQ, strongest cell (see :ref:`sec-handover-algorithm`).
 
 Each test case passes if the following conditions are true:
 
@@ -992,3 +1337,48 @@
 computation, utilizing the fact that the handover will be delayed when this
 computation is broken. In the default simulation configuration, the handover
 delay observed because of a broken RA-RNTI computation is typically 6 ms.
+
+
+Selection of target cell in handover algorithm
+----------------------------------------------
+
+eNodeB may utilize :ref:`sec-handover-algorithm` to automatically create
+handover decisions during simulation. The decision includes the UE which should
+do the handover and the target cell where the UE should perform handover to.
+
+The test suite ``lte-handover-target`` verifies that the handover algorithm is
+making the right decision, in particular, in choosing the right target cell. It
+consists of several short test cases for different network topology (2×2 grid
+and 3×2 grid) and types of handover algorithm (the A2-A4-RSRQ handover algorithm
+and the strongest cell handover algorithm).
+
+Each test case is a simulation of a micro-cell environment with the following
+parameter:
+
+ - EPC is enabled
+ - several circular (isotropic antenna) micro-cell eNodeBs in a rectangular grid
+   layout, with 130 m distance between each adjacent point 
+ - 1 static UE, positioned close to and attached to the source cell
+ - no control channel error model
+ - no application installed
+ - no channel fading
+ - default path loss model (Friis)
+ - 1s simulation duration
+
+To trigger a handover, the test case "shutdowns" the source cell at +0.5s
+simulation time. Figure :ref:`fig-lte-handover-target-scenario` below
+illustrates the process. This is done by setting the source cell's Tx power to
+a very low value. As a result, the handover algorithm notices that the UE
+deserves a handover and several neighbouring cells become candidates of target
+cell at the same time.
+
+.. _fig-lte-handover-target-scenario:
+
+.. figure:: figures/lte-handover-target-scenario.*
+   :scale: 80 %
+   :align: center
+
+   ``lte-handover-target`` test scenario in a 2×2 grid
+
+The test case then verifies that the handover algorithm, when faced with more
+than one options of target cells, is able to choose the right one.
diff -Naur ns-3.18.1/src/lte/doc/source/lte-user.rst ns-3.19/src/lte/doc/source/lte-user.rst
--- ns-3.18.1/src/lte/doc/source/lte-user.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/doc/source/lte-user.rst	2013-12-20 09:44:51.000000000 -0800
@@ -1,9 +1,9 @@
 .. include:: replace.txt
 
 
-+++++++++++++++++++++++++++++++++
- User Documentation
-+++++++++++++++++++++++++++++++++
+++++++++++++++++++
+User Documentation
+++++++++++++++++++
 
 
 Background
@@ -39,6 +39,8 @@
 
 
 
+.. _sec-basic-simulation-program:
+
 Basic simulation program
 ------------------------
 
@@ -60,7 +62,7 @@
       // the rest of the simulation program follows
 
 
-#. Create a LteHelper object::
+#. Create an ``LteHelper`` object::
 
       Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
 
@@ -68,7 +70,7 @@
    objects (e.g., the Channel object) and provide the methods to add
    eNBs and UEs and configure them.
 
-#. Create Node objects for the eNB(s) and the UEs::
+#. Create ``Node`` objects for the eNB(s) and the UEs::
 
       NodeContainer enbNodes;
       enbNodes.Create (1);
@@ -137,8 +139,8 @@
 For how to compile and run simulation programs, please refer to [ns3tutorial]_.
 
 
-Configuration of LTE model parameters 
---------------------------------------
+Configuration of LTE model parameters
+-------------------------------------
 
 All the relevant LTE model parameters are managed through the ns-3
 attribute system. Please refer to the [ns3tutorial]_ and [ns3manual]_
@@ -261,10 +263,12 @@
      ./waf --run lena-simple --command-template="%s --PrintAttributes=ns3::LteEnbMac"
      ./waf --run lena-simple --command-template="%s --PrintAttributes=ns3::LteEnbPhy"
      ./waf --run lena-simple --command-template="%s --PrintAttributes=ns3::LteUePhy"
-     ./waf --run lena-simple --command-template="%s --PrintAttributes=ns3::EpcHelper"
+     ./waf --run lena-simple --command-template="%s --PrintAttributes=ns3::PointToPointEpcHelper"
  
 
 
+.. _sec-simulation-output:
+
 Simulation Output
 -----------------
 
@@ -382,14 +386,14 @@
   2. Cell ID
   3. unique UE ID (IMSI)
   4. RSRP
-  5. Linear average of the SINR peceived by the RBs
+  5. Linear average over all RBs of the downlink SINR in linear units
 
 The contents in the UE SINR file are:
 
   1. Simulation time in seconds at which the allocation is indicated by the scheduler
   2. Cell ID
   3. unique UE ID (IMSI)
-  4. SINR in linear units for the UE
+  4. uplink SINR in linear units for the UE
 
 In the interference filename the content is:
 
@@ -503,7 +507,7 @@
    Excerpt of the fading trace included in the simulator for an urban  scenario (speed of 3 kmph).
 
 
-Mobility Model with Buildings 
+Mobility Model with Buildings
 -----------------------------
 
 We now explain by examples how to use the buildings model (in particular, the ``MobilityBuildingInfo`` and the ``BuildingPropagationModel`` classes) in an ns-3 simulation program to setup an LTE simulation scenario that includes buildings and indoor nodes.
@@ -653,10 +657,12 @@
 with different antenna orientations to be installed on each node.
 
 
+.. _sec-radio-environment-maps:
+
 Radio Environment Maps
 ----------------------
 
-By using the class RadioEnvironmentMapHelper it is possible to output
+By using the class ``RadioEnvironmentMapHelper`` it is possible to output
 to a file a Radio Environment Map (REM), i.e., a uniform 2D grid of values
 that represent the Signal-to-noise ratio in the downlink with respect
 to the eNB that has the strongest signal at each point. 
@@ -676,9 +682,9 @@
   remHelper->SetAttribute ("Z", DoubleValue (0.0));
   remHelper->Install ();
 
-By configuring the attributes of the RadioEnvironmentMapHelper object
+By configuring the attributes of the ``RadioEnvironmentMapHelper`` object
 as shown above, you can tune the parameters of the REM to be
-generated. Note that each RadioEnvironmentMapHelper instance can
+generated. Note that each ``RadioEnvironmentMapHelper`` instance can
 generate only one REM; if you want to generate more REMs, you need to
 create one separate instance for each REM. 
 
@@ -758,6 +764,7 @@
 
 
 
+.. _sec-evolved-packet-core:
 
 Evolved Packet Core (EPC)
 -------------------------
@@ -769,11 +776,18 @@
 IPv4 over LTE, and also to connect an LTE network to any other IPv4
 network you might have in your simulation.
 
-First of all, in your simulation program you need to create two
-helpers::
+First of all, in addition to ``LteHelper`` that we already introduced
+in :ref:`sec-basic-simulation-program`, you need to use an additional
+``EpcHelper`` class, which will take care of creating the EPC entities and
+network topology. Note that you can't use ``EpcHelper`` directly, as
+it is an abstract base class; instead, you need to use one of its
+child classes, which provide different EPC topology implementations. In
+this example we will consider ``PointToPointEpcHelper``, which
+implements an EPC based on point-to-point links. To use it, you need
+first to insert this code in your simulation program::
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper> epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
 
 Then, you need to tell the LTE helper that the EPC will be used::
 
@@ -794,11 +808,11 @@
 the default; otherwise, the attribute won't be changed (e.g., if
 you changed the default to ``RLC_AM_ALWAYS``, it won't be touched).
 
-It is to be noted that, upon construction, the EpcHelper will also
-create and configure the PGW node. Its configuration in particular
-is very complex, and hence is done automatically by the Helper. Still,
-it is allowed to access the PGW node in order to connect it to other
-IPv4 network (e.g., the internet). Here is a very simple example about
+It is to be noted that the ``EpcHelper`` will also automatically
+create the PGW node and configure it so that it can properly handle
+traffic from/to the LTE radio access network.  Still,
+you need to add some explicit code to connect the PGW to other
+IPv4 networks (e.g., the internet). Here is a very simple example about
 how to connect a single remote host to the PGW via a point-to-point
 link::
 
@@ -826,7 +840,7 @@
 
 It's important to specify routes so that the remote host can reach LTE
 UEs. One way of doing this is by exploiting the fact that the
-EpcHelper will by default assign to LTE UEs an IP address in the
+``PointToPointEpcHelper`` will by default assign to LTE UEs an IP address in the
 7.0.0.0 network. With this in mind, it suffices to do::
 
   Ipv4StaticRoutingHelper ipv4RoutingHelper;
@@ -913,74 +927,401 @@
 
 
 
-X2-based handover
------------------
+.. _sec-network-attachment:
 
-The execution of an X2-based handover between two eNBs requires the
-configuration of an X2 interface between the two eNBs. This needs to
-be done explicitly within the simulation program like this::
+Network Attachment
+------------------
 
-     lteHelper->AddX2Interface (enbNodes);
+As shown in the basic example in section :ref:`sec-basic-simulation-program`,
+attaching a UE to an eNodeB is done by calling ``LteHelper::Attach`` function.
 
-where ``enbNodes`` is a ``NodeContainer`` that contains the two eNBs
-between which the X2 interface is to be configured.
+There are 2 possible ways of network attachment. The first method is the
+*"manual"* one, while the second one has a more *"automatic"* sense on it. Each
+of them will be covered in this section.
+
+Manual attachment
+*****************
+
+This method uses the ``LteHelper::Attach`` function mentioned above. It has been
+the only available network attachment method in earlier versions of LTE module.
+It is typically invoked before the simulation begins::
+
+   lteHelper->Attach (ueDevs, enbDev); // attach one or more UEs to a single eNodeB
+
+``LteHelper::InstallEnbDevice`` and ``LteHelper::InstallUeDevice`` functions
+must have been called before attaching. In an EPC-enabled simulation, it is also
+required to have IPv4 properly pre-installed in the UE.
+
+This method is very simple, but requires you to know exactly which UE belongs to
+to which eNodeB before the simulation begins. This can be difficult when the UE
+initial position is randomly determined by the simulation script.
+
+One may choose the distance between the UE and the eNodeB as a criterion for
+selecting the appropriate cell. It is quite simple (at least from the
+simulator's point of view) and sometimes practical. But it is important to note
+that sometimes distance does not make a single correct criterion. For instance,
+the eNodeB antenna directivity should be considered as well. Besides that, one
+should also take into account the channel condition, which might be fluctuating
+if there is fading or shadowing in effect. In these kind of cases, network
+attachment should not be based on distance alone.
+
+In real life, UE will automatically evaluate certain criteria and select the
+best cell to attach to, without manual intervention from the user. Obviously
+this is not the case in this ``LteHelper::Attach`` function. The other network
+attachment method uses more *"automatic"* approach to network attachment, as
+will be described next.
+
+Automatic attachment using Idle mode cell selection procedure
+*************************************************************
+
+The strength of the received signal is the standard criterion used for selecting
+the best cell to attach to. The use of this criterion is implemented in the
+`initial cell selection` process, which can be invoked by calling another
+version of the ``LteHelper::Attach`` function, as shown below::
+
+   lteHelper->Attach (ueDevs); // attach one or more UEs to a strongest cell
+
+The difference with the manual method is that the destination eNodeB is not
+specified. The procedure will find the best cell for the UEs, based on several
+criteria, including the strength of the received signal (RSRP).
+
+After the method is called, the UE will spend some time to measure the
+neighbouring cells, and then attempt to attach to the best one. More details can
+be found in section :ref:`sec-initial-cell-selection` of the Design
+Documentation.
 
+It is important to note that this method only works in EPC-enabled simulations.
+LTE-only simulations must resort to manual attachment method.
 
-Manual handover trigger
+Closed Subscriber Group
 ***********************
 
-Handover event can be triggered "manually" within the simulation
-program by scheduling an  explicit handover event. The ``LteHelper``
-provides a convenient method for the scheduling of a handover
-event. As an example, let us assume that ``ueLteDevs``` is a
-``NetDeviceContainer`` that contains the UE that is to be handed over,
-and that ``enbLteDevs`` is another ``NetDeviceContainer`` that
-contains the source and the target eNB. Then, an handover at 0.1s can be
-scheduled like this::
+An interesting use case of the initial cell selection process is to setup a
+simulation environment with Closed Subscriber Group (CSG).
 
-     lteHelper->HandoverRequest (Seconds (0.100), 
-                                 ueLteDevs.Get (0), 
-                                 enbLteDevs.Get (0), 
-                                 enbLteDevs.Get (1));
+For example, a certain eNodeB, typically a smaller version such as femtocell,
+might belong to a private owner (e.g. a household or business), allowing access
+only to some UEs which have been previously registered by the owner. The eNodeB
+and the registered UEs altogether form a CSG.
+
+The access restriction can be simulated by "labeling" the CSG members with the
+same CSG ID. This is done through the attributes in both eNodeB and UE, for
+example using the following ``LteHelper`` functions::
+
+   // label the following eNodeBs with CSG identity of 1 and CSG indication enabled
+   lteHelper->SetEnbDeviceAttribute ("CsgId", UintegerValue (1));
+   lteHelper->SetEnbDeviceAttribute ("CsgIndication", BooleanValue (true));
 
+   // label one or more UEs with CSG identity of 1
+   lteHelper->SetUeDeviceAttribute ("CsgId", UintegerValue (1));
+   
+   // install the eNodeBs and UEs
+   NetDeviceContainer csgEnbDevs = lteHelper->InstallEnbDevice (csgEnbNodes);
+   NetDeviceContainer csgUeDevs = lteHelper->InstallUeDevice (csgUeNodes);
 
-Note that the UE needs to be already connected to the source eNB,
-otherwise the simulation will terminate with an error message.
+Then enable the initial cell selection procedure on the UEs:: 
 
+   lteHelper->Attach (csgUeDevs);
 
-Automatic handover trigger
-**************************
+This is necessary because the CSG restriction only works with automatic method
+of network attachment, but not in the manual method.
+
+Note that setting the CSG indication of an eNodeB as false (the default value)
+will disable the restriction, i.e., any UEs can connect to this eNodeB.
+
+
+
+.. _sec-configure-ue-measurements:
+
+Configure UE measurements
+-------------------------
 
-Handover procedure can be triggered "automatically" by the serving eNB of 
-the UE. It is also known as the source eNB in the handover procedure. In
-order to control when the handover procedure is initiated, you can configure
-the parameters of the handover algorithm in your simulation program 
-through the ns-3 attributes of the eNB RRC entity::
+The active UE measurement configuration in a simulation is dictated by the
+selected so called "consumers", such as handover algorithm. Users may add their
+own configuration into action, and there are several ways to do so:
 
+ #. direct configuration in eNodeB RRC entity;
+ 
+ #. configuring existing handover algorithm; and
+ 
+ #. developing a new handover algorithm.
+ 
+This section will cover the first method only. The second method is covered in
+:ref:`sec-automatic-handover`, while the third method is explained in length in
+Section :ref:`sec-handover-algorithm` of the Design Documentation.
+
+Direct configuration in eNodeB RRC works as follows. User begins by creating a
+new ``LteRrcSap::ReportConfigEutra`` instance and pass it to the
+``LteEnbRrc::AddUeMeasReportConfig`` function. The function will return the
+``measId`` (measurement identity) which is a unique reference of the
+configuration in the eNodeB instance. This function must be called before the
+simulation begins. The measurement configuration will be active in all UEs
+attached to the eNodeB throughout the duration of the simulation. During the
+simulation, user can capture the measurement reports produced by the UEs by
+listening to the existing ``LteEnbRrc::RecvMeasurementReport`` trace source.
 
-  Config::SetDefault ("ns3::LteEnbRrc::ServingCellHandoverThreshold",
-                      UintegerValue (30));
+The structure `ReportConfigEutra` is in accord with 3GPP specification.
+Definition of the structure and each member field can be found in Section 6.3.5
+of [TS36331]_.
 
-  Config::SetDefault ("ns3::LteEnbRrc::NeighbourCellHandoverOffset",
-                      UintegerValue (1));
+The code sample below configures Event A1 RSRP measurement to every eNodeB
+within the container ``devs``::
 
+   LteRrcSap::ReportConfigEutra config;        
+   config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+   config.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRP;
+   config.threshold1.range = 41;
+   config.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRP;
+   config.reportInterval = LteRrcSap::ReportConfigEutra::MS480;
+   
+   std::vector<uint8_t> measIdList;
 
-The UE measurements are used in the automatic handover algorithm. You can
-configure the parameters of the UE measurements in your simulation program
-through the ns-3 attributes of the eNB RRC entity. You can set the thresholds
-of events A2 and A4::
+   NetDeviceContainer::Iterator it;
+   for (it = devs.Begin (); it != devs.End (); it++)
+   {
+     Ptr<NetDevice> dev = *it;
+     Ptr<LteEnbNetDevice> enbDev = dev->GetObject<LteEnbNetDevice> ();
+     Ptr<LteEnbRrc> enbRrc = enbDev->GetRrc ();
+    
+     uint8_t measId = enbRrc->AddUeMeasReportConfig (config);
+     measIdList.push_back (measId); // remember the measId created
+    
+     enbRrc->TraceConnect ("RecvMeasurementReport",
+                           "context",
+                           MakeCallback (&RecvMeasurementReportCallback));
+   }
+
+Note that thresholds are expressed as range. In the example above, the range 41
+for RSRP corresponds to -100 dBm. The conversion from and to the range format is
+due to Section 9.1.4 and 9.1.7 of [TS36133]_. The ``EutranMeasurementMapping``
+class has several static functions that can be used for this purpose.
+
+The corresponding callback function would have a definition similar as below::
+
+   void
+   RecvMeasurementReportCallback (std::string context,
+                                  uint64_t imsi,
+                                  uint16_t cellId,
+                                  uint16_t rnti,
+                                  LteRrcSap::MeasurementReport measReport);
+
+This method will register the callback function as a consumer of UE
+measurements. In the case where there are more than one consumers in the
+simulation (e.g. handover algorithm), the measurements intended for other
+consumers will also be captured by this callback function. Users may utilize the
+the ``measId`` field, contained within the ``LteRrcSap::MeasurementReport``
+argument of the callback function, to tell which measurement configuration has
+triggered the report.
+
+In general, this mechanism prevents one consumer to unknowingly intervene with
+another consumer's reporting configuration.
+
+Note that only the reporting configuration part (i.e.
+``LteRrcSap::ReportConfigEutra``) of the UE measurements parameter is open for
+consumers to configure, while the other parts are kept hidden. The
+intra-frequency limitation is the main motivation behind this API implementation
+decision:
 
+ - there is only one, unambiguous and definitive *measurement object*, thus
+   there is no need to configure it;
+   
+ - *measurement identities* are kept hidden because of the fact that there is
+   one-to-one mapping between reporting configuration and measurement identity,
+   thus a new measurement identity is set up automatically when a new reporting
+   configuration is created;
 
-  Config::SetDefault ("ns3::LteEnbRrc::EventA2Threshold",
-                      UintegerValue (32));
+ - *quantity configuration* is configured elsewhere, see
+   :ref:`sec-performing-measurements`; and
+   
+ - *measurement gaps* are not supported, because it is only applicable for
+   inter-frequency settings;
 
-  Config::SetDefault ("ns3::LteEnbRrc::EventA4Threshold",
-                      UintegerValue (2));
 
 
-You can find more info about events A2 and A4 in Subsections 5.5.4.3 and 5.5.4.5
-of [TS36331]_.
+.. _sec-x2-based-handover:
 
+X2-based handover
+-----------------
+
+As defined by 3GPP, handover is a procedure for changing the serving cell of a
+UE in CONNECTED mode. The two eNodeBs involved in the process are typically
+called the *source eNodeB* and the *target eNodeB*.
+
+In order to enable the execution of X2-based handover in simulation, there are
+two requirements that must be met. Firstly, EPC must be enabled in the
+simulation (see :ref:`sec-evolved-packet-core`).
+
+Secondly, an X2 interface must be configured between the two eNodeBs, which
+needs to be done explicitly within the simulation program::
+
+   lteHelper->AddX2Interface (enbNodes);
+
+where ``enbNodes`` is a ``NodeContainer`` that contains the two eNodeBs between
+which the X2 interface is to be configured. If the container has more than two
+eNodeBs, the function will create an X2 interface between every pair of eNodeBs
+in the container.
+
+Lastly, the target eNodeB must be configured as "open" to X2 HANDOVER REQUEST.
+Every eNodeB is open by default, so no extra instruction is needed in most
+cases. However, users may set the eNodeB to "closed" by setting the boolean
+attribute ``LteEnbRrc::AdmitHandoverRequest`` to `false`. As an example, you can
+run the ``lena-x2-handover`` program and setting the attribute in this way::
+
+   NS_LOG=EpcX2:LteEnbRrc ./waf --run lena-x2-handover --command="%s --ns3::LteEnbRrc::AdmitHandoverRequest=false"
+
+After the above three requirements are fulfilled, the handover procedure can be
+triggered manually or automatically. Each will be presented in the following
+subsections.
+
+
+Manual handover trigger
+***********************
+
+Handover event can be triggered "manually" within the simulation program by
+scheduling an explicit handover event. The ``LteHelper`` object provides a
+convenient method for the scheduling of a handover event. As an example, let us
+assume that ``ueLteDevs`` is a ``NetDeviceContainer`` that contains the UE that
+is to be handed over, and that ``enbLteDevs`` is another ``NetDeviceContainer``
+that contains the source and the target eNB. Then, a handover at 0.1s can be
+scheduled like this::
+
+   lteHelper->HandoverRequest (Seconds (0.100), 
+                               ueLteDevs.Get (0), 
+                               enbLteDevs.Get (0), 
+                               enbLteDevs.Get (1));
+
+Note that the UE needs to be already connected to the source eNB, otherwise the
+simulation will terminate with an error message. 
+
+For an example with full source code, please refer to the ``lena-x2-handover``
+example program.
+
+
+.. _sec-automatic-handover:
+
+Automatic handover trigger
+**************************
+
+Handover procedure can also be triggered "automatically" by the serving eNodeB 
+of the UE. The logic behind the trigger depends on the handover algorithm
+currently active in the eNodeB RRC entity. Users may select and configure the
+handover algorithm that will be used in the simulation, which will be explained
+shortly in this section. Users may also opt to write their own implementation of
+handover algorithm, as described in Section :ref:`sec-handover-algorithm` of the
+Design Documentation.
+
+Selecting a handover algorithm is done via the ``LteHelper`` object and its
+``SetHandoverAlgorithmType`` method as shown below::
+
+   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+   lteHelper->SetHandoverAlgorithmType ("ns3::A2A4RsrqHandoverAlgorithm");
+ 
+The selected handover algorithm may also provide several configurable
+attributes, which can be set as follows::
+
+   lteHelper->SetHandoverAlgorithmAttribute ("ServingCellThreshold",
+                                             UintegerValue (30));
+   lteHelper->SetHandoverAlgorithmAttribute ("NeighbourCellOffset",
+                                             UintegerValue (1));
+
+Three options of handover algorithm are included in the LTE module. The
+*A2-A4-RSRQ* handover algorithm (named as ``ns3::A2A4RsrqHandoverAlgorithm``) is
+the default option, and the usage has already been shown above.
+
+Another option is the *strongest cell* handover algorithm (named as
+``ns3::A3RsrpHandoverAlgorithm``), which can be selected and configured by the
+following code::
+
+   lteHelper->SetHandoverAlgorithmType ("ns3::A3RsrpHandoverAlgorithm");
+   lteHelper->SetHandoverAlgorithmAttribute ("Hysteresis",
+                                             DoubleValue (3.0));
+   lteHelper->SetHandoverAlgorithmAttribute ("TimeToTrigger",
+                                             TimeValue (MilliSeconds (256)));
+
+The last option is a special one, called the *no-op* handover algorithm, which
+basically disables automatic handover trigger. This is useful for example in
+cases where manual handover trigger need an exclusive control of all handover
+decision. It does not have any configurable attributes. The usage is as
+follows::
+
+   lteHelper->SetHandoverAlgorithmType ("ns3::NoOpHandoverAlgorithm");
+
+For more information on each handover algorithm's decision policy and their
+attributes, please refer to their respective subsections in Section
+:ref:`sec-handover-algorithm` of the Design Documentation.
+
+Finally, the ``InstallEnbDevice`` function of ``LteHelper`` will instantiate one
+instance of the selected handover algorithm for each eNodeB device. In other
+words, make sure to select the right handover algorithm before finalizing it in
+the following line of code::
+
+   NetDeviceContainer enbLteDevs = lteHelper->InstallEnbDevice (enbNodes); 
+
+Example with full source code of using automatic handover trigger can be found
+in the ``lena-x2-handover-measures`` example program.
+
+
+.. _sec-tuning-handover-simulation:
+
+Tuning simulation with handover
+*******************************
+
+As mentioned in the Design Documentation, the current implementation of handover
+model may produce unpredicted behaviour when handover failure occurs. This
+subsection will focus on the steps that should be taken into account by users
+if they plan to use handover in their simulations.
+
+The major cause of handover failure that we will tackle is the error in
+transmitting handover-related signaling messages during the execution of a
+handover procedure. As apparent from the Figure
+:ref:`fig-x2-based-handover-seq-diagram` from the Design Documentation, there
+are many of them and they use different interfaces and protocols. For the sake
+of simplicity, we can safely assume that the X2 interface (between the source
+eNodeB and the target eNodeB) and the S1 interface (between the target eNodeB
+and the SGW/PGW) are quite stable. Therefore we will focus our attention to the
+RRC protocol (between the UE and the eNodeBs) and the Random Access procedure,
+which are normally transmitted through the air and susceptible to degradation of
+channel condition. 
+
+A general tips to reduce transmission error is to *ensure high enough SINR*
+level in every UE. This can be done by a proper planning of the network topology
+that *minimizes network coverage hole*. If the topology has a known coverage
+hole, then the UE should be configured not to venture to that area.
+
+Another approach to keep in mind is to *avoid too-late handovers*. In other
+words, handover should happen before the UE's SINR becomes too low, otherwise
+the UE may fail to receive the handover command from the source eNodeB. Handover
+algorithms have the means to control how early or late a handover decision is
+made. For example, A2-A4-RSRQ handover algorithm can be configured with a higher
+threshold to make it decide a handover earlier. Similarly, smaller hysteresis
+and/or shorter time-to-trigger in the strongest cell handover algorithm
+typically results in earlier handovers. In order to find the right values for
+these parameters, one of the factors that should be considered is the UE
+movement speed. Generally, a faster moving UE requires the handover to be
+executed earlier. Some research work have suggested recommended values, such as
+in [Lee2010]_.
+
+The above tips should be enough in normal simulation uses, but in the case some
+special needs arise then an extreme measure can be taken into consideration.
+For instance, users may consider *disabling the channel error models*. This will
+ensure that all handover-related signaling messages will be transmitted
+successfully, regardless of distance and channel condition. However, it will
+also affect all other data or control packets not related to handover, which may
+be an unwanted side effect. Otherwise, it can be done as follows::
+
+   Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled");
+   Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled");
+   
+By using the above code, we disable the error model in both control and data
+channels and in both directions (downlink and uplink). This is necessary because
+handover-related signaling messages are transmitted using these channels. An
+exception is when the simulation uses the ideal RRC protocol. In this case, only
+the Random Access procedure is left to be considered. The procedure consists of
+control messages, therefore we only need to disable the control channel's error
+model.
+      
+
+.. _sec-handover-traces:
 
 Handover traces
 ***************
@@ -991,76 +1332,73 @@
 handover execution phase at both the UE and eNB side. As an example,
 in your simulation program you can declare the following methods::
 
-
-  void 
-  NotifyHandoverStartUe (std::string context, 
-                         uint64_t imsi, 
-                         uint16_t cellid, 
-                         uint16_t rnti, 
-                         uint16_t targetCellId)
-  {
-    std::cout << context 
-              << " UE IMSI " << imsi 
-              << ": previously connected to CellId " << cellid 
-              << " with RNTI " << rnti 
-              << ", doing handover to CellId " << targetCellId 
-              << std::endl;
-  }
-
-  void 
-  NotifyHandoverEndOkUe (std::string context, 
-                         uint64_t imsi, 
-                         uint16_t cellid, 
-                         uint16_t rnti)
-  {
-    std::cout << context 
-              << " UE IMSI " << imsi 
-              << ": successful handover to CellId " << cellid 
-              << " with RNTI " << rnti 
-              << std::endl;
-  }
-
-  void 
-  NotifyHandoverStartEnb (std::string context, 
+   void 
+   NotifyHandoverStartUe (std::string context, 
                           uint64_t imsi, 
-                          uint16_t cellid, 
+                          uint16_t cellId, 
                           uint16_t rnti, 
                           uint16_t targetCellId)
-  {
-    std::cout << context 
-              << " eNB CellId " << cellid 
-              << ": start handover of UE with IMSI " << imsi 
-              << " RNTI " << rnti 
-              << " to CellId " << targetCellId 
-              << std::endl;
-  }
+   {
+     std::cout << Simulator::Now ().GetSeconds () << " " << context 
+               << " UE IMSI " << imsi 
+               << ": previously connected to CellId " << cellId 
+               << " with RNTI " << rnti 
+               << ", doing handover to CellId " << targetCellId 
+               << std::endl;
+   }
 
-  void 
-  NotifyHandoverEndOkEnb (std::string context, 
+   void 
+   NotifyHandoverEndOkUe (std::string context, 
                           uint64_t imsi, 
-                          uint16_t cellid, 
+                          uint16_t cellId, 
                           uint16_t rnti)
-  {
-    std::cout << context 
-              << " eNB CellId " << cellid 
-              << ": completed handover of UE with IMSI " << imsi 
-              << " RNTI " << rnti 
-              << std::endl;
-  }
-
+   {
+     std::cout << Simulator::Now ().GetSeconds () << " " << context 
+               << " UE IMSI " << imsi 
+               << ": successful handover to CellId " << cellId 
+               << " with RNTI " << rnti 
+               << std::endl;
+   }
+
+   void 
+   NotifyHandoverStartEnb (std::string context, 
+                           uint64_t imsi, 
+                           uint16_t cellId, 
+                           uint16_t rnti, 
+                           uint16_t targetCellId)
+   {
+     std::cout << Simulator::Now ().GetSeconds () << " " << context 
+               << " eNB CellId " << cellId 
+               << ": start handover of UE with IMSI " << imsi 
+               << " RNTI " << rnti 
+               << " to CellId " << targetCellId 
+               << std::endl;
+   }
+
+   void 
+   NotifyHandoverEndOkEnb (std::string context, 
+                           uint64_t imsi, 
+                           uint16_t cellId, 
+                           uint16_t rnti)
+   {
+     std::cout << Simulator::Now ().GetSeconds () << " " << context 
+               << " eNB CellId " << cellId 
+               << ": completed handover of UE with IMSI " << imsi 
+               << " RNTI " << rnti 
+               << std::endl;
+   }
 
 Then, you can hook up these methods to the corresponding trace sources
 like this::
 
-  Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverStart",
-                   MakeCallback (&NotifyHandoverStartEnb));
-  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverStart",
-                   MakeCallback (&NotifyHandoverStartUe));
-  Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverEndOk",
-                   MakeCallback (&NotifyHandoverEndOkEnb));
-  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverEndOk",
-                   MakeCallback (&NotifyHandoverEndOkUe));
-
+   Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverStart",
+                    MakeCallback (&NotifyHandoverStartEnb));
+   Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverStart",
+                    MakeCallback (&NotifyHandoverStartUe));
+   Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverEndOk",
+                    MakeCallback (&NotifyHandoverEndOkEnb));
+   Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverEndOk",
+                    MakeCallback (&NotifyHandoverEndOkUe));
 
 The example program ``src/lte/examples/lena-x2-handover.cc``
 illustrates how the all above instructions can be integrated in a
@@ -1075,14 +1413,6 @@
     NS_LOG=LteEnbRrc:LteUeRrc:EpcX2 ./waf --run lena-x2-handover
 
 
-Whether a target eNB will accept or not an incoming X2 HANDOVER
-REQUEST is controlled by the boolean attribute
-``LteEnbRrc::AdmitHandoverRequest`` (default: true). As an example,
-you can run the ``lena-x2-handover`` program setting the attribute to
-false in this way::
-
-   NS_LOG=EpcX2:LteEnbRrc ./waf --run lena-x2-handover 
-     --command="%s --ns3::LteEnbRrc::AdmitHandoverRequest=false"
 
 
 
@@ -1093,28 +1423,311 @@
 show how to simulate different LTE scenarios. 
 
 
+
 Reference scenarios
 -------------------
 
 There is a vast amount of reference LTE simulation scenarios which can
 be found in the literature. Here we list some of them: 
 
- * The dual stripe model [R4-092042]_, which is partially implemented
-   in the example program
-   ``src/lte/examples/lena-dual-stripe.cc``. This example program
-   features a lot of configurable parameters which can be customize by
-   changing the corresponding global variable. To get a list of all these
-   parameters, you can run this command::
-
-     ./waf --run lena-dual-stripe --command-template="%s --PrintGlobals"
-
-
-
- * The system simulation scenarios mentioned in section A.2 of [TR36814]_
-
-
+ * The system simulation scenarios mentioned in section A.2 of [TR36814]_.
 
+ * The dual stripe model [R4-092042]_, which is partially implemented in the
+   example program ``src/lte/examples/lena-dual-stripe.cc``. This example
+   program features a lot of configurable parameters which can be customized by
+   changing the corresponding global variables. To get a list of all these
+   global variables, you can run this command::
 
+     ./waf --run lena-dual-stripe --command-template="%s --PrintGlobals"
+     
+   The following subsection presents an example of running a simulation
+   campaign using this example program.
+
+
+Handover simulation campaign
+****************************
+
+In this subsection, we will demonstrate an example of running a simulation
+campaign using the LTE module of |ns3|. The objective of the campaign is to
+compare the effect of each built-in handover algorithm of the LTE module.
+
+The campaign will use the ``lena-dual-stripe`` example program. First, we have
+to modify the example program to produce the output that we need. In this
+occassion, we want to produce the number of handovers, user average throughput,
+and average SINR.
+
+The number of handovers can be obtained by counting the number of times the
+`HandoverEndOk` :ref:`sec-handover-traces` is fired. Then the user average
+throughput can be obtained by enabling the RLC :ref:`sec-simulation-output`.
+Finally, SINR can be obtained by enabling the PHY simulation output. The
+following sample code snippet shows one possible way to obtain the above::
+
+   void
+   NotifyHandoverEndOkUe (std::string context, uint64_t imsi,
+                          uint16_t cellId, uint16_t rnti)
+   {
+     std::cout << "Handover IMSI " << imsi << std::endl;
+   }
+
+   int
+   main (int argc, char *argv[])
+   {
+     /*** SNIP ***/
+
+     Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverEndOk",
+                      MakeCallback (&NotifyHandoverEndOkUe));
+
+     lteHelper->EnablePhyTraces ();
+     lteHelper->EnableRlcTraces ();
+     Ptr<RadioBearerStatsCalculator> rlcStats = lteHelper->GetRlcStats ();
+     rlcStats->SetAttribute ("StartTime", TimeValue (Seconds (0)));
+     rlcStats->SetAttribute ("EpochDuration", TimeValue (Seconds (simTime)));
+
+     Simulator::Run ();
+     Simulator::Destroy ();
+     return 0;
+   }
+
+Then we have to configure the parameters of the program to suit our simulation
+needs. We are looking for the following assumptions in our simulation:
+
+ * 7 sites of tri-sectored macro eNodeBs (i.e. 21 macrocells) deployed in
+   hexagonal layout with 500 m inter-site distance.
+
+ * Although ``lena-dual-stripe`` is originally intended for a two-tier
+   (macrocell and femtocell) simulation, we will simplify our simulation to
+   one-tier (macrocell) simulation only.
+
+ * UEs are randomly distributed around the sites and attach to the network
+   automatically using Idle mode cell selection. After that, UE will roam the
+   simulation environment with 60 kmph movement speed.
+
+ * 50 seconds simulation duration, so UEs would have traveled far enough to
+   trigger some handovers.
+
+ * 46 dBm macrocell Tx power and 10 dBm UE Tx power.
+
+ * EPC mode will be used because the X2 handover procedure requires it to be
+   enabled.
+
+ * Full-buffer downlink and uplink traffic, both in 5 MHz bandwidth, using TCP
+   protocol and Proportional Fair scheduler.
+
+ * Ideal RRC protocol.
+
+Table :ref:`tab-handover-campaign-program-parameter` below shows how we
+configure the parameters of ``lena-dual-stripe`` to achieve the above
+assumptions.
+
+.. _tab-handover-campaign-program-parameter:
+
+.. table:: ``lena-dual-stripe`` parameter configuration for handover campaign
+
+   ================== ========== ===============================================
+   Parameter name     Value      Description
+   ================== ========== ===============================================
+   simTime            50         50 seconds simulation duration
+   nBlocks            0          Disabling apartment buildings and femtocells
+   nMacroEnbSites     7          Number of macrocell sites (each site has 3
+                                 cells)
+   nMacroEnbSitesX    2          The macrocell sites will be positioned in a
+                                 2-3-2 formation
+   interSiteDistance  500        500 m distance between adjacent macrocell sites
+   macroEnbTxPowerDbm 46         46 dBm Tx power for each macrocell
+   epc                1          Enable EPC mode
+   epcDl              1          Enable full-buffer DL traffic
+   epcUl              1          Enable full-buffer UL traffic
+   useUdp             0          Disable UDP traffic and enable TCP instead
+   macroUeDensity     0.00002    Determines number of UEs (translates to 48 UEs
+                                 in our simulation)
+   outdoorUeMinSpeed  16.6667    Minimum UE movement speed in m/s (60 kmph)
+   outdoorUeMaxSpeed  16.6667    Maximum UE movement speed in m/s (60 kmph)
+   macroEnbBandwidth  25         5 MHz DL and UL bandwidth
+   generateRem        1          (Optional) For plotting the Radio Environment
+                                 Map
+   ================== ========== ===============================================
+
+Some of the required assumptions are not available as parameters of
+``lena-dual-stripe``. In this case, we override the default attributes, as
+shown in Table :ref:`tab-handover-campaign-default-values` below.
+
+.. _tab-handover-campaign-default-values:
+
+.. table:: Overriding default attributes for handover campaign
+
+   ==================================================== ================================== ==============================================
+   Default value name                                   Value                              Description
+   ==================================================== ================================== ==============================================
+   ns3::LteHelper::HandoverAlgorithm                    `ns3::NoOpHandoverAlgorithm`,      Choice of handover algorithm
+                                                        `ns3::A3RsrpHandoverAlgorithm`, or
+                                                        `ns3::A2A4RsrqHandoverAlgorithm`
+   ns3::LteHelper::Scheduler                            `ns3::PfFfMacScheduler`            Proportional Fair scheduler
+   ns3::LteHelper::UseIdealRrc                           1                                 Ideal RRC protocol
+   ns3::RadioBearerStatsCalculator::DlRlcOutputFilename `<run>`-DlRlcStats.txt             File name for DL RLC trace output
+   ns3::RadioBearerStatsCalculator::UlRlcOutputFilename `<run>`-UlRlcStats.txt             File name for UL RLC trace output
+   ns3::PhyStatsCalculator::DlRsrpSinrFilename          `<run>`-DlRsrpSinrStats.txt        File name for DL PHY RSRP/SINR trace output
+   ns3::PhyStatsCalculator::UlSinrFilename              `<run>`-UlSinrStats.txt            File name for UL PHY SINR trace output
+   ==================================================== ================================== ==============================================
+
+|ns3| provides many ways for passing configuration values into a simulation. In
+this example, we will use the command line arguments. It is basically done by
+appending the parameters and their values to the ``waf`` call when starting each
+individual simulation. So the ``waf`` calls for invoking our 3 simulations would
+look as below::
+
+   $ ./waf --run="lena-dual-stripe
+     --simTime=50 --nBlocks=0 --nMacroEnbSites=7 --nMacroEnbSitesX=2
+     --epc=1 --useUdp=0 --outdoorUeMinSpeed=16.6667 --outdoorUeMaxSpeed=16.6667
+     --ns3::LteHelper::HandoverAlgorithm=ns3::NoOpHandoverAlgorithm
+     --ns3::RadioBearerStatsCalculator::DlRlcOutputFilename=no-op-DlRlcStats.txt
+     --ns3::RadioBearerStatsCalculator::UlRlcOutputFilename=no-op-UlRlcStats.txt
+     --ns3::PhyStatsCalculator::DlRsrpSinrFilename=no-op-DlRsrpSinrStats.txt
+     --ns3::PhyStatsCalculator::UlSinrFilename=no-op-UlSinrStats.txt
+     --RngRun=1" > no-op.txt
+
+   $ ./waf --run="lena-dual-stripe
+     --simTime=50 --nBlocks=0 --nMacroEnbSites=7 --nMacroEnbSitesX=2
+     --epc=1 --useUdp=0 --outdoorUeMinSpeed=16.6667 --outdoorUeMaxSpeed=16.6667
+     --ns3::LteHelper::HandoverAlgorithm=ns3::A3RsrpHandoverAlgorithm
+     --ns3::RadioBearerStatsCalculator::DlRlcOutputFilename=a3-rsrp-DlRlcStats.txt
+     --ns3::RadioBearerStatsCalculator::UlRlcOutputFilename=a3-rsrp-UlRlcStats.txt
+     --ns3::PhyStatsCalculator::DlRsrpSinrFilename=a3-rsrp-DlRsrpSinrStats.txt
+     --ns3::PhyStatsCalculator::UlSinrFilename=a3-rsrp-UlSinrStats.txt
+     --RngRun=1" > a3-rsrp.txt
+
+   $ ./waf --run="lena-dual-stripe
+     --simTime=50 --nBlocks=0 --nMacroEnbSites=7 --nMacroEnbSitesX=2
+     --epc=1 --useUdp=0 --outdoorUeMinSpeed=16.6667 --outdoorUeMaxSpeed=16.6667
+     --ns3::LteHelper::HandoverAlgorithm=ns3::A2A4RsrqHandoverAlgorithm
+     --ns3::RadioBearerStatsCalculator::DlRlcOutputFilename=a2-a4-rsrq-DlRlcStats.txt
+     --ns3::RadioBearerStatsCalculator::UlRlcOutputFilename=a2-a4-rsrq-UlRlcStats.txt
+     --ns3::PhyStatsCalculator::DlRsrpSinrFilename=a2-a4-rsrq-DlRsrpSinrStats.txt
+     --ns3::PhyStatsCalculator::UlSinrFilename=a2-a4-rsrq-UlSinrStats.txt
+     --RngRun=1" > a2-a4-rsrq.txt
+
+Some notes on the execution:
+
+ * Notice that some arguments are not specified because they are already the
+   same as the default values. We also keep the handover algorithms on each own
+   default settings.
+
+ * Note the file names of simulation output, e.g. RLC traces and PHY traces,
+   because we have to make sure that they are not overwritten by the next
+   simulation run. In this example, we specify the names one by one using the
+   command line arguments.
+
+ * The ``--RngRun=1`` argument at the end is used for setting the run number
+   used by the random number generator used in the simulation. We re-run the
+   same simulations with different `RngRun` values, hence creating several
+   independent replications of the same simulations. Then we average the
+   results obtained from these replications to achieve some statistical
+   confidence.
+
+ * We can add a ``--generateRem=1`` argument to generate the files necessary for
+   generating the Radio Environment Map (REM) of the simulation. The result is
+   Figure :ref:`fig-lte-handover-campaign-rem` below, which can be produced by
+   following the steps described in Section :ref:`sec-radio-environment-maps`.
+   This figure also shows the position of eNodeBs and UEs at the beginning of a
+   simulation using ``RngRun = 1``. Other values of `RngRun` may produce
+   different UE position.
+   
+.. _fig-lte-handover-campaign-rem:
 
+.. figure:: figures/lte-handover-campaign-rem.*
+   :align: center
 
+   REM obtained from a simulation in handover campaign
 
+After hours of running, the simulation campaign will eventually end. Next we
+will perform some post-processing on the produced simulation output to obtain
+meaningful information out of it.
+
+In this example, we use GNU Octave to assist the processing of throughput and
+SINR data, as demonstrated in a sample GNU Octave script below::
+
+   % RxBytes is the 10th column
+   DlRxBytes = load ("no-op-DlRlcStats.txt") (:,10);
+   DlAverageThroughputKbps = sum (DlRxBytes) * 8 / 1000 / 50
+
+   % RxBytes is the 10th column
+   UlRxBytes = load ("no-op-UlRlcStats.txt") (:,10);
+   UlAverageThroughputKbps = sum (UlRxBytes) * 8 / 1000 / 50
+
+   % Sinr is the 6th column
+   DlSinr = load ("no-op-DlRsrpSinrStats.txt") (:,6);
+   % eliminate NaN values
+   idx = isnan (DlSinr);
+   DlSinr (idx) = 0;
+   DlAverageSinrDb = 10 * log10 (mean (DlSinr)) % convert to dB
+
+   % Sinr is the 5th column
+   UlSinr = load ("no-op-UlSinrStats.txt") (:,5);
+   % eliminate NaN values
+   idx = isnan (UlSinr);
+   UlSinr (idx) = 0;
+   UlAverageSinrDb = 10 * log10 (mean (UlSinr)) % convert to dB
+
+As for the number of handovers, we can use simple shell scripting to count the
+number of occurrences of string "Handover" in the log file::
+
+   $ grep "Handover" no-op.txt | wc -l
+
+Table :ref:`tab-handover-campaign-results` below shows the complete statistics
+after we are done with post-processing on every individual simulation run. The
+values shown are the average of the results obtained from ``RngRun`` of 1, 2, 3,
+and 4.
+
+.. _tab-handover-campaign-results:
+
+.. table:: Results of handover campaign
+
+   ===================================== ========== =========== ==============
+   Statistics                            No-op      A2-A4-RSRQ  Strongest cell
+   ===================================== ========== =========== ==============
+   Average DL system throughput          6 615 kbps 20 509 kbps 19 709 kbps
+   Average UL system throughput          4 095 kbps 5 705 kbps  6 627 kbps
+   Average DL SINR                       -0.10 dB   5.19 dB     5.24 dB
+   Average UL SINR                       9.54 dB    81.57 dB    79.65 dB
+   Number of handovers per UE per second 0          0.05694     0.04771
+   ===================================== ========== =========== ==============
+
+.. Below are the detailed datasheets from the campaign, for informational
+   purpose, but hidden from the published document.
+
+.. ======================= ========== ========== ========== ========== =======
+   NoOp                    RngRun = 1 RngRun = 2 RngRun = 3 RngRun = 4 Average
+   ======================= ========== ========== ========== ========== =======
+   DlAverageThroughputKbps 8 476      4 478      6 913      6 593      6 615
+   UlAverageThroughputKbps 4 923      2 962      4 715      3 779      4 095
+   DlAverageSinrDb         0.40       -0.99      0.84       -0.64      -0.10
+   UlAverageSinrDb         7.93       8.06       12.52      9.65       9.54
+   NumHandoverPerUePerSec  0          0          0          0          0
+   ======================= ========== ========== ========== ========== =======
+
+.. ======================= ========== ========== ========== ========== =======
+   A2A4Rsrq                RngRun = 1 RngRun = 2 RngRun = 3 RngRun = 4 Average
+   ======================= ========== ========== ========== ========== =======
+   DlAverageThroughputKbps 21 575     18 500     n/a        21 451     20 509
+   UlAverageThroughputKbps 6 039      5 320      n/a        5 757      5 705
+   DlAverageSinrDb         5.31       5.16       n/a        5.09       5.19
+   UlAverageSinrDb         84.17      79.18      n/a        81.37      81.57
+   NumHandoverPerUePerSec  0.05458    0.06000    n/a        0.05625    0.05694
+   ======================= ========== ========== ========== ========== =======
+   RngRun = 3 simulation got a segmentation fault as around +15.2s. The cause is
+   unknown at the moment.
+
+.. ======================= ========== ========== ========== ========== =======
+   A3Rsrp                  RngRun = 1 RngRun = 2 RngRun = 3 RngRun = 4 Average
+   ======================= ========== ========== ========== ========== =======
+   DlAverageThroughputKbps 20 349     17 781     20 229     20 478     19 709
+   UlAverageThroughputKbps 6 491      6 397      7 555      6 064      6 627
+   DlAverageSinrDb         5.24       5.08       5.63       5.01       5.24
+   UlAverageSinrDb         83.62      81.94      78.84      74.19      79.65
+   NumHandoverPerUePerSec  0.04625    0.04917    0.04958    0.04583    0.04771
+   ======================= ========== ========== ========== ========== =======
+
+The results show that having a handover algorithm in a mobility simulation
+improves both user throughput and SINR significantly. There is little difference
+between the two handover algorithms in this campaign scenario. It would be
+interesting to see their performance in different scenarios, such as scenarios
+with home eNodeBs deployment.
diff -Naur ns-3.18.1/src/lte/examples/lena-dual-stripe.cc ns-3.19/src/lte/examples/lena-dual-stripe.cc
--- ns-3.18.1/src/lte/examples/lena-dual-stripe.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/examples/lena-dual-stripe.cc	2013-12-20 09:44:51.000000000 -0800
@@ -55,7 +55,7 @@
   FemtocellBlockAllocator (Box area, uint32_t nApartmentsX, uint32_t nFloors);
   void Create (uint32_t n);
   void Create ();
-  
+
 private:
   bool OverlapsWithAnyPrevious (Box);
   Box m_area;
@@ -66,7 +66,7 @@
   double m_ySize;
   Ptr<UniformRandomVariable> m_xMinVar;
   Ptr<UniformRandomVariable> m_yMinVar;
-  
+
 };
 
 FemtocellBlockAllocator::FemtocellBlockAllocator (Box area, uint32_t nApartmentsX, uint32_t nFloors)
@@ -76,12 +76,12 @@
     m_xSize (nApartmentsX*10 + 20),
     m_ySize (70)
 {
-    m_xMinVar = CreateObject<UniformRandomVariable> ();
-    m_xMinVar->SetAttribute ("Min", DoubleValue (area.xMin));
-    m_xMinVar->SetAttribute ("Max", DoubleValue (area.xMax - m_xSize));
-    m_yMinVar = CreateObject<UniformRandomVariable> ();
-    m_yMinVar->SetAttribute ("Min", DoubleValue (area.yMin));
-    m_yMinVar->SetAttribute ("Max", DoubleValue (area.yMax - m_ySize));
+  m_xMinVar = CreateObject<UniformRandomVariable> ();
+  m_xMinVar->SetAttribute ("Min", DoubleValue (area.xMin));
+  m_xMinVar->SetAttribute ("Max", DoubleValue (area.xMax - m_xSize));
+  m_yMinVar = CreateObject<UniformRandomVariable> ();
+  m_yMinVar->SetAttribute ("Min", DoubleValue (area.yMin));
+  m_yMinVar->SetAttribute ("Max", DoubleValue (area.yMax - m_ySize));
 }
 
 void 
@@ -104,7 +104,7 @@
       box.xMin = m_xMinVar->GetValue ();
       box.xMax = box.xMin + m_xSize;
       box.yMin = m_yMinVar->GetValue ();
-      box.yMax = box.yMin + m_ySize;      
+      box.yMax = box.yMin + m_ySize;
       ++attempt;
     }
   while (OverlapsWithAnyPrevious (box));
@@ -156,7 +156,7 @@
       ++index;
       Box box = (*it)->GetBoundaries ();
       outFile << "set object " << index
-              << " rect from " << box.xMin  << "," << box.yMin  
+              << " rect from " << box.xMin  << "," << box.yMin
               << " to "   << box.xMax  << "," << box.yMax
               << " front fs empty "
               << std::endl;
@@ -184,7 +184,7 @@
             {
               Vector pos = node->GetObject<MobilityModel> ()->GetPosition ();
               outFile << "set label \"" << uedev->GetImsi ()
-                      << "\" at "<< pos.x << "," << pos.y << " left font \"Helvetica,4\" textcolor rgb \"grey\" front point pt 1 ps 0.3 lc rgb \"grey\" offset 0,0"  
+                      << "\" at "<< pos.x << "," << pos.y << " left font \"Helvetica,4\" textcolor rgb \"grey\" front point pt 1 ps 0.3 lc rgb \"grey\" offset 0,0"
                       << std::endl;
             }
         }
@@ -212,7 +212,8 @@
             {
               Vector pos = node->GetObject<MobilityModel> ()->GetPosition ();
               outFile << "set label \"" << enbdev->GetCellId ()
-                      << "\" at "<< pos.x << "," << pos.y << " left font \"Helvetica,4\" textcolor rgb \"white\" front  point pt 2 ps 0.3 lc rgb \"white\" offset 0,0"  
+                      << "\" at "<< pos.x << "," << pos.y
+                      << " left font \"Helvetica,4\" textcolor rgb \"white\" front  point pt 2 ps 0.3 lc rgb \"white\" offset 0,0"
                       << std::endl;
             }
         }
@@ -220,133 +221,131 @@
 }
 
 
-static ns3::GlobalValue g_nBlocks ("nBlocks", 
-                                   "Number of femtocell blocks", 
+static ns3::GlobalValue g_nBlocks ("nBlocks",
+                                   "Number of femtocell blocks",
                                    ns3::UintegerValue (1),
                                    ns3::MakeUintegerChecker<uint32_t> ());
-static ns3::GlobalValue g_nApartmentsX ("nApartmentsX", 
-                                        "Number of apartments along the X axis in a femtocell block",  
+static ns3::GlobalValue g_nApartmentsX ("nApartmentsX",
+                                        "Number of apartments along the X axis in a femtocell block",
                                         ns3::UintegerValue (10),
                                         ns3::MakeUintegerChecker<uint32_t> ());
-static ns3::GlobalValue g_nFloors ("nFloors", 
-                                   "Number of floors",  
+static ns3::GlobalValue g_nFloors ("nFloors",
+                                   "Number of floors",
                                    ns3::UintegerValue (1),
                                    ns3::MakeUintegerChecker<uint32_t> ());
-static ns3::GlobalValue g_nMacroEnbSites ("nMacroEnbSites", 
-                                          "How many macro sites there are",  
+static ns3::GlobalValue g_nMacroEnbSites ("nMacroEnbSites",
+                                          "How many macro sites there are",
                                           ns3::UintegerValue (3),
                                           ns3::MakeUintegerChecker<uint32_t> ());
-static ns3::GlobalValue g_nMacroEnbSitesX ("nMacroEnbSitesX", 
-                                           "(minimum) number of sites along the X-axis of the hex grid",  
+static ns3::GlobalValue g_nMacroEnbSitesX ("nMacroEnbSitesX",
+                                           "(minimum) number of sites along the X-axis of the hex grid",
                                            ns3::UintegerValue (1),
                                            ns3::MakeUintegerChecker<uint32_t> ());
-static ns3::GlobalValue g_interSiteDistance ("interSiteDistance", 
-                                             "min distance between two nearby macro cell sites",  
+static ns3::GlobalValue g_interSiteDistance ("interSiteDistance",
+                                             "min distance between two nearby macro cell sites",
                                              ns3::DoubleValue (500),
                                              ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_areaMarginFactor ("areaMarginFactor", 
+static ns3::GlobalValue g_areaMarginFactor ("areaMarginFactor",
                                             "how much the UE area extends outside the macrocell grid, "
-                                            "expressed as fraction of the interSiteDistance",   
+                                            "expressed as fraction of the interSiteDistance",
                                             ns3::DoubleValue (0.5),
                                             ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_macroUeDensity ("macroUeDensity", 
-                                          "How many macrocell UEs there are per square meter",   
+static ns3::GlobalValue g_macroUeDensity ("macroUeDensity",
+                                          "How many macrocell UEs there are per square meter",
                                           ns3::DoubleValue (0.00002),
                                           ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_homeEnbDeploymentRatio ("homeEnbDeploymentRatio", 
-                                                  "The HeNB deployment ratio as per 3GPP R4-092042",   
+static ns3::GlobalValue g_homeEnbDeploymentRatio ("homeEnbDeploymentRatio",
+                                                  "The HeNB deployment ratio as per 3GPP R4-092042",
                                                   ns3::DoubleValue (0.2),
                                                   ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_homeEnbActivationRatio ("homeEnbActivationRatio", 
-                                                  "The HeNB activation ratio as per 3GPP R4-092042",   
+static ns3::GlobalValue g_homeEnbActivationRatio ("homeEnbActivationRatio",
+                                                  "The HeNB activation ratio as per 3GPP R4-092042",
                                                   ns3::DoubleValue (0.5),
                                                   ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_homeUesHomeEnbRatio ("homeUesHomeEnbRatio", 
-                                               "How many (on average) home UEs per HeNB there are in the simulation",         
+static ns3::GlobalValue g_homeUesHomeEnbRatio ("homeUesHomeEnbRatio",
+                                               "How many (on average) home UEs per HeNB there are in the simulation",
                                                ns3::DoubleValue (1.0),
                                                ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_macroEnbTxPowerDbm ("macroEnbTxPowerDbm", 
-                                              "TX power [dBm] used by macro eNBs",   
+static ns3::GlobalValue g_macroEnbTxPowerDbm ("macroEnbTxPowerDbm",
+                                              "TX power [dBm] used by macro eNBs",
                                               ns3::DoubleValue (46.0),
                                               ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_homeEnbTxPowerDbm ("homeEnbTxPowerDbm", 
-                                             "TX power [dBm] used by HeNBs",   
+static ns3::GlobalValue g_homeEnbTxPowerDbm ("homeEnbTxPowerDbm",
+                                             "TX power [dBm] used by HeNBs",
                                              ns3::DoubleValue (20.0),
                                              ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_macroEnbDlEarfcn ("macroEnbDlEarfcn", 
-                                            "DL EARFCN used by macro eNBs", 
+static ns3::GlobalValue g_macroEnbDlEarfcn ("macroEnbDlEarfcn",
+                                            "DL EARFCN used by macro eNBs",
                                             ns3::UintegerValue (100),
                                             ns3::MakeUintegerChecker<uint16_t> ());
-static ns3::GlobalValue g_homeEnbDlEarfcn ("homeEnbDlEarfcn", 
-                                           "DL EARFCN used by HeNBs",  
+static ns3::GlobalValue g_homeEnbDlEarfcn ("homeEnbDlEarfcn",
+                                           "DL EARFCN used by HeNBs",
                                            ns3::UintegerValue (100),
                                            ns3::MakeUintegerChecker<uint16_t> ());
-static ns3::GlobalValue g_macroEnbBandwidth ("macroEnbBandwidth", 
-                                             "bandwidth [num RBs] used by macro eNBs",  
+static ns3::GlobalValue g_macroEnbBandwidth ("macroEnbBandwidth",
+                                             "bandwidth [num RBs] used by macro eNBs",
                                              ns3::UintegerValue (25),
                                              ns3::MakeUintegerChecker<uint16_t> ());
-static ns3::GlobalValue g_homeEnbBandwidth ("homeEnbBandwidth", 
-                                            "bandwidth [num RBs] used by HeNBs",  
+static ns3::GlobalValue g_homeEnbBandwidth ("homeEnbBandwidth",
+                                            "bandwidth [num RBs] used by HeNBs",
                                             ns3::UintegerValue (25),
                                             ns3::MakeUintegerChecker<uint16_t> ());
-static ns3::GlobalValue g_simTime ("simTime", 
-                                   "Total duration of the simulation [s]",  
+static ns3::GlobalValue g_simTime ("simTime",
+                                   "Total duration of the simulation [s]",
                                    ns3::DoubleValue (0.25),
                                    ns3::MakeDoubleChecker<double> ());
-static ns3::GlobalValue g_generateRem ("generateRem", 
+static ns3::GlobalValue g_generateRem ("generateRem",
                                        "if true, will generate a REM and then abort the simulation;"
-                                       "if false, will run the simulation normally (without generating any REM)",  
+                                       "if false, will run the simulation normally (without generating any REM)",
                                        ns3::BooleanValue (false),
                                        ns3::MakeBooleanChecker ());
-static ns3::GlobalValue g_epc ("epc", 
+static ns3::GlobalValue g_epc ("epc",
                                "If true, will setup the EPC to simulate an end-to-end topology, "
                                "with real IP applications over PDCP and RLC UM (or RLC AM by changing "
                                "the default value of EpsBearerToRlcMapping e.g. to RLC_AM_ALWAYS). "
-                               "If false, only the LTE radio access will be simulated with RLC SM. ",  
+                               "If false, only the LTE radio access will be simulated with RLC SM. ",
                                ns3::BooleanValue (false),
                                ns3::MakeBooleanChecker ());
-static ns3::GlobalValue g_epcDl ("epcDl", 
+static ns3::GlobalValue g_epcDl ("epcDl",
                                  "if true, will activate data flows in the downlink when EPC is being used. "
                                  "If false, downlink flows won't be activated. "
-                                 "If EPC is not used, this parameter will be ignored.",  
+                                 "If EPC is not used, this parameter will be ignored.",
                                  ns3::BooleanValue (true),
                                  ns3::MakeBooleanChecker ());
-static ns3::GlobalValue g_epcUl ("epcUl", 
+static ns3::GlobalValue g_epcUl ("epcUl",
                                  "if true, will activate data flows in the uplink when EPC is being used. "
                                  "If false, uplink flows won't be activated. "
-                                 "If EPC is not used, this parameter will be ignored.",  
+                                 "If EPC is not used, this parameter will be ignored.",
                                  ns3::BooleanValue (true),
                                  ns3::MakeBooleanChecker ());
-static ns3::GlobalValue g_useUdp ("useUdp", 
+static ns3::GlobalValue g_useUdp ("useUdp",
                                   "if true, the UdpClient application will be used. "
                                   "Otherwise, the BulkSend application will be used over a TCP connection. "
-                                  "If EPC is not used, this parameter will be ignored.",  
+                                  "If EPC is not used, this parameter will be ignored.",
                                   ns3::BooleanValue (true),
                                   ns3::MakeBooleanChecker ());
-static ns3::GlobalValue g_fadingTrace ("fadingTrace", 
-                                           "The path of the fading trace (by default no fading trace "
-                                           "is loaded, i.e., fading is not considered)",  
-                                           ns3::StringValue (""),
-                                           ns3::MakeStringChecker ());
+static ns3::GlobalValue g_fadingTrace ("fadingTrace",
+                                       "The path of the fading trace (by default no fading trace "
+                                       "is loaded, i.e., fading is not considered)",
+                                       ns3::StringValue (""),
+                                       ns3::MakeStringChecker ());
 static ns3::GlobalValue g_numBearersPerUe ("numBearersPerUe",
-                                               "How many bearers per UE there are in the simulation",
-                                               ns3::UintegerValue (1),
-                                               ns3::MakeUintegerChecker<uint16_t> ());
-
+                                           "How many bearers per UE there are in the simulation",
+                                           ns3::UintegerValue (1),
+                                           ns3::MakeUintegerChecker<uint16_t> ());
 static ns3::GlobalValue g_srsPeriodicity ("srsPeriodicity",
-                                               "SRS Periodicity (has to be at least greater than the number of UEs per eNB)",
-                                               ns3::UintegerValue (80),
-                                               ns3::MakeUintegerChecker<uint16_t> ());
-
+                                          "SRS Periodicity (has to be at least "
+                                          "greater than the number of UEs per eNB)",
+                                          ns3::UintegerValue (80),
+                                          ns3::MakeUintegerChecker<uint16_t> ());
 static ns3::GlobalValue g_outdoorUeMinSpeed ("outdoorUeMinSpeed",
-                                   "Minimum speed value of macor UE with random waypoint model [m/s].",
-                                   ns3::DoubleValue (0.0),
-                                   ns3::MakeDoubleChecker<double> ());
-
+                                             "Minimum speed value of macor UE with random waypoint model [m/s].",
+                                             ns3::DoubleValue (0.0),
+                                             ns3::MakeDoubleChecker<double> ());
 static ns3::GlobalValue g_outdoorUeMaxSpeed ("outdoorUeMaxSpeed",
-                                   "Maximum speed value of macor UE with random waypoint model [m/s].",
-                                   ns3::DoubleValue (0.0),
-                                   ns3::MakeDoubleChecker<double> ());
+                                             "Maximum speed value of macor UE with random waypoint model [m/s].",
+                                             ns3::DoubleValue (0.0),
+                                             ns3::MakeDoubleChecker<double> ());
 
 int
 main (int argc, char *argv[])
@@ -427,7 +426,7 @@
   GlobalValue::GetValueByName ("outdoorUeMaxSpeed", doubleValue);
   uint16_t outdoorUeMaxSpeed = doubleValue.Get ();
 
-  Config::SetDefault ("ns3::LteEnbRrc::SrsPeriodicity", UintegerValue(srsPeriodicity));
+  Config::SetDefault ("ns3::LteEnbRrc::SrsPeriodicity", UintegerValue (srsPeriodicity));
 
   Box macroUeBox;
   double ueZ = 1.5;
@@ -447,7 +446,7 @@
       macroUeBox = Box (-areaMarginFactor*interSiteDistance, 
                         (nMacroEnbSitesX + areaMarginFactor)*interSiteDistance, 
                         -areaMarginFactor*interSiteDistance, 
-                        (nMacroEnbSitesY -1)*interSiteDistance*sqrt(0.75) + areaMarginFactor*interSiteDistance,
+                        (nMacroEnbSitesY -1)*interSiteDistance*sqrt (0.75) + areaMarginFactor*interSiteDistance,
                         ueZ, ueZ);
     }
   else
@@ -455,7 +454,7 @@
       // still need the box to place femtocell blocks
       macroUeBox = Box (0, 150, 0, 150, ueZ, ueZ);
     }
-  
+
   FemtocellBlockAllocator blockAllocator (macroUeBox, nApartmentsX, nFloors);
   blockAllocator.Create (nBlocks);
 
@@ -465,9 +464,9 @@
   uint32_t nHomeUes = round (nHomeEnbs * homeUesHomeEnbRatio);
   NS_LOG_LOGIC ("nHomeUes = " << nHomeUes);
   double macroUeAreaSize = (macroUeBox.xMax - macroUeBox.xMin) * (macroUeBox.yMax - macroUeBox.yMin);
-  uint32_t nMacroUes = round (macroUeAreaSize * macroUeDensity) ;
+  uint32_t nMacroUes = round (macroUeAreaSize * macroUeDensity);
   NS_LOG_LOGIC ("nMacroUes = " << nMacroUes << " (density=" << macroUeDensity << ")");
-  
+
   NodeContainer homeEnbs;
   homeEnbs.Create (nHomeEnbs);
   NodeContainer macroEnbs;
@@ -492,23 +491,23 @@
 
 //   lteHelper->EnableLogComponents ();
 //   LogComponentEnable ("PfFfMacScheduler", LOG_LEVEL_ALL);
-  
+
   if (!fadingTrace.empty ())
     {
       lteHelper->SetAttribute ("FadingModel", StringValue ("ns3::TraceFadingLossModel"));
-      lteHelper->SetFadingModelAttribute("TraceFilename", StringValue (fadingTrace));
+      lteHelper->SetFadingModelAttribute ("TraceFilename", StringValue (fadingTrace));
     }
 
-  Ptr<EpcHelper> epcHelper;
+  Ptr<PointToPointEpcHelper> epcHelper;
   if (epc)
     {
       NS_LOG_LOGIC ("enabling EPC");
-      epcHelper = CreateObject<EpcHelper> ();
-      lteHelper->SetEpcHelper (epcHelper);      
+      epcHelper = CreateObject<PointToPointEpcHelper> ();
+      lteHelper->SetEpcHelper (epcHelper);
     }
 
   // Macro eNBs in 3-sector hex grid
-  
+
   mobility.Install (macroEnbs);
   BuildingsHelper::Install (macroEnbs);
   Ptr<LteHexGridEnbTopologyHelper> lteHexGridEnbTopologyHelper = CreateObject<LteHexGridEnbTopologyHelper> ();
@@ -533,7 +532,7 @@
     }
   
   // HomeEnbs randomly indoor
-  
+
   Ptr<PositionAllocator> positionAlloc = CreateObject<RandomRoomPositionAllocator> ();
   mobility.SetPositionAllocator (positionAlloc);
   mobility.Install (homeEnbs);
@@ -544,14 +543,17 @@
   lteHelper->SetEnbDeviceAttribute ("UlEarfcn", UintegerValue (homeEnbDlEarfcn + 18000));
   lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (homeEnbBandwidth));
   lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (homeEnbBandwidth));
+  lteHelper->SetEnbDeviceAttribute ("CsgId", UintegerValue (1));
+  lteHelper->SetEnbDeviceAttribute ("CsgIndication", BooleanValue (true));
   NetDeviceContainer homeEnbDevs  = lteHelper->InstallEnbDevice (homeEnbs);
 
-
   // home UEs located in the same apartment in which there are the Home eNBs
   positionAlloc = CreateObject<SameRoomPositionAllocator> (homeEnbs);
   mobility.SetPositionAllocator (positionAlloc);
   mobility.Install (homeUes);
   BuildingsHelper::Install (homeUes);
+  // set the home UE as a CSG member of the home eNodeBs
+  lteHelper->SetUeDeviceAttribute ("CsgId", UintegerValue (1));
   NetDeviceContainer homeUeDevs = lteHelper->InstallUeDevice (homeUes);
 
   // macro Ues
@@ -614,10 +616,11 @@
   Ipv4InterfaceContainer ueIpIfaces;
   Ptr<Node> remoteHost;
   NetDeviceContainer ueDevs;
+
   if (epc)
     {
       NS_LOG_LOGIC ("setting up internet and remote host");
-  
+
       // Create a single RemoteHost
       NodeContainer remoteHostContainer;
       remoteHostContainer.Create (1);
@@ -646,34 +649,38 @@
       ues.Add (homeUes);
       ues.Add (macroUes);
       ueDevs.Add (homeUeDevs);
-      ueDevs.Add (macroUeDevs);      
+      ueDevs.Add (macroUeDevs);
 
-      // Install the IP stack on the UEs      
+      // Install the IP stack on the UEs
       internet.Install (ues);
       ueIpIfaces = epcHelper->AssignUeIpv4Address (NetDeviceContainer (ueDevs));
+
+      // attachment (needs to be done after IP stack configuration)
+      // using initial cell selection
+      lteHelper->Attach (macroUeDevs);
+      lteHelper->Attach (homeUeDevs);
     }
+  else
+    {
+      // macro UEs attached to the closest macro eNB
+      lteHelper->AttachToClosestEnb (macroUeDevs, macroEnbDevs);
 
-  // attachment (needs to be done after IP stack configuration)
-  // macro UEs attached to the closest macro eNB
-  lteHelper->AttachToClosestEnb (macroUeDevs, macroEnbDevs);
-  // each home UE is ttach explicitly to its home eNB
-  NetDeviceContainer::Iterator ueDevIt;
-  NetDeviceContainer::Iterator enbDevIt = homeEnbDevs.Begin ();
-
-  for (ueDevIt = homeUeDevs.Begin ();
-       ueDevIt != homeUeDevs.End ();
-       ++ueDevIt, ++enbDevIt)
-    {
-      // this because of the order in which SameRoomPositionAllocator
-      // will place the UEs
-      if (enbDevIt == homeEnbDevs.End ())
+      // each home UE is attached explicitly to its home eNB
+      NetDeviceContainer::Iterator ueDevIt;
+      NetDeviceContainer::Iterator enbDevIt;
+      for (ueDevIt = homeUeDevs.Begin (), enbDevIt = homeEnbDevs.Begin ();
+           ueDevIt != homeUeDevs.End (); ++ueDevIt, ++enbDevIt)
         {
-          enbDevIt = homeEnbDevs.Begin ();
+          // this because of the order in which SameRoomPositionAllocator
+          // will place the UEs
+          if (enbDevIt == homeEnbDevs.End ())
+            {
+              enbDevIt = homeEnbDevs.Begin ();
+            }
+          lteHelper->Attach (*ueDevIt, *enbDevIt);
         }
-      lteHelper->Attach (*ueDevIt, *enbDevIt);
     }
 
-
   if (epc)
     {
       NS_LOG_LOGIC ("setting up applications");
@@ -687,7 +694,7 @@
       // exactly at the same time) 
       Ptr<UniformRandomVariable> startTimeSeconds = CreateObject<UniformRandomVariable> ();
       if (useUdp)
-        {      
+        {
           startTimeSeconds->SetAttribute ("Min", DoubleValue (0));
           startTimeSeconds->SetAttribute ("Max", DoubleValue (0.010));
         }
@@ -732,7 +739,7 @@
                       clientApps.Add (ulClientHelper.Install (ue));
                       PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", 
                                                            InetSocketAddress (Ipv4Address::GetAny (), ulPort));
-                      serverApps.Add (ulPacketSinkHelper.Install (remoteHost));  
+                      serverApps.Add (ulPacketSinkHelper.Install (remoteHost));
                     }
                 }
               else // use TCP
@@ -749,11 +756,11 @@
                       serverApps.Add (dlPacketSinkHelper.Install (ue));
                     }
                   if (epcUl)
-                    {     
-                      NS_LOG_LOGIC ("installing TCP UL app for UE " << u);              
+                    {
+                      NS_LOG_LOGIC ("installing TCP UL app for UE " << u);
                       BulkSendHelper ulClientHelper ("ns3::TcpSocketFactory",
                                                      InetSocketAddress (remoteHostAddr, ulPort));
-                      ulClientHelper.SetAttribute ("MaxBytes", UintegerValue (0));                  
+                      ulClientHelper.SetAttribute ("MaxBytes", UintegerValue (0));
                       clientApps.Add (ulClientHelper.Install (ue));
                       PacketSinkHelper ulPacketSinkHelper ("ns3::TcpSocketFactory", 
                                                            InetSocketAddress (Ipv4Address::GetAny (), ulPort));
@@ -795,7 +802,7 @@
       // for radio bearer activation purposes, consider together home UEs and macro UEs
       NetDeviceContainer ueDevs;
       ueDevs.Add (homeUeDevs);
-      ueDevs.Add (macroUeDevs);  
+      ueDevs.Add (macroUeDevs);
       for (uint32_t u = 0; u < ueDevs.GetN (); ++u)
         {
           Ptr<NetDevice> ueDev = ueDevs.Get (u);
@@ -830,7 +837,7 @@
     }
   else
     {
-      Simulator::Stop (Seconds (simTime));  
+      Simulator::Stop (Seconds (simTime));
     }
 
   lteHelper->EnableMacTraces ();
diff -Naur ns-3.18.1/src/lte/examples/lena-profiling.cc ns-3.19/src/lte/examples/lena-profiling.cc
--- ns-3.18.1/src/lte/examples/lena-profiling.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/examples/lena-profiling.cc	2013-12-20 09:44:51.000000000 -0800
@@ -1,208 +1,208 @@
-/* -*-  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: Jaume Nin <jnin@cttc.es>
- */
-
-#include "ns3/core-module.h"
-#include "ns3/network-module.h"
-#include "ns3/mobility-module.h"
-#include "ns3/lte-module.h"
-#include "ns3/config-store.h"
-#include <ns3/buildings-module.h>
-#include <iomanip>
-#include <string>
-#include <vector>
-//#include "ns3/gtk-config-store.h"
-
-using namespace ns3;
-
-int
-main (int argc, char *argv[])
-{
-  uint32_t nEnbPerFloor = 1;
-  uint32_t nUe = 1;
-  uint32_t nFloors = 0;
-  double simTime = 1.0;
-  CommandLine cmd;
-
-  cmd.AddValue ("nEnb", "Number of eNodeBs per floor", nEnbPerFloor);
-  cmd.AddValue ("nUe", "Number of UEs", nUe);
-  cmd.AddValue ("nFloors", "Number of floors, 0 for Friis propagation model",
-                nFloors);
-  cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)",
-                simTime);
-  cmd.Parse (argc, argv);
-
-  ConfigStore inputConfig;
-  inputConfig.ConfigureDefaults ();
-
-  // parse again so you can override default values from the command line
-  cmd.Parse (argc, argv);
-
-  // Geometry of the scenario (in meters)
-  // Assume squared building
-  double nodeHeight = 1.5;
-  double roomHeight = 3;
-  double roomLength = 8;
-  uint32_t nRooms = std::ceil (std::sqrt (nEnbPerFloor));
-  uint32_t nEnb;
-
-  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  //lteHelper->EnableLogComponents ();
-  //LogComponentEnable ("BuildingsPropagationLossModel", LOG_LEVEL_ALL);
-  if (nFloors == 0)
-    {
-      lteHelper->SetAttribute ("PathlossModel",
-                               StringValue ("ns3::FriisPropagationLossModel"));
-      nEnb = nEnbPerFloor;
-    }
-  else
-    {
-      lteHelper->SetAttribute ("PathlossModel",
-                               StringValue ("ns3::HybridBuildingsPropagationLossModel"));
-      nEnb = nFloors * nEnbPerFloor;
-    }
-
-  // Create Nodes: eNodeB and UE
-  NodeContainer enbNodes;
-  std::vector<NodeContainer> ueNodes;
-
-  enbNodes.Create (nEnb);
-  for (uint32_t i = 0; i < nEnb; i++)
-    {
-      NodeContainer ueNode;
-      ueNode.Create (nUe);
-      ueNodes.push_back (ueNode);
-    }
-
-  MobilityHelper mobility;
-  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
-  std::vector<Vector> enbPosition;
-  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
-  Ptr<Building> building;
-
-  if (nFloors == 0)
-    {
-      // Position of eNBs
-      uint32_t plantedEnb = 0;
-      for (uint32_t row = 0; row < nRooms; row++)
-        {
-          for (uint32_t column = 0; column < nRooms && plantedEnb < nEnbPerFloor; column++, plantedEnb++)
-            {
-              Vector v (roomLength * (column + 0.5), roomLength * (row + 0.5), nodeHeight);
-              positionAlloc->Add (v);
-              enbPosition.push_back (v);
-              mobility.Install (ueNodes.at(plantedEnb));
-            }
-        }
-      mobility.SetPositionAllocator (positionAlloc);
-      mobility.Install (enbNodes);
-      BuildingsHelper::Install (enbNodes);
-
-      // Position of UEs attached to eNB
-      for (uint32_t i = 0; i < nEnb; i++)
-        {
-          Ptr<UniformRandomVariable> posX = CreateObject<UniformRandomVariable> ();
-          posX->SetAttribute ("Min", DoubleValue (enbPosition.at(i).x - roomLength * 0.5));
-          posX->SetAttribute ("Max", DoubleValue (enbPosition.at(i).x + roomLength * 0.5));
-          Ptr<UniformRandomVariable> posY = CreateObject<UniformRandomVariable> ();
-          posY->SetAttribute ("Min", DoubleValue (enbPosition.at(i).y - roomLength * 0.5));
-          posY->SetAttribute ("Max", DoubleValue (enbPosition.at(i).y + roomLength * 0.5));
-          positionAlloc = CreateObject<ListPositionAllocator> ();
-          for (uint32_t j = 0; j < nUe; j++)
-            {
-              positionAlloc->Add (Vector (posX->GetValue (), posY->GetValue (), nodeHeight));
-              mobility.SetPositionAllocator (positionAlloc);
-            }
-          mobility.Install (ueNodes.at(i));
-          BuildingsHelper::Install (ueNodes.at(i));
-        }
-
-    }
-  else
-    {
-      building = CreateObject<Building> ();
-      building->SetBoundaries (Box (0.0, nRooms * roomLength,
-                                    0.0, nRooms * roomLength,
-                                    0.0, nFloors* roomHeight));
-      building->SetBuildingType (Building::Residential);
-      building->SetExtWallsType (Building::ConcreteWithWindows);
-      building->SetNFloors (nFloors);
-      building->SetNRoomsX (nRooms);
-      building->SetNRoomsY (nRooms);
-      mobility.Install (enbNodes);
-      BuildingsHelper::Install (enbNodes);
-      uint32_t plantedEnb = 0;
-      for (uint32_t floor = 0; floor < nFloors; floor++)
-        {
-          uint32_t plantedEnbPerFloor = 0;
-          for (uint32_t row = 0; row < nRooms; row++)
-            {
-              for (uint32_t column = 0; column < nRooms && plantedEnbPerFloor < nEnbPerFloor; column++, plantedEnb++, plantedEnbPerFloor++)
-                {
-                  Vector v (roomLength * (column + 0.5),
-                            roomLength * (row + 0.5),
-                            nodeHeight + roomHeight * floor);
-                  positionAlloc->Add (v);
-                  enbPosition.push_back (v);
-                  Ptr<MobilityModel> mmEnb = enbNodes.Get (plantedEnb)->GetObject<MobilityModel> ();
-                  mmEnb->SetPosition (v);
-
-                  // Positioning UEs attached to eNB
-                  mobility.Install (ueNodes.at(plantedEnb));
-                  BuildingsHelper::Install (ueNodes.at(plantedEnb));
-                  for (uint32_t ue = 0; ue < nUe; ue++)
-                    {
-                      Ptr<MobilityModel> mmUe = ueNodes.at(plantedEnb).Get (ue)->GetObject<MobilityModel> ();
-                      Vector vUe (v.x, v.y, v.z);
-                      mmUe->SetPosition (vUe);
-                    }
-                }
-            }
-        }
-    }
-
-
-  // Create Devices and install them in the Nodes (eNB and UE)
-  NetDeviceContainer enbDevs;
-  std::vector<NetDeviceContainer> ueDevs;
-  enbDevs = lteHelper->InstallEnbDevice (enbNodes);
-  for (uint32_t i = 0; i < nEnb; i++)
-    {
-      NetDeviceContainer ueDev = lteHelper->InstallUeDevice (ueNodes.at(i));
-      ueDevs.push_back (ueDev);
-      lteHelper->Attach (ueDev, enbDevs.Get (i));
-      enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
-      EpsBearer bearer (q);
-      lteHelper->ActivateDataRadioBearer (ueDev, bearer);
-    }
-
-
-  BuildingsHelper::MakeMobilityModelConsistent ();
-
-  Simulator::Stop (Seconds (simTime));
-  lteHelper->EnableTraces ();
-
-  Simulator::Run ();
-
-  /*GtkConfigStore config;
-  config.ConfigureAttributes ();*/
-
-  Simulator::Destroy ();
-  return 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: Jaume Nin <jnin@cttc.es>
+ */
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/lte-module.h"
+#include "ns3/config-store.h"
+#include <ns3/buildings-module.h>
+#include <iomanip>
+#include <string>
+#include <vector>
+//#include "ns3/gtk-config-store.h"
+
+using namespace ns3;
+
+int
+main (int argc, char *argv[])
+{
+  uint32_t nEnbPerFloor = 1;
+  uint32_t nUe = 1;
+  uint32_t nFloors = 0;
+  double simTime = 1.0;
+  CommandLine cmd;
+
+  cmd.AddValue ("nEnb", "Number of eNodeBs per floor", nEnbPerFloor);
+  cmd.AddValue ("nUe", "Number of UEs", nUe);
+  cmd.AddValue ("nFloors", "Number of floors, 0 for Friis propagation model",
+                nFloors);
+  cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)",
+                simTime);
+  cmd.Parse (argc, argv);
+
+  ConfigStore inputConfig;
+  inputConfig.ConfigureDefaults ();
+
+  // parse again so you can override default values from the command line
+  cmd.Parse (argc, argv);
+
+  // Geometry of the scenario (in meters)
+  // Assume squared building
+  double nodeHeight = 1.5;
+  double roomHeight = 3;
+  double roomLength = 8;
+  uint32_t nRooms = std::ceil (std::sqrt (nEnbPerFloor));
+  uint32_t nEnb;
+
+  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+  //lteHelper->EnableLogComponents ();
+  //LogComponentEnable ("BuildingsPropagationLossModel", LOG_LEVEL_ALL);
+  if (nFloors == 0)
+    {
+      lteHelper->SetAttribute ("PathlossModel",
+                               StringValue ("ns3::FriisPropagationLossModel"));
+      nEnb = nEnbPerFloor;
+    }
+  else
+    {
+      lteHelper->SetAttribute ("PathlossModel",
+                               StringValue ("ns3::HybridBuildingsPropagationLossModel"));
+      nEnb = nFloors * nEnbPerFloor;
+    }
+
+  // Create Nodes: eNodeB and UE
+  NodeContainer enbNodes;
+  std::vector<NodeContainer> ueNodes;
+
+  enbNodes.Create (nEnb);
+  for (uint32_t i = 0; i < nEnb; i++)
+    {
+      NodeContainer ueNode;
+      ueNode.Create (nUe);
+      ueNodes.push_back (ueNode);
+    }
+
+  MobilityHelper mobility;
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  std::vector<Vector> enbPosition;
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+  Ptr<Building> building;
+
+  if (nFloors == 0)
+    {
+      // Position of eNBs
+      uint32_t plantedEnb = 0;
+      for (uint32_t row = 0; row < nRooms; row++)
+        {
+          for (uint32_t column = 0; column < nRooms && plantedEnb < nEnbPerFloor; column++, plantedEnb++)
+            {
+              Vector v (roomLength * (column + 0.5), roomLength * (row + 0.5), nodeHeight);
+              positionAlloc->Add (v);
+              enbPosition.push_back (v);
+              mobility.Install (ueNodes.at(plantedEnb));
+            }
+        }
+      mobility.SetPositionAllocator (positionAlloc);
+      mobility.Install (enbNodes);
+      BuildingsHelper::Install (enbNodes);
+
+      // Position of UEs attached to eNB
+      for (uint32_t i = 0; i < nEnb; i++)
+        {
+          Ptr<UniformRandomVariable> posX = CreateObject<UniformRandomVariable> ();
+          posX->SetAttribute ("Min", DoubleValue (enbPosition.at(i).x - roomLength * 0.5));
+          posX->SetAttribute ("Max", DoubleValue (enbPosition.at(i).x + roomLength * 0.5));
+          Ptr<UniformRandomVariable> posY = CreateObject<UniformRandomVariable> ();
+          posY->SetAttribute ("Min", DoubleValue (enbPosition.at(i).y - roomLength * 0.5));
+          posY->SetAttribute ("Max", DoubleValue (enbPosition.at(i).y + roomLength * 0.5));
+          positionAlloc = CreateObject<ListPositionAllocator> ();
+          for (uint32_t j = 0; j < nUe; j++)
+            {
+              positionAlloc->Add (Vector (posX->GetValue (), posY->GetValue (), nodeHeight));
+              mobility.SetPositionAllocator (positionAlloc);
+            }
+          mobility.Install (ueNodes.at(i));
+          BuildingsHelper::Install (ueNodes.at(i));
+        }
+
+    }
+  else
+    {
+      building = CreateObject<Building> ();
+      building->SetBoundaries (Box (0.0, nRooms * roomLength,
+                                    0.0, nRooms * roomLength,
+                                    0.0, nFloors* roomHeight));
+      building->SetBuildingType (Building::Residential);
+      building->SetExtWallsType (Building::ConcreteWithWindows);
+      building->SetNFloors (nFloors);
+      building->SetNRoomsX (nRooms);
+      building->SetNRoomsY (nRooms);
+      mobility.Install (enbNodes);
+      BuildingsHelper::Install (enbNodes);
+      uint32_t plantedEnb = 0;
+      for (uint32_t floor = 0; floor < nFloors; floor++)
+        {
+          uint32_t plantedEnbPerFloor = 0;
+          for (uint32_t row = 0; row < nRooms; row++)
+            {
+              for (uint32_t column = 0; column < nRooms && plantedEnbPerFloor < nEnbPerFloor; column++, plantedEnb++, plantedEnbPerFloor++)
+                {
+                  Vector v (roomLength * (column + 0.5),
+                            roomLength * (row + 0.5),
+                            nodeHeight + roomHeight * floor);
+                  positionAlloc->Add (v);
+                  enbPosition.push_back (v);
+                  Ptr<MobilityModel> mmEnb = enbNodes.Get (plantedEnb)->GetObject<MobilityModel> ();
+                  mmEnb->SetPosition (v);
+
+                  // Positioning UEs attached to eNB
+                  mobility.Install (ueNodes.at(plantedEnb));
+                  BuildingsHelper::Install (ueNodes.at(plantedEnb));
+                  for (uint32_t ue = 0; ue < nUe; ue++)
+                    {
+                      Ptr<MobilityModel> mmUe = ueNodes.at(plantedEnb).Get (ue)->GetObject<MobilityModel> ();
+                      Vector vUe (v.x, v.y, v.z);
+                      mmUe->SetPosition (vUe);
+                    }
+                }
+            }
+        }
+    }
+
+
+  // Create Devices and install them in the Nodes (eNB and UE)
+  NetDeviceContainer enbDevs;
+  std::vector<NetDeviceContainer> ueDevs;
+  enbDevs = lteHelper->InstallEnbDevice (enbNodes);
+  for (uint32_t i = 0; i < nEnb; i++)
+    {
+      NetDeviceContainer ueDev = lteHelper->InstallUeDevice (ueNodes.at(i));
+      ueDevs.push_back (ueDev);
+      lteHelper->Attach (ueDev, enbDevs.Get (i));
+      enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
+      EpsBearer bearer (q);
+      lteHelper->ActivateDataRadioBearer (ueDev, bearer);
+    }
+
+
+  BuildingsHelper::MakeMobilityModelConsistent ();
+
+  Simulator::Stop (Seconds (simTime));
+  lteHelper->EnableTraces ();
+
+  Simulator::Run ();
+
+  /*GtkConfigStore config;
+  config.ConfigureAttributes ();*/
+
+  Simulator::Destroy ();
+  return 0;
+}
diff -Naur ns-3.18.1/src/lte/examples/lena-rem-sector-antenna.cc ns-3.19/src/lte/examples/lena-rem-sector-antenna.cc
--- ns-3.18.1/src/lte/examples/lena-rem-sector-antenna.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/examples/lena-rem-sector-antenna.cc	2013-12-20 09:44:51.000000000 -0800
@@ -1,230 +1,230 @@
-/* -*-  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: Jaume Nin <jnin@cttc.es>
- */
-
-#include "ns3/core-module.h"
-#include "ns3/network-module.h"
-#include "ns3/mobility-module.h"
-#include "ns3/lte-module.h"
-#include "ns3/config-store.h"
-#include <ns3/buildings-propagation-loss-model.h>
-#include <ns3/buildings-helper.h>
-#include <ns3/radio-environment-map-helper.h>
-#include <iomanip>
-#include <string>
-#include <vector>
-//#include "ns3/gtk-config-store.h"
-
-using namespace ns3;
-using std::vector;
-
-int
-main (int argc, char *argv[])
-{
-  CommandLine cmd;
-  cmd.Parse (argc, argv);
-
-  ConfigStore inputConfig;
-  inputConfig.ConfigureDefaults ();
-
-  cmd.Parse (argc, argv);
-
-  // Geometry of the scenario (in meters)
-  // Assume squared building
-  double nodeHeight = 1.5;
-  double roomHeight = 3;
-  double roomLength = 500;
-  uint32_t nRooms = 2;
-  // Create one eNodeB per room + one 3 sector eNodeB (i.e. 3 eNodeB) + one regular eNodeB
-  uint32_t nEnb = nRooms*nRooms + 4;
-  uint32_t nUe = 1;
-
-  Ptr < LteHelper > lteHelper = CreateObject<LteHelper> ();
-  //lteHelper->EnableLogComponents ();
-  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisPropagationLossModel"));
-
-  // Create Nodes: eNodeB and UE
-  NodeContainer enbNodes;
-  NodeContainer oneSectorNodes;
-  NodeContainer threeSectorNodes;
-  vector < NodeContainer > ueNodes;
-
-  oneSectorNodes.Create (nEnb-3);
-  threeSectorNodes.Create (3);
-
-  enbNodes.Add (oneSectorNodes);
-  enbNodes.Add (threeSectorNodes);
-
-  for (uint32_t i = 0; i < nEnb; i++)
-    {
-      NodeContainer ueNode;
-      ueNode.Create (nUe);
-      ueNodes.push_back (ueNode);
-    }
-
-  MobilityHelper mobility;
-  vector<Vector> enbPosition;
-  Ptr < ListPositionAllocator > positionAlloc = CreateObject<ListPositionAllocator> ();
-  Ptr < Building > building;
-  building = Create<Building> ();
-  building->SetBoundaries (Box (0.0, nRooms * roomLength,
-                                0.0, nRooms * roomLength,
-                                0.0, roomHeight));
-  building->SetBuildingType (Building::Residential);
-  building->SetExtWallsType (Building::ConcreteWithWindows);
-  building->SetNFloors (1);
-  building->SetNRoomsX (nRooms);
-  building->SetNRoomsY (nRooms);
-  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
-  mobility.Install (enbNodes);
-  BuildingsHelper::Install (enbNodes);
-  uint32_t plantedEnb = 0;
-  for (uint32_t row = 0; row < nRooms; row++)
-    {
-      for (uint32_t column = 0; column < nRooms; column++, plantedEnb++)
-        {
-          Vector v (roomLength * (column + 0.5),
-                    roomLength * (row + 0.5),
-                    nodeHeight );
-          positionAlloc->Add (v);
-          enbPosition.push_back (v);
-          Ptr<MobilityModel> mmEnb = enbNodes.Get (plantedEnb)->GetObject<MobilityModel> ();
-          mmEnb->SetPosition (v);
-        }
-    }
-
-  // Add a 1-sector site
-  Vector v (500, 3000, nodeHeight);
-  positionAlloc->Add (v);
-  enbPosition.push_back (v);
-  mobility.Install (ueNodes.at(plantedEnb));
-  plantedEnb++;
-
-  // Add the 3-sector site
-  for (uint32_t index = 0; index < 3; index++, plantedEnb++)
-    {
-      Vector v (500, 2000, nodeHeight);
-      positionAlloc->Add (v);
-      enbPosition.push_back (v);
-      mobility.Install (ueNodes.at(plantedEnb));
-    }
-
-
-  mobility.SetPositionAllocator (positionAlloc);
-  mobility.Install (enbNodes);
-
-  // Position of UEs attached to eNB
-  for (uint32_t i = 0; i < nEnb; i++)
-    {
-      Ptr<UniformRandomVariable> posX = CreateObject<UniformRandomVariable> ();
-      posX->SetAttribute ("Min", DoubleValue (enbPosition.at(i).x - roomLength * 0));
-      posX->SetAttribute ("Max", DoubleValue (enbPosition.at(i).x + roomLength * 0));
-      Ptr<UniformRandomVariable> posY = CreateObject<UniformRandomVariable> ();
-      posY->SetAttribute ("Min", DoubleValue (enbPosition.at(i).y - roomLength * 0));
-      posY->SetAttribute ("Max", DoubleValue (enbPosition.at(i).y + roomLength * 0));
-      positionAlloc = CreateObject<ListPositionAllocator> ();
-      for (uint32_t j = 0; j < nUe; j++)
-        {
-          if ( i == nEnb - 3 )
-            {
-              positionAlloc->Add (Vector (enbPosition.at(i).x + 10, enbPosition.at(i).y, nodeHeight));
-            }
-          else if ( i == nEnb - 2 )
-            {
-              positionAlloc->Add (Vector (enbPosition.at(i).x - std::sqrt (10), enbPosition.at(i).y + std::sqrt (10), nodeHeight));
-            }
-          else if ( i == nEnb - 1 )
-            {
-              positionAlloc->Add (Vector (enbPosition.at(i).x - std::sqrt (10), enbPosition.at(i).y - std::sqrt (10), nodeHeight));
-            }
-          else
-            {
-              positionAlloc->Add (Vector (posX->GetValue (), posY->GetValue (), nodeHeight));
-            }
-          mobility.SetPositionAllocator (positionAlloc);
-        }
-      mobility.Install (ueNodes.at(i));
-      BuildingsHelper::Install (ueNodes.at(i));
-    }
-
-  // Create Devices and install them in the Nodes (eNB and UE)
-  NetDeviceContainer enbDevs;
-  vector < NetDeviceContainer > ueDevs;
-
-  // power setting in dBm for small cells
-  Config::SetDefault ("ns3::LteEnbPhy::TxPower", DoubleValue (20.0));
-  enbDevs = lteHelper->InstallEnbDevice (oneSectorNodes);
-
-
-  // power setting for three-sector macrocell
-  Config::SetDefault ("ns3::LteEnbPhy::TxPower", DoubleValue (43.0));
-
-  // Beam width is made quite narrow so sectors can be noticed in the REM
-  lteHelper->SetEnbAntennaModelType ("ns3::CosineAntennaModel");
-  lteHelper->SetEnbAntennaModelAttribute ("Orientation", DoubleValue (0));
-  lteHelper->SetEnbAntennaModelAttribute ("Beamwidth",   DoubleValue (100));
-  lteHelper->SetEnbAntennaModelAttribute ("MaxGain",     DoubleValue (0.0));
-  enbDevs.Add ( lteHelper->InstallEnbDevice (threeSectorNodes.Get (0)));
-
-  lteHelper->SetEnbAntennaModelType ("ns3::CosineAntennaModel");
-  lteHelper->SetEnbAntennaModelAttribute ("Orientation", DoubleValue (360/3));
-  lteHelper->SetEnbAntennaModelAttribute ("Beamwidth",   DoubleValue (100));
-  lteHelper->SetEnbAntennaModelAttribute ("MaxGain",     DoubleValue (0.0));
-  enbDevs.Add ( lteHelper->InstallEnbDevice (threeSectorNodes.Get (1)));
-
-  lteHelper->SetEnbAntennaModelType ("ns3::CosineAntennaModel");
-  lteHelper->SetEnbAntennaModelAttribute ("Orientation", DoubleValue (2*360/3));
-  lteHelper->SetEnbAntennaModelAttribute ("Beamwidth",   DoubleValue (100));
-  lteHelper->SetEnbAntennaModelAttribute ("MaxGain",     DoubleValue (0.0));
-  enbDevs.Add ( lteHelper->InstallEnbDevice (threeSectorNodes.Get (2)));
-
-  for (uint32_t i = 0; i < nEnb; i++)
-    {
-      NetDeviceContainer ueDev = lteHelper->InstallUeDevice (ueNodes.at(i));
-      ueDevs.push_back (ueDev);
-      lteHelper->Attach (ueDev, enbDevs.Get (i));
-      enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
-      EpsBearer bearer (q);
-      lteHelper->ActivateDataRadioBearer (ueDev, bearer);
-    }
-
-  BuildingsHelper::MakeMobilityModelConsistent ();
-
-  // by default, simulation will anyway stop right after the REM has been generated
-  Simulator::Stop (Seconds (0.0069));  
-
-  Ptr<RadioEnvironmentMapHelper> remHelper = CreateObject<RadioEnvironmentMapHelper> ();
-  remHelper->SetAttribute ("ChannelPath", StringValue ("/ChannelList/0"));
-  remHelper->SetAttribute ("OutputFile", StringValue ("rem.out"));
-  remHelper->SetAttribute ("XMin", DoubleValue (-2000.0));
-  remHelper->SetAttribute ("XMax", DoubleValue (+2000.0));
-  remHelper->SetAttribute ("YMin", DoubleValue (-500.0));
-  remHelper->SetAttribute ("YMax", DoubleValue (+3500.0));
-  remHelper->SetAttribute ("Z", DoubleValue (1.5));
-  remHelper->Install ();
-
-  Simulator::Run ();
-
-//  GtkConfigStore config;
-//  config.ConfigureAttributes ();
-
-  lteHelper = 0;
-  Simulator::Destroy ();
-  return 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: Jaume Nin <jnin@cttc.es>
+ */
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/lte-module.h"
+#include "ns3/config-store.h"
+#include <ns3/buildings-propagation-loss-model.h>
+#include <ns3/buildings-helper.h>
+#include <ns3/radio-environment-map-helper.h>
+#include <iomanip>
+#include <string>
+#include <vector>
+//#include "ns3/gtk-config-store.h"
+
+using namespace ns3;
+using std::vector;
+
+int
+main (int argc, char *argv[])
+{
+  CommandLine cmd;
+  cmd.Parse (argc, argv);
+
+  ConfigStore inputConfig;
+  inputConfig.ConfigureDefaults ();
+
+  cmd.Parse (argc, argv);
+
+  // Geometry of the scenario (in meters)
+  // Assume squared building
+  double nodeHeight = 1.5;
+  double roomHeight = 3;
+  double roomLength = 500;
+  uint32_t nRooms = 2;
+  // Create one eNodeB per room + one 3 sector eNodeB (i.e. 3 eNodeB) + one regular eNodeB
+  uint32_t nEnb = nRooms*nRooms + 4;
+  uint32_t nUe = 1;
+
+  Ptr < LteHelper > lteHelper = CreateObject<LteHelper> ();
+  //lteHelper->EnableLogComponents ();
+  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisPropagationLossModel"));
+
+  // Create Nodes: eNodeB and UE
+  NodeContainer enbNodes;
+  NodeContainer oneSectorNodes;
+  NodeContainer threeSectorNodes;
+  vector < NodeContainer > ueNodes;
+
+  oneSectorNodes.Create (nEnb-3);
+  threeSectorNodes.Create (3);
+
+  enbNodes.Add (oneSectorNodes);
+  enbNodes.Add (threeSectorNodes);
+
+  for (uint32_t i = 0; i < nEnb; i++)
+    {
+      NodeContainer ueNode;
+      ueNode.Create (nUe);
+      ueNodes.push_back (ueNode);
+    }
+
+  MobilityHelper mobility;
+  vector<Vector> enbPosition;
+  Ptr < ListPositionAllocator > positionAlloc = CreateObject<ListPositionAllocator> ();
+  Ptr < Building > building;
+  building = Create<Building> ();
+  building->SetBoundaries (Box (0.0, nRooms * roomLength,
+                                0.0, nRooms * roomLength,
+                                0.0, roomHeight));
+  building->SetBuildingType (Building::Residential);
+  building->SetExtWallsType (Building::ConcreteWithWindows);
+  building->SetNFloors (1);
+  building->SetNRoomsX (nRooms);
+  building->SetNRoomsY (nRooms);
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.Install (enbNodes);
+  BuildingsHelper::Install (enbNodes);
+  uint32_t plantedEnb = 0;
+  for (uint32_t row = 0; row < nRooms; row++)
+    {
+      for (uint32_t column = 0; column < nRooms; column++, plantedEnb++)
+        {
+          Vector v (roomLength * (column + 0.5),
+                    roomLength * (row + 0.5),
+                    nodeHeight );
+          positionAlloc->Add (v);
+          enbPosition.push_back (v);
+          Ptr<MobilityModel> mmEnb = enbNodes.Get (plantedEnb)->GetObject<MobilityModel> ();
+          mmEnb->SetPosition (v);
+        }
+    }
+
+  // Add a 1-sector site
+  Vector v (500, 3000, nodeHeight);
+  positionAlloc->Add (v);
+  enbPosition.push_back (v);
+  mobility.Install (ueNodes.at(plantedEnb));
+  plantedEnb++;
+
+  // Add the 3-sector site
+  for (uint32_t index = 0; index < 3; index++, plantedEnb++)
+    {
+      Vector v (500, 2000, nodeHeight);
+      positionAlloc->Add (v);
+      enbPosition.push_back (v);
+      mobility.Install (ueNodes.at(plantedEnb));
+    }
+
+
+  mobility.SetPositionAllocator (positionAlloc);
+  mobility.Install (enbNodes);
+
+  // Position of UEs attached to eNB
+  for (uint32_t i = 0; i < nEnb; i++)
+    {
+      Ptr<UniformRandomVariable> posX = CreateObject<UniformRandomVariable> ();
+      posX->SetAttribute ("Min", DoubleValue (enbPosition.at(i).x - roomLength * 0));
+      posX->SetAttribute ("Max", DoubleValue (enbPosition.at(i).x + roomLength * 0));
+      Ptr<UniformRandomVariable> posY = CreateObject<UniformRandomVariable> ();
+      posY->SetAttribute ("Min", DoubleValue (enbPosition.at(i).y - roomLength * 0));
+      posY->SetAttribute ("Max", DoubleValue (enbPosition.at(i).y + roomLength * 0));
+      positionAlloc = CreateObject<ListPositionAllocator> ();
+      for (uint32_t j = 0; j < nUe; j++)
+        {
+          if ( i == nEnb - 3 )
+            {
+              positionAlloc->Add (Vector (enbPosition.at(i).x + 10, enbPosition.at(i).y, nodeHeight));
+            }
+          else if ( i == nEnb - 2 )
+            {
+              positionAlloc->Add (Vector (enbPosition.at(i).x - std::sqrt (10), enbPosition.at(i).y + std::sqrt (10), nodeHeight));
+            }
+          else if ( i == nEnb - 1 )
+            {
+              positionAlloc->Add (Vector (enbPosition.at(i).x - std::sqrt (10), enbPosition.at(i).y - std::sqrt (10), nodeHeight));
+            }
+          else
+            {
+              positionAlloc->Add (Vector (posX->GetValue (), posY->GetValue (), nodeHeight));
+            }
+          mobility.SetPositionAllocator (positionAlloc);
+        }
+      mobility.Install (ueNodes.at(i));
+      BuildingsHelper::Install (ueNodes.at(i));
+    }
+
+  // Create Devices and install them in the Nodes (eNB and UE)
+  NetDeviceContainer enbDevs;
+  vector < NetDeviceContainer > ueDevs;
+
+  // power setting in dBm for small cells
+  Config::SetDefault ("ns3::LteEnbPhy::TxPower", DoubleValue (20.0));
+  enbDevs = lteHelper->InstallEnbDevice (oneSectorNodes);
+
+
+  // power setting for three-sector macrocell
+  Config::SetDefault ("ns3::LteEnbPhy::TxPower", DoubleValue (43.0));
+
+  // Beam width is made quite narrow so sectors can be noticed in the REM
+  lteHelper->SetEnbAntennaModelType ("ns3::CosineAntennaModel");
+  lteHelper->SetEnbAntennaModelAttribute ("Orientation", DoubleValue (0));
+  lteHelper->SetEnbAntennaModelAttribute ("Beamwidth",   DoubleValue (100));
+  lteHelper->SetEnbAntennaModelAttribute ("MaxGain",     DoubleValue (0.0));
+  enbDevs.Add ( lteHelper->InstallEnbDevice (threeSectorNodes.Get (0)));
+
+  lteHelper->SetEnbAntennaModelType ("ns3::CosineAntennaModel");
+  lteHelper->SetEnbAntennaModelAttribute ("Orientation", DoubleValue (360/3));
+  lteHelper->SetEnbAntennaModelAttribute ("Beamwidth",   DoubleValue (100));
+  lteHelper->SetEnbAntennaModelAttribute ("MaxGain",     DoubleValue (0.0));
+  enbDevs.Add ( lteHelper->InstallEnbDevice (threeSectorNodes.Get (1)));
+
+  lteHelper->SetEnbAntennaModelType ("ns3::CosineAntennaModel");
+  lteHelper->SetEnbAntennaModelAttribute ("Orientation", DoubleValue (2*360/3));
+  lteHelper->SetEnbAntennaModelAttribute ("Beamwidth",   DoubleValue (100));
+  lteHelper->SetEnbAntennaModelAttribute ("MaxGain",     DoubleValue (0.0));
+  enbDevs.Add ( lteHelper->InstallEnbDevice (threeSectorNodes.Get (2)));
+
+  for (uint32_t i = 0; i < nEnb; i++)
+    {
+      NetDeviceContainer ueDev = lteHelper->InstallUeDevice (ueNodes.at(i));
+      ueDevs.push_back (ueDev);
+      lteHelper->Attach (ueDev, enbDevs.Get (i));
+      enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
+      EpsBearer bearer (q);
+      lteHelper->ActivateDataRadioBearer (ueDev, bearer);
+    }
+
+  BuildingsHelper::MakeMobilityModelConsistent ();
+
+  // by default, simulation will anyway stop right after the REM has been generated
+  Simulator::Stop (Seconds (0.0069));  
+
+  Ptr<RadioEnvironmentMapHelper> remHelper = CreateObject<RadioEnvironmentMapHelper> ();
+  remHelper->SetAttribute ("ChannelPath", StringValue ("/ChannelList/0"));
+  remHelper->SetAttribute ("OutputFile", StringValue ("rem.out"));
+  remHelper->SetAttribute ("XMin", DoubleValue (-2000.0));
+  remHelper->SetAttribute ("XMax", DoubleValue (+2000.0));
+  remHelper->SetAttribute ("YMin", DoubleValue (-500.0));
+  remHelper->SetAttribute ("YMax", DoubleValue (+3500.0));
+  remHelper->SetAttribute ("Z", DoubleValue (1.5));
+  remHelper->Install ();
+
+  Simulator::Run ();
+
+//  GtkConfigStore config;
+//  config.ConfigureAttributes ();
+
+  lteHelper = 0;
+  Simulator::Destroy ();
+  return 0;
+}
diff -Naur ns-3.18.1/src/lte/examples/lena-simple-epc.cc ns-3.19/src/lte/examples/lena-simple-epc.cc
--- ns-3.18.1/src/lte/examples/lena-simple-epc.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/examples/lena-simple-epc.cc	2013-12-20 09:44:51.000000000 -0800
@@ -57,7 +57,7 @@
   cmd.Parse(argc, argv);
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper>  epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper>  epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
 
   ConfigStore inputConfig;
diff -Naur ns-3.18.1/src/lte/examples/lena-x2-handover.cc ns-3.19/src/lte/examples/lena-x2-handover.cc
--- ns-3.18.1/src/lte/examples/lena-x2-handover.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/examples/lena-x2-handover.cc	2013-12-20 09:44:51.000000000 -0800
@@ -29,91 +29,89 @@
 
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("LenaX2HandoverExample");
 
-
-void 
-NotifyConnectionEstablishedUe (std::string context, 
-                               uint64_t imsi, 
-                               uint16_t cellid, 
+void
+NotifyConnectionEstablishedUe (std::string context,
+                               uint64_t imsi,
+                               uint16_t cellid,
                                uint16_t rnti)
 {
-  std::cout << context 
-            << " UE IMSI " << imsi 
-            << ": connected to CellId " << cellid 
-            << " with RNTI " << rnti 
+  std::cout << Simulator::Now ().GetSeconds () << " " << context
+            << " UE IMSI " << imsi
+            << ": connected to CellId " << cellid
+            << " with RNTI " << rnti
             << std::endl;
 }
 
-void 
-NotifyHandoverStartUe (std::string context, 
-                       uint64_t imsi, 
-                       uint16_t cellid, 
-                       uint16_t rnti, 
+void
+NotifyHandoverStartUe (std::string context,
+                       uint64_t imsi,
+                       uint16_t cellid,
+                       uint16_t rnti,
                        uint16_t targetCellId)
 {
-  std::cout << context 
-            << " UE IMSI " << imsi 
-            << ": previously connected to CellId " << cellid 
-            << " with RNTI " << rnti 
-            << ", doing handover to CellId " << targetCellId 
+  std::cout << Simulator::Now ().GetSeconds () << " " << context
+            << " UE IMSI " << imsi
+            << ": previously connected to CellId " << cellid
+            << " with RNTI " << rnti
+            << ", doing handover to CellId " << targetCellId
             << std::endl;
 }
 
-void 
-NotifyHandoverEndOkUe (std::string context, 
-                       uint64_t imsi, 
-                       uint16_t cellid, 
+void
+NotifyHandoverEndOkUe (std::string context,
+                       uint64_t imsi,
+                       uint16_t cellid,
                        uint16_t rnti)
 {
-  std::cout << context 
-            << " UE IMSI " << imsi 
-            << ": successful handover to CellId " << cellid 
-            << " with RNTI " << rnti 
+  std::cout << Simulator::Now ().GetSeconds () << " " << context
+            << " UE IMSI " << imsi
+            << ": successful handover to CellId " << cellid
+            << " with RNTI " << rnti
             << std::endl;
 }
 
-void 
-NotifyConnectionEstablishedEnb (std::string context, 
-                                uint64_t imsi, 
-                                uint16_t cellid, 
+void
+NotifyConnectionEstablishedEnb (std::string context,
+                                uint64_t imsi,
+                                uint16_t cellid,
                                 uint16_t rnti)
 {
-  std::cout << context 
-            << " eNB CellId " << cellid 
-            << ": successful connection of UE with IMSI " << imsi 
-            << " RNTI " << rnti 
+  std::cout << Simulator::Now ().GetSeconds () << " " << context
+            << " eNB CellId " << cellid
+            << ": successful connection of UE with IMSI " << imsi
+            << " RNTI " << rnti
             << std::endl;
 }
 
-void 
-NotifyHandoverStartEnb (std::string context, 
-                        uint64_t imsi, 
-                        uint16_t cellid, 
-                        uint16_t rnti, 
+void
+NotifyHandoverStartEnb (std::string context,
+                        uint64_t imsi,
+                        uint16_t cellid,
+                        uint16_t rnti,
                         uint16_t targetCellId)
 {
-  std::cout << context 
-            << " eNB CellId " << cellid 
-            << ": start handover of UE with IMSI " << imsi 
-            << " RNTI " << rnti 
-            << " to CellId " << targetCellId 
+  std::cout << Simulator::Now ().GetSeconds () << " " << context
+            << " eNB CellId " << cellid
+            << ": start handover of UE with IMSI " << imsi
+            << " RNTI " << rnti
+            << " to CellId " << targetCellId
             << std::endl;
 }
 
-void 
-NotifyHandoverEndOkEnb (std::string context, 
-                        uint64_t imsi, 
-                        uint16_t cellid, 
+void
+NotifyHandoverEndOkEnb (std::string context,
+                        uint64_t imsi,
+                        uint16_t cellid,
                         uint16_t rnti)
 {
-  std::cout << context 
-            << " eNB CellId " << cellid 
-            << ": completed handover of UE with IMSI " << imsi 
-            << " RNTI " << rnti 
+  std::cout << Simulator::Now ().GetSeconds () << " " << context
+            << " eNB CellId " << cellid
+            << ": completed handover of UE with IMSI " << imsi
+            << " RNTI " << rnti
             << std::endl;
 }
- 
-
 
 
 /**
@@ -121,7 +119,6 @@
  * It instantiates two eNodeB, attaches one UE to the 'source' eNB and
  * triggers a handover of the UE towards the 'target' eNB.
  */
-NS_LOG_COMPONENT_DEFINE ("EpcX2HandoverExample");
 int
 main (int argc, char *argv[])
 {
@@ -146,23 +143,24 @@
 
   // change some default attributes so that they are reasonable for
   // this scenario, but do this before processing command line
-  // arguments, so that the user is allowed to override these settings 
-  Config::SetDefault ("ns3::UdpClient::Interval", TimeValue (MilliSeconds(10)));
-  Config::SetDefault ("ns3::UdpClient::MaxPackets", UintegerValue(1000000));
-  Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue(false));
+  // arguments, so that the user is allowed to override these settings
+  Config::SetDefault ("ns3::UdpClient::Interval", TimeValue (MilliSeconds (10)));
+  Config::SetDefault ("ns3::UdpClient::MaxPackets", UintegerValue (1000000));
+  Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (false));
 
   // Command line arguments
   CommandLine cmd;
-  cmd.AddValue("numberOfUes", "Number of UEs", numberOfUes);
-  cmd.AddValue("numberOfEnbs", "Number of eNodeBs", numberOfEnbs);
-  cmd.AddValue("simTime", "Total duration of the simulation (in seconds)",simTime);
-  cmd.Parse(argc, argv);
+  cmd.AddValue ("numberOfUes", "Number of UEs", numberOfUes);
+  cmd.AddValue ("numberOfEnbs", "Number of eNodeBs", numberOfEnbs);
+  cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime);
+  cmd.Parse (argc, argv);
 
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper> epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
-  lteHelper->SetSchedulerType("ns3::RrFfMacScheduler");
+  lteHelper->SetSchedulerType ("ns3::RrFfMacScheduler");
+  lteHelper->SetHandoverAlgorithmType ("ns3::NoOpHandoverAlgorithm"); // disable automatic handover
 
   Ptr<Node> pgw = epcHelper->GetPgwNode ();
 
@@ -193,24 +191,24 @@
 
   NodeContainer ueNodes;
   NodeContainer enbNodes;
-  enbNodes.Create(numberOfEnbs);
-  ueNodes.Create(numberOfUes);
+  enbNodes.Create (numberOfEnbs);
+  ueNodes.Create (numberOfUes);
 
   // Install Mobility Model
   Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
   for (uint16_t i = 0; i < numberOfEnbs; i++)
     {
-      positionAlloc->Add (Vector(distance * 2*i - distance, 0, 0));
+      positionAlloc->Add (Vector (distance * 2 * i - distance, 0, 0));
     }
   for (uint16_t i = 0; i < numberOfUes; i++)
     {
-      positionAlloc->Add (Vector(0, 0, 0));
+      positionAlloc->Add (Vector (0, 0, 0));
     }
   MobilityHelper mobility;
-  mobility.SetMobilityModel("ns3::ConstantPositionMobilityModel");
-  mobility.SetPositionAllocator(positionAlloc);
-  mobility.Install(enbNodes);
-  mobility.Install(ueNodes);
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.SetPositionAllocator (positionAlloc);
+  mobility.Install (enbNodes);
+  mobility.Install (ueNodes);
 
   // Install LTE Devices in eNB and UEs
   NetDeviceContainer enbLteDevs = lteHelper->InstallEnbDevice (enbNodes);
@@ -233,23 +231,23 @@
   // Attach all UEs to the first eNodeB
   for (uint16_t i = 0; i < numberOfUes; i++)
     {
-      lteHelper->Attach (ueLteDevs.Get(i), enbLteDevs.Get(0));
+      lteHelper->Attach (ueLteDevs.Get (i), enbLteDevs.Get (0));
     }
 
 
   NS_LOG_LOGIC ("setting up applications");
-    
+
   // Install and start applications on UEs and remote host
   uint16_t dlPort = 10000;
   uint16_t ulPort = 20000;
 
   // randomize a bit start times to avoid simulation artifacts
   // (e.g., buffer overflows due to packet transmissions happening
-  // exactly at the same time) 
+  // exactly at the same time)
   Ptr<UniformRandomVariable> startTimeSeconds = CreateObject<UniformRandomVariable> ();
   startTimeSeconds->SetAttribute ("Min", DoubleValue (0));
   startTimeSeconds->SetAttribute ("Max", DoubleValue (0.010));
-     
+
   for (uint32_t u = 0; u < numberOfUes; ++u)
     {
       Ptr<Node> ue = ueNodes.Get (u);
@@ -264,33 +262,33 @@
 
           ApplicationContainer clientApps;
           ApplicationContainer serverApps;
-          
+
           NS_LOG_LOGIC ("installing UDP DL app for UE " << u);
           UdpClientHelper dlClientHelper (ueIpIfaces.GetAddress (u), dlPort);
           clientApps.Add (dlClientHelper.Install (remoteHost));
-          PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", 
+          PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory",
                                                InetSocketAddress (Ipv4Address::GetAny (), dlPort));
           serverApps.Add (dlPacketSinkHelper.Install (ue));
-              
+
           NS_LOG_LOGIC ("installing UDP UL app for UE " << u);
           UdpClientHelper ulClientHelper (remoteHostAddr, ulPort);
           clientApps.Add (ulClientHelper.Install (ue));
-          PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", 
+          PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory",
                                                InetSocketAddress (Ipv4Address::GetAny (), ulPort));
-          serverApps.Add (ulPacketSinkHelper.Install (remoteHost));  
-             
+          serverApps.Add (ulPacketSinkHelper.Install (remoteHost));
+
           Ptr<EpcTft> tft = Create<EpcTft> ();
           EpcTft::PacketFilter dlpf;
           dlpf.localPortStart = dlPort;
           dlpf.localPortEnd = dlPort;
-          tft->Add (dlpf); 
+          tft->Add (dlpf);
           EpcTft::PacketFilter ulpf;
           ulpf.remotePortStart = ulPort;
           ulpf.remotePortEnd = ulPort;
           tft->Add (ulpf);
           EpsBearer bearer (EpsBearer::NGBR_VIDEO_TCP_DEFAULT);
           lteHelper->ActivateDedicatedEpsBearer (ueLteDevs.Get (u), bearer, tft);
-          
+
           Time startTime = Seconds (startTimeSeconds->GetValue ());
           serverApps.Start (startTime);
           clientApps.Start (startTime);
@@ -304,11 +302,11 @@
 
   // X2-based Handover
   lteHelper->HandoverRequest (Seconds (0.100), ueLteDevs.Get (0), enbLteDevs.Get (0), enbLteDevs.Get (1));
-  
-  
+
   // Uncomment to enable PCAP tracing
   //p2ph.EnablePcapAll("lena-x2-handover");
 
+  lteHelper->EnablePhyTraces ();
   lteHelper->EnableMacTraces ();
   lteHelper->EnableRlcTraces ();
   lteHelper->EnablePdcpTraces ();
@@ -333,13 +331,13 @@
                    MakeCallback (&NotifyHandoverEndOkUe));
 
 
-  Simulator::Stop(Seconds(simTime));
-  Simulator::Run();
+  Simulator::Stop (Seconds (simTime));
+  Simulator::Run ();
 
   // GtkConfigStore config;
-  // config.ConfigureAttributes();
+  // config.ConfigureAttributes ();
 
-  Simulator::Destroy();
+  Simulator::Destroy ();
   return 0;
 
 }
diff -Naur ns-3.18.1/src/lte/examples/lena-x2-handover-measures.cc ns-3.19/src/lte/examples/lena-x2-handover-measures.cc
--- ns-3.18.1/src/lte/examples/lena-x2-handover-measures.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/examples/lena-x2-handover-measures.cc	2013-12-20 09:44:51.000000000 -0800
@@ -27,12 +27,92 @@
 #include "ns3/point-to-point-module.h"
 #include "ns3/config-store-module.h"
 
-#include <iomanip>
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("LenaX2HandoverMeasures");
 
+void
+NotifyConnectionEstablishedUe (std::string context,
+                               uint64_t imsi,
+                               uint16_t cellid,
+                               uint16_t rnti)
+{
+  std::cout << context
+            << " UE IMSI " << imsi
+            << ": connected to CellId " << cellid
+            << " with RNTI " << rnti
+            << std::endl;
+}
+
+void
+NotifyHandoverStartUe (std::string context,
+                       uint64_t imsi,
+                       uint16_t cellid,
+                       uint16_t rnti,
+                       uint16_t targetCellId)
+{
+  std::cout << context
+            << " UE IMSI " << imsi
+            << ": previously connected to CellId " << cellid
+            << " with RNTI " << rnti
+            << ", doing handover to CellId " << targetCellId
+            << std::endl;
+}
+
+void
+NotifyHandoverEndOkUe (std::string context,
+                       uint64_t imsi,
+                       uint16_t cellid,
+                       uint16_t rnti)
+{
+  std::cout << context
+            << " UE IMSI " << imsi
+            << ": successful handover to CellId " << cellid
+            << " with RNTI " << rnti
+            << std::endl;
+}
+
+void
+NotifyConnectionEstablishedEnb (std::string context,
+                                uint64_t imsi,
+                                uint16_t cellid,
+                                uint16_t rnti)
+{
+  std::cout << context
+            << " eNB CellId " << cellid
+            << ": successful connection of UE with IMSI " << imsi
+            << " RNTI " << rnti
+            << std::endl;
+}
+
+void
+NotifyHandoverStartEnb (std::string context,
+                        uint64_t imsi,
+                        uint16_t cellid,
+                        uint16_t rnti,
+                        uint16_t targetCellId)
+{
+  std::cout << context
+            << " eNB CellId " << cellid
+            << ": start handover of UE with IMSI " << imsi
+            << " RNTI " << rnti
+            << " to CellId " << targetCellId
+            << std::endl;
+}
+
+void
+NotifyHandoverEndOkEnb (std::string context,
+                        uint64_t imsi,
+                        uint16_t cellid,
+                        uint16_t rnti)
+{
+  std::cout << context
+            << " eNB CellId " << cellid
+            << ": completed handover of UE with IMSI " << imsi
+            << " RNTI " << rnti
+            << std::endl;
+}
+
 
 /**
  * Sample simulation script for an automatic X2-based handover based on the RSRQ measures.
@@ -44,7 +124,7 @@
 int
 main (int argc, char *argv[])
 {
-  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);
+  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_ALL | LOG_LEVEL_ALL);
 
   // LogComponentEnable ("LteHelper", logLevel);
   // LogComponentEnable ("EpcHelper", logLevel);
@@ -56,37 +136,51 @@
   // LogComponentEnable ("LteEnbNetDevice", logLevel);
   // LogComponentEnable ("LteUeRrc", logLevel);
   // LogComponentEnable ("LteUeNetDevice", logLevel);
+  // LogComponentEnable ("A2A4RsrqHandoverAlgorithm", logLevel);
+  // LogComponentEnable ("A3RsrpHandoverAlgorithm", logLevel);
 
   uint16_t numberOfUes = 1;
   uint16_t numberOfEnbs = 2;
   uint16_t numBearersPerUe = 0;
-  double distance = 1000.0; // m
-  double yForUe = 1000.0;   // m
-  double speed = 20;        // m/s
-  double simTime = 3.0 * distance / speed; // 3000 m / 20 m/s = 150 secs
-  double enbTxPowerDbm = 20.0;
+  double distance = 500.0; // m
+  double yForUe = 500.0;   // m
+  double speed = 20;       // m/s
+  double simTime = (double)(numberOfEnbs + 1) * distance / speed; // 1500 m / 20 m/s = 75 secs
+  double enbTxPowerDbm = 46.0;
 
   // change some default attributes so that they are reasonable for
   // this scenario, but do this before processing command line
-  // arguments, so that the user is allowed to override these settings 
-  Config::SetDefault ("ns3::UdpClient::Interval", TimeValue (MilliSeconds(10)));
-  Config::SetDefault ("ns3::UdpClient::MaxPackets", UintegerValue(1000000));
-  Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue(true));
+  // arguments, so that the user is allowed to override these settings
+  Config::SetDefault ("ns3::UdpClient::Interval", TimeValue (MilliSeconds (10)));
+  Config::SetDefault ("ns3::UdpClient::MaxPackets", UintegerValue (1000000));
+  Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (true));
 
   // Command line arguments
   CommandLine cmd;
-  cmd.AddValue("simTime", "Total duration of the simulation (in seconds)", simTime);
-  cmd.AddValue("speed", "Speed of the UE (default = 20 m/s)", speed);
-  cmd.AddValue("enbTxPowerDbm", "TX power [dBm] used by HeNBs (defalut = 20.0)", enbTxPowerDbm);
+  cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime);
+  cmd.AddValue ("speed", "Speed of the UE (default = 20 m/s)", speed);
+  cmd.AddValue ("enbTxPowerDbm", "TX power [dBm] used by HeNBs (defalut = 46.0)", enbTxPowerDbm);
 
-  cmd.Parse(argc, argv);
+  cmd.Parse (argc, argv);
 
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper> epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
   lteHelper->SetSchedulerType ("ns3::RrFfMacScheduler");
 
+  lteHelper->SetHandoverAlgorithmType ("ns3::A2A4RsrqHandoverAlgorithm");
+  lteHelper->SetHandoverAlgorithmAttribute ("ServingCellThreshold",
+                                            UintegerValue (30));
+  lteHelper->SetHandoverAlgorithmAttribute ("NeighbourCellOffset",
+                                            UintegerValue (1));
+
+  //  lteHelper->SetHandoverAlgorithmType ("ns3::A3RsrpHandoverAlgorithm");
+  //  lteHelper->SetHandoverAlgorithmAttribute ("Hysteresis",
+  //                                            DoubleValue (3.0));
+  //  lteHelper->SetHandoverAlgorithmAttribute ("TimeToTrigger",
+  //                                            TimeValue (MilliSeconds (256)));
+
   Ptr<Node> pgw = epcHelper->GetPgwNode ();
 
   // Create a single RemoteHost
@@ -114,6 +208,21 @@
   // interface 0 is localhost, 1 is the p2p device
   remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);
 
+  /*
+   * Network topology:
+   *
+   *      |     + --------------------------------------------------------->
+   *      |     UE
+   *      |
+   *      |               d                   d                   d
+   *    y |     |-------------------x-------------------x-------------------
+   *      |     |                 eNodeB              eNodeB
+   *      |   d |
+   *      |     |
+   *      |     |                                             d = distance
+   *            o (0, 0, 0)                                   y = yForUe
+   */
+
   NodeContainer ueNodes;
   NodeContainer enbNodes;
   enbNodes.Create (numberOfEnbs);
@@ -127,14 +236,14 @@
       enbPositionAlloc->Add (enbPosition);
     }
   MobilityHelper enbMobility;
-  enbMobility.SetMobilityModel("ns3::ConstantPositionMobilityModel");
-  enbMobility.SetPositionAllocator(enbPositionAlloc);
-  enbMobility.Install(enbNodes);
+  enbMobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  enbMobility.SetPositionAllocator (enbPositionAlloc);
+  enbMobility.Install (enbNodes);
 
   // Install Mobility Model in UE
   MobilityHelper ueMobility;
   ueMobility.SetMobilityModel ("ns3::ConstantVelocityMobilityModel");
-  ueMobility.Install(ueNodes);
+  ueMobility.Install (ueNodes);
   ueNodes.Get (0)->GetObject<MobilityModel> ()->SetPosition (Vector (0, yForUe, 0));
   ueNodes.Get (0)->GetObject<ConstantVelocityMobilityModel> ()->SetVelocity (Vector (speed, 0, 0));
 
@@ -160,23 +269,23 @@
   // Attach all UEs to the first eNodeB
   for (uint16_t i = 0; i < numberOfUes; i++)
     {
-      lteHelper->Attach (ueLteDevs.Get(i), enbLteDevs.Get(0));
+      lteHelper->Attach (ueLteDevs.Get (i), enbLteDevs.Get (0));
     }
 
 
   NS_LOG_LOGIC ("setting up applications");
-    
+
   // Install and start applications on UEs and remote host
   uint16_t dlPort = 10000;
   uint16_t ulPort = 20000;
 
   // randomize a bit start times to avoid simulation artifacts
   // (e.g., buffer overflows due to packet transmissions happening
-  // exactly at the same time) 
+  // exactly at the same time)
   Ptr<UniformRandomVariable> startTimeSeconds = CreateObject<UniformRandomVariable> ();
   startTimeSeconds->SetAttribute ("Min", DoubleValue (0));
   startTimeSeconds->SetAttribute ("Max", DoubleValue (0.010));
-     
+
   for (uint32_t u = 0; u < numberOfUes; ++u)
     {
       Ptr<Node> ue = ueNodes.Get (u);
@@ -195,22 +304,22 @@
           NS_LOG_LOGIC ("installing UDP DL app for UE " << u);
           UdpClientHelper dlClientHelper (ueIpIfaces.GetAddress (u), dlPort);
           clientApps.Add (dlClientHelper.Install (remoteHost));
-          PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", 
+          PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory",
                                                InetSocketAddress (Ipv4Address::GetAny (), dlPort));
           serverApps.Add (dlPacketSinkHelper.Install (ue));
 
           NS_LOG_LOGIC ("installing UDP UL app for UE " << u);
           UdpClientHelper ulClientHelper (remoteHostAddr, ulPort);
           clientApps.Add (ulClientHelper.Install (ue));
-          PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", 
+          PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory",
                                                InetSocketAddress (Ipv4Address::GetAny (), ulPort));
-          serverApps.Add (ulPacketSinkHelper.Install (remoteHost));  
+          serverApps.Add (ulPacketSinkHelper.Install (remoteHost));
 
           Ptr<EpcTft> tft = Create<EpcTft> ();
           EpcTft::PacketFilter dlpf;
           dlpf.localPortStart = dlPort;
           dlpf.localPortEnd = dlPort;
-          tft->Add (dlpf); 
+          tft->Add (dlpf);
           EpcTft::PacketFilter ulpf;
           ulpf.remotePortStart = ulPort;
           ulpf.remotePortEnd = ulPort;
@@ -221,6 +330,7 @@
           Time startTime = Seconds (startTimeSeconds->GetValue ());
           serverApps.Start (startTime);
           clientApps.Start (startTime);
+
         } // end for b
     }
 
@@ -229,11 +339,10 @@
   lteHelper->AddX2Interface (enbNodes);
 
   // X2-based Handover
-//   lteHelper->HandoverRequest (Seconds (0.100), ueLteDevs.Get (0), enbLteDevs.Get (0), enbLteDevs.Get (1));
-  
-  
+  //lteHelper->HandoverRequest (Seconds (0.100), ueLteDevs.Get (0), enbLteDevs.Get (0), enbLteDevs.Get (1));
+
   // Uncomment to enable PCAP tracing
-  //p2ph.EnablePcapAll("lena-x2-handover");
+  // p2ph.EnablePcapAll("lena-x2-handover-measures");
 
   lteHelper->EnablePhyTraces ();
   lteHelper->EnableMacTraces ();
@@ -244,14 +353,28 @@
   Ptr<RadioBearerStatsCalculator> pdcpStats = lteHelper->GetPdcpStats ();
   pdcpStats->SetAttribute ("EpochDuration", TimeValue (Seconds (1.0)));
 
+  // connect custom trace sinks for RRC connection establishment and handover notification
+  Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/ConnectionEstablished",
+                   MakeCallback (&NotifyConnectionEstablishedEnb));
+  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/ConnectionEstablished",
+                   MakeCallback (&NotifyConnectionEstablishedUe));
+  Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverStart",
+                   MakeCallback (&NotifyHandoverStartEnb));
+  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverStart",
+                   MakeCallback (&NotifyHandoverStartUe));
+  Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverEndOk",
+                   MakeCallback (&NotifyHandoverEndOkEnb));
+  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverEndOk",
+                   MakeCallback (&NotifyHandoverEndOkUe));
+
 
-  Simulator::Stop(Seconds(simTime));
-  Simulator::Run();
+  Simulator::Stop (Seconds (simTime));
+  Simulator::Run ();
 
   // GtkConfigStore config;
-  // config.ConfigureAttributes();
+  // config.ConfigureAttributes ();
 
-  Simulator::Destroy();
+  Simulator::Destroy ();
   return 0;
 
 }
diff -Naur ns-3.18.1/src/lte/helper/epc-helper.cc ns-3.19/src/lte/helper/epc-helper.cc
--- ns-3.18.1/src/lte/helper/epc-helper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/epc-helper.cc	2013-12-20 09:44:51.000000000 -0800
@@ -1,6 +1,6 @@
 /* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2011-2012 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ * Copyright (c) 2011-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
@@ -22,84 +22,21 @@
 
 #include <ns3/epc-helper.h>
 #include <ns3/log.h>
-#include <ns3/inet-socket-address.h>
-#include <ns3/mac48-address.h>
-#include <ns3/eps-bearer.h>
+#include <ns3/node.h>
 #include <ns3/ipv4-address.h>
-#include <ns3/internet-stack-helper.h>
-#include <ns3/point-to-point-helper.h>
-#include <ns3/packet-socket-helper.h>
-#include <ns3/packet-socket-address.h>
-#include <ns3/epc-enb-application.h>
-#include <ns3/epc-sgw-pgw-application.h>
-
-#include <ns3/lte-enb-rrc.h>
-#include <ns3/epc-x2.h>
-#include <ns3/lte-enb-net-device.h>
-#include <ns3/lte-ue-net-device.h>
-#include <ns3/epc-mme.h>
-#include <ns3/epc-ue-nas.h>
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("EpcHelper");
+NS_LOG_COMPONENT_DEFINE ("EpcHelper")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (EpcHelper);
+NS_OBJECT_ENSURE_REGISTERED (EpcHelper)
+  ;
 
 
 EpcHelper::EpcHelper () 
-  : m_gtpuUdpPort (2152)  // fixed by the standard
 {
   NS_LOG_FUNCTION (this);
-
-  // since we use point-to-point links for all S1-U links, 
-  // we use a /30 subnet which can hold exactly two addresses 
-  // (remember that net broadcast and null address are not valid)
-  m_s1uIpv4AddressHelper.SetBase ("10.0.0.0", "255.255.255.252");
-
-  m_x2Ipv4AddressHelper.SetBase ("12.0.0.0", "255.255.255.252");
-
-  // we use a /8 net for all UEs
-  m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0");
-  
-  // create SgwPgwNode
-  m_sgwPgw = CreateObject<Node> ();
-  InternetStackHelper internet;
-  internet.Install (m_sgwPgw);
-  
-  // create S1-U socket
-  Ptr<Socket> sgwPgwS1uSocket = Socket::CreateSocket (m_sgwPgw, TypeId::LookupByName ("ns3::UdpSocketFactory"));
-  int retval = sgwPgwS1uSocket->Bind (InetSocketAddress (Ipv4Address::GetAny (), m_gtpuUdpPort));
-  NS_ASSERT (retval == 0);
-
-  // create TUN device implementing tunneling of user data over GTP-U/UDP/IP 
-  m_tunDevice = CreateObject<VirtualNetDevice> ();
-  // allow jumbo packets
-  m_tunDevice->SetAttribute ("Mtu", UintegerValue (30000));
-
-  // yes we need this
-  m_tunDevice->SetAddress (Mac48Address::Allocate ()); 
-
-  m_sgwPgw->AddDevice (m_tunDevice);
-  NetDeviceContainer tunDeviceContainer;
-  tunDeviceContainer.Add (m_tunDevice);
-  
-  // the TUN device is on the same subnet as the UEs, so when a packet
-  // addressed to an UE arrives at the intenet to the WAN interface of
-  // the PGW it will be forwarded to the TUN device. 
-  Ipv4InterfaceContainer tunDeviceIpv4IfContainer = m_ueAddressHelper.Assign (tunDeviceContainer);  
-
-  // create EpcSgwPgwApplication
-  m_sgwPgwApp = CreateObject<EpcSgwPgwApplication> (m_tunDevice, sgwPgwS1uSocket);
-  m_sgwPgw->AddApplication (m_sgwPgwApp);
-  
-  // connect SgwPgwApplication and virtual net device for tunneling
-  m_tunDevice->SetSendCallback (MakeCallback (&EpcSgwPgwApplication::RecvFromTunDevice, m_sgwPgwApp));
-
-  // Create MME and connect with SGW via S11 interface
-  m_mme = CreateObject<EpcMme> ();
-  m_mme->SetS11SapSgw (m_sgwPgwApp->GetS11SapSgw ());
-  m_sgwPgwApp->SetS11SapMme (m_mme->GetS11SapMme ());
 }
 
 EpcHelper::~EpcHelper ()
@@ -112,38 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcHelper")
     .SetParent<Object> ()
-    .AddConstructor<EpcHelper> ()
-    .AddAttribute ("S1uLinkDataRate", 
-                   "The data rate to be used for the next S1-U link to be created",
-                   DataRateValue (DataRate ("10Gb/s")),
-                   MakeDataRateAccessor (&EpcHelper::m_s1uLinkDataRate),
-                   MakeDataRateChecker ())
-    .AddAttribute ("S1uLinkDelay", 
-                   "The delay to be used for the next S1-U link to be created",
-                   TimeValue (Seconds (0)),
-                   MakeTimeAccessor (&EpcHelper::m_s1uLinkDelay),
-                   MakeTimeChecker ())
-    .AddAttribute ("S1uLinkMtu", 
-                   "The MTU of the next S1-U link to be created. Note that, because of the additional GTP/UDP/IP tunneling overhead, you need a MTU larger than the end-to-end MTU that you want to support.",
-                   UintegerValue (2000),
-                   MakeUintegerAccessor (&EpcHelper::m_s1uLinkMtu),
-                   MakeUintegerChecker<uint16_t> ())
-    .AddAttribute ("X2LinkDataRate",
-                   "The data rate to be used for the next X2 link to be created",
-                   DataRateValue (DataRate ("10Gb/s")),
-                   MakeDataRateAccessor (&EpcHelper::m_x2LinkDataRate),
-                   MakeDataRateChecker ())
-    .AddAttribute ("X2LinkDelay",
-                   "The delay to be used for the next X2 link to be created",
-                   TimeValue (Seconds (0)),
-                   MakeTimeAccessor (&EpcHelper::m_x2LinkDelay),
-                   MakeTimeChecker ())
-    .AddAttribute ("X2LinkMtu",
-                   "The MTU of the next X2 link to be created. Note that, because of some big X2 messages, you need a big MTU.",
-                   UintegerValue (3000),
-                   MakeUintegerAccessor (&EpcHelper::m_x2LinkMtu),
-                   MakeUintegerChecker<uint16_t> ())
-  ;
+    ;
   return tid;
 }
 
@@ -151,194 +57,9 @@
 EpcHelper::DoDispose ()
 {
   NS_LOG_FUNCTION (this);
-  m_tunDevice->SetSendCallback (MakeNullCallback<bool, Ptr<Packet>, const Address&, const Address&, uint16_t> ());
-  m_tunDevice = 0;
-  m_sgwPgwApp = 0;  
-  m_sgwPgw->Dispose ();
-}
-
-
-void
-EpcHelper::AddEnb (Ptr<Node> enb, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId)
-{
-  NS_LOG_FUNCTION (this << enb << lteEnbNetDevice << cellId);
-
-  NS_ASSERT (enb == lteEnbNetDevice->GetNode ());
-
-  // add an IPv4 stack to the previously created eNB
-  InternetStackHelper internet;
-  internet.Install (enb);
-  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after node creation: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());
-
-  // create a point to point link between the new eNB and the SGW with
-  // the corresponding new NetDevices on each side  
-  NodeContainer enbSgwNodes;
-  enbSgwNodes.Add (m_sgwPgw);
-  enbSgwNodes.Add (enb);
-  PointToPointHelper p2ph;
-  p2ph.SetDeviceAttribute ("DataRate", DataRateValue (m_s1uLinkDataRate));
-  p2ph.SetDeviceAttribute ("Mtu", UintegerValue (m_s1uLinkMtu));
-  p2ph.SetChannelAttribute ("Delay", TimeValue (m_s1uLinkDelay));  
-  NetDeviceContainer enbSgwDevices = p2ph.Install (enb, m_sgwPgw);
-  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after installing p2p dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());  
-  Ptr<NetDevice> enbDev = enbSgwDevices.Get (0);
-  Ptr<NetDevice> sgwDev = enbSgwDevices.Get (1);
-  m_s1uIpv4AddressHelper.NewNetwork ();
-  Ipv4InterfaceContainer enbSgwIpIfaces = m_s1uIpv4AddressHelper.Assign (enbSgwDevices);
-  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after assigning Ipv4 addr to S1 dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());
-  
-  Ipv4Address enbAddress = enbSgwIpIfaces.GetAddress (0);
-  Ipv4Address sgwAddress = enbSgwIpIfaces.GetAddress (1);
-
-  // create S1-U socket for the ENB
-  Ptr<Socket> enbS1uSocket = Socket::CreateSocket (enb, TypeId::LookupByName ("ns3::UdpSocketFactory"));
-  int retval = enbS1uSocket->Bind (InetSocketAddress (enbAddress, m_gtpuUdpPort));
-  NS_ASSERT (retval == 0);
-  
-
-  // give PacketSocket powers to the eNB
-  //PacketSocketHelper packetSocket;
-  //packetSocket.Install (enb); 
-  
-  // create LTE socket for the ENB 
-  Ptr<Socket> enbLteSocket = Socket::CreateSocket (enb, TypeId::LookupByName ("ns3::PacketSocketFactory"));
-  PacketSocketAddress enbLteSocketBindAddress;
-  enbLteSocketBindAddress.SetSingleDevice (lteEnbNetDevice->GetIfIndex ());
-  enbLteSocketBindAddress.SetProtocol (Ipv4L3Protocol::PROT_NUMBER);
-  retval = enbLteSocket->Bind (enbLteSocketBindAddress);
-  NS_ASSERT (retval == 0);  
-  PacketSocketAddress enbLteSocketConnectAddress;
-  enbLteSocketConnectAddress.SetPhysicalAddress (Mac48Address::GetBroadcast ());
-  enbLteSocketConnectAddress.SetSingleDevice (lteEnbNetDevice->GetIfIndex ());
-  enbLteSocketConnectAddress.SetProtocol (Ipv4L3Protocol::PROT_NUMBER);
-  retval = enbLteSocket->Connect (enbLteSocketConnectAddress);
-  NS_ASSERT (retval == 0);  
-  
-
-  NS_LOG_INFO ("create EpcEnbApplication");
-  Ptr<EpcEnbApplication> enbApp = CreateObject<EpcEnbApplication> (enbLteSocket, enbS1uSocket, enbAddress, sgwAddress, cellId);
-  enb->AddApplication (enbApp);
-  NS_ASSERT (enb->GetNApplications () == 1);
-  NS_ASSERT_MSG (enb->GetApplication (0)->GetObject<EpcEnbApplication> () != 0, "cannot retrieve EpcEnbApplication");
-  NS_LOG_LOGIC ("enb: " << enb << ", enb->GetApplication (0): " << enb->GetApplication (0));
-
-  
-  NS_LOG_INFO ("Create EpcX2 entity");
-  Ptr<EpcX2> x2 = CreateObject<EpcX2> ();
-  enb->AggregateObject (x2);
-
-  NS_LOG_INFO ("connect S1-AP interface");
-  m_mme->AddEnb (cellId, enbAddress, enbApp->GetS1apSapEnb ());
-  m_sgwPgwApp->AddEnb (cellId, enbAddress, sgwAddress);
-  enbApp->SetS1apSapMme (m_mme->GetS1apSapMme ());
+  Object::DoDispose ();
 }
 
 
-void
-EpcHelper::AddX2Interface (Ptr<Node> enb1, Ptr<Node> enb2)
-{
-  NS_LOG_FUNCTION (this << enb1 << enb2);
-
-  // Create a point to point link between the two eNBs with
-  // the corresponding new NetDevices on each side
-  NodeContainer enbNodes;
-  enbNodes.Add (enb1);
-  enbNodes.Add (enb2);
-  PointToPointHelper p2ph;
-  p2ph.SetDeviceAttribute ("DataRate", DataRateValue (m_x2LinkDataRate));
-  p2ph.SetDeviceAttribute ("Mtu", UintegerValue (m_x2LinkMtu));
-  p2ph.SetChannelAttribute ("Delay", TimeValue (m_x2LinkDelay));
-  NetDeviceContainer enbDevices = p2ph.Install (enb1, enb2);
-  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #1 after installing p2p dev: " << enb1->GetObject<Ipv4> ()->GetNInterfaces ());
-  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #2 after installing p2p dev: " << enb2->GetObject<Ipv4> ()->GetNInterfaces ());
-  Ptr<NetDevice> enb1Dev = enbDevices.Get (0);
-  Ptr<NetDevice> enb2Dev = enbDevices.Get (1);
-
-  m_x2Ipv4AddressHelper.NewNetwork ();
-  Ipv4InterfaceContainer enbIpIfaces = m_x2Ipv4AddressHelper.Assign (enbDevices);
-  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #1 after assigning Ipv4 addr to X2 dev: " << enb1->GetObject<Ipv4> ()->GetNInterfaces ());
-  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #2 after assigning Ipv4 addr to X2 dev: " << enb2->GetObject<Ipv4> ()->GetNInterfaces ());
-
-  Ipv4Address enb1X2Address = enbIpIfaces.GetAddress (0);
-  Ipv4Address enb2X2Address = enbIpIfaces.GetAddress (1);
-
-  // Add X2 interface to both eNBs' X2 entities
-  Ptr<EpcX2> enb1X2 = enb1->GetObject<EpcX2> ();
-  Ptr<LteEnbNetDevice> enb1LteDev = enb1->GetDevice (0)->GetObject<LteEnbNetDevice> ();
-  uint16_t enb1CellId = enb1LteDev->GetCellId ();
-  NS_LOG_LOGIC ("LteEnbNetDevice #1 = " << enb1LteDev << " - CellId = " << enb1CellId);
-
-  Ptr<EpcX2> enb2X2 = enb2->GetObject<EpcX2> ();
-  Ptr<LteEnbNetDevice> enb2LteDev = enb2->GetDevice (0)->GetObject<LteEnbNetDevice> ();
-  uint16_t enb2CellId = enb2LteDev->GetCellId ();
-  NS_LOG_LOGIC ("LteEnbNetDevice #2 = " << enb2LteDev << " - CellId = " << enb2CellId);
-
-  enb1X2->AddX2Interface (enb1CellId, enb1X2Address, enb2CellId, enb2X2Address);
-  enb2X2->AddX2Interface (enb2CellId, enb2X2Address, enb1CellId, enb1X2Address);
-
-  enb1LteDev->GetRrc ()->AddX2Neighbour (enb2LteDev->GetCellId ());
-  enb2LteDev->GetRrc ()->AddX2Neighbour (enb1LteDev->GetCellId ());
-}
-
-
-void 
-EpcHelper::AddUe (Ptr<NetDevice> ueDevice, uint64_t imsi)
-{
-  NS_LOG_FUNCTION (this << imsi << ueDevice );
-  
-  m_mme->AddUe (imsi);
-  m_sgwPgwApp->AddUe (imsi);
-  
-
-}
-
-void
-EpcHelper::ActivateEpsBearer (Ptr<NetDevice> ueDevice, uint64_t imsi, Ptr<EpcTft> tft, EpsBearer bearer)
-{
-  NS_LOG_FUNCTION (this << ueDevice << imsi);
-
-  // we now retrieve the IPv4 address of the UE and notify it to the SGW;
-  // we couldn't do it before since address assignment is triggered by
-  // the user simulation program, rather than done by the EPC   
-  Ptr<Node> ueNode = ueDevice->GetNode (); 
-  Ptr<Ipv4> ueIpv4 = ueNode->GetObject<Ipv4> ();
-  NS_ASSERT_MSG (ueIpv4 != 0, "UEs need to have IPv4 installed before EPS bearers can be activated");
-  int32_t interface =  ueIpv4->GetInterfaceForDevice (ueDevice);
-  NS_ASSERT (interface >= 0);
-  NS_ASSERT (ueIpv4->GetNAddresses (interface) == 1);
-  Ipv4Address ueAddr = ueIpv4->GetAddress (interface, 0).GetLocal ();
-  NS_LOG_LOGIC (" UE IP address: " << ueAddr);  m_sgwPgwApp->SetUeAddress (imsi, ueAddr);
-  
-  m_mme->AddBearer (imsi, tft, bearer);
-  Ptr<LteUeNetDevice> ueLteDevice = ueDevice->GetObject<LteUeNetDevice> ();
-  if (ueLteDevice)
-    {
-      ueLteDevice->GetNas ()->ActivateEpsBearer (bearer, tft);
-    }
-}
-
-
-Ptr<Node>
-EpcHelper::GetPgwNode ()
-{
-  return m_sgwPgw;
-}
-
-
-Ipv4InterfaceContainer 
-EpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices)
-{
-  return m_ueAddressHelper.Assign (ueDevices);
-}
-
-
-
-Ipv4Address
-EpcHelper::GetUeDefaultGatewayAddress ()
-{
-  // return the address of the tun device
-  return m_sgwPgw->GetObject<Ipv4> ()->GetAddress (1, 0).GetLocal ();
-}
-
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/lte/helper/epc-helper.h ns-3.19/src/lte/helper/epc-helper.h
--- ns-3.18.1/src/lte/helper/epc-helper.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/epc-helper.h	2013-12-20 09:44:51.000000000 -0800
@@ -1,6 +1,6 @@
 /* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2011-2012 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ * Copyright (c) 2011-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
@@ -39,12 +39,11 @@
 class EpcMme;
 
 /**
- * \brief Helper class to handle the creation of the EPC entities and protocols.
+ * \brief Base helper class to handle the creation of the EPC entities.
  *
- * This Helper will create an EPC network topology comprising of a
- * single node that implements both the SGW and PGW functionality, and
- * is connected to all the eNBs in the simulation by means of the S1-U
- * interface. 
+ * This class provides the API for the implementation of helpers that
+ * allow to create EPC entities and the nodes and interfaces that host
+ * and connect them. 
  */
 class EpcHelper : public Object
 {
@@ -73,7 +72,7 @@
    * \param lteEnbNetDevice the LteEnbNetDevice of the eNB node
    * \param cellId ID of the eNB
    */
-  void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);
+  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId) = 0;
 
   /** 
    * Notify the EPC of the existance of a new UE which might attach at a later time
@@ -81,7 +80,7 @@
    * \param ueLteDevice the UE device to be attached
    * \param imsi the unique identifier of the UE
    */
-  void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);
+  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi) = 0;
 
   /** 
    * Add an X2 interface between two eNB
@@ -89,7 +88,7 @@
    * \param enbNode1 one eNB peer of the X2 interface
    * \param enbNode2 the other eNB peer of the X2 interface
    */
-  void AddX2Interface (Ptr<Node> enbNode1, Ptr<Node> enbNode2);
+  virtual void AddX2Interface (Ptr<Node> enbNode1, Ptr<Node> enbNode2) = 0;
 
   /** 
    * Activate an EPS bearer, setting up the corresponding S1-U tunnel.
@@ -102,7 +101,7 @@
    * \param tft the Traffic Flow Template of the new bearer
    * \param bearer struct describing the characteristics of the EPS bearer to be activated
    */
-  void ActivateEpsBearer (Ptr<NetDevice> ueLteDevice, uint64_t imsi, Ptr<EpcTft> tft, EpsBearer bearer);
+  virtual void ActivateEpsBearer (Ptr<NetDevice> ueLteDevice, uint64_t imsi, Ptr<EpcTft> tft, EpsBearer bearer) = 0;
 
 
   /** 
@@ -113,7 +112,7 @@
    * intended for this method is to allow the user to configure the Gi
    * interface of the PGW, i.e., to connect the PGW to the internet.
    */
-  Ptr<Node> GetPgwNode ();
+  virtual Ptr<Node> GetPgwNode () = 0;
 
   /** 
    * Assign IPv4 addresses to UE devices
@@ -122,66 +121,16 @@
    * 
    * \return the interface container, \see Ipv4AddressHelper::Assign() which has similar semantics
    */
-  Ipv4InterfaceContainer AssignUeIpv4Address (NetDeviceContainer ueDevices);
+  virtual Ipv4InterfaceContainer AssignUeIpv4Address (NetDeviceContainer ueDevices) = 0;
 
 
   /** 
    * 
    * \return the address of the Default Gateway to be used by UEs to reach the internet
    */
-  Ipv4Address GetUeDefaultGatewayAddress ();
+  virtual Ipv4Address GetUeDefaultGatewayAddress () = 0;
 
 
-
-private:
-
-  /**
-   * SGW-PGW network element
-   */
-
-  /** 
-   * helper to assign addresses to UE devices as well as to the TUN device of the SGW/PGW
-   */
-  Ipv4AddressHelper m_ueAddressHelper; 
-  
-  Ptr<Node> m_sgwPgw; 
-  Ptr<EpcSgwPgwApplication> m_sgwPgwApp;
-  Ptr<VirtualNetDevice> m_tunDevice;
-  Ptr<EpcMme> m_mme;
-
-  /**
-   * S1-U interfaces
-   */
-
-  /** 
-   * helper to assign addresses to S1-U NetDevices 
-   */
-  Ipv4AddressHelper m_s1uIpv4AddressHelper; 
-
-  DataRate m_s1uLinkDataRate;
-  Time     m_s1uLinkDelay;
-  uint16_t m_s1uLinkMtu;
-
-  /**
-   * UDP port where the GTP-U Socket is bound, fixed by the standard as 2152
-   */
-  uint16_t m_gtpuUdpPort;
-
-  /**
-   * Map storing for each IMSI the corresponding eNB NetDevice
-   * 
-   */
-  std::map<uint64_t, Ptr<NetDevice> > m_imsiEnbDeviceMap;
-  
-  /** 
-   * helper to assign addresses to X2 NetDevices 
-   */
-  Ipv4AddressHelper m_x2Ipv4AddressHelper;   
-
-  DataRate m_x2LinkDataRate;
-  Time     m_x2LinkDelay;
-  uint16_t m_x2LinkMtu;
-
 };
 
 
diff -Naur ns-3.18.1/src/lte/helper/lte-global-pathloss-database.cc ns-3.19/src/lte/helper/lte-global-pathloss-database.cc
--- ns-3.18.1/src/lte/helper/lte-global-pathloss-database.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/lte-global-pathloss-database.cc	2013-12-20 09:44:51.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase");
+NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase")
+  ;
 
 
 LteGlobalPathlossDatabase::~LteGlobalPathlossDatabase (void)
diff -Naur ns-3.18.1/src/lte/helper/lte-helper.cc ns-3.19/src/lte/helper/lte-helper.cc
--- ns-3.18.1/src/lte/helper/lte-helper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/lte-helper.cc	2013-12-20 09:44:51.000000000 -0800
@@ -43,6 +43,8 @@
 #include <ns3/lte-enb-net-device.h>
 #include <ns3/lte-ue-net-device.h>
 #include <ns3/ff-mac-scheduler.h>
+#include <ns3/lte-handover-algorithm.h>
+#include <ns3/lte-anr.h>
 #include <ns3/lte-rlc.h>
 #include <ns3/lte-rlc-um.h>
 #include <ns3/lte-rlc-am.h>
@@ -63,16 +65,18 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteHelper);
+NS_OBJECT_ENSURE_REGISTERED (LteHelper)
+  ;
 
 LteHelper::LteHelper (void)
-  :  m_fadingStreamsAssigned (false),
-     m_imsiCounter (0),
-     m_cellIdCounter (0)
+  : m_fadingStreamsAssigned (false),
+    m_imsiCounter (0),
+    m_cellIdCounter (0)
 {
   NS_LOG_FUNCTION (this);
   m_enbNetDeviceFactory.SetTypeId (LteEnbNetDevice::GetTypeId ());
   m_enbAntennaModelFactory.SetTypeId (IsotropicAntennaModel::GetTypeId ());
+  m_ueNetDeviceFactory.SetTypeId (LteUeNetDevice::GetTypeId ());
   m_ueAntennaModelFactory.SetTypeId (IsotropicAntennaModel::GetTypeId ());
   m_channelFactory.SetTypeId (MultiModelSpectrumChannel::GetTypeId ());
 }
@@ -145,7 +149,16 @@
                    "The allowed values for this attributes are the type names "
                    "of any class inheriting from ns3::FfMacScheduler.",
                    StringValue ("ns3::PfFfMacScheduler"),
-                   MakeStringAccessor (&LteHelper::SetSchedulerType, &LteHelper::GetSchedulerType),
+                   MakeStringAccessor (&LteHelper::SetSchedulerType,
+                                       &LteHelper::GetSchedulerType),
+                   MakeStringChecker ())
+    .AddAttribute ("HandoverAlgorithm",
+                   "The type of handover algorithm to be used for eNBs. "
+                   "The allowed values for this attributes are the type names "
+                   "of any class inheriting from ns3::HandoverAlgorithm.",
+                   StringValue ("ns3::NoOpHandoverAlgorithm"),
+                   MakeStringAccessor (&LteHelper::SetHandoverAlgorithmType,
+                                       &LteHelper::GetHandoverAlgorithmType),
                    MakeStringChecker ())
     .AddAttribute ("PathlossModel",
                    "The type of pathloss model to be used. "
@@ -168,6 +181,11 @@
                    BooleanValue (true), 
                    MakeBooleanAccessor (&LteHelper::m_useIdealRrc),
                    MakeBooleanChecker ())
+    .AddAttribute ("AnrEnabled",
+                   "Activate or deactivate Automatic Neighbour Relation function",
+                   BooleanValue (true),
+                   MakeBooleanAccessor (&LteHelper::m_isAnrEnabled),
+                   MakeBooleanChecker ())
   ;
   return tid;
 }
@@ -210,6 +228,27 @@
   m_schedulerFactory.Set (n, v);
 }
 
+std::string
+LteHelper::GetHandoverAlgorithmType () const
+{
+  return m_handoverAlgorithmFactory.GetTypeId ().GetName ();
+}
+
+void
+LteHelper::SetHandoverAlgorithmType (std::string type)
+{
+  NS_LOG_FUNCTION (this << type);
+  m_handoverAlgorithmFactory = ObjectFactory ();
+  m_handoverAlgorithmFactory.SetTypeId (type);
+}
+
+void
+LteHelper::SetHandoverAlgorithmAttribute (std::string n, const AttributeValue &v)
+{
+  NS_LOG_FUNCTION (this << n);
+  m_handoverAlgorithmFactory.Set (n, v);
+}
+
 
 void 
 LteHelper::SetPathlossModelType (std::string type) 
@@ -251,6 +290,13 @@
   m_enbAntennaModelFactory.Set (n, v);
 }
 
+void
+LteHelper::SetUeDeviceAttribute (std::string n, const AttributeValue &v)
+{
+  NS_LOG_FUNCTION (this);
+  m_ueNetDeviceFactory.Set (n, v);
+}
+
 void 
 LteHelper::SetUeAntennaModelType (std::string type)
 {
@@ -368,6 +414,7 @@
 
   Ptr<LteEnbMac> mac = CreateObject<LteEnbMac> ();
   Ptr<FfMacScheduler> sched = m_schedulerFactory.Create<FfMacScheduler> ();
+  Ptr<LteHandoverAlgorithm> handoverAlgorithm = m_handoverAlgorithmFactory.Create<LteHandoverAlgorithm> ();
   Ptr<LteEnbRrc> rrc = CreateObject<LteEnbRrc> ();
 
   if (m_useIdealRrc)
@@ -402,6 +449,9 @@
   mac->SetLteEnbCmacSapUser (rrc->GetLteEnbCmacSapUser ());
   rrc->SetLteMacSapProvider (mac->GetLteMacSapProvider ());
 
+  rrc->SetLteHandoverManagementSapProvider (handoverAlgorithm->GetLteHandoverManagementSapProvider ());
+  handoverAlgorithm->SetLteHandoverManagementSapUser (rrc->GetLteHandoverManagementSapUser ());
+
   mac->SetFfMacSchedSapProvider (sched->GetFfMacSchedSapProvider ());
   mac->SetFfMacCschedSapProvider (sched->GetFfMacCschedSapProvider ());
 
@@ -411,7 +461,6 @@
   phy->SetLteEnbPhySapUser (mac->GetLteEnbPhySapUser ());
   mac->SetLteEnbPhySapProvider (phy->GetLteEnbPhySapProvider ());
 
-
   phy->SetLteEnbCphySapUser (rrc->GetLteEnbCphySapUser ());
   rrc->SetLteEnbCphySapProvider (phy->GetLteEnbCphySapProvider ());
 
@@ -422,6 +471,15 @@
   dev->SetAttribute ("LteEnbMac", PointerValue (mac));
   dev->SetAttribute ("FfMacScheduler", PointerValue (sched));
   dev->SetAttribute ("LteEnbRrc", PointerValue (rrc)); 
+  dev->SetAttribute ("LteHandoverAlgorithm", PointerValue (handoverAlgorithm));
+
+  if (m_isAnrEnabled)
+    {
+      Ptr<LteAnr> anr = CreateObject<LteAnr> (cellId);
+      rrc->SetLteAnrSapProvider (anr->GetLteAnrSapProvider ());
+      anr->SetLteAnrSapUser (rrc->GetLteAnrSapUser ());
+      dev->SetAttribute ("LteAnr", PointerValue (anr));
+    }
 
   phy->SetDevice (dev);
   dlPhy->SetDevice (dev);
@@ -448,7 +506,6 @@
     {
       NS_LOG_WARN ("UL propagation model does not have a Frequency attribute");
     }
-  
 
   dev->Initialize ();
 
@@ -464,7 +521,7 @@
       // S1 SAPs
       rrc->SetS1SapProvider (enbApp->GetS1SapProvider ());
       enbApp->SetS1SapUser (rrc->GetS1SapUser ());
-      
+
       // X2 SAPs
       Ptr<EpcX2> x2 = n->GetObject<EpcX2> ();
       x2->SetEpcX2SapUser (rrc->GetEpcX2SapUser ());
@@ -493,7 +550,7 @@
 
   Ptr<LteInterferencePowerChunkProcessor> pInterf = Create<LteInterferencePowerChunkProcessor> (phy);
   dlPhy->AddInterferenceCtrlChunkProcessor (pInterf); // for RSRQ evaluation of UE Measurements
-  
+
   Ptr<LteCtrlSinrChunkProcessor> pCtrl = Create<LteCtrlSinrChunkProcessor> (phy->GetObject<LtePhy> (), dlPhy);
   dlPhy->AddCtrlSinrChunkProcessor (pCtrl);
 
@@ -517,20 +574,20 @@
   Ptr<LteUeRrc> rrc = CreateObject<LteUeRrc> ();
 
   if (m_useIdealRrc)
-    {      
-      Ptr<LteUeRrcProtocolIdeal> rrcProtocol = CreateObject<LteUeRrcProtocolIdeal> ();      
+    {
+      Ptr<LteUeRrcProtocolIdeal> rrcProtocol = CreateObject<LteUeRrcProtocolIdeal> ();
       rrcProtocol->SetUeRrc (rrc);
       rrc->AggregateObject (rrcProtocol);
       rrcProtocol->SetLteUeRrcSapProvider (rrc->GetLteUeRrcSapProvider ());
-      rrc->SetLteUeRrcSapUser (rrcProtocol->GetLteUeRrcSapUser ());      
+      rrc->SetLteUeRrcSapUser (rrcProtocol->GetLteUeRrcSapUser ());
     }
   else
     {
-      Ptr<LteUeRrcProtocolReal> rrcProtocol = CreateObject<LteUeRrcProtocolReal> ();      
+      Ptr<LteUeRrcProtocolReal> rrcProtocol = CreateObject<LteUeRrcProtocolReal> ();
       rrcProtocol->SetUeRrc (rrc);
       rrc->AggregateObject (rrcProtocol);
       rrcProtocol->SetLteUeRrcSapProvider (rrc->GetLteUeRrcSapProvider ());
-      rrc->SetLteUeRrcSapUser (rrcProtocol->GetLteUeRrcSapUser ());      
+      rrc->SetLteUeRrcSapUser (rrcProtocol->GetLteUeRrcSapUser ());
     }
 
   if (m_epcHelper != 0)
@@ -552,9 +609,17 @@
   phy->SetLteUeCphySapUser (rrc->GetLteUeCphySapUser ());
   rrc->SetLteUeCphySapProvider (phy->GetLteUeCphySapProvider ());
 
-  NS_ABORT_MSG_IF (m_imsiCounter >= 0xFFFFFFFF, "max num UEs exceeded");  
+  NS_ABORT_MSG_IF (m_imsiCounter >= 0xFFFFFFFF, "max num UEs exceeded");
   uint64_t imsi = ++m_imsiCounter;
-  Ptr<LteUeNetDevice> dev = CreateObject<LteUeNetDevice> (n, phy, mac, rrc, nas, imsi);
+
+  Ptr<LteUeNetDevice> dev = m_ueNetDeviceFactory.Create<LteUeNetDevice> ();
+  dev->SetNode (n);
+  dev->SetAttribute ("Imsi", UintegerValue (imsi));
+  dev->SetAttribute ("LteUePhy", PointerValue (phy));
+  dev->SetAttribute ("LteUeMac", PointerValue (mac));
+  dev->SetAttribute ("LteUeRrc", PointerValue (rrc));
+  dev->SetAttribute ("EpcUeNas", PointerValue (nas));
+
   phy->SetDevice (dev);
   dlPhy->SetDevice (dev);
   ulPhy->SetDevice (dev);
@@ -579,6 +644,47 @@
 
 
 void
+LteHelper::Attach (NetDeviceContainer ueDevices)
+{
+  NS_LOG_FUNCTION (this);
+  for (NetDeviceContainer::Iterator i = ueDevices.Begin (); i != ueDevices.End (); ++i)
+    {
+      Attach (*i);
+    }
+}
+
+void
+LteHelper::Attach (Ptr<NetDevice> ueDevice)
+{
+  NS_LOG_FUNCTION (this);
+
+  if (m_epcHelper == 0)
+    {
+      NS_FATAL_ERROR ("This function is not valid without properly configured EPC");
+    }
+
+  Ptr<LteUeNetDevice> ueLteDevice = ueDevice->GetObject<LteUeNetDevice> ();
+  if (ueLteDevice == 0)
+    {
+      NS_FATAL_ERROR ("The passed NetDevice must be an LteUeNetDevice");
+    }
+
+  // initiate cell selection
+  Ptr<EpcUeNas> ueNas = ueLteDevice->GetNas ();
+  NS_ASSERT (ueNas != 0);
+  uint16_t dlEarfcn = ueLteDevice->GetDlEarfcn ();
+  ueNas->StartCellSelection (dlEarfcn);
+
+  // instruct UE to immediately enter CONNECTED mode after camping
+  ueNas->Connect ();
+
+  // activate default EPS bearer
+  m_epcHelper->ActivateEpsBearer (ueDevice, ueLteDevice->GetImsi (),
+                                  EpcTft::Default (),
+                                  EpsBearer (EpsBearer::NGBR_VIDEO_TCP_DEFAULT));
+}
+
+void
 LteHelper::Attach (NetDeviceContainer ueDevices, Ptr<NetDevice> enbDevice)
 {
   NS_LOG_FUNCTION (this);
@@ -605,7 +711,7 @@
       // activate default EPS bearer
       m_epcHelper->ActivateEpsBearer (ueDevice, ueLteDevice->GetImsi (), EpcTft::Default (), EpsBearer (EpsBearer::NGBR_VIDEO_TCP_DEFAULT));
     }
-  
+
   // tricks needed for the simplified LTE-only simulations 
   if (m_epcHelper == 0)
     {
@@ -639,7 +745,7 @@
         {
           minDistance = distance;
           closestEnbDevice = *i;
-        }      
+        }
     }
   NS_ASSERT (closestEnbDevice != 0);
   Attach (ueDevice, closestEnbDevice);
@@ -661,8 +767,8 @@
 {
   NS_LOG_FUNCTION (this);
 
-  NS_ASSERT_MSG (m_epcHelper != 0, "dedicated EPS bearers cannot be set up when EPC is not used");
-  
+  NS_ASSERT_MSG (m_epcHelper != 0, "dedicated EPS bearers cannot be set up when the EPC is not used");
+
   uint64_t imsi = ueDevice->GetObject<LteUeNetDevice> ()->GetImsi ();
   m_epcHelper->ActivateEpsBearer (ueDevice, imsi, tft, bearer);
 }
@@ -702,8 +808,8 @@
   if ((!m_active) && (imsi == m_imsi))
     {
       Ptr<LteUeRrc> ueRrc = m_ueDevice->GetObject<LteUeNetDevice> ()->GetRrc ();
-      NS_ASSERT (ueRrc->GetState () == LteUeRrc::CONNECTED_NORMALLY);      
-      uint16_t rnti = ueRrc->GetRnti();
+      NS_ASSERT (ueRrc->GetState () == LteUeRrc::CONNECTED_NORMALLY);
+      uint16_t rnti = ueRrc->GetRnti ();
       Ptr<LteEnbNetDevice> enbLteDevice = m_ueDevice->GetObject<LteUeNetDevice> ()->GetTargetEnb ();
       Ptr<LteEnbRrc> enbRrc = enbLteDevice->GetObject<LteEnbNetDevice> ()->GetRrc ();
       NS_ASSERT (ueRrc->GetCellId () == enbLteDevice->GetCellId ());
@@ -719,14 +825,14 @@
       m_active = true;
     }
 }
-  
+
 
 void 
 LteHelper::ActivateDataRadioBearer (Ptr<NetDevice> ueDevice, EpsBearer bearer)
 {
   NS_LOG_FUNCTION (this << ueDevice);
-  NS_ASSERT_MSG (m_epcHelper == 0, "this method must not be used when EPC is being used");  
-  
+  NS_ASSERT_MSG (m_epcHelper == 0, "this method must not be used when the EPC is being used");
+
   // Normally it is the EPC that takes care of activating DRBs
   // when the UE gets connected. When the EPC is not used, we achieve
   // the same behavior by hooking a dedicated DRB activation function
@@ -738,7 +844,7 @@
   std::ostringstream path;
   path << "/NodeList/" << enbLteDevice->GetNode ()->GetId () 
        << "/DeviceList/" << enbLteDevice->GetIfIndex ()
-       << "/LteEnbRrc/ConnectionEstablished";  
+       << "/LteEnbRrc/ConnectionEstablished";
   Ptr<DrbActivator> arg = Create<DrbActivator> (ueDevice, bearer);
   Config::Connect (path.str (), MakeBoundCallback (&DrbActivator::ActivateCallback, arg));
 }
@@ -748,6 +854,8 @@
 {
   NS_LOG_FUNCTION (this);
 
+  NS_ASSERT_MSG (m_epcHelper != 0, "X2 interfaces cannot be set up when the EPC is not used");
+
   for (NodeContainer::Iterator i = enbNodes.Begin (); i != enbNodes.End (); ++i)
     {
       for (NodeContainer::Iterator j = i + 1; j != enbNodes.End (); ++j)
@@ -782,7 +890,7 @@
   uint16_t targetCellId = targetEnbDev->GetObject<LteEnbNetDevice> ()->GetCellId ();
   Ptr<LteEnbRrc> sourceRrc = sourceEnbDev->GetObject<LteEnbNetDevice> ()->GetRrc ();
   uint16_t rnti = ueDev->GetObject<LteUeNetDevice> ()->GetRrc ()->GetRnti ();
-  sourceRrc->SendHandoverRequest (rnti, targetCellId);  
+  sourceRrc->SendHandoverRequest (rnti, targetCellId);
 }
 
 
@@ -793,7 +901,7 @@
 LteHelper::ActivateDataRadioBearer (NetDeviceContainer ueDevices, EpsBearer bearer)
 {
   NS_LOG_FUNCTION (this);
-   for (NetDeviceContainer::Iterator i = ueDevices.Begin (); i != ueDevices.End (); ++i)
+  for (NetDeviceContainer::Iterator i = ueDevices.Begin (); i != ueDevices.End (); ++i)
     {
       ActivateDataRadioBearer (*i, bearer);
     }
diff -Naur ns-3.18.1/src/lte/helper/lte-helper.h ns-3.19/src/lte/helper/lte-helper.h
--- ns-3.18.1/src/lte/helper/lte-helper.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/lte-helper.h	2013-12-20 09:44:51.000000000 -0800
@@ -49,8 +49,8 @@
 class SpectrumPropagationLossModel;
 
 /**
- * Creation and configuration of LTE entities
- *
+ * \ingroup lte
+ * \brief Creation and configuration of LTE entities
  */
 class LteHelper : public Object
 {
@@ -113,6 +113,26 @@
   void SetSchedulerAttribute (std::string n, const AttributeValue &v);
 
   /**
+   *
+   * \param type the type of handover algorithm to be used for the eNBs
+   */
+  void SetHandoverAlgorithmType (std::string type);
+
+  /**
+   *
+   * \return the handover algorithm type
+   */
+  std::string GetHandoverAlgorithmType () const;
+
+  /**
+   * set an attribute for the handover algorithm to be created
+   *
+   * \param n the name of the attribute
+   * \param v the value of the attribute
+   */
+  void SetHandoverAlgorithmAttribute (std::string n, const AttributeValue &v);
+
+  /**
    * set an attribute for the LteEnbNetDevice to be created
    * 
    * \param n the name of the attribute
@@ -134,6 +154,14 @@
    */
   void SetEnbAntennaModelAttribute (std::string n, const AttributeValue &v);
 
+  /**
+   * set an attribute for the LteUeNetDevice to be created
+   *
+   * \param n the name of the attribute
+   * \param v the value of the attribute
+   */
+  void SetUeDeviceAttribute (std::string n, const AttributeValue &v);
+
   /** 
    * 
    * \param type the type of AntennaModel to be used for the UEs
@@ -161,6 +189,7 @@
    * \param v the value of the attribute
    */
   void SetSpectrumChannelAttribute (std::string n, const AttributeValue &v);
+
   /**
    * create a set of eNB devices
    *
@@ -180,40 +209,101 @@
   NetDeviceContainer InstallUeDevice (NodeContainer c);
 
   /**
-   * Attach a set of UE devices to a single eNB device
+   * \brief Enables automatic attachment of a set of UE devices to a suitable
+   *        cell using Idle mode initial cell selection procedure.
+   * \param ueDevices the set of UE devices to be attached
+   *
+   * By calling this, the UE will start the initial cell selection procedure at
+   * the beginning of simulation. In addition, the function also instructs each
+   * UE to immediately enter CONNECTED mode and activates the default EPS
+   * bearer.
    *
-   * \param ueDevices
-   * \param enbDevice
+   * If this function is called when the UE is in a situation where entering
+   * CONNECTED mode is not possible (e.g. before the simulation begin), then the
+   * UE will attempt to connect at the earliest possible time (e.g. after it
+   * camps to a suitable cell).
+   *
+   * Note that this function can only be used in EPC-enabled simulation.
    */
-  void Attach (NetDeviceContainer ueDevices, Ptr<NetDevice> enbDevice);
+  void Attach (NetDeviceContainer ueDevices);
 
   /**
-   * Attach a UE to the network
+   * \brief Enables automatic attachment of a UE device to a suitable cell
+   *        using Idle mode initial cell selection procedure.
+   * \param ueDevice the UE device to be attached
+   *
+   * By calling this, the UE will start the initial cell selection procedure at
+   * the beginning of simulation. In addition, the function also instructs the
+   * UE to immediately enter CONNECTED mode and activates the default EPS
+   * bearer.
    *
-   * Attach a UE device to the network via a given eNB, and activate the default EPS bearer.
+   * If this function is called when the UE is in a situation where entering
+   * CONNECTED mode is not possible (e.g. before the simulation begin), then the
+   * UE will attempt to connect at the earliest possible time (e.g. after it
+   * camps to a suitable cell).
    *
-   * \param ueDevice
-   * \param enbDevice
+   * Note that this function can only be used in EPC-enabled simulation.
+   */
+  void Attach (Ptr<NetDevice> ueDevice);
+
+  /**
+   * \brief Manual attachment of a set of UE devices to the network via a given
+   *        eNodeB.
+   * \param ueDevices the set of UE devices to be attached
+   * \param enbDevice the destination eNodeB device
+   *
+   * In addition, the function also instructs each UE to immediately enter
+   * CONNECTED mode and activates the default EPS bearer.
+   *
+   * The function can be used in both LTE-only and EPC-enabled simulations.
+   * Note that this function will disable Idle mode initial cell selection
+   * procedure.
+   */
+  void Attach (NetDeviceContainer ueDevices, Ptr<NetDevice> enbDevice);
+
+  /**
+   * \brief Manual attachment of a UE device to the network via a given eNodeB.
+   * \param ueDevice the UE device to be attached
+   * \param enbDevice the destination eNodeB device
+   *
+   * In addition, the function also instructs the UE to immediately enter
+   * CONNECTED mode and activates the default EPS bearer.
+   *
+   * The function can be used in both LTE-only and EPC-enabled simulations.
+   * Note that this function will disable Idle mode initial cell selection
+   * procedure.
    */
   void Attach (Ptr<NetDevice> ueDevice, Ptr<NetDevice> enbDevice);
 
   /** 
-   * Attach each UE in a set to the closest (w.r.t. distance) eNB among those in a set.
+   * \brief Manual attachment of a set of UE devices to the network via the
+   *        closest eNodeB (with respect to distance) among those in the set.
+   * \param ueDevices the set of UE devices to be attached
+   * \param enbDevices the set of eNodeB devices to be considered
    * 
+   * This function finds among the eNodeB set the closest eNodeB for each UE,
+   * and then invokes manual attachment between the pair.
    * 
+   * Users are encouraged to use automatic attachment (Idle mode cell selection)
+   * instead of this function.
    * 
-   * \param ueDevices the set of UEs
-   * \param enbDevices the set of eNBs
+   * \sa LteHelper::Attach(NetDeviceContainer ueDevices);
    */
   void AttachToClosestEnb (NetDeviceContainer ueDevices, NetDeviceContainer enbDevices);
 
   /** 
-   * Attach an UE ito the closest (w.r.t. distance) eNB among those in a set
-   * Will call LteHelper::Attach () passing to it the single eNB
-   * instance which resulted to be the closest to the UE 
+   * \brief Manual attachment of a UE device to the network via the closest
+   *        eNodeB (with respect to distance) among those in the set.
+   * \param ueDevice the UE device to be attached
+   * \param enbDevices the set of eNodeB devices to be considered
+   *
+   * This function finds among the eNodeB set the closest eNodeB for the UE,
+   * and then invokes manual attachment between the pair.
    * 
-   * \param ueDevice the UE
-   * \param enbDevices the set of eNBs
+   * Users are encouraged to use automatic attachment (Idle mode cell selection)
+   * instead of this function.
+   *
+   * \sa LteHelper::Attach(Ptr<NetDevice> ueDevice);
    */
   void AttachToClosestEnb (Ptr<NetDevice> ueDevice, NetDeviceContainer enbDevices);
 
@@ -229,7 +319,7 @@
   /**
    * Activate a dedicated EPS bearer on a given UE device
    *
-   * \param ueDevices the set of UE devices
+   * \param ueDevice the UE device
    * \param bearer the characteristics of the bearer to be activated
    * \param tft the Traffic Flow Template that identifies the traffic to go on this bearer
    */
@@ -252,14 +342,19 @@
   void AddX2Interface (Ptr<Node> enbNode1, Ptr<Node> enbNode2);
 
   /**
-   * Trigger an X2-based handover of a UE between two eNBs
-   *
+   * \brief Manually trigger an X2-based handover of a UE between two eNBs at a
+   *        specific simulation time.
    * \param hoTime when the Handover is initiated
-   * \param ueDev the UE that hands off
-   * \param enbDev1 source eNB, originally the UE is attached to this eNB
-   * \param enbDev2 target eNB, the UE is finally connected to this eNB
+   * \param ueDev the UE that hands off, must be of the type LteUeNetDevice
+   * \param sourceEnbDev source eNB, must be of the type LteEnbNetDevice
+   *                     (originally the UE is attached to this eNB)
+   * \param targetEnbDev target eNB, must be of the type LteEnbNetDevice
+   *                     (the UE is finally connected to this eNB)
+   *
+   * \warning Requires the use of EPC mode. See SetEpcHelper() method.
    */
-  void HandoverRequest (Time hoTime, Ptr<NetDevice> ueDev, Ptr<NetDevice> sourceEnbDev, Ptr<NetDevice> targetEnbDev);
+  void HandoverRequest (Time hoTime, Ptr<NetDevice> ueDev,
+                        Ptr<NetDevice> sourceEnbDev, Ptr<NetDevice> targetEnbDev);
 
 
   /** 
@@ -285,12 +380,15 @@
   /** 
    * 
    * 
-   * \param type the fading model to be used
+   * \param model the fading model to be used
    */
   void SetFadingModel (std::string model);
 
   /**
    * set an attribute of the fading model
+   *
+   * \param n the name of the attribute
+   * \param v the value of the attribute
    */
   void SetFadingModelAttribute (std::string n, const AttributeValue &v);
 
@@ -323,7 +421,7 @@
    * Enable trace sinks for UL PHY layer
    */
   void EnableUlPhyTraces (void);
-  
+
   /**
    * Enable trace sinks for DL transmission PHY layer
    */
@@ -404,10 +502,34 @@
   virtual void DoInitialize (void);
 
 private:
+  /**
+   * \brief Create an eNodeB device (LteEnbNetDevice) on the given node.
+   * \param n the node where the device is to be installed
+   * \return pointer to the created device
+   */
   Ptr<NetDevice> InstallSingleEnbDevice (Ptr<Node> n);
+
+  /**
+   * \brief Create a UE device (LteUeNetDevice) on the given node.
+   * \param n the node where the device is to be installed
+   * \return pointer to the created device
+   */
   Ptr<NetDevice> InstallSingleUeDevice (Ptr<Node> n);
 
-  void DoHandoverRequest (Ptr<NetDevice> ueDev, Ptr<NetDevice> sourceEnbDev, Ptr<NetDevice> targetEnbDev);
+  /**
+   * \brief The actual function to trigger a manual handover.
+   * \param ueDev the UE that hands off, must be of the type LteUeNetDevice
+   * \param sourceEnbDev source eNB, must be of the type LteEnbNetDevice
+   *                     (originally the UE is attached to this eNB)
+   * \param targetEnbDev target eNB, must be of the type LteEnbNetDevice
+   *                     (the UE is finally connected to this eNB)
+   *
+   * This method is normally scheduled by HandoverRequest() to run at a specific
+   * time where a manual handover is desired by the simulation user.
+   */
+  void DoHandoverRequest (Ptr<NetDevice> ueDev,
+                          Ptr<NetDevice> sourceEnbDev,
+                          Ptr<NetDevice> targetEnbDev);
 
   Ptr<SpectrumChannel> m_downlinkChannel;
   Ptr<SpectrumChannel> m_uplinkChannel;
@@ -416,9 +538,11 @@
   Ptr<Object> m_uplinkPathlossModel;
 
   ObjectFactory m_schedulerFactory;
+  ObjectFactory m_handoverAlgorithmFactory;
   ObjectFactory m_propagationModelFactory;
   ObjectFactory m_enbNetDeviceFactory;
   ObjectFactory m_enbAntennaModelFactory;
+  ObjectFactory m_ueNetDeviceFactory;
   ObjectFactory m_ueAntennaModelFactory;
 
   ObjectFactory m_dlPathlossModelFactory;
@@ -445,6 +569,7 @@
   uint16_t m_cellIdCounter;
 
   bool m_useIdealRrc;
+  bool m_isAnrEnabled;
 };
 
 
diff -Naur ns-3.18.1/src/lte/helper/lte-hex-grid-enb-topology-helper.cc ns-3.19/src/lte/helper/lte-hex-grid-enb-topology-helper.cc
--- ns-3.18.1/src/lte/helper/lte-hex-grid-enb-topology-helper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/lte-hex-grid-enb-topology-helper.cc	2013-12-20 09:44:51.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteHexGridEnbTopologyHelper);
+NS_OBJECT_ENSURE_REGISTERED (LteHexGridEnbTopologyHelper)
+  ;
 
 LteHexGridEnbTopologyHelper::LteHexGridEnbTopologyHelper ()
 {
diff -Naur ns-3.18.1/src/lte/helper/lte-stats-calculator.cc ns-3.19/src/lte/helper/lte-stats-calculator.cc
--- ns-3.18.1/src/lte/helper/lte-stats-calculator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/lte-stats-calculator.cc	2013-12-20 09:44:51.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator")
+  ;
 
 LteStatsCalculator::LteStatsCalculator ()
   : m_dlOutputFilename (""),
diff -Naur ns-3.18.1/src/lte/helper/lte-stats-calculator.h ns-3.19/src/lte/helper/lte-stats-calculator.h
--- ns-3.18.1/src/lte/helper/lte-stats-calculator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/lte-stats-calculator.h	2013-12-20 09:44:51.000000000 -0800
@@ -51,6 +51,7 @@
 
   /**
    * Get the name of the file where the uplink statistics will be stored.
+   * @return the name of the file where the uplink statistics will be stored
    */
   std::string GetUlOutputFilename (void);
 
@@ -63,12 +64,14 @@
 
   /**
    * Get the name of the file where the downlink statistics will be stored.
+   * @return the name of the file where the downlink statistics will be stored
    */
   std::string GetDlOutputFilename (void);
 
   /**
    * Checks if there is an already stored IMSI for the given path
    * @param path Path in the attribute system to check
+   * @return true if the path exists, false otherwise
    */
   bool ExistsImsiPath (std::string path);
 
@@ -82,12 +85,14 @@
   /**
    * Retrieves the imsi information for the given path
    * @param path Path in the attribute system to get
+   * @return the IMSI associated with the given path
    */
   uint64_t GetImsiPath (std::string path);
 
   /**
    * Checks if there is an already stored cell id for the given path
    * @param path Path in the attribute system to check
+   * @return true if the path exists, false otherwise
    */
   bool ExistsCellIdPath (std::string path);
 
@@ -101,6 +106,7 @@
   /**
    * Retrieves the cell id information for the given path
    * @param path Path in the attribute system to get
+   * @return the cell ID associated with the given path
    */
   uint16_t GetCellIdPath (std::string path);
 
diff -Naur ns-3.18.1/src/lte/helper/mac-stats-calculator.cc ns-3.19/src/lte/helper/mac-stats-calculator.cc
--- ns-3.18.1/src/lte/helper/mac-stats-calculator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/mac-stats-calculator.cc	2013-12-20 09:44:51.000000000 -0800
@@ -25,9 +25,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator);
+NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator)
+  ;
 
 MacStatsCalculator::MacStatsCalculator ()
   : m_dlFirstWrite (true),
@@ -131,9 +133,9 @@
 
 void
 MacStatsCalculator::UlScheduling (uint16_t cellId, uint64_t imsi, uint32_t frameNo,
-                                  uint32_t subframeNo, uint16_t rnti,uint8_t mcs, uint16_t size)
+                                  uint32_t subframeNo, uint16_t rnti,uint8_t mcsTb, uint16_t size)
 {
-  NS_LOG_FUNCTION (this << cellId << imsi << frameNo << subframeNo << rnti << (uint32_t) mcs << size);
+  NS_LOG_FUNCTION (this << cellId << imsi << frameNo << subframeNo << rnti << (uint32_t) mcsTb << size);
   NS_LOG_INFO ("Write UL Mac Stats in " << GetUlOutputFilename ().c_str ());
 
   std::ofstream outFile;
@@ -165,7 +167,7 @@
   outFile << frameNo << "\t";
   outFile << subframeNo << "\t";
   outFile << rnti << "\t";
-  outFile << (uint32_t) mcs << "\t";
+  outFile << (uint32_t) mcsTb << "\t";
   outFile << size << std::endl;
   outFile.close ();
 }
diff -Naur ns-3.18.1/src/lte/helper/mac-stats-calculator.h ns-3.19/src/lte/helper/mac-stats-calculator.h
--- ns-3.18.1/src/lte/helper/mac-stats-calculator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/mac-stats-calculator.h	2013-12-20 09:44:51.000000000 -0800
@@ -53,9 +53,7 @@
    */
   virtual ~MacStatsCalculator ();
 
-  /**
-   * Inherited from ns3::Object
-   */
+  // Inherited from ns3::Object
   static TypeId GetTypeId (void);
 
   /**
@@ -67,6 +65,7 @@
 
   /**
    * Get the name of the file where the uplink statistics will be stored.
+   * @return the name of the file where the uplink statistics will be stored
    */
   std::string GetUlOutputFilename (void);
 
@@ -79,6 +78,7 @@
 
   /**
    * Get the name of the file where the downlink statistics will be stored.
+   * @return the name of the file where the downlink statistics will be stored
    */
   std::string GetDlOutputFilename (void);
 
@@ -108,7 +108,7 @@
    * @param sizeTb Size of transport block
    */
   void UlScheduling (uint16_t cellId, uint64_t imsi,uint32_t frameNo, uint32_t subframeNo,
-                     uint16_t rnti, uint8_t mcs, uint16_t sizeTb);
+                     uint16_t rnti, uint8_t mcsTb, uint16_t sizeTb);
 
   
   /** 
diff -Naur ns-3.18.1/src/lte/helper/phy-rx-stats-calculator.cc ns-3.19/src/lte/helper/phy-rx-stats-calculator.cc
--- ns-3.18.1/src/lte/helper/phy-rx-stats-calculator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/phy-rx-stats-calculator.cc	2013-12-20 09:44:51.000000000 -0800
@@ -27,9 +27,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator);
+NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator)
+  ;
 
 PhyRxStatsCalculator::PhyRxStatsCalculator ()
   : m_dlRxFirstWrite (true),
diff -Naur ns-3.18.1/src/lte/helper/phy-rx-stats-calculator.h ns-3.19/src/lte/helper/phy-rx-stats-calculator.h
--- ns-3.18.1/src/lte/helper/phy-rx-stats-calculator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/phy-rx-stats-calculator.h	2013-12-20 09:44:51.000000000 -0800
@@ -35,7 +35,7 @@
 /**
  * Takes care of storing the information generated at PHY layer regarding 
  * reception. Metrics saved are:
- *time\tframe\tsframe\tRNTI\tmcsTb1\tsizeTb1\tmcsTb2\tsizeTb2
+ *
  *   - Timestamp (in seconds)
  *   - Frame index
  *   - Subframe index
@@ -58,9 +58,7 @@
    */
   virtual ~PhyRxStatsCalculator ();
 
-  /**
-   * Inherited from ns3::Object
-   */
+  // Inherited from ns3::Object
   static TypeId GetTypeId (void);
 
   /**
@@ -72,6 +70,7 @@
 
   /**
    * Get the name of the file where the UL RX PHY statistics will be stored.
+   * @return the name of the file where the UL RX PHY statistics will be stored
    */
   std::string GetUlRxOutputFilename (void);
 
@@ -84,40 +83,19 @@
 
   /**
    * Get the name of the file where the DL RX PHY statistics will be stored.
+   * @return the name of the file where the DL RX PHY statistics will be stored
    */
   std::string GetDlRxOutputFilename (void);
 
   /**
    * Notifies the stats calculator that an downlink reception has occurred.
-   * @param cellId Cell ID of the attached Enb
-   * @param imsi IMSI of the scheduled UE
-   * @param frameNo Frame number
-   * @param subframeNo Subframe number
-   * @param rnti C-RNTI scheduled
-   * @param layer the layer (cw) of the transmission
-   * @param txMode the transmission Mode
-   * @param mcs MCS for transport block
-   * @param size Size of transport block
-   * @param rv the redundancy version (HARQ)
-   * @param ndi new data indicator flag
-   * @param correctness correctness of the TB received
+   * @param params Trace information regarding PHY reception stats
    */
   void DlPhyReception (PhyReceptionStatParameters params);
 
   /**
    * Notifies the stats calculator that an uplink reception has occurred.
-   * @param cellId Cell ID of the attached Enb
-   * @param imsi IMSI of the scheduled UE
-   * @param frameNo Frame number
-   * @param subframeNo Subframe number
-   * @param rnti C-RNTI scheduled
-   * @param layer the layer (cw) of the transmission
-   * @param txMode the transmission Mode
-   * @param mcs MCS for transport block
-   * @param size Size of transport block
-   * @param rv the redundancy version (HARQ)
-   * @param ndi new data indicator flag
-   * @param correctness correctness of the TB received
+   * @param params Trace information regarding PHY reception stats
    */
   void UlPhyReception (PhyReceptionStatParameters params);
 
diff -Naur ns-3.18.1/src/lte/helper/phy-stats-calculator.cc ns-3.19/src/lte/helper/phy-stats-calculator.cc
--- ns-3.18.1/src/lte/helper/phy-stats-calculator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/phy-stats-calculator.cc	2013-12-20 09:44:51.000000000 -0800
@@ -25,9 +25,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator);
+NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator)
+  ;
 
 PhyStatsCalculator::PhyStatsCalculator ()
   :  m_RsrpSinrFirstWrite (true),
diff -Naur ns-3.18.1/src/lte/helper/phy-stats-calculator.h ns-3.19/src/lte/helper/phy-stats-calculator.h
--- ns-3.18.1/src/lte/helper/phy-stats-calculator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/phy-stats-calculator.h	2013-12-20 09:44:51.000000000 -0800
@@ -63,20 +63,19 @@
    */
   virtual ~PhyStatsCalculator ();
 
-  /**
-   * Inherited from ns3::Object
-   */
+  // Inherited from ns3::Object
   static TypeId GetTypeId (void);
 
   /**
    * Set the name of the file where the RSRP/SINR statistics will be stored.
    *
-   * \param filename string with the name of the file
+   * @param filename string with the name of the file
    */
   void SetCurrentCellRsrpSinrFilename (std::string filename);
 
   /**
    * Get the name of the file where the RSRP/SINR statistics will be stored.
+   * @return the name of the file where the RSRP/SINR statistics will be stored
    */
   std::string GetCurrentCellRsrpSinrFilename  (void);
 
@@ -89,6 +88,7 @@
 
   /**
    * Get the name of the file where the UE SINR statistics will be stored.
+   * @return the name of the file where the UE SINR statistics will be stored
    */
   std::string GetUeSinrFilename (void);
 
@@ -101,6 +101,7 @@
 
   /**
    * Get the name of the file where the interference statistics will be stored.
+   * @return the name of the file where the interference statistics will be stored
    */
   std::string GetInterferenceFilename (void);
 
@@ -123,8 +124,6 @@
   void ReportUeSinr (uint16_t cellId, uint64_t imsi, uint16_t rnti, double sinrLinear);
   /**
    * Notifies the stats calculator that an interference report has occurred.
-   * @param imsi IMSI of the scheduled UE
-   * @param rnti C-RNTI scheduled
    * @param cellId Cell ID of the reported Enb
    * @param interference Measured interference for each RB
    */
diff -Naur ns-3.18.1/src/lte/helper/phy-tx-stats-calculator.cc ns-3.19/src/lte/helper/phy-tx-stats-calculator.cc
--- ns-3.18.1/src/lte/helper/phy-tx-stats-calculator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/phy-tx-stats-calculator.cc	2013-12-20 09:44:51.000000000 -0800
@@ -27,9 +27,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator);
+NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator)
+  ;
 
 PhyTxStatsCalculator::PhyTxStatsCalculator ()
   : m_dlTxFirstWrite (true),
diff -Naur ns-3.18.1/src/lte/helper/phy-tx-stats-calculator.h ns-3.19/src/lte/helper/phy-tx-stats-calculator.h
--- ns-3.18.1/src/lte/helper/phy-tx-stats-calculator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/phy-tx-stats-calculator.h	2013-12-20 09:44:51.000000000 -0800
@@ -37,7 +37,7 @@
 /**
  * Takes care of storing the information generated at PHY layer regarding 
  * transmission. Metrics saved are:
- *time\tframe\tsframe\tRNTI\tmcsTb1\tsizeTb1\tmcsTb2\tsizeTb2
+ *
  *   - Timestamp (in seconds)
  *   - Frame index
  *   - Subframe index
@@ -60,20 +60,19 @@
    */
   virtual ~PhyTxStatsCalculator ();
 
-  /**
-   * Inherited from ns3::Object
-   */
+  // Inherited from ns3::Object
   static TypeId GetTypeId (void);
 
   /**
    * Set the name of the file where the UL Tx PHY statistics will be stored.
    *
-   * \param outputFilename string with the name of the file
+   * @param outputFilename string with the name of the file
    */
   void SetUlTxOutputFilename (std::string outputFilename);
 
   /**
    * Get the name of the file where the UL RX PHY statistics will be stored.
+   * @return the name of the file where the UL RX PHY statistics will be stored
    */
   std::string GetUlTxOutputFilename (void);
 
@@ -86,38 +85,19 @@
 
   /**
    * Get the name of the file where the DL TX PHY statistics will be stored.
+   * @return the name of the file where the DL TX PHY statistics will be stored
    */
   std::string GetDlTxOutputFilename (void);
 
   /**
    * Notifies the stats calculator that an downlink trasmission has occurred.
-   * @param cellId Cell ID of the attached Enb
-   * @param imsi IMSI of the scheduled UE
-   * @param frameNo Frame number
-   * @param subframeNo Subframe number
-   * @param rnti C-RNTI scheduled
-   * @param layer the layer (cw) of the transmission
-   * @param txMode the transmission Mode
-   * @param mcs MCS for transport block
-   * @param size Size of transport block
-   * @param rv the redundancy version (HARQ)
-   * @param ndi new data indicator flag
+   * @param params Trace information regarding PHY transmission stats
    */
   void DlPhyTransmission (PhyTransmissionStatParameters params);
 
   /**
    * Notifies the stats calculator that an uplink trasmission has occurred.
-   * @param cellId Cell ID of the attached Enb
-   * @param imsi IMSI of the scheduled UE
-   * @param frameNo Frame number
-   * @param subframeNo Subframe number
-   * @param rnti C-RNTI scheduled
-   * @param layer the layer (cw) of the transmission
-   * @param txMode the transmission Mode
-   * @param mcs MCS for transport block
-   * @param size Size of transport block
-   * @param rv the redundancy version (HARQ)
-   * @param ndi new data indicator flag
+   * @param params Trace information regarding PHY transmission stats
    */
   void UlPhyTransmission (PhyTransmissionStatParameters params);
 
diff -Naur ns-3.18.1/src/lte/helper/point-to-point-epc-helper.cc ns-3.19/src/lte/helper/point-to-point-epc-helper.cc
--- ns-3.18.1/src/lte/helper/point-to-point-epc-helper.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/helper/point-to-point-epc-helper.cc	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,346 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011-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: Jaume Nin <jnin@cttc.es>
+ *         Nicola Baldo <nbaldo@cttc.es>
+ *         Manuel Requena <manuel.requena@cttc.es>
+ */
+
+#include <ns3/point-to-point-epc-helper.h>
+#include <ns3/log.h>
+#include <ns3/inet-socket-address.h>
+#include <ns3/mac48-address.h>
+#include <ns3/eps-bearer.h>
+#include <ns3/ipv4-address.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/point-to-point-helper.h>
+#include <ns3/packet-socket-helper.h>
+#include <ns3/packet-socket-address.h>
+#include <ns3/epc-enb-application.h>
+#include <ns3/epc-sgw-pgw-application.h>
+
+#include <ns3/lte-enb-rrc.h>
+#include <ns3/epc-x2.h>
+#include <ns3/lte-enb-net-device.h>
+#include <ns3/lte-ue-net-device.h>
+#include <ns3/epc-mme.h>
+#include <ns3/epc-ue-nas.h>
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("PointToPointEpcHelper")
+  ;
+
+NS_OBJECT_ENSURE_REGISTERED (PointToPointEpcHelper)
+  ;
+
+
+PointToPointEpcHelper::PointToPointEpcHelper () 
+  : m_gtpuUdpPort (2152)  // fixed by the standard
+{
+  NS_LOG_FUNCTION (this);
+
+  // since we use point-to-point links for all S1-U links, 
+  // we use a /30 subnet which can hold exactly two addresses 
+  // (remember that net broadcast and null address are not valid)
+  m_s1uIpv4AddressHelper.SetBase ("10.0.0.0", "255.255.255.252");
+
+  m_x2Ipv4AddressHelper.SetBase ("12.0.0.0", "255.255.255.252");
+
+  // we use a /8 net for all UEs
+  m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0");
+  
+  // create SgwPgwNode
+  m_sgwPgw = CreateObject<Node> ();
+  InternetStackHelper internet;
+  internet.Install (m_sgwPgw);
+  
+  // create S1-U socket
+  Ptr<Socket> sgwPgwS1uSocket = Socket::CreateSocket (m_sgwPgw, TypeId::LookupByName ("ns3::UdpSocketFactory"));
+  int retval = sgwPgwS1uSocket->Bind (InetSocketAddress (Ipv4Address::GetAny (), m_gtpuUdpPort));
+  NS_ASSERT (retval == 0);
+
+  // create TUN device implementing tunneling of user data over GTP-U/UDP/IP 
+  m_tunDevice = CreateObject<VirtualNetDevice> ();
+  // allow jumbo packets
+  m_tunDevice->SetAttribute ("Mtu", UintegerValue (30000));
+
+  // yes we need this
+  m_tunDevice->SetAddress (Mac48Address::Allocate ()); 
+
+  m_sgwPgw->AddDevice (m_tunDevice);
+  NetDeviceContainer tunDeviceContainer;
+  tunDeviceContainer.Add (m_tunDevice);
+  
+  // the TUN device is on the same subnet as the UEs, so when a packet
+  // addressed to an UE arrives at the intenet to the WAN interface of
+  // the PGW it will be forwarded to the TUN device. 
+  Ipv4InterfaceContainer tunDeviceIpv4IfContainer = m_ueAddressHelper.Assign (tunDeviceContainer);  
+
+  // create EpcSgwPgwApplication
+  m_sgwPgwApp = CreateObject<EpcSgwPgwApplication> (m_tunDevice, sgwPgwS1uSocket);
+  m_sgwPgw->AddApplication (m_sgwPgwApp);
+  
+  // connect SgwPgwApplication and virtual net device for tunneling
+  m_tunDevice->SetSendCallback (MakeCallback (&EpcSgwPgwApplication::RecvFromTunDevice, m_sgwPgwApp));
+
+  // Create MME and connect with SGW via S11 interface
+  m_mme = CreateObject<EpcMme> ();
+  m_mme->SetS11SapSgw (m_sgwPgwApp->GetS11SapSgw ());
+  m_sgwPgwApp->SetS11SapMme (m_mme->GetS11SapMme ());
+}
+
+PointToPointEpcHelper::~PointToPointEpcHelper ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+TypeId
+PointToPointEpcHelper::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::PointToPointEpcHelper")
+    .SetParent<EpcHelper> ()
+    .AddConstructor<PointToPointEpcHelper> ()
+    .AddAttribute ("S1uLinkDataRate", 
+                   "The data rate to be used for the next S1-U link to be created",
+                   DataRateValue (DataRate ("10Gb/s")),
+                   MakeDataRateAccessor (&PointToPointEpcHelper::m_s1uLinkDataRate),
+                   MakeDataRateChecker ())
+    .AddAttribute ("S1uLinkDelay", 
+                   "The delay to be used for the next S1-U link to be created",
+                   TimeValue (Seconds (0)),
+                   MakeTimeAccessor (&PointToPointEpcHelper::m_s1uLinkDelay),
+                   MakeTimeChecker ())
+    .AddAttribute ("S1uLinkMtu", 
+                   "The MTU of the next S1-U link to be created. Note that, because of the additional GTP/UDP/IP tunneling overhead, you need a MTU larger than the end-to-end MTU that you want to support.",
+                   UintegerValue (2000),
+                   MakeUintegerAccessor (&PointToPointEpcHelper::m_s1uLinkMtu),
+                   MakeUintegerChecker<uint16_t> ())
+    .AddAttribute ("X2LinkDataRate",
+                   "The data rate to be used for the next X2 link to be created",
+                   DataRateValue (DataRate ("10Gb/s")),
+                   MakeDataRateAccessor (&PointToPointEpcHelper::m_x2LinkDataRate),
+                   MakeDataRateChecker ())
+    .AddAttribute ("X2LinkDelay",
+                   "The delay to be used for the next X2 link to be created",
+                   TimeValue (Seconds (0)),
+                   MakeTimeAccessor (&PointToPointEpcHelper::m_x2LinkDelay),
+                   MakeTimeChecker ())
+    .AddAttribute ("X2LinkMtu",
+                   "The MTU of the next X2 link to be created. Note that, because of some big X2 messages, you need a big MTU.",
+                   UintegerValue (3000),
+                   MakeUintegerAccessor (&PointToPointEpcHelper::m_x2LinkMtu),
+                   MakeUintegerChecker<uint16_t> ())
+  ;
+  return tid;
+}
+
+void
+PointToPointEpcHelper::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  m_tunDevice->SetSendCallback (MakeNullCallback<bool, Ptr<Packet>, const Address&, const Address&, uint16_t> ());
+  m_tunDevice = 0;
+  m_sgwPgwApp = 0;  
+  m_sgwPgw->Dispose ();
+}
+
+
+void
+PointToPointEpcHelper::AddEnb (Ptr<Node> enb, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << enb << lteEnbNetDevice << cellId);
+
+  NS_ASSERT (enb == lteEnbNetDevice->GetNode ());
+
+  // add an IPv4 stack to the previously created eNB
+  InternetStackHelper internet;
+  internet.Install (enb);
+  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after node creation: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());
+
+  // create a point to point link between the new eNB and the SGW with
+  // the corresponding new NetDevices on each side  
+  NodeContainer enbSgwNodes;
+  enbSgwNodes.Add (m_sgwPgw);
+  enbSgwNodes.Add (enb);
+  PointToPointHelper p2ph;
+  p2ph.SetDeviceAttribute ("DataRate", DataRateValue (m_s1uLinkDataRate));
+  p2ph.SetDeviceAttribute ("Mtu", UintegerValue (m_s1uLinkMtu));
+  p2ph.SetChannelAttribute ("Delay", TimeValue (m_s1uLinkDelay));  
+  NetDeviceContainer enbSgwDevices = p2ph.Install (enb, m_sgwPgw);
+  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after installing p2p dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());  
+  Ptr<NetDevice> enbDev = enbSgwDevices.Get (0);
+  Ptr<NetDevice> sgwDev = enbSgwDevices.Get (1);
+  m_s1uIpv4AddressHelper.NewNetwork ();
+  Ipv4InterfaceContainer enbSgwIpIfaces = m_s1uIpv4AddressHelper.Assign (enbSgwDevices);
+  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after assigning Ipv4 addr to S1 dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());
+  
+  Ipv4Address enbAddress = enbSgwIpIfaces.GetAddress (0);
+  Ipv4Address sgwAddress = enbSgwIpIfaces.GetAddress (1);
+
+  // create S1-U socket for the ENB
+  Ptr<Socket> enbS1uSocket = Socket::CreateSocket (enb, TypeId::LookupByName ("ns3::UdpSocketFactory"));
+  int retval = enbS1uSocket->Bind (InetSocketAddress (enbAddress, m_gtpuUdpPort));
+  NS_ASSERT (retval == 0);
+  
+
+  // give PacketSocket powers to the eNB
+  //PacketSocketHelper packetSocket;
+  //packetSocket.Install (enb); 
+  
+  // create LTE socket for the ENB 
+  Ptr<Socket> enbLteSocket = Socket::CreateSocket (enb, TypeId::LookupByName ("ns3::PacketSocketFactory"));
+  PacketSocketAddress enbLteSocketBindAddress;
+  enbLteSocketBindAddress.SetSingleDevice (lteEnbNetDevice->GetIfIndex ());
+  enbLteSocketBindAddress.SetProtocol (Ipv4L3Protocol::PROT_NUMBER);
+  retval = enbLteSocket->Bind (enbLteSocketBindAddress);
+  NS_ASSERT (retval == 0);  
+  PacketSocketAddress enbLteSocketConnectAddress;
+  enbLteSocketConnectAddress.SetPhysicalAddress (Mac48Address::GetBroadcast ());
+  enbLteSocketConnectAddress.SetSingleDevice (lteEnbNetDevice->GetIfIndex ());
+  enbLteSocketConnectAddress.SetProtocol (Ipv4L3Protocol::PROT_NUMBER);
+  retval = enbLteSocket->Connect (enbLteSocketConnectAddress);
+  NS_ASSERT (retval == 0);  
+  
+
+  NS_LOG_INFO ("create EpcEnbApplication");
+  Ptr<EpcEnbApplication> enbApp = CreateObject<EpcEnbApplication> (enbLteSocket, enbS1uSocket, enbAddress, sgwAddress, cellId);
+  enb->AddApplication (enbApp);
+  NS_ASSERT (enb->GetNApplications () == 1);
+  NS_ASSERT_MSG (enb->GetApplication (0)->GetObject<EpcEnbApplication> () != 0, "cannot retrieve EpcEnbApplication");
+  NS_LOG_LOGIC ("enb: " << enb << ", enb->GetApplication (0): " << enb->GetApplication (0));
+
+  
+  NS_LOG_INFO ("Create EpcX2 entity");
+  Ptr<EpcX2> x2 = CreateObject<EpcX2> ();
+  enb->AggregateObject (x2);
+
+  NS_LOG_INFO ("connect S1-AP interface");
+  m_mme->AddEnb (cellId, enbAddress, enbApp->GetS1apSapEnb ());
+  m_sgwPgwApp->AddEnb (cellId, enbAddress, sgwAddress);
+  enbApp->SetS1apSapMme (m_mme->GetS1apSapMme ());
+}
+
+
+void
+PointToPointEpcHelper::AddX2Interface (Ptr<Node> enb1, Ptr<Node> enb2)
+{
+  NS_LOG_FUNCTION (this << enb1 << enb2);
+
+  // Create a point to point link between the two eNBs with
+  // the corresponding new NetDevices on each side
+  NodeContainer enbNodes;
+  enbNodes.Add (enb1);
+  enbNodes.Add (enb2);
+  PointToPointHelper p2ph;
+  p2ph.SetDeviceAttribute ("DataRate", DataRateValue (m_x2LinkDataRate));
+  p2ph.SetDeviceAttribute ("Mtu", UintegerValue (m_x2LinkMtu));
+  p2ph.SetChannelAttribute ("Delay", TimeValue (m_x2LinkDelay));
+  NetDeviceContainer enbDevices = p2ph.Install (enb1, enb2);
+  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #1 after installing p2p dev: " << enb1->GetObject<Ipv4> ()->GetNInterfaces ());
+  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #2 after installing p2p dev: " << enb2->GetObject<Ipv4> ()->GetNInterfaces ());
+  Ptr<NetDevice> enb1Dev = enbDevices.Get (0);
+  Ptr<NetDevice> enb2Dev = enbDevices.Get (1);
+
+  m_x2Ipv4AddressHelper.NewNetwork ();
+  Ipv4InterfaceContainer enbIpIfaces = m_x2Ipv4AddressHelper.Assign (enbDevices);
+  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #1 after assigning Ipv4 addr to X2 dev: " << enb1->GetObject<Ipv4> ()->GetNInterfaces ());
+  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #2 after assigning Ipv4 addr to X2 dev: " << enb2->GetObject<Ipv4> ()->GetNInterfaces ());
+
+  Ipv4Address enb1X2Address = enbIpIfaces.GetAddress (0);
+  Ipv4Address enb2X2Address = enbIpIfaces.GetAddress (1);
+
+  // Add X2 interface to both eNBs' X2 entities
+  Ptr<EpcX2> enb1X2 = enb1->GetObject<EpcX2> ();
+  Ptr<LteEnbNetDevice> enb1LteDev = enb1->GetDevice (0)->GetObject<LteEnbNetDevice> ();
+  uint16_t enb1CellId = enb1LteDev->GetCellId ();
+  NS_LOG_LOGIC ("LteEnbNetDevice #1 = " << enb1LteDev << " - CellId = " << enb1CellId);
+
+  Ptr<EpcX2> enb2X2 = enb2->GetObject<EpcX2> ();
+  Ptr<LteEnbNetDevice> enb2LteDev = enb2->GetDevice (0)->GetObject<LteEnbNetDevice> ();
+  uint16_t enb2CellId = enb2LteDev->GetCellId ();
+  NS_LOG_LOGIC ("LteEnbNetDevice #2 = " << enb2LteDev << " - CellId = " << enb2CellId);
+
+  enb1X2->AddX2Interface (enb1CellId, enb1X2Address, enb2CellId, enb2X2Address);
+  enb2X2->AddX2Interface (enb2CellId, enb2X2Address, enb1CellId, enb1X2Address);
+
+  enb1LteDev->GetRrc ()->AddX2Neighbour (enb2LteDev->GetCellId ());
+  enb2LteDev->GetRrc ()->AddX2Neighbour (enb1LteDev->GetCellId ());
+}
+
+
+void 
+PointToPointEpcHelper::AddUe (Ptr<NetDevice> ueDevice, uint64_t imsi)
+{
+  NS_LOG_FUNCTION (this << imsi << ueDevice );
+  
+  m_mme->AddUe (imsi);
+  m_sgwPgwApp->AddUe (imsi);
+  
+
+}
+
+void
+PointToPointEpcHelper::ActivateEpsBearer (Ptr<NetDevice> ueDevice, uint64_t imsi, Ptr<EpcTft> tft, EpsBearer bearer)
+{
+  NS_LOG_FUNCTION (this << ueDevice << imsi);
+
+  // we now retrieve the IPv4 address of the UE and notify it to the SGW;
+  // we couldn't do it before since address assignment is triggered by
+  // the user simulation program, rather than done by the EPC   
+  Ptr<Node> ueNode = ueDevice->GetNode (); 
+  Ptr<Ipv4> ueIpv4 = ueNode->GetObject<Ipv4> ();
+  NS_ASSERT_MSG (ueIpv4 != 0, "UEs need to have IPv4 installed before EPS bearers can be activated");
+  int32_t interface =  ueIpv4->GetInterfaceForDevice (ueDevice);
+  NS_ASSERT (interface >= 0);
+  NS_ASSERT (ueIpv4->GetNAddresses (interface) == 1);
+  Ipv4Address ueAddr = ueIpv4->GetAddress (interface, 0).GetLocal ();
+  NS_LOG_LOGIC (" UE IP address: " << ueAddr);  m_sgwPgwApp->SetUeAddress (imsi, ueAddr);
+  
+  m_mme->AddBearer (imsi, tft, bearer);
+  Ptr<LteUeNetDevice> ueLteDevice = ueDevice->GetObject<LteUeNetDevice> ();
+  if (ueLteDevice)
+    {
+      ueLteDevice->GetNas ()->ActivateEpsBearer (bearer, tft);
+    }
+}
+
+
+Ptr<Node>
+PointToPointEpcHelper::GetPgwNode ()
+{
+  return m_sgwPgw;
+}
+
+
+Ipv4InterfaceContainer 
+PointToPointEpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices)
+{
+  return m_ueAddressHelper.Assign (ueDevices);
+}
+
+
+
+Ipv4Address
+PointToPointEpcHelper::GetUeDefaultGatewayAddress ()
+{
+  // return the address of the tun device
+  return m_sgwPgw->GetObject<Ipv4> ()->GetAddress (1, 0).GetLocal ();
+}
+
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/lte/helper/point-to-point-epc-helper.h ns-3.19/src/lte/helper/point-to-point-epc-helper.h
--- ns-3.18.1/src/lte/helper/point-to-point-epc-helper.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/helper/point-to-point-epc-helper.h	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,135 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011-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: Jaume Nin <jnin@cttc.es>
+ *         Nicola Baldo <nbaldo@cttc.es>
+ *         Manuel Requena <manuel.requena@cttc.es>
+ */
+
+#ifndef POINT_TO_POINT_EPC_HELPER_H
+#define POINT_TO_POINT_EPC_HELPER_H
+
+#include <ns3/object.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/data-rate.h>
+#include <ns3/epc-tft.h>
+#include <ns3/eps-bearer.h>
+#include <ns3/epc-helper.h>
+
+namespace ns3 {
+
+class Node;
+class NetDevice;
+class VirtualNetDevice;
+class EpcSgwPgwApplication;
+class EpcX2;
+class EpcMme;
+
+/**
+ * \brief Create an EPC network with PointToPoint links
+ *
+ * This Helper will create an EPC network topology comprising of a
+ * single node that implements both the SGW and PGW functionality, and
+ * an MME node. The S1-U, X2-U and X2-C interfaces are realized over
+ * PointToPoint links. 
+ */
+class PointToPointEpcHelper : public EpcHelper
+{
+public:
+  
+  /** 
+   * Constructor
+   */
+  PointToPointEpcHelper ();
+
+  /** 
+   * Destructor
+   */  
+  virtual ~PointToPointEpcHelper ();
+  
+  // inherited from Object
+  static TypeId GetTypeId (void);
+  virtual void DoDispose ();
+
+  // inherited from EpcHelper
+  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);
+  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);
+  virtual void AddX2Interface (Ptr<Node> enbNode1, Ptr<Node> enbNode2);
+  virtual void ActivateEpsBearer (Ptr<NetDevice> ueLteDevice, uint64_t imsi, Ptr<EpcTft> tft, EpsBearer bearer);
+  virtual Ptr<Node> GetPgwNode ();
+  virtual Ipv4InterfaceContainer AssignUeIpv4Address (NetDeviceContainer ueDevices);
+  virtual Ipv4Address GetUeDefaultGatewayAddress ();
+
+
+
+private:
+
+  /**
+   * SGW-PGW network element
+   */
+
+  /** 
+   * helper to assign addresses to UE devices as well as to the TUN device of the SGW/PGW
+   */
+  Ipv4AddressHelper m_ueAddressHelper; 
+  
+  Ptr<Node> m_sgwPgw; 
+  Ptr<EpcSgwPgwApplication> m_sgwPgwApp;
+  Ptr<VirtualNetDevice> m_tunDevice;
+  Ptr<EpcMme> m_mme;
+
+  /**
+   * S1-U interfaces
+   */
+
+  /** 
+   * helper to assign addresses to S1-U NetDevices 
+   */
+  Ipv4AddressHelper m_s1uIpv4AddressHelper; 
+
+  DataRate m_s1uLinkDataRate;
+  Time     m_s1uLinkDelay;
+  uint16_t m_s1uLinkMtu;
+
+  /**
+   * UDP port where the GTP-U Socket is bound, fixed by the standard as 2152
+   */
+  uint16_t m_gtpuUdpPort;
+
+  /**
+   * Map storing for each IMSI the corresponding eNB NetDevice
+   * 
+   */
+  std::map<uint64_t, Ptr<NetDevice> > m_imsiEnbDeviceMap;
+  
+  /** 
+   * helper to assign addresses to X2 NetDevices 
+   */
+  Ipv4AddressHelper m_x2Ipv4AddressHelper;   
+
+  DataRate m_x2LinkDataRate;
+  Time     m_x2LinkDelay;
+  uint16_t m_x2LinkMtu;
+
+};
+
+
+
+
+} // namespace ns3
+
+#endif // POINT_TO_POINT_EPC_HELPER_H
diff -Naur ns-3.18.1/src/lte/helper/radio-bearer-stats-calculator.cc ns-3.19/src/lte/helper/radio-bearer-stats-calculator.cc
--- ns-3.18.1/src/lte/helper/radio-bearer-stats-calculator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/radio-bearer-stats-calculator.cc	2013-12-20 09:44:51.000000000 -0800
@@ -29,9 +29,11 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator);
+NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator)
+  ;
 
 RadioBearerStatsCalculator::RadioBearerStatsCalculator ()
   : m_firstWrite (true),
diff -Naur ns-3.18.1/src/lte/helper/radio-bearer-stats-calculator.h ns-3.19/src/lte/helper/radio-bearer-stats-calculator.h
--- ns-3.18.1/src/lte/helper/radio-bearer-stats-calculator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/radio-bearer-stats-calculator.h	2013-12-20 09:44:51.000000000 -0800
@@ -79,31 +79,32 @@
   virtual
   ~RadioBearerStatsCalculator ();
 
-  /**
-   * Inherited from ns3::Object
-   */
+  // Inherited from ns3::Object
   static TypeId GetTypeId (void);
   void DoDispose ();
 
   /**
    * Get the name of the file where the uplink statistics will be stored.
+   * @return the name of the file where the uplink statistics will be stored
    */
   std::string GetUlOutputFilename (void);
 
   /**
    * Get the name of the file where the downlink statistics will be stored.
+   * @return the name of the file where the downlink statistics will be stored
    */
   std::string GetDlOutputFilename (void);
 
   /**
    * Set the name of the file where the uplink PDCP statistics will be stored.
    *
-   * \param outputFilename string with the name of the file
+   * @param outputFilename string with the name of the file
    */
   void SetUlPdcpOutputFilename (std::string outputFilename);
 
   /**
    * Get the name of the file where the uplink PDCP statistics will be stored.
+   * @return the name of the file where the uplink PDCP statistics will be stored
    */
   std::string GetUlPdcpOutputFilename (void);
 
@@ -116,6 +117,7 @@
 
   /**
    * Get the name of the file where the downlink PDCP statistics will be stored.
+   * @return the name of the file where the downlink PDCP statistics will be stored
    */
   std::string GetDlPdcpOutputFilename (void);
 
diff -Naur ns-3.18.1/src/lte/helper/radio-environment-map-helper.cc ns-3.19/src/lte/helper/radio-environment-map-helper.cc
--- ns-3.18.1/src/lte/helper/radio-environment-map-helper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/helper/radio-environment-map-helper.cc	2013-12-20 09:44:51.000000000 -0800
@@ -46,7 +46,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (RadioEnvironmentMapHelper);
+NS_OBJECT_ENSURE_REGISTERED (RadioEnvironmentMapHelper)
+  ;
 
 RadioEnvironmentMapHelper::RadioEnvironmentMapHelper ()
 {
diff -Naur ns-3.18.1/src/lte/model/a2-a4-rsrq-handover-algorithm.cc ns-3.19/src/lte/model/a2-a4-rsrq-handover-algorithm.cc
--- ns-3.18.1/src/lte/model/a2-a4-rsrq-handover-algorithm.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/a2-a4-rsrq-handover-algorithm.cc	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,289 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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
+ *
+ * Original work authors (from lte-enb-rrc.cc):
+ * - Nicola Baldo <nbaldo@cttc.es>
+ * - Marco Miozzo <mmiozzo@cttc.es>
+ * - Manuel Requena <manuel.requena@cttc.es>
+ *
+ * Converted to handover algorithm interface by:
+ * - Budiarto Herman <budiarto.herman@magister.fi>
+ */
+
+#include "a2-a4-rsrq-handover-algorithm.h"
+#include <ns3/log.h>
+#include <ns3/uinteger.h>
+
+NS_LOG_COMPONENT_DEFINE ("A2A4RsrqHandoverAlgorithm");
+
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (A2A4RsrqHandoverAlgorithm)
+  ;
+
+
+///////////////////////////////////////////
+// Handover Management SAP forwarder
+///////////////////////////////////////////
+
+
+A2A4RsrqHandoverAlgorithm::A2A4RsrqHandoverAlgorithm ()
+  : m_a2MeasId (0),
+    m_a4MeasId (0),
+    m_servingCellThreshold (30),
+    m_neighbourCellOffset (1),
+    m_handoverManagementSapUser (0)
+{
+  NS_LOG_FUNCTION (this);
+  m_handoverManagementSapProvider = new MemberLteHandoverManagementSapProvider<A2A4RsrqHandoverAlgorithm> (this);
+}
+
+
+A2A4RsrqHandoverAlgorithm::~A2A4RsrqHandoverAlgorithm ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+
+TypeId
+A2A4RsrqHandoverAlgorithm::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::A2A4RsrqHandoverAlgorithm")
+    .SetParent<LteHandoverAlgorithm> ()
+    .AddConstructor<A2A4RsrqHandoverAlgorithm> ()
+    .AddAttribute ("ServingCellThreshold",
+                   "If the RSRQ of the serving cell is worse than this threshold, "
+                   "neighbour cells are consider for handover",
+                   UintegerValue (30),
+                   MakeUintegerAccessor (&A2A4RsrqHandoverAlgorithm::m_servingCellThreshold),
+                   MakeUintegerChecker<uint8_t> (0, 34)) // RSRQ range is [0..34] as per Section 9.1.7 of 3GPP TS 36.133
+    .AddAttribute ("NeighbourCellOffset",
+                   "Minimum offset between serving and best neighbour cell to trigger the Handover",
+                   UintegerValue (1),
+                   MakeUintegerAccessor (&A2A4RsrqHandoverAlgorithm::m_neighbourCellOffset),
+                   MakeUintegerChecker<uint8_t> ())
+  ;
+  return tid;
+}
+
+
+void
+A2A4RsrqHandoverAlgorithm::SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s)
+{
+  NS_LOG_FUNCTION (this << s);
+  m_handoverManagementSapUser = s;
+}
+
+
+LteHandoverManagementSapProvider*
+A2A4RsrqHandoverAlgorithm::GetLteHandoverManagementSapProvider ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_handoverManagementSapProvider;
+}
+
+
+void
+A2A4RsrqHandoverAlgorithm::DoInitialize ()
+{
+  NS_LOG_FUNCTION (this);
+
+  NS_LOG_LOGIC (this << " requesting Event A2 measurements"
+                     << " (threshold=" << (uint16_t) m_servingCellThreshold << ")");
+  LteRrcSap::ReportConfigEutra reportConfigA2;
+  reportConfigA2.eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  reportConfigA2.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ;
+  reportConfigA2.threshold1.range = m_servingCellThreshold;
+  reportConfigA2.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRQ;
+  reportConfigA2.reportInterval = LteRrcSap::ReportConfigEutra::MS240;
+  m_a2MeasId = m_handoverManagementSapUser->AddUeMeasReportConfigForHandover (reportConfigA2);
+
+  NS_LOG_LOGIC (this << " requesting Event A4 measurements"
+                     << " (threshold=0)");
+  LteRrcSap::ReportConfigEutra reportConfigA4;
+  reportConfigA4.eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  reportConfigA4.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ;
+  reportConfigA4.threshold1.range = 0; // intentionally very low threshold
+  reportConfigA4.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRQ;
+  reportConfigA4.reportInterval = LteRrcSap::ReportConfigEutra::MS480;
+  m_a4MeasId = m_handoverManagementSapUser->AddUeMeasReportConfigForHandover (reportConfigA4);
+
+  LteHandoverAlgorithm::DoInitialize ();
+}
+
+
+void
+A2A4RsrqHandoverAlgorithm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  delete m_handoverManagementSapProvider;
+}
+
+
+void
+A2A4RsrqHandoverAlgorithm::DoReportUeMeas (uint16_t rnti,
+                                           LteRrcSap::MeasResults measResults)
+{
+  NS_LOG_FUNCTION (this << rnti << (uint16_t) measResults.measId);
+
+  if (measResults.measId == m_a2MeasId)
+    {
+      NS_ASSERT_MSG (measResults.rsrqResult <= m_servingCellThreshold,
+                     "Invalid UE measurement report");
+      EvaluateHandover (rnti, measResults.rsrqResult);
+    }
+  else if (measResults.measId == m_a4MeasId)
+    {
+      if (measResults.haveMeasResultNeighCells
+          && !measResults.measResultListEutra.empty ())
+        {
+          for (std::list <LteRrcSap::MeasResultEutra>::iterator it = measResults.measResultListEutra.begin ();
+               it != measResults.measResultListEutra.end ();
+               ++it)
+            {
+              NS_ASSERT_MSG (it->haveRsrqResult == true,
+                             "RSRQ measurement is missing from cellId " << it->physCellId);
+              UpdateNeighbourMeasurements (rnti, it->physCellId, it->rsrqResult);
+            }
+        }
+      else
+        {
+          NS_LOG_WARN (this << " Event A4 received without measurement results from neighbouring cells");
+        }
+    }
+  else
+    {
+      NS_LOG_WARN ("Ignoring measId " << (uint16_t) measResults.measId);
+    }
+
+} // end of DoReportUeMeas
+
+
+void
+A2A4RsrqHandoverAlgorithm::EvaluateHandover (uint16_t rnti,
+                                             uint8_t servingCellRsrq)
+{
+  NS_LOG_FUNCTION (this << rnti << (uint16_t) servingCellRsrq);
+
+  MeasurementTable_t::iterator it1;
+  it1 = m_neighbourCellMeasures.find (rnti);
+
+  if (it1 == m_neighbourCellMeasures.end ())
+    {
+      NS_LOG_WARN ("Skipping handover evaluation for RNTI " << rnti << " because neighbour cells information is not found");
+    }
+  else
+    {
+      // Find the best neighbour cell (eNB)
+      NS_LOG_LOGIC ("Number of neighbour cells = " << it1->second.size ());
+      uint16_t bestNeighbourCellId = 0;
+      uint8_t bestNeighbourRsrq = 0;
+      MeasurementRow_t::iterator it2;
+      for (it2 = it1->second.begin (); it2 != it1->second.end (); ++it2)
+        {
+          if ((it2->second->m_rsrq > bestNeighbourRsrq)
+              && IsValidNeighbour (it2->first))
+            {
+              bestNeighbourCellId = it2->first;
+              bestNeighbourRsrq = it2->second->m_rsrq;
+            }
+        }
+
+      // Trigger Handover, if needed
+      if (bestNeighbourCellId > 0)
+        {
+          NS_LOG_LOGIC ("Best neighbour cellId " << bestNeighbourCellId);
+
+          if ((bestNeighbourRsrq - servingCellRsrq) >= m_neighbourCellOffset)
+            {
+              NS_LOG_LOGIC ("Trigger Handover to cellId " << bestNeighbourCellId);
+              NS_LOG_LOGIC ("target cell RSRQ " << (uint16_t) bestNeighbourRsrq);
+              NS_LOG_LOGIC ("serving cell RSRQ " << (uint16_t) servingCellRsrq);
+
+              // Inform eNodeB RRC about handover
+              m_handoverManagementSapUser->TriggerHandover (rnti,
+                                                            bestNeighbourCellId);
+            }
+        }
+
+    } // end of else of if (it1 == m_neighbourCellMeasures.end ())
+
+} // end of EvaluateMeasurementReport
+
+
+bool
+A2A4RsrqHandoverAlgorithm::IsValidNeighbour (uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << cellId);
+
+  /**
+   * \todo In the future, this function can be expanded to validate whether the
+   *       neighbour cell is a valid target cell, e.g., taking into account the
+   *       NRT in ANR and whether it is a CSG cell with closed access.
+   */
+
+  return true;
+}
+
+
+void
+A2A4RsrqHandoverAlgorithm::UpdateNeighbourMeasurements (uint16_t rnti,
+                                                        uint16_t cellId,
+                                                        uint8_t rsrq)
+{
+  NS_LOG_FUNCTION (this << rnti << cellId << (uint16_t) rsrq);
+  MeasurementTable_t::iterator it1;
+  it1 = m_neighbourCellMeasures.find (rnti);
+
+  if (it1 == m_neighbourCellMeasures.end ())
+    {
+      // insert a new UE entry
+      MeasurementRow_t row;
+      std::pair<MeasurementTable_t::iterator, bool> ret;
+      ret = m_neighbourCellMeasures.insert (std::pair<uint16_t, MeasurementRow_t> (rnti, row));
+      NS_ASSERT (ret.second);
+      it1 = ret.first;
+    }
+
+  NS_ASSERT (it1 != m_neighbourCellMeasures.end ());
+  Ptr<UeMeasure> neighbourCellMeasures;
+  std::map<uint16_t, Ptr<UeMeasure> >::iterator it2;
+  it2 = it1->second.find (cellId);
+
+  if (it2 != it1->second.end ())
+    {
+      neighbourCellMeasures = it2->second;
+      neighbourCellMeasures->m_cellId = cellId;
+      neighbourCellMeasures->m_rsrp = 0;
+      neighbourCellMeasures->m_rsrq = rsrq;
+    }
+  else
+    {
+      // insert a new cell entry
+      neighbourCellMeasures = Create<UeMeasure> ();
+      neighbourCellMeasures->m_cellId = cellId;
+      neighbourCellMeasures->m_rsrp = 0;
+      neighbourCellMeasures->m_rsrq = rsrq;
+      it1->second[cellId] = neighbourCellMeasures;
+    }
+
+} // end of UpdateNeighbourMeasurements
+
+
+} // end of namespace ns3
diff -Naur ns-3.18.1/src/lte/model/a2-a4-rsrq-handover-algorithm.h ns-3.19/src/lte/model/a2-a4-rsrq-handover-algorithm.h
--- ns-3.18.1/src/lte/model/a2-a4-rsrq-handover-algorithm.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/a2-a4-rsrq-handover-algorithm.h	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,152 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011, 2012 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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
+ *
+ * Original work authors (from lte-enb-rrc.cc):
+ * - Nicola Baldo <nbaldo@cttc.es>
+ * - Marco Miozzo <mmiozzo@cttc.es>
+ * - Manuel Requena <manuel.requena@cttc.es>
+ *
+ * Converted to handover algorithm interface by:
+ * - Budiarto Herman <budiarto.herman@magister.fi>
+ */
+
+#ifndef A2_A4_RSRQ_HANDOVER_ALGORITHM_H
+#define A2_A4_RSRQ_HANDOVER_ALGORITHM_H
+
+#include <ns3/lte-handover-algorithm.h>
+#include <ns3/lte-handover-management-sap.h>
+#include <ns3/lte-rrc-sap.h>
+#include <ns3/simple-ref-count.h>
+#include <ns3/ptr.h>
+#include <map>
+
+namespace ns3 {
+
+
+/**
+ * \brief Handover algorithm implementation based on RSRQ measurements, Event
+ *        A2 and Event A4.
+ *
+ * Handover decision made by this algorithm is primarily based on Event A2
+ * measurements (serving cell's RSRQ becomes worse than threshold). When the
+ * event is triggered, the first condition of handover is fulfilled.
+ *
+ * Event A4 measurements (neighbour cell's RSRQ becomes better than threshold)
+ * are used to detect neighbouring cells and their respective RSRQ. When a
+ * neighbouring cell's RSRQ is higher than the serving cell's RSRQ by a certain
+ * offset, then the second condition of handover is fulfilled.
+ *
+ * When the first and second conditions above are fulfilled, the algorithm
+ * informs the eNodeB RRC to trigger a handover.
+ *
+ * The threshold for Event A2 can be configured in the `ServingCellThreshold`
+ * attribute. The offset used in the second condition can also be configured by
+ * setting the `NeighbourCellOffset` attribute.
+ *
+ * The following code snippet is an example of using and configuring the
+ * handover algorithm in a simulation program:
+ *
+ *     Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+ *
+ *     NodeContainer enbNodes;
+ *     // configure the nodes here...
+ *
+ *     lteHelper->SetHandoverAlgorithmType ("ns3::A2A4RsrqHandoverAlgorithm");
+ *     lteHelper->SetHandoverAlgorithmAttribute ("ServingCellThreshold",
+ *                                               UintegerValue (30));
+ *     lteHelper->SetHandoverAlgorithmAttribute ("NeighbourCellOffset",
+ *                                               UintegerValue (1));
+ *     NetDeviceContainer enbLteDevs = lteHelper->InstallEnbDevice (enbNodes);
+ *
+ * \note Setting the handover algorithm type and attributes after the call to
+ *       LteHelper::InstallEnbDevice does not have any effect to the devices
+ *       that have already been installed.
+ */
+class A2A4RsrqHandoverAlgorithm : public LteHandoverAlgorithm
+{
+public:
+  /**
+   * \brief Creates an A2-A4-RSRQ handover algorithm instance.
+   */
+  A2A4RsrqHandoverAlgorithm ();
+
+  virtual ~A2A4RsrqHandoverAlgorithm ();
+
+  // inherited from Object
+  static TypeId GetTypeId ();
+
+  // inherited from LteHandoverAlgorithm
+  virtual void SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s);
+  virtual LteHandoverManagementSapProvider* GetLteHandoverManagementSapProvider ();
+
+  // let the forwarder class access the protected and private members
+  friend class MemberLteHandoverManagementSapProvider<A2A4RsrqHandoverAlgorithm>;
+
+protected:
+  // inherited from Object
+  virtual void DoInitialize ();
+  virtual void DoDispose ();
+
+  // inherited from LteHandoverAlgorithm as a Handover Management SAP implementation
+  void DoReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults);
+
+private:
+  // Internal methods
+  void EvaluateHandover (uint16_t rnti, uint8_t servingCellRsrq);
+  bool IsValidNeighbour (uint16_t cellId);
+  void UpdateNeighbourMeasurements (uint16_t rnti, uint16_t cellId,
+                                    uint8_t rsrq);
+
+  // The expected measurement identities
+  uint8_t m_a2MeasId;
+  uint8_t m_a4MeasId;
+
+  /**
+   * \brief Measurements reported by a UE for a cell ID.
+   *
+   * The values are quantized according 3GPP TS 36.133 section 9.1.4 and 9.1.7.
+   */
+  class UeMeasure : public SimpleRefCount<UeMeasure>
+  {
+  public:
+    uint16_t m_cellId;
+    uint8_t m_rsrp;
+    uint8_t m_rsrq;
+  };
+
+  //               cellId
+  typedef std::map<uint16_t, Ptr<UeMeasure> > MeasurementRow_t;
+  //               rnti
+  typedef std::map<uint16_t, MeasurementRow_t> MeasurementTable_t;
+  MeasurementTable_t m_neighbourCellMeasures;
+
+  // Class attributes
+  uint8_t m_servingCellThreshold;
+  uint8_t m_neighbourCellOffset;
+
+  // Handover Management SAPs
+  LteHandoverManagementSapUser* m_handoverManagementSapUser;
+  LteHandoverManagementSapProvider* m_handoverManagementSapProvider;
+
+}; // end of class A2A4RsrqHandoverAlgorithm
+
+
+} // end of namespace ns3
+
+
+#endif /* A2_A4_RSRQ_HANDOVER_ALGORITHM_H */
diff -Naur ns-3.18.1/src/lte/model/a3-rsrp-handover-algorithm.cc ns-3.19/src/lte/model/a3-rsrp-handover-algorithm.cc
--- ns-3.18.1/src/lte/model/a3-rsrp-handover-algorithm.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/a3-rsrp-handover-algorithm.cc	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,194 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#include "a3-rsrp-handover-algorithm.h"
+#include <ns3/log.h>
+#include <ns3/double.h>
+#include <ns3/lte-common.h>
+#include <list>
+
+NS_LOG_COMPONENT_DEFINE ("A3RsrpHandoverAlgorithm");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (A3RsrpHandoverAlgorithm)
+  ;
+
+
+A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm ()
+  : m_handoverManagementSapUser (0)
+{
+  NS_LOG_FUNCTION (this);
+  m_handoverManagementSapProvider = new MemberLteHandoverManagementSapProvider<A3RsrpHandoverAlgorithm> (this);
+}
+
+
+A3RsrpHandoverAlgorithm::~A3RsrpHandoverAlgorithm ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+
+TypeId
+A3RsrpHandoverAlgorithm::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::A3RsrpHandoverAlgorithm")
+    .SetParent<LteHandoverAlgorithm> ()
+    .AddConstructor<A3RsrpHandoverAlgorithm> ()
+    .AddAttribute ("Hysteresis",
+                   "Handover margin (hysteresis) in dB "
+                   "(rounded to the nearest multiple of 0.5 dB)",
+                   DoubleValue (3.0),
+                   MakeDoubleAccessor (&A3RsrpHandoverAlgorithm::m_hysteresisDb),
+                   MakeDoubleChecker<uint8_t> (0.0, 15.0)) // Hysteresis IE value range is [0..30] as per Section 6.3.5 of 3GPP TS 36.331
+    .AddAttribute ("TimeToTrigger",
+                   "Time during which neighbour cell's RSRP "
+                   "must continuously higher than serving cell's RSRP "
+                   "in order to trigger a handover",
+                   TimeValue (MilliSeconds (256)), // 3GPP time-to-trigger median value as per Section 6.3.5 of 3GPP TS 36.331
+                   MakeTimeAccessor (&A3RsrpHandoverAlgorithm::m_timeToTrigger),
+                   MakeTimeChecker ())
+  ;
+  return tid;
+}
+
+
+void
+A3RsrpHandoverAlgorithm::SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s)
+{
+  NS_LOG_FUNCTION (this << s);
+  m_handoverManagementSapUser = s;
+}
+
+
+LteHandoverManagementSapProvider*
+A3RsrpHandoverAlgorithm::GetLteHandoverManagementSapProvider ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_handoverManagementSapProvider;
+}
+
+
+void
+A3RsrpHandoverAlgorithm::DoInitialize ()
+{
+  NS_LOG_FUNCTION (this);
+
+  uint8_t hysteresisIeValue = EutranMeasurementMapping::ActualHysteresis2IeValue (m_hysteresisDb);
+  NS_LOG_LOGIC (this << " requesting Event A3 measurements"
+                     << " (hysteresis=" << (uint16_t) hysteresisIeValue << ")"
+                     << " (ttt=" << m_timeToTrigger.GetMilliSeconds () << ")");
+
+  LteRrcSap::ReportConfigEutra reportConfig;
+  reportConfig.eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  reportConfig.a3Offset = 0;
+  reportConfig.hysteresis = hysteresisIeValue;
+  reportConfig.timeToTrigger = m_timeToTrigger.GetMilliSeconds ();
+  reportConfig.reportOnLeave = false;
+  reportConfig.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRP;
+  reportConfig.reportInterval = LteRrcSap::ReportConfigEutra::MS1024;
+  m_measId = m_handoverManagementSapUser->AddUeMeasReportConfigForHandover (reportConfig);
+
+  LteHandoverAlgorithm::DoInitialize ();
+}
+
+
+void
+A3RsrpHandoverAlgorithm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  delete m_handoverManagementSapProvider;
+}
+
+
+void
+A3RsrpHandoverAlgorithm::DoReportUeMeas (uint16_t rnti,
+                                         LteRrcSap::MeasResults measResults)
+{
+  NS_LOG_FUNCTION (this << rnti << (uint16_t) measResults.measId);
+
+  if (measResults.measId != m_measId)
+    {
+      NS_LOG_WARN ("Ignoring measId " << (uint16_t) measResults.measId);
+    }
+  else
+    {
+      if (measResults.haveMeasResultNeighCells
+          && !measResults.measResultListEutra.empty ())
+        {
+          uint16_t bestNeighbourCellId = 0;
+          uint8_t bestNeighbourRsrp = -std::numeric_limits<double>::infinity ();
+
+          for (std::list <LteRrcSap::MeasResultEutra>::iterator it = measResults.measResultListEutra.begin ();
+               it != measResults.measResultListEutra.end ();
+               ++it)
+            {
+              if (it->haveRsrpResult)
+                {
+                  if ((bestNeighbourRsrp < it->rsrpResult)
+                      && IsValidNeighbour (it->physCellId))
+                    {
+                      bestNeighbourCellId = it->physCellId;
+                      bestNeighbourRsrp = it->rsrpResult;
+                    }
+                }
+              else
+                {
+                  NS_LOG_WARN ("RSRP measurement is missing from cell ID " << it->physCellId);
+                }
+            }
+
+          if (bestNeighbourCellId > 0)
+            {
+              NS_LOG_LOGIC ("Trigger Handover to cellId " << bestNeighbourCellId);
+              NS_LOG_LOGIC ("target cell RSRP " << (uint16_t) bestNeighbourRsrp);
+              NS_LOG_LOGIC ("serving cell RSRP " << (uint16_t) measResults.rsrpResult);
+
+              // Inform eNodeB RRC about handover
+              m_handoverManagementSapUser->TriggerHandover (rnti,
+                                                            bestNeighbourCellId);
+            }
+        }
+      else
+        {
+          NS_LOG_WARN (this << " Event A3 received without measurement results from neighbouring cells");
+        }
+    } // end of else of if (measResults.measId != m_measId)
+
+} // end of DoReportUeMeas
+
+
+bool
+A3RsrpHandoverAlgorithm::IsValidNeighbour (uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << cellId);
+
+  /**
+   * \todo In the future, this function can be expanded to validate whether the
+   *       neighbour cell is a valid target cell, e.g., taking into account the
+   *       NRT in ANR and whether it is a CSG cell with closed access.
+   */
+
+  return true;
+}
+
+
+} // end of namespace ns3
diff -Naur ns-3.18.1/src/lte/model/a3-rsrp-handover-algorithm.h ns-3.19/src/lte/model/a3-rsrp-handover-algorithm.h
--- ns-3.18.1/src/lte/model/a3-rsrp-handover-algorithm.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/a3-rsrp-handover-algorithm.h	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,114 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#ifndef A3_RSRP_HANDOVER_ALGORITHM_H
+#define A3_RSRP_HANDOVER_ALGORITHM_H
+
+#include <ns3/lte-handover-algorithm.h>
+#include <ns3/lte-handover-management-sap.h>
+#include <ns3/lte-rrc-sap.h>
+#include <ns3/nstime.h>
+
+namespace ns3 {
+
+
+/**
+ * \brief Implementation of the strongest cell handover algorithm, based on RSRP
+ *        measurements and Event A3.
+ *
+ * The algorithm utilizes Event A3 (Section 5.5.4.4 of 3GPP TS 36.331) UE
+ * measurements and the Reference Signal Reference Power (RSRP). It is defined
+ * as the event when the UE perceives that a neighbour cell's RSRP is better
+ * than the serving cell's RSRP.
+ *
+ * Handover margin (a.k.a. hysteresis) and time-to-trigger (TTT) can be
+ * configured to delay the event triggering. The values of these parameters
+ * apply to all attached UEs.
+ *
+ * The following code snippet is an example of using and configuring the
+ * handover algorithm in a simulation program:
+ *
+ *     Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+ *
+ *     NodeContainer enbNodes;
+ *     // configure the nodes here...
+ *
+ *     lteHelper->SetHandoverAlgorithmType ("ns3::A3RsrpHandoverAlgorithm");
+ *     lteHelper->SetHandoverAlgorithmAttribute ("Hysteresis",
+ *                                               DoubleValue (3.0));
+ *     lteHelper->SetHandoverAlgorithmAttribute ("TimeToTrigger",
+ *                                               TimeValue (MilliSeconds (256)));
+ *     NetDeviceContainer enbLteDevs = lteHelper->InstallEnbDevice (enbNodes);
+ *
+ * \note Setting the handover algorithm type and attributes after the call to
+ *       LteHelper::InstallEnbDevice does not have any effect to the devices
+ *       that have already been installed.
+ */
+class A3RsrpHandoverAlgorithm : public LteHandoverAlgorithm
+{
+public:
+  /**
+   * \brief Creates a strongest cell handover algorithm instance.
+   */
+  A3RsrpHandoverAlgorithm ();
+
+  virtual ~A3RsrpHandoverAlgorithm ();
+
+  // inherited from Object
+  static TypeId GetTypeId ();
+
+  // inherited from LteHandoverAlgorithm
+  virtual void SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s);
+  virtual LteHandoverManagementSapProvider* GetLteHandoverManagementSapProvider ();
+
+  // let the forwarder class access the protected and private members
+  friend class MemberLteHandoverManagementSapProvider<A3RsrpHandoverAlgorithm>;
+
+protected:
+  // inherited from Object
+  virtual void DoInitialize ();
+  virtual void DoDispose ();
+
+  // inherited from LteHandoverAlgorithm as a Handover Management SAP implementation
+  void DoReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults);
+
+private:
+  // Internal method
+  bool IsValidNeighbour (uint16_t cellId);
+
+  // The expected measurement identity
+  uint8_t m_measId;
+
+  // Class attributes
+  double m_hysteresisDb;
+  Time m_timeToTrigger;
+
+  // Handover Management SAPs
+  LteHandoverManagementSapUser* m_handoverManagementSapUser;
+  LteHandoverManagementSapProvider* m_handoverManagementSapProvider;
+
+}; // end of class A3RsrpHandoverAlgorithm
+
+
+} // end of namespace ns3
+
+
+#endif /* A3_RSRP_HANDOVER_ALGORITHM_H */
diff -Naur ns-3.18.1/src/lte/model/epc-enb-application.cc ns-3.19/src/lte/model/epc-enb-application.cc
--- ns-3.18.1/src/lte/model/epc-enb-application.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-enb-application.cc	2013-12-20 09:44:51.000000000 -0800
@@ -33,7 +33,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication");
+NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication")
+  ;
 
 
 EpcEnbApplication::EpsFlowId_t::EpsFlowId_t ()
diff -Naur ns-3.18.1/src/lte/model/epc-gtpu-header.cc ns-3.19/src/lte/model/epc-gtpu-header.cc
--- ns-3.18.1/src/lte/model/epc-gtpu-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-gtpu-header.cc	2013-12-20 09:44:51.000000000 -0800
@@ -30,7 +30,8 @@
  *        GTP-U-v1 Header
  ********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (GtpuHeader);
+NS_OBJECT_ENSURE_REGISTERED (GtpuHeader)
+  ;
 
 TypeId
 GtpuHeader::GetTypeId (void)
diff -Naur ns-3.18.1/src/lte/model/epc-mme.cc ns-3.19/src/lte/model/epc-mme.cc
--- ns-3.18.1/src/lte/model/epc-mme.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-mme.cc	2013-12-20 09:44:51.000000000 -0800
@@ -33,7 +33,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (EpcMme);
+NS_OBJECT_ENSURE_REGISTERED (EpcMme)
+  ;
 
 EpcMme::EpcMme ()
   : m_s11SapSgw (0)
diff -Naur ns-3.18.1/src/lte/model/epc-mme.h ns-3.19/src/lte/model/epc-mme.h
--- ns-3.18.1/src/lte/model/epc-mme.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-mme.h	2013-12-20 09:44:51.000000000 -0800
@@ -84,10 +84,10 @@
 
   /** 
    * Add a new ENB to the MME. 
-   * \param imsi the unique identifier of the UE
+   * \param ecgi E-UTRAN Cell Global ID, the unique identifier of the eNodeB
    * \param enbS1apSap the ENB side of the S1-AP SAP 
    */
-  void AddEnb (uint16_t egci, Ipv4Address enbS1UAddr, EpcS1apSapEnb* enbS1apSap); 
+  void AddEnb (uint16_t ecgi, Ipv4Address enbS1UAddr, EpcS1apSapEnb* enbS1apSap);
   
   /** 
    * Add a new UE to the MME. This is the equivalent of storing the UE
diff -Naur ns-3.18.1/src/lte/model/epc-s11-sap.h ns-3.19/src/lte/model/epc-s11-sap.h
--- ns-3.18.1/src/lte/model/epc-s11-sap.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-s11-sap.h	2013-12-20 09:44:51.000000000 -0800
@@ -99,7 +99,7 @@
   /** 
    * send a Create Session Response message
    * 
-   * \params msg the message
+   * \param msg the message
    */
   virtual void CreateSessionResponse (CreateSessionResponseMessage msg) = 0;
 
@@ -120,7 +120,7 @@
   /** 
    * send a Modify Bearer Response message
    * 
-   * \params msg the message
+   * \param msg the message
    */
   virtual void ModifyBearerResponse (ModifyBearerResponseMessage msg) = 0;
 
@@ -158,7 +158,7 @@
   /** 
    * send a Create Session Request message
    * 
-   * \params msg the message
+   * \param msg the message
    */
   virtual void CreateSessionRequest (CreateSessionRequestMessage msg) = 0;
 
@@ -174,7 +174,7 @@
   /** 
    * send a Modify Bearer Request message
    * 
-   * \params msg the message
+   * \param msg the message
    */
   virtual void ModifyBearerRequest (ModifyBearerRequestMessage msg) = 0;
 
diff -Naur ns-3.18.1/src/lte/model/epc-s1ap-sap.h ns-3.19/src/lte/model/epc-s1ap-sap.h
--- ns-3.18.1/src/lte/model/epc-s1ap-sap.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-s1ap-sap.h	2013-12-20 09:44:51.000000000 -0800
@@ -53,11 +53,11 @@
    * 
    * \param mmeUeS1Id in practice, we use the IMSI
    * \param enbUeS1Id in practice, we use the RNTI
-   * \param s-tmsi in practice, the imsi
+   * \param stmsi in practice, the imsi
    * \param ecgi in practice, the cell Id
    * 
    */
-  virtual void InitialUeMessage (uint64_t mmeUeS1Id, uint16_t enbUeS1Id, uint64_t imsi, uint16_t ecgi) = 0;
+  virtual void InitialUeMessage (uint64_t mmeUeS1Id, uint16_t enbUeS1Id, uint64_t stmsi, uint16_t ecgi) = 0;
 
 
   /**
@@ -76,10 +76,12 @@
    * 
    * \param mmeUeS1Id in practice, we use the IMSI
    * \param enbUeS1Id in practice, we use the RNTI
-   * \param ecgi in practice, the cell Id
+   * \param erabSetupList
    * 
    */
-  virtual void InitialContextSetupResponse (uint64_t mmeUeS1Id, uint16_t enbUeS1Id, std::list<ErabSetupItem> erabSetupList) = 0;
+  virtual void InitialContextSetupResponse (uint64_t mmeUeS1Id,
+                                            uint16_t enbUeS1Id,
+                                            std::list<ErabSetupItem> erabSetupList) = 0;
 
 
   /**
@@ -126,10 +128,12 @@
    * 
    * \param mmeUeS1Id in practice, we use the IMSI
    * \param enbUeS1Id in practice, we use the RNTI
-   * \param ecgi in practice, the cell Id
+   * \param erabToBeSetupList
    * 
    */
-  virtual void InitialContextSetupRequest (uint64_t mmeUeS1Id, uint16_t enbUeS1Id, std::list<ErabToBeSetupItem> erabToBeSetupList) = 0;
+  virtual void InitialContextSetupRequest (uint64_t mmeUeS1Id,
+                                           uint16_t enbUeS1Id,
+                                           std::list<ErabToBeSetupItem> erabToBeSetupList) = 0;
 
 
   /**
diff -Naur ns-3.18.1/src/lte/model/epc-sgw-pgw-application.cc ns-3.19/src/lte/model/epc-sgw-pgw-application.cc
--- ns-3.18.1/src/lte/model/epc-sgw-pgw-application.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-sgw-pgw-application.cc	2013-12-20 09:44:51.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication");
+NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication")
+  ;
 
 
 /////////////////////////
diff -Naur ns-3.18.1/src/lte/model/epc-sgw-pgw-application.h ns-3.19/src/lte/model/epc-sgw-pgw-application.h
--- ns-3.18.1/src/lte/model/epc-sgw-pgw-application.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-sgw-pgw-application.h	2013-12-20 09:44:51.000000000 -0800
@@ -130,7 +130,8 @@
    * Let the SGW be aware of a new eNB 
    * 
    * \param cellId the cell identifier
-   * \param enbAdd the address of the eNB
+   * \param enbAddr the address of the eNB
+   * \param sgwAddr the address of the SGW
    */
   void AddEnb (uint16_t cellId, Ipv4Address enbAddr, Ipv4Address sgwAddr);
 
diff -Naur ns-3.18.1/src/lte/model/epc-tft.cc ns-3.19/src/lte/model/epc-tft.cc
--- ns-3.18.1/src/lte/model/epc-tft.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-tft.cc	2013-12-20 09:44:51.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("EpcTft");
+NS_LOG_COMPONENT_DEFINE ("EpcTft")
+  ;
 
 std::ostream& operator<< (std::ostream& os, EpcTft::Direction& d)
 {
diff -Naur ns-3.18.1/src/lte/model/epc-tft.h ns-3.19/src/lte/model/epc-tft.h
--- ns-3.18.1/src/lte/model/epc-tft.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-tft.h	2013-12-20 09:44:51.000000000 -0800
@@ -124,7 +124,7 @@
   /** 
    * add a PacketFilter to the Traffic Flow Template
    * 
-   * \param the PacketFilter to be added
+   * \param f the PacketFilter to be added
    * 
    * \return the id( 0 <= id < 16) of the newly added filter, if the addition was successful. Will fail if you try to add more than 15 filters. This is to be compliant with TS 24.008.
    */
diff -Naur ns-3.18.1/src/lte/model/epc-ue-nas.cc ns-3.19/src/lte/model/epc-ue-nas.cc
--- ns-3.18.1/src/lte/model/epc-ue-nas.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-ue-nas.cc	2013-12-20 09:44:51.000000000 -0800
@@ -35,14 +35,14 @@
 
 
 
-const char* g_ueNasStateName[EpcUeNas::NUM_STATES] = 
-  {
-      "OFF",
-      "ATTACHING",
-      "IDLE_REGISTERED",
-      "CONNECTING_TO_EPC",
-      "ACTIVE "    
-  };
+const char* g_ueNasStateName[EpcUeNas::NUM_STATES] =
+{
+  "OFF",
+  "ATTACHING",
+  "IDLE_REGISTERED",
+  "CONNECTING_TO_EPC",
+  "ACTIVE"
+};
 
 std::string ToString (EpcUeNas::State s)
 {
@@ -52,10 +52,12 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (EpcUeNas);
+NS_OBJECT_ENSURE_REGISTERED (EpcUeNas)
+  ;
 
 EpcUeNas::EpcUeNas ()
   : m_state (OFF),
+    m_csgId (0),
     m_asSapProvider (0),
     m_bidCounter (0)
 {
@@ -73,7 +75,7 @@
 EpcUeNas::DoDispose ()
 {
   NS_LOG_FUNCTION (this);
-  delete m_asSapUser;  
+  delete m_asSapUser;
 }
 
 TypeId
@@ -92,41 +94,76 @@
 void 
 EpcUeNas::SetDevice (Ptr<NetDevice> dev)
 {
+  NS_LOG_FUNCTION (this << dev);
   m_device = dev;
 }
 
 void 
 EpcUeNas::SetImsi (uint64_t imsi)
 {
+  NS_LOG_FUNCTION (this << imsi);
   m_imsi = imsi;
 }
 
 void
+EpcUeNas::SetCsgId (uint32_t csgId)
+{
+  NS_LOG_FUNCTION (this << csgId);
+  m_csgId = csgId;
+  m_asSapProvider->SetCsgWhiteList (csgId);
+}
+
+uint32_t
+EpcUeNas::GetCsgId () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_csgId;
+}
+
+void
 EpcUeNas::SetAsSapProvider (LteAsSapProvider* s)
 {
+  NS_LOG_FUNCTION (this << s);
   m_asSapProvider = s;
 }
 
-LteAsSapUser* 
+LteAsSapUser*
 EpcUeNas::GetAsSapUser ()
 {
+  NS_LOG_FUNCTION (this);
   return m_asSapUser;
 }
 
-void 
+void
 EpcUeNas::SetForwardUpCallback (Callback <void, Ptr<Packet> > cb)
 {
+  NS_LOG_FUNCTION (this);
   m_forwardUpCallback = cb;
 }
 
+void
+EpcUeNas::StartCellSelection (uint16_t dlEarfcn)
+{
+  NS_LOG_FUNCTION (this << dlEarfcn);
+  m_asSapProvider->StartCellSelection (dlEarfcn);
+}
+
 void 
-EpcUeNas::Connect (uint16_t cellId, uint16_t earfcn)
+EpcUeNas::Connect ()
 {
   NS_LOG_FUNCTION (this);
 
-  // since RRC Idle Mode cell selection is not supported yet, we
+  // tell RRC to go into connected mode
+  m_asSapProvider->Connect ();
+}
+
+void
+EpcUeNas::Connect (uint16_t cellId, uint16_t dlEarfcn)
+{
+  NS_LOG_FUNCTION (this << cellId << dlEarfcn);
+
   // force the UE RRC to be camped on a specific eNB
-  m_asSapProvider->ForceCampedOnEnb (cellId, earfcn);
+  m_asSapProvider->ForceCampedOnEnb (cellId, dlEarfcn);
 
   // tell RRC to go into connected mode
   m_asSapProvider->Connect ();
@@ -165,7 +202,7 @@
 EpcUeNas::Send (Ptr<Packet> packet)
 {
   NS_LOG_FUNCTION (this << packet);
-  
+
   switch (m_state)
     {
     case ACTIVE:
@@ -181,15 +218,15 @@
           {
             m_asSapProvider->SendData (packet, bid); 
             return true;
-        }
+          }
       }
       break;
 
-    default:      
+    default:
       NS_LOG_WARN (this << " NAS OFF, discarding packet");
       return false;
       break;
-    }        
+    }
 }
 
 void 
@@ -203,13 +240,20 @@
 void 
 EpcUeNas::DoNotifyConnectionFailed ()
 {
-  NS_FATAL_ERROR ("connection failed, it should not happen with the current model");
+  NS_LOG_FUNCTION (this);
+
+  SwitchToState (OFF);
+  /**
+   * \todo Currently not implemented, action by NAS and upper layers after UE
+   *       fails to switch to CONNNECTED mode. Maybe a retry, or just stop here
+   *       and fire a trace to let user know.
+   */
 }
 
 void
 EpcUeNas::DoRecvData (Ptr<Packet> packet)
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << packet);
   m_forwardUpCallback (packet);
 }
 
@@ -229,10 +273,17 @@
   m_tftClassifier.Add (tft, bid);
 }
 
+EpcUeNas::State
+EpcUeNas::GetState () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_state;
+}
+
 void 
 EpcUeNas::SwitchToState (State newState)
 {
-  NS_LOG_FUNCTION (this << newState);
+  NS_LOG_FUNCTION (this << ToString (newState));
   State oldState = m_state;
   m_state = newState;
   NS_LOG_INFO ("IMSI " << m_imsi << " NAS " << ToString (oldState) << " --> " << ToString (newState));
diff -Naur ns-3.18.1/src/lte/model/epc-ue-nas.h ns-3.19/src/lte/model/epc-ue-nas.h
--- ns-3.18.1/src/lte/model/epc-ue-nas.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-ue-nas.h	2013-12-20 09:44:51.000000000 -0800
@@ -64,36 +64,64 @@
    */
   void SetImsi (uint64_t imsi);
 
-  /** 
+  /**
+   *
+   * \param csgId Closed Subscriber Group identity
+   */
+  void SetCsgId (uint32_t csgId);
+
+  /**
+   *
+   * \return csgId Closed Subscriber Group identity
+   */
+  uint32_t GetCsgId () const;
+
+  /**
    * Set the AS SAP provider to interact with the NAS entity
-   * 
+   *
    * \param s the AS SAP provider
    */
   void SetAsSapProvider (LteAsSapProvider* s);
 
-  /** 
-   * 
-   * 
+  /**
+   *
+   *
    * \return the AS SAP user exported by this RRC
    */
   LteAsSapUser* GetAsSapUser ();
 
-  /** 
+  /**
    * set the callback used to forward data packets up the stack
-   * 
+   *
    * \param cb the callback
    */
   void SetForwardUpCallback (Callback <void, Ptr<Packet> > cb);
- 
-  /** 
-   * instruct the NAS to go to ACTIVE state, i.e., EMM Registered + ECM Connected
-   * Since RRC Idle Mode cell selection is not supported yet, we
-   * force the UE RRC to be camped on a specific eNB.
+
+  /**
+   * \brief Causes NAS to tell AS to find a suitable cell and camp to it.
+   *
+   * \param dlEarfcn the DL frequency of the eNB
+   */
+  void StartCellSelection (uint16_t dlEarfcn);
+
+  /**
+   * \brief Causes NAS to tell AS to go to ACTIVE state.
    * 
+   * The end result is equivalent with EMM Registered + ECM Connected states.
+   */
+  void Connect ();
+
+  /**
+   * \brief Causes NAS to tell AS to camp to a specific cell and go to ACTIVE
+   *        state.
    * \param cellId the id of the eNB to camp on
-   * \param earfcn the DL frequency of the eNB
+   * \param dlEarfcn the DL frequency of the eNB
+   *
+   * The end result is equivalent with EMM Registered + ECM Connected states.
+   * Since RRC Idle Mode cell selection is not supported yet, we force the UE
+   * RRC to be camped on a specific eNB.
    */
-  void Connect (uint16_t cellId, uint16_t earfcn);
+  void Connect (uint16_t cellId, uint16_t dlEarfcn);
  
   /** 
    * instruct the NAS to disconnect
@@ -126,18 +154,23 @@
    * 
    */
   enum State 
-    {
-      OFF = 0,
-      ATTACHING,
-      IDLE_REGISTERED,
-      CONNECTING_TO_EPC,
-      ACTIVE,
-      NUM_STATES
-    };
+  {
+    OFF = 0,
+    ATTACHING,
+    IDLE_REGISTERED,
+    CONNECTING_TO_EPC,
+    ACTIVE,
+    NUM_STATES
+  };
+
+  /**
+   * \return The current state
+   */
+  State GetState () const;
 
  
 private:
-  
+
   // LTE AS SAP methods
   void DoNotifyConnectionSuccessful ();
   void DoNotifyConnectionFailed ();
@@ -155,7 +188,9 @@
   Ptr<NetDevice> m_device;
 
   uint64_t m_imsi;
-  
+
+  uint32_t m_csgId;
+
   LteAsSapProvider* m_asSapProvider;
   LteAsSapUser* m_asSapUser;
 
diff -Naur ns-3.18.1/src/lte/model/epc-x2.cc ns-3.19/src/lte/model/epc-x2.cc
--- ns-3.18.1/src/lte/model/epc-x2.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-x2.cc	2013-12-20 09:44:51.000000000 -0800
@@ -80,7 +80,8 @@
 
 ///////////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2)
+  ;
 
 EpcX2::EpcX2 ()
   : m_x2cUdpPort (4444),
diff -Naur ns-3.18.1/src/lte/model/epc-x2.h ns-3.19/src/lte/model/epc-x2.h
--- ns-3.18.1/src/lte/model/epc-x2.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-x2.h	2013-12-20 09:44:51.000000000 -0800
@@ -92,15 +92,20 @@
   void SetEpcX2SapUser (EpcX2SapUser * s);
 
   /**
-   * \param s the X2 SAP Provider interface offered by this EPC X2 entity
+   * \return the X2 SAP Provider interface offered by this EPC X2 entity
    */
   EpcX2SapProvider* GetEpcX2SapProvider ();
 
 
   /**
-   * \param s the X2 SAP Provider interface offered by this EPC X2 entity
+   * Add an X2 interface to this EPC X2 entity
+   * \param enb1CellId the cell ID of the current eNodeB
+   * \param enb1X2Address the address of the current eNodeB
+   * \param enb2CellId the cell ID of the neighbouring eNodeB
+   * \param enb2X2Address the address of the neighbouring eNodeB
    */
-  void AddX2Interface (uint16_t enb1CellId, Ipv4Address enb1X2Address, uint16_t enb2CellId, Ipv4Address enb2X2Address);
+  void AddX2Interface (uint16_t enb1CellId, Ipv4Address enb1X2Address,
+                       uint16_t enb2CellId, Ipv4Address enb2X2Address);
 
 
   /** 
diff -Naur ns-3.18.1/src/lte/model/epc-x2-header.cc ns-3.19/src/lte/model/epc-x2-header.cc
--- ns-3.18.1/src/lte/model/epc-x2-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/epc-x2-header.cc	2013-12-20 09:44:51.000000000 -0800
@@ -27,7 +27,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2Header);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2Header)
+  ;
 
 EpcX2Header::EpcX2Header ()
   : m_messageType (0xfa),
@@ -145,7 +146,8 @@
 
 /////////////////////////////////////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestHeader);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestHeader)
+  ;
 
 EpcX2HandoverRequestHeader::EpcX2HandoverRequestHeader ()
   : m_numberOfIes (1 + 1 + 1 + 1),
@@ -433,7 +435,8 @@
 
 /////////////////////////////////////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestAckHeader);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestAckHeader)
+  ;
 
 EpcX2HandoverRequestAckHeader::EpcX2HandoverRequestAckHeader ()
   : m_numberOfIes (1 + 1 + 1 + 1),
@@ -658,7 +661,8 @@
 
 /////////////////////////////////////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverPreparationFailureHeader);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverPreparationFailureHeader)
+  ;
 
 EpcX2HandoverPreparationFailureHeader::EpcX2HandoverPreparationFailureHeader ()
   : m_numberOfIes (1 + 1 + 1),
@@ -783,7 +787,8 @@
 
 /////////////////////////////////////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2SnStatusTransferHeader);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2SnStatusTransferHeader)
+  ;
 
 EpcX2SnStatusTransferHeader::EpcX2SnStatusTransferHeader ()
   : m_numberOfIes (3),
@@ -975,7 +980,8 @@
 
 /////////////////////////////////////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2UeContextReleaseHeader);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2UeContextReleaseHeader)
+  ;
 
 EpcX2UeContextReleaseHeader::EpcX2UeContextReleaseHeader ()
   : m_numberOfIes (1 + 1),
@@ -1082,7 +1088,8 @@
 
 /////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2LoadInformationHeader);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2LoadInformationHeader)
+  ;
 
 EpcX2LoadInformationHeader::EpcX2LoadInformationHeader ()
   : m_numberOfIes (1),
@@ -1306,7 +1313,8 @@
 
 ////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (EpcX2ResourceStatusUpdateHeader);
+NS_OBJECT_ENSURE_REGISTERED (EpcX2ResourceStatusUpdateHeader)
+  ;
 
 EpcX2ResourceStatusUpdateHeader::EpcX2ResourceStatusUpdateHeader ()
   : m_numberOfIes (3),
diff -Naur ns-3.18.1/src/lte/model/eps-bearer-tag.cc ns-3.19/src/lte/model/eps-bearer-tag.cc
--- ns-3.18.1/src/lte/model/eps-bearer-tag.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/eps-bearer-tag.cc	2013-12-20 09:44:51.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (EpsBearerTag);
+NS_OBJECT_ENSURE_REGISTERED (EpsBearerTag)
+  ;
 
 TypeId
 EpsBearerTag::GetTypeId (void)
diff -Naur ns-3.18.1/src/lte/model/eps-bearer-tag.h ns-3.19/src/lte/model/eps-bearer-tag.h
--- ns-3.18.1/src/lte/model/eps-bearer-tag.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/eps-bearer-tag.h	2013-12-20 09:44:51.000000000 -0800
@@ -54,7 +54,7 @@
    *
    * @param rnti the value of the RNTI to set
    */
-  void SetRnti (uint16_t tid);
+  void SetRnti (uint16_t rnti);
 
   /**
    * Set the bearer id to the given value.
diff -Naur ns-3.18.1/src/lte/model/fdbet-ff-mac-scheduler.cc ns-3.19/src/lte/model/fdbet-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/fdbet-ff-mac-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/fdbet-ff-mac-scheduler.cc	2013-12-20 09:44:51.000000000 -0800
@@ -43,7 +43,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (FdBetFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (FdBetFfMacScheduler)
+  ;
 
 
 
@@ -650,6 +651,14 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -691,6 +700,44 @@
         }
       rbStart = rbStart + rbLen;
 
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -952,6 +999,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
   std::map <uint16_t, fdbetsFlowPerf_t>::iterator itFlow;
   std::map <uint16_t, double> estAveThr;                                // store expected average throughput for UE
   std::map <uint16_t, double>::iterator itMax = estAveThr.end ();
@@ -1381,20 +1438,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
-
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/fdmt-ff-mac-scheduler.cc ns-3.19/src/lte/model/fdmt-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/fdmt-ff-mac-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/fdmt-ff-mac-scheduler.cc	2013-12-20 09:44:51.000000000 -0800
@@ -43,7 +43,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (FdMtFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (FdMtFfMacScheduler)
+  ;
 
 
 
@@ -639,6 +640,13 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -680,6 +688,44 @@
         }
       rbStart = rbStart + rbLen;
 
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -941,6 +987,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
 
 
   for (int i = 0; i < rbgNum; i++)
@@ -1361,20 +1417,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
-
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/fdtbfq-ff-mac-scheduler.cc ns-3.19/src/lte/model/fdtbfq-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/fdtbfq-ff-mac-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/fdtbfq-ff-mac-scheduler.cc	2013-12-20 09:44:51.000000000 -0800
@@ -44,7 +44,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (FdTbfqFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (FdTbfqFfMacScheduler)
+  ;
 
 
 
@@ -694,6 +695,13 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -735,6 +743,44 @@
         }
       rbStart = rbStart + rbLen;
 
+            if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -996,6 +1042,15 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
 
   // update token pool, counter and bank size
   std::map <uint16_t, fdtbfqsFlowPerf_t>::iterator itStats;
@@ -1612,20 +1667,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
-
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/ff-mac-scheduler.cc ns-3.19/src/lte/model/ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/ff-mac-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/ff-mac-scheduler.cc	2013-12-20 09:44:51.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (FfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (FfMacScheduler)
+  ;
 
 
 FfMacScheduler::FfMacScheduler ()
diff -Naur ns-3.18.1/src/lte/model/lte-amc.cc ns-3.19/src/lte/model/lte-amc.cc
--- ns-3.18.1/src/lte/model/lte-amc.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/lte-amc.cc	2013-12-20 09:44:51.000000000 -0800
@@ -36,7 +36,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteAmc);
+NS_OBJECT_ENSURE_REGISTERED (LteAmc)
+  ;
 
 // from 3GPP R1-081483 "Conveying MCS and TB size via PDCCH"
 // file TBS_support.xls
diff -Naur ns-3.18.1/src/lte/model/lte-amc.h ns-3.19/src/lte/model/lte-amc.h
--- ns-3.18.1/src/lte/model/lte-amc.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/lte-amc.h	2013-12-20 09:44:51.000000000 -0800
@@ -86,9 +86,10 @@
    * \brief Create a message with CQI feedback
    * \param sinr the SpectrumValue vector of SINR for evaluating the CQI
    * \param rbgSize size of RB group (in RBs) for evaluating subband/wideband CQI
-   *
+   * \return a vector of CQI feedbacks
    */
-  /*static*/ std::vector<int> CreateCqiFeedbacks (const SpectrumValue& sinr, uint8_t rbgSize = 0);
+  /*static*/ std::vector<int> CreateCqiFeedbacks (const SpectrumValue& sinr,
+                                                  uint8_t rbgSize = 0);
 
   /**
    * \brief Get a proper CQI for the spectrale efficiency value.
diff -Naur ns-3.18.1/src/lte/model/lte-anr.cc ns-3.19/src/lte/model/lte-anr.cc
--- ns-3.18.1/src/lte/model/lte-anr.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/lte-anr.cc	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,264 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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
+ *
+ * Original work authors (from lte-enb-rrc.cc):
+ * - Nicola Baldo <nbaldo@cttc.es>
+ * - Marco Miozzo <mmiozzo@cttc.es>
+ * - Manuel Requena <manuel.requena@cttc.es>
+ *
+ * Converted to ANR interface by:
+ * - Budiarto Herman <budiarto.herman@magister.fi>
+ */
+
+#include "lte-anr.h"
+#include <ns3/log.h>
+#include <ns3/uinteger.h>
+
+NS_LOG_COMPONENT_DEFINE ("LteAnr");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (LteAnr)
+  ;
+
+
+LteAnr::LteAnr (uint16_t servingCellId)
+  : m_anrSapUser (0),
+    m_threshold (0),
+    m_measId (0),
+    m_servingCellId (servingCellId)
+{
+  NS_LOG_FUNCTION (this << servingCellId);
+  m_anrSapProvider = new MemberLteAnrSapProvider<LteAnr> (this);
+}
+
+
+LteAnr::~LteAnr ()
+{
+  NS_LOG_FUNCTION (this << m_servingCellId);
+}
+
+
+TypeId
+LteAnr::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::LteAnr")
+    .SetParent<Object> ()
+    .AddAttribute ("Threshold",
+                   "Minimum RSRQ range value required for detecting a neighbour cell",
+                   UintegerValue (0),
+                   MakeUintegerAccessor (&LteAnr::m_threshold),
+                   MakeUintegerChecker<uint8_t> (0, 34)) // RSRQ range is [0..34] as per Section 9.1.7 of 3GPP TS 36.133
+  ;
+  return tid;
+}
+
+
+void
+LteAnr::AddNeighbourRelation (uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << m_servingCellId << cellId);
+
+  if (cellId == m_servingCellId)
+    {
+      NS_FATAL_ERROR ("Serving cell ID " << cellId << " may not be added into NRT");
+    }
+
+  if (m_neighbourRelationTable.find (cellId) != m_neighbourRelationTable.end ())
+    {
+      NS_FATAL_ERROR ("There is already an entry in the NRT for cell ID " << cellId);
+    }
+
+  NeighbourRelation_t neighbourRelation;
+  neighbourRelation.noRemove = true;
+  neighbourRelation.noHo = true;
+  neighbourRelation.noX2 = false;
+  neighbourRelation.detectedAsNeighbour = false;
+  m_neighbourRelationTable[cellId] = neighbourRelation;
+}
+
+
+void
+LteAnr::RemoveNeighbourRelation (uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << m_servingCellId << cellId);
+
+  NeighbourRelationTable_t::iterator it = m_neighbourRelationTable.find (cellId);
+  if (it != m_neighbourRelationTable.end ())
+    {
+      NS_FATAL_ERROR ("Cell ID " << cellId << " cannot be found in NRT");
+    }
+
+  m_neighbourRelationTable.erase (it);
+}
+
+
+void
+LteAnr::SetLteAnrSapUser (LteAnrSapUser* s)
+{
+  NS_LOG_FUNCTION (this << s);
+  m_anrSapUser = s;
+}
+
+
+LteAnrSapProvider*
+LteAnr::GetLteAnrSapProvider ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_anrSapProvider;
+}
+
+
+void
+LteAnr::DoInitialize ()
+{
+  NS_LOG_FUNCTION (this);
+  NS_LOG_LOGIC (this << " requesting Event A4 measurements"
+                     << " (threshold=" << (uint16_t) m_threshold << ")");
+  LteRrcSap::ReportConfigEutra reportConfig;
+  reportConfig.eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  reportConfig.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ;
+  reportConfig.threshold1.range = m_threshold;
+  reportConfig.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRQ;
+  reportConfig.reportInterval = LteRrcSap::ReportConfigEutra::MS480;
+  m_measId = m_anrSapUser->AddUeMeasReportConfigForAnr (reportConfig);
+}
+
+
+void
+LteAnr::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  delete m_anrSapProvider;
+  m_neighbourRelationTable.clear ();
+}
+
+
+void
+LteAnr::DoReportUeMeas (LteRrcSap::MeasResults measResults)
+{
+  uint8_t measId = measResults.measId;
+  NS_LOG_FUNCTION (this << m_servingCellId << (uint16_t) measId);
+
+  if (measId != m_measId)
+    {
+      NS_LOG_WARN (this << " Skipping unexpected measurement identity " << (uint16_t) measId);
+    }
+  else
+    {
+      if (measResults.haveMeasResultNeighCells
+          && !(measResults.measResultListEutra.empty ()))
+        {
+          for (std::list <LteRrcSap::MeasResultEutra>::iterator it = measResults.measResultListEutra.begin ();
+               it != measResults.measResultListEutra.end ();
+               ++it)
+            {
+              // Keep new RSRQ value reported for the neighbour cell
+              NS_ASSERT_MSG (it->haveRsrqResult == true,
+                             "RSRQ measure missing for cellId " << it->physCellId);
+
+              // Update Neighbour Relation Table
+              NeighbourRelationTable_t::iterator itNrt = m_neighbourRelationTable.find (it->physCellId);
+              if (itNrt != m_neighbourRelationTable.end ())
+                {
+                  // Update neighbour relation entry
+                  NS_LOG_LOGIC (this << " updating NRT of cell " << m_servingCellId
+                                     << " with entry of cell " << it->physCellId);
+                  if (itNrt->second.noX2 == false)
+                    {
+                      NS_LOG_LOGIC (this << " enabling handover"
+                                         << " from cell " << m_servingCellId
+                                         << " to cell " << it->physCellId);
+                      itNrt->second.noHo = false;
+                    }
+                  itNrt->second.detectedAsNeighbour = true;
+                }
+              else
+                {
+                  // Discovered new neighbour
+                  NS_LOG_LOGIC (this << " inserting NRT of cell " << m_servingCellId
+                                     << " with newly discovered neighbouring cell "
+                                     << it->physCellId);
+                  NeighbourRelation_t neighbourRelation;
+                  neighbourRelation.noRemove = false;
+                  neighbourRelation.noHo = true;
+                  neighbourRelation.noX2 = true;
+                  neighbourRelation.detectedAsNeighbour = true;
+                  m_neighbourRelationTable[it->physCellId] = neighbourRelation;
+                }
+
+            } // end of for (it = measResults.measResultListEutra.begin ())
+
+        } // end of if (measResults.haveMeasResultNeighCells && !(measResults.measResultListEutra.empty ()))
+      else
+        {
+          NS_LOG_WARN (this << " Event A4 received without measurement results from neighbouring cells");
+          /// \todo Remove neighbours in the NRT.
+        }
+
+    } // end of else of if (measId != m_measId)
+
+} // end of DoReportUeMeas
+
+
+void
+LteAnr::DoAddNeighbourRelation (uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << cellId);
+  AddNeighbourRelation (cellId);
+}
+
+
+bool
+LteAnr::DoGetNoRemove (uint16_t cellId) const
+{
+  NS_LOG_FUNCTION (this << m_servingCellId << cellId);
+  return Find (cellId)->noRemove;
+}
+
+
+bool
+LteAnr::DoGetNoHo (uint16_t cellId) const
+{
+  NS_LOG_FUNCTION (this << m_servingCellId << cellId);
+  return Find (cellId)->noHo;
+}
+
+
+bool
+LteAnr::DoGetNoX2 (uint16_t cellId) const
+{
+  NS_LOG_FUNCTION (this << m_servingCellId << cellId);
+  return Find (cellId)->noX2;
+}
+
+
+const LteAnr::NeighbourRelation_t *
+LteAnr::Find (uint16_t cellId) const
+{
+  NeighbourRelationTable_t::const_iterator it = m_neighbourRelationTable.find (cellId);
+  if (it == m_neighbourRelationTable.end ())
+    {
+      NS_FATAL_ERROR ("Cell ID " << cellId << " cannot be found in NRT");
+    }
+  return &(it->second);
+}
+
+
+} // end of namespace ns3
+
diff -Naur ns-3.18.1/src/lte/model/lte-anr.h ns-3.19/src/lte/model/lte-anr.h
--- ns-3.18.1/src/lte/model/lte-anr.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/lte-anr.h	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,233 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011, 2012 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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
+ *
+ * Original work authors (from lte-enb-rrc.cc):
+ * - Nicola Baldo <nbaldo@cttc.es>
+ * - Marco Miozzo <mmiozzo@cttc.es>
+ * - Manuel Requena <manuel.requena@cttc.es>
+ *
+ * Converted to ANR interface by:
+ * - Budiarto Herman <budiarto.herman@magister.fi>
+ */
+
+#ifndef LTE_ANR_H
+#define LTE_ANR_H
+
+#include <ns3/object.h>
+#include <ns3/lte-rrc-sap.h>
+#include <ns3/lte-anr-sap.h>
+#include <map>
+
+namespace ns3 {
+
+
+class LteAnrSapProvider;
+class LteAnrSapUser;
+class LteNeighbourRelation;
+
+/**
+ * \brief Automatic Neighbour Relation function.
+ *
+ * ANR is a conceptually a list of neighbouring cells called the Neighbour
+ * Relation Table (NRT). ANR has the capability of automatically inserting new
+ * entries into NRT based on measurement reports obtained from the eNodeB RRC
+ * instance. Besides this, ANR also supports manual insertion and accepts
+ * queries for the NRT content.
+ *
+ * The LteHelper class automatically installs one ANR instance for each eNodeB
+ * RRC instance. When installed, ANR will assist the eNodeB RRC's handover
+ * function, e.g., by preventing an X2-based handover execution if there is no
+ * X2 interface to the target neighbour cell. If this is not desired, it can be
+ * disabled by the following code sample:
+ *
+ *     Config::SetDefault ("ns3::LteHelper::AnrEnabled", BooleanValue (false));
+ *     Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+ *
+ * The communication between an ANR instance and the eNodeB RRC instance is done
+ * through the *ANR SAP* interface. The ANR instance corresponds to the
+ * "provider" part of this interface, while the eNodeB RRC instance takes the
+ * role of the "user" part. The following code skeleton establishes the
+ * connection between both instances:
+ *
+ *     Ptr<LteEnbRrc> u = ...;
+ *     Ptr<LteAnr> p = ...;
+ *     u->SetLteAnrSapProvider (p->GetLteAnrSapProvider ());
+ *     p->SetLteAnrSapUser (u->GetLteAnrSapUser ());
+ *
+ * However, user rarely needs to use the above code, since it has already been
+ * taken care by LteHelper::InstallEnbDevice.
+ *
+ * The current ANR model is inspired from Section 22.3.2a and 22.3.3 of 3GPP
+ * TS 36.300.
+ *
+ * \sa SetLteAnrSapProvider, SetLteAnrSapUser
+ */
+class LteAnr : public Object
+{
+public:
+  /**
+   * \brief Creates an ANR instance.
+   * \param servingCellId the cell ID of the eNodeB instance whom this ANR
+   *                      instance is to be associated with
+   */
+  LteAnr (uint16_t servingCellId);
+  virtual ~LteAnr ();
+
+  // inherited from Object
+  static TypeId GetTypeId ();
+
+  /**
+   * \brief Provide an advance information about a related neighbouring cell
+   *        and add it as a new Neighbour Relation entry.
+   * \param cellId the cell ID of the new neighbour
+   *
+   * This function simulates the Neighbour Relation addition operation by
+   * network operations and maintenance, as depicted in Section 22.3.2a of
+   * 3GPP TS 36.300.
+   *
+   * An entry added by this function will have the NoRemove flag set to TRUE and
+   * the NoHo flag set to TRUE. Hence, the cell may not act as the target cell
+   * of a handover, unless a measurement report of the cell is received, which
+   * will update the NoHo flag to FALSE.
+   */
+  void AddNeighbourRelation (uint16_t cellId);
+
+  /**
+   * \brief Remove an existing Neighbour Relation entry.
+   * \param cellId the cell ID to be removed from the NRT
+   *
+   * This function simulates the Neighbour Relation removal operation by
+   * network operations and maintenance, as depicted in Section 22.3.2a of
+   * 3GPP TS 36.300.
+   */
+  void RemoveNeighbourRelation (uint16_t cellId);
+
+  /**
+   * \brief Set the "user" part of the ANR SAP interface that this ANR instance
+   *        will interact with.
+   * \param s a reference to the "user" part of the interface, typically a
+   *          member of an LteEnbRrc instance
+   */
+  virtual void SetLteAnrSapUser (LteAnrSapUser* s);
+
+  /**
+   * \brief Export the "provider" part of the ANR SAP interface.
+   * \return the reference to the "provider" part of the interface, typically to
+   *         be kept by an LteEnbRrc instance
+   */
+  virtual LteAnrSapProvider* GetLteAnrSapProvider ();
+
+  // let the forwarder class access the protected and private members
+  friend class MemberLteAnrSapProvider<LteAnr>;
+
+protected:
+  // inherited from Object
+  virtual void DoInitialize ();
+  virtual void DoDispose ();
+
+private:
+
+  // ANR SAP PROVIDER IMPLEMENTATION
+
+  /**
+   * \brief Implementation of LteAnrSapProvider::ReportUeMeas.
+   * \param measResults a single report of one measurement identity
+   */
+  void DoReportUeMeas (LteRrcSap::MeasResults measResults);
+
+  /**
+   * \brief Implementation of LteAnrSapProvider::AddNeighbourRelation.
+   * \param cellId the Physical Cell ID of the new neighbouring cell
+   */
+  void DoAddNeighbourRelation (uint16_t cellId);
+
+  /**
+   * \brief Implementation of LteAnrSapProvider::GetNoRemove.
+   * \param cellId the Physical Cell ID of the neighbouring cell of interest
+   * \return if true, the Neighbour Relation shall *not* be removed from the NRT
+   */
+  bool DoGetNoRemove (uint16_t cellId) const;
+
+  /**
+   * \brief Implementation of LteAnrSapProvider::GetNoHo.
+   * \param cellId the Physical Cell ID of the neighbouring cell of interest
+   * \return if true, the Neighbour Relation shall *not* be used by the eNodeB
+   *         for handover reasons
+   */
+  bool DoGetNoHo (uint16_t cellId) const;
+
+  /**
+   * \brief Implementation of LteAnrSapProvider::GetNoX2.
+   * \param cellId the Physical Cell ID of the neighbouring cell of interest
+   * \return if true, the Neighbour Relation shall *not* use an X2 interface in
+   *         order to initiate procedures towards the eNodeB parenting the
+   *         target cell
+   */
+  bool DoGetNoX2 (uint16_t cellId) const;
+
+  // ANR SAP
+
+  /**
+   * \brief Reference to the "provider" part of the ANR SAP interface, which is
+   *        automatically created when this class instantiates.
+   */
+  LteAnrSapProvider* m_anrSapProvider;
+
+  /**
+   * \brief Reference to the "user" part of the ANR SAP interface, which is
+   *        provided by the eNodeB RRC instance.
+   */
+  LteAnrSapUser* m_anrSapUser;
+
+  // ATTRIBUTE
+
+  /// The attribute Threshold.
+  uint8_t m_threshold;
+
+  /**
+   * \brief Neighbour Relation between two eNodeBs (serving eNodeB and neighbour
+   *        eNodeB).
+   */
+  struct NeighbourRelation_t
+  {
+    bool noRemove;
+    bool noHo;
+    bool noX2;
+    bool detectedAsNeighbour;
+  };
+
+  //               cellId
+  typedef std::map<uint16_t, NeighbourRelation_t> NeighbourRelationTable_t;
+
+  NeighbourRelationTable_t m_neighbourRelationTable;
+
+  // internal methods
+  const NeighbourRelation_t* Find (uint16_t cellId) const;
+
+  // The expected measurement identity
+  uint8_t m_measId;
+
+  uint16_t m_servingCellId;
+
+}; // end of class LteAnr
+
+
+} // end of namespace ns3
+
+
+#endif /* LTE_ANR_H */
diff -Naur ns-3.18.1/src/lte/model/lte-anr-sap.cc ns-3.19/src/lte/model/lte-anr-sap.cc
--- ns-3.18.1/src/lte/model/lte-anr-sap.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/lte-anr-sap.cc	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,38 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#include "lte-anr-sap.h"
+
+
+namespace ns3 {
+
+
+LteAnrSapProvider::~LteAnrSapProvider ()
+{
+}
+
+
+LteAnrSapUser::~LteAnrSapUser ()
+{
+}
+
+
+} // end of namespace ns3
diff -Naur ns-3.18.1/src/lte/model/lte-anr-sap.h ns-3.19/src/lte/model/lte-anr-sap.h
--- ns-3.18.1/src/lte/model/lte-anr-sap.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/lte-anr-sap.h	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,233 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#ifndef LTE_ANR_SAP_H
+#define LTE_ANR_SAP_H
+
+#include <ns3/lte-rrc-sap.h>
+
+namespace ns3 {
+
+
+/**
+ * \brief Service Access Point (SAP) offered by the ANR instance to the eNodeB
+ *        RRC instance.
+ *
+ * This is the *ANR SAP Provider*, i.e., the part of the SAP that contains the
+ * ANR (Automatic Neighbour Relation) methods called by the eNodeB RRC instance.
+ */
+class LteAnrSapProvider
+{
+public:
+  virtual ~LteAnrSapProvider ();
+
+  /**
+   * \brief Send a UE measurement report to the ANC instance.
+   * \param measResults a single report of one measurement identity
+   *
+   * The received measurement report is a result of the UE measurement
+   * configuration previously configured by calling
+   * LteAnrSapUser::AddUeMeasReportConfigForAnr. The report may be stored and
+   * utilized for the purpose of maintaining Neighbour Relation Table (NRT).
+   */
+  virtual void ReportUeMeas (LteRrcSap::MeasResults measResults) = 0;
+
+  /**
+   * \brief Add a new Neighbour Relation entry.
+   * \param cellId the Physical Cell ID of the new neighbouring cell
+   */
+  virtual void AddNeighbourRelation (uint16_t cellId) = 0;
+
+  /**
+   * \brief Get the value of *No Remove* field of a neighbouring cell from the
+   *        Neighbour Relation Table (NRT).
+   * \param cellId the Physical Cell ID of the neighbouring cell of interest
+   * \return if true, the Neighbour Relation shall *not* be removed from the NRT
+   */
+  virtual bool GetNoRemove (uint16_t cellId) const = 0;
+
+  /**
+   * \brief Get the value of *No HO* field of a neighbouring cell from the
+   *        Neighbour Relation Table (NRT).
+   * \param cellId the Physical Cell ID of the neighbouring cell of interest
+   * \return if true, the Neighbour Relation shall *not* be used by the eNodeB
+   *         for handover reasons
+   */
+  virtual bool GetNoHo (uint16_t cellId) const = 0;
+
+  /**
+   * \brief Get the value of *No X2* field of a neighbouring cell from the
+   *        Neighbour Relation Table (NRT).
+   * \param cellId the Physical Cell ID of the neighbouring cell of interest
+   * \return if true, the Neighbour Relation shall *not* use an X2 interface in
+   *         order to initiate procedures towards the eNodeB parenting the
+   *         target cell
+   */
+  virtual bool GetNoX2 (uint16_t cellId) const = 0;
+
+}; // end of class LteAnrSapProvider
+
+
+
+/**
+ * \brief Service Access Point (SAP) offered by the eNodeB RRC instance to the
+ *        ANR instance.
+ *
+ * This is the *ANR SAP User*, i.e., the part of the SAP that contains the
+ * eNodeB RRC methods called by the ANR (Automatic Neighbour Relation) instance.
+ */
+class LteAnrSapUser
+{
+public:
+  virtual ~LteAnrSapUser ();
+
+  /**
+   * \brief Request a certain reporting configuration to be fulfilled by the UEs
+   *        attached to the eNodeB entity.
+   * \param reportConfig the UE measurement reporting configuration
+   * \return the measurement identity associated with this newly added
+   *         reporting configuration
+   *
+   * The eNodeB RRC entity is expected to configure the same reporting
+   * configuration in each of the attached UEs. When later in the simulation a
+   * UE measurement report is received from a UE as a result of this
+   * configuration, the eNodeB RRC entity shall forward this report to the ANC
+   * instance through the LteAnrSapProvider::ReportUeMeas SAP function.
+   *
+   * \note This function is only valid before the simulation begins.
+   */
+  virtual uint8_t AddUeMeasReportConfigForAnr (LteRrcSap::ReportConfigEutra reportConfig) = 0;
+
+}; // end of class LteAnrSapUser
+
+
+
+/**
+ * \brief Template for the implementation of the LteAnrSapProvider as a member
+ *        of an owner class of type C to which all methods are forwarded.
+ */
+template <class C>
+class MemberLteAnrSapProvider : public LteAnrSapProvider
+{
+public:
+  MemberLteAnrSapProvider (C* owner);
+
+  // inherited from LteAnrSapProvider
+  virtual void ReportUeMeas (LteRrcSap::MeasResults measResults);
+  virtual void AddNeighbourRelation (uint16_t cellId);
+  virtual bool GetNoRemove (uint16_t cellId) const;
+  virtual bool GetNoHo (uint16_t cellId) const;
+  virtual bool GetNoX2 (uint16_t cellId) const;
+
+private:
+  MemberLteAnrSapProvider ();
+  C* m_owner;
+
+}; // end of class MemberLteAnrSapProvider
+
+
+template <class C>
+MemberLteAnrSapProvider<C>::MemberLteAnrSapProvider (C* owner)
+  : m_owner (owner)
+{
+}
+
+
+template <class C>
+void
+MemberLteAnrSapProvider<C>::ReportUeMeas (LteRrcSap::MeasResults measResults)
+{
+  m_owner->DoReportUeMeas (measResults);
+}
+
+
+template <class C>
+void
+MemberLteAnrSapProvider<C>::AddNeighbourRelation (uint16_t cellId)
+{
+  m_owner->DoAddNeighbourRelation (cellId);
+}
+
+
+template <class C>
+bool
+MemberLteAnrSapProvider<C>::GetNoRemove (uint16_t cellId) const
+{
+  return m_owner->DoGetNoRemove (cellId);
+}
+
+
+template <class C>
+bool
+MemberLteAnrSapProvider<C>::GetNoHo (uint16_t cellId) const
+{
+  return m_owner->DoGetNoHo (cellId);
+}
+
+
+template <class C>
+bool
+MemberLteAnrSapProvider<C>::GetNoX2 (uint16_t cellId) const
+{
+  return m_owner->DoGetNoX2 (cellId);
+}
+
+
+
+/**
+ * \brief Template for the implementation of the LteAnrSapUser as a member of an
+ *        owner class of type C to which all methods are forwarded.
+ */
+template <class C>
+class MemberLteAnrSapUser : public LteAnrSapUser
+{
+public:
+  MemberLteAnrSapUser (C* owner);
+
+  // inherited from LteAnrSapUser
+  virtual uint8_t AddUeMeasReportConfigForAnr (LteRrcSap::ReportConfigEutra reportConfig);
+
+private:
+  MemberLteAnrSapUser ();
+  C* m_owner;
+
+}; // end of class MemberLteAnrSapUser
+
+
+template <class C>
+MemberLteAnrSapUser<C>::MemberLteAnrSapUser (C* owner)
+  : m_owner (owner)
+{
+}
+
+
+template <class C>
+uint8_t
+MemberLteAnrSapUser<C>::AddUeMeasReportConfigForAnr (LteRrcSap::ReportConfigEutra reportConfig)
+{
+  return m_owner->DoAddUeMeasReportConfigForAnr (reportConfig);
+}
+
+
+} // end of namespace ns3
+
+
+#endif /* LTE_ANR_SAP_H */
diff -Naur ns-3.18.1/src/lte/model/lte-asn1-header.cc ns-3.19/src/lte/model/lte-asn1-header.cc
--- ns-3.18.1/src/lte/model/lte-asn1-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/lte-asn1-header.cc	2013-12-20 09:44:51.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Asn1Header);
+NS_OBJECT_ENSURE_REGISTERED (Asn1Header)
+  ;
 
 TypeId
 Asn1Header::GetTypeId (void)
diff -Naur ns-3.18.1/src/lte/model/lte-as-sap.h ns-3.19/src/lte/model/lte-as-sap.h
--- ns-3.18.1/src/lte/model/lte-as-sap.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/lte/model/lte-as-sap.h	2013-12-20 09:44:51.000000000 -0800
@@ -33,7 +33,7 @@
 /**
  * This class implements the Access Stratum (AS) Service Access Point
  * (SAP), i.e., the interface between the EpcUeNas and the LteUeRrc.
- * In particular, this class implements the  
+ * In particular, this class implements the
  * Provider part of the SAP, i.e., the methods exported by the
  * LteUeRrc and called by the EpcUeNas.
  * 
@@ -43,24 +43,42 @@
 public:
   virtual ~LteAsSapProvider ();
 
-  /** 
-   * Force the RRC to stay camped on a certain eNB
-   * 
-   * \param enbDevice the eNB device (wild hack, might go away in
-   * future versions)
-   * \param cellId the Cell ID identifying the eNB
-   */
-  virtual void ForceCampedOnEnb (uint16_t cellId, uint16_t earfcn) = 0;
-  
-  /** 
-   * Tell the RRC to go into Connected Mode
-   * 
+  /**
+   * \brief Set the selected Closed Subscriber Group subscription list to be
+   *        used for cell selection.
+   *
+   * \param csgId identity of the subscribed CSG
+   */
+  virtual void SetCsgWhiteList (uint32_t csgId) = 0;
+
+  /**
+   * \brief Initiate Idle mode cell selection procedure.
+   *
+   * \param dlEarfcn the downlink carrier frequency (EARFCN)
+   */
+  virtual void StartCellSelection (uint16_t dlEarfcn) = 0;
+
+  /** 
+   * \brief Force the RRC entity to stay camped on a certain eNodeB.
+   *
+   * \param cellId the cell ID identifying the eNodeB
+   * \param dlEarfcn the downlink carrier frequency (EARFCN)
+   */
+  virtual void ForceCampedOnEnb (uint16_t cellId, uint16_t dlEarfcn) = 0;
+
+  /**
+   * \brief Tell the RRC entity to enter Connected mode.
+   *
+   * If this function is called when the UE is in a situation where connecting
+   * is not possible (e.g. before the simulation begin), then the UE will
+   * attempt to connect at the earliest possible time (e.g. after it camps to a
+   * suitable cell).
    */
   virtual void Connect (void) = 0;
 
   /** 
-   * Send a data packet
-   * 
+   * \brief Send a data packet.
+   *
    * \param packet the packet
    * \param bid the EPS bearer ID
    */
@@ -68,13 +86,13 @@
 
 
   /** 
-   * Tell the RRC to release the connection
-   * 
+   * \brief Tell the RRC entity to release the connection.
+   *
    */
   virtual void Disconnect () = 0;
 
 };
-  
+
 
 /**
  * This class implements the Access Stratum (AS) Service Access Point
@@ -88,15 +106,15 @@
 {
 public:
   virtual ~LteAsSapUser ();
-  
+
   /** 
-   * Notify the NAS that RRC Connection Establishment was successful
+   * \brief Notify the NAS that RRC Connection Establishment was successful.
    * 
    */
   virtual void NotifyConnectionSuccessful () = 0;
 
   /** 
-   * Notify the NAS that RRC Connection Establishment failed
+   * \brief Notify the NAS that RRC Connection Establishment failed.
    * 
    */
   virtual void NotifyConnectionFailed () = 0;
@@ -114,9 +132,9 @@
    * \param packet the packet
    */
   virtual void RecvData (Ptr<Packet> packet) = 0;
-  
+
 };
-  
+
 
 
 
@@ -132,8 +150,10 @@
   MemberLteAsSapProvider (C* owner);
 
   // inherited from LteAsSapProvider
+  virtual void SetCsgWhiteList (uint32_t csgId);
+  virtual void StartCellSelection (uint16_t dlEarfcn);
+  virtual void ForceCampedOnEnb (uint16_t cellId, uint16_t dlEarfcn);
   virtual void Connect (void);
-  virtual void ForceCampedOnEnb (uint16_t cellId, uint16_t earfcn);
   virtual void SendData (Ptr<Packet> packet, uint8_t bid);
   virtual void Disconnect ();
 
@@ -154,12 +174,25 @@
 }
 
 template <class C>
-void 
-MemberLteAsSapProvider<C>::ForceCampedOnEnb (uint16_t cellId, uint16_t earfcn)
+void
+MemberLteAsSapProvider<C>::SetCsgWhiteList (uint32_t csgId)
 {
-  m_owner->DoForceCampedOnEnb (cellId, earfcn);
+  m_owner->DoSetCsgWhiteList (csgId);
 }
 
+template <class C>
+void
+MemberLteAsSapProvider<C>::StartCellSelection (uint16_t dlEarfcn)
+{
+  m_owner->DoStartCellSelection (dlEarfcn);
+}
+
+template <class C>
+void
+MemberLteAsSapProvider<C>::ForceCampedOnEnb (uint16_t cellId, uint16_t dlEarfcn)
+{
+  m_owner->DoForceCampedOnEnb (cellId, dlEarfcn);
+}
 
 template <class C>
 void 
diff -Naur ns-3.18.1/src/lte/model/lte-common.cc ns-3.19/src/lte/model/lte-common.cc
--- ns-3.18.1/src/lte/model/lte-common.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-common.cc	2013-12-20 09:44:51.000000000 -0800
@@ -128,14 +128,14 @@
 
 
 uint32_t BufferSizeLevelBsrTable[64] = {
-  
+
   0, 10, 12, 14, 17, 19, 22, 26, 31, 36, 42, 49, 57, 67, 78, 91, 
   107, 125, 146, 171, 200, 234, 274, 321, 376, 440, 515, 603, 
   706, 826, 967, 1132, 1326, 1552, 1817, 2127, 2490, 2915, 3413,
   3995, 4677, 5476, 6411, 7505, 8787, 10287, 12043, 14099, 16507,
   19325, 22624, 26487, 31009, 36304, 42502, 49759, 58255,
   68201, 79846, 93749, 109439, 128125, 150000, 150000
-  
+
 };
 
 uint32_t
@@ -161,7 +161,7 @@
           index++;
         }
     }
-    
+
   return (index);
 }
 
@@ -210,7 +210,7 @@
 EutranMeasurementMapping::Dbm2RsrpRange (double dbm)
 {
   // 3GPP TS 36.133 section 9.1.4 RSRP Measurement Report Mapping
-  double range = std::min( std::max (std::floor(dbm + 141), 0.0), 97.0);
+  double range = std::min (std::max (std::floor (dbm + 141), 0.0), 97.0);
   return (uint8_t) range;
 }
 
@@ -242,5 +242,100 @@
   return RsrqRange2Db (Db2RsrqRange (v));
 }
 
+double
+EutranMeasurementMapping::IeValue2ActualHysteresis (uint8_t hysteresisIeValue)
+{
+  if (hysteresisIeValue > 30)
+    {
+      NS_FATAL_ERROR ("The value " << (uint16_t) hysteresisIeValue
+                                   << " is out of the allowed range (0..30)"
+                                   << " for Hysteresis IE value");
+    }
+
+  double actual = static_cast<double> (hysteresisIeValue) * 0.5;
+  NS_ASSERT (actual >= 0.0);
+  NS_ASSERT (actual <= 15.0);
+  return actual;
+}
+
+uint8_t
+EutranMeasurementMapping::ActualHysteresis2IeValue (double hysteresisDb)
+{
+  if ((hysteresisDb < 0.0) || (hysteresisDb > 15.0))
+    {
+      NS_FATAL_ERROR ("The value " << hysteresisDb
+                                   << " is out of the allowed range (0..15) dB"
+                                   << " for hysteresis");
+    }
+
+  uint8_t ieValue = lround (hysteresisDb * 2.0);
+  NS_ASSERT (ieValue <= 30);
+  return ieValue;
+}
+
+double
+EutranMeasurementMapping::IeValue2ActualA3Offset (int8_t a3OffsetIeValue)
+{
+  if ((a3OffsetIeValue < -30) || (a3OffsetIeValue > 30))
+    {
+      NS_FATAL_ERROR ("The value " << (int16_t) a3OffsetIeValue
+                                   << " is out of the allowed range (-30..30)"
+                                   << " for a3-Offset IE value");
+    }
+
+  double actual = static_cast<double> (a3OffsetIeValue) * 0.5;
+  NS_ASSERT (actual >= -15.0);
+  NS_ASSERT (actual <= 15.0);
+  return actual;
+}
+
+int8_t
+EutranMeasurementMapping::ActualA3Offset2IeValue (double a3OffsetDb)
+{
+  if ((a3OffsetDb < -15.0) || (a3OffsetDb > 15.0))
+    {
+      NS_FATAL_ERROR ("The value " << a3OffsetDb
+                                   << " is out of the allowed range (-15..15) dB"
+                                   << " for A3 Offset");
+    }
+
+  int8_t ieValue = lround (a3OffsetDb * 2.0);
+  NS_ASSERT (ieValue >= -30);
+  NS_ASSERT (ieValue <= 30);
+  return ieValue;
+}
+
+double
+EutranMeasurementMapping::IeValue2ActualQRxLevMin (int8_t qRxLevMinIeValue)
+{
+  if ((qRxLevMinIeValue < -70) || (qRxLevMinIeValue > -22))
+    {
+      NS_FATAL_ERROR ("The value " << (int16_t) qRxLevMinIeValue
+                                   << " is out of the allowed range (-70..-22)"
+                                   << " for Q-RxLevMin IE value");
+    }
+
+  double actual = static_cast<double> (qRxLevMinIeValue) * 2;
+  NS_ASSERT (actual >= -140.0);
+  NS_ASSERT (actual <= -44.0);
+  return actual;
+}
+
+double
+EutranMeasurementMapping::IeValue2ActualQQualMin (int8_t qQualMinIeValue)
+{
+  if ((qQualMinIeValue < -34) || (qQualMinIeValue > -3))
+    {
+      NS_FATAL_ERROR ("The value " << (int16_t) qQualMinIeValue
+                                   << " is out of the allowed range (-34..-3)"
+                                   << " for Q-QualMin IE value");
+    }
+
+  double actual = static_cast<double> (qQualMinIeValue);
+  NS_ASSERT (actual >= -34.0);
+  NS_ASSERT (actual <= -3.0);
+  return actual;
+}
+
 }; // namespace ns3
 
diff -Naur ns-3.18.1/src/lte/model/lte-common.h ns-3.19/src/lte/model/lte-common.h
--- ns-3.18.1/src/lte/model/lte-common.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-common.h	2013-12-20 09:44:51.000000000 -0800
@@ -76,12 +76,12 @@
   * Srs Configuration index for UE specific SRS, see section 8.2 of TS 36.213
   */
   uint16_t  m_srsConfigurationIndex;
-  
-  public:
-    LteUeConfig_t ();
-    
-    friend bool operator == (const LteUeConfig_t &a, const LteUeConfig_t &b);
-    friend bool operator < (const LteUeConfig_t &a, const LteUeConfig_t &b);
+
+public:
+  LteUeConfig_t ();
+
+  friend bool operator == (const LteUeConfig_t &a, const LteUeConfig_t &b);
+  friend bool operator < (const LteUeConfig_t &a, const LteUeConfig_t &b);
 };
 
 
@@ -95,24 +95,22 @@
 
   //static const double MIN_FP_S11DOT3_VALUE = -4096;
 
-
 };
 
 class BufferSizeLevelBsr
 {
-  
-  public:
-    static uint32_t BsrId2BufferSize (uint8_t val);
-    static uint8_t BufferSize2BsrId (uint32_t val);
-    
-    static int  m_bufferSizeLevelBsr[64];
-    
-    
+
+public:
+  static uint32_t BsrId2BufferSize (uint8_t val);
+  static uint8_t BufferSize2BsrId (uint32_t val);
+
+  static int  m_bufferSizeLevelBsr[64];
+
 };
 
 class TransmissionModesLayers
 {
-  public:
+public:
   static uint8_t TxMode2LayerNum (uint8_t txMode);
 };
 
@@ -120,31 +118,31 @@
 struct PhyTransmissionStatParameters
 {
   int64_t  m_timestamp; // in millisecond
-  uint16_t m_cellId;
-  uint64_t m_imsi;
-  uint16_t m_rnti;
-  uint8_t  m_txMode;
-  uint8_t  m_layer;
-  uint8_t  m_mcs;
-  uint16_t m_size;
-  uint8_t  m_rv;
-  uint8_t  m_ndi;
+  uint16_t m_cellId;  ///< Cell ID of the attached Enb
+  uint64_t m_imsi;    ///< IMSI of the scheduled UE
+  uint16_t m_rnti;    ///< C-RNTI scheduled
+  uint8_t  m_txMode;  ///< the transmission Mode
+  uint8_t  m_layer;   ///< the layer (cw) of the transmission
+  uint8_t  m_mcs;     ///< MCS for transport block
+  uint16_t m_size;    ///< Size of transport block
+  uint8_t  m_rv;      ///< the redundancy version (HARQ)
+  uint8_t  m_ndi;     ///< new data indicator flag
 };
 
 
 struct PhyReceptionStatParameters
 {
   int64_t  m_timestamp; // in millisecond
-  uint16_t m_cellId;
-  uint64_t m_imsi;
-  uint16_t m_rnti;
-  uint8_t  m_txMode;
-  uint8_t  m_layer;
-  uint8_t  m_mcs;
-  uint16_t m_size;
-  uint8_t  m_rv;
-  uint8_t  m_ndi;
-  uint8_t  m_correctness;
+  uint16_t m_cellId;       ///< Cell ID of the attached Enb
+  uint64_t m_imsi;         ///< IMSI of the scheduled UE
+  uint16_t m_rnti;         ///< C-RNTI scheduled
+  uint8_t  m_txMode;       ///< the transmission Mode
+  uint8_t  m_layer;        ///< the layer (cw) of the transmission
+  uint8_t  m_mcs;          ///< MCS for transport block
+  uint16_t m_size;         ///< Size of transport block
+  uint8_t  m_rv;           ///< the redundancy version (HARQ)
+  uint8_t  m_ndi;          ///< new data indicator flag
+  uint8_t  m_correctness;  ///< correctness of the TB received
 };
 
 
@@ -158,7 +156,7 @@
 public:
   /** 
    * converts an RSRP range to dBm as per 
-   * 3GPP TS 36.133 section 9.1.4 RSRP Measurement Report Mapping  
+   * 3GPP TS 36.133 section 9.1.4 RSRP Measurement Report Mapping
    *
    * \param range the RSRP range value
    * 
@@ -168,7 +166,7 @@
 
   /** 
    * convert an RSRP value in dBm to the corresponding range as per 
-   * 3GPP TS 36.133 section 9.1.4 RSRP Measurement Report Mapping 
+   * 3GPP TS 36.133 section 9.1.4 RSRP Measurement Report Mapping
    * 
    * \param dbm the RSRP value in dBm
    * 
@@ -194,7 +192,7 @@
    * 
    * \return the corresponding range
    */
-  static uint8_t Db2RsrqRange (double db);  
+  static uint8_t Db2RsrqRange (double db);
 
   /** 
    * Quantize an RSRP value according to the measurement mapping of TS 36.133
@@ -212,9 +210,81 @@
    * 
    * \return the quantized RSRQ value in dB
    */
-  static double QuantizeRsrq(double v);
+  static double QuantizeRsrq (double v);
 
-};
+  /**
+   * \brief Returns the actual value of a hysteresis parameter.
+   * \param hysteresisIeValue IE value of hysteresis
+   * \return actual value in dB, which is IE value * 0.5 dB
+   *
+   * As per section 6.3.5 of 3GPP TS 36.331.
+   *
+   * The allowed values for hysteresis IE value are between 0 and 30.
+   *
+   * \sa LteRrcSap::ReportConfigEutra
+   */
+  static double IeValue2ActualHysteresis (uint8_t hysteresisIeValue);
+
+  /**
+   * \brief Returns the IE value of hysteresis.
+   * \param hysteresisDb actual hysteresis value in dB
+   * \return IE value of hysteresis in dB, which is actual value * 2, rounded
+   *         to the nearest integer
+   *
+   * The allowed values for hysteresis are between 0 and 15 dB.
+   *
+   * \sa LteRrcSap::ReportConfigEutra
+   */
+  static uint8_t ActualHysteresis2IeValue (double hysteresisDb);
+
+  /**
+   * \brief Returns the actual value of an a3-Offset parameter.
+   * \param a3OffsetIeValue IE value of a3-Offset
+   * \return actual value in dB, which is IE value * 0.5 dB
+   *
+   * As per section 6.3.5 of 3GPP TS 36.331.
+   *
+   * The allowed values for a3-Offset IE value are between -30 and 30.
+   *
+   * \sa LteRrcSap::ReportConfigEutra
+   */
+  static double IeValue2ActualA3Offset (int8_t a3OffsetIeValue);
+
+  /**
+   * \brief Returns the IE value of a3-Offset.
+   * \param a3OffsetDb actual A3 Offset value in dB
+   * \return IE value of a3-Offset in dB, which is actual value * 2, rounded
+   *         to the nearest integer
+   *
+   * The allowed values for A3 Offset are between -15 and 15 dB.
+   *
+   * \sa LteRrcSap::ReportConfigEutra
+   */
+  static int8_t ActualA3Offset2IeValue (double a3OffsetDb);
+
+  /**
+   * \brief Returns the actual value of an Q-RxLevMin parameter.
+   * \param qRxLevMinIeValue IE value of Q-RxLevMin
+   * \return Q-RxLevMin actual value in dBm, which is IE value * 2 dBm
+   *
+   * As per section 6.3.4 of 3GPP TS 36.331.
+   *
+   * \sa LteRrcSap::CellSelectionInfo
+   */
+  static double IeValue2ActualQRxLevMin (int8_t qRxLevMinIeValue);
+
+  /**
+   * \brief Returns the actual value of an Q-QualMin parameter.
+   * \param qQualMinIeValue IE value of Q-QualMin
+   * \return Q-QualMin actual value in dB, which is IE value dB
+   *
+   * As per section 6.3.4 of 3GPP TS 36.331.
+   *
+   * \sa LteRrcSap::CellSelectionInfo
+   */
+  static double IeValue2ActualQQualMin (int8_t qQualMinIeValue);
+
+}; // end of class EutranMeasurementMapping
 
 }; // namespace ns3
 
diff -Naur ns-3.18.1/src/lte/model/lte-control-messages.cc ns-3.19/src/lte/model/lte-control-messages.cc
--- ns-3.18.1/src/lte/model/lte-control-messages.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-control-messages.cc	2013-12-20 09:44:51.000000000 -0800
@@ -258,11 +258,33 @@
 }
 
 
+// ----------------------------------------------------------------------------------------------------------
+
+
+
+Sib1LteControlMessage::Sib1LteControlMessage (void)
+{
+  SetMessageType (LteControlMessage::SIB1);
+}
+
+
+void
+Sib1LteControlMessage::SetSib1 (LteRrcSap::SystemInformationBlockType1 sib1)
+{
+  m_sib1 = sib1;
+}
+
+LteRrcSap::SystemInformationBlockType1
+Sib1LteControlMessage::GetSib1 () const
+{
+  return m_sib1;
+}
 
 
 // ---------------------------------------------------------------------------
 
 
+
 DlHarqFeedbackLteControlMessage::DlHarqFeedbackLteControlMessage (void)
 {
   SetMessageType (LteControlMessage::DL_HARQ);
diff -Naur ns-3.18.1/src/lte/model/lte-control-messages.h ns-3.19/src/lte/model/lte-control-messages.h
--- ns-3.18.1/src/lte/model/lte-control-messages.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-control-messages.h	2013-12-20 09:44:51.000000000 -0800
@@ -22,8 +22,10 @@
 #ifndef LTE_CONTROL_MESSAGES_H
 #define LTE_CONTROL_MESSAGES_H
 
-#include "ns3/ptr.h"
-#include "ns3/simple-ref-count.h"
+#include <ns3/ptr.h>
+#include <ns3/simple-ref-count.h>
+#include <ns3/ff-mac-common.h>
+#include <ns3/lte-rrc-sap.h>
 #include <list>
 
 namespace ns3 {
@@ -58,6 +60,7 @@
     RACH_PREAMBLE, // Random Access Preamble
     RAR, // Random Access Response
     MIB, // Master Information Block
+    SIB1, // System Information Block Type 1
   };
 
   LteControlMessage (void);
@@ -77,24 +80,10 @@
 private:
   MessageType m_type;
 };
-} // namespace ns3
-
-#endif /* LTE_CONTROL_MESSAGES_H */
-
-
 
 
 // -----------------------------------------------------------------------
 
-
-#ifndef DL_DCI_LTE_CONTROL_MESSAGES_H
-#define DL_DCI_LTE_CONTROL_MESSAGES_H
-
-#include <ns3/object.h>
-#include <ns3/ff-mac-common.h>
-
-namespace ns3 {
-
 /**
  * \ingroup lte
  * The Downlink Data Control Indicator messages defines the RB allocation for the
@@ -118,26 +107,13 @@
   */
   DlDciListElement_s GetDci (void);
 
-
 private:
   DlDciListElement_s m_dci;
 };
-} // namespace ns3
-
-#endif /* DL_DCI_LTE_CONTROL_MESSAGES_H */
 
 
 // ---------------------------------------------------------------------------
 
-
-#ifndef UL_DCI_LTE_CONTROL_MESSAGES_H
-#define UL_DCI_LTE_CONTROL_MESSAGES_H
-
-#include <ns3/object.h>
-#include <ns3/ff-mac-common.h>
-
-namespace ns3 {
-
 /**
  * \ingroup lte
  * The Uplink Data Control Indicator messages defines the RB allocation for the
@@ -161,30 +137,13 @@
   */
   UlDciListElement_s GetDci (void);
 
-
 private:
   UlDciListElement_s m_dci;
 };
-} // namespace ns3
-
-#endif /* UL_DCI_LTE_CONTROL_MESSAGES_H */
-
 
 
 // ---------------------------------------------------------------------------
 
-
-
-#ifndef DLCQI_LTE_CONTROL_MESSAGES_H
-#define DLCQI_LTE_CONTROL_MESSAGES_H
-
-#include <ns3/object.h>
-#include <ns3/ff-mac-common.h>
-
-namespace ns3 {
-
-class LteNetDevice;
-
 /**
  * \ingroup lte
  * The downlink CqiLteControlMessage defines an ideal list of
@@ -208,27 +167,13 @@
   */
   CqiListElement_s GetDlCqi (void);
 
-
 private:
   CqiListElement_s m_dlCqi;
 };
-} // namespace ns3
-
-#endif /* DLCQI_LTE_CONTROL_MESSAGES_H */
 
 
 // ---------------------------------------------------------------------------
 
-#ifndef BSR_LTE_CONTROL_MESSAGES_H
-#define BSR_LTE_CONTROL_MESSAGES_H
-
-#include <ns3/object.h>
-#include <ns3/ff-mac-common.h>
-
-namespace ns3 {
-
-class LteNetDevice;
-
 /**
  * \ingroup lte
  * The uplink BsrLteControlMessage defines the specific
@@ -244,7 +189,7 @@
   * \brief add a BSR feedback record into the message.
   * \param bsr the BSR feedback
   */
-  void SetBsr (MacCeListElement_s ulcqi);
+  void SetBsr (MacCeListElement_s bsr);
 
   /**
   * \brief Get BSR informations
@@ -252,28 +197,14 @@
   */
   MacCeListElement_s GetBsr (void);
 
-
 private:
   MacCeListElement_s m_bsr;
 
-
 };
 
-} // namespace ns3
-
-#endif /* BSR_LTE_CONTROL_MESSAGES_H */
-
 
 // ---------------------------------------------------------------------------
 
-#ifndef DL_HARQ_LTE_CONTROL_MESSAGES_H
-#define DL_HARQ_LTE_CONTROL_MESSAGES_H
-
-#include <ns3/object.h>
-#include <ns3/ff-mac-common.h>
-
-namespace ns3 {
-
 /**
  * \ingroup lte
  * The downlink DlHarqFeedbackLteControlMessage defines the specific
@@ -287,7 +218,7 @@
 
   /**
   * \brief add a DL HARQ feedback record into the message.
-  * \param DlInfoListElement_s the dl HARQ feedback
+  * \param m the DL HARQ feedback
   */
   void SetDlHarqFeedback (DlInfoListElement_s m);
 
@@ -297,26 +228,13 @@
   */
   DlInfoListElement_s GetDlHarqFeedback (void);
 
-
 private:
   DlInfoListElement_s m_dlInfoListElement;
 
-
 };
-} // namespace ns3
-
-#endif /* DL_HARQ_LTE_CONTROL_MESSAGES_H */
-
-
-#ifndef RACH_PREAMBLE_LTE_CONTROL_MESSAGES_H
-#define RACH_PREAMBLE_LTE_CONTROL_MESSAGES_H
-
-#include <ns3/object.h>
-#include <ns3/ff-mac-common.h>
 
-namespace ns3 {
 
-class LteNetDevice;
+// ---------------------------------------------------------------------------
 
 /**
  * \ingroup lte
@@ -327,12 +245,11 @@
 {
 public:
   RachPreambleLteControlMessage (void);
-
   
   /** 
    * Set the Random Access Preamble Identifier (RAPID), see 3GPP TS 36.321 6.2.2
    *
-   * \param rapid
+   * \param rapid the RAPID
    */
   void SetRapId (uint32_t rapid);
   
@@ -343,26 +260,12 @@
   uint32_t GetRapId () const;
 
 private:
-  
   uint32_t m_rapId;
 
-
 };
 
-} // namespace ns3
-
-#endif  // RACH_PREAMBLE_LTE_CONTROL_MESSAGES_H
 
-
-#ifndef RAR_LTE_CONTROL_MESSAGES_H
-#define RAR_LTE_CONTROL_MESSAGES_H
-
-#include <ns3/object.h>
-#include <ns3/ff-mac-common.h>
-
-namespace ns3 {
-
-class LteNetDevice;
+// ---------------------------------------------------------------------------
 
 /**
  * \ingroup lte
@@ -414,54 +317,92 @@
    * \return a const iterator to the end of the RAR list
    */
   std::list<Rar>::const_iterator RarListEnd () const;
-  
-  
+
 private:
-  
   std::list<Rar> m_rarList;
   uint16_t m_raRnti;
 
 };
 
-} // namespace ns3
 
-#endif  // RAR_LTE_CONTROL_MESSAGES_H
+// ---------------------------------------------------------------------------
 
+/**
+ * \ingroup lte
+ * \brief Abstract model for broadcasting the Master Information Block (MIB)
+ *        within the control channel (BCCH).
+ *
+ * MIB is transmitted by eNodeB RRC and received by UE RRC at every radio frame,
+ * i.e., every 10 milliseconds.
+ *
+ * \sa LteEnbRrc::ConfigureCell, LteEnbPhy::StartFrame,
+ *     LteUeRrc::DoRecvMasterInformationBlock
+ */
+class MibLteControlMessage : public LteControlMessage
+{
+public:
+  /**
+   * \brief Create a new instance of MIB control message.
+   */
+  MibLteControlMessage (void);
 
+  /**
+   * \brief Replace the MIB content of this control message.
+   * \param mib the desired MIB content
+   */
+  void SetMib (LteRrcSap::MasterInformationBlock mib);
 
+  /**
+   * \brief Retrieve the MIB content from this control message.
+   * \return the current MIB content that this control message holds
+   */
+  LteRrcSap::MasterInformationBlock GetMib () const;
 
-#ifndef MIB_LTE_CONTROL_MESSAGES_H
-#define MIB_LTE_CONTROL_MESSAGES_H
+private:
+  LteRrcSap::MasterInformationBlock m_mib;
 
-#include <ns3/object.h>
-#include <ns3/ff-mac-common.h>
-#include <ns3/lte-rrc-sap.h>
+}; // end of class MibLteControlMessage
 
-namespace ns3 {
 
-class LteNetDevice;
+// ---------------------------------------------------------------------------
 
 /**
  * \ingroup lte
+ * \brief Abstract model for broadcasting the System Information Block Type 1
+ *        (SIB1) within the control channel (BCCH).
+ *
+ * SIB1 is transmitted by eNodeB RRC and received by UE RRC at the 6th subframe
+ * of every odd-numbered radio frame, i.e., every 20 milliseconds.
  *
- * abstract model for broadcasting the Master Information Block
+ * \sa LteEnbRrc::SetSystemInformationBlockType1, LteEnbPhy::StartSubFrame,
+ *     LteUeRrc::DoRecvSystemInformationBlockType1
  */
-class MibLteControlMessage : public LteControlMessage
+class Sib1LteControlMessage : public LteControlMessage
 {
 public:
+  /**
+   * \brief Create a new instance of SIB1 control message.
+   */
+  Sib1LteControlMessage (void);
 
-  MibLteControlMessage (void);
+  /**
+   * \brief Replace the SIB1 content of this control message.
+   * \param sib1 the desired SIB1 content
+   */
+  void SetSib1 (LteRrcSap::SystemInformationBlockType1 sib1);
 
-  void SetMib (LteRrcSap::MasterInformationBlock mib);
+  /**
+   * \brief Retrieve the SIB1 content from this control message.
+   * \return the current SIB1 content that this control message holds
+   */
+  LteRrcSap::SystemInformationBlockType1 GetSib1 () const;
 
-  LteRrcSap::MasterInformationBlock GetMib () const;
-  
 private:
-  
-  LteRrcSap::MasterInformationBlock m_mib;
+  LteRrcSap::SystemInformationBlockType1 m_sib1;
+
+}; // end of class Sib1LteControlMessage
 
-};
 
 } // namespace ns3
 
-#endif  // MIB_LTE_CONTROL_MESSAGES_H
+#endif  // LTE_CONTROL_MESSAGES_H
diff -Naur ns-3.18.1/src/lte/model/lte-enb-cphy-sap.h ns-3.19/src/lte/model/lte-enb-cphy-sap.h
--- ns-3.18.1/src/lte/model/lte-enb-cphy-sap.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-cphy-sap.h	2013-12-20 09:44:51.000000000 -0800
@@ -83,19 +83,25 @@
    * \param rnti the RNTI of the user
    * \param txMode the transmissionMode of the user
    */
-  virtual void SetTransmissionMode (uint16_t  rnti, uint8_t txMode) = 0;
+  virtual void SetTransmissionMode (uint16_t rnti, uint8_t txMode) = 0;
 
   /**
    * \param rnti the RNTI of the user
-   * \param txMode the SRS Configuration Index of the user
+   * \param srsCi the SRS Configuration Index of the user
    */
-  virtual void SetSrsConfigurationIndex (uint16_t  rnti, uint16_t srsCi) = 0;
+  virtual void SetSrsConfigurationIndex (uint16_t rnti, uint16_t srsCi) = 0;
 
   /** 
    * 
    * \param mib the Master Information Block to be sent on the BCH
    */
   virtual void SetMasterInformationBlock (LteRrcSap::MasterInformationBlock mib) = 0;
+
+  /**
+   *
+   * \param sib1 the System Information Block Type 1 to be sent on the BCH
+   */
+  virtual void SetSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 sib1) = 0;
 };
 
 
@@ -137,6 +143,7 @@
   virtual void SetTransmissionMode (uint16_t  rnti, uint8_t txMode);
   virtual void SetSrsConfigurationIndex (uint16_t  rnti, uint16_t srsCi);
   virtual void SetMasterInformationBlock (LteRrcSap::MasterInformationBlock mib);
+  virtual void SetSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 sib1);
   
 private:
   MemberLteEnbCphySapProvider ();
@@ -211,6 +218,13 @@
   m_owner->DoSetMasterInformationBlock (mib);
 }
 
+template <class C>
+void
+MemberLteEnbCphySapProvider<C>::SetSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 sib1)
+{
+  m_owner->DoSetSystemInformationBlockType1 (sib1);
+}
+
 
 
 /**
diff -Naur ns-3.18.1/src/lte/model/lte-enb-mac.cc ns-3.19/src/lte/model/lte-enb-mac.cc
--- ns-3.18.1/src/lte/model/lte-enb-mac.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-mac.cc	2013-12-20 09:44:51.000000000 -0800
@@ -43,7 +43,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (LteEnbMac);
+NS_OBJECT_ENSURE_REGISTERED (LteEnbMac)
+  ;
 
 
 
diff -Naur ns-3.18.1/src/lte/model/lte-enb-mac.h ns-3.19/src/lte/model/lte-enb-mac.h
--- ns-3.18.1/src/lte/model/lte-enb-mac.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-mac.h	2013-12-20 09:44:51.000000000 -0800
@@ -133,7 +133,7 @@
 
   /**
   * \brief Receive a CE element containing the buffer status report
-  * \param msg the BSR message
+  * \param bsr the BSR message
   */
   void ReceiveBsrMessage  (MacCeListElement_s bsr);
 
diff -Naur ns-3.18.1/src/lte/model/lte-enb-net-device.cc ns-3.19/src/lte/model/lte-enb-net-device.cc
--- ns-3.18.1/src/lte/model/lte-enb-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-net-device.cc	2013-12-20 09:44:51.000000000 -0800
@@ -38,6 +38,8 @@
 #include <ns3/lte-ue-net-device.h>
 #include <ns3/lte-enb-phy.h>
 #include <ns3/ff-mac-scheduler.h>
+#include <ns3/lte-handover-algorithm.h>
+#include <ns3/lte-anr.h>
 #include <ns3/ipv4-l3-protocol.h>
 #include <ns3/abort.h>
 #include <ns3/log.h>
@@ -46,7 +48,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice);
+NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice)
+  ;
 
 TypeId LteEnbNetDevice::GetTypeId (void)
 {
@@ -60,6 +63,16 @@
                    PointerValue (),
                    MakePointerAccessor (&LteEnbNetDevice::m_rrc),
                    MakePointerChecker <LteEnbRrc> ())
+    .AddAttribute ("LteHandoverAlgorithm",
+                   "The handover algorithm associated to this EnbNetDevice",
+                   PointerValue (),
+                   MakePointerAccessor (&LteEnbNetDevice::m_handoverAlgorithm),
+                   MakePointerChecker <LteHandoverAlgorithm> ())
+    .AddAttribute ("LteAnr",
+                   "The automatic neighbour relation function associated to this EnbNetDevice",
+                   PointerValue (),
+                   MakePointerAccessor (&LteEnbNetDevice::m_anr),
+                   MakePointerChecker <LteAnr> ())
     .AddAttribute ("LteEnbMac",
                    "The MAC associated to this EnbNetDevice",
                    PointerValue (),
@@ -104,11 +117,28 @@
                    UintegerValue (18100),
                    MakeUintegerAccessor (&LteEnbNetDevice::m_ulEarfcn),
                    MakeUintegerChecker<uint16_t> (18000, 24599))
+    .AddAttribute ("CsgId",
+                   "The Closed Subscriber Group (CSG) identity that this eNodeB belongs to",
+                   UintegerValue (0),
+                   MakeUintegerAccessor (&LteEnbNetDevice::SetCsgId,
+                                         &LteEnbNetDevice::GetCsgId),
+                   MakeUintegerChecker<uint32_t> ())
+    .AddAttribute ("CsgIndication",
+                   "If true, only UEs which are members of the CSG (i.e. same CSG ID) "
+                   "can gain access to the eNodeB, therefore enforcing closed access mode. "
+                   "Otherwise, the eNodeB operates as a non-CSG cell and implements open access mode.",
+                   BooleanValue (false),
+                   MakeBooleanAccessor (&LteEnbNetDevice::SetCsgIndication,
+                                        &LteEnbNetDevice::GetCsgIndication),
+                   MakeBooleanChecker ())
   ;
   return tid;
 }
 
 LteEnbNetDevice::LteEnbNetDevice ()
+  : m_isConstructed (false),
+    m_isConfigured (false),
+    m_anr (0)
 {
   NS_LOG_FUNCTION (this);
 }
@@ -132,6 +162,15 @@
   m_rrc->Dispose ();
   m_rrc = 0;
 
+  m_handoverAlgorithm->Dispose ();
+  m_handoverAlgorithm = 0;
+
+  if (m_anr != 0)
+    {
+      m_anr->Dispose ();
+      m_anr = 0;
+    }
+
   m_phy->Dispose ();
   m_phy = 0;
 
@@ -141,21 +180,17 @@
 
 
 Ptr<LteEnbMac>
-LteEnbNetDevice::GetMac (void) const
+LteEnbNetDevice::GetMac () const
 {
-  NS_LOG_FUNCTION (this);
   return m_mac;
 }
 
-
 Ptr<LteEnbPhy>
-LteEnbNetDevice::GetPhy (void) const
+LteEnbNetDevice::GetPhy () const
 {
-  NS_LOG_FUNCTION (this);
   return m_phy;
 }
 
-
 Ptr<LteEnbRrc>
 LteEnbNetDevice::GetRrc () const
 {
@@ -177,6 +212,7 @@
 void 
 LteEnbNetDevice::SetUlBandwidth (uint8_t bw)
 { 
+  NS_LOG_FUNCTION (this << uint16_t (bw));
   switch (bw)
     { 
     case 6:
@@ -203,6 +239,7 @@
 void 
 LteEnbNetDevice::SetDlBandwidth (uint8_t bw)
 {
+  NS_LOG_FUNCTION (this << uint16_t (bw));
   switch (bw)
     { 
     case 6:
@@ -229,6 +266,7 @@
 void 
 LteEnbNetDevice::SetDlEarfcn (uint16_t earfcn)
 { 
+  NS_LOG_FUNCTION (this << earfcn);
   m_dlEarfcn = earfcn;
 }
 
@@ -241,20 +279,55 @@
 void 
 LteEnbNetDevice::SetUlEarfcn (uint16_t earfcn)
 { 
+  NS_LOG_FUNCTION (this << earfcn);
   m_ulEarfcn = earfcn;
 }
 
+uint32_t
+LteEnbNetDevice::GetCsgId () const
+{
+  return m_csgId;
+}
+
+void
+LteEnbNetDevice::SetCsgId (uint32_t csgId)
+{
+  NS_LOG_FUNCTION (this << csgId);
+  m_csgId = csgId;
+  UpdateConfig (); // propagate the change to RRC level
+}
+
+bool
+LteEnbNetDevice::GetCsgIndication () const
+{
+  return m_csgIndication;
+}
+
+void
+LteEnbNetDevice::SetCsgIndication (bool csgIndication)
+{
+  NS_LOG_FUNCTION (this << csgIndication);
+  m_csgIndication = csgIndication;
+  UpdateConfig (); // propagate the change to RRC level
+}
+
 
 void 
 LteEnbNetDevice::DoInitialize (void)
 {
-
+  NS_LOG_FUNCTION (this);
+  m_isConstructed = true;
   UpdateConfig ();
   m_phy->Initialize ();
   m_mac->Initialize ();
   m_rrc->Initialize ();
-}
+  m_handoverAlgorithm->Initialize ();
 
+  if (m_anr != 0)
+    {
+      m_anr->Initialize ();
+    }
+}
 
 
 bool
@@ -266,16 +339,33 @@
 }
 
 
-
-
 void
 LteEnbNetDevice::UpdateConfig (void)
 {
   NS_LOG_FUNCTION (this);
 
-  m_rrc->ConfigureCell (m_ulBandwidth, m_dlBandwidth, m_ulEarfcn, m_dlEarfcn, m_cellId);
-  m_rrc->SetCellId (m_cellId);
-
+  if (m_isConstructed)
+    {
+      if (!m_isConfigured)
+        {
+          NS_LOG_LOGIC (this << " Configure cell " << m_cellId);
+          // we have to make sure that this function is called only once
+          m_rrc->ConfigureCell (m_ulBandwidth, m_dlBandwidth, m_ulEarfcn, m_dlEarfcn, m_cellId);
+          m_isConfigured = true;
+        }
+
+      NS_LOG_LOGIC (this << " Updating SIB1 of cell " << m_cellId
+                         << " with CSG ID " << m_csgId
+                         << " and CSG indication " << m_csgIndication);
+      m_rrc->SetCsgId (m_csgId, m_csgIndication);
+    }
+  else
+    {
+      /*
+       * Lower layers are not ready yet, so do nothing now and expect
+       * ``DoInitialize`` to re-invoke this function.
+       */
+    }
 }
 
 
diff -Naur ns-3.18.1/src/lte/model/lte-enb-net-device.h ns-3.19/src/lte/model/lte-enb-net-device.h
--- ns-3.18.1/src/lte/model/lte-enb-net-device.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-net-device.h	2013-12-20 09:44:51.000000000 -0800
@@ -40,6 +40,8 @@
 class LteEnbMac;
 class LteEnbRrc;
 class FfMacScheduler;
+class LteHandoverAlgorithm;
+class LteAnr;
 
 
 /**
@@ -106,7 +108,7 @@
   uint16_t GetDlEarfcn () const;
 
   /** 
-   * \param bw the downlink carrier frequency (EARFCN)
+   * \param earfcn the downlink carrier frequency (EARFCN)
    */
   void SetDlEarfcn (uint16_t earfcn);
 
@@ -116,10 +118,54 @@
   uint16_t GetUlEarfcn () const;
 
   /** 
-   * \param bw the uplink carrier frequency (EARFCN)
+   * \param earfcn the uplink carrier frequency (EARFCN)
    */
   void SetUlEarfcn (uint16_t earfcn);
 
+  /**
+   * \brief Returns the CSG ID of the eNodeB.
+   * \return the Closed Subscriber Group identity
+   * \sa LteEnbNetDevice::SetCsgId
+   */
+  uint32_t GetCsgId () const;
+
+  /**
+   * \brief Associate the eNodeB device with a particular CSG.
+   * \param csgId the intended Closed Subscriber Group identity
+   *
+   * CSG identity is a number identifying a Closed Subscriber Group which the
+   * cell belongs to. eNodeB is associated with a single CSG identity.
+   *
+   * The same CSG identity can also be associated to several UEs, which is
+   * equivalent as enlisting these UEs as the members of this particular CSG.
+   *
+   * \sa LteEnbNetDevice::SetCsgIndication
+   */
+  void SetCsgId (uint32_t csgId);
+
+  /**
+   * \brief Returns the CSG indication flag of the eNodeB.
+   * \return the CSG indication flag
+   * \sa LteEnbNetDevice::SetCsgIndication
+   */
+  bool GetCsgIndication () const;
+
+  /**
+   * \brief Enable or disable the CSG indication flag.
+   * \param csgIndication if TRUE, only CSG members are allowed to access this
+   *                      cell
+   *
+   * When the CSG indication field is set to TRUE, only UEs which are members of
+   * the CSG (i.e. same CSG ID) can gain access to the eNodeB, therefore
+   * enforcing closed access mode. Otherwise, the eNodeB operates as a non-CSG
+   * cell and implements open access mode.
+   *
+   * \note This restriction only applies to initial cell selection and
+   *       EPC-enabled simulation.
+   *
+   * \sa LteEnbNetDevice::SetCsgIndication
+   */
+  void SetCsgIndication (bool csgIndication);
 
 protected:
   // inherited from Object
@@ -127,16 +173,20 @@
 
 
 private:
+  bool m_isConstructed;
+  bool m_isConfigured;
 
   /**
-   * Several attributes (e.g., the bandwidth) are exported as
-   * attributes of the LteEnbNetDevice from a user perspective,  but
-   * are actually used also in other modules as well (the RRC, the
-   * PHY, the scheduler...). This methods takes care of updating the
-   * configuration of all modules so that their copy of the attribute
-   * values is in sync with the one in the LteEnbNetDevice.
+   * \brief Propagate attributes and configuration to sub-modules.
+   *
+   * Several attributes (e.g., the bandwidth) are exported as the attributes of
+   * the LteEnbNetDevice from a user perspective, but are actually used also in
+   * other sub-modules (the RRC, the PHY, the scheduler, etc.). This method
+   * takes care of updating the configuration of all these sub-modules so that
+   * their copy of attribute values are in sync with the one in
+   * the LteEnbNetDevice.
    */
-  void UpdateConfig (void);
+  void UpdateConfig ();
 
   Ptr<LteEnbMac> m_mac;
 
@@ -146,6 +196,10 @@
 
   Ptr<FfMacScheduler> m_scheduler;
 
+  Ptr<LteHandoverAlgorithm> m_handoverAlgorithm;
+
+  Ptr<LteAnr> m_anr;
+
   uint16_t m_cellId; /**< Cell Identifer. Part of the CGI, see TS 29.274, section 8.21.1  */
 
   uint8_t m_dlBandwidth; /**< downlink bandwidth in RBs */
@@ -154,7 +208,10 @@
   uint16_t m_dlEarfcn;  /**< downlink carrier frequency */
   uint16_t m_ulEarfcn;  /**< uplink carrier frequency */
 
-};
+  uint16_t m_csgId;
+  bool m_csgIndication;
+
+}; // end of class LteEnbNetDevice
 
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/lte/model/lte-enb-phy.cc ns-3.19/src/lte/model/lte-enb-phy.cc
--- ns-3.18.1/src/lte/model/lte-enb-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-phy.cc	2013-12-20 09:44:51.000000000 -0800
@@ -49,7 +49,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteEnbPhy);
+NS_OBJECT_ENSURE_REGISTERED (LteEnbPhy)
+  ;
 
 // duration of the data part of a subframe in DL
 // = 0.001 / 14 * 11 (fixed to 11 symbols) -1ns as margin to avoid overlapping simulator events
@@ -525,6 +526,21 @@
   NS_LOG_FUNCTION (this);
 
   ++m_nrSubFrames;
+
+  /*
+   * Send SIB1 at 6th subframe of every odd-numbered radio frame. This is
+   * equivalent with Section 5.2.1.2 of 3GPP TS 36.331, where it is specified
+   * "repetitions are scheduled in subframe #5 of all other radio frames for
+   * which SFN mod 2 = 0," except that 3GPP counts frames and subframes starting
+   * from 0, while ns-3 counts starting from 1.
+   */
+  if ((m_nrSubFrames == 6) && ((m_nrFrames % 2) == 1))
+    {
+      Ptr<Sib1LteControlMessage> msg = Create<Sib1LteControlMessage> ();
+      msg->SetSib1 (m_sib1);
+      m_controlMessagesQueue.at (0).push_back (msg);
+    }
+
   if (m_srsPeriodicity>0)
     { 
       // might be 0 in case the eNB has no UEs attached
@@ -973,6 +989,14 @@
 }
 
 
+void
+LteEnbPhy::DoSetSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 sib1)
+{
+  NS_LOG_FUNCTION (this);
+  m_sib1 = sib1;
+}
+
+
 void
 LteEnbPhy::SetHarqPhyModule (Ptr<LteHarqPhy> harq)
 {
diff -Naur ns-3.18.1/src/lte/model/lte-enb-phy.h ns-3.19/src/lte/model/lte-enb-phy.h
--- ns-3.18.1/src/lte/model/lte-enb-phy.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-phy.h	2013-12-20 09:44:51.000000000 -0800
@@ -95,7 +95,7 @@
   void SetLteEnbCphySapUser (LteEnbCphySapUser* s);
 
   /**
-   * \param pw the transmission power in dBm
+   * \param pow the transmission power in dBm
    */
   void SetTxPower (double pow);
 
@@ -106,7 +106,7 @@
 
 
   /**
-   * \param pw the noise figure in dB
+   * \param pow the noise figure in dB
    */
   void SetNoiseFigure (double pow);
 
@@ -178,6 +178,7 @@
   * \brief Create the UL CQI feedback from SINR values perceived at
   * the physical layer with the PUSCH signal received from eNB
   * \param sinr SINR values vector
+  * \return UL CQI feedback in the format usable by an FF MAC scheduler
   */
   FfMacSchedSapProvider::SchedUlCqiInfoReqParameters CreatePuschCqiReport (const SpectrumValue& sinr);
   
@@ -185,6 +186,7 @@
   * \brief Create the UL CQI feedback from SINR values perceived at
   * the physical layer with the SRS signal received from eNB
   * \param sinr SINR values vector
+  * \return UL CQI feedback in the format usable by an FF MAC scheduler
   */
   FfMacSchedSapProvider::SchedUlCqiInfoReqParameters CreateSrsCqiReport (const SpectrumValue& sinr);
 
@@ -242,7 +244,7 @@
   virtual void GenerateCtrlCqiReport (const SpectrumValue& sinr);
   virtual void GenerateDataCqiReport (const SpectrumValue& sinr);
   virtual void ReportInterference (const SpectrumValue& interf);
-  virtual void ReportRsReceivedPower (const SpectrumValue& interf);
+  virtual void ReportRsReceivedPower (const SpectrumValue& power);
 
 
 
@@ -264,6 +266,7 @@
   void DoSetTransmissionMode (uint16_t  rnti, uint8_t txMode);
   void DoSetSrsConfigurationIndex (uint16_t  rnti, uint16_t srcCi);  
   void DoSetMasterInformationBlock (LteRrcSap::MasterInformationBlock mib);
+  void DoSetSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 sib1);
 
   // LteEnbPhySapProvider forwarded methods
   void DoSendMacPdu (Ptr<Packet> p);  
@@ -301,6 +304,7 @@
   uint16_t m_currentSrsOffset;
 
   LteRrcSap::MasterInformationBlock m_mib;
+  LteRrcSap::SystemInformationBlockType1 m_sib1;
 
   Ptr<LteHarqPhy> m_harqPhyModule;
 
diff -Naur ns-3.18.1/src/lte/model/lte-enb-rrc.cc ns-3.19/src/lte/model/lte-enb-rrc.cc
--- ns-3.18.1/src/lte/model/lte-enb-rrc.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-rrc.cc	2013-12-20 09:44:51.000000000 -0800
@@ -15,36 +15,32 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Author: Nicola Baldo <nbaldo@cttc.es>
- *         Marco Miozzo <mmiozzo@cttc.es>
- *         Manuel Requena <manuel.requena@cttc.es>
+ * Authors: Nicola Baldo <nbaldo@cttc.es>
+ *          Marco Miozzo <mmiozzo@cttc.es>
+ *          Manuel Requena <manuel.requena@cttc.es>
  */
 
-#include "ns3/fatal-error.h"
-#include "ns3/log.h"
-#include "ns3/abort.h"
-#include "ns3/pointer.h"
-#include "ns3/object-map.h"
-#include "ns3/object-factory.h"
-#include "ns3/simulator.h"
-
 #include "lte-enb-rrc.h"
 
-#include "lte-enb-net-device.h"
-#include "lte-radio-bearer-info.h"
-#include "eps-bearer-tag.h"
-#include "ff-mac-csched-sap.h"
-#include "epc-enb-s1-sap.h"
-
-#include "lte-rlc.h"
-#include "lte-rlc-tm.h"
-#include "lte-rlc-um.h"
-#include "lte-rlc-am.h"
-#include "lte-pdcp.h"
-#include "lte-pdcp-sap.h"
-
+#include <ns3/fatal-error.h>
+#include <ns3/log.h>
+#include <ns3/abort.h>
+
+#include <ns3/pointer.h>
+#include <ns3/object-map.h>
+#include <ns3/object-factory.h>
 #include <ns3/simulator.h>
 
+#include <ns3/lte-radio-bearer-info.h>
+#include <ns3/eps-bearer-tag.h>
+#include <ns3/packet.h>
+
+#include <ns3/lte-rlc.h>
+#include <ns3/lte-rlc-tm.h>
+#include <ns3/lte-rlc-um.h>
+#include <ns3/lte-rlc-am.h>
+#include <ns3/lte-pdcp.h>
+
 
 
 
@@ -54,10 +50,13 @@
 namespace ns3 {
 
 
-// ///////////////////////////
+///////////////////////////////////////////
 // CMAC SAP forwarder
-// ///////////////////////////
+///////////////////////////////////////////
 
+/**
+ * \brief Class for forwarding CMAC SAP User functions.
+ */
 class EnbRrcMemberLteEnbCmacSapUser : public LteEnbCmacSapUser
 {
 public:
@@ -95,19 +94,25 @@
 }
 
 
+
+///////////////////////////////////////////
+// UeManager
+///////////////////////////////////////////
+
+
 const char* g_ueManagerStateName[UeManager::NUM_STATES] = 
-  {
-    "INITIAL_RANDOM_ACCESS",
-    "CONNECTION_SETUP",
-    "CONNECTION_REJECTED",
-    "CONNECTED_NORMALLY",
-    "CONNECTION_RECONFIGURATION",
-    "CONNECTION_REESTABLISHMENT",
-    "HANDOVER_PREPARATION",
-    "HANDOVER_JOINING",
-    "HANDOVER_PATH_SWITCH",
-    "HANDOVER_LEAVING",
-  };
+{
+  "INITIAL_RANDOM_ACCESS",
+  "CONNECTION_SETUP",
+  "CONNECTION_REJECTED",
+  "CONNECTED_NORMALLY",
+  "CONNECTION_RECONFIGURATION",
+  "CONNECTION_REESTABLISHMENT",
+  "HANDOVER_PREPARATION",
+  "HANDOVER_JOINING",
+  "HANDOVER_PATH_SWITCH",
+  "HANDOVER_LEAVING",
+};
 
 std::string ToString (UeManager::State s)
 {
@@ -115,13 +120,8 @@
 }
 
 
-
-///////////////////////////////////////////
-// UeManager 
-///////////////////////////////////////////
-
-
-NS_OBJECT_ENSURE_REGISTERED (UeManager);
+NS_OBJECT_ENSURE_REGISTERED (UeManager)
+  ;
 
 
 UeManager::UeManager ()
@@ -248,19 +248,14 @@
 
     case HANDOVER_JOINING:
       m_handoverJoiningTimeout = Simulator::Schedule (m_rrc->m_handoverJoiningTimeoutDuration, 
-                                                 &LteEnbRrc::HandoverJoiningTimeout, 
-                                                 m_rrc, m_rnti);
+                                                      &LteEnbRrc::HandoverJoiningTimeout,
+                                                      m_rrc, m_rnti);
       break;      
 
     default:
       NS_FATAL_ERROR ("unexpected state " << ToString (m_state));
-      break;      
-    }  
-
-  m_servingCellMeasures = CreateObject<UeMeasure> ();
-  m_servingCellMeasures->m_cellId = m_rrc->m_cellId;
-  m_servingCellMeasures->m_rsrp = 0;
-  m_servingCellMeasures->m_rsrq = 0;
+      break;
+    }
 
 }
 
@@ -281,7 +276,6 @@
       m_rrc->m_x2uTeidInfoMap.erase (it->second->m_gtpTeid);
     }
 
-  m_servingCellMeasures = 0;
 }
 
 TypeId UeManager::GetTypeId (void)
@@ -310,7 +304,7 @@
     .AddTraceSource ("StateTransition",
                      "fired upon every UE state transition seen by the UeManager at the eNB RRC",
                      MakeTraceSourceAccessor (&UeManager::m_stateTransitionTrace))
-    ;
+  ;
   return tid;
 }
 
@@ -490,8 +484,8 @@
       // a previous reconfiguration still ongoing, we need to wait for it to be finished
       m_pendingRrcConnectionReconfiguration = true;
       break;
-      
-    case CONNECTED_NORMALLY:      
+
+    case CONNECTED_NORMALLY:
       {
         m_pendingRrcConnectionReconfiguration = false;
         LteRrcSap::RrcConnectionReconfiguration msg = BuildRrcConnectionReconfiguration ();
@@ -499,21 +493,21 @@
         RecordDataRadioBearersToBeStarted ();
         SwitchToState (CONNECTION_RECONFIGURATION);
       }
-      break;      
-      
+      break;
+
     default:
       NS_FATAL_ERROR ("method unexpected in state " << ToString (m_state));
-      break;      
+      break;
     }
 }
 
 void 
 UeManager::PrepareHandover (uint16_t cellId)
-{  
-  NS_LOG_FUNCTION (this << cellId);  
+{
+  NS_LOG_FUNCTION (this << cellId);
   switch (m_state)
     {
-    case CONNECTED_NORMALLY:      
+    case CONNECTED_NORMALLY:
       {
         m_targetCellId = cellId;
         EpcX2SapProvider::HandoverRequestParams params;
@@ -529,14 +523,14 @@
         LteRrcSap::HandoverPreparationInfo hpi;
         hpi.asConfig.sourceUeIdentity = m_rnti;
         hpi.asConfig.sourceDlCarrierFreq = m_rrc->m_dlEarfcn;
-        hpi.asConfig.sourceMeasConfig = BuildMeasConfig ();
+        hpi.asConfig.sourceMeasConfig = m_rrc->m_ueMeasConfig;
         hpi.asConfig.sourceRadioResourceConfig = GetRadioResourceConfigForHandoverPreparationInfo ();
         hpi.asConfig.sourceMasterInformationBlock.dlBandwidth = m_rrc->m_dlBandwidth;
         hpi.asConfig.sourceMasterInformationBlock.systemFrameNumber = 0;
-        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.plmnIdentityInfo.plmnIdentity = 0;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.plmnIdentityInfo.plmnIdentity = m_rrc->m_sib1.cellAccessRelatedInfo.plmnIdentityInfo.plmnIdentity;
         hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.cellIdentity = m_rrc->m_cellId;
-        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIndication = 0;
-        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIdentity = 0;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIndication = m_rrc->m_sib1.cellAccessRelatedInfo.csgIndication;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIdentity = m_rrc->m_sib1.cellAccessRelatedInfo.csgIdentity;
         LteEnbCmacSapProvider::RachConfig rc = m_rrc->m_cmacSapProvider->GetRachConfig ();
         hpi.asConfig.sourceSystemInformationBlockType2.radioResourceConfigCommon.rachConfigCommon.preambleInfo.numberOfRaPreambles = rc.numberOfRaPreambles;
         hpi.asConfig.sourceSystemInformationBlockType2.radioResourceConfigCommon.rachConfigCommon.raSupervisionInfo.preambleTransMax = rc.preambleTransMax;
@@ -558,7 +552,7 @@
       
     default:
       NS_FATAL_ERROR ("method unexpected in state " << ToString (m_state));
-      break;      
+      break;
     }
 
 }
@@ -583,8 +577,8 @@
   SwitchToState (HANDOVER_LEAVING);
   m_handoverLeavingTimeout = Simulator::Schedule (m_rrc->m_handoverLeavingTimeoutDuration, 
                                                   &LteEnbRrc::HandoverLeavingTimeout, 
-                                                  m_rrc, m_rnti);  
-  NS_ASSERT (handoverCommand.haveMobilityControlInfo);  
+                                                  m_rrc, m_rnti);
+  NS_ASSERT (handoverCommand.haveMobilityControlInfo);
   m_rrc->m_handoverStartTrace (m_imsi, m_rrc->m_cellId, m_rnti, handoverCommand.mobilityControlInfo.targetPhysCellId);
 
   EpcX2SapProvider::SnStatusTransferParams sst;
@@ -628,7 +622,7 @@
 UeManager::SendData (uint8_t bid, Ptr<Packet> p)
 {
   NS_LOG_FUNCTION (this << p << (uint16_t) bid);
-   switch (m_state)
+  switch (m_state)
     {
     case INITIAL_RANDOM_ACCESS:
     case CONNECTION_SETUP:
@@ -926,8 +920,9 @@
 void 
 UeManager::RecvMeasurementReport (LteRrcSap::MeasurementReport msg)
 {
-  NS_LOG_FUNCTION (this);
-  NS_LOG_LOGIC ("measId " << (uint16_t) msg.measResults.measId
+  uint8_t measId = msg.measResults.measId;
+  NS_LOG_FUNCTION (this << (uint16_t) measId);
+  NS_LOG_LOGIC ("measId " << (uint16_t) measId
                 << " haveMeasResultNeighCells " << msg.measResults.haveMeasResultNeighCells
                 << " measResultListEutra " << msg.measResults.measResultListEutra.size ());
   NS_LOG_LOGIC ("serving cellId " << m_rrc->m_cellId
@@ -943,124 +938,25 @@
                     << " RSRQ " << (it->haveRsrqResult ? (uint16_t) it->rsrqResult : 255));
     }
 
-  m_rrc->m_recvMeasurementReportTrace (m_imsi, m_rrc->m_cellId, m_rnti, msg);
-
-  // Just these two measId are supported
-  NS_ASSERT_MSG ((msg.measResults.measId == 1) || (msg.measResults.measId == 2),
-                 "Measure identity is unknown");
-
-  /// Event A2 (Serving becomes worse than threshold)
-  if (msg.measResults.measId == 1)
-    {
-      // Keep new RSRQ value reported for the serving cell
-      m_servingCellMeasures->m_rsrq = msg.measResults.rsrqResult;
-      m_servingCellMeasures->m_rsrp = msg.measResults.rsrpResult;
-
-      // Serving cell is worse than a handover threshold.
-      // This handover threshold is independent from the event A2 threshold
-      if (m_servingCellMeasures->m_rsrq <= m_rrc->m_servingCellHandoverThreshold)
-        {
-          // Find the best neighbour cell (eNB)
-          Ptr<UeMeasure> bestNeighbour = 0;
-          uint8_t bestNeighbourRsrq = 0;
-          NS_LOG_LOGIC ("Number of neighbour cells = " << m_neighbourCellMeasures.size ());
-          for (std::map <uint16_t, Ptr<UeMeasure> >::iterator it = m_neighbourCellMeasures.begin ();
-               it != m_neighbourCellMeasures.end ();
-               ++it)
-            {
-              if (it->second->m_rsrq > bestNeighbourRsrq)
-                {
-                  Ptr<NeighbourRelation> neighbourRelation = m_rrc->m_neighbourRelationTable[it->second->m_cellId];
-                  if ((neighbourRelation->m_noHo == false) &&
-                      (neighbourRelation->m_noX2 == false))
-                    {
-                      bestNeighbour = it->second;
-                      bestNeighbourRsrq = it->second->m_rsrq;
-                    }
-                }
-            }
-
-          // Trigger Handover, if needed
-          if (bestNeighbour)
-            {
-              uint16_t targetCellId = bestNeighbour->m_cellId;
-              NS_LOG_LOGIC ("Best neighbour cellId " << targetCellId);
-              if ( (bestNeighbour->m_rsrq - m_servingCellMeasures->m_rsrq >= m_rrc->m_neighbourCellHandoverOffset) &&
-                   (m_state == CONNECTED_NORMALLY) )
-                {
-                  NS_LOG_LOGIC ("Trigger Handover to cellId " << targetCellId);
-                  NS_LOG_LOGIC ("target cell RSRQ " << (uint16_t) bestNeighbour->m_rsrq);
-                  NS_LOG_LOGIC ("serving cell RSRQ " << (uint16_t) m_servingCellMeasures->m_rsrq);
-                  PrepareHandover (targetCellId);
-                }
-            }
-        }
+  if ((m_rrc->m_handoverManagementSapProvider != 0)
+      && (m_rrc->m_handoverMeasIds.find (measId) != m_rrc->m_handoverMeasIds.end ()))
+    {
+      // this measurement was requested by the handover algorithm
+      m_rrc->m_handoverManagementSapProvider->ReportUeMeas (m_rnti,
+                                                            msg.measResults);
     }
-  /// Event A4 (Neighbour becomes better than threshold)
-  else if (msg.measResults.measId == 2)
+
+  if ((m_rrc->m_anrSapProvider != 0)
+      && (m_rrc->m_anrMeasIds.find (measId) != m_rrc->m_anrMeasIds.end ()))
     {
-      // Update the NRT
-      if (msg.measResults.haveMeasResultNeighCells && ! (msg.measResults.measResultListEutra.empty ()))
-        {
-          for (std::list <LteRrcSap::MeasResultEutra>::iterator it = msg.measResults.measResultListEutra.begin ();
-               it != msg.measResults.measResultListEutra.end ();
-               ++it)
-            {
-              // Keep new RSRQ value reported for the neighbour cell
-              NS_ASSERT_MSG (it->haveRsrqResult == true, "RSRQ measure missing for cellId " << it->physCellId);
+      // this measurement was requested by the ANR function
+      m_rrc->m_anrSapProvider->ReportUeMeas (msg.measResults);
+    }
 
-              // Update Neighbour Relation Table
-              if (m_rrc->m_neighbourRelationTable.find (it->physCellId) != m_rrc->m_neighbourRelationTable.end ())
-                {
-                  // Update neighbour info
-                  Ptr<NeighbourRelation> neighbourRelation = m_rrc->m_neighbourRelationTable[it->physCellId];
-                  NS_ASSERT_MSG (neighbourRelation->m_physCellId == it->physCellId,
-                                 "Wrong cellId " << neighbourRelation->m_physCellId);
-
-                  if (neighbourRelation->m_noX2 == false)
-                    {
-                      neighbourRelation->m_noHo = false;
-                    }
-                  neighbourRelation->m_detectedAsNeighbour = true;
-                }
-              else // new neighbour
-                {
-                  Ptr<NeighbourRelation> neighbourRelation = CreateObject <NeighbourRelation> ();
-                  neighbourRelation->m_physCellId = it->physCellId;
-                  neighbourRelation->m_noRemove = false;
-                  neighbourRelation->m_noHo = true;
-                  neighbourRelation->m_noX2 = true;
-                  neighbourRelation->m_detectedAsNeighbour = true;
-                  m_rrc->m_neighbourRelationTable[it->physCellId] = neighbourRelation;
-                }
+  // fire a trace source
+  m_rrc->m_recvMeasurementReportTrace (m_imsi, m_rrc->m_cellId, m_rnti, msg);
 
-              // Update measure info of the neighbour cell
-              Ptr<UeMeasure> neighbourCellMeasures;
-              if (m_neighbourCellMeasures.find (it->physCellId) != m_neighbourCellMeasures.end ())
-                {
-                  neighbourCellMeasures = m_neighbourCellMeasures[it->physCellId];
-                  neighbourCellMeasures->m_cellId = it->physCellId;
-                  neighbourCellMeasures->m_rsrq = it->rsrqResult;
-                  neighbourCellMeasures->m_rsrp = 0;
-                }
-              else
-                {
-                  neighbourCellMeasures = CreateObject <UeMeasure> ();
-                  neighbourCellMeasures->m_cellId = it->physCellId;
-                  neighbourCellMeasures->m_rsrq = it->rsrqResult;
-                  neighbourCellMeasures->m_rsrp = 0;
-                  m_neighbourCellMeasures[it->physCellId] = neighbourCellMeasures;
-                }
-            }
-        }
-      else
-        {
-           NS_LOG_LOGIC ("WARNING");
-//            NS_ASSERT_MSG ("Event A4 received without measure results for neighbour cells");
-           // TODO Remove neighbours in the neighbourCellMeasures table
-        }
-    }
-}
+} // end of UeManager::RecvMeasurementReport
 
 
 // methods forwarded from CMAC SAP
@@ -1099,19 +995,19 @@
 
 
 uint16_t
-UeManager::GetRnti (void)
+UeManager::GetRnti (void) const
 {
   return m_rnti;
 }
 
 uint64_t
-UeManager::GetImsi (void)
+UeManager::GetImsi (void) const
 {
   return m_imsi;
 }
 
 uint16_t
-UeManager::GetSrsConfigurationIndex (void)
+UeManager::GetSrsConfigurationIndex (void) const
 {
   return m_physicalConfigDedicated.soundingRsUlConfigDedicated.srsConfigIndex;
 }
@@ -1136,7 +1032,7 @@
 }
 
 UeManager::State
-UeManager::GetState (void)
+UeManager::GetState (void) const
 {
   return m_state;
 }
@@ -1195,78 +1091,11 @@
   msg.radioResourceConfigDedicated = BuildRadioResourceConfigDedicated ();
   msg.haveMobilityControlInfo = false;
   msg.haveMeasConfig = true;
-  msg.measConfig = BuildMeasConfig ();
+  msg.measConfig = m_rrc->m_ueMeasConfig;
 
   return msg;
 }
 
-LteRrcSap::MeasConfig
-UeManager::BuildMeasConfig ()
-{
-  // Just intra-frequency measurements are supported,
-  // so just one measurement object is created
-  LteRrcSap::MeasObjectToAddMod measObject;
-  measObject.measObjectId = 1;
-  measObject.measObjectEutra.carrierFreq = m_rrc->m_dlEarfcn;
-  measObject.measObjectEutra.allowedMeasBandwidth = m_rrc->m_dlBandwidth;
-  measObject.measObjectEutra.presenceAntennaPort1 = false;
-  measObject.measObjectEutra.neighCellConfig = 0;
-  measObject.measObjectEutra.offsetFreq = 0;
-  measObject.measObjectEutra.haveCellForWhichToReportCGI = false;
-
-  // Just event A2 and event A4 are supported
-  LteRrcSap::ReportConfigToAddMod reportConfigA2;
-  reportConfigA2.reportConfigId = 1;
-  reportConfigA2.reportConfigEutra.triggerType = LteRrcSap::ReportConfigEutra::EVENT;
-  reportConfigA2.reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
-  reportConfigA2.reportConfigEutra.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ;
-  reportConfigA2.reportConfigEutra.threshold1.range = m_rrc->m_eventA2Threshold;
-  reportConfigA2.reportConfigEutra.hysteresis = 0;
-  reportConfigA2.reportConfigEutra.timeToTrigger = 0;
-  reportConfigA2.reportConfigEutra.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRQ;
-  reportConfigA2.reportConfigEutra.reportQuantity = LteRrcSap::ReportConfigEutra::SAME_AS_TRIGGER_QUANTITY; 
-  reportConfigA2.reportConfigEutra.maxReportCells = LteRrcSap::MaxReportCells;
-  reportConfigA2.reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::MS480;
-  reportConfigA2.reportConfigEutra.reportAmount = 255;
-
-  LteRrcSap::ReportConfigToAddMod reportConfigA4;
-  reportConfigA4.reportConfigId = 2;
-  reportConfigA4.reportConfigEutra.triggerType = LteRrcSap::ReportConfigEutra::EVENT;
-  reportConfigA4.reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
-  reportConfigA4.reportConfigEutra.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ;
-  reportConfigA4.reportConfigEutra.threshold1.range = m_rrc->m_eventA4Threshold;
-  reportConfigA4.reportConfigEutra.hysteresis = 0;
-  reportConfigA4.reportConfigEutra.timeToTrigger = 0;
-  reportConfigA4.reportConfigEutra.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRQ;
-  reportConfigA4.reportConfigEutra.reportQuantity = LteRrcSap::ReportConfigEutra::SAME_AS_TRIGGER_QUANTITY; 
-  reportConfigA4.reportConfigEutra.maxReportCells = LteRrcSap::MaxReportCells;
-  reportConfigA4.reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::MS480;
-  reportConfigA4.reportConfigEutra.reportAmount = 255;
-
-  LteRrcSap::MeasIdToAddMod measId[2];
-  measId[0].measId = 1;
-  measId[0].measObjectId = 1;
-  measId[0].reportConfigId = 1;
-  measId[1].measId = 2;
-  measId[1].measObjectId = 1;
-  measId[1].reportConfigId = 2;
-
-  LteRrcSap::MeasConfig measConfig;
-  measConfig.measObjectToAddModList.push_back (measObject);
-  measConfig.reportConfigToAddModList.push_back (reportConfigA2);
-  measConfig.reportConfigToAddModList.push_back (reportConfigA4);
-  measConfig.measIdToAddModList.push_back (measId[0]);
-  measConfig.measIdToAddModList.push_back (measId[1]);
-  measConfig.haveQuantityConfig = true;
-  measConfig.quantityConfig.filterCoefficientRSRP = 4; // default = fc4 (See TS 36.331)
-  measConfig.quantityConfig.filterCoefficientRSRQ = 4; // default = fc4 (See TS 36.331)
-  measConfig.haveMeasGapConfig = false;
-  measConfig.haveSmeasure = false;
-  measConfig.haveSpeedStatePars = false;
-
-  return measConfig;
-}
-
 LteRrcSap::RadioResourceConfigDedicated
 UeManager::BuildRadioResourceConfigDedicated ()
 {
@@ -1345,10 +1174,11 @@
 void 
 UeManager::SwitchToState (State newState)
 {
-  NS_LOG_FUNCTION (this << newState);
+  NS_LOG_FUNCTION (this << ToString (newState));
   State oldState = m_state;
   m_state = newState;
-  NS_LOG_INFO ("IMSI " << m_imsi << " RNTI " << m_rnti << " UeManager " << ToString (oldState) << " --> " << ToString (newState));
+  NS_LOG_INFO (this << "IMSI " << m_imsi << " RNTI " << m_rnti << " UeManager "
+                    << ToString (oldState) << " --> " << ToString (newState));
   m_stateTransitionTrace (m_imsi, m_rrc->m_cellId, m_rnti, oldState, newState);
   
   switch (newState)
@@ -1385,16 +1215,19 @@
 }
 
 
-  
-// ///////////////////////////
+
+///////////////////////////////////////////
 // eNB RRC methods
-// ///////////////////////////
+///////////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (LteEnbRrc);
+NS_OBJECT_ENSURE_REGISTERED (LteEnbRrc)
+  ;
 
 LteEnbRrc::LteEnbRrc ()
   : m_x2SapProvider (0),
     m_cmacSapProvider (0),
+    m_handoverManagementSapProvider (0),
+    m_anrSapProvider (0),
     m_rrcSapUser (0),
     m_macSapProvider (0),
     m_s1SapProvider (0),
@@ -1407,12 +1240,12 @@
 {
   NS_LOG_FUNCTION (this);
   m_cmacSapUser = new EnbRrcMemberLteEnbCmacSapUser (this);
+  m_handoverManagementSapUser = new MemberLteHandoverManagementSapUser<LteEnbRrc> (this);
+  m_anrSapUser = new MemberLteAnrSapUser<LteEnbRrc> (this);
   m_rrcSapProvider = new MemberLteEnbRrcSapProvider<LteEnbRrc> (this);
   m_x2SapUser = new EpcX2SpecificEpcX2SapUser<LteEnbRrc> (this);
   m_s1SapUser = new MemberEpcEnbS1SapUser<LteEnbRrc> (this);
   m_cphySapUser = new MemberLteEnbCphySapUser<LteEnbRrc> (this);
-
- 
 }
 
 
@@ -1428,6 +1261,8 @@
   NS_LOG_FUNCTION (this);
   m_ueMap.clear ();
   delete m_cmacSapUser;
+  delete m_handoverManagementSapUser;
+  delete m_anrSapUser;
   delete m_rrcSapProvider;
   delete m_x2SapUser;
   delete m_s1SapUser;
@@ -1446,10 +1281,10 @@
                    MakeObjectMapAccessor (&LteEnbRrc::m_ueMap),
                    MakeObjectMapChecker<UeManager> ())
     .AddAttribute ("DefaultTransmissionMode",
-                  "The default UEs' transmission mode (0: SISO)",
-                  UintegerValue (0),  // default tx-mode
-                  MakeUintegerAccessor (&LteEnbRrc::m_defaultTransmissionMode),
-                  MakeUintegerChecker<uint8_t> ())
+                   "The default UEs' transmission mode (0: SISO)",
+                   UintegerValue (0),  // default tx-mode
+                   MakeUintegerAccessor (&LteEnbRrc::m_defaultTransmissionMode),
+                   MakeUintegerChecker<uint8_t> ())
     .AddAttribute ("EpsBearerToRlcMapping", 
                    "Specify which type of RLC will be used for each type of EPS bearer. ",
                    EnumValue (RLC_SM_ALWAYS),
@@ -1460,65 +1295,85 @@
                                     PER_BASED,     "PacketErrorRateBased"))
     .AddAttribute ("SystemInformationPeriodicity",
                    "The interval for sending system information (Time value)",
-                   TimeValue (MilliSeconds (80)),  
+                   TimeValue (MilliSeconds (80)),
                    MakeTimeAccessor (&LteEnbRrc::m_systemInformationPeriodicity),
                    MakeTimeChecker ())
+
+    // SRS related attributes
     .AddAttribute ("SrsPeriodicity",
                    "The SRS periodicity in milliseconds",
-                   UintegerValue (40),  
+                   UintegerValue (40),
                    MakeUintegerAccessor (&LteEnbRrc::SetSrsPeriodicity, 
                                          &LteEnbRrc::GetSrsPeriodicity),
                    MakeUintegerChecker<uint32_t> ())
+
+    // Timeout related attributes
     .AddAttribute ("ConnectionTimeoutDuration",
                    "After a RA attempt, if no RRC Connection Request is received before this time, the UE context is destroyed. Must account for reception of RAR and transmission of RRC CONNECTION REQUEST over UL GRANT.",
-                   TimeValue (MilliSeconds (15)),  
+                   TimeValue (MilliSeconds (15)),
                    MakeTimeAccessor (&LteEnbRrc::m_connectionTimeoutDuration),
                    MakeTimeChecker ())
     .AddAttribute ("ConnectionRejectedTimeoutDuration",
                    "Time to wait between sending a RRC CONNECTION REJECT and destroying the UE context",
-                   TimeValue (MilliSeconds (30)),  
+                   TimeValue (MilliSeconds (30)),
                    MakeTimeAccessor (&LteEnbRrc::m_connectionRejectedTimeoutDuration),
                    MakeTimeChecker ())
     .AddAttribute ("HandoverJoiningTimeoutDuration",
                    "After accepting a handover request, if no RRC Connection Reconfiguration Completed is received before this time, the UE context is destroyed. Must account for reception of X2 HO REQ ACK by source eNB, transmission of the Handover Command, non-contention-based random access and reception of the RRC Connection Reconfiguration Completed message.",
-                   TimeValue (MilliSeconds (200)),  
+                   TimeValue (MilliSeconds (200)),
                    MakeTimeAccessor (&LteEnbRrc::m_handoverJoiningTimeoutDuration),
                    MakeTimeChecker ())
     .AddAttribute ("HandoverLeavingTimeoutDuration",
                    "After issuing a Handover Command, if neither RRC Connection Reestablishment nor X2 UE Context Release has been previously received, the UE context is destroyed.",
-                   TimeValue (MilliSeconds (500)),  
+                   TimeValue (MilliSeconds (500)),
                    MakeTimeAccessor (&LteEnbRrc::m_handoverLeavingTimeoutDuration),
                    MakeTimeChecker ())
-   .AddAttribute ("AdmitHandoverRequest",
+
+    // Cell selection related attribute
+   .AddAttribute ("QRxLevMin",
+                  "One of information transmitted within the SIB1 message, "
+                  "indicating the required minimum RSRP level that any UE must "
+                  "receive from this cell before it is allowed to camp to this "
+                  "cell. The default value -70 corresponds to -140 dBm and is "
+                  "the lowest possible value as defined by Section 6.3.4 of "
+                  "3GPP TS 36.133. This restriction, however, only applies to "
+                  "initial cell selection and EPC-enabled simulation.",
+                  TypeId::ATTR_GET | TypeId::ATTR_CONSTRUCT,
+                  IntegerValue (-70),
+                  MakeIntegerAccessor (&LteEnbRrc::m_qRxLevMin),
+                  MakeIntegerChecker<int8_t> (-70, -22))
+
+    // Handover related attributes
+    .AddAttribute ("AdmitHandoverRequest",
                    "Whether to admit an X2 handover request from another eNB",
-                   BooleanValue (true),  
+                   BooleanValue (true),
                    MakeBooleanAccessor (&LteEnbRrc::m_admitHandoverRequest),
-                   MakeBooleanChecker ()) 
-   .AddAttribute ("AdmitRrcConnectionRequest",
-                   "Whether to admit a connection request from a Ue",
-                   BooleanValue (true),  
+                   MakeBooleanChecker ())
+    .AddAttribute ("AdmitRrcConnectionRequest",
+                   "Whether to admit a connection request from a UE",
+                   BooleanValue (true),
                    MakeBooleanAccessor (&LteEnbRrc::m_admitRrcConnectionRequest),
                    MakeBooleanChecker ())
-    .AddAttribute ("EventA2Threshold",
-                   "Threshold of the event A2 (Serving becomes worse than threshold)",
-                   UintegerValue (34),
-                   MakeUintegerAccessor (&LteEnbRrc::m_eventA2Threshold),
-                   MakeUintegerChecker<uint8_t> ())
-    .AddAttribute ("EventA4Threshold",
-                   "Threshold of the event A4 (Neighbour becomes better than threshold)",
-                   UintegerValue (0),
-                   MakeUintegerAccessor (&LteEnbRrc::m_eventA4Threshold),
-                   MakeUintegerChecker<uint8_t> ())
-    .AddAttribute ("ServingCellHandoverThreshold",
-                   "If serving cell is worse than this threshold, neighbour cells are consider for Handover",
-                   UintegerValue (15),
-                   MakeUintegerAccessor (&LteEnbRrc::m_servingCellHandoverThreshold),
-                   MakeUintegerChecker<uint8_t> ())
-    .AddAttribute ("NeighbourCellHandoverOffset",
-                   "Minimum offset between serving and best neighbour cell to trigger the Handover",
-                   UintegerValue (1),
-                   MakeUintegerAccessor (&LteEnbRrc::m_neighbourCellHandoverOffset),
-                   MakeUintegerChecker<uint8_t> ())
+
+    // UE measurements related attributes
+    .AddAttribute ("RsrpFilterCoefficient",
+                   "Determines the strength of smoothing effect induced by "
+                   "layer 3 filtering of RSRP in all attached UE; "
+                   "if set to 0, no layer 3 filtering is applicable",
+                   // i.e. the variable k in 3GPP TS 36.331 section 5.5.3.2
+                   UintegerValue (4),
+                   MakeUintegerAccessor (&LteEnbRrc::m_rsrpFilterCoefficient),
+                   MakeUintegerChecker<uint8_t> (0))
+    .AddAttribute ("RsrqFilterCoefficient",
+                   "Determines the strength of smoothing effect induced by "
+                   "layer 3 filtering of RSRQ in all attached UE; "
+                   "if set to 0, no layer 3 filtering is applicable",
+                   // i.e. the variable k in 3GPP TS 36.331 section 5.5.3.2
+                   UintegerValue (4),
+                   MakeUintegerAccessor (&LteEnbRrc::m_rsrqFilterCoefficient),
+                   MakeUintegerChecker<uint8_t> (0))
+
+    // Trace sources
     .AddTraceSource ("NewUeContext",
                      "trace fired upon creation of a new UE context",
                      MakeTraceSourceAccessor (&LteEnbRrc::m_newUeContextTrace))
@@ -1570,6 +1425,34 @@
 }
 
 void
+LteEnbRrc::SetLteHandoverManagementSapProvider (LteHandoverManagementSapProvider * s)
+{
+  NS_LOG_FUNCTION (this << s);
+  m_handoverManagementSapProvider = s;
+}
+
+LteHandoverManagementSapUser*
+LteEnbRrc::GetLteHandoverManagementSapUser ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_handoverManagementSapUser;
+}
+
+void
+LteEnbRrc::SetLteAnrSapProvider (LteAnrSapProvider * s)
+{
+  NS_LOG_FUNCTION (this << s);
+  m_anrSapProvider = s;
+}
+
+LteAnrSapUser*
+LteEnbRrc::GetLteAnrSapUser ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_anrSapUser;
+}
+
+void
 LteEnbRrc::SetLteEnbRrcSapUser (LteEnbRrcSapUser * s)
 {
   NS_LOG_FUNCTION (this << s);
@@ -1622,15 +1505,105 @@
 {
   NS_LOG_FUNCTION (this << (uint32_t) rnti);
   NS_ASSERT (0 != rnti);
-  std::map<uint16_t, Ptr<UeManager> >::iterator it = m_ueMap.find (rnti);  
+  std::map<uint16_t, Ptr<UeManager> >::iterator it = m_ueMap.find (rnti);
   NS_ASSERT_MSG (it != m_ueMap.end (), "RNTI " << rnti << " not found in eNB with cellId " << m_cellId);
   return it->second;
 }
 
-void
-LteEnbRrc::ConfigureCell (uint8_t ulBandwidth, uint8_t dlBandwidth, uint16_t ulEarfcn, uint16_t dlEarfcn, uint16_t cellId)
+uint8_t
+LteEnbRrc::AddUeMeasReportConfig (LteRrcSap::ReportConfigEutra config)
 {
   NS_LOG_FUNCTION (this);
+
+  // SANITY CHECK
+
+  NS_ASSERT_MSG (m_ueMeasConfig.measIdToAddModList.size () == m_ueMeasConfig.reportConfigToAddModList.size (),
+                 "Measurement identities and reporting configuration should not have different quantity");
+
+  if (Simulator::Now () != Seconds (0))
+    {
+      NS_FATAL_ERROR ("AddUeMeasReportConfig may not be called after the simulation has run");
+    }
+
+  // INPUT VALIDATION
+
+  switch (config.triggerQuantity)
+    {
+    case LteRrcSap::ReportConfigEutra::RSRP:
+      if ((config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A5)
+          && (config.threshold2.choice != LteRrcSap::ThresholdEutra::THRESHOLD_RSRP))
+        {
+          NS_FATAL_ERROR ("The given triggerQuantity (RSRP) does not match with the given threshold2.choice");
+        }
+
+      if (((config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A1)
+           || (config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A2)
+           || (config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A4)
+           || (config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A5))
+          && (config.threshold1.choice != LteRrcSap::ThresholdEutra::THRESHOLD_RSRP))
+        {
+          NS_FATAL_ERROR ("The given triggerQuantity (RSRP) does not match with the given threshold1.choice");
+        }
+      break;
+
+    case LteRrcSap::ReportConfigEutra::RSRQ:
+      if ((config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A5)
+          && (config.threshold2.choice != LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ))
+        {
+          NS_FATAL_ERROR ("The given triggerQuantity (RSRQ) does not match with the given threshold2.choice");
+        }
+
+      if (((config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A1)
+           || (config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A2)
+           || (config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A4)
+           || (config.eventId == LteRrcSap::ReportConfigEutra::EVENT_A5))
+          && (config.threshold1.choice != LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ))
+        {
+          NS_FATAL_ERROR ("The given triggerQuantity (RSRQ) does not match with the given threshold1.choice");
+        }
+      break;
+
+    default:
+      NS_FATAL_ERROR ("unsupported triggerQuantity");
+      break;
+    }
+
+  if (config.purpose != LteRrcSap::ReportConfigEutra::REPORT_STRONGEST_CELLS)
+    {
+      NS_FATAL_ERROR ("Only REPORT_STRONGEST_CELLS purpose is supported");
+    }
+
+  if (config.reportQuantity != LteRrcSap::ReportConfigEutra::BOTH)
+    {
+      NS_LOG_WARN ("reportQuantity = BOTH will be used instead of the given reportQuantity");
+    }
+
+  uint8_t nextId = m_ueMeasConfig.reportConfigToAddModList.size () + 1;
+
+  // create the reporting configuration
+  LteRrcSap::ReportConfigToAddMod reportConfig;
+  reportConfig.reportConfigId = nextId;
+  reportConfig.reportConfigEutra = config;
+
+  // create the measurement identity
+  LteRrcSap::MeasIdToAddMod measId;
+  measId.measId = nextId;
+  measId.measObjectId = 1;
+  measId.reportConfigId = nextId;
+
+  // add both to the list of UE measurement configuration
+  m_ueMeasConfig.reportConfigToAddModList.push_back (reportConfig);
+  m_ueMeasConfig.measIdToAddModList.push_back (measId);
+
+  return nextId;
+}
+
+void
+LteEnbRrc::ConfigureCell (uint8_t ulBandwidth, uint8_t dlBandwidth,
+                          uint16_t ulEarfcn, uint16_t dlEarfcn, uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) ulBandwidth << (uint16_t) dlBandwidth
+                        << ulEarfcn << dlEarfcn << cellId);
   NS_ASSERT (!m_configured);
   m_cmacSapProvider->ConfigureMac (ulBandwidth, dlBandwidth);
   m_cphySapProvider->SetBandwidth (ulBandwidth, dlBandwidth);
@@ -1641,13 +1614,54 @@
   m_ulBandwidth = ulBandwidth;
   m_cellId = cellId;
   m_cphySapProvider->SetCellId (cellId);
+
+  /*
+   * Initializing the list of UE measurement configuration (m_ueMeasConfig).
+   * Only intra-frequency measurements are supported, so only one measurement
+   * object is created.
+   */
+
+  LteRrcSap::MeasObjectToAddMod measObject;
+  measObject.measObjectId = 1;
+  measObject.measObjectEutra.carrierFreq = m_dlEarfcn;
+  measObject.measObjectEutra.allowedMeasBandwidth = m_dlBandwidth;
+  measObject.measObjectEutra.presenceAntennaPort1 = false;
+  measObject.measObjectEutra.neighCellConfig = 0;
+  measObject.measObjectEutra.offsetFreq = 0;
+  measObject.measObjectEutra.haveCellForWhichToReportCGI = false;
+
+  m_ueMeasConfig.measObjectToAddModList.push_back (measObject);
+  m_ueMeasConfig.haveQuantityConfig = true;
+  m_ueMeasConfig.quantityConfig.filterCoefficientRSRP = m_rsrpFilterCoefficient;
+  m_ueMeasConfig.quantityConfig.filterCoefficientRSRQ = m_rsrqFilterCoefficient;
+  m_ueMeasConfig.haveMeasGapConfig = false;
+  m_ueMeasConfig.haveSmeasure = false;
+  m_ueMeasConfig.haveSpeedStatePars = false;
+
+  // Enabling MIB transmission
   LteRrcSap::MasterInformationBlock mib;
   mib.dlBandwidth = m_dlBandwidth;
   m_cphySapProvider->SetMasterInformationBlock (mib);
-  m_configured = true;
 
-  // the first time System Information is sent
+  // Enabling SIB1 transmission with default values
+  m_sib1.cellAccessRelatedInfo.cellIdentity = cellId;
+  m_sib1.cellAccessRelatedInfo.csgIndication = false;
+  m_sib1.cellAccessRelatedInfo.csgIdentity = 0;
+  m_sib1.cellAccessRelatedInfo.plmnIdentityInfo.plmnIdentity = 0; // not used
+  m_sib1.cellSelectionInfo.qQualMin = -34; // not used, set as minimum value
+  m_sib1.cellSelectionInfo.qRxLevMin = m_qRxLevMin; // set as minimum value
+  m_cphySapProvider->SetSystemInformationBlockType1 (m_sib1);
+
+  /*
+   * Enabling transmission of other SIB. The first time System Information is
+   * transmitted is arbitrarily assumed to be at +0.016s, and then it will be
+   * regularly transmitted every 80 ms by default (set the
+   * SystemInformationPeriodicity attribute to configure this).
+   */
   Simulator::Schedule (MilliSeconds (16), &LteEnbRrc::SendSystemInformation, this);
+
+  m_configured = true;
+
 }
 
 
@@ -1655,6 +1669,10 @@
 LteEnbRrc::SetCellId (uint16_t cellId)
 {
   m_cellId = cellId;
+
+  // update SIB1 too
+  m_sib1.cellAccessRelatedInfo.cellIdentity = cellId;
+  m_cphySapProvider->SetSystemInformationBlockType1 (m_sib1);
 }
 
 bool
@@ -1667,7 +1685,7 @@
   NS_ASSERT_MSG (found, "no EpsBearerTag found in packet to be sent");
   Ptr<UeManager> ueManager = GetUeManager (tag.GetRnti ());
   ueManager->SendData (tag.GetBid (), packet);
-  
+
   return true;
 }
 
@@ -1736,8 +1754,7 @@
 LteEnbRrc::DoRecvRrcConnectionRequest (uint16_t rnti, LteRrcSap::RrcConnectionRequest msg)
 {
   NS_LOG_FUNCTION (this << rnti);
-  
-    GetUeManager (rnti)->RecvRrcConnectionRequest (msg);
+  GetUeManager (rnti)->RecvRrcConnectionRequest (msg);
 }
 
 void
@@ -2016,6 +2033,67 @@
 }
 
 
+uint8_t
+LteEnbRrc::DoAddUeMeasReportConfigForHandover (LteRrcSap::ReportConfigEutra reportConfig)
+{
+  NS_LOG_FUNCTION (this);
+  uint8_t measId = AddUeMeasReportConfig (reportConfig);
+  m_handoverMeasIds.insert (measId);
+  return measId;
+}
+
+void
+LteEnbRrc::DoTriggerHandover (uint16_t rnti, uint16_t targetCellId)
+{
+  NS_LOG_FUNCTION (this << rnti << targetCellId);
+
+  bool isHandoverAllowed = true;
+
+  if (m_anrSapProvider != 0)
+    {
+      // ensure that proper neighbour relationship exists between source and target cells
+      bool noHo = m_anrSapProvider->GetNoHo (targetCellId);
+      bool noX2 = m_anrSapProvider->GetNoX2 (targetCellId);
+      NS_LOG_DEBUG (this << " cellId=" << m_cellId
+                         << " targetCellId=" << targetCellId
+                         << " NRT.NoHo=" << noHo << " NRT.NoX2=" << noX2);
+
+      if (noHo || noX2)
+        {
+          isHandoverAllowed = false;
+          NS_LOG_LOGIC (this << " handover to cell " << targetCellId
+                             << " is not allowed by ANR");
+        }
+    }
+
+  Ptr<UeManager> ueManager = GetUeManager (rnti);
+  NS_ASSERT_MSG (ueManager != 0, "Cannot find UE context with RNTI " << rnti);
+
+  if (ueManager->GetState () != UeManager::CONNECTED_NORMALLY)
+    {
+      isHandoverAllowed = false;
+      NS_LOG_LOGIC (this << " handover is not allowed because the UE"
+                         << " rnti=" << rnti << " is in "
+                         << ToString (ueManager->GetState ()) << " state");
+    }
+
+  if (isHandoverAllowed)
+    {
+      // initiate handover execution
+      ueManager->PrepareHandover (targetCellId);
+    }
+}
+
+uint8_t
+LteEnbRrc::DoAddUeMeasReportConfigForAnr (LteRrcSap::ReportConfigEutra reportConfig)
+{
+  NS_LOG_FUNCTION (this);
+  uint8_t measId = AddUeMeasReportConfig (reportConfig);
+  m_anrMeasIds.insert (measId);
+  return measId;
+}
+
+
 
 uint16_t
 LteEnbRrc::AddUe (UeManager::State state)
@@ -2030,7 +2108,7 @@
       if ((rnti != 0) && (m_ueMap.find (rnti) == m_ueMap.end ()))
         {
           found = true;
-          break;        
+          break;
         }
     }
 
@@ -2060,7 +2138,7 @@
     }
   // need to do this after UeManager has been deleted
   RemoveSrsConfigurationIndex (srsCi); 
- }
+}
 
 TypeId
 LteEnbRrc::GetRlcType (EpsBearer bearer)
@@ -2100,17 +2178,21 @@
 void
 LteEnbRrc::AddX2Neighbour (uint16_t cellId)
 {
-  NS_LOG_FUNCTION (cellId);
-  NS_ASSERT_MSG (m_neighbourRelationTable.find (cellId) == m_neighbourRelationTable.end (),
-                 "There is already an entry in the Neighbour Relation Table for cellId " << cellId);
-
-  Ptr<NeighbourRelation> neighbourRelation = CreateObject <NeighbourRelation> ();
-  neighbourRelation->m_physCellId = cellId;
-  neighbourRelation->m_noRemove = true;
-  neighbourRelation->m_noHo = true;
-  neighbourRelation->m_noX2 = false;
-  neighbourRelation->m_detectedAsNeighbour = false;
-  m_neighbourRelationTable[cellId] = neighbourRelation;
+  NS_LOG_FUNCTION (this << cellId);
+
+  if (m_anrSapProvider != 0)
+    {
+      m_anrSapProvider->AddNeighbourRelation (cellId);
+    }
+}
+
+void
+LteEnbRrc::SetCsgId (uint32_t csgId, bool csgIndication)
+{
+  NS_LOG_FUNCTION (this << csgId << csgIndication);
+  m_sib1.cellAccessRelatedInfo.csgIdentity = csgId;
+  m_sib1.cellAccessRelatedInfo.csgIndication = csgIndication;
+  m_cphySapProvider->SetSystemInformationBlockType1 (m_sib1);
 }
 
 
@@ -2236,14 +2318,17 @@
 void
 LteEnbRrc::SendSystemInformation ()
 {
-//   NS_LOG_FUNCTION (this);
-  // for simplicity, we use the same periodicity for all sibs
-  // note that in real systems the periodicy of each sibs could be different
+  // NS_LOG_FUNCTION (this);
+
+  /*
+   * For simplicity, we use the same periodicity for all SIBs. Note that in real
+   * systems the periodicy of each SIBs could be different.
+   */
   LteRrcSap::SystemInformation si;
   si.haveSib2 = true;
   si.sib2.freqInfo.ulCarrierFreq = m_ulEarfcn;
   si.sib2.freqInfo.ulBandwidth = m_ulBandwidth;
-  
+
   LteEnbCmacSapProvider::RachConfig rc = m_cmacSapProvider->GetRachConfig ();
   LteRrcSap::RachConfigCommon rachConfigCommon;
   rachConfigCommon.preambleInfo.numberOfRaPreambles = rc.numberOfRaPreambles;
@@ -2255,5 +2340,6 @@
   Simulator::Schedule (m_systemInformationPeriodicity, &LteEnbRrc::SendSystemInformation, this);
 }
 
+
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/lte/model/lte-enb-rrc.h ns-3.19/src/lte/model/lte-enb-rrc.h
--- ns-3.18.1/src/lte/model/lte-enb-rrc.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-enb-rrc.h	2013-12-20 09:44:51.000000000 -0800
@@ -25,17 +25,20 @@
 
 #include <ns3/nstime.h>
 #include <ns3/object.h>
-#include <ns3/packet.h>
+#include <ns3/traced-callback.h>
+#include <ns3/event-id.h>
+
 #include <ns3/lte-enb-cmac-sap.h>
 #include <ns3/lte-mac-sap.h>
 #include <ns3/ff-mac-sched-sap.h>
+#include <ns3/ff-mac-csched-sap.h>
 #include <ns3/lte-pdcp-sap.h>
 #include <ns3/epc-x2-sap.h>
 #include <ns3/epc-enb-s1-sap.h>
+#include <ns3/lte-handover-management-sap.h>
 #include <ns3/lte-enb-cphy-sap.h>
 #include <ns3/lte-rrc-sap.h>
-#include <ns3/traced-callback.h>
-#include <ns3/event-id.h>
+#include <ns3/lte-anr-sap.h>
 
 #include <map>
 #include <set>
@@ -45,38 +48,10 @@
 class LteRadioBearerInfo;
 class LteSignalingRadioBearerInfo;
 class LteDataRadioBearerInfo;
-class EpcEnbS1SapUser;
-class EpcEnbS1SapProvider;
-class LteUeRrc;
 class LteEnbRrc;
+class Packet;
 
 
-/**
- * Neighbour Relation between two eNBs (serving eNB and neighbour eNB)
- * See XXXXX for more info
- */
-class NeighbourRelation : public Object
-{
-public:
-  uint16_t  m_physCellId;
-  bool      m_noRemove;
-  bool      m_noHo;
-  bool      m_noX2;
-  bool      m_detectedAsNeighbour;
-};
-
-/**
- * Measurements reported by a UE for a cellId
- * The values are quantized according 3GPP TS XXXXX
- */
-class UeMeasure : public Object
-{
-public:
-  uint16_t  m_cellId;
-  uint8_t   m_rsrp;
-  uint8_t   m_rsrq;
-};
-
 
 /**
  * Manages all the radio bearer information possessed by the ENB RRC for a single UE
@@ -94,19 +69,19 @@
    * 
    */
   enum State
-    {
-      INITIAL_RANDOM_ACCESS = 0,
-      CONNECTION_SETUP,
-      CONNECTION_REJECTED,
-      CONNECTED_NORMALLY,
-      CONNECTION_RECONFIGURATION,
-      CONNECTION_REESTABLISHMENT,
-      HANDOVER_PREPARATION,
-      HANDOVER_JOINING,
-      HANDOVER_PATH_SWITCH,
-      HANDOVER_LEAVING,
-      NUM_STATES
-    };
+  {
+    INITIAL_RANDOM_ACCESS = 0,
+    CONNECTION_SETUP,
+    CONNECTION_REJECTED,
+    CONNECTED_NORMALLY,
+    CONNECTION_RECONFIGURATION,
+    CONNECTION_REESTABLISHMENT,
+    HANDOVER_PREPARATION,
+    HANDOVER_JOINING,
+    HANDOVER_PATH_SWITCH,
+    HANDOVER_LEAVING,
+    NUM_STATES
+  };
 
   UeManager ();
  
@@ -260,21 +235,31 @@
    */
   void RecvUeContextRelease (EpcX2SapUser::UeContextReleaseParams params); 
 
-  // methods forwarded from RRC SAP
+
+  // METHODS FORWARDED FROM ENB RRC SAP ///////////////////////////////////////
+
+  /// Part of the RRC protocol. Implement the LteEnbRrcSapProvider::CompleteSetupUe interface.
   void CompleteSetupUe (LteEnbRrcSapProvider::CompleteSetupUeParameters params);
+  /// Part of the RRC protocol. Implement the LteEnbRrcSapProvider::RecvRrcConnectionRequest interface.
   void RecvRrcConnectionRequest (LteRrcSap::RrcConnectionRequest msg);
+  /// Part of the RRC protocol. Implement the LteEnbRrcSapProvider::RecvRrcConnectionSetupCompleted interface.
   void RecvRrcConnectionSetupCompleted (LteRrcSap::RrcConnectionSetupCompleted msg);
+  /// Part of the RRC protocol. Implement the LteEnbRrcSapProvider::RecvRrcConnectionReconfigurationCompleted interface.
   void RecvRrcConnectionReconfigurationCompleted (LteRrcSap::RrcConnectionReconfigurationCompleted msg);
+  /// Part of the RRC protocol. Implement the LteEnbRrcSapProvider::RecvRrcConnectionReestablishmentRequest interface.
   void RecvRrcConnectionReestablishmentRequest (LteRrcSap::RrcConnectionReestablishmentRequest msg);
+  /// Part of the RRC protocol. Implement the LteEnbRrcSapProvider::RecvRrcConnectionReestablishmentComplete interface.
   void RecvRrcConnectionReestablishmentComplete (LteRrcSap::RrcConnectionReestablishmentComplete msg);
+  /// Part of the RRC protocol. Implement the LteEnbRrcSapProvider::RecvMeasurementReport interface.
   void RecvMeasurementReport (LteRrcSap::MeasurementReport msg);
 
 
-  // methods forwarded from CMAC SAP
+  // METHODS FORWARDED FROM ENB CMAC SAP //////////////////////////////////////
+
   void CmacUeConfigUpdateInd (LteEnbCmacSapUser::UeConfig cmacParams);
 
+  // METHODS FORWARDED FROM ENB PDCP SAP //////////////////////////////////////
 
-  // methods forwarded from PDCP SAP
   void DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameters params);
   
   /** 
@@ -282,19 +267,19 @@
    * \return the RNTI, i.e., an UE identifier that is unique within
    * the cell
    */
-  uint16_t GetRnti (void);
+  uint16_t GetRnti (void) const;
 
   /** 
    *
    * \return the IMSI, i.e., a globally unique UE identifier
    */
-  uint64_t GetImsi (void);
+  uint64_t GetImsi (void) const;
 
   /** 
    * 
    * \return the SRS Configuration Index
    */
-  uint16_t GetSrsConfigurationIndex (void);  
+  uint16_t GetSrsConfigurationIndex (void) const;
 
   /** 
    * Set the SRS configuration index and do the necessary reconfiguration
@@ -307,7 +292,7 @@
    * 
    * \return the current state
    */
-  State GetState ();
+  State GetState () const;
 
 
 private:
@@ -341,7 +326,7 @@
    * current configuration
    */
   LteRrcSap::RrcConnectionReconfiguration BuildRrcConnectionReconfiguration ();
-  
+
   /** 
    * 
    * \return a RadioResourceConfigDedicated struct built based on the
@@ -351,14 +336,6 @@
 
   /** 
    * 
-   * \return a MeasConfig struct built based on the
-   * current configuration
-   */
-  LteRrcSap::MeasConfig BuildMeasConfig ();
-
-
-  /** 
-   * 
    * \return a newly allocated identifier for a new RRC transaction
    */
   uint8_t GetNewRrcTransactionIdentifier ();
@@ -438,13 +415,10 @@
   EventId m_handoverJoiningTimeout;
   EventId m_handoverLeavingTimeout;
 
-  Ptr<UeMeasure> m_servingCellMeasures;
-  //       cellid
-  std::map<uint16_t, Ptr<UeMeasure> > m_neighbourCellMeasures;
-
 };
 
 
+
 /**
  * \ingroup lte
  * 
@@ -454,6 +428,8 @@
 {
 
   friend class EnbRrcMemberLteEnbCmacSapUser;
+  friend class MemberLteHandoverManagementSapUser<LteEnbRrc>;
+  friend class MemberLteAnrSapUser<LteEnbRrc>;
   friend class MemberLteEnbRrcSapProvider<LteEnbRrc>;
   friend class MemberEpcEnbS1SapUser<LteEnbRrc>;
   friend class EpcX2SpecificEpcX2SapUser<LteEnbRrc>;
@@ -507,6 +483,36 @@
 
 
   /**
+   * set the Handover Management SAP this RRC should interact with
+   *
+   * \param s the Handover Management SAP Provider to be used by this RRC
+   */
+  void SetLteHandoverManagementSapProvider (LteHandoverManagementSapProvider * s);
+
+  /**
+   * Get the Handover Management SAP offered by this RRC
+   * \return s the Handover Management SAP User interface offered to the
+   *           handover algorithm by this RRC
+   */
+  LteHandoverManagementSapUser* GetLteHandoverManagementSapUser ();
+
+
+  /**
+   * set the ANR SAP this RRC should interact with
+   *
+   * \param s the ANR SAP Provider to be used by this RRC
+   */
+  void SetLteAnrSapProvider (LteAnrSapProvider * s);
+
+  /**
+   * Get the ANR SAP offered by this RRC
+   * \return s the ANR SAP User interface offered to the ANR instance by this
+   *           RRC
+   */
+  LteAnrSapUser* GetLteAnrSapUser ();
+
+
+  /**
    * set the RRC SAP this RRC should interact with
    *
    * \param s the RRC SAP User to be used by this RRC
@@ -568,20 +574,50 @@
   Ptr<UeManager> GetUeManager (uint16_t rnti);
 
   /**
-   * configure cell-specific parameters
+   * \brief Add a new UE measurement reporting configuration
+   * \param config the new reporting configuration
+   * \return the measurement ID (measId) referring to the newly added
+   *         reporting configuration
+   *
+   * Assuming intra-frequency environment, the new measurement reporting
+   * configuration will be automatically associated to the only measurement
+   * object (i.e., a new measurement identity will be automatically created).
    *
+   * Can only be called before the start of simulation.
+   */
+  uint8_t AddUeMeasReportConfig (LteRrcSap::ReportConfigEutra config);
+
+  /**
+   * \brief Configure cell-specific parameters.
    * \param ulBandwidth the uplink bandwidth in number of RB
    * \param dlBandwidth the downlink bandwidth in number of RB
    * \param ulEarfcn the UL EARFCN
    * \param dlEarfcn the DL EARFCN
    * \param cellId the ID of the cell
+   *
+   * Configure cell-specific parameters and propagate them to lower layers.
+   * The parameters include bandwidth, EARFCN (E-UTRA Absolute Radio Frequency
+   * Channel Number), and cell ID.
+   *
+   * In addition to parameter configuration, this function also performs several
+   * other tasks:
+   *  - Initializing UE measurement (i.e. measurement object and quantity
+   *    configuration), which is expected to be further configured through
+   *    `LteEnbRrc::AddUeMeasReportConfig`;
+   *  - Enabling MIB (Master Information Block) broadcast transmission
+   *  - Enabling SIB (System Information Block) broadcast transmission
+   *
+   * Typically runs when the eNodeB NetDevice is installed, for instance by
+   * `LteHelper::InstallEnbDevice` (i.e. before the simulation starts).
+   *
+   * \warning Raises an error when executed more than once.
    */
   void ConfigureCell (uint8_t ulBandwidth,
                       uint8_t dlBandwidth,
                       uint16_t ulEarfcn, 
                       uint16_t dlEarfcn,
                       uint16_t cellId);
-  
+
   /** 
    * set the cell id of this eNB
    * 
@@ -603,7 +639,6 @@
   /** 
    * set the callback used to forward data packets up the stack
    * 
-   * \param void 
    * \param cb 
    */
   void SetForwardUpCallback (Callback <void, Ptr<Packet> > cb);
@@ -646,8 +681,8 @@
    * by sending a handover request to the target eNB over the X2
    * interface 
    *
-   * \param imsi the id of the UE to be handed over 
-   * \param cellId the id of the target eNB
+   * \param rnti the ID of the UE to be handed over
+   * \param cellId the ID of the target eNB
    */
   void SendHandoverRequest (uint16_t rnti, uint16_t cellId);
 
@@ -663,21 +698,30 @@
 private:
 
 
-  // methods forwarded from RRC SAP
-  
+  // RRC SAP methods
+
+  /// Part of the RRC protocol. Forwarding LteEnbRrcSapProvider::CompleteSetupUe interface to UeManager::CompleteSetupUe
   void DoCompleteSetupUe (uint16_t rnti, LteEnbRrcSapProvider::CompleteSetupUeParameters params);
+  /// Part of the RRC protocol. Forwarding LteEnbRrcSapProvider::RecvRrcConnectionRequest interface to UeManager::RecvRrcConnectionRequest
   void DoRecvRrcConnectionRequest (uint16_t rnti, LteRrcSap::RrcConnectionRequest msg);
+  /// Part of the RRC protocol. Forwarding LteEnbRrcSapProvider::RecvRrcConnectionSetupCompleted interface to UeManager::RecvRrcConnectionSetupCompleted
   void DoRecvRrcConnectionSetupCompleted (uint16_t rnti, LteRrcSap::RrcConnectionSetupCompleted msg);
+  /// Part of the RRC protocol. Forwarding LteEnbRrcSapProvider::RecvRrcConnectionReconfigurationCompleted interface to UeManager::RecvRrcConnectionReconfigurationCompleted
   void DoRecvRrcConnectionReconfigurationCompleted (uint16_t rnti, LteRrcSap::RrcConnectionReconfigurationCompleted msg);
+  /// Part of the RRC protocol. Forwarding LteEnbRrcSapProvider::RecvRrcConnectionReestablishmentRequest interface to UeManager::RecvRrcConnectionReestablishmentRequest
   void DoRecvRrcConnectionReestablishmentRequest (uint16_t rnti, LteRrcSap::RrcConnectionReestablishmentRequest msg);
+  /// Part of the RRC protocol. Forwarding LteEnbRrcSapProvider::RecvRrcConnectionReestablishmentComplete interface to UeManager::RecvRrcConnectionReestablishmentComplete
   void DoRecvRrcConnectionReestablishmentComplete (uint16_t rnti, LteRrcSap::RrcConnectionReestablishmentComplete msg);
+  /// Part of the RRC protocol. Forwarding LteEnbRrcSapProvider::RecvMeasurementReport interface to UeManager::RecvMeasurementReport
   void DoRecvMeasurementReport (uint16_t rnti, LteRrcSap::MeasurementReport msg);
 
-
   // S1 SAP methods
+
   void DoDataRadioBearerSetupRequest (EpcEnbS1SapUser::DataRadioBearerSetupRequestParameters params);
-  void DoPathSwitchRequestAcknowledge (EpcEnbS1SapUser::PathSwitchRequestAcknowledgeParameters params);       
+  void DoPathSwitchRequestAcknowledge (EpcEnbS1SapUser::PathSwitchRequestAcknowledgeParameters params);
+
   // X2 SAP methods
+
   void DoRecvHandoverRequest (EpcX2SapUser::HandoverRequestParams params);
   void DoRecvHandoverRequestAck (EpcX2SapUser::HandoverRequestAckParams params);
   void DoRecvHandoverPreparationFailure (EpcX2SapUser::HandoverPreparationFailureParams params);
@@ -687,12 +731,21 @@
   void DoRecvResourceStatusUpdate (EpcX2SapUser::ResourceStatusUpdateParams params);
   void DoRecvUeData (EpcX2SapUser::UeDataParams params);
 
-
   // CMAC SAP methods
+
   uint16_t DoAllocateTemporaryCellRnti ();
   void DoNotifyLcConfigResult (uint16_t rnti, uint8_t lcid, bool success);
   void DoRrcConfigurationUpdateInd (LteEnbCmacSapUser::UeConfig params);
-  
+
+  // Handover Management SAP methods
+
+  uint8_t DoAddUeMeasReportConfigForHandover (LteRrcSap::ReportConfigEutra reportConfig);
+  void DoTriggerHandover (uint16_t rnti, uint16_t targetCellId);
+
+  // ANR SAP methods
+
+  uint8_t DoAddUeMeasReportConfigForAnr (LteRrcSap::ReportConfigEutra reportConfig);
+
 
   // Internal methods
 
@@ -730,7 +783,7 @@
   /** 
    * Add a neighbour with an X2 interface
    *
-   * \param cellid neighbouring cell id
+   * \param cellId neighbouring cell id
    */
   void AddX2Neighbour (uint16_t cellId);
 
@@ -746,6 +799,27 @@
    */
   uint32_t GetSrsPeriodicity () const;
 
+  /**
+   * \brief Associate this RRC entity with a particular CSG information.
+   * \param csgId the intended Closed Subscriber Group identity
+   * \param csgIndication if TRUE, only CSG members are allowed to access the
+   *                      cell
+   *
+   * CSG identity is a number identifying a Closed Subscriber Group which the
+   * cell belongs to. eNodeB is associated with a single CSG identity.
+   *
+   * The same CSG identity can also be associated to several UEs, which is
+   * equivalent as enlisting these UEs as the members of this particular CSG.
+   * When the CSG indication field is set to TRUE, only UEs which are members of
+   * the CSG (i.e. same CSG ID) can gain access to the eNodeB, therefore
+   * enforcing closed access mode. Otherwise, the eNodeB operates as a non-CSG
+   * cell and implements open access mode.
+   *
+   * This restriction only applies to initial cell selection and EPC-enabled
+   * simulation.
+   */
+  void SetCsgId (uint32_t csgId, bool csgIndication);
+
 private:
 
   /** 
@@ -804,6 +878,12 @@
   LteEnbCmacSapUser* m_cmacSapUser;
   LteEnbCmacSapProvider* m_cmacSapProvider;
 
+  LteHandoverManagementSapUser* m_handoverManagementSapUser;
+  LteHandoverManagementSapProvider* m_handoverManagementSapProvider;
+
+  LteAnrSapUser* m_anrSapUser;
+  LteAnrSapProvider* m_anrSapProvider;
+
   LteEnbRrcSapUser* m_rrcSapUser;
   LteEnbRrcSapProvider* m_rrcSapProvider;
 
@@ -823,46 +903,57 @@
   uint16_t m_ulBandwidth;
   uint16_t m_lastAllocatedRnti;
 
-  std::map<uint16_t, Ptr<UeManager> > m_ueMap;  
+  /// the System Information Block Type 1 that is currently broadcasted over BCH
+  LteRrcSap::SystemInformationBlockType1 m_sib1;
+
+  std::map<uint16_t, Ptr<UeManager> > m_ueMap;
+
+  /**
+   * \brief List of measurement configuration which are active in every UE
+   *        attached to this eNodeB instance.
+   */
+  LteRrcSap::MeasConfig m_ueMeasConfig;
+
+  std::set<uint8_t> m_handoverMeasIds;
+  std::set<uint8_t> m_anrMeasIds;
 
   struct X2uTeidInfo
   {
     uint16_t rnti;
     uint8_t drbid;
   };
-    
+
   //       TEID      RNTI, DRBID
-  std::map<uint32_t, X2uTeidInfo> m_x2uTeidInfoMap; 
-  
+  std::map<uint32_t, X2uTeidInfo> m_x2uTeidInfoMap;
+
   uint8_t m_defaultTransmissionMode;
 
   enum LteEpsBearerToRlcMapping_t m_epsBearerToRlcMapping;
 
   Time m_systemInformationPeriodicity;
-  
+
   // SRS related attributes
   uint16_t m_srsCurrentPeriodicityId;
   std::set<uint16_t> m_ueSrsConfigurationIndexSet;
   uint16_t m_lastAllocatedConfigurationIndex;
   bool m_reconfigureUes;
 
+  // Cell selection related attribute
+  int8_t m_qRxLevMin;
+
   // Handover related attributes
   bool m_admitHandoverRequest;
   bool m_admitRrcConnectionRequest;
-  uint8_t m_eventA2Threshold;
-  uint8_t m_eventA4Threshold;
-  uint8_t m_servingCellHandoverThreshold;
-  uint8_t m_neighbourCellHandoverOffset;
+
+  // UE measurements related attributes
+  uint8_t m_rsrpFilterCoefficient;
+  uint8_t m_rsrqFilterCoefficient;
 
   // timeouts
   Time m_connectionTimeoutDuration;
   Time m_connectionRejectedTimeoutDuration;
   Time m_handoverJoiningTimeoutDuration;
-  Time m_handoverLeavingTimeoutDuration;  
-
-  //       cellid
-  std::map<uint16_t, Ptr<NeighbourRelation> > m_neighbourRelationTable;
-
+  Time m_handoverLeavingTimeoutDuration;
 
   //             cellid    rnti   
   TracedCallback<uint16_t, uint16_t> m_newUeContextTrace;
diff -Naur ns-3.18.1/src/lte/model/lte-handover-algorithm.cc ns-3.19/src/lte/model/lte-handover-algorithm.cc
--- ns-3.18.1/src/lte/model/lte-handover-algorithm.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/lte-handover-algorithm.cc	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,60 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#include "lte-handover-algorithm.h"
+#include <ns3/log.h>
+
+NS_LOG_COMPONENT_DEFINE ("LteHandoverAlgorithm");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (LteHandoverAlgorithm)
+  ;
+
+
+LteHandoverAlgorithm::LteHandoverAlgorithm ()
+{
+}
+
+
+LteHandoverAlgorithm::~LteHandoverAlgorithm ()
+{
+}
+
+
+TypeId
+LteHandoverAlgorithm::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::LteHandoverAlgorithm")
+    .SetParent<Object> ()
+  ;
+  return tid;
+}
+
+
+void
+LteHandoverAlgorithm::DoDispose ()
+{
+}
+
+
+
+} // end of namespace ns3
diff -Naur ns-3.18.1/src/lte/model/lte-handover-algorithm.h ns-3.19/src/lte/model/lte-handover-algorithm.h
--- ns-3.18.1/src/lte/model/lte-handover-algorithm.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/lte-handover-algorithm.h	2013-12-20 09:44:51.000000000 -0800
@@ -0,0 +1,111 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#ifndef LTE_HANDOVER_ALGORITHM_H
+#define LTE_HANDOVER_ALGORITHM_H
+
+#include <ns3/object.h>
+#include <ns3/lte-rrc-sap.h>
+
+namespace ns3 {
+
+
+class LteHandoverManagementSapUser;
+class LteHandoverManagementSapProvider;
+
+
+/**
+ * \brief The abstract base class of a handover algorithm that operates using
+ *        the Handover Management SAP interface.
+ *
+ * Handover algorithm receives measurement reports from an eNode RRC instance
+ * and tells the eNodeB RRC instance when to do a handover.
+ *
+ * This class is an abstract class intended to be inherited by subclasses that
+ * implement its virtual methods. By inheriting from this abstract class, the
+ * subclasses gain the benefits of being compatible with the LteEnbNetDevice
+ * class, being accessible using namespace-based access through ns-3 Config
+ * subsystem, and being installed and configured by LteHelper class (see
+ * LteHelper::SetHandoverAlgorithmType and
+ * LteHelper::SetHandoverAlgorithmAttribute methods).
+ *
+ * The communication with the eNodeB RRC instance is done through the *Handover
+ * Management SAP* interface. The handover algorithm instance corresponds to the
+ * "provider" part of this interface, while the eNodeB RRC instance takes the
+ * role of the "user" part. The following code skeleton establishes the
+ * connection between both instances:
+ *
+ *     Ptr<LteEnbRrc> u = ...;
+ *     Ptr<LteHandoverAlgorithm> p = ...;
+ *     u->SetLteHandoverManagementSapProvider (p->GetLteHandoverManagementSapProvider ());
+ *     p->SetLteHandoverManagementSapUser (u->GetLteHandoverManagementSapUser ());
+ *
+ * However, user rarely needs to use the above code, since it has already been
+ * taken care by LteHelper::InstallEnbDevice.
+ *
+ * \sa LteHandoverManagementSapProvider, LteHandoverManagementSapUser
+ */
+class LteHandoverAlgorithm : public Object
+{
+public:
+  LteHandoverAlgorithm ();
+  virtual ~LteHandoverAlgorithm ();
+
+  // inherited from Object
+  static TypeId GetTypeId ();
+
+  /**
+   * \brief Set the "user" part of the Handover Management SAP interface that
+   *        this handover algorithm instance will interact with.
+   * \param s a reference to the "user" part of the interface, typically a
+   *          member of an LteEnbRrc instance
+   */
+  virtual void SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s) = 0;
+
+  /**
+   * \brief Export the "provider" part of the Handover Management SAP interface.
+   * \return the reference to the "provider" part of the interface, typically to
+   *         be kept by an LteEnbRrc instance
+   */
+  virtual LteHandoverManagementSapProvider* GetLteHandoverManagementSapProvider () = 0;
+
+protected:
+
+  // inherited from Object
+  virtual void DoDispose ();
+
+  // HANDOVER MANAGEMENT SAP PROVIDER IMPLEMENTATION
+
+  /**
+   * \brief Implementation of LteHandoverManagementSapProvider::ReportUeMeas.
+   * \param rnti Radio Network Temporary Identity, an integer identifying the UE
+   *             where the report originates from
+   * \param measResults a single report of one measurement identity
+   */
+  virtual void DoReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults) = 0;
+
+}; // end of class LteHandoverAlgorithm
+
+
+} // end of namespace ns3
+
+
+#endif /* LTE_HANDOVER_ALGORITHM_H */
diff -Naur ns-3.18.1/src/lte/model/lte-handover-management-sap.cc ns-3.19/src/lte/model/lte-handover-management-sap.cc
--- ns-3.18.1/src/lte/model/lte-handover-management-sap.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/lte-handover-management-sap.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,37 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#include "lte-handover-management-sap.h"
+
+namespace ns3 {
+
+
+LteHandoverManagementSapProvider::~LteHandoverManagementSapProvider ()
+{
+}
+
+
+LteHandoverManagementSapUser::~LteHandoverManagementSapUser ()
+{
+}
+
+
+} // end of namespace ns3
diff -Naur ns-3.18.1/src/lte/model/lte-handover-management-sap.h ns-3.19/src/lte/model/lte-handover-management-sap.h
--- ns-3.18.1/src/lte/model/lte-handover-management-sap.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/lte-handover-management-sap.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,194 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#ifndef LTE_HANDOVER_MANAGEMENT_SAP_H
+#define LTE_HANDOVER_MANAGEMENT_SAP_H
+
+#include <ns3/lte-rrc-sap.h>
+
+namespace ns3 {
+
+
+/**
+ * \brief Service Access Point (SAP) offered by the handover algorithm instance
+ *        to the eNodeB RRC instance.
+ *
+ * This is the *Handover Management SAP Provider*, i.e., the part of the SAP
+ * that contains the handover algorithm methods called by the eNodeB RRC
+ * instance.
+ */
+class LteHandoverManagementSapProvider
+{
+public:
+  virtual ~LteHandoverManagementSapProvider ();
+
+  /**
+   * \brief Send a UE measurement report to handover algorithm.
+   * \param rnti Radio Network Temporary Identity, an integer identifying the UE
+   *             where the report originates from
+   * \param measResults a single report of one measurement identity
+   *
+   * The received measurement report is a result of the UE measurement
+   * configuration previously configured by calling
+   * LteHandoverManagementSapUser::AddUeMeasReportConfigForHandover. The report
+   * may be stored and utilised for the purpose of making handover decision.
+   */
+  virtual void ReportUeMeas (uint16_t rnti,
+                             LteRrcSap::MeasResults measResults) = 0;
+
+}; // end of class LteHandoverManagementSapProvider
+
+
+/**
+ * \brief Service Access Point (SAP) offered by the eNodeB RRC instance to the
+ *        handover algorithm instance.
+ *
+ * This is the *Handover Management SAP User*, i.e., the part of the SAP that
+ * contains the eNodeB RRC methods called by the handover algorithm instance.
+ */
+class LteHandoverManagementSapUser
+{
+public:
+  virtual ~LteHandoverManagementSapUser ();
+
+  /**
+   * \brief Request a certain reporting configuration to be fulfilled by the UEs
+   *        attached to the eNodeB entity.
+   * \param reportConfig the UE measurement reporting configuration
+   * \return the measurement identity associated with this newly added
+   *         reporting configuration
+   *
+   * The eNodeB RRC entity is expected to configure the same reporting
+   * configuration in each of the attached UEs. When later in the simulation a
+   * UE measurement report is received from a UE as a result of this
+   * configuration, the eNodeB RRC entity shall forward this report to the
+   * handover algorithm through the LteHandoverManagementSapProvider::ReportUeMeas
+   * SAP function.
+   *
+   * \note This function is only valid before the simulation begins.
+   */
+  virtual uint8_t AddUeMeasReportConfigForHandover (LteRrcSap::ReportConfigEutra reportConfig) = 0;
+
+  /**
+   * \brief Instruct the eNodeB RRC entity to prepare a handover.
+   * \param rnti Radio Network Temporary Identity, an integer identifying the
+   *             UE which shall perform the handover
+   * \param targetCellId the cell ID of the target eNodeB
+   *
+   * This function is used by the handover algorithm entity when a handover
+   * decision has been reached.
+   *
+   * The process to produce the decision is up to the implementation of handover
+   * algorithm. It is typically based on the reported UE measurements, which are
+   * received through the LteHandoverManagementSapProvider::ReportUeMeas function.
+   */
+  virtual void TriggerHandover (uint16_t rnti, uint16_t targetCellId) = 0;
+
+}; // end of class LteHandoverManagementSapUser
+
+
+
+/**
+ * \brief Template for the implementation of the LteHandoverManagementSapProvider
+ *        as a member of an owner class of type C to which all methods are
+ *        forwarded.
+ */
+template <class C>
+class MemberLteHandoverManagementSapProvider : public LteHandoverManagementSapProvider
+{
+public:
+  MemberLteHandoverManagementSapProvider (C* owner);
+
+  // inherited from LteHandoverManagemenrSapProvider
+  virtual void ReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults);
+
+private:
+  MemberLteHandoverManagementSapProvider ();
+  C* m_owner;
+
+}; // end of class MemberLteHandoverManagementSapProvider
+
+
+template <class C>
+MemberLteHandoverManagementSapProvider<C>::MemberLteHandoverManagementSapProvider (C* owner)
+  : m_owner (owner)
+{
+}
+
+
+template <class C>
+void
+MemberLteHandoverManagementSapProvider<C>::ReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults)
+{
+  m_owner->DoReportUeMeas (rnti, measResults);
+}
+
+
+
+/**
+ * \brief Template for the implementation of the LteHandoverManagementSapUser
+ *        as a member of an owner class of type C to which all methods are
+ *        forwarded.
+ */
+template <class C>
+class MemberLteHandoverManagementSapUser : public LteHandoverManagementSapUser
+{
+public:
+  MemberLteHandoverManagementSapUser (C* owner);
+
+  // inherited from LteHandoverManagementSapUser
+  virtual uint8_t AddUeMeasReportConfigForHandover (LteRrcSap::ReportConfigEutra reportConfig);
+  virtual void TriggerHandover (uint16_t rnti, uint16_t targetCellId);
+
+private:
+  MemberLteHandoverManagementSapUser ();
+  C* m_owner;
+
+}; // end of class MemberLteAnrSapUser
+
+
+template <class C>
+MemberLteHandoverManagementSapUser<C>::MemberLteHandoverManagementSapUser (C* owner)
+  : m_owner (owner)
+{
+}
+
+
+template <class C>
+uint8_t
+MemberLteHandoverManagementSapUser<C>::AddUeMeasReportConfigForHandover (LteRrcSap::ReportConfigEutra reportConfig)
+{
+  return m_owner->DoAddUeMeasReportConfigForHandover (reportConfig);
+}
+
+
+template <class C>
+void
+MemberLteHandoverManagementSapUser<C>::TriggerHandover (uint16_t rnti, uint16_t targetCellId)
+{
+  return m_owner->DoTriggerHandover (rnti, targetCellId);
+}
+
+
+} // end of namespace ns3
+
+
+#endif /* LTE_HANDOVER_MANAGEMENT_SAP_H */
diff -Naur ns-3.18.1/src/lte/model/lte-harq-phy.cc ns-3.19/src/lte/model/lte-harq-phy.cc
--- ns-3.18.1/src/lte/model/lte-harq-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-harq-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-//NS_OBJECT_ENSURE_REGISTERED (LteHarqPhy);
+//NS_OBJECT_ENSURE_REGISTERED (LteHarqPhy)
+//  ;
 
 
 LteHarqPhy::LteHarqPhy ()
diff -Naur ns-3.18.1/src/lte/model/lte-harq-phy.h ns-3.19/src/lte/model/lte-harq-phy.h
--- ns-3.18.1/src/lte/model/lte-harq-phy.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-harq-phy.h	2013-12-20 09:44:50.000000000 -0800
@@ -88,8 +88,8 @@
   /**
   * \brief Return the info of the HARQ procId in case of retranmissions
   * for UL (asynchronous)
+  * \param rnti the RNTI of the transmitter
   * \param harqProcId the HARQ proc id
-  * \param layer layer no. (for MIMO spatail multiplexing)
   * \return the vector of the info related to HARQ proc Id
   */
   HarqProcessInfoList_t GetHarqProcessInfoUl (uint16_t rnti, uint8_t harqProcId);
diff -Naur ns-3.18.1/src/lte/model/lte-mi-error-model.cc ns-3.19/src/lte/model/lte-mi-error-model.cc
--- ns-3.18.1/src/lte/model/lte-mi-error-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-mi-error-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -328,62 +328,72 @@
   
   double MI;
   double MIsum = 0.0;
+  SpectrumValue sinrCopy = sinr;
   
   for (uint32_t i = 0; i < map.size (); i++)
     {
-      SpectrumValue sinrCopy = sinr;
       double sinrLin = sinrCopy[map.at (i)];
       if (mcs <= MI_QPSK_MAX_ID) // QPSK
         {
-          int tr = 0;
-          while ((tr<MI_MAP_QPSK_SIZE)&&(MI_map_qpsk_axis[tr] < sinrLin))
-            {
-              tr++;
-            }
+
           if (sinrLin > MI_map_qpsk_axis[MI_MAP_QPSK_SIZE-1])
             {
               MI = 1;
             }
           else 
-            {
-              NS_ASSERT_MSG (tr<MI_MAP_QPSK_SIZE, "MI map out of data");
-              MI = MI_map_qpsk[tr];
+            { 
+              // since the values in MI_map_qpsk_axis are uniformly spaced, we have
+              // index = ((sinrLin - value[0]) / (value[SIZE-1] - value[0])) * (SIZE-1)
+              // the scaling coefficient is always the same, so we use a static const
+              // to speed up the calculation
+              static const double scalingCoeffQpsk = 
+                (MI_MAP_QPSK_SIZE - 1) / (MI_map_qpsk_axis[MI_MAP_QPSK_SIZE-1] - MI_map_qpsk_axis[0]);
+              double sinrIndexDouble = (sinrLin -  MI_map_qpsk_axis[0]) * scalingCoeffQpsk + 1;
+              uint32_t sinrIndex = std::max(0.0, std::floor (sinrIndexDouble));
+              NS_ASSERT_MSG (sinrIndex < MI_MAP_QPSK_SIZE, "MI map out of data");
+              MI = MI_map_qpsk[sinrIndex];
             }
         }
       else
         {
           if (mcs > MI_QPSK_MAX_ID && mcs <= MI_16QAM_MAX_ID )	// 16-QAM
             {
-              int tr = 0;
-              while ((tr<MI_MAP_16QAM_SIZE)&&(MI_map_16qam_axis[tr] < sinrLin))
-                {
-                  tr++;
-                }
               if (sinrLin > MI_map_16qam_axis[MI_MAP_16QAM_SIZE-1])
                 {
                   MI = 1;
                 }
               else 
                 {
-                  NS_ASSERT_MSG (tr<MI_MAP_16QAM_SIZE, "MI map out of data");
-                  MI = MI_map_16qam[tr];
+                  // since the values in MI_map_16QAM_axis are uniformly spaced, we have
+                  // index = ((sinrLin - value[0]) / (value[SIZE-1] - value[0])) * (SIZE-1)
+                  // the scaling coefficient is always the same, so we use a static const
+                  // to speed up the calculation
+                  static const double scalingCoeff16qam = 
+                    (MI_MAP_16QAM_SIZE - 1) / (MI_map_16qam_axis[MI_MAP_16QAM_SIZE-1] - MI_map_16qam_axis[0]);
+                  double sinrIndexDouble = (sinrLin -  MI_map_16qam_axis[0]) * scalingCoeff16qam + 1;
+                  uint32_t sinrIndex = std::max(0.0, std::floor (sinrIndexDouble));
+                  NS_ASSERT_MSG (sinrIndex < MI_MAP_16QAM_SIZE, "MI map out of data");
+                  MI = MI_map_16qam[sinrIndex];
                 }
             }
           else // 64-QAM
             {
-              int tr = 0;
-              while ((tr<MI_MAP_64QAM_SIZE)&&(MI_map_64qam_axis[tr] < sinrLin))
-                {
-                  tr++;
-                }
               if (sinrLin > MI_map_64qam_axis[MI_MAP_64QAM_SIZE-1])
                 {
                   MI = 1;
                 }
               else
                 {
-                  NS_ASSERT_MSG (tr<MI_MAP_64QAM_SIZE, "MI map out of data");
-                  MI = MI_map_64qam[tr];
+                  // since the values in MI_map_64QAM_axis are uniformly spaced, we have
+                  // index = ((sinrLin - value[0]) / (value[SIZE-1] - value[0])) * (SIZE-1)
+                  // the scaling coefficient is always the same, so we use a static const
+                  // to speed up the calculation
+                  static const double scalingCoeff64qam = 
+                    (MI_MAP_64QAM_SIZE - 1) / (MI_map_64qam_axis[MI_MAP_64QAM_SIZE-1] - MI_map_64qam_axis[0]);
+                  double sinrIndexDouble = (sinrLin -  MI_map_64qam_axis[0]) * scalingCoeff64qam + 1;
+                  uint32_t sinrIndex = std::max(0.0, std::floor (sinrIndexDouble));
+                  NS_ASSERT_MSG (sinrIndex < MI_MAP_64QAM_SIZE, "MI map out of data");
+                  MI = MI_map_64qam[sinrIndex];
                 }
             }
         }
diff -Naur ns-3.18.1/src/lte/model/lte-mi-error-model.h ns-3.19/src/lte/model/lte-mi-error-model.h
--- ns-3.18.1/src/lte/model/lte-mi-error-model.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-mi-error-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -82,8 +82,8 @@
   static double Mib (const SpectrumValue& sinr, const std::vector<int>& map, uint8_t mcs);
   /** 
    * \brief map the mmib (mean mutual information per bit) for different MCS
-   * \param mmib mean mutual information per bit of a code-block
-   * \param mcs the MCS
+   * \param mib mean mutual information per bit of a code-block
+   * \param ecrId Effective Code Rate ID
    * \param cbSize the size of the CB
    * \return the code block error rate
    */
diff -Naur ns-3.18.1/src/lte/model/lte-net-device.cc ns-3.19/src/lte/model/lte-net-device.cc
--- ns-3.18.1/src/lte/model/lte-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( LteNetDevice);
+NS_OBJECT_ENSURE_REGISTERED ( LteNetDevice)
+  ;
 
 ////////////////////////////////
 // LteNetDevice
diff -Naur ns-3.18.1/src/lte/model/lte-pdcp.cc ns-3.19/src/lte/model/lte-pdcp.cc
--- ns-3.18.1/src/lte/model/lte-pdcp.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-pdcp.cc	2013-12-20 09:44:50.000000000 -0800
@@ -61,7 +61,8 @@
 
 ///////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (LtePdcp);
+NS_OBJECT_ENSURE_REGISTERED (LtePdcp)
+  ;
 
 LtePdcp::LtePdcp ()
   : m_pdcpSapUser (0),
diff -Naur ns-3.18.1/src/lte/model/lte-pdcp.h ns-3.19/src/lte/model/lte-pdcp.h
--- ns-3.18.1/src/lte/model/lte-pdcp.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-pdcp.h	2013-12-20 09:44:50.000000000 -0800
@@ -68,7 +68,7 @@
   /**
    *
    *
-   * \param s the PDCP SAP Provider interface offered to the RRC by this LTE_PDCP
+   * \return the PDCP SAP Provider interface offered to the RRC by this LTE_PDCP
    */
   LtePdcpSapProvider* GetLtePdcpSapProvider ();
 
@@ -82,7 +82,7 @@
   /**
    *
    *
-   * \param s the RLC SAP User interface offered to the RLC by this LTE_PDCP
+   * \return the RLC SAP User interface offered to the RLC by this LTE_PDCP
    */
   LteRlcSapUser* GetLteRlcSapUser ();
 
diff -Naur ns-3.18.1/src/lte/model/lte-pdcp-header.cc ns-3.19/src/lte/model/lte-pdcp-header.cc
--- ns-3.18.1/src/lte/model/lte-pdcp-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-pdcp-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LtePdcpHeader);
+NS_OBJECT_ENSURE_REGISTERED (LtePdcpHeader)
+  ;
 
 LtePdcpHeader::LtePdcpHeader ()
   : m_dcBit (0xff),
diff -Naur ns-3.18.1/src/lte/model/lte-pdcp-tag.cc ns-3.19/src/lte/model/lte-pdcp-tag.cc
--- ns-3.18.1/src/lte/model/lte-pdcp-tag.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-pdcp-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PdcpTag);
+NS_OBJECT_ENSURE_REGISTERED (PdcpTag)
+  ;
 
 PdcpTag::PdcpTag ()
   : m_senderTimestamp (Seconds (0))
diff -Naur ns-3.18.1/src/lte/model/lte-pdcp-tag.h ns-3.19/src/lte/model/lte-pdcp-tag.h
--- ns-3.18.1/src/lte/model/lte-pdcp-tag.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-pdcp-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -56,6 +56,7 @@
 
   /**
    * Get the instant when the PDCP delivers the PDU to the MAC SAP provider
+   * @return the sender timestamp
    */
   Time  GetSenderTimestamp (void) const;
 
diff -Naur ns-3.18.1/src/lte/model/lte-phy.cc ns-3.19/src/lte/model/lte-phy.cc
--- ns-3.18.1/src/lte/model/lte-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -33,7 +33,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (LtePhy);
+NS_OBJECT_ENSURE_REGISTERED (LtePhy)
+  ;
 
 
 LtePhy::LtePhy ()
diff -Naur ns-3.18.1/src/lte/model/lte-phy.h ns-3.19/src/lte/model/lte-phy.h
--- ns-3.18.1/src/lte/model/lte-phy.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-phy.h	2013-12-20 09:44:50.000000000 -0800
@@ -121,13 +121,6 @@
   void DoDispose ();
 
   /**
-   * \brief Receive SendLteControlMessage (PDCCH map, CQI feedbacks) using the ideal control channel
-   * \param msg the Ideal Control Message to receive
-   */
-//   virtual void ReceiveLteControlMessage (Ptr<LteControlMessage> msg) = 0;
-
-
-  /**
    * \param tti transmission time interval
    */
   void SetTti (double tti);
@@ -188,7 +181,7 @@
    * 
    * \param sinr the SINR vs frequency measured by the device
    */
-  virtual void  GenerateCtrlCqiReport (const SpectrumValue& sinr) = 0;
+  virtual void GenerateCtrlCqiReport (const SpectrumValue& sinr) = 0;
   
   /** 
   * generate a CQI report based on the given SINR of Data frame
@@ -196,25 +189,25 @@
   * 
   * \param sinr the SINR vs frequency measured by the device
   */
-  virtual void  GenerateDataCqiReport (const SpectrumValue& sinr) = 0;
+  virtual void GenerateDataCqiReport (const SpectrumValue& sinr) = 0;
 
   /**
   * generate a report based on the linear interference and noise power
   * perceived during DATA frame
   * NOTE: used only by eNB 
   *
-  * \param sinr the interference + noise power measured by the device
+  * \param interf the interference + noise power measured by the device
   */
-  virtual void ReportInterference (const SpectrumValue& power) = 0;
+  virtual void ReportInterference (const SpectrumValue& interf) = 0;
 
   /**
   * generate a report based on the linear RS power perceived during CTRL 
   * frame
   * NOTE: used only by UE for evaluating RSRP
   *
-  * \param sinr the RS power measured by the device
+  * \param power the RS power measured by the device
   */
-  virtual void ReportRsReceivedPower (const SpectrumValue& interf) = 0;
+  virtual void ReportRsReceivedPower (const SpectrumValue& power) = 0;
 
 
 
diff -Naur ns-3.18.1/src/lte/model/lte-phy-tag.cc ns-3.19/src/lte/model/lte-phy-tag.cc
--- ns-3.18.1/src/lte/model/lte-phy-tag.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-phy-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LtePhyTag);
+NS_OBJECT_ENSURE_REGISTERED (LtePhyTag)
+  ;
 
 TypeId
 LtePhyTag::GetTypeId (void)
diff -Naur ns-3.18.1/src/lte/model/lte-radio-bearer-info.cc ns-3.19/src/lte/model/lte-radio-bearer-info.cc
--- ns-3.18.1/src/lte/model/lte-radio-bearer-info.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-radio-bearer-info.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerInfo);
+NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerInfo)
+  ;
 
 LteRadioBearerInfo::LteRadioBearerInfo (void)
 {
diff -Naur ns-3.18.1/src/lte/model/lte-radio-bearer-tag.cc ns-3.19/src/lte/model/lte-radio-bearer-tag.cc
--- ns-3.18.1/src/lte/model/lte-radio-bearer-tag.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-radio-bearer-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag);
+NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag)
+  ;
 
 TypeId
 LteRadioBearerTag::GetTypeId (void)
diff -Naur ns-3.18.1/src/lte/model/lte-radio-bearer-tag.h ns-3.19/src/lte/model/lte-radio-bearer-tag.h
--- ns-3.18.1/src/lte/model/lte-radio-bearer-tag.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-radio-bearer-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -57,7 +57,7 @@
    *
    * @param rnti the value of the RNTI to set
    */
-  void SetRnti (uint16_t tid);
+  void SetRnti (uint16_t rnti);
 
   /**
    * Set the LC id to the given value.
@@ -71,7 +71,7 @@
   *
   * @param layer the value of the layer to set
   */
-  void SetLayer (uint8_t lcid);
+  void SetLayer (uint8_t layer);
 
 
   virtual void Serialize (TagBuffer i) const;
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-am.cc ns-3.19/src/lte/model/lte-rlc-am.cc
--- ns-3.18.1/src/lte/model/lte-rlc-am.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-am.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteRlcAm);
+NS_OBJECT_ENSURE_REGISTERED (LteRlcAm)
+  ;
 
 LteRlcAm::LteRlcAm ()
 {
@@ -93,6 +94,14 @@
                    TimeValue (MilliSeconds (100)),
                    MakeTimeAccessor (&LteRlcAm::m_pollRetransmitTimerValue),
                    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 "
+                   "is performed unless the corresponding TxOpportunity is big enough.",
+                   BooleanValue (false),
+                   MakeBooleanAccessor (&LteRlcAm::m_txOpportunityForRetxAlwaysBigEnough),
+                   MakeBooleanChecker ())
+
     ;
   return tid;
 }
@@ -211,7 +220,8 @@
 
       Ptr<Packet> packet = m_retxBuffer.at (m_vtA.GetValue ()).m_pdu->Copy ();
 
-      if ( packet->GetSize () <= bytes )
+      if (( packet->GetSize () <= bytes )
+          || m_txOpportunityForRetxAlwaysBigEnough)
         {
           LteRlcAmHeader rlcAmHeader;
           packet->PeekHeader (rlcAmHeader);
@@ -258,7 +268,8 @@
       uint16_t vta = m_vtA.GetValue ();
       Ptr<Packet> packet = m_txedBuffer.at (vta)->Copy ();
 
-      if ( packet->GetSize () <= bytes )
+      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 ();
@@ -962,12 +973,22 @@
       NS_LOG_INFO ("ackSn     = " << ackSn);
       NS_LOG_INFO ("VT(A)     = " << m_vtA);
       NS_LOG_INFO ("VT(S)     = " << m_vtS);
+
+      m_vtA.SetModulusBase (m_vtA);
+      m_vtS.SetModulusBase (m_vtA);
+      ackSn.SetModulusBase (m_vtA);
       while (m_vtA < ackSn && m_vtA < m_vtS)
         {
 //           NS_LOG_INFO ("seqNumber = " << seqNumber);
 //           NS_LOG_INFO ("m_txedBuffer( VT(A) ).size = " << m_txedBuffer.size ());
 
           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");
@@ -985,6 +1006,9 @@
             }
 
           m_vtA++;
+          m_vtA.SetModulusBase (m_vtA);
+          m_vtS.SetModulusBase (m_vtA);
+          ackSn.SetModulusBase (m_vtA);
         }
 
       NS_LOG_INFO ("New VT(A) = " << m_vtA);
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-am.h ns-3.19/src/lte/model/lte-rlc-am.h
--- ns-3.18.1/src/lte/model/lte-rlc-am.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-am.h	2013-12-20 09:44:50.000000000 -0800
@@ -150,6 +150,8 @@
   uint16_t m_maxRetxThreshold;  /// \todo How these parameters are configured???
   uint16_t m_pollPdu;
   uint16_t m_pollByte;
+  
+  bool m_txOpportunityForRetxAlwaysBigEnough;
 
   /**
    * SDU Reassembling state
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-am-header.cc ns-3.19/src/lte/model/lte-rlc-am-header.cc
--- ns-3.18.1/src/lte/model/lte-rlc-am-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-am-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteRlcAmHeader);
+NS_OBJECT_ENSURE_REGISTERED (LteRlcAmHeader)
+  ;
 
 LteRlcAmHeader::LteRlcAmHeader ()
   : m_headerLength (0),
diff -Naur ns-3.18.1/src/lte/model/lte-rlc.cc ns-3.19/src/lte/model/lte-rlc.cc
--- ns-3.18.1/src/lte/model/lte-rlc.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc.cc	2013-12-20 09:44:50.000000000 -0800
@@ -81,7 +81,8 @@
 
 ///////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (LteRlc);
+NS_OBJECT_ENSURE_REGISTERED (LteRlc)
+  ;
 
 LteRlc::LteRlc ()
   : m_rlcSapUser (0),
@@ -167,7 +168,8 @@
 
 ////////////////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (LteRlcSm);
+NS_OBJECT_ENSURE_REGISTERED (LteRlcSm)
+  ;
 
 LteRlcSm::LteRlcSm ()
 {
diff -Naur ns-3.18.1/src/lte/model/lte-rlc.h ns-3.19/src/lte/model/lte-rlc.h
--- ns-3.18.1/src/lte/model/lte-rlc.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc.h	2013-12-20 09:44:50.000000000 -0800
@@ -81,7 +81,7 @@
   /**
    *
    *
-   * \param s the RLC SAP Provider interface offered to the PDCP by this LTE_RLC
+   * \return the RLC SAP Provider interface offered to the PDCP by this LTE_RLC
    */
   LteRlcSapProvider* GetLteRlcSapProvider ();
 
@@ -95,7 +95,7 @@
   /**
    *
    *
-   * \param s the MAC SAP User interface offered to the MAC by this LTE_RLC
+   * \return the MAC SAP User interface offered to the MAC by this LTE_RLC
    */
   LteMacSapUser* GetLteMacSapUser ();
 
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-header.cc ns-3.19/src/lte/model/lte-rlc-header.cc
--- ns-3.18.1/src/lte/model/lte-rlc-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteRlcHeader);
+NS_OBJECT_ENSURE_REGISTERED (LteRlcHeader)
+  ;
 
 LteRlcHeader::LteRlcHeader ()
   : m_headerLength (0),
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-sdu-status-tag.cc ns-3.19/src/lte/model/lte-rlc-sdu-status-tag.cc
--- ns-3.18.1/src/lte/model/lte-rlc-sdu-status-tag.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-sdu-status-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteRlcSduStatusTag);
+NS_OBJECT_ENSURE_REGISTERED (LteRlcSduStatusTag)
+  ;
 
 LteRlcSduStatusTag::LteRlcSduStatusTag ()
 {
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-tag.cc ns-3.19/src/lte/model/lte-rlc-tag.cc
--- ns-3.18.1/src/lte/model/lte-rlc-tag.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RlcTag);
+NS_OBJECT_ENSURE_REGISTERED (RlcTag)
+  ;
 
 RlcTag::RlcTag ()
   : m_senderTimestamp (Seconds (0))
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-tag.h ns-3.19/src/lte/model/lte-rlc-tag.h
--- ns-3.18.1/src/lte/model/lte-rlc-tag.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -55,6 +55,7 @@
 
   /**
    * Get the instant when the RLC delivers the PDU to the MAC SAP provider
+   * @return the sender timestamp
    */
   Time  GetSenderTimestamp (void) const
   {
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-tm.cc ns-3.19/src/lte/model/lte-rlc-tm.cc
--- ns-3.18.1/src/lte/model/lte-rlc-tm.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-tm.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteRlcTm);
+NS_OBJECT_ENSURE_REGISTERED (LteRlcTm)
+  ;
 
 LteRlcTm::LteRlcTm ()
   : m_maxTxBufferSize (0),
@@ -130,7 +131,6 @@
 
   if (bytes < packet->GetSize ())
     {
-      // Stingy MAC: Header fix part is 2 bytes, we need more bytes for the data
       NS_LOG_WARN ("TX opportunity too small = " << bytes << " (PDU size: " << packet->GetSize () << ")");
       return;
     }
diff -Naur ns-3.18.1/src/lte/model/lte-rlc-um.cc ns-3.19/src/lte/model/lte-rlc-um.cc
--- ns-3.18.1/src/lte/model/lte-rlc-um.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rlc-um.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteRlcUm);
+NS_OBJECT_ENSURE_REGISTERED (LteRlcUm)
+  ;
 
 LteRlcUm::LteRlcUm ()
   : m_maxTxBufferSize (10 * 1024),
diff -Naur ns-3.18.1/src/lte/model/lte-rrc-protocol-ideal.cc ns-3.19/src/lte/model/lte-rrc-protocol-ideal.cc
--- ns-3.18.1/src/lte/model/lte-rrc-protocol-ideal.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rrc-protocol-ideal.cc	2013-12-20 09:44:50.000000000 -0800
@@ -39,7 +39,8 @@
 
 const Time RRC_IDEAL_MSG_DELAY = MilliSeconds (0); 
 
-NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolIdeal);
+NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolIdeal)
+  ;
 
 LteUeRrcProtocolIdeal::LteUeRrcProtocolIdeal ()
   :  m_ueRrcSapProvider (0),
@@ -206,7 +207,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolIdeal);
+NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolIdeal)
+  ;
 
 LteEnbRrcProtocolIdeal::LteEnbRrcProtocolIdeal ()
   :  m_enbRrcSapProvider (0)
@@ -323,50 +325,6 @@
 }
 
 void 
-LteEnbRrcProtocolIdeal::DoSendMasterInformationBlock (LteRrcSap::MasterInformationBlock msg)
-{
-  NS_LOG_FUNCTION (this);
-  for (std::map<uint16_t, LteUeRrcSapProvider*>::const_iterator it = m_enbRrcSapProviderMap.begin ();
-       it != m_enbRrcSapProviderMap.end ();
-       ++it)
-    {
-      Simulator::Schedule (RRC_IDEAL_MSG_DELAY, 
-                           &LteUeRrcSapProvider::RecvMasterInformationBlock,
-                           it->second, 
-                           msg);
-    }
-}
-
-void 
-LteEnbRrcProtocolIdeal::DoSendSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 msg)
-{
-  NS_LOG_FUNCTION (this << m_cellId);
- // walk list of all nodes to get UEs with this cellId
-  Ptr<LteUeRrc> ueRrc;
-  for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i)
-    {
-      Ptr<Node> node = *i;
-      int nDevs = node->GetNDevices ();
-      for (int j = 0; j < nDevs; ++j)
-        {
-          Ptr<LteUeNetDevice> ueDev = node->GetDevice (j)->GetObject <LteUeNetDevice> ();
-          if (ueDev != 0)
-            {
-              NS_LOG_LOGIC ("considering UE " << ueDev->GetImsi ());
-              Ptr<LteUeRrc> ueRrc = ueDev->GetRrc ();              
-              if (ueRrc->GetCellId () == m_cellId)
-                {       
-                  Simulator::Schedule (RRC_IDEAL_MSG_DELAY, 
-                                       &LteUeRrcSapProvider::RecvSystemInformationBlockType1,
-                                       ueRrc->GetLteUeRrcSapProvider (), 
-                                       msg);          
-                }             
-            }
-        }
-    } 
-}
-
-void 
 LteEnbRrcProtocolIdeal::DoSendSystemInformation (LteRrcSap::SystemInformation msg)
 {
   NS_LOG_FUNCTION (this << m_cellId);
diff -Naur ns-3.18.1/src/lte/model/lte-rrc-protocol-ideal.h ns-3.19/src/lte/model/lte-rrc-protocol-ideal.h
--- ns-3.18.1/src/lte/model/lte-rrc-protocol-ideal.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rrc-protocol-ideal.h	2013-12-20 09:44:50.000000000 -0800
@@ -116,8 +116,6 @@
   // methods forwarded from LteEnbRrcSapUser
   void DoSetupUe (uint16_t rnti, LteEnbRrcSapUser::SetupUeParameters params);
   void DoRemoveUe (uint16_t rnti);
-  void DoSendMasterInformationBlock (LteRrcSap::MasterInformationBlock msg);
-  void DoSendSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 msg);
   void DoSendSystemInformation (LteRrcSap::SystemInformation msg);
   void SendSystemInformation (LteRrcSap::SystemInformation msg);
   void DoSendRrcConnectionSetup (uint16_t rnti, LteRrcSap::RrcConnectionSetup msg);
diff -Naur ns-3.18.1/src/lte/model/lte-rrc-protocol-real.cc ns-3.19/src/lte/model/lte-rrc-protocol-real.cc
--- ns-3.18.1/src/lte/model/lte-rrc-protocol-real.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rrc-protocol-real.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,8 @@
 
 const Time RRC_REAL_MSG_DELAY = MilliSeconds (0); 
 
-NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal);
+NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal)
+  ;
 
 LteUeRrcProtocolReal::LteUeRrcProtocolReal ()
   :  m_ueRrcSapProvider (0),
@@ -350,7 +351,8 @@
     }
 }
 
-NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal);
+NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal)
+  ;
 
 LteEnbRrcProtocolReal::LteEnbRrcProtocolReal ()
   :  m_enbRrcSapProvider (0)
@@ -503,50 +505,6 @@
 }
 
 void 
-LteEnbRrcProtocolReal::DoSendMasterInformationBlock (LteRrcSap::MasterInformationBlock msg)
-{
-  NS_LOG_FUNCTION (this);
-  for (std::map<uint16_t, LteUeRrcSapProvider*>::const_iterator it = m_enbRrcSapProviderMap.begin ();
-       it != m_enbRrcSapProviderMap.end ();
-       ++it)
-    {
-      Simulator::Schedule (RRC_REAL_MSG_DELAY, 
-                           &LteUeRrcSapProvider::RecvMasterInformationBlock,
-                           it->second, 
-                           msg);
-    }
-}
-
-void 
-LteEnbRrcProtocolReal::DoSendSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 msg)
-{
-  NS_LOG_FUNCTION (this << m_cellId);
-  // walk list of all nodes to get UEs with this cellId
-  Ptr<LteUeRrc> ueRrc;
-  for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i)
-    {
-      Ptr<Node> node = *i;
-      int nDevs = node->GetNDevices ();
-      for (int j = 0; j < nDevs; ++j)
-        {
-          Ptr<LteUeNetDevice> ueDev = node->GetDevice (j)->GetObject <LteUeNetDevice> ();
-          if (ueDev != 0)
-            {
-              NS_LOG_LOGIC ("considering UE " << ueDev->GetImsi ());
-              Ptr<LteUeRrc> ueRrc = ueDev->GetRrc ();
-              if (ueRrc->GetCellId () == m_cellId)
-                {
-                  Simulator::Schedule (RRC_REAL_MSG_DELAY, 
-                                       &LteUeRrcSapProvider::RecvSystemInformationBlockType1,
-                                       ueRrc->GetLteUeRrcSapProvider (), 
-                                       msg);
-                }
-            }
-        }
-    } 
-}
-
-void 
 LteEnbRrcProtocolReal::DoSendSystemInformation (LteRrcSap::SystemInformation msg)
 {
   NS_LOG_FUNCTION (this << m_cellId);
diff -Naur ns-3.18.1/src/lte/model/lte-rrc-protocol-real.h ns-3.19/src/lte/model/lte-rrc-protocol-real.h
--- ns-3.18.1/src/lte/model/lte-rrc-protocol-real.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rrc-protocol-real.h	2013-12-20 09:44:50.000000000 -0800
@@ -128,8 +128,6 @@
   // methods forwarded from LteEnbRrcSapUser
   void DoSetupUe (uint16_t rnti, LteEnbRrcSapUser::SetupUeParameters params);
   void DoRemoveUe (uint16_t rnti);
-  void DoSendMasterInformationBlock (LteRrcSap::MasterInformationBlock msg);
-  void DoSendSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 msg);
   void DoSendSystemInformation (LteRrcSap::SystemInformation msg);
   void SendSystemInformation (LteRrcSap::SystemInformation msg);
   void DoSendRrcConnectionSetup (uint16_t rnti, LteRrcSap::RrcConnectionSetup msg);
diff -Naur ns-3.18.1/src/lte/model/lte-rrc-sap.cc ns-3.19/src/lte/model/lte-rrc-sap.cc
--- ns-3.18.1/src/lte/model/lte-rrc-sap.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rrc-sap.cc	2013-12-20 09:44:50.000000000 -0800
@@ -18,7 +18,7 @@
  * Author: Nicola Baldo <nbaldo@cttc.es>
  */
 
-#include "ns3/lte-rrc-sap.h"
+#include "lte-rrc-sap.h"
 
 namespace ns3 {
 
@@ -26,4 +26,25 @@
 {
 }
 
+LteRrcSap::ReportConfigEutra::ReportConfigEutra ()
+{
+  triggerType = EVENT;
+  eventId = EVENT_A1;
+  threshold1.choice = ThresholdEutra::THRESHOLD_RSRP;
+  threshold1.range = 0;
+  threshold2.choice = ThresholdEutra::THRESHOLD_RSRP;
+  threshold2.range = 0;
+  reportOnLeave = false;
+  a3Offset = 0;
+  hysteresis = 0;
+  timeToTrigger = 0;
+  purpose = REPORT_STRONGEST_CELLS;
+  triggerQuantity = RSRP;
+  reportQuantity = BOTH;
+  maxReportCells = MaxReportCells;
+  reportInterval = MS480;
+  reportAmount = 255;
+}
+
+
 } // namespace ns3
diff -Naur ns-3.18.1/src/lte/model/lte-rrc-sap.h ns-3.19/src/lte/model/lte-rrc-sap.h
--- ns-3.18.1/src/lte/model/lte-rrc-sap.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-rrc-sap.h	2013-12-20 09:44:50.000000000 -0800
@@ -38,16 +38,20 @@
 class Packet;
 
 /**
- * Class holding definition common to all Ue/Enb SAP
- * Users/Providers. See 3GPP TS 36.331 for reference. 
+ * \ingroup lte
+ *
+ * \brief Class holding definition common to all UE/eNodeB SAP Users/Providers.
+ *
+ * See 3GPP TS 36.331 for reference.
+ *
  * Note that only those values that are (expected to be) used by the
  * ns-3 model are mentioned here. The naming of the variables that are
  * defined here is the same of 36.331, except for removal of "-" and
  * conversion to CamelCase or ALL_CAPS where needed in order to follow
- * the ns-3 coding style. Due to the 1-to-1 mapping with TS 36.331, 
+ * the ns-3 coding style. Due to the 1-to-1 mapping with TS 36.331,
  * detailed doxygen documentation is omitted, so please refer to
  * 36.331 for the meaning of these data structures / fields.
- * 
+ *
  */
 class LteRrcSap
 {
@@ -73,6 +77,12 @@
     uint32_t csgIdentity;
   };
 
+  struct CellSelectionInfo
+  {
+    int8_t qRxLevMin; ///< INTEGER (-70..-22), actual value = IE value * 2 [dBm].
+    int8_t qQualMin; ///< INTEGER (-34..-3), actual value = IE value [dB].
+  };
+
   struct FreqInfo
   {
     uint16_t ulCarrierFreq;
@@ -225,16 +235,26 @@
     uint8_t cellForWhichToReportCGI;
   };
 
+  /**
+   * \brief Threshold for event evaluation.
+   *
+   * For RSRP-based threshold, the actual value is (value - 140) dBm. While for
+   * RSRQ-based threshold, the actual value is (value - 40) / 2 dB. This is in
+   * accordance with section 9.1.4 and 9.1.7 of 3GPP TS 36.133.
+   *
+   * \sa ns3::EutranMeasurementMapping
+   */
   struct ThresholdEutra
   {
     enum
     {
-      THRESHOLD_RSRP,
-      THRESHOLD_RSRQ
+      THRESHOLD_RSRP, ///< RSRP is used for the threshold.
+      THRESHOLD_RSRQ ///< RSRQ is used for the threshold.
     } choice;
-    uint8_t range;
+    uint8_t range; ///< Value range used in RSRP/RSRQ threshold.
   };
 
+  /// Specifies criteria for triggering of an E-UTRA measurement reporting event.
   struct ReportConfigEutra
   {
     enum
@@ -245,34 +265,50 @@
 
     enum
     {
-      EVENT_A1,
-      EVENT_A2,
-      EVENT_A3,
-      EVENT_A4,
-      EVENT_A5
-    } eventId;
-    ThresholdEutra threshold1; // used for A1, A2, A4, A5
-    ThresholdEutra threshold2; // used for A5
-    bool reportOnLeave; // used for A3
-    int8_t a3Offset; // used for A3
+      EVENT_A1, ///< Event A1: Serving becomes better than absolute threshold.
+      EVENT_A2, ///< Event A2: Serving becomes worse than absolute threshold.
+      EVENT_A3, ///< Event A3: Neighbour becomes amount of offset better than PCell.
+      EVENT_A4, ///< Event A4: Neighbour becomes better than absolute threshold.
+      EVENT_A5 ///< Event A5: PCell becomes worse than absolute `threshold1` AND Neighbour becomes better than another absolute `threshold2`.
+
+    } eventId; ///< Choice of E-UTRA event triggered reporting criteria.
+
+    ThresholdEutra threshold1; ///< Threshold for event A1, A2, A4, and A5.
+    ThresholdEutra threshold2; ///< Threshold for event A5.
+
+    /// Indicates whether or not the UE shall initiate the measurement reporting procedure when the leaving condition is met for a cell in `cellsTriggeredList`, as specified in 5.5.4.1 of 3GPP TS 36.331.
+    bool reportOnLeave;
+
+    /// Offset value for Event A3. An integer between -30 and 30. The actual value is (value * 0.5) dB.
+    int8_t a3Offset;
+
+    /// Parameter used within the entry and leave condition of an event triggered reporting condition. The actual value is (value * 0.5) dB.
     uint8_t hysteresis;
+
+    /// Time during which specific criteria for the event needs to be met in order to trigger a measurement report.
     uint16_t timeToTrigger;
+
     enum
     {
       REPORT_STRONGEST_CELLS,
       REPORT_CGI
     } purpose;
+
     enum
     {
-      RSRP,
-      RSRQ
-    } triggerQuantity;
+      RSRP, ///< Reference Signal Received Power
+      RSRQ ///< Reference Signal Received Quality
+    } triggerQuantity; ///< The quantities used to evaluate the triggering condition for the event, see 3GPP TS 36.214.
+
     enum
     {
       SAME_AS_TRIGGER_QUANTITY,
-      BOTH
-    } reportQuantity;
+      BOTH ///< Both the RSRP and RSRQ quantities are to be included in the measurement report.
+    } reportQuantity; ///< The quantities to be included in the measurement report, always assumed to be BOTH.
+
+    /// Maximum number of cells, excluding the serving cell, to be included in the measurement report.
     uint8_t maxReportCells;
+
     enum
     {
       MS120,
@@ -291,9 +327,14 @@
       SPARE3,
       SPARE2,
       SPARE1
-    } reportInterval;
+    } reportInterval; ///< Indicates the interval between periodical reports.
+
+    /// Number of measurement reports applicable, always assumed to be infinite.
     uint8_t reportAmount;
-  };
+
+    ReportConfigEutra ();
+
+  }; // end of struct ReportConfigEutra
 
   struct MeasObjectToAddMod
   {
@@ -424,6 +465,7 @@
   struct SystemInformationBlockType1
   {
     CellAccessRelatedInfo cellAccessRelatedInfo;
+    CellSelectionInfo cellSelectionInfo;
   };
 
   struct SystemInformationBlockType2
@@ -558,10 +600,10 @@
 
 
 /**
- * Service Access Point (SAP) used by the UE RRC to send messages to
- * the eNB. Each method defined in this class correspond to the
- * transmission of a message that is defined in section 6.2.2 of TS
- * 36.331.
+ * \brief Part of the RRC protocol. This Service Access Point (SAP) is used by
+ *        the UE RRC to send messages to the eNB. Each method defined in this
+ *        class corresponds to the transmission of a message that is defined in
+ *        Section 6.2.2 of TS 36.331.
  */
 class LteUeRrcSapUser : public LteRrcSap
 {
@@ -573,20 +615,63 @@
   };
 
   virtual void Setup (SetupParameters params) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionRequest message to the serving eNodeB
+   *        during an RRC connection establishment procedure
+   *        (Section 5.3.3 of TS 36.331).
+   * \param msg the message
+   */
   virtual void SendRrcConnectionRequest (RrcConnectionRequest msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionSetupComplete_ message to the serving eNodeB
+   *        during an RRC connection establishment procedure
+   *        (Section 5.3.3 of TS 36.331).
+   * \param msg the message
+   */
   virtual void SendRrcConnectionSetupCompleted (RrcConnectionSetupCompleted msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionReconfigurationComplete_ message to the serving eNodeB
+   *        during an RRC connection reconfiguration procedure
+   *        (Section 5.3.5 of TS 36.331).
+   * \param msg the message
+   */
   virtual void SendRrcConnectionReconfigurationCompleted (RrcConnectionReconfigurationCompleted msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionReestablishmentRequest_ message to the serving eNodeB
+   *        during an RRC connection re-establishment procedure
+   *        (Section 5.3.7 of TS 36.331).
+   * \param msg the message
+   */
   virtual void SendRrcConnectionReestablishmentRequest (RrcConnectionReestablishmentRequest msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionReestablishmentComplete_ message to the serving eNodeB
+   *        during an RRC connection re-establishment procedure
+   *        (Section 5.3.7 of TS 36.331).
+   * \param msg the message
+   */
   virtual void SendRrcConnectionReestablishmentComplete (RrcConnectionReestablishmentComplete msg) = 0;
+
+  /**
+   * \brief Send a _MeasurementReport_ message to the serving eNodeB
+   *        during a measurement reporting procedure
+   *        (Section 5.5.5 of TS 36.331).
+   * \param msg the message
+   */
   virtual void SendMeasurementReport (MeasurementReport msg) = 0;
+
 };
 
 
 /**
- * Service Access Point (SAP) used to let the UE RRC receive a message
- * from the eNB RRC. Each method defined in this class correspond to
- * the reception of a message that is defined in section 6.2.2 of TS
- * 36.331.
+ * \brief Part of the RRC protocol. This Service Access Point (SAP) is used to
+ *        let the UE RRC receive a message from the eNB RRC. Each method defined
+ *        in this class corresponds to the reception of a message that is
+ *        defined in Section 6.2.2 of TS 36.331.
  */
 class LteUeRrcSapProvider : public LteRrcSap
 {
@@ -598,24 +683,71 @@
   };
 
   virtual void CompleteSetup (CompleteSetupParameters params) = 0;
-  virtual void RecvMasterInformationBlock (MasterInformationBlock msg) = 0;
-  virtual void RecvSystemInformationBlockType1 (SystemInformationBlockType1 msg) = 0;
+
+  /**
+   * \brief Receive a _SystemInformation_ message from the serving eNodeB
+   *        during a system information acquisition procedure
+   *        (Section 5.2.2 of TS 36.331).
+   * \param msg the message
+   */
   virtual void RecvSystemInformation (SystemInformation msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionSetup_ message from the serving eNodeB
+   *        during an RRC connection establishment procedure
+   *        (Section 5.3.3 of TS 36.331).
+   * \param msg the message
+   */
   virtual void RecvRrcConnectionSetup (RrcConnectionSetup msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionReconfiguration_ message from the serving eNodeB
+   *        during an RRC connection reconfiguration procedure
+   *        (Section 5.3.5 of TS 36.331).
+   * \param msg the message
+   */
   virtual void RecvRrcConnectionReconfiguration (RrcConnectionReconfiguration msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionReestablishment_ message from the serving eNodeB
+   *        during an RRC connection re-establishment procedure
+   *        (Section 5.3.7 of TS 36.331).
+   * \param msg the message
+   */
   virtual void RecvRrcConnectionReestablishment (RrcConnectionReestablishment msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionReestablishmentReject_ message from the serving eNodeB
+   *        during an RRC connection re-establishment procedure
+   *        (Section 5.3.7 of TS 36.331).
+   * \param msg the message
+   */
   virtual void RecvRrcConnectionReestablishmentReject (RrcConnectionReestablishmentReject msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionRelease_ message from the serving eNodeB
+   *        during an RRC connection release procedure
+   *        (Section 5.3.8 of TS 36.331).
+   * \param msg the message
+   */
   virtual void RecvRrcConnectionRelease (RrcConnectionRelease msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionReject_ message from the serving eNodeB
+   *        during an RRC connection establishment procedure
+   *        (Section 5.3.3 of TS 36.331).
+   * \param msg the message
+   */
   virtual void RecvRrcConnectionReject (RrcConnectionReject msg) = 0;
 
 };
 
 
 /**
- * Service Access Point (SAP) used by the eNB RRC to send messages to
- * the UE RC.  Each method defined in this class correspond to
- * the transmission of a message that is defined in section 6.2.2 of TS
- * 36.331.
+ * \brief Part of the RRC protocol. This Service Access Point (SAP) is used by
+ *        the eNB RRC to send messages to the UE RRC.  Each method defined in
+ *        this class corresponds to the transmission of a message that is
+ *        defined in Section 6.2.2 of TS 36.331.
  */
 class LteEnbRrcSapUser : public LteRrcSap
 {
@@ -628,14 +760,69 @@
 
   virtual void SetupUe (uint16_t rnti, SetupUeParameters params) = 0;
   virtual void RemoveUe (uint16_t rnti) = 0;
-  virtual void SendSystemInformationBlockType1 (SystemInformationBlockType1 msg) = 0;
+
+  /**
+   * \brief Send a _SystemInformation_ message to all attached UEs
+   *        during a system information acquisition procedure
+   *        (Section 5.2.2 of TS 36.331).
+   * \param msg the message
+   */
   virtual void SendSystemInformation (SystemInformation msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionSetup_ message to a UE
+   *        during an RRC connection establishment procedure
+   *        (Section 5.3.3 of TS 36.331).
+   * \param rnti the RNTI of the destination UE
+   * \param msg the message
+   */
   virtual void SendRrcConnectionSetup (uint16_t rnti, RrcConnectionSetup msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionReconfiguration_ message to a UE
+   *        during an RRC connection reconfiguration procedure
+   *        (Section 5.3.5 of TS 36.331).
+   * \param rnti the RNTI of the destination UE
+   * \param msg the message
+   */
   virtual void SendRrcConnectionReconfiguration (uint16_t rnti, RrcConnectionReconfiguration msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionReestablishment_ message to a UE
+   *        during an RRC connection re-establishment procedure
+   *        (Section 5.3.7 of TS 36.331).
+   * \param rnti the RNTI of the destination UE
+   * \param msg the message
+   */
   virtual void SendRrcConnectionReestablishment (uint16_t rnti, RrcConnectionReestablishment msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionReestablishmentReject_ message to a UE
+   *        during an RRC connection re-establishment procedure
+   *        (Section 5.3.7 of TS 36.331).
+   * \param rnti the RNTI of the destination UE
+   * \param msg the message
+   */
   virtual void SendRrcConnectionReestablishmentReject (uint16_t rnti, RrcConnectionReestablishmentReject msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionRelease_ message to a UE
+   *        during an RRC connection release procedure
+   *        (Section 5.3.8 of TS 36.331).
+   * \param rnti the RNTI of the destination UE
+   * \param msg the message
+   */
   virtual void SendRrcConnectionRelease (uint16_t rnti, RrcConnectionRelease msg) = 0;
+
+  /**
+   * \brief Send an _RRCConnectionReject_ message to a UE
+   *        during an RRC connection establishment procedure
+   *        (Section 5.3.3 of TS 36.331).
+   * \param rnti the RNTI of the destination UE
+   * \param msg the message
+   */
   virtual void SendRrcConnectionReject (uint16_t rnti, RrcConnectionReject msg) = 0;
+
   virtual Ptr<Packet> EncodeHandoverPreparationInformation (HandoverPreparationInfo msg) = 0;
   virtual HandoverPreparationInfo DecodeHandoverPreparationInformation (Ptr<Packet> p) = 0;
   virtual Ptr<Packet> EncodeHandoverCommand (RrcConnectionReconfiguration msg) = 0;
@@ -645,10 +832,10 @@
 
 
 /**
- * Service Access Point (SAP) used to let the eNB RRC receive a
- * message from a UE RRC.  Each method defined in this class correspond to
- * the reception of a message that is defined in section 6.2.2 of TS
- * 36.331.
+ * \brief Part of the RRC protocol. This Service Access Point (SAP) is used to
+ *        let the eNB RRC receive a message from a UE RRC.  Each method defined
+ *        in this class corresponds to the reception of a message that is
+ *        defined in Section 6.2.2 of TS 36.331.
  */
 class LteEnbRrcSapProvider : public LteRrcSap
 {
@@ -660,11 +847,64 @@
   };
 
   virtual void CompleteSetupUe (uint16_t rnti, CompleteSetupUeParameters params) = 0;
-  virtual void RecvRrcConnectionRequest (uint16_t rnti, RrcConnectionRequest msg) = 0;
-  virtual void RecvRrcConnectionSetupCompleted (uint16_t rnti, RrcConnectionSetupCompleted msg) = 0;
-  virtual void RecvRrcConnectionReconfigurationCompleted (uint16_t rnti, RrcConnectionReconfigurationCompleted msg) = 0;
-  virtual void RecvRrcConnectionReestablishmentRequest (uint16_t rnti, RrcConnectionReestablishmentRequest msg) = 0;
-  virtual void RecvRrcConnectionReestablishmentComplete (uint16_t rnti, RrcConnectionReestablishmentComplete msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionRequest_ message from a UE
+   *        during an RRC connection establishment procedure
+   *        (Section 5.3.3 of TS 36.331).
+   * \param rnti the RNTI of UE which sent the message
+   * \param msg the message
+   */
+  virtual void RecvRrcConnectionRequest (uint16_t rnti,
+                                         RrcConnectionRequest msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionSetupComplete_ message from a UE
+   *        during an RRC connection establishment procedure
+   *        (Section 5.3.3 of TS 36.331).
+   * \param rnti the RNTI of UE which sent the message
+   * \param msg the message
+   */
+  virtual void RecvRrcConnectionSetupCompleted (uint16_t rnti,
+                                                RrcConnectionSetupCompleted msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionReconfigurationComplete_ message from a UE
+   *        during an RRC connection reconfiguration procedure
+   *        (Section 5.3.5 of TS 36.331).
+   * \param rnti the RNTI of UE which sent the message
+   * \param msg the message
+   */
+  virtual void RecvRrcConnectionReconfigurationCompleted (uint16_t rnti,
+                                                          RrcConnectionReconfigurationCompleted msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionReestablishmentRequest_ message from a UE
+   *        during an RRC connection re-establishment procedure
+   *        (Section 5.3.7 of TS 36.331).
+   * \param rnti the RNTI of UE which sent the message
+   * \param msg the message
+   */
+  virtual void RecvRrcConnectionReestablishmentRequest (uint16_t rnti,
+                                                        RrcConnectionReestablishmentRequest msg) = 0;
+
+  /**
+   * \brief Receive an _RRCConnectionReestablishmentComplete_ message from a UE
+   *        during an RRC connection re-establishment procedure
+   *        (Section 5.3.7 of TS 36.331).
+   * \param rnti the RNTI of UE which sent the message
+   * \param msg the message
+   */
+  virtual void RecvRrcConnectionReestablishmentComplete (uint16_t rnti,
+                                                         RrcConnectionReestablishmentComplete msg) = 0;
+
+  /**
+   * \brief Receive a _MeasurementReport_ message from a UE
+   *        during a measurement reporting procedure
+   *        (Section 5.5.5 of TS 36.331).
+   * \param rnti the RNTI of UE which sent the message
+   * \param msg the message
+   */
   virtual void RecvMeasurementReport (uint16_t rnti, MeasurementReport msg) = 0;
 
 };
@@ -777,8 +1017,6 @@
 
   // methods inherited from LteUeRrcSapProvider go here
   virtual void CompleteSetup (CompleteSetupParameters params);
-  virtual void RecvMasterInformationBlock (MasterInformationBlock msg);
-  virtual void RecvSystemInformationBlockType1 (SystemInformationBlockType1 msg);
   virtual void RecvSystemInformation (SystemInformation msg);
   virtual void RecvRrcConnectionSetup (RrcConnectionSetup msg);
   virtual void RecvRrcConnectionReconfiguration (RrcConnectionReconfiguration msg);
@@ -812,20 +1050,6 @@
 
 template <class C>
 void
-MemberLteUeRrcSapProvider<C>::RecvMasterInformationBlock (MasterInformationBlock msg)
-{
-  Simulator::ScheduleNow (&C::DoRecvMasterInformationBlock, m_owner, msg);
-}
-
-template <class C>
-void
-MemberLteUeRrcSapProvider<C>::RecvSystemInformationBlockType1 (SystemInformationBlockType1 msg)
-{
-  Simulator::ScheduleNow (&C::DoRecvSystemInformationBlockType1, m_owner, msg);
-}
-
-template <class C>
-void
 MemberLteUeRrcSapProvider<C>::RecvSystemInformation (SystemInformation msg)
 {
   Simulator::ScheduleNow (&C::DoRecvSystemInformation, m_owner, msg);
@@ -889,8 +1113,6 @@
 
   virtual void SetupUe (uint16_t rnti, SetupUeParameters params);
   virtual void RemoveUe (uint16_t rnti);
-  virtual void SendMasterInformationBlock (MasterInformationBlock msg);
-  virtual void SendSystemInformationBlockType1 (SystemInformationBlockType1 msg);
   virtual void SendSystemInformation (SystemInformation msg);
   virtual void SendRrcConnectionSetup (uint16_t rnti, RrcConnectionSetup msg);
   virtual void SendRrcConnectionReconfiguration (uint16_t rnti, RrcConnectionReconfiguration msg);
@@ -934,20 +1156,6 @@
 }
 
 template <class C>
-void
-MemberLteEnbRrcSapUser<C>::SendMasterInformationBlock (MasterInformationBlock msg)
-{
-  m_owner->DoSendMasterInformationBlock (msg);
-}
-
-template <class C>
-void
-MemberLteEnbRrcSapUser<C>::SendSystemInformationBlockType1 (SystemInformationBlockType1 msg)
-{
-  m_owner->DoSendSystemInformationBlockType1 (msg);
-}
-
-template <class C>
 void
 MemberLteEnbRrcSapUser<C>::SendSystemInformation (SystemInformation msg)
 {
diff -Naur ns-3.18.1/src/lte/model/lte-spectrum-phy.cc ns-3.19/src/lte/model/lte-spectrum-phy.cc
--- ns-3.18.1/src/lte/model/lte-spectrum-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-spectrum-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -110,10 +110,12 @@
   return ( (a.m_rnti < b.m_rnti) || ( (a.m_rnti == b.m_rnti) && (a.m_layer < b.m_layer) ) );
 }
 
-NS_OBJECT_ENSURE_REGISTERED (LteSpectrumPhy);
+NS_OBJECT_ENSURE_REGISTERED (LteSpectrumPhy)
+  ;
 
 LteSpectrumPhy::LteSpectrumPhy ()
   : m_state (IDLE),
+    m_cellId (0),
   m_transmissionMode (0),
   m_layersNum (1)
 {
diff -Naur ns-3.18.1/src/lte/model/lte-spectrum-phy.h ns-3.19/src/lte/model/lte-spectrum-phy.h
--- ns-3.18.1/src/lte/model/lte-spectrum-phy.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-spectrum-phy.h	2013-12-20 09:44:50.000000000 -0800
@@ -227,7 +227,7 @@
   * Start a transmission of control frame in DL
   *
   *
-  * @param ctrlMsgList the burst of contrl messages to be transmitted
+  * @param ctrlMsgList the burst of control messages to be transmitted
   * @param pss the flag for transmitting the primary synchronization signal
   *
   * @return true if an error occurred and the transmission was not
@@ -239,9 +239,6 @@
   /**
   * Start a transmission of control frame in UL
   *
-  *
-  * @param pb the burst of control messages to be transmitted
-  *
   * @return true if an error occurred and the transmission was not
   * started, false otherwise.
   */
@@ -250,7 +247,7 @@
 
   /**
    * set the callback for the end of a TX, as part of the
-   * interconnections betweenthe PHY and the MAC
+   * interconnections between the PHY and the MAC
    *
    * @param c the callback
    */
@@ -258,7 +255,7 @@
 
   /**
    * set the callback for the end of a RX in error, as part of the
-   * interconnections betweenthe PHY and the MAC
+   * interconnections between the PHY and the MAC
    *
    * @param c the callback
    */
@@ -266,7 +263,7 @@
 
   /**
    * set the callback for the successful end of a RX, as part of the
-   * interconnections betweenthe PHY and the MAC
+   * interconnections between the PHY and the MAC
    *
    * @param c the callback
    */
@@ -274,7 +271,7 @@
   
   /**
   * set the callback for the successful end of a RX ctrl frame, as part 
-  * of the interconnections betweenthe LteSpectrumPhy and the PHY
+  * of the interconnections between the LteSpectrumPhy and the PHY
   *
   * @param c the callback
   */
@@ -282,7 +279,7 @@
   
   /**
   * set the callback for the erroneous end of a RX ctrl frame, as part 
-  * of the interconnections betweenthe LteSpectrumPhy and the PHY
+  * of the interconnections between the LteSpectrumPhy and the PHY
   *
   * @param c the callback
   */
@@ -298,7 +295,7 @@
 
   /**
   * set the callback for the DL HARQ feedback as part of the 
-  * interconnections betweenthe LteSpectrumPhy and the PHY
+  * interconnections between the LteSpectrumPhy and the PHY
   *
   * @param c the callback
   */
@@ -306,7 +303,7 @@
 
   /**
   * set the callback for the UL HARQ feedback as part of the
-  * interconnections betweenthe LteSpectrumPhy and the PHY
+  * interconnections between the LteSpectrumPhy and the PHY
   *
   * @param c the callback
   */
@@ -330,7 +327,7 @@
   *
   *
   * \param p the new LteSinrChunkProcessor to be added to the RS power 
-  * \processing chain
+  *          processing chain
   */
   void AddRsPowerChunkProcessor (Ptr<LteSinrChunkProcessor> p);
   
@@ -342,7 +339,7 @@
   void AddDataSinrChunkProcessor (Ptr<LteSinrChunkProcessor> p);
 
   /**
-  *  LteSinrChunkProcessor devoted to evaluate intefrerence + noise power 
+  *  LteSinrChunkProcessor devoted to evaluate interference + noise power
   *  in control symbols of the subframe
   *
   * \param p the new LteSinrChunkProcessor to be added to the data processing chain
@@ -350,7 +347,7 @@
   void AddInterferenceCtrlChunkProcessor (Ptr<LteSinrChunkProcessor> p);
 
   /**
-  *  LteSinrChunkProcessor devoted to evaluate intefrerence + noise power
+  *  LteSinrChunkProcessor devoted to evaluate interference + noise power
   *  in data symbols of the subframe
   *
   * \param p the new LteSinrChunkProcessor to be added to the data processing chain
diff -Naur ns-3.18.1/src/lte/model/lte-spectrum-value-helper.h ns-3.19/src/lte/model/lte-spectrum-value-helper.h
--- ns-3.18.1/src/lte/model/lte-spectrum-value-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-spectrum-value-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -102,12 +102,15 @@
    * \param earfcn the carrier frequency (EARFCN) of the transmission
    * \param bandwidth the Transmission Bandwidth Configuration in
    * number of resource blocks
-   * \param txPower the total power in dBm over the whole bandwidth
-   * \param ActiveRbs the list of Active Resource Blocks (PRBs)
+   * \param powerTx the total power in dBm over the whole bandwidth
+   * \param activeRbs the list of Active Resource Blocks (PRBs)
    *
    * \return a pointer to a newly allocated SpectrumValue representing the TX Power Spectral Density in W/Hz for each Resource Block
    */
-  static Ptr<SpectrumValue> CreateTxPowerSpectralDensity (uint16_t earfcn, uint8_t bandwidth, double powerTx, std::vector <int> activeRbs);
+  static Ptr<SpectrumValue> CreateTxPowerSpectralDensity (uint16_t earfcn,
+                                                          uint8_t bandwidth,
+                                                          double powerTx,
+                                                          std::vector <int> activeRbs);
 
 
   /**
diff -Naur ns-3.18.1/src/lte/model/lte-ue-cphy-sap.h ns-3.19/src/lte/model/lte-ue-cphy-sap.h
--- ns-3.18.1/src/lte/model/lte-ue-cphy-sap.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-ue-cphy-sap.h	2013-12-20 09:44:50.000000000 -0800
@@ -53,24 +53,66 @@
    */
   virtual void Reset () = 0;
 
-  /** 
-   * tell the PHY to synchronize with a given eNB for communication purposes
-   * 
-   * \param cellId the ID of the eNB
-   * \param dlEarfcn  the carrier frequency (EARFCN) in downlink
+  /**
+   * \brief Tell the PHY entity to listen to PSS from surrounding cells and
+   *        measure the RSRP.
+   * \param dlEarfcn the downlink carrier frequency (EARFCN) to listen to
+   *
+   * This function will instruct this PHY instance to listen to the DL channel
+   * over the bandwidth of 6 RB at the frequency associated with the given
+   * EARFCN.
+   *
+   * After this, it will start receiving Primary Synchronization Signal (PSS)
+   * and periodically returning measurement reports to RRC via
+   * LteUeCphySapUser::ReportUeMeasurements function.
    */
-  virtual void SyncronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn) = 0;
-  
+  virtual void StartCellSearch (uint16_t dlEarfcn) = 0;
+
   /**
-   * \param dlBandwidth the DL bandwidth in PRBs
+   * \brief Tell the PHY entity to synchronize with a given eNodeB over the
+   *        currently active EARFCN for communication purposes.
+   * \param cellId the ID of the eNodeB to synchronize with
+   *
+   * By synchronizing, the PHY will start receiving various information
+   * transmitted by the eNodeB. For instance, when receiving system information,
+   * the message will be relayed to RRC via
+   * LteUeCphySapUser::RecvMasterInformationBlock and
+   * LteUeCphySapUser::RecvSystemInformationBlockType1 functions.
+   *
+   * Initially, the PHY will be configured to listen to 6 RBs of BCH.
+   * LteUeCphySapProvider::SetDlBandwidth can be called afterwards to increase
+   * the bandwidth.
+   */
+  virtual void SynchronizeWithEnb (uint16_t cellId) = 0;
+
+  /**
+   * \brief Tell the PHY entity to align to the given EARFCN and synchronize
+   *        with a given eNodeB for communication purposes.
+   * \param cellId the ID of the eNodeB to synchronize with
+   * \param dlEarfcn the downlink carrier frequency (EARFCN)
+   *
+   * By synchronizing, the PHY will start receiving various information
+   * transmitted by the eNodeB. For instance, when receiving system information,
+   * the message will be relayed to RRC via
+   * LteUeCphySapUser::RecvMasterInformationBlock and
+   * LteUeCphySapUser::RecvSystemInformationBlockType1 functions.
+   *
+   * Initially, the PHY will be configured to listen to 6 RBs of BCH.
+   * LteUeCphySapProvider::SetDlBandwidth can be called afterwards to increase
+   * the bandwidth.
+   */
+  virtual void SynchronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn) = 0;
+
+  /**
+   * \param dlBandwidth the DL bandwidth in number of PRBs
    */
   virtual void SetDlBandwidth (uint8_t dlBandwidth) = 0;
 
   /** 
-   * Configure uplink (normally done after reception of SIB2)
+   * \brief Configure uplink (normally done after reception of SIB2)
    * 
-   * \param ulEarfcn the carrier frequency (EARFCN) in uplink
-   * \param ulBandwidth the UL bandwidth in PRBs
+   * \param ulEarfcn the uplink carrier frequency (EARFCN)
+   * \param ulBandwidth the UL bandwidth in number of PRBs
    */
   virtual void ConfigureUplink (uint16_t ulEarfcn, uint8_t ulBandwidth) = 0;
 
@@ -86,9 +128,9 @@
   virtual void SetTransmissionMode (uint8_t txMode) = 0;
 
   /**
-   * \param txMode the transmissionMode of the user
+   * \param srcCi the SRS configuration index
    */
-  virtual void SetSrsConfigurationIndex (uint16_t   srcCi) = 0;
+  virtual void SetSrsConfigurationIndex (uint16_t srcCi) = 0;
 
 };
 
@@ -102,40 +144,59 @@
 class LteUeCphySapUser
 {
 public:
-  
+
   /** 
    * destructor
    */
   virtual ~LteUeCphySapUser ();
 
-  
+
   /**
    * Parameters of the ReportUeMeasurements primitive: RSRP [dBm] and RSRQ [dB]
    * See section 5.1.1 and 5.1.3 of TS 36.214
    */
   struct UeMeasurementsElement
-    {
-      uint16_t m_cellId;
-      double m_rsrp;  // [dBm]
-      double m_rsrq;  // [dB]
-    };
+  {
+    uint16_t m_cellId;
+    double m_rsrp;  // [dBm]
+    double m_rsrq;  // [dB]
+  };
+
   struct UeMeasurementsParameters
-    {
-      std::vector <struct UeMeasurementsElement> m_ueMeasurementsList;
-    };
+  {
+    std::vector <struct UeMeasurementsElement> m_ueMeasurementsList;
+  };
 
 
-  /** 
+  /**
+   * \brief Relay an MIB message from the PHY entity to the RRC layer.
+   * \param cellId the ID of the eNodeB where the message originates from
+   * \param mib the Master Information Block message
    * 
-   * \param mib the Master Information Block received on the BCH
+   * This function is typically called after PHY receives an MIB message over
+   * the BCH.
    */
-  virtual void RecvMasterInformationBlock (LteRrcSap::MasterInformationBlock mib) = 0;
+  virtual void RecvMasterInformationBlock (uint16_t cellId,
+                                           LteRrcSap::MasterInformationBlock mib) = 0;
 
   /**
+   * \brief Relay an SIB1 message from the PHY entity to the RRC layer.
+   * \param cellId the ID of the eNodeB where the message originates from
+   * \param sib1 the System Information Block Type 1 message
    *
-   * \param params the structure containing the vector of cellId, SRSP and RSRQ
+   * This function is typically called after PHY receives an SIB1 message over
+   * the BCH.
+   */
+  virtual void RecvSystemInformationBlockType1 (uint16_t cellId,
+                                                LteRrcSap::SystemInformationBlockType1 sib1) = 0;
+
+  /**
+   * \brief Send a report of RSRP and RSRQ values perceived from PSS by the PHY
+   *        entity (after applying layer-1 filtering) to the RRC layer.
+   * \param params the structure containing a vector of cellId, RSRP and RSRQ
    */
   virtual void ReportUeMeasurements (UeMeasurementsParameters params) = 0;
+
 };
 
 
@@ -154,8 +215,10 @@
 
   // inherited from LteUeCphySapProvider
   virtual void Reset ();
-  virtual void SyncronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn);  
-  virtual void SetDlBandwidth (uint8_t ulBandwidth);
+  virtual void StartCellSearch (uint16_t dlEarfcn);
+  virtual void SynchronizeWithEnb (uint16_t cellId);
+  virtual void SynchronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn);
+  virtual void SetDlBandwidth (uint8_t dlBandwidth);
   virtual void ConfigureUplink (uint16_t ulEarfcn, uint8_t ulBandwidth);
   virtual void SetRnti (uint16_t rnti);
   virtual void SetTransmissionMode (uint8_t txMode);
@@ -185,14 +248,28 @@
 }
 
 template <class C>
-void 
-MemberLteUeCphySapProvider<C>::SyncronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn)
+void
+MemberLteUeCphySapProvider<C>::StartCellSearch (uint16_t dlEarfcn)
 {
-  m_owner->DoSyncronizeWithEnb (cellId, dlEarfcn);
+  m_owner->DoStartCellSearch (dlEarfcn);
 }
 
 template <class C>
-void 
+void
+MemberLteUeCphySapProvider<C>::SynchronizeWithEnb (uint16_t cellId)
+{
+  m_owner->DoSynchronizeWithEnb (cellId);
+}
+
+template <class C>
+void
+MemberLteUeCphySapProvider<C>::SynchronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn)
+{
+  m_owner->DoSynchronizeWithEnb (cellId, dlEarfcn);
+}
+
+template <class C>
+void
 MemberLteUeCphySapProvider<C>::SetDlBandwidth (uint8_t dlBandwidth)
 {
   m_owner->DoSetDlBandwidth (dlBandwidth);
@@ -240,8 +317,10 @@
   MemberLteUeCphySapUser (C* owner);
 
   // methods inherited from LteUeCphySapUser go here
-  virtual void RecvMasterInformationBlock (LteRrcSap::MasterInformationBlock mib);
-
+  virtual void RecvMasterInformationBlock (uint16_t cellId,
+                                           LteRrcSap::MasterInformationBlock mib);
+  virtual void RecvSystemInformationBlockType1 (uint16_t cellId,
+                                                LteRrcSap::SystemInformationBlockType1 sib1);
   virtual void ReportUeMeasurements (LteUeCphySapUser::UeMeasurementsParameters params);
 
 private:
@@ -262,9 +341,18 @@
 
 template <class C> 
 void 
-MemberLteUeCphySapUser<C>::RecvMasterInformationBlock (LteRrcSap::MasterInformationBlock mib)
+MemberLteUeCphySapUser<C>::RecvMasterInformationBlock (uint16_t cellId,
+                                                       LteRrcSap::MasterInformationBlock mib)
+{
+  m_owner->DoRecvMasterInformationBlock (cellId, mib);
+}
+
+template <class C>
+void
+MemberLteUeCphySapUser<C>::RecvSystemInformationBlockType1 (uint16_t cellId,
+                                                            LteRrcSap::SystemInformationBlockType1 sib1)
 {
-  m_owner->DoRecvMasterInformationBlock (mib);
+  m_owner->DoRecvSystemInformationBlockType1 (cellId, sib1);
 }
 
 template <class C>
diff -Naur ns-3.18.1/src/lte/model/lte-ue-mac.cc ns-3.19/src/lte/model/lte-ue-mac.cc
--- ns-3.18.1/src/lte/model/lte-ue-mac.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-ue-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -41,7 +41,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LteUeMac);
+NS_OBJECT_ENSURE_REGISTERED (LteUeMac)
+  ;
 
 
 ///////////////////////////////////////////////////////////
@@ -339,6 +340,10 @@
       std::map <uint8_t, LcInfo>::iterator lcInfoMapIt;
       lcInfoMapIt = m_lcInfoMap.find (lcid);
       NS_ASSERT (lcInfoMapIt !=  m_lcInfoMap.end ());
+      NS_ASSERT_MSG ((lcid != 0) || (((*it).second.txQueueSize == 0)
+                                     && ((*it).second.retxQueueSize == 0)
+                                     && ((*it).second.statusPduSize == 0)),
+                     "BSR should not be used for LCID 0");
       uint8_t lcg = lcInfoMapIt->second.lcConfig.logicalChannelGroup;
       queue.at (lcg) += ((*it).second.txQueueSize + (*it).second.retxQueueSize + (*it).second.statusPduSize);
     }
@@ -411,6 +416,21 @@
   // preambles are sent no one is received, so there is no need
   // for contention resolution
   m_cmacSapUser->NotifyRandomAccessSuccessful ();
+  // trigger tx opportunity for Message 3 over LC 0
+  // this is needed since Message 3's UL GRANT is in the RAR, not in UL-DCIs
+  const uint8_t lc0Lcid = 0;
+  std::map <uint8_t, LcInfo>::iterator lc0InfoIt = m_lcInfoMap.find (lc0Lcid);
+  NS_ASSERT (lc0InfoIt != m_lcInfoMap.end ());
+  std::map <uint8_t, LteMacSapProvider::ReportBufferStatusParameters>::iterator lc0BsrIt
+    = m_ulBsrReceived.find (lc0Lcid);
+  if ((lc0BsrIt != m_ulBsrReceived.end ())
+      && (lc0BsrIt->second.txQueueSize > 0))
+    {
+      NS_ASSERT_MSG (raResponse.m_grant.m_tbSize > lc0BsrIt->second.txQueueSize, 
+                     "segmentation of Message 3 is not allowed");
+      lc0InfoIt->second.macSapUser->NotifyTxOpportunity (raResponse.m_grant.m_tbSize, 0, 0); 
+      lc0BsrIt->second.txQueueSize = 0;
+    }
 }
 
 void 
diff -Naur ns-3.18.1/src/lte/model/lte-ue-net-device.cc ns-3.19/src/lte/model/lte-ue-net-device.cc
--- ns-3.18.1/src/lte/model/lte-ue-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-ue-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -48,7 +48,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice);
+NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice)
+  ;
 
 
 TypeId LteUeNetDevice::GetTypeId (void)
@@ -57,6 +58,12 @@
     tid =
     TypeId ("ns3::LteUeNetDevice")
     .SetParent<LteNetDevice> ()
+    .AddConstructor<LteUeNetDevice> ()
+    .AddAttribute ("EpcUeNas",
+                   "The NAS associated to this UeNetDevice",
+                   PointerValue (),
+                   MakePointerAccessor (&LteUeNetDevice::m_nas),
+                   MakePointerChecker <EpcUeNas> ())
     .AddAttribute ("LteUeRrc",
                    "The RRC associated to this UeNetDevice",
                    PointerValue (),
@@ -74,10 +81,25 @@
                    MakePointerChecker <LteUePhy> ())
     .AddAttribute ("Imsi",
                    "International Mobile Subscriber Identity assigned to this UE",
-                   TypeId::ATTR_GET,
-                   UintegerValue (0), // not used because the attribute is read-only
+                   UintegerValue (0),
                    MakeUintegerAccessor (&LteUeNetDevice::m_imsi),
                    MakeUintegerChecker<uint64_t> ())
+    .AddAttribute ("DlEarfcn",
+                   "Downlink E-UTRA Absolute Radio Frequency Channel Number (EARFCN) "
+                   "as per 3GPP 36.101 Section 5.7.3. ",
+                   UintegerValue (100),
+                   MakeUintegerAccessor (&LteUeNetDevice::SetDlEarfcn,
+                                         &LteUeNetDevice::GetDlEarfcn),
+                   MakeUintegerChecker<uint16_t> (0, 6149))
+    .AddAttribute ("CsgId",
+                   "The Closed Subscriber Group (CSG) identity that this UE is associated with, "
+                   "i.e., giving the UE access to cells which belong to this particular CSG. "
+                   "This restriction only applies to initial cell selection and EPC-enabled simulation. "
+                   "This does not revoke the UE's access to non-CSG cells. ",
+                   UintegerValue (0),
+                   MakeUintegerAccessor (&LteUeNetDevice::SetCsgId,
+                                         &LteUeNetDevice::GetCsgId),
+                   MakeUintegerChecker<uint32_t> ())
   ;
 
   return tid;
@@ -85,21 +107,9 @@
 
 
 LteUeNetDevice::LteUeNetDevice (void)
+  : m_isConstructed (false)
 {
   NS_LOG_FUNCTION (this);
-  NS_FATAL_ERROR ("This constructor should not be called");
-}
-
-
-  LteUeNetDevice::LteUeNetDevice (Ptr<Node> node, Ptr<LteUePhy> phy, Ptr<LteUeMac> mac, Ptr<LteUeRrc> rrc, Ptr<EpcUeNas> nas, uint64_t imsi)
-{
-  NS_LOG_FUNCTION (this);
-  m_phy = phy;
-  m_mac = mac;
-  m_rrc = rrc;
-  m_nas = nas;
-  SetNode (node);
-  m_imsi = imsi;
 }
 
 LteUeNetDevice::~LteUeNetDevice (void)
@@ -127,9 +137,22 @@
 LteUeNetDevice::UpdateConfig (void)
 {
   NS_LOG_FUNCTION (this);
-  m_nas->SetImsi (m_imsi);
-  m_rrc->SetImsi (m_imsi);
-  
+
+  if (m_isConstructed)
+    {
+      NS_LOG_LOGIC (this << " Updating configuration: IMSI " << m_imsi
+                         << " CSG ID " << m_csgId);
+      m_nas->SetImsi (m_imsi);
+      m_rrc->SetImsi (m_imsi);
+      m_nas->SetCsgId (m_csgId); // this also handles propagation to RRC
+    }
+  else
+    {
+      /*
+       * NAS and RRC instances are not be ready yet, so do nothing now and
+       * expect ``DoInitialize`` to re-invoke this function.
+       */
+    }
 }
 
 
@@ -171,6 +194,35 @@
   return m_imsi;
 }
 
+uint16_t
+LteUeNetDevice::GetDlEarfcn () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_dlEarfcn;
+}
+
+void
+LteUeNetDevice::SetDlEarfcn (uint16_t earfcn)
+{
+  NS_LOG_FUNCTION (this << earfcn);
+  m_dlEarfcn = earfcn;
+}
+
+uint32_t
+LteUeNetDevice::GetCsgId () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_csgId;
+}
+
+void
+LteUeNetDevice::SetCsgId (uint32_t csgId)
+{
+  NS_LOG_FUNCTION (this << csgId);
+  m_csgId = csgId;
+  UpdateConfig (); // propagate the change down to NAS and RRC
+}
+
 void
 LteUeNetDevice::SetTargetEnb (Ptr<LteEnbNetDevice> enb)
 {
@@ -190,6 +242,7 @@
 LteUeNetDevice::DoInitialize (void)
 {
   NS_LOG_FUNCTION (this);
+  m_isConstructed = true;
   UpdateConfig ();
   m_phy->Initialize ();
   m_mac->Initialize ();
diff -Naur ns-3.18.1/src/lte/model/lte-ue-net-device.h ns-3.19/src/lte/model/lte-ue-net-device.h
--- ns-3.18.1/src/lte/model/lte-ue-net-device.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-ue-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -55,43 +55,65 @@
   static TypeId GetTypeId (void);
 
   LteUeNetDevice (void);
-  /**
-   * \brief Create an UE net device
-   * \param node the node to which the device belongs
-   * \param phy the PHY entity
-   * \param mac the MAC entity
-   * \param rrc the RRC entity
-   * \param nas the NAS entity
-   * \param imsi the unique UE identifier
-   * 
-   */
-  LteUeNetDevice (Ptr<Node> node, Ptr<LteUePhy> phy, Ptr<LteUeMac> mac, Ptr<LteUeRrc> rrc, Ptr<EpcUeNas> nas, uint64_t imsi);
-
   virtual ~LteUeNetDevice (void);
   virtual void DoDispose ();
 
 
   // inherited from NetDevice
   virtual bool Send (Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);
-  
+
 
   Ptr<LteUeMac> GetMac (void) const;
 
-  Ptr<LteUeRrc> GetRrc () const ;
+  Ptr<LteUeRrc> GetRrc () const;
 
   Ptr<LteUePhy> GetPhy (void) const;
-  
+
   Ptr<EpcUeNas> GetNas (void) const;
 
   uint64_t GetImsi () const;
 
- 
+  /**
+   * \return the downlink carrier frequency (EARFCN)
+   *
+   * Note that real-life handset typically supports more than one EARFCN, but
+   * the sake of simplicity we assume only one EARFCN is supported.
+   */
+  uint16_t GetDlEarfcn () const;
+
+  /**
+   * \param earfcn the downlink carrier frequency (EARFCN)
+   *
+   * Note that real-life handset typically supports more than one EARFCN, but
+   * the sake of simplicity we assume only one EARFCN is supported.
+   */
+  void SetDlEarfcn (uint16_t earfcn);
+
+  /**
+   * \brief Returns the CSG ID the UE is currently a member of.
+   * \return the Closed Subscriber Group identity
+   */
+  uint32_t GetCsgId () const;
+
+  /**
+   * \brief Enlist the UE device as a member of a particular CSG.
+   * \param csgId the intended Closed Subscriber Group identity
+   *
+   * UE is associated with a single CSG identity, and thus becoming a member of
+   * this particular CSG. As a result, the UE may gain access to cells which
+   * belong to this CSG. This does not revoke the UE's access to non-CSG cells.
+   *
+   * \note This restriction only applies to initial cell selection and
+   *       EPC-enabled simulation.
+   */
+  void SetCsgId (uint32_t csgId);
+
   /**
    * \brief Set the targer eNB where the UE is registered
    * \param enb
    */
   void SetTargetEnb (Ptr<LteEnbNetDevice> enb);
-  
+
   /**
    * \brief Get the targer eNB where the UE is registered
    * \return the pointer to the enb
@@ -105,16 +127,18 @@
 
 
 private:
+  bool m_isConstructed;
 
   /**
-   * Some attributes are exported as
-   * attributes of the LteUeNetDevice from a user perspective,  but
-   * are actually used also in other modules as well (the RRC, the
-   * PHY...). This methods takes care of updating the
-   * configuration of all modules so that their copy of the attribute
-   * values is in sync with the one in the LteUeNetDevice.
+   * \brief Propagate attributes and configuration to sub-modules.
+   *
+   * Several attributes (e.g., the IMSI) are exported as the attributes of the
+   * LteUeNetDevice from a user perspective, but are actually used also in other
+   * sub-modules (the RRC, the PHY, etc.). This method takes care of updating
+   * the configuration of all these sub-modules so that their copy of attribute
+   * values are in sync with the one in the LteUeNetDevice.
    */
-  void UpdateConfig (void);
+  void UpdateConfig ();
 
   Ptr<LteEnbNetDevice> m_targetEnb;
 
@@ -124,8 +148,12 @@
   Ptr<EpcUeNas> m_nas;
 
   uint64_t m_imsi;
-  
-};
+
+  uint16_t m_dlEarfcn; /**< downlink carrier frequency */
+
+  uint32_t m_csgId;
+
+}; // end of class LteUeNetDevice
 
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/lte/model/lte-ue-phy.cc ns-3.19/src/lte/model/lte-ue-phy.cc
--- ns-3.18.1/src/lte/model/lte-ue-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-ue-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -106,8 +106,20 @@
 // LteUePhy methods
 ////////////////////////////////////////
 
+const char* g_uePhyStateName[LteUePhy::NUM_STATES] =
+{
+  "CELL_SEARCH",
+  "SYNCHRONIZED"
+};
+
+std::string ToString (LteUePhy::State s)
+{
+  return std::string (g_uePhyStateName[s]);
+}
 
-NS_OBJECT_ENSURE_REGISTERED (LteUePhy);
+
+NS_OBJECT_ENSURE_REGISTERED (LteUePhy)
+  ;
 
 
 LteUePhy::LteUePhy ()
@@ -118,10 +130,11 @@
 
 LteUePhy::LteUePhy (Ptr<LteSpectrumPhy> dlPhy, Ptr<LteSpectrumPhy> ulPhy)
   : LtePhy (dlPhy, ulPhy),
-    m_p10CqiPeriocity (MilliSeconds (1)),  // ideal behavior  
+    m_p10CqiPeriocity (MilliSeconds (1)),  // ideal behavior
     m_a30CqiPeriocity (MilliSeconds (1)),  // ideal behavior
     m_uePhySapUser (0),
     m_ueCphySapUser (0),
+    m_state (CELL_SEARCH),
     m_subframeNo (0),
     m_rsReceivedPowerUpdated (false),
     m_rsInterferencePowerUpdated (false),
@@ -134,7 +147,7 @@
   m_uePhySapProvider = new UeMemberLteUePhySapProvider (this);
   m_ueCphySapProvider = new MemberLteUeCphySapProvider<LteUePhy> (this);
   m_macChTtiDelay = UL_PUSCH_TTIS_DELAY;
-  
+
   NS_ASSERT_MSG (Simulator::Now ().GetNanoSeconds () == 0,
                  "Cannot create UE devices after simulation started");
   Simulator::ScheduleNow (&LteUePhy::SubframeIndication, this, 1, 1);
@@ -185,40 +198,40 @@
                                        &LteUePhy::GetNoiseFigure),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("TxMode1Gain",
-                  "Transmission mode 1 gain in dB",
-                  DoubleValue (0.0),
-                   MakeDoubleAccessor (&LteUePhy::SetTxMode1Gain                       ),
-                  MakeDoubleChecker<double> ())
+                   "Transmission mode 1 gain in dB",
+                   DoubleValue (0.0),
+                   MakeDoubleAccessor (&LteUePhy::SetTxMode1Gain),
+                   MakeDoubleChecker<double> ())
     .AddAttribute ("TxMode2Gain",
-                    "Transmission mode 2 gain in dB",
-                    DoubleValue (4.2),
-                   MakeDoubleAccessor (&LteUePhy::SetTxMode2Gain                       ),
-                    MakeDoubleChecker<double> ())
+                   "Transmission mode 2 gain in dB",
+                   DoubleValue (4.2),
+                   MakeDoubleAccessor (&LteUePhy::SetTxMode2Gain),
+                   MakeDoubleChecker<double> ())
     .AddAttribute ("TxMode3Gain",
-                    "Transmission mode 3 gain in dB",
-                    DoubleValue (-2.8),
-                   MakeDoubleAccessor (&LteUePhy::SetTxMode3Gain                       ),
-                    MakeDoubleChecker<double> ())
+                   "Transmission mode 3 gain in dB",
+                   DoubleValue (-2.8),
+                   MakeDoubleAccessor (&LteUePhy::SetTxMode3Gain),
+                   MakeDoubleChecker<double> ())
     .AddAttribute ("TxMode4Gain",
-                    "Transmission mode 4 gain in dB",
-                    DoubleValue (0.0),
-                   MakeDoubleAccessor (&LteUePhy::SetTxMode4Gain                       ),
-                    MakeDoubleChecker<double> ())
+                   "Transmission mode 4 gain in dB",
+                   DoubleValue (0.0),
+                   MakeDoubleAccessor (&LteUePhy::SetTxMode4Gain),
+                   MakeDoubleChecker<double> ())
     .AddAttribute ("TxMode5Gain",
-                  "Transmission mode 5 gain in dB",
-                  DoubleValue (0.0),
-                   MakeDoubleAccessor (&LteUePhy::SetTxMode5Gain                       ),
-                  MakeDoubleChecker<double> ())
+                   "Transmission mode 5 gain in dB",
+                   DoubleValue (0.0),
+                   MakeDoubleAccessor (&LteUePhy::SetTxMode5Gain),
+                   MakeDoubleChecker<double> ())
     .AddAttribute ("TxMode6Gain",
-                    "Transmission mode 6 gain in dB",
-                    DoubleValue (0.0),
-                   MakeDoubleAccessor (&LteUePhy::SetTxMode6Gain                       ),
-                    MakeDoubleChecker<double> ())
+                   "Transmission mode 6 gain in dB",
+                   DoubleValue (0.0),
+                   MakeDoubleAccessor (&LteUePhy::SetTxMode6Gain),
+                   MakeDoubleChecker<double> ())
     .AddAttribute ("TxMode7Gain",
-                  "Transmission mode 7 gain in dB",
-                  DoubleValue (0.0),
-                   MakeDoubleAccessor (&LteUePhy::SetTxMode7Gain                       ),
-                  MakeDoubleChecker<double> ())
+                   "Transmission mode 7 gain in dB",
+                   DoubleValue (0.0),
+                   MakeDoubleAccessor (&LteUePhy::SetTxMode7Gain),
+                   MakeDoubleChecker<double> ())
     .AddTraceSource ("ReportCurrentCellRsrpSinr",
                      "RSRP and SINR statistics.",
                      MakeTraceSourceAccessor (&LteUePhy::m_reportCurrentCellRsrpSinrTrace))
@@ -243,18 +256,21 @@
                    MakePointerAccessor (&LteUePhy::GetUlSpectrumPhy),
                    MakePointerChecker <LteSpectrumPhy> ())
     .AddAttribute ("RsrqUeMeasThreshold",
-                  "Receive threshold for PSS on RSRQ [dB]",
-                  DoubleValue (-1000.0),
-                   MakeDoubleAccessor (&LteUePhy::m_pssReceptionThreshold                    ),
-                  MakeDoubleChecker<double> ())
+                   "Receive threshold for PSS on RSRQ [dB]",
+                   DoubleValue (-1000.0),
+                   MakeDoubleAccessor (&LteUePhy::m_pssReceptionThreshold),
+                   MakeDoubleChecker<double> ())
     .AddAttribute ("UeMeasurementsFilterPeriod",
-                  "Time period for reporting UE measurements (default 200 ms.) ",
-                  TimeValue (MilliSeconds (200)),
-                  MakeTimeAccessor (&LteUePhy::m_ueMeasurementsFilterPeriod),
-                  MakeTimeChecker ())
+                   "Time period for reporting UE measurements (default 200 ms.) ",
+                   TimeValue (MilliSeconds (200)),
+                   MakeTimeAccessor (&LteUePhy::m_ueMeasurementsFilterPeriod),
+                   MakeTimeChecker ())
     .AddTraceSource ("ReportUeMeasurements",
                      "Report UE measurements RSRP (dBm) and RSRQ (dB).",
                      MakeTraceSourceAccessor (&LteUePhy::m_reportUeMeasurements))
+    .AddTraceSource ("StateTransition",
+                     "Trace fired upon every UE PHY state transition",
+                     MakeTraceSourceAccessor (&LteUePhy::m_stateTransitionTrace))
   ;
   return tid;
 }
@@ -408,34 +424,33 @@
 {
   NS_LOG_FUNCTION (this);
 
-  if ((!(m_dlConfigured && m_ulConfigured)) || (m_rnti == 0))
-    {
-      // abort method, the UE is still not registered
-      m_pssList.clear ();
-      return;
-    }
+  NS_ASSERT (m_state != CELL_SEARCH);
+  NS_ASSERT (m_cellId > 0);
 
-  // check periodic wideband CQI
-  if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriocity)
+  if (m_dlConfigured && m_ulConfigured && (m_rnti > 0))
     {
-      Ptr<LteUeNetDevice> thisDevice = GetDevice ()->GetObject<LteUeNetDevice> ();
-      Ptr<DlCqiLteControlMessage> msg = CreateDlCqiFeedbackMessage (sinr);
-      if (msg)
+      // check periodic wideband CQI
+      if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriocity)
         {
-          DoSendLteControlMessage (msg);
+          Ptr<LteUeNetDevice> thisDevice = GetDevice ()->GetObject<LteUeNetDevice> ();
+          Ptr<DlCqiLteControlMessage> msg = CreateDlCqiFeedbackMessage (sinr);
+          if (msg)
+            {
+              DoSendLteControlMessage (msg);
+            }
+          m_p10CqiLast = Simulator::Now ();
         }
-      m_p10CqiLast = Simulator::Now ();
-    }
-  // check aperiodic high-layer configured subband CQI
-  if  (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriocity)
-    {
-      Ptr<LteUeNetDevice> thisDevice = GetDevice ()->GetObject<LteUeNetDevice> ();
-      Ptr<DlCqiLteControlMessage> msg = CreateDlCqiFeedbackMessage (sinr);
-      if (msg)
+      // check aperiodic high-layer configured subband CQI
+      if  (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriocity)
         {
-          DoSendLteControlMessage (msg);
+          Ptr<LteUeNetDevice> thisDevice = GetDevice ()->GetObject<LteUeNetDevice> ();
+          Ptr<DlCqiLteControlMessage> msg = CreateDlCqiFeedbackMessage (sinr);
+          if (msg)
+            {
+              DoSendLteControlMessage (msg);
+            }
+          m_a30CqiLast = Simulator::Now ();
         }
-      m_a30CqiLast = Simulator::Now ();
     }
 
   // Generate PHY trace
@@ -472,20 +487,22 @@
       m_rsrpSinrSampleCounter = 0;
     }
 
-  // Generate UE Measurements for upper layers
   if (m_pssReceived)
     {
+      // measure instantaneous RSRQ now
       NS_ASSERT_MSG (m_rsInterferencePowerUpdated, " RS interference power info obsolete");
-      // PSSs received
-      NS_LOG_DEBUG (this << " Process PSS RNTI " << m_rnti << " cellId " << m_cellId << " PSS num " << m_pssList.size ());
+
       std::list <PssElement>::iterator itPss = m_pssList.begin ();
       while (itPss != m_pssList.end ())
         {
-          uint8_t rbNum = 0;
+          uint16_t rbNum = 0;
           double rsrqSum = 0.0;
-          Values::const_iterator itIntN = m_rsIntereferencePower.ConstValuesBegin ();
+
+          Values::const_iterator itIntN = m_rsInterferencePower.ConstValuesBegin ();
           Values::const_iterator itPj = m_rsReceivedPower.ConstValuesBegin ();
-          for (itPj = m_rsReceivedPower.ConstValuesBegin (); itPj != m_rsReceivedPower.ConstValuesEnd (); itIntN++, itPj++)
+          for (itPj = m_rsReceivedPower.ConstValuesBegin ();
+               itPj != m_rsReceivedPower.ConstValuesEnd ();
+               itIntN++, itPj++)
             {
               rbNum++;
               // convert PSD [W/Hz] to linear power [W] for the single RE
@@ -493,43 +510,31 @@
               double intPowerTxW = ((*itPj) * 180000.0) / 12.0;
               rsrqSum += (2 * (noisePowerTxW + intPowerTxW));
             }
+
           NS_ASSERT (rbNum == (*itPss).nRB);
-          double rsrp_dBm = 10 * log10 (1000 * ((*itPss).pssPsdSum / (double)rbNum));
           double rsrq_dB = 10 * log10 ((*itPss).pssPsdSum / rsrqSum);
 
           if (rsrq_dB > m_pssReceptionThreshold)
             {
-              // report UE Measurements to upper layers
-              NS_LOG_INFO (this << " PSS received from CellId " << (*itPss).cellId << " has RSRP " << rsrp_dBm << " and RSRQ " << rsrq_dB << " RBnum " << (uint16_t)rbNum);
+              NS_LOG_INFO (this << " PSS RNTI " << m_rnti << " cellId " << m_cellId
+                                << " has RSRQ " << rsrq_dB << " and RBnum " << rbNum);
               // store measurements
-              std::map <uint16_t, UeMeasurementsElement>::iterator itMeasMap =  m_UeMeasurementsMap.find ((*itPss).cellId);
-              if (itMeasMap == m_UeMeasurementsMap.end ())
-                {
-                  // insert new entry
-                  UeMeasurementsElement newEl;
-                  newEl.rsrpSum = rsrp_dBm;
-                  newEl.rsrpNum = 1;
-                  newEl.rsrqSum = rsrq_dB;
-                  newEl.rsrqNum = 1;
-                  m_UeMeasurementsMap.insert (std::pair <uint16_t, UeMeasurementsElement> ((*itPss).cellId, newEl));
-                }
-              else
-                {
-                  (*itMeasMap).second.rsrpSum += rsrp_dBm;
-                  (*itMeasMap).second.rsrpNum++;
-                  (*itMeasMap).second.rsrqSum += rsrq_dB;
-                  (*itMeasMap).second.rsrqNum++;
-                }
-
+              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++;
             }
+
           itPss++;
-        }
-        m_pssList.clear ();
-    }
 
+        } // end of while (itPss != m_pssList.end ())
 
-  
-}
+      m_pssList.clear ();
+
+    } // end of if (m_pssReceived)
+
+} // end of void LteUePhy::GenerateCtrlCqiReport (const SpectrumValue& sinr)
 
 void
 LteUePhy::GenerateDataCqiReport (const SpectrumValue& sinr)
@@ -542,7 +547,7 @@
 {
   NS_LOG_FUNCTION (this << interf);
   m_rsInterferencePowerUpdated = true;
-  m_rsIntereferencePower = interf; 
+  m_rsInterferencePower = interf;
 }
 
 void
@@ -550,7 +555,7 @@
 {
   NS_LOG_FUNCTION (this << power);
   m_rsReceivedPowerUpdated = true;
-  m_rsReceivedPower = power;  
+  m_rsReceivedPower = power;
 }
 
 
@@ -559,7 +564,7 @@
 LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr)
 {
   NS_LOG_FUNCTION (this);
-  
+
 
   // apply transmission mode gain
   NS_ASSERT (m_transmissionMode < m_txModeGain.size ());
@@ -573,7 +578,7 @@
   if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriocity)
     {
       cqi = m_amc->CreateCqiFeedbacks (newSinr, m_dlBandwidth);
-      
+
       int nLayer = TransmissionModesLayers::TxMode2LayerNum (m_transmissionMode);
       int nbSubChannels = cqi.size ();
       double cqiSum = 0.0;
@@ -660,27 +665,41 @@
 {
   NS_LOG_FUNCTION (this << Simulator::Now ());
   NS_LOG_DEBUG (this << " Report UE Measurements ");
+
   LteUeCphySapUser::UeMeasurementsParameters ret;
+
   std::map <uint16_t, UeMeasurementsElement>::iterator it;
-  for (it = m_UeMeasurementsMap.begin (); it != m_UeMeasurementsMap.end (); it++)
+  for (it = m_ueMeasurementsMap.begin (); it != m_ueMeasurementsMap.end (); it++)
     {
       double avg_rsrp = (*it).second.rsrpSum / (double)(*it).second.rsrpNum;
       double avg_rsrq = (*it).second.rsrqSum / (double)(*it).second.rsrqNum;
-      NS_LOG_DEBUG (this << " CellId " << (*it).first << " RSRP " << avg_rsrp << " (nSamples " << (*it).second.rsrpNum << ") RSRQ " << avg_rsrq << " (nSamples " << (*it).second.rsrpNum << ")");
+      /*
+       * In CELL_SEARCH state, this may result in avg_rsrq = 0/0 = -nan.
+       * UE RRC must take this into account when receiving measurement reports.
+       * TODO remove this shortcoming by calculating RSRQ during CELL_SEARCH
+       */
+      NS_LOG_DEBUG (this << " CellId " << (*it).first
+                         << " RSRP " << avg_rsrp
+                         << " (nSamples " << (uint16_t)(*it).second.rsrpNum << ")"
+                         << " RSRQ " << avg_rsrq
+                         << " (nSamples " << (uint16_t)(*it).second.rsrqNum << ")");
+
       LteUeCphySapUser::UeMeasurementsElement newEl;
       newEl.m_cellId = (*it).first;
       newEl.m_rsrp = avg_rsrp;
       newEl.m_rsrq = avg_rsrq;
       ret.m_ueMeasurementsList.push_back (newEl);
+
       // report to UE measurements trace
-      m_reportUeMeasurements (m_rnti, m_cellId, avg_rsrp, avg_rsrq, ((*it).first == m_cellId ? 1 : 0));
+      m_reportUeMeasurements (m_rnti, (*it).first, avg_rsrp, avg_rsrq, ((*it).first == m_cellId ? 1 : 0));
     }
-  m_ueCphySapUser-> ReportUeMeasurements(ret);
-  m_UeMeasurementsMap.clear ();
-  Simulator::Schedule (m_ueMeasurementsFilterPeriod, &LteUePhy::ReportUeMeasurements, this);
-}
 
+  // report to RRC
+  m_ueCphySapUser->ReportUeMeasurements (ret);
 
+  m_ueMeasurementsMap.clear ();
+  Simulator::Schedule (m_ueMeasurementsFilterPeriod, &LteUePhy::ReportUeMeasurements, this);
+}
 
 void
 LteUePhy::DoSendLteControlMessage (Ptr<LteControlMessage> msg)
@@ -708,7 +727,7 @@
 LteUePhy::ReceiveLteControlMessageList (std::list<Ptr<LteControlMessage> > msgList)
 {
   NS_LOG_FUNCTION (this);
-  
+
   std::list<Ptr<LteControlMessage> >::iterator it;
   for (it = msgList.begin (); it != msgList.end(); it++)
   {
@@ -760,7 +779,7 @@
     }
     else if (msg->GetMessageType () == LteControlMessage::UL_DCI) 
     {
-      // set the uplink bandwidht according to the UL-CQI
+      // set the uplink bandwidth according to the UL-CQI
       Ptr<UlDciLteControlMessage> msg2 = DynamicCast<UlDciLteControlMessage> (msg);
       UlDciListElement_s dci = msg2->GetDci ();
       if (dci.m_rnti != m_rnti)
@@ -828,8 +847,16 @@
     else if (msg->GetMessageType () == LteControlMessage::MIB) 
       {
         NS_LOG_INFO ("received MIB");
+        NS_ASSERT (m_cellId > 0);
         Ptr<MibLteControlMessage> msg2 = DynamicCast<MibLteControlMessage> (msg);
-        m_ueCphySapUser->RecvMasterInformationBlock (msg2->GetMib ());
+        m_ueCphySapUser->RecvMasterInformationBlock (m_cellId, msg2->GetMib ());
+      }
+    else if (msg->GetMessageType () == LteControlMessage::SIB1)
+      {
+        NS_LOG_INFO ("received SIB1");
+        NS_ASSERT (m_cellId > 0);
+        Ptr<Sib1LteControlMessage> msg2 = DynamicCast<Sib1LteControlMessage> (msg);
+        m_ueCphySapUser->RecvSystemInformationBlockType1 (m_cellId, msg2->GetSib1 ());
       }
     else
     {
@@ -847,14 +874,7 @@
 LteUePhy::ReceivePss (uint16_t cellId, Ptr<SpectrumValue> p)
 {
   NS_LOG_FUNCTION (this << cellId << (*p));
-  if (!m_dlConfigured)
-    {
-      // LteUePhy not yet configured -> skip measurement
-      return;
-    }
-  m_pssReceived = true;
-  PssElement el;
-  el.cellId = cellId;
+
   double sum = 0.0;
   uint16_t nRB = 0;
   Values::const_iterator itPi;
@@ -865,10 +885,43 @@
       sum += powerTxW;
       nRB++;
     }
+
+  // measure instantaneous RSRP now
+  double rsrp_dBm = 10 * log10 (1000 * (sum / (double)nRB));
+  NS_LOG_INFO (this << " PSS RNTI " << m_rnti << " cellId " << m_cellId
+                    << " has RSRP " << rsrp_dBm << " and RBnum " << nRB);
+  // note that m_pssReceptionThreshold does not apply here
+
+  // store measurements
+  std::map <uint16_t, UeMeasurementsElement>::iterator itMeasMap = m_ueMeasurementsMap.find (cellId);
+  if (itMeasMap == m_ueMeasurementsMap.end ())
+    {
+      // insert new entry
+      UeMeasurementsElement newEl;
+      newEl.rsrpSum = rsrp_dBm;
+      newEl.rsrpNum = 1;
+      newEl.rsrqSum = 0;
+      newEl.rsrqNum = 0;
+      m_ueMeasurementsMap.insert (std::pair <uint16_t, UeMeasurementsElement> (cellId, newEl));
+    }
+  else
+    {
+      (*itMeasMap).second.rsrpSum += rsrp_dBm;
+      (*itMeasMap).second.rsrpNum++;
+    }
+
+  /*
+   * Collect the PSS for later processing in GenerateCtrlCqiReport()
+   * (to be called from ChunkProcessor after RX is finished).
+   */
+  m_pssReceived = true;
+  PssElement el;
+  el.cellId = cellId;
   el.pssPsdSum = sum;
   el.nRB = nRB;
   m_pssList.push_back (el);
-}
+
+} // end of void LteUePhy::ReceivePss (uint16_t cellId, Ptr<SpectrumValue> p)
 
 
 void
@@ -884,17 +937,17 @@
   NS_LOG_FUNCTION (this << frameNo << subframeNo);
 
   NS_ASSERT_MSG (frameNo > 0, "the SRS index check code assumes that frameNo starts at 1");
-  
+
   // refresh internal variables
   m_rsReceivedPowerUpdated = false;
   m_rsInterferencePowerUpdated = false;
   m_pssReceived = false;
-  
+
   if (m_ulConfigured)
     {
       // update uplink transmission mask according to previous UL-CQIs
       SetSubChannelsForTransmission (m_subChannelsForTransmissionQueue.at (0));
-   
+
       // shift the queue
       for (uint8_t i = 1; i < m_macChTtiDelay; i++)
         {
@@ -926,7 +979,7 @@
         }
       else
         {
-      // send only PUCCH (ideal: fake null bandwidth signal)
+          // send only PUCCH (ideal: fake null bandwidth signal)
           if (ctrlMsg.size ()>0)
             {
               NS_LOG_LOGIC (this << " UE - start TX PUCCH (NO PUSCH)");
@@ -953,9 +1006,10 @@
     }
   
   // schedule next subframe indication
-  Simulator::Schedule (Seconds (GetTti ()), &LteUePhy::SubframeIndication, this, frameNo, subframeNo);  
+  Simulator::Schedule (Seconds (GetTti ()), &LteUePhy::SubframeIndication, this, frameNo, subframeNo);
 }
-  
+
+
 void
 LteUePhy::SendSrs ()
 {
@@ -976,7 +1030,7 @@
 LteUePhy::DoReset ()
 {
   NS_LOG_FUNCTION (this);
-  
+
   m_rnti = 0;
   m_transmissionMode = 0;
   m_srsPeriodicity = 0;
@@ -1005,25 +1059,47 @@
   m_sendSrsEvent.Cancel ();
   m_downlinkSpectrumPhy->Reset ();
   m_uplinkSpectrumPhy->Reset ();
+
+} // end of void LteUePhy::DoReset ()
+
+void
+LteUePhy::DoStartCellSearch (uint16_t dlEarfcn)
+{
+  NS_LOG_FUNCTION (this << dlEarfcn);
+  m_dlEarfcn = dlEarfcn;
+  DoSetDlBandwidth (6); // configure DL for receiving PSS
+  SwitchToState (CELL_SEARCH);
 }
 
 void
-LteUePhy::DoSyncronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn)
+LteUePhy::DoSynchronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn)
+{
+  NS_LOG_FUNCTION (this << cellId << dlEarfcn);
+  m_dlEarfcn = dlEarfcn;
+  DoSynchronizeWithEnb (cellId);
+}
+
+void
+LteUePhy::DoSynchronizeWithEnb (uint16_t cellId)
 {
   NS_LOG_FUNCTION (this << cellId);
+
+  if (cellId == 0)
+    {
+      NS_FATAL_ERROR ("Cell ID shall not be zero");
+    }
+
   m_cellId = cellId;
-  m_dlEarfcn = dlEarfcn;
   m_downlinkSpectrumPhy->SetCellId (cellId);
   m_uplinkSpectrumPhy->SetCellId (cellId);
 
-  // configure DL for receing the BCH with the minimum bandwith
-  m_dlBandwidth = 6;
-  Ptr<SpectrumValue> noisePsd = LteSpectrumValueHelper::CreateNoisePowerSpectralDensity (m_dlEarfcn, m_dlBandwidth, m_noiseFigure);
-  m_downlinkSpectrumPhy->SetNoisePowerSpectralDensity (noisePsd);
-  m_downlinkSpectrumPhy->GetChannel ()->AddRx (m_downlinkSpectrumPhy);  
-  
+  // configure DL for receiving the BCH with the minimum bandwidth
+  DoSetDlBandwidth (6);
+
   m_dlConfigured = false;
   m_ulConfigured = false;
+
+  SwitchToState (SYNCHRONIZED);
 }
 
 void
@@ -1048,10 +1124,10 @@
               break;
             }
         }
-  
+
       Ptr<SpectrumValue> noisePsd = LteSpectrumValueHelper::CreateNoisePowerSpectralDensity (m_dlEarfcn, m_dlBandwidth, m_noiseFigure);
       m_downlinkSpectrumPhy->SetNoisePowerSpectralDensity (noisePsd);
-      m_downlinkSpectrumPhy->GetChannel ()->AddRx (m_downlinkSpectrumPhy);  
+      m_downlinkSpectrumPhy->GetChannel ()->AddRx (m_downlinkSpectrumPhy);
     }
   m_dlConfigured = true;
 }
@@ -1186,4 +1262,25 @@
 }
 
 
+LteUePhy::State
+LteUePhy::GetState () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_state;
+}
+
+
+void
+LteUePhy::SwitchToState (State newState)
+{
+  NS_LOG_FUNCTION (this << newState);
+  State oldState = m_state;
+  m_state = newState;
+  NS_LOG_INFO (this << " cellId=" << m_cellId << " rnti=" << m_rnti
+                    << " UePhy " << ToString (oldState)
+                    << " --> " << ToString (newState));
+  m_stateTransitionTrace (m_cellId, m_rnti, oldState, newState);
+}
+
+
 } // namespace ns3
diff -Naur ns-3.18.1/src/lte/model/lte-ue-phy.h ns-3.19/src/lte/model/lte-ue-phy.h
--- ns-3.18.1/src/lte/model/lte-ue-phy.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-ue-phy.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,7 @@
 #include <ns3/lte-ue-cphy-sap.h>
 #include <ns3/ptr.h>
 #include <ns3/lte-amc.h>
+#include <set>
 
 
 namespace ns3 {
@@ -54,6 +55,16 @@
 
 public:
   /**
+   * \brief The states of the UE PHY entity
+   */
+  enum State
+  {
+    CELL_SEARCH = 0,
+    SYNCHRONIZED,
+    NUM_STATES
+  };
+
+  /**
    * @warning the default constructor should not be used
    */
   LteUePhy ();
@@ -98,7 +109,7 @@
 
 
   /**
-   * \param pw the transmission power in dBm
+   * \param pow the transmission power in dBm
    */
   void SetTxPower (double pow);
 
@@ -107,9 +118,9 @@
    */
   double GetTxPower () const;
   /**
-   * \param pw the noise figure in dB
+   * \param nf the noise figure in dB
    */
-  void SetNoiseFigure (double pow);
+  void SetNoiseFigure (double nf);
 
   /**
    * \return the noise figure in dB
@@ -131,7 +142,6 @@
    */
   Ptr<LteSpectrumPhy> GetUlSpectrumPhy () const;
 
-
   /**
    * \brief Create the PSD for the TX
    * \return the pointer to the PSD
@@ -160,11 +170,11 @@
    */
   std::vector <int> GetSubChannelsForReception (void);
 
-
   /**
   * \brief Create the DL CQI feedback from SINR values perceived at
   * the physical layer with the signal received from eNB
   * \param sinr SINR values vector
+  * \return a DL CQI control message containing the CQI feedback
   */
   Ptr<DlCqiLteControlMessage> CreateDlCqiFeedbackMessage (const SpectrumValue& sinr);
 
@@ -179,8 +189,6 @@
   // callbacks for LteSpectrumPhy
   virtual void ReceiveLteControlMessageList (std::list<Ptr<LteControlMessage> >);
   virtual void ReceivePss (uint16_t cellId, Ptr<SpectrumValue> p);
-  
-  
 
 
 
@@ -200,25 +208,29 @@
 
 
   /**
-  * \brief Send the SRS signal in the last symbols of the frame
-  */
+   * \brief Send the SRS signal in the last symbols of the frame
+   */
   void SendSrs ();
-  
-    /**
-  * \brief PhySpectrum generated a new DL HARQ feedback
-  */
+
+  /**
+   * \brief PhySpectrum generated a new DL HARQ feedback
+   */
   virtual void ReceiveLteDlHarqFeedback (DlInfoListElement_s mes);
 
   /**
-  * \brief Set the HARQ PHY module
-  */
+   * \brief Set the HARQ PHY module
+   */
   void SetHarqPhyModule (Ptr<LteHarqPhy> harq);
 
+  /**
+   * \return The current state
+   */
+  State GetState () const;
 
 
 
 private:
-  
+
   void SetTxMode1Gain (double gain);
   void SetTxMode2Gain (double gain);
   void SetTxMode3Gain (double gain);
@@ -230,11 +242,22 @@
 
   void QueueSubChannelsForTransmission (std::vector <int> rbMap);
 
+  /**
+   * \brief Layer-1 filtering of RSRP and RSRQ measurements and reporting to
+   *        the RRC entity.
+   *
+   * Initially executed at +0.200s, and then repeatedly executed with
+   * periodicity as indicated by the *UeMeasurementsFilterPeriod* attribute.
+   */
   void ReportUeMeasurements ();
 
+  void SwitchToState (State s);
+
   // UE CPHY SAP methods
-  void DoReset ();  
-  void DoSyncronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn);  
+  void DoReset ();
+  void DoStartCellSearch (uint16_t dlEarfcn);
+  void DoSynchronizeWithEnb (uint16_t cellId);
+  void DoSynchronizeWithEnb (uint16_t cellId, uint16_t dlEarfcn);
   void DoSetDlBandwidth (uint8_t ulBandwidth);
   void DoConfigureUplink (uint16_t ulEarfcn, uint8_t ulBandwidth);
   void DoSetRnti (uint16_t rnti);
@@ -242,16 +265,16 @@
   void DoSetSrsConfigurationIndex (uint16_t srcCi);
 
   // UE PHY SAP methods 
-  virtual void DoSendMacPdu (Ptr<Packet> p);  
+  virtual void DoSendMacPdu (Ptr<Packet> p);
   virtual void DoSendLteControlMessage (Ptr<LteControlMessage> msg);
   virtual void DoSendRachPreamble (uint32_t prachId, uint32_t raRnti);
-  
+
   std::vector <int> m_subChannelsForTransmission;
   std::vector <int> m_subChannelsForReception;
-  
+
   std::vector< std::vector <int> > m_subChannelsForTransmissionQueue;
-  
-  
+
+
   Ptr<LteAmc> m_amc;
 
   Time m_p10CqiPeriocity; /**< Wideband Periodic CQI: 2, 5, 10, 16, 20, 32, 40, 64, 80 or 160 ms */
@@ -272,7 +295,7 @@
  
   uint8_t m_transmissionMode;
   std::vector <double> m_txModeGain;
-  
+
   uint16_t m_srsPeriodicity;
   uint16_t m_srsSubframeOffset;
   uint16_t m_srsConfigured;
@@ -281,34 +304,38 @@
   bool m_dlConfigured;
   bool m_ulConfigured;
 
+  State m_state;
+  //             cellid    rnti
+  TracedCallback<uint16_t, uint16_t, State, State> m_stateTransitionTrace;
+
   uint8_t m_subframeNo;
 
   bool m_rsReceivedPowerUpdated;
   SpectrumValue m_rsReceivedPower;
 
   bool m_rsInterferencePowerUpdated;
-  SpectrumValue m_rsIntereferencePower;
+  SpectrumValue m_rsInterferencePower;
 
   bool m_pssReceived;
   struct PssElement
-    {
-      uint16_t cellId;
-      double pssPsdSum;
-      uint16_t nRB;
-    };
+  {
+    uint16_t cellId;
+    double pssPsdSum;
+    uint16_t nRB;
+  };
   std::list <PssElement> m_pssList;
 
   double m_pssReceptionThreshold; // on RSRQ [W]
 
   struct UeMeasurementsElement
-    {
-      double rsrpSum;
-      uint8_t rsrpNum;
-      double rsrqSum;
-      uint8_t rsrqNum;
-    };
+  {
+    double rsrpSum;
+    uint8_t rsrpNum;
+    double rsrqSum;
+    uint8_t rsrqNum;
+  };
 
-  std::map <uint16_t, UeMeasurementsElement> m_UeMeasurementsMap;
+  std::map <uint16_t, UeMeasurementsElement> m_ueMeasurementsMap;
   Time m_ueMeasurementsFilterPeriod;
   Time m_ueMeasurementsFilterLast;
 
@@ -327,7 +354,7 @@
 
   /**
    * Trace information regarding RSRP and RSRQ (see TS 36.214)
-   * uint16_t rnti, uint16_t cellId, double rsrp, double sinr, bool servingCell
+   * uint16_t rnti, uint16_t cellId, double rsrpDbm, double rsrqDb, bool isServingCell
    */
   TracedCallback<uint16_t, uint16_t, double, double, bool> m_reportUeMeasurements;
 
diff -Naur ns-3.18.1/src/lte/model/lte-ue-rrc.cc ns-3.19/src/lte/model/lte-ue-rrc.cc
--- ns-3.18.1/src/lte/model/lte-ue-rrc.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-ue-rrc.cc	2013-12-20 09:44:50.000000000 -0800
@@ -16,27 +16,23 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: Nicola Baldo <nbaldo@cttc.es>
+ *         Budiarto Herman <budiarto.herman@magister.fi>
  */
 
+#include "lte-ue-rrc.h"
+
 #include <ns3/fatal-error.h>
 #include <ns3/log.h>
 #include <ns3/object-map.h>
 #include <ns3/object-factory.h>
-#include <ns3/node-list.h>
-#include <ns3/node.h>
 #include <ns3/simulator.h>
 
-#include "lte-ue-rrc.h"
-#include "lte-enb-rrc.h"
-#include "lte-rlc.h"
-#include "lte-rlc-tm.h"
-#include "lte-rlc-um.h"
-#include "lte-rlc-am.h"
-#include "lte-pdcp.h"
-#include "lte-pdcp-sap.h"
-#include "lte-radio-bearer-info.h"
-#include "lte-as-sap.h"
-#include "lte-enb-net-device.h"
+#include <ns3/lte-rlc.h>
+#include <ns3/lte-rlc-tm.h>
+#include <ns3/lte-rlc-um.h>
+#include <ns3/lte-rlc-am.h>
+#include <ns3/lte-pdcp.h>
+#include <ns3/lte-radio-bearer-info.h>
 
 #include <cmath>
 
@@ -45,7 +41,6 @@
 namespace ns3 {
 
 
-
 /////////////////////////////
 // CMAC SAP forwarder
 /////////////////////////////
@@ -58,7 +53,7 @@
   virtual void SetTemporaryCellRnti (uint16_t rnti);
   virtual void NotifyRandomAccessSuccessful ();
   virtual void NotifyRandomAccessFailed ();
-  
+
 private:
   LteUeRrc* m_rrc;
 };
@@ -94,16 +89,21 @@
 
 
 const char* g_ueRrcStateName[LteUeRrc::NUM_STATES] = 
-  {
-    "IDLE_CELL_SELECTION",
-    "IDLE_WAIT_SYSTEM_INFO",
-    "IDLE_CAMPED_NORMALLY",
-    "IDLE_RANDOM_ACCESS",
-    "IDLE_CONNECTING",
-    "CONNECTED_NORMALLY",
-    "CONNECTED_REESTABLISHING",
-    "CONNECTED_HANDOVER"
-  };
+{
+  "IDLE_START",
+  "IDLE_CELL_SEARCH",
+  "IDLE_WAIT_MIB_SIB1",
+  "IDLE_WAIT_MIB",
+  "IDLE_WAIT_SIB1",
+  "IDLE_CAMPED_NORMALLY",
+  "IDLE_WAIT_SIB2",
+  "IDLE_RANDOM_ACCESS",
+  "IDLE_CONNECTING",
+  "CONNECTED_NORMALLY",
+  "CONNECTED_HANDOVER",
+  "CONNECTED_PHY_PROBLEM",
+  "CONNECTED_REESTABLISHING"
+};
 
 std::string ToString (LteUeRrc::State s)
 {
@@ -115,7 +115,8 @@
 // ue RRC methods
 /////////////////////////////
 
-NS_OBJECT_ENSURE_REGISTERED (LteUeRrc);
+NS_OBJECT_ENSURE_REGISTERED (LteUeRrc)
+  ;
 
 
 LteUeRrc::LteUeRrc ()
@@ -124,15 +125,16 @@
     m_rrcSapUser (0),
     m_macSapProvider (0),
     m_asSapUser (0),
-    m_state (IDLE_CELL_SELECTION),
+    m_state (IDLE_START),
     m_imsi (0),
     m_rnti (0),
     m_cellId (0),
     m_useRlcSm (true),
-    m_connectionPending (0),
-    m_receivedMib (0),
-    m_receivedSib2 (0)
-
+    m_connectionPending (false),
+    m_hasReceivedMib (false),
+    m_hasReceivedSib1 (false),
+    m_hasReceivedSib2 (false),
+    m_csgWhiteList (0)
 {
   NS_LOG_FUNCTION (this);
   m_cphySapUser = new MemberLteUeCphySapUser<LteUeRrc> (this);
@@ -188,12 +190,30 @@
                    UintegerValue (0), // unused, read-only attribute
                    MakeUintegerAccessor (&LteUeRrc::GetRnti),
                    MakeUintegerChecker<uint16_t> ())
+    .AddTraceSource ("MibReceived",
+                     "trace fired upon reception of Master Information Block",
+                     MakeTraceSourceAccessor (&LteUeRrc::m_mibReceivedTrace))
+    .AddTraceSource ("Sib1Received",
+                     "trace fired upon reception of System Information Block Type 1",
+                     MakeTraceSourceAccessor (&LteUeRrc::m_sib1ReceivedTrace))
+    .AddTraceSource ("Sib2Received",
+                     "trace fired upon reception of System Information Block Type 2",
+                     MakeTraceSourceAccessor (&LteUeRrc::m_sib2ReceivedTrace))
     .AddTraceSource ("StateTransition",
                      "trace fired upon every UE RRC state transition",
                      MakeTraceSourceAccessor (&LteUeRrc::m_stateTransitionTrace))
+    .AddTraceSource ("InitialCellSelectionEndOk",
+                     "trace fired upon successful initial cell selection procedure",
+                     MakeTraceSourceAccessor (&LteUeRrc::m_initialCellSelectionEndOkTrace))
+    .AddTraceSource ("InitialCellSelectionEndError",
+                     "trace fired upon failed initial cell selection procedure",
+                     MakeTraceSourceAccessor (&LteUeRrc::m_initialCellSelectionEndErrorTrace))
     .AddTraceSource ("RandomAccessSuccessful",
                      "trace fired upon successful completion of the random access procedure",
                      MakeTraceSourceAccessor (&LteUeRrc::m_randomAccessSuccessfulTrace))
+    .AddTraceSource ("RandomAccessError",
+                     "trace fired upon failure of the random access procedure",
+                     MakeTraceSourceAccessor (&LteUeRrc::m_randomAccessErrorTrace))
     .AddTraceSource ("ConnectionEstablished",
                      "trace fired upon successful RRC connection establishment",
                      MakeTraceSourceAccessor (&LteUeRrc::m_connectionEstablishedTrace))
@@ -206,7 +226,10 @@
     .AddTraceSource ("HandoverEndOk",
                      "trace fired upon successful termination of a handover procedure",
                      MakeTraceSourceAccessor (&LteUeRrc::m_handoverEndOkTrace))
-    ;
+    .AddTraceSource ("HandoverEndError",
+                     "trace fired upon failure of a handover procedure",
+                     MakeTraceSourceAccessor (&LteUeRrc::m_handoverEndErrorTrace))
+  ;
   return tid;
 }
 
@@ -280,7 +303,7 @@
 }
 
 uint64_t
-LteUeRrc::GetImsi (void)
+LteUeRrc::GetImsi (void) const
 {
   return m_imsi;
 }
@@ -314,7 +337,7 @@
   return m_dlBandwidth;
 }
 
-uint16_t 
+uint16_t
 LteUeRrc::GetDlEarfcn () const
 {
   return m_dlEarfcn;
@@ -327,9 +350,8 @@
   return m_ulEarfcn;
 }
 
-
 LteUeRrc::State
-LteUeRrc::GetState (void)
+LteUeRrc::GetState (void) const
 {
   NS_LOG_FUNCTION (this);
   return m_state;
@@ -356,7 +378,7 @@
   rlc->SetRnti (m_rnti);
   rlc->SetLcId (lcid);
 
-  m_srb0 = CreateObject<LteSignalingRadioBearerInfo> ();  
+  m_srb0 = CreateObject<LteSignalingRadioBearerInfo> ();
   m_srb0->m_rlc = rlc;
   m_srb0->m_srbIdentity = 0;
   LteUeRrcSapUser::SetupParameters ueParams;
@@ -372,7 +394,7 @@
   lcConfig.logicalChannelGroup = 0; // all SRBs mapped to LCG 0
 
   m_cmacSapProvider->AddLc (lcid, lcConfig, rlc->GetLteMacSapUser ());
-    
+
 }
 
 
@@ -381,7 +403,6 @@
 {
   NS_LOG_FUNCTION (this << packet);
 
-
   uint8_t drbid = Bid2Drbid (bid);
 
   std::map<uint8_t, Ptr<LteDataRadioBearerInfo> >::iterator it =   m_drbMap.find (drbid);
@@ -391,35 +412,44 @@
   params.pdcpSdu = packet;
   params.rnti = m_rnti;
   params.lcid = it->second->m_logicalChannelIdentity;
-  
-  NS_LOG_LOGIC (this << " RNTI=" << m_rnti << " sending " << packet << "on DRBID " << (uint32_t) drbid << " (LCID" << params.lcid << ")" << " (" << packet->GetSize () << " bytes)");
-  it->second->m_pdcp->GetLtePdcpSapProvider ()->TransmitPdcpSdu (params);  
+
+  NS_LOG_LOGIC (this << " RNTI=" << m_rnti << " sending packet " << packet
+                     << " on DRBID " << (uint32_t) drbid
+                     << " (LCID " << (uint32_t) params.lcid << ")"
+                     << " (" << packet->GetSize () << " bytes)");
+  it->second->m_pdcp->GetLtePdcpSapProvider ()->TransmitPdcpSdu (params);
 }
 
+
 void
 LteUeRrc::DoDisconnect ()
 {
   NS_LOG_FUNCTION (this);
 
   switch (m_state)
-    {      
-    case IDLE_CELL_SELECTION:
+    {
+    case IDLE_START:
+    case IDLE_CELL_SEARCH:
+    case IDLE_WAIT_MIB_SIB1:
+    case IDLE_WAIT_MIB:
+    case IDLE_WAIT_SIB1:
     case IDLE_CAMPED_NORMALLY:
       NS_LOG_INFO ("already disconnected");
       break;
 
+    case IDLE_WAIT_SIB2:
     case IDLE_CONNECTING:
-      NS_LOG_INFO ("aborting connection setup procedure");
-      SwitchToState (IDLE_CAMPED_NORMALLY);
+      NS_FATAL_ERROR ("cannot abort connection setup procedure");
       break;
-      
+
     case CONNECTED_NORMALLY:
-    case CONNECTED_REESTABLISHING:
     case CONNECTED_HANDOVER:
+    case CONNECTED_PHY_PROBLEM:
+    case CONNECTED_REESTABLISHING:
       LeaveConnectedMode ();
       break;
-      
-    default:
+
+    default: // i.e. IDLE_RANDOM_ACCESS
       NS_FATAL_ERROR ("method unexpected in state " << ToString (m_state));
       break;
     }
@@ -446,10 +476,11 @@
 LteUeRrc::DoNotifyRandomAccessSuccessful ()
 {
   NS_LOG_FUNCTION (this << m_imsi << ToString (m_state));
-  m_randomAccessSuccessfulTrace (m_imsi, m_cellId, m_rnti);  
+  m_randomAccessSuccessfulTrace (m_imsi, m_cellId, m_rnti);
+
   switch (m_state)
     {
-    case IDLE_RANDOM_ACCESS:     
+    case IDLE_RANDOM_ACCESS:
       {
         // we just received a RAR with a T-C-RNTI and an UL grant
         // send RRC connection request as message 3 of the random access procedure 
@@ -459,342 +490,269 @@
         m_rrcSapUser->SendRrcConnectionRequest (msg); 
       }
       break;
-      
-    case CONNECTED_HANDOVER:     
+
+    case CONNECTED_HANDOVER:
       {
         LteRrcSap::RrcConnectionReconfigurationCompleted msg;
         msg.rrcTransactionIdentifier = m_lastRrcTransactionIdentifier;
         m_rrcSapUser->SendRrcConnectionReconfigurationCompleted (msg);
+
+        // 3GPP TS 36.331 section 5.5.6.1 Measurements related actions upon handover
+        std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt;
+        for (measIdIt = m_varMeasConfig.measIdList.begin ();
+             measIdIt != m_varMeasConfig.measIdList.end ();
+             ++measIdIt)
+          {
+            VarMeasReportListClear (measIdIt->second.measId);
+          }
+
         SwitchToState (CONNECTED_NORMALLY);
         m_handoverEndOkTrace (m_imsi, m_cellId, m_rnti);
       }
       break;
-          
+
     default:
       NS_FATAL_ERROR ("unexpected event in state " << ToString (m_state));
       break; 
-    } 
+    }
 }
 
 void
 LteUeRrc::DoNotifyRandomAccessFailed ()
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << m_imsi << ToString (m_state));
+  m_randomAccessErrorTrace (m_imsi, m_cellId, m_rnti);
+
+  switch (m_state)
+    {
+    case IDLE_RANDOM_ACCESS:
+      {
+        SwitchToState (IDLE_CAMPED_NORMALLY);
+        m_asSapUser->NotifyConnectionFailed ();
+      }
+      break;
+
+    case CONNECTED_HANDOVER:
+      {
+        m_handoverEndErrorTrace (m_imsi, m_cellId, m_rnti);
+        /**
+         * \todo After a handover failure because of a random access failure,
+         *       send an RRC Connection Re-establishment and switch to
+         *       CONNECTED_REESTABLISHING state.
+         */
+      }
+      break;
+
+    default:
+      NS_FATAL_ERROR ("unexpected event in state " << ToString (m_state));
+      break;
+    }
 }
 
 
+void
+LteUeRrc::DoSetCsgWhiteList (uint32_t csgId)
+{
+  NS_LOG_FUNCTION (this << m_imsi << csgId);
+  m_csgWhiteList = csgId;
+}
+
 void 
-LteUeRrc::DoForceCampedOnEnb (uint16_t cellId, uint16_t earfcn)
+LteUeRrc::DoStartCellSelection (uint16_t dlEarfcn)
 {
-  NS_LOG_FUNCTION (this << cellId << earfcn);
-    
-  m_cellId = cellId;
-  m_dlEarfcn = earfcn;
-  m_cphySapProvider->SyncronizeWithEnb (m_cellId, m_dlEarfcn); 
-  SwitchToState (IDLE_WAIT_SYSTEM_INFO);
+  NS_LOG_FUNCTION (this << m_imsi << dlEarfcn);
+  NS_ASSERT_MSG (m_state == IDLE_START,
+                 "cannot start cell selection from state " << ToString (m_state));
+  m_dlEarfcn = dlEarfcn;
+  m_cphySapProvider->StartCellSearch (dlEarfcn);
+  SwitchToState (IDLE_CELL_SEARCH);
 }
 
 void 
+LteUeRrc::DoForceCampedOnEnb (uint16_t cellId, uint16_t dlEarfcn)
+{
+  NS_LOG_FUNCTION (this << m_imsi << cellId << dlEarfcn);
+
+  switch (m_state)
+    {
+    case IDLE_START:
+      m_cellId = cellId;
+      m_dlEarfcn = dlEarfcn;
+      m_cphySapProvider->SynchronizeWithEnb (m_cellId, m_dlEarfcn);
+      SwitchToState (IDLE_WAIT_MIB);
+      break;
+
+    case IDLE_CELL_SEARCH:
+    case IDLE_WAIT_MIB_SIB1:
+    case IDLE_WAIT_SIB1:
+      NS_FATAL_ERROR ("cannot abort cell selection " << ToString (m_state));
+      break;
+
+    case IDLE_WAIT_MIB:
+      NS_LOG_INFO ("already forced to camp to cell " << m_cellId);
+      break;
+
+    case IDLE_CAMPED_NORMALLY:
+    case IDLE_WAIT_SIB2:
+    case IDLE_RANDOM_ACCESS:
+    case IDLE_CONNECTING:
+      NS_LOG_INFO ("already camped to cell " << m_cellId);
+      break;
+
+    case CONNECTED_NORMALLY:
+    case CONNECTED_HANDOVER:
+    case CONNECTED_PHY_PROBLEM:
+    case CONNECTED_REESTABLISHING:
+      NS_LOG_INFO ("already connected to cell " << m_cellId);
+      break;
+
+    default:
+      NS_FATAL_ERROR ("unexpected event in state " << ToString (m_state));
+      break;
+    }
+
+}
+
+void
 LteUeRrc::DoConnect ()
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << m_imsi);
+
   switch (m_state)
     {
-    case IDLE_CELL_SELECTION:
-    case IDLE_WAIT_SYSTEM_INFO:
+    case IDLE_START:
+    case IDLE_CELL_SEARCH:
+    case IDLE_WAIT_MIB_SIB1:
+    case IDLE_WAIT_SIB1:
+    case IDLE_WAIT_MIB:
       m_connectionPending = true;
       break;
 
-    case IDLE_CAMPED_NORMALLY:     
-      StartConnection ();
+    case IDLE_CAMPED_NORMALLY:
+      m_connectionPending = true;
+      SwitchToState (IDLE_WAIT_SIB2);
       break;
 
+    case IDLE_WAIT_SIB2:
     case IDLE_RANDOM_ACCESS:
     case IDLE_CONNECTING:
-      NS_LOG_WARN ("already connecting (state " << ToString (m_state) << ")");      
+      NS_LOG_INFO ("already connecting");
       break;
 
     case CONNECTED_NORMALLY:
     case CONNECTED_REESTABLISHING:
     case CONNECTED_HANDOVER:
-      NS_LOG_WARN ("already connected (state " << ToString (m_state) << ")");      
-      break;  
-      
+      NS_LOG_INFO ("already connected");
+      break;
+
     default:
-      NS_FATAL_ERROR ("cannot connect while in state " << ToString (m_state));
+      NS_FATAL_ERROR ("unexpected event in state " << ToString (m_state));
       break;
     }
-
-
 }
 
 
 
 // CPHY SAP methods
 
-void 
-LteUeRrc::DoRecvMasterInformationBlock (LteRrcSap::MasterInformationBlock msg)  
+void
+LteUeRrc::DoRecvMasterInformationBlock (uint16_t cellId,
+                                        LteRrcSap::MasterInformationBlock msg)
 { 
-  NS_LOG_FUNCTION (this);
   m_dlBandwidth = msg.dlBandwidth;
   m_cphySapProvider->SetDlBandwidth (msg.dlBandwidth);
-  m_receivedMib = true;
-  if (m_state == IDLE_WAIT_SYSTEM_INFO && m_receivedMib && m_receivedSib2)
+  m_hasReceivedMib = true;
+  m_mibReceivedTrace (m_imsi, m_cellId, m_rnti, cellId);
+
+  switch (m_state)
     {
+    case IDLE_WAIT_MIB:
+      // manual attachment
       SwitchToState (IDLE_CAMPED_NORMALLY);
+      break;
+
+    case IDLE_WAIT_MIB_SIB1:
+      // automatic attachment from Idle mode cell selection
+      SwitchToState (IDLE_WAIT_SIB1);
+      break;
+
+    default:
+      // do nothing extra
+      break;
     }
 }
 
 void
-LteUeRrc::DoReportUeMeasurements (LteUeCphySapUser::UeMeasurementsParameters params)
+LteUeRrc::DoRecvSystemInformationBlockType1 (uint16_t cellId,
+                                             LteRrcSap::SystemInformationBlockType1 msg)
 {
-  NS_LOG_FUNCTION (this);
-
-  for (std::vector <LteUeCphySapUser::UeMeasurementsElement>::iterator newMeasIt = params.m_ueMeasurementsList.begin (); newMeasIt != params.m_ueMeasurementsList.end (); ++newMeasIt)
-    {      
-      NS_LOG_LOGIC (this << " CellId " << newMeasIt->m_cellId << " RSRP " << newMeasIt->m_rsrp << " RSRQ " << newMeasIt->m_rsrq);    
-      
-      //  3GPP TS 36.331 section 5.5.3.2 Layer 3 filtering
-      std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.find (newMeasIt->m_cellId);
-      if (storedMeasIt == m_storedMeasValues.end ())
-        {
-          // first value is unfiltered
-          MeasValues v;
-          v.rsrp = newMeasIt->m_rsrp;
-          v.rsrq = newMeasIt->m_rsrq;
-          std::pair<uint16_t, MeasValues> val (newMeasIt->m_cellId, v);
-          std::pair<std::map<uint16_t, MeasValues>::iterator, bool> 
-            ret = m_storedMeasValues.insert (val);
-          NS_ASSERT_MSG (ret.second == true, "element already existed");
-          storedMeasIt = ret.first;
-        }
-      else
-        {
-          // F_n = (1-a) F_{n-1} + a M_n
-          storedMeasIt->second.rsrp = (1 - m_varMeasConfig.aRsrp) * storedMeasIt->second.rsrp 
-            + m_varMeasConfig.aRsrp * newMeasIt->m_rsrp;          
-          storedMeasIt->second.rsrq = (1 - m_varMeasConfig.aRsrq) * storedMeasIt->second.rsrq 
-            + m_varMeasConfig.aRsrq * newMeasIt->m_rsrq;          
-        }  
-      storedMeasIt->second.timestamp = Simulator::Now ();
-    }
-
-                  
-  //  3GPP TS 36.331 section 5.5.4.1 Measurement report triggering - General
-  for (std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt 
-         = m_varMeasConfig.measIdList.begin ();
-       measIdIt != m_varMeasConfig.measIdList.end ();
-       ++measIdIt)               
-    {
-      NS_ASSERT (measIdIt->first == measIdIt->second.measId);
-      uint8_t measId = measIdIt->first;
-      NS_LOG_LOGIC (this << " considering measId " << (uint32_t) measId);
-
-      std::map<uint8_t, LteRrcSap::ReportConfigToAddMod>::iterator 
-        reportConfigIt = m_varMeasConfig.reportConfigList.find (measIdIt->second.reportConfigId);
-      NS_ASSERT (reportConfigIt != m_varMeasConfig.reportConfigList.end ());
-      LteRrcSap::ReportConfigEutra& reportConfigEutra = reportConfigIt->second.reportConfigEutra;
-
-      std::map<uint8_t, LteRrcSap::MeasObjectToAddMod>::iterator 
-        measObjectIt = m_varMeasConfig.measObjectList.find (measIdIt->second.measObjectId);
-      NS_ASSERT (measObjectIt != m_varMeasConfig.measObjectList.end ());
-      LteRrcSap::MeasObjectEutra& measObjectEutra = measObjectIt->second.measObjectEutra;
-
-      std::map<uint8_t, VarMeasReport>::iterator 
-        measReportIt = m_varMeasReportList.find (measId);
-          
-      // we don't check the purpose field, as it is only included for
-      // triggerType == periodical, which is not supported  
-      NS_ASSERT_MSG (reportConfigEutra.triggerType 
-                     == LteRrcSap::ReportConfigEutra::EVENT,
-                     "only triggerType == event is supported");
-      // only EUTRA is supported, no need to check for it
-
-      bool eventEntryCondApplicable = false;
-      bool eventLeavingCondApplicable = false;
-
-      std::list<uint16_t> concernedCellsEntry;
-      std::list<uint16_t> concernedCellsLeaving;
-              
-      switch (reportConfigEutra.eventId)
-        {
-        case LteRrcSap::ReportConfigEutra::EVENT_A2:
-          {
-            double ms; // Ms, the measurement for serving cell
-            double thresh; // Tresh, the threshold parameter for this event
-            double hys = (double) reportConfigEutra.hysteresis * 0.5; // Hys, the hysteresis parameter for this event. See 36.331 section 6.3.5 for the conversion.
-            switch (reportConfigEutra.triggerQuantity)
-              {
-              case LteRrcSap::ReportConfigEutra::RSRP:
-                ms = m_storedMeasValues[m_cellId].rsrp;
-                //ms = EutranMeasurementMapping::QuantizeRsrp (m_storedMeasValues[m_cellId].rsrp);
-                NS_ASSERT (reportConfigEutra.threshold1.choice 
-                           == LteRrcSap::ThresholdEutra::THRESHOLD_RSRP);
-                thresh = EutranMeasurementMapping::RsrpRange2Dbm (reportConfigEutra.threshold1.range);
-                break;
-              case LteRrcSap::ReportConfigEutra::RSRQ:
-                ms = m_storedMeasValues[m_cellId].rsrq;
-                //ms = EutranMeasurementMapping::QuantizeRsrq (m_storedMeasValues[m_cellId].rsrq);
-                NS_ASSERT (reportConfigEutra.threshold1.choice 
-                           == LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ);                
-                thresh = EutranMeasurementMapping::RsrqRange2Db (reportConfigEutra.threshold1.range);
-                break;
-              default:
-                NS_FATAL_ERROR ("unsupported triggerQuantity");
-                break;
-              }            
-            // Inequality A2-1 (Entering condition) :  Ms + Hys < Thresh
-            bool entryCond = ms + hys < thresh;
-            if (entryCond == true 
-                && (measReportIt == m_varMeasReportList.end ()
-                    || (measReportIt != m_varMeasReportList.end () 
-                        && (measReportIt->second.cellsTriggeredList.find (m_cellId) 
-                            == measReportIt->second.cellsTriggeredList.end ()))))
-              {
-                concernedCellsEntry.push_back (m_cellId);
-                eventEntryCondApplicable = true;
-              }
-            // Inequality A2-2 (Leaving condition) : Ms − Hys > Thresh
-            bool leavingCond = ms - hys > thresh;
-            if (leavingCond         
-                && measReportIt != m_varMeasReportList.end ()
-                && (measReportIt->second.cellsTriggeredList.find (m_cellId) 
-                    != measReportIt->second.cellsTriggeredList.end ()))
-              {
-                concernedCellsLeaving.push_back (m_cellId);
-                eventLeavingCondApplicable = true;
-              }
-            NS_LOG_LOGIC ("event A2: serving cell " << m_cellId << " ms=" << ms << " thresh=" << thresh << " entryCond=" << entryCond << " leavingCond=" << leavingCond);
-          }                  
-          break;
+  switch (m_state)
+    {
+    case IDLE_WAIT_SIB1:
+      NS_ASSERT_MSG (cellId == msg.cellAccessRelatedInfo.cellIdentity,
+                     "Cell identity in SIB1 does not match with the originating cell");
+      m_hasReceivedSib1 = true;
+      m_lastSib1 = msg;
+      m_sib1ReceivedTrace (m_imsi, m_cellId, m_rnti, cellId);
+      EvaluateCellForSelection ();
+      break;
 
-        case LteRrcSap::ReportConfigEutra::EVENT_A4:
-          {
-            for (std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.begin ();
-                 storedMeasIt != m_storedMeasValues.end ();
-                 ++storedMeasIt)
-              {
-                uint16_t cellId = storedMeasIt->first;
-                if (cellId != m_cellId) 
-                  {
-                    double mn; // Mn, the measurement for neighboring cell
-                    double thresh; // Tresh, the threshold parameter for this event
-                    double hys = (double) reportConfigEutra.hysteresis * 0.5; // Hys, the hysteresis parameter for this event. See 36.331 section 6.3.5 for the conversion.
-                    switch (reportConfigEutra.triggerQuantity)
-                      {
-                      case LteRrcSap::ReportConfigEutra::RSRP:
-                        mn = storedMeasIt->second.rsrp;
-                        //mn = EutranMeasurementMapping::QuantizeRsrp (storedMeasIt->second.rsrp);
-                        NS_ASSERT (reportConfigEutra.threshold1.choice 
-                                   == LteRrcSap::ThresholdEutra::THRESHOLD_RSRP);    
-                        thresh = EutranMeasurementMapping::RsrpRange2Dbm (reportConfigEutra.threshold1.range);            
-                        break;
-                      case LteRrcSap::ReportConfigEutra::RSRQ:
-                        mn = storedMeasIt->second.rsrq;
-                        //mn = EutranMeasurementMapping::QuantizeRsrq (storedMeasIt->second.rsrq);
-                        NS_ASSERT (reportConfigEutra.threshold1.choice 
-                                   == LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ);                
-                        thresh = EutranMeasurementMapping::RsrqRange2Db (reportConfigEutra.threshold1.range);
-                        break;
-                      default:
-                        NS_FATAL_ERROR ("unsupported triggerQuantity");
-                        break;
-                      }            
-                    // Inequality A4-1 (Entering condition) :  Mn + Ofn + Ocn − Hys > Thresh
-                    bool entryCond = mn + measObjectEutra.offsetFreq + 0.0 - hys > thresh;
-                    if (entryCond == true 
-                        && (measReportIt == m_varMeasReportList.end ()
-                            || (measReportIt != m_varMeasReportList.end () 
-                                && (measReportIt->second.cellsTriggeredList.find (cellId) 
-                                    == measReportIt->second.cellsTriggeredList.end ()))))
-                      {
-                        concernedCellsEntry.push_back (cellId);
-                        eventEntryCondApplicable = true;
-                      }
-                    // Inequality A4-2 (Leaving condition) : Mn + Ofn + Ocn + Hys < Thresh
-                    bool leavingCond = mn + measObjectEutra.offsetFreq + 0.0 + hys < thresh;
-                    if (leavingCond         
-                        && measReportIt != m_varMeasReportList.end ()
-                        && (measReportIt->second.cellsTriggeredList.find (cellId) 
-                            != measReportIt->second.cellsTriggeredList.end ()))
-                      {
-                        concernedCellsLeaving.push_back (cellId);
-                        eventLeavingCondApplicable = true;
-                      }
-                   
-                    NS_LOG_LOGIC ("event A4: neighbor cell " << cellId << " mn=" << mn << " thresh=" << thresh << " entryCond=" << entryCond << " leavingCond=" << leavingCond);
-                  }
-              }
-          }
-          break;
+    case IDLE_CAMPED_NORMALLY:
+    case IDLE_RANDOM_ACCESS:
+    case IDLE_CONNECTING:
+    case CONNECTED_NORMALLY:
+    case CONNECTED_HANDOVER:
+    case CONNECTED_PHY_PROBLEM:
+    case CONNECTED_REESTABLISHING:
+      NS_ASSERT_MSG (cellId == msg.cellAccessRelatedInfo.cellIdentity,
+                     "Cell identity in SIB1 does not match with the originating cell");
+      m_hasReceivedSib1 = true;
+      m_lastSib1 = msg;
+      m_sib1ReceivedTrace (m_imsi, m_cellId, m_rnti, cellId);
+      break;
 
-        default:
-          NS_FATAL_ERROR ("unsupported eventId " << reportConfigEutra.eventId);
-          break;
-          
-          } // switch (event type)
+    case IDLE_WAIT_MIB_SIB1:
+      // MIB has not been received, so ignore this SIB1
+      break;
 
-      NS_LOG_LOGIC ("eventEntryCondApplicable=" << eventEntryCondApplicable
-                    << " eventLeavingCondApplicable=" << eventLeavingCondApplicable);
+    default: // e.g. IDLE_START, IDLE_CELL_SEARCH, IDLE_WAIT_MIB, IDLE_WAIT_SIB2
+      // do nothing
+      break;
+    }
+}
 
-      bool initiateUeMeasurementReportingProcedure = false;
+void
+LteUeRrc::DoReportUeMeasurements (LteUeCphySapUser::UeMeasurementsParameters params)
+{
+  NS_LOG_FUNCTION (this);
 
-      if (eventEntryCondApplicable)
-        {          
-          if (measReportIt == m_varMeasReportList.end ())
-            {
-              VarMeasReport r;
-              r.measId = measId;              
-              std::pair<uint8_t, VarMeasReport> val (measId, r);
-              std::pair<std::map<uint8_t, VarMeasReport>::iterator, bool> 
-                ret = m_varMeasReportList.insert (val);
-              NS_ASSERT_MSG (ret.second == true, "element already existed");
-              measReportIt = ret.first;
-            }
-          for (std::list<uint16_t>::iterator it = concernedCellsEntry.begin ();
-               it != concernedCellsEntry.end ();
-               ++it)
-            {
-              measReportIt->second.cellsTriggeredList.insert (*it);
-            }
-          measReportIt->second.numberOfReportsSent = 0;
-          initiateUeMeasurementReportingProcedure = true;
-        }
-      
-      if (eventLeavingCondApplicable)
-        {                  
-          NS_ASSERT (measReportIt != m_varMeasReportList.end ());
-          for (std::list<uint16_t>::iterator it = concernedCellsLeaving.begin ();
-               it != concernedCellsLeaving.end ();
-               ++it)
-            {
-              measReportIt->second.cellsTriggeredList.erase (*it);
-            }
+  // layer 3 filtering does not apply in IDLE mode
+  bool useLayer3Filtering = (m_state == CONNECTED_NORMALLY);
 
-          // reportOnLeave will only be set when eventId = eventA3
-          if(reportConfigEutra.eventId == LteRrcSap::ReportConfigEutra::EVENT_A3)
-            {
-              if (reportConfigEutra.reportOnLeave)
-                {
-                  initiateUeMeasurementReportingProcedure = true;
-                }
-            }    
-        }
+  std::vector <LteUeCphySapUser::UeMeasurementsElement>::iterator newMeasIt;
+  for (newMeasIt = params.m_ueMeasurementsList.begin ();
+       newMeasIt != params.m_ueMeasurementsList.end (); ++newMeasIt)
+    {
+      SaveUeMeasurements (newMeasIt->m_cellId, newMeasIt->m_rsrp,
+                          newMeasIt->m_rsrq, useLayer3Filtering);
+    }
 
-      if (initiateUeMeasurementReportingProcedure)
-        {
-          SendMeasurementReport (measId);
-        }    
-      
-      if ((measReportIt != m_varMeasReportList.end ())
-          && (measReportIt->second.cellsTriggeredList.empty ()))
+  if (m_state == IDLE_CELL_SEARCH)
+    {
+      // start decoding BCH
+      SynchronizeToStrongestCell ();
+    }
+  else
+    {
+      std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt;
+      for (measIdIt = m_varMeasConfig.measIdList.begin ();
+           measIdIt != m_varMeasConfig.measIdList.end (); ++measIdIt)
         {
-          measReportIt->second.periodicReportTimer.Cancel ();
-          m_varMeasReportList.erase (measReportIt);
+          MeasurementReportTriggering (measIdIt->first);
         }
-      
-    } // for each measId in m_varMeasConfig.measIdList   
-}
+    }
+
+} // end of LteUeRrc::DoReportUeMeasurements
 
 
 
@@ -803,7 +761,7 @@
 void 
 LteUeRrc::DoCompleteSetup (LteUeRrcSapProvider::CompleteSetupParameters params)
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << " RNTI " << m_rnti);
   m_srb0->m_rlc->SetLteRlcSapUser (params.srb0SapUser);
   if (m_srb1)
     {
@@ -813,40 +771,52 @@
 
 
 void 
-LteUeRrc::DoRecvSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 msg)
-{
-  NS_LOG_FUNCTION (this);
-  // to be implemented
-}
-
- 
-void 
 LteUeRrc::DoRecvSystemInformation (LteRrcSap::SystemInformation msg)
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << " RNTI " << m_rnti);
+
   if (msg.haveSib2)
     {
-      m_receivedSib2 = true;
-      m_ulBandwidth = msg.sib2.freqInfo.ulBandwidth;
-      m_ulEarfcn = msg.sib2.freqInfo.ulCarrierFreq;
-      LteUeCmacSapProvider::RachConfig rc;
-      rc.numberOfRaPreambles = msg.sib2.radioResourceConfigCommon.rachConfigCommon.preambleInfo.numberOfRaPreambles;
-      rc.preambleTransMax = msg.sib2.radioResourceConfigCommon.rachConfigCommon.raSupervisionInfo.preambleTransMax;
-      rc.raResponseWindowSize = msg.sib2.radioResourceConfigCommon.rachConfigCommon.raSupervisionInfo.raResponseWindowSize;
-      m_cmacSapProvider->ConfigureRach (rc);
-      m_cphySapProvider->ConfigureUplink (m_ulEarfcn, m_ulBandwidth);
-    }
-  if (m_state == IDLE_WAIT_SYSTEM_INFO && m_receivedMib && m_receivedSib2)
-    {
-       SwitchToState (IDLE_CAMPED_NORMALLY);
+      switch (m_state)
+        {
+        case IDLE_CAMPED_NORMALLY:
+        case IDLE_WAIT_SIB2:
+        case IDLE_RANDOM_ACCESS:
+        case IDLE_CONNECTING:
+        case CONNECTED_NORMALLY:
+        case CONNECTED_HANDOVER:
+        case CONNECTED_PHY_PROBLEM:
+        case CONNECTED_REESTABLISHING:
+          m_hasReceivedSib2 = true;
+          m_ulBandwidth = msg.sib2.freqInfo.ulBandwidth;
+          m_ulEarfcn = msg.sib2.freqInfo.ulCarrierFreq;
+          m_sib2ReceivedTrace (m_imsi, m_cellId, m_rnti);
+          LteUeCmacSapProvider::RachConfig rc;
+          rc.numberOfRaPreambles = msg.sib2.radioResourceConfigCommon.rachConfigCommon.preambleInfo.numberOfRaPreambles;
+          rc.preambleTransMax = msg.sib2.radioResourceConfigCommon.rachConfigCommon.raSupervisionInfo.preambleTransMax;
+          rc.raResponseWindowSize = msg.sib2.radioResourceConfigCommon.rachConfigCommon.raSupervisionInfo.raResponseWindowSize;
+          m_cmacSapProvider->ConfigureRach (rc);
+          m_cphySapProvider->ConfigureUplink (m_ulEarfcn, m_ulBandwidth);
+          if (m_state == IDLE_WAIT_SIB2)
+            {
+              NS_ASSERT (m_connectionPending);
+              StartConnection ();
+            }
+          break;
+
+        default: // IDLE_START, IDLE_CELL_SEARCH, IDLE_WAIT_MIB, IDLE_WAIT_MIB_SIB1, IDLE_WAIT_SIB1
+          // do nothing
+          break;
+        }
     }
+
 }
 
 
 void 
 LteUeRrc::DoRecvRrcConnectionSetup (LteRrcSap::RrcConnectionSetup msg)
-{    
-  NS_LOG_FUNCTION (this);
+{
+  NS_LOG_FUNCTION (this << " RNTI " << m_rnti);
   switch (m_state)
     {
     case IDLE_CONNECTING:
@@ -860,7 +830,7 @@
         m_connectionEstablishedTrace (m_imsi, m_cellId, m_rnti);
       }
       break;
-      
+
     default:
       NS_FATAL_ERROR ("method unexpected in state " << ToString (m_state));
       break;
@@ -885,12 +855,12 @@
           m_cellId = mci.targetPhysCellId;
           NS_ASSERT (mci.haveCarrierFreq);
           NS_ASSERT (mci.haveCarrierBandwidth);
-          m_cphySapProvider->SyncronizeWithEnb (m_cellId, mci.carrierFreq.dlCarrierFreq); 
-          m_cphySapProvider->SetDlBandwidth ( mci.carrierBandwidth.dlBandwidth); 
+          m_cphySapProvider->SynchronizeWithEnb (m_cellId, mci.carrierFreq.dlCarrierFreq);
+          m_cphySapProvider->SetDlBandwidth ( mci.carrierBandwidth.dlBandwidth);
           m_cphySapProvider->ConfigureUplink (mci.carrierFreq.ulCarrierFreq, mci.carrierBandwidth.ulBandwidth); 
           m_rnti = msg.mobilityControlInfo.newUeIdentity;
           m_srb0->m_rlc->SetRnti (m_rnti);
-          NS_ASSERT_MSG (mci.haveRachConfigDedicated, "handover is only supported with non-contention-based random access procedure");          
+          NS_ASSERT_MSG (mci.haveRachConfigDedicated, "handover is only supported with non-contention-based random access procedure");
           m_cmacSapProvider->StartNonContentionBasedRandomAccessProcedure (m_rnti, mci.rachConfigDedicated.raPreambleIndex, mci.rachConfigDedicated.raPrachMaskIndex);
           m_cphySapProvider->SetRnti (m_rnti);
           m_lastRrcTransactionIdentifier = msg.rrcTransactionIdentifier;
@@ -901,11 +871,11 @@
           // it's in the current stack, so we would corrupt the stack
           // if we did so. Hence we schedule it for later disposal
           m_srb1Old = m_srb1;
-          Simulator::ScheduleNow (&LteUeRrc::DisposeOldSrb1, this);          
+          Simulator::ScheduleNow (&LteUeRrc::DisposeOldSrb1, this);
           m_srb1 = 0; // new instance will be be created within ApplyRadioResourceConfigDedicated
 
           m_drbMap.clear (); // dispose all DRBs
-          ApplyRadioResourceConfigDedicated (msg.radioResourceConfigDedicated);    
+          ApplyRadioResourceConfigDedicated (msg.radioResourceConfigDedicated);
 
           if (msg.haveMeasConfig)
             {
@@ -924,7 +894,7 @@
           if (msg.haveMeasConfig)
             {
               ApplyMeasConfig (msg.measConfig);
-            }          
+            }
           LteRrcSap::RrcConnectionReconfigurationCompleted msg2;
           msg2.rrcTransactionIdentifier = msg.rrcTransactionIdentifier;
           m_rrcSapUser->SendRrcConnectionReconfigurationCompleted (msg2);
@@ -941,13 +911,21 @@
 void 
 LteUeRrc::DoRecvRrcConnectionReestablishment (LteRrcSap::RrcConnectionReestablishment msg)
 {
+  NS_LOG_FUNCTION (this << " RNTI " << m_rnti);
   switch (m_state)
     {
     case CONNECTED_REESTABLISHING:
       {
+        /**
+         * \todo After receiving RRC Connection Re-establishment, stop timer
+         *       T301, fire a new trace source, reply with RRC Connection
+         *       Re-establishment Complete, and finally switch to
+         *       CONNECTED_NORMALLY state. See Section 5.3.7.5 of 3GPP TS
+         *       36.331.
+         */
       }
       break;
-      
+
     default:
       NS_FATAL_ERROR ("method unexpected in state " << ToString (m_state));
       break;
@@ -957,15 +935,19 @@
 void 
 LteUeRrc::DoRecvRrcConnectionReestablishmentReject (LteRrcSap::RrcConnectionReestablishmentReject msg)
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << " RNTI " << m_rnti);
   switch (m_state)
     {
     case CONNECTED_REESTABLISHING:
       {
+        /**
+         * \todo After receiving RRC Connection Re-establishment Reject, stop
+         *       timer T301. See Section 5.3.7.8 of 3GPP TS 36.331.
+         */
         LeaveConnectedMode ();
       }
       break;
-      
+
     default:
       NS_FATAL_ERROR ("method unexpected in state " << ToString (m_state));
       break;
@@ -975,7 +957,8 @@
 void 
 LteUeRrc::DoRecvRrcConnectionRelease (LteRrcSap::RrcConnectionRelease msg)
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << " RNTI " << m_rnti);
+  /// \todo Currently not implemented, see Section 5.3.8 of 3GPP TS 36.331.
 }
 
 void 
@@ -988,15 +971,125 @@
 
 
 
-void 
-LteUeRrc::ApplyRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated rrcd)
+void
+LteUeRrc::SynchronizeToStrongestCell ()
 {
   NS_LOG_FUNCTION (this);
-  const struct LteRrcSap::PhysicalConfigDedicated& pcd = rrcd.physicalConfigDedicated;
-  
-  if (pcd.haveAntennaInfoDedicated)
+  NS_ASSERT (m_state == IDLE_CELL_SEARCH);
+
+  uint16_t maxRsrpCellId = 0;
+  double maxRsrp = -std::numeric_limits<double>::infinity ();
+
+  std::map<uint16_t, MeasValues>::iterator it;
+  for (it = m_storedMeasValues.begin (); it != m_storedMeasValues.end (); it++)
     {
-      m_cphySapProvider->SetTransmissionMode (pcd.antennaInfo.transmissionMode);
+      /*
+       * This block attempts to find a cell with strongest RSRP and has not
+       * yet been identified as "acceptable cell".
+       */
+      if (maxRsrp < it->second.rsrp)
+        {
+          std::set<uint16_t>::const_iterator itCell;
+          itCell = m_acceptableCell.find (it->first);
+          if (itCell == m_acceptableCell.end ())
+            {
+              maxRsrpCellId = it->first;
+              maxRsrp = it->second.rsrp;
+            }
+        }
+    }
+
+  if (maxRsrpCellId == 0)
+    {
+      NS_LOG_WARN (this << " Cell search is unable to detect surrounding cell to attach to");
+    }
+  else
+    {
+      NS_LOG_LOGIC (this << " cell " << maxRsrpCellId
+                         << " is the strongest untried surrounding cell");
+      m_cphySapProvider->SynchronizeWithEnb (maxRsrpCellId, m_dlEarfcn);
+      SwitchToState (IDLE_WAIT_MIB_SIB1);
+    }
+
+} // end of void LteUeRrc::SynchronizeToStrongestCell ()
+
+
+void
+LteUeRrc::EvaluateCellForSelection ()
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT (m_state == IDLE_WAIT_SIB1);
+  NS_ASSERT (m_hasReceivedMib);
+  NS_ASSERT (m_hasReceivedSib1);
+  uint16_t cellId = m_lastSib1.cellAccessRelatedInfo.cellIdentity;
+
+  // Cell selection criteria evaluation
+
+  bool isSuitableCell = false;
+  bool isAcceptableCell = false;
+  std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.find (cellId);
+  double qRxLevMeas = storedMeasIt->second.rsrp;
+  double qRxLevMin = EutranMeasurementMapping::IeValue2ActualQRxLevMin (m_lastSib1.cellSelectionInfo.qRxLevMin);
+  NS_LOG_LOGIC (this << " cell selection to cellId=" << cellId
+                     << " qrxlevmeas=" << qRxLevMeas << " dBm"
+                     << " qrxlevmin=" << qRxLevMin << " dBm");
+
+  if (qRxLevMeas - qRxLevMin > 0)
+    {
+      isAcceptableCell = true;
+
+      uint32_t cellCsgId = m_lastSib1.cellAccessRelatedInfo.csgIdentity;
+      bool cellCsgIndication = m_lastSib1.cellAccessRelatedInfo.csgIndication;
+
+      isSuitableCell = (cellCsgIndication == false) || (cellCsgId == m_csgWhiteList);
+
+      NS_LOG_LOGIC (this << " csg(ue/cell/indication)=" << m_csgWhiteList << "/"
+                         << cellCsgId << "/" << cellCsgIndication);
+    }
+
+  // Cell selection decision
+
+  if (isSuitableCell)
+    {
+      m_cellId = cellId;
+      m_cphySapProvider->SynchronizeWithEnb (cellId, m_dlEarfcn);
+      m_cphySapProvider->SetDlBandwidth (m_dlBandwidth);
+      m_initialCellSelectionEndOkTrace (m_imsi, cellId);
+      SwitchToState (IDLE_CAMPED_NORMALLY);
+    }
+  else
+    {
+      // ignore the MIB and SIB1 received from this cell
+      m_hasReceivedMib = false;
+      m_hasReceivedSib1 = false;
+
+      m_initialCellSelectionEndErrorTrace (m_imsi, cellId);
+
+      if (isAcceptableCell)
+        {
+          /*
+           * The cells inserted into this list will not be considered for
+           * subsequent cell search attempt.
+           */
+          m_acceptableCell.insert (cellId);
+        }
+
+      SwitchToState (IDLE_CELL_SEARCH);
+      SynchronizeToStrongestCell (); // retry to a different cell
+    }
+
+} // end of void LteUeRrc::EvaluateCellForSelection ()
+
+
+void 
+LteUeRrc::ApplyRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated rrcd)
+{
+  NS_LOG_FUNCTION (this);
+  const struct LteRrcSap::PhysicalConfigDedicated& pcd = rrcd.physicalConfigDedicated;
+  
+  if (pcd.haveAntennaInfoDedicated)
+    {
+      m_cphySapProvider->SetTransmissionMode (pcd.antennaInfo.transmissionMode);
     }
   if (pcd.haveSoundingRsUlConfigDedicated)
     {
@@ -1187,23 +1280,17 @@
               NS_LOG_LOGIC (this << " deleting measId " << (uint32_t) measId << " because referring to measObjectId " << (uint32_t)  measObjectId);
               // note: postfix operator preserves iterator validity
               m_varMeasConfig.measIdList.erase (measIdIt++);
-              std::map<uint8_t, VarMeasReport>::iterator measReportIt = m_varMeasReportList.find (measId);
-              if (measReportIt != m_varMeasReportList.end ())
-                {                  
-                  NS_LOG_LOGIC (this << " deleting existing report for measId " << (uint32_t) measId << " because referring to measObjectId " << (uint32_t)  measObjectId);
-                  measReportIt->second.periodicReportTimer.Cancel ();
-                  m_varMeasReportList.erase (measReportIt);
-                }
+              VarMeasReportListClear (measId);
             }
           else
             {
               ++measIdIt;
             }
-        }    
-      
-    }     
+        }
+
+    }
 
-  // 3GPP TS 36.331 section 5.5.2.5  Measurement object addition/ modification  
+  // 3GPP TS 36.331 section 5.5.2.5  Measurement object addition/ modification
   for (std::list<LteRrcSap::MeasObjectToAddMod>::iterator it = mc.measObjectToAddModList.begin ();
        it !=  mc.measObjectToAddModList.end ();
        ++it)
@@ -1213,39 +1300,33 @@
       NS_ASSERT_MSG (it->measObjectEutra.cellsToAddModList.empty (), "cellsToAddModList not supported");
       NS_ASSERT_MSG (it->measObjectEutra.cellsToRemoveList.empty (), "blackCellsToRemoveList not supported");
       NS_ASSERT_MSG (it->measObjectEutra.blackCellsToAddModList.empty (), "blackCellsToAddModList not supported");
-      NS_ASSERT_MSG (it->measObjectEutra.haveCellForWhichToReportCGI == false , "cellForWhichToReportCGI is not supported");
-      
-                     
-      uint8_t measObjectId = it->measObjectId;         
-      std::map<uint8_t, LteRrcSap::MeasObjectToAddMod>::iterator measObjectIt = m_varMeasConfig.measObjectList.find (measObjectId);      
+      NS_ASSERT_MSG (it->measObjectEutra.haveCellForWhichToReportCGI == false, "cellForWhichToReportCGI is not supported");
+
+      uint8_t measObjectId = it->measObjectId;
+      std::map<uint8_t, LteRrcSap::MeasObjectToAddMod>::iterator measObjectIt = m_varMeasConfig.measObjectList.find (measObjectId);
       if (measObjectIt != m_varMeasConfig.measObjectList.end ())
         {
           NS_LOG_LOGIC ("measObjectId " << (uint32_t) measObjectId << " exists, updating entry");
-          measObjectIt->second = *it;          
+          measObjectIt->second = *it;
           for (std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt 
                  = m_varMeasConfig.measIdList.begin ();
                measIdIt != m_varMeasConfig.measIdList.end ();
-               ++measIdIt)               
+               ++measIdIt)
             {
               if (measIdIt->second.measObjectId == measObjectId)
                 {
                   uint8_t measId = measIdIt->second.measId;
                   NS_LOG_LOGIC (this << " found measId " << (uint32_t) measId << " referring to measObjectId " << (uint32_t)  measObjectId);
-                  std::map<uint8_t, VarMeasReport>::iterator measReportIt = m_varMeasReportList.find (measId);
-                  if (measReportIt != m_varMeasReportList.end ())
-                    {
-                      NS_LOG_LOGIC (this << " deleting existing report for measId " << (uint32_t) measId << " because referring to measObjectId " << (uint32_t)  measObjectId);
-                      measReportIt->second.periodicReportTimer.Cancel ();
-                      m_varMeasReportList.erase (measReportIt);
-                    }
+                  VarMeasReportListClear (measId);
                 }
             }
         }
       else
         {
-          NS_LOG_LOGIC ("measObjectId " << (uint32_t) measObjectId << " is new, adding entry");     
+          NS_LOG_LOGIC ("measObjectId " << (uint32_t) measObjectId << " is new, adding entry");
           m_varMeasConfig.measObjectList[measObjectId] = *it;
-        }            
+        }
+
     }
 
   // 3GPP TS 36.331 section 5.5.2.6 Reporting configuration removal
@@ -1266,22 +1347,16 @@
               NS_LOG_LOGIC (this << " deleting measId " << (uint32_t) measId << " because referring to reportConfigId " << (uint32_t)  reportConfigId);
               // note: postfix operator preserves iterator validity
               m_varMeasConfig.measIdList.erase (measIdIt++);
-              std::map<uint8_t, VarMeasReport>::iterator measReportIt = m_varMeasReportList.find (measId);
-              if (measReportIt != m_varMeasReportList.end ())
-                {                  
-                  NS_LOG_LOGIC (this << " deleting existing report for measId" << (uint32_t) measId << " because referring to reportConfigId " << (uint32_t)  reportConfigId);
-                  measReportIt->second.periodicReportTimer.Cancel ();
-                  m_varMeasReportList.erase (measReportIt);
-                }
+              VarMeasReportListClear (measId);
             }
           else
             {
               ++measIdIt;
             }
-        }    
+        }
 
     }
-  
+
   // 3GPP TS 36.331 section 5.5.2.7 Reporting configuration addition/ modification
   for (std::list<LteRrcSap::ReportConfigToAddMod>::iterator it = mc.reportConfigToAddModList.begin ();
        it !=  mc.reportConfigToAddModList.end ();
@@ -1290,75 +1365,54 @@
       // simplifying assumptions
       NS_ASSERT_MSG (it->reportConfigEutra.triggerType == LteRrcSap::ReportConfigEutra::EVENT,
                      "only trigger type EVENT is supported");
-      NS_ASSERT_MSG (it->reportConfigEutra.eventId == LteRrcSap::ReportConfigEutra::EVENT_A2
-                     || it->reportConfigEutra.eventId == LteRrcSap::ReportConfigEutra::EVENT_A4,
-                     "only events A2 and A4 are supported");
-      NS_ASSERT_MSG (it->reportConfigEutra.timeToTrigger == 0, "timeToTrigger > 0 is not supported");
-      
-      uint8_t reportConfigId = it->reportConfigId;         
-      std::map<uint8_t, LteRrcSap::ReportConfigToAddMod>::iterator reportConfigIt = m_varMeasConfig.reportConfigList.find (reportConfigId);      
+
+      uint8_t reportConfigId = it->reportConfigId;
+      std::map<uint8_t, LteRrcSap::ReportConfigToAddMod>::iterator reportConfigIt = m_varMeasConfig.reportConfigList.find (reportConfigId);
       if (reportConfigIt != m_varMeasConfig.reportConfigList.end ())
         {
           NS_LOG_LOGIC ("reportConfigId " << (uint32_t) reportConfigId << " exists, updating entry");
-          m_varMeasConfig.reportConfigList[reportConfigId] = *it;          
+          m_varMeasConfig.reportConfigList[reportConfigId] = *it;
           for (std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt 
                  = m_varMeasConfig.measIdList.begin ();
                measIdIt != m_varMeasConfig.measIdList.end ();
-               ++measIdIt)               
+               ++measIdIt)
             {
               if (measIdIt->second.reportConfigId == reportConfigId)
                 {
                   uint8_t measId = measIdIt->second.measId;
                   NS_LOG_LOGIC (this << " found measId " << (uint32_t) measId << " referring to reportConfigId " << (uint32_t)  reportConfigId);
-                  std::map<uint8_t, VarMeasReport>::iterator measReportIt = m_varMeasReportList.find (measId);
-                  if (measReportIt != m_varMeasReportList.end ())
-                    {
-                      NS_LOG_LOGIC (this << " deleting existing report for measId " << (uint32_t) measId << " because referring to reportConfigId " << (uint32_t)  reportConfigId);
-                      measReportIt->second.periodicReportTimer.Cancel ();
-                      m_varMeasReportList.erase (measReportIt);
-                    }
+                  VarMeasReportListClear (measId);
                 }
             }
         }
       else
         {
-          NS_LOG_LOGIC ("reportConfigId " << (uint32_t) reportConfigId << " is new, adding entry");     
+          NS_LOG_LOGIC ("reportConfigId " << (uint32_t) reportConfigId << " is new, adding entry");
           m_varMeasConfig.reportConfigList[reportConfigId] = *it;
-        }            
-    }
+        }
 
+    }
 
   // 3GPP TS 36.331 section 5.5.2.8 Quantity configuration
   if (mc.haveQuantityConfig)
     {
       NS_LOG_LOGIC (this << " setting quantityConfig");
       m_varMeasConfig.quantityConfig = mc.quantityConfig;
-      std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt = m_varMeasConfig.measIdList.begin ();
-      while (measIdIt != m_varMeasConfig.measIdList.end ())
-        {
-          uint8_t measId = measIdIt->second.measId;
-          NS_ASSERT (measId == measIdIt->first);
-          NS_LOG_LOGIC (this << " deleting measId " << (uint32_t) measId);
-          // note: postfix operator preserves iterator validity
-          m_varMeasConfig.measIdList.erase (measIdIt++);
-          std::map<uint8_t, VarMeasReport>::iterator measReportIt = m_varMeasReportList.find (measId);
-          if (measReportIt != m_varMeasReportList.end ())
-            {                  
-              NS_LOG_LOGIC (this << " deleting existing report for measId" << (uint32_t) measId);
-              measReportIt->second.periodicReportTimer.Cancel ();
-              m_varMeasReportList.erase (measReportIt);
-            }
-        }
       // we calculate here the coefficient a used for Layer 3 filtering, see 3GPP TS 36.331 section 5.5.3.2
-      m_varMeasConfig.aRsrp = std::pow (0.5,  mc.quantityConfig.filterCoefficientRSRP/4.0);
-      m_varMeasConfig.aRsrq = std::pow (0.5,  mc.quantityConfig.filterCoefficientRSRQ/4.0);
+      m_varMeasConfig.aRsrp = std::pow (0.5, mc.quantityConfig.filterCoefficientRSRP/4.0);
+      m_varMeasConfig.aRsrq = std::pow (0.5, mc.quantityConfig.filterCoefficientRSRQ/4.0);
       NS_LOG_LOGIC (this << " new filter coefficients: aRsrp=" << m_varMeasConfig.aRsrp << ", aRsrq=" << m_varMeasConfig.aRsrq);
 
-
+      for (std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt
+             = m_varMeasConfig.measIdList.begin ();
+           measIdIt != m_varMeasConfig.measIdList.end ();
+           ++measIdIt)
+        {
+          VarMeasReportListClear (measIdIt->second.measId);
+        }
     }
 
-
-  // 3GPP TS 36.331 section 5.5.2.2 Measurement identity removal  
+  // 3GPP TS 36.331 section 5.5.2.2 Measurement identity removal
   for (std::list<uint8_t>::iterator it = mc.measIdToRemoveList.begin ();
        it !=  mc.measIdToRemoveList.end ();
        ++it)
@@ -1366,13 +1420,11 @@
       uint8_t measId = *it;
       NS_LOG_LOGIC (this << " deleting measId " << (uint32_t) measId);
       m_varMeasConfig.measIdList.erase (measId);
-      std::map<uint8_t, VarMeasReport>::iterator measReportIt = m_varMeasReportList.find (measId);
-      if (measReportIt != m_varMeasReportList.end ())
-        {
-          NS_LOG_LOGIC (this << " deleting existing report for measId" << (uint32_t) measId);
-          measReportIt->second.periodicReportTimer.Cancel ();
-          m_varMeasReportList.erase (measReportIt);
-        }
+      VarMeasReportListClear (measId);
+
+      // removing time-to-trigger queues
+      m_enteringTriggerQueue.erase (measId);
+      m_leavingTriggerQueue.erase (measId);
     }
 
   // 3GPP TS 36.331 section 5.5.2.3 Measurement identity addition/ modification
@@ -1380,12 +1432,14 @@
        it !=  mc.measIdToAddModList.end ();
        ++it)
     {
-      NS_LOG_LOGIC (this << " measId " << (uint32_t) it->measId << " (measObjectId=" 
-                    << (uint32_t) it->measObjectId << ", reportConfigId=" << (uint32_t) it->reportConfigId << ")");
+      NS_LOG_LOGIC (this << " measId " << (uint32_t) it->measId
+                         << " (measObjectId=" << (uint32_t) it->measObjectId
+                         << ", reportConfigId=" << (uint32_t) it->reportConfigId
+                         << ")");
       NS_ASSERT (m_varMeasConfig.measObjectList.find (it->measObjectId)
                  != m_varMeasConfig.measObjectList.end ());
       NS_ASSERT (m_varMeasConfig.reportConfigList.find (it->reportConfigId)
-                 != m_varMeasConfig.reportConfigList.end ());      
+                 != m_varMeasConfig.reportConfigList.end ());
       m_varMeasConfig.measIdList[it->measId] = *it; // side effect: create new entry if not exists
       std::map<uint8_t, VarMeasReport>::iterator measReportIt = m_varMeasReportList.find (it->measId);
       if (measReportIt != m_varMeasReportList.end ())
@@ -1396,6 +1450,10 @@
       NS_ASSERT (m_varMeasConfig.reportConfigList.find (it->reportConfigId)
                  ->second.reportConfigEutra.triggerType != LteRrcSap::ReportConfigEutra::PERIODICAL);
 
+      // new empty queues for time-to-trigger
+      std::list<PendingTrigger_t> s;
+      m_enteringTriggerQueue[it->measId] = s;
+      m_leavingTriggerQueue[it->measId] = s;
     }
 
   if (mc.haveMeasGapConfig)
@@ -1414,16 +1472,1086 @@
     }
 }
 
+void
+LteUeRrc::SaveUeMeasurements (uint16_t cellId, double rsrp, double rsrq,
+                              bool useLayer3Filtering)
+{
+  NS_LOG_FUNCTION (this << cellId << rsrp << rsrq << useLayer3Filtering);
+
+  std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.find (cellId);;
+
+  if (storedMeasIt != m_storedMeasValues.end ())
+    {
+      if (useLayer3Filtering)
+        {
+          // F_n = (1-a) F_{n-1} + a M_n
+          storedMeasIt->second.rsrp = (1 - m_varMeasConfig.aRsrp) * storedMeasIt->second.rsrp
+            + m_varMeasConfig.aRsrp * rsrp;
+
+          if (std::isnan (storedMeasIt->second.rsrq))
+            {
+              // the previous RSRQ measurements provided UE PHY are invalid
+              storedMeasIt->second.rsrq = rsrq; // replace it with unfiltered value
+            }
+          else
+            {
+              storedMeasIt->second.rsrq = (1 - m_varMeasConfig.aRsrq) * storedMeasIt->second.rsrq
+                + m_varMeasConfig.aRsrq * rsrq;
+            }
+        }
+      else
+        {
+          storedMeasIt->second.rsrp = rsrp;
+          storedMeasIt->second.rsrq = rsrq;
+        }
+    }
+  else
+    {
+      // first value is always unfiltered
+      MeasValues v;
+      v.rsrp = rsrp;
+      v.rsrq = rsrq;
+      std::pair<uint16_t, MeasValues> val (cellId, v);
+      std::pair<std::map<uint16_t, MeasValues>::iterator, bool>
+        ret = m_storedMeasValues.insert (val);
+      NS_ASSERT_MSG (ret.second == true, "element already existed");
+      storedMeasIt = ret.first;
+    }
+
+  NS_LOG_DEBUG (this << " IMSI " << m_imsi << " state " << ToString (m_state)
+                     << ", measured cell " << m_cellId
+                     << ", new RSRP " << rsrp << " stored " << storedMeasIt->second.rsrp
+                     << ", new RSRQ " << rsrq << " stored " << storedMeasIt->second.rsrq);
+  storedMeasIt->second.timestamp = Simulator::Now ();
+
+} // end of void SaveUeMeasurements
+
+void
+LteUeRrc::MeasurementReportTriggering (uint8_t measId)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) measId);
+
+  std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator measIdIt =
+    m_varMeasConfig.measIdList.find (measId);
+  NS_ASSERT (measIdIt != m_varMeasConfig.measIdList.end ());
+  NS_ASSERT (measIdIt->first == measIdIt->second.measId);
+
+  std::map<uint8_t, LteRrcSap::ReportConfigToAddMod>::iterator
+    reportConfigIt = m_varMeasConfig.reportConfigList.find (measIdIt->second.reportConfigId);
+  NS_ASSERT (reportConfigIt != m_varMeasConfig.reportConfigList.end ());
+  LteRrcSap::ReportConfigEutra& reportConfigEutra = reportConfigIt->second.reportConfigEutra;
+
+  std::map<uint8_t, LteRrcSap::MeasObjectToAddMod>::iterator
+    measObjectIt = m_varMeasConfig.measObjectList.find (measIdIt->second.measObjectId);
+  NS_ASSERT (measObjectIt != m_varMeasConfig.measObjectList.end ());
+  LteRrcSap::MeasObjectEutra& measObjectEutra = measObjectIt->second.measObjectEutra;
+
+  std::map<uint8_t, VarMeasReport>::iterator
+    measReportIt = m_varMeasReportList.find (measId);
+  bool isMeasIdInReportList = (measReportIt != m_varMeasReportList.end ());
+
+  // we don't check the purpose field, as it is only included for
+  // triggerType == periodical, which is not supported
+  NS_ASSERT_MSG (reportConfigEutra.triggerType
+                 == LteRrcSap::ReportConfigEutra::EVENT,
+                 "only triggerType == event is supported");
+  // only EUTRA is supported, no need to check for it
+
+  NS_LOG_LOGIC (this << " considering measId " << (uint32_t) measId);
+  bool eventEntryCondApplicable = false;
+  bool eventLeavingCondApplicable = false;
+  ConcernedCells_t concernedCellsEntry;
+  ConcernedCells_t concernedCellsLeaving;
+
+  switch (reportConfigEutra.eventId)
+    {
+    case LteRrcSap::ReportConfigEutra::EVENT_A1:
+      {
+        /*
+         * Event A1 (Serving becomes better than threshold)
+         * Please refer to 3GPP TS 36.331 Section 5.5.4.2
+         */
+
+        double ms; // Ms, the measurement result of the serving cell
+        double thresh; // Thresh, the threshold parameter for this event
+        // Hys, the hysteresis parameter for this event.
+        double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
+
+        switch (reportConfigEutra.triggerQuantity)
+          {
+          case LteRrcSap::ReportConfigEutra::RSRP:
+            ms = m_storedMeasValues[m_cellId].rsrp;
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRP);
+            thresh = EutranMeasurementMapping::RsrpRange2Dbm (reportConfigEutra.threshold1.range);
+            break;
+          case LteRrcSap::ReportConfigEutra::RSRQ:
+            ms = m_storedMeasValues[m_cellId].rsrq;
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ);
+            thresh = EutranMeasurementMapping::RsrqRange2Db (reportConfigEutra.threshold1.range);
+            break;
+          default:
+            NS_FATAL_ERROR ("unsupported triggerQuantity");
+            break;
+          }
+
+        // Inequality A1-1 (Entering condition): Ms - Hys > Thresh
+        bool entryCond = ms - hys > thresh;
+
+        if (entryCond)
+          {
+            if (!isMeasIdInReportList)
+              {
+                concernedCellsEntry.push_back (m_cellId);
+                eventEntryCondApplicable = true;
+              }
+            else
+              {
+                /*
+                 * This is to check that the triggered cell recorded in the
+                 * VarMeasReportList is the serving cell.
+                 */
+                NS_ASSERT (measReportIt->second.cellsTriggeredList.find (m_cellId)
+                           != measReportIt->second.cellsTriggeredList.end ());
+              }
+          }
+        else if (reportConfigEutra.timeToTrigger > 0)
+          {
+            CancelEnteringTrigger (measId);
+          }
+
+        // Inequality A1-2 (Leaving condition): Ms + Hys < Thresh
+        bool leavingCond = ms + hys < thresh;
+
+        if (leavingCond)
+          {
+            if (isMeasIdInReportList)
+              {
+                /*
+                 * This is to check that the triggered cell recorded in the
+                 * VarMeasReportList is the serving cell.
+                 */
+                NS_ASSERT (measReportIt->second.cellsTriggeredList.find (m_cellId)
+                           != measReportIt->second.cellsTriggeredList.end ());
+                concernedCellsLeaving.push_back (m_cellId);
+                eventLeavingCondApplicable = true;
+              }
+          }
+        else if (reportConfigEutra.timeToTrigger > 0)
+          {
+            CancelLeavingTrigger (measId);
+          }
+
+        NS_LOG_LOGIC (this << " event A1: serving cell " << m_cellId
+                           << " ms=" << ms << " thresh=" << thresh
+                           << " entryCond=" << entryCond
+                           << " leavingCond=" << leavingCond);
+
+      } // end of case LteRrcSap::ReportConfigEutra::EVENT_A1
+
+      break;
+
+    case LteRrcSap::ReportConfigEutra::EVENT_A2:
+      {
+        /*
+         * Event A2 (Serving becomes worse than threshold)
+         * Please refer to 3GPP TS 36.331 Section 5.5.4.3
+         */
+
+        double ms; // Ms, the measurement result of the serving cell
+        double thresh; // Thresh, the threshold parameter for this event
+        // Hys, the hysteresis parameter for this event.
+        double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
+
+        switch (reportConfigEutra.triggerQuantity)
+          {
+          case LteRrcSap::ReportConfigEutra::RSRP:
+            ms = m_storedMeasValues[m_cellId].rsrp;
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRP);
+            thresh = EutranMeasurementMapping::RsrpRange2Dbm (reportConfigEutra.threshold1.range);
+            break;
+          case LteRrcSap::ReportConfigEutra::RSRQ:
+            ms = m_storedMeasValues[m_cellId].rsrq;
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ);
+            thresh = EutranMeasurementMapping::RsrqRange2Db (reportConfigEutra.threshold1.range);
+            break;
+          default:
+            NS_FATAL_ERROR ("unsupported triggerQuantity");
+            break;
+          }
+
+        // Inequality A2-1 (Entering condition): Ms + Hys < Thresh
+        bool entryCond = ms + hys < thresh;
+
+        if (entryCond)
+          {
+            if (!isMeasIdInReportList)
+              {
+                concernedCellsEntry.push_back (m_cellId);
+                eventEntryCondApplicable = true;
+              }
+            else
+              {
+                /*
+                 * This is to check that the triggered cell recorded in the
+                 * VarMeasReportList is the serving cell.
+                 */
+                NS_ASSERT (measReportIt->second.cellsTriggeredList.find (m_cellId)
+                           != measReportIt->second.cellsTriggeredList.end ());
+              }
+          }
+        else if (reportConfigEutra.timeToTrigger > 0)
+          {
+            CancelEnteringTrigger (measId);
+          }
+
+        // Inequality A2-2 (Leaving condition): Ms - Hys > Thresh
+        bool leavingCond = ms - hys > thresh;
+
+        if (leavingCond)
+          {
+            if (isMeasIdInReportList)
+              {
+                /*
+                 * This is to check that the triggered cell recorded in the
+                 * VarMeasReportList is the serving cell.
+                 */
+                NS_ASSERT (measReportIt->second.cellsTriggeredList.find (m_cellId)
+                           != measReportIt->second.cellsTriggeredList.end ());
+                concernedCellsLeaving.push_back (m_cellId);
+                eventLeavingCondApplicable = true;
+              }
+          }
+        else if (reportConfigEutra.timeToTrigger > 0)
+          {
+            CancelLeavingTrigger (measId);
+          }
+
+        NS_LOG_LOGIC (this << " event A2: serving cell " << m_cellId
+                           << " ms=" << ms << " thresh=" << thresh
+                           << " entryCond=" << entryCond
+                           << " leavingCond=" << leavingCond);
+
+      } // end of case LteRrcSap::ReportConfigEutra::EVENT_A2
+
+      break;
+
+    case LteRrcSap::ReportConfigEutra::EVENT_A3:
+      {
+        /*
+         * Event A3 (Neighbour becomes offset better than PCell)
+         * Please refer to 3GPP TS 36.331 Section 5.5.4.4
+         */
+
+        double mn; // Mn, the measurement result of the neighbouring cell
+        double ofn = measObjectEutra.offsetFreq; // Ofn, the frequency specific offset of the frequency of the
+        double ocn = 0.0; // Ocn, the cell specific offset of the neighbour cell
+        double mp; // Mp, the measurement result of the PCell
+        double ofp = measObjectEutra.offsetFreq; // Ofp, the frequency specific offset of the primary frequency
+        double ocp = 0.0; // Ocp, the cell specific offset of the PCell
+        // Off, the offset parameter for this event.
+        double off = EutranMeasurementMapping::IeValue2ActualA3Offset (reportConfigEutra.a3Offset);
+        // Hys, the hysteresis parameter for this event.
+        double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
+
+        switch (reportConfigEutra.triggerQuantity)
+          {
+          case LteRrcSap::ReportConfigEutra::RSRP:
+            mp = m_storedMeasValues[m_cellId].rsrp;
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRP);
+            break;
+          case LteRrcSap::ReportConfigEutra::RSRQ:
+            mp = m_storedMeasValues[m_cellId].rsrq;
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ);
+            break;
+          default:
+            NS_FATAL_ERROR ("unsupported triggerQuantity");
+            break;
+          }
+
+        for (std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.begin ();
+             storedMeasIt != m_storedMeasValues.end ();
+             ++storedMeasIt)
+          {
+            uint16_t cellId = storedMeasIt->first;
+            if (cellId == m_cellId)
+              {
+                continue;
+              }
+
+            switch (reportConfigEutra.triggerQuantity)
+              {
+              case LteRrcSap::ReportConfigEutra::RSRP:
+                mn = storedMeasIt->second.rsrp;
+                break;
+              case LteRrcSap::ReportConfigEutra::RSRQ:
+                mn = storedMeasIt->second.rsrq;
+                break;
+              default:
+                NS_FATAL_ERROR ("unsupported triggerQuantity");
+                break;
+              }
+
+            bool hasTriggered = isMeasIdInReportList
+              && (measReportIt->second.cellsTriggeredList.find (cellId)
+                  != measReportIt->second.cellsTriggeredList.end ());
+
+            // Inequality A3-1 (Entering condition): Mn + Ofn + Ocn - Hys > Mp + Ofp + Ocp + Off
+            bool entryCond = mn + ofn + ocn - hys > mp + ofp + ocp + off;
+
+            if (entryCond)
+              {
+                if (!hasTriggered)
+                  {
+                    concernedCellsEntry.push_back (cellId);
+                    eventEntryCondApplicable = true;
+                  }
+              }
+            else if (reportConfigEutra.timeToTrigger > 0)
+              {
+                CancelEnteringTrigger (measId, cellId);
+              }
+
+            // Inequality A3-2 (Leaving condition): Mn + Ofn + Ocn + Hys < Mp + Ofp + Ocp + Off
+            bool leavingCond = mn + ofn + ocn + hys < mp + ofp + ocp + off;
+
+            if (leavingCond)
+              {
+                if (hasTriggered)
+                  {
+                    concernedCellsLeaving.push_back (cellId);
+                    eventLeavingCondApplicable = true;
+                  }
+              }
+            else if (reportConfigEutra.timeToTrigger > 0)
+              {
+                CancelLeavingTrigger (measId, cellId);
+              }
+
+            NS_LOG_LOGIC (this << " event A3: neighbor cell " << cellId
+                               << " mn=" << mn << " mp=" << mp << " offset=" << off
+                               << " entryCond=" << entryCond
+                               << " leavingCond=" << leavingCond);
+
+          } // end of for (storedMeasIt)
+
+      } // end of case LteRrcSap::ReportConfigEutra::EVENT_A3
+
+      break;
+
+    case LteRrcSap::ReportConfigEutra::EVENT_A4:
+      {
+        /*
+         * Event A4 (Neighbour becomes better than threshold)
+         * Please refer to 3GPP TS 36.331 Section 5.5.4.5
+         */
+
+        double mn; // Mn, the measurement result of the neighbouring cell
+        double ofn = measObjectEutra.offsetFreq; // Ofn, the frequency specific offset of the frequency of the
+        double ocn = 0.0; // Ocn, the cell specific offset of the neighbour cell
+        double thresh; // Thresh, the threshold parameter for this event
+        // Hys, the hysteresis parameter for this event.
+        double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
+
+        switch (reportConfigEutra.triggerQuantity)
+          {
+          case LteRrcSap::ReportConfigEutra::RSRP:
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRP);
+            thresh = EutranMeasurementMapping::RsrpRange2Dbm (reportConfigEutra.threshold1.range);
+            break;
+          case LteRrcSap::ReportConfigEutra::RSRQ:
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ);
+            thresh = EutranMeasurementMapping::RsrqRange2Db (reportConfigEutra.threshold1.range);
+            break;
+          default:
+            NS_FATAL_ERROR ("unsupported triggerQuantity");
+            break;
+          }
+
+        for (std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.begin ();
+             storedMeasIt != m_storedMeasValues.end ();
+             ++storedMeasIt)
+          {
+            uint16_t cellId = storedMeasIt->first;
+            if (cellId == m_cellId)
+              {
+                continue;
+              }
+
+            switch (reportConfigEutra.triggerQuantity)
+              {
+              case LteRrcSap::ReportConfigEutra::RSRP:
+                mn = storedMeasIt->second.rsrp;
+                break;
+              case LteRrcSap::ReportConfigEutra::RSRQ:
+                mn = storedMeasIt->second.rsrq;
+                break;
+              default:
+                NS_FATAL_ERROR ("unsupported triggerQuantity");
+                break;
+              }
+
+            bool hasTriggered = isMeasIdInReportList
+              && (measReportIt->second.cellsTriggeredList.find (cellId)
+                  != measReportIt->second.cellsTriggeredList.end ());
+
+            // Inequality A4-1 (Entering condition): Mn + Ofn + Ocn - Hys > Thresh
+            bool entryCond = mn + ofn + ocn - hys > thresh;
+
+            if (entryCond)
+              {
+                if (!hasTriggered)
+                  {
+                    concernedCellsEntry.push_back (cellId);
+                    eventEntryCondApplicable = true;
+                  }
+              }
+            else if (reportConfigEutra.timeToTrigger > 0)
+              {
+                CancelEnteringTrigger (measId, cellId);
+              }
+
+            // Inequality A4-2 (Leaving condition): Mn + Ofn + Ocn + Hys < Thresh
+            bool leavingCond = mn + ofn + ocn + hys < thresh;
+
+            if (leavingCond)
+              {
+                if (hasTriggered)
+                  {
+                    concernedCellsLeaving.push_back (cellId);
+                    eventLeavingCondApplicable = true;
+                  }
+              }
+            else if (reportConfigEutra.timeToTrigger > 0)
+              {
+                CancelLeavingTrigger (measId, cellId);
+              }
+
+            NS_LOG_LOGIC (this << " event A4: neighbor cell " << cellId
+                               << " mn=" << mn << " thresh=" << thresh
+                               << " entryCond=" << entryCond
+                               << " leavingCond=" << leavingCond);
+
+          } // end of for (storedMeasIt)
+
+      } // end of case LteRrcSap::ReportConfigEutra::EVENT_A4
+
+      break;
+
+    case LteRrcSap::ReportConfigEutra::EVENT_A5:
+      {
+        /*
+         * Event A5 (PCell becomes worse than threshold1 and neighbour
+         * becomes better than threshold2)
+         * Please refer to 3GPP TS 36.331 Section 5.5.4.6
+         */
+
+        double mp; // Mp, the measurement result of the PCell
+        double mn; // Mn, the measurement result of the neighbouring cell
+        double ofn = measObjectEutra.offsetFreq; // Ofn, the frequency specific offset of the frequency of the
+        double ocn = 0.0; // Ocn, the cell specific offset of the neighbour cell
+        double thresh1; // Thresh1, the threshold parameter for this event
+        double thresh2; // Thresh2, the threshold parameter for this event
+        // Hys, the hysteresis parameter for this event.
+        double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
+
+        switch (reportConfigEutra.triggerQuantity)
+          {
+          case LteRrcSap::ReportConfigEutra::RSRP:
+            mp = m_storedMeasValues[m_cellId].rsrp;
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRP);
+            NS_ASSERT (reportConfigEutra.threshold2.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRP);
+            thresh1 = EutranMeasurementMapping::RsrpRange2Dbm (reportConfigEutra.threshold1.range);
+            thresh2 = EutranMeasurementMapping::RsrpRange2Dbm (reportConfigEutra.threshold2.range);
+            break;
+          case LteRrcSap::ReportConfigEutra::RSRQ:
+            mp = m_storedMeasValues[m_cellId].rsrq;
+            NS_ASSERT (reportConfigEutra.threshold1.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ);
+            NS_ASSERT (reportConfigEutra.threshold2.choice
+                       == LteRrcSap::ThresholdEutra::THRESHOLD_RSRQ);
+            thresh1 = EutranMeasurementMapping::RsrqRange2Db (reportConfigEutra.threshold1.range);
+            thresh2 = EutranMeasurementMapping::RsrqRange2Db (reportConfigEutra.threshold2.range);
+            break;
+          default:
+            NS_FATAL_ERROR ("unsupported triggerQuantity");
+            break;
+          }
+
+        // Inequality A5-1 (Entering condition 1): Mp + Hys < Thresh1
+        bool entryCond = mp + hys < thresh1;
+
+        if (entryCond)
+          {
+            for (std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.begin ();
+                 storedMeasIt != m_storedMeasValues.end ();
+                 ++storedMeasIt)
+              {
+                uint16_t cellId = storedMeasIt->first;
+                if (cellId == m_cellId)
+                  {
+                    continue;
+                  }
+
+                switch (reportConfigEutra.triggerQuantity)
+                  {
+                  case LteRrcSap::ReportConfigEutra::RSRP:
+                    mn = storedMeasIt->second.rsrp;
+                    break;
+                  case LteRrcSap::ReportConfigEutra::RSRQ:
+                    mn = storedMeasIt->second.rsrq;
+                    break;
+                  default:
+                    NS_FATAL_ERROR ("unsupported triggerQuantity");
+                    break;
+                  }
+
+                bool hasTriggered = isMeasIdInReportList
+                  && (measReportIt->second.cellsTriggeredList.find (cellId)
+                      != measReportIt->second.cellsTriggeredList.end ());
+
+                // Inequality A5-2 (Entering condition 2): Mn + Ofn + Ocn - Hys > Thresh2
+
+                entryCond = mn + ofn + ocn - hys > thresh2;
+
+                if (entryCond)
+                  {
+                    if (!hasTriggered)
+                      {
+                        concernedCellsEntry.push_back (cellId);
+                        eventEntryCondApplicable = true;
+                      }
+                  }
+                else if (reportConfigEutra.timeToTrigger > 0)
+                  {
+                    CancelEnteringTrigger (measId, cellId);
+                  }
+
+                NS_LOG_LOGIC (this << " event A5: neighbor cell " << cellId
+                                   << " mn=" << mn << " mp=" << mp
+                                   << " thresh2=" << thresh2
+                                   << " thresh1=" << thresh1
+                                   << " entryCond=" << entryCond);
+
+              } // end of for (storedMeasIt)
+
+          } // end of if (entryCond)
+        else
+          {
+            NS_LOG_LOGIC (this << " event A5: serving cell " << m_cellId
+                               << " mp=" << mp << " thresh1=" << thresh1
+                               << " entryCond=" << entryCond);
+
+            if (reportConfigEutra.timeToTrigger > 0)
+              {
+                CancelEnteringTrigger (measId);
+              }
+          }
+
+        if (isMeasIdInReportList)
+          {
+            // Inequality A5-3 (Leaving condition 1): Mp - Hys > Thresh1
+            bool leavingCond = mp - hys > thresh1;
+
+            if (leavingCond)
+              {
+                if (reportConfigEutra.timeToTrigger == 0)
+                  {
+                    // leaving condition #2 does not have to be checked
+
+                    for (std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.begin ();
+                         storedMeasIt != m_storedMeasValues.end ();
+                         ++storedMeasIt)
+                      {
+                        uint16_t cellId = storedMeasIt->first;
+                        if (cellId == m_cellId)
+                          {
+                            continue;
+                          }
+
+                        if (measReportIt->second.cellsTriggeredList.find (cellId)
+                            != measReportIt->second.cellsTriggeredList.end ())
+                          {
+                            concernedCellsLeaving.push_back (cellId);
+                            eventLeavingCondApplicable = true;
+                          }
+                      }
+                  } // end of if (reportConfigEutra.timeToTrigger == 0)
+                else
+                  {
+                    // leaving condition #2 has to be checked to cancel time-to-trigger
+
+                    for (std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.begin ();
+                         storedMeasIt != m_storedMeasValues.end ();
+                         ++storedMeasIt)
+                      {
+                        uint16_t cellId = storedMeasIt->first;
+                        if (cellId == m_cellId)
+                          {
+                            continue;
+                          }
+
+                        if (measReportIt->second.cellsTriggeredList.find (cellId)
+                            != measReportIt->second.cellsTriggeredList.end ())
+                          {
+                            switch (reportConfigEutra.triggerQuantity)
+                              {
+                              case LteRrcSap::ReportConfigEutra::RSRP:
+                                mn = storedMeasIt->second.rsrp;
+                                break;
+                              case LteRrcSap::ReportConfigEutra::RSRQ:
+                                mn = storedMeasIt->second.rsrq;
+                                break;
+                              default:
+                                NS_FATAL_ERROR ("unsupported triggerQuantity");
+                                break;
+                              }
+
+                            // Inequality A5-4 (Leaving condition 2): Mn + Ofn + Ocn + Hys < Thresh2
+
+                            leavingCond = mn + ofn + ocn + hys < thresh2;
+
+                            if (!leavingCond)
+                              {
+                                CancelLeavingTrigger (measId, cellId);
+                              }
+
+                            /*
+                             * Whatever the result of leaving condition #2, this
+                             * cell is still "in", because leaving condition #1
+                             * is already true.
+                             */
+                            concernedCellsLeaving.push_back (cellId);
+                            eventLeavingCondApplicable = true;
+
+                            NS_LOG_LOGIC (this << " event A5: neighbor cell " << cellId
+                                               << " mn=" << mn << " mp=" << mp
+                                               << " thresh2=" << thresh2
+                                               << " thresh1=" << thresh1
+                                               << " leavingCond=" << leavingCond);
+
+                          } // end of if (measReportIt->second.cellsTriggeredList.find (cellId)
+                            //            != measReportIt->second.cellsTriggeredList.end ())
+
+                      } // end of for (storedMeasIt)
+
+                  } // end of else of if (reportConfigEutra.timeToTrigger == 0)
+
+                NS_LOG_LOGIC (this << " event A5: serving cell " << m_cellId
+                                   << " mp=" << mp << " thresh1=" << thresh1
+                                   << " leavingCond=" << leavingCond);
+
+              } // end of if (leavingCond)
+            else
+              {
+                if (reportConfigEutra.timeToTrigger > 0)
+                  {
+                    CancelLeavingTrigger (measId);
+                  }
+
+                // check leaving condition #2
+
+                for (std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.begin ();
+                     storedMeasIt != m_storedMeasValues.end ();
+                     ++storedMeasIt)
+                  {
+                    uint16_t cellId = storedMeasIt->first;
+                    if (cellId == m_cellId)
+                      {
+                        continue;
+                      }
+
+                    if (measReportIt->second.cellsTriggeredList.find (cellId)
+                        != measReportIt->second.cellsTriggeredList.end ())
+                      {
+                        switch (reportConfigEutra.triggerQuantity)
+                          {
+                          case LteRrcSap::ReportConfigEutra::RSRP:
+                            mn = storedMeasIt->second.rsrp;
+                            break;
+                          case LteRrcSap::ReportConfigEutra::RSRQ:
+                            mn = storedMeasIt->second.rsrq;
+                            break;
+                          default:
+                            NS_FATAL_ERROR ("unsupported triggerQuantity");
+                            break;
+                          }
+
+                        // Inequality A5-4 (Leaving condition 2): Mn + Ofn + Ocn + Hys < Thresh2
+                        leavingCond = mn + ofn + ocn + hys < thresh2;
+
+                        if (leavingCond)
+                          {
+                            concernedCellsLeaving.push_back (cellId);
+                            eventLeavingCondApplicable = true;
+                          }
+
+                        NS_LOG_LOGIC (this << " event A5: neighbor cell " << cellId
+                                           << " mn=" << mn << " mp=" << mp
+                                           << " thresh2=" << thresh2
+                                           << " thresh1=" << thresh1
+                                           << " leavingCond=" << leavingCond);
+
+                      } // end of if (measReportIt->second.cellsTriggeredList.find (cellId)
+                        //            != measReportIt->second.cellsTriggeredList.end ())
+
+                  } // end of for (storedMeasIt)
+
+              } // end of else of if (leavingCond)
+
+          } // end of if (isMeasIdInReportList)
+
+      } // end of case LteRrcSap::ReportConfigEutra::EVENT_A5
+
+      break;
+
+    default:
+      NS_FATAL_ERROR ("unsupported eventId " << reportConfigEutra.eventId);
+      break;
+
+    } // switch (event type)
+
+  NS_LOG_LOGIC (this << " eventEntryCondApplicable=" << eventEntryCondApplicable
+                     << " eventLeavingCondApplicable=" << eventLeavingCondApplicable);
+
+  if (eventEntryCondApplicable)
+    {
+      if (reportConfigEutra.timeToTrigger == 0)
+        {
+          VarMeasReportListAdd (measId, concernedCellsEntry);
+        }
+      else
+        {
+          PendingTrigger_t t;
+          t.measId = measId;
+          t.concernedCells = concernedCellsEntry;
+          t.timer = Simulator::Schedule (MilliSeconds (reportConfigEutra.timeToTrigger),
+                                         &LteUeRrc::VarMeasReportListAdd, this,
+                                         measId, concernedCellsEntry);
+          std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
+            enteringTriggerIt = m_enteringTriggerQueue.find (measId);
+          NS_ASSERT (enteringTriggerIt != m_enteringTriggerQueue.end ());
+          enteringTriggerIt->second.push_back (t);
+        }
+    }
+
+  if (eventLeavingCondApplicable)
+    {
+      // reportOnLeave will only be set when eventId = eventA3
+      bool reportOnLeave = (reportConfigEutra.eventId == LteRrcSap::ReportConfigEutra::EVENT_A3)
+        && reportConfigEutra.reportOnLeave;
+
+      if (reportConfigEutra.timeToTrigger == 0)
+        {
+          VarMeasReportListErase (measId, concernedCellsLeaving, reportOnLeave);
+        }
+      else
+        {
+          PendingTrigger_t t;
+          t.measId = measId;
+          t.concernedCells = concernedCellsLeaving;
+          t.timer = Simulator::Schedule (MilliSeconds (reportConfigEutra.timeToTrigger),
+                                         &LteUeRrc::VarMeasReportListErase, this,
+                                         measId, concernedCellsLeaving, reportOnLeave);
+          std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
+            leavingTriggerIt = m_leavingTriggerQueue.find (measId);
+          NS_ASSERT (leavingTriggerIt != m_leavingTriggerQueue.end ());
+          leavingTriggerIt->second.push_back (t);
+        }
+    }
+
+} // end of void LteUeRrc::MeasurementReportTriggering (uint8_t measId)
+
+void
+LteUeRrc::CancelEnteringTrigger (uint8_t measId)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) measId);
+
+  std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
+    it1 = m_enteringTriggerQueue.find (measId);
+  NS_ASSERT (it1 != m_enteringTriggerQueue.end ());
+
+  if (!it1->second.empty ())
+    {
+      std::list<PendingTrigger_t>::iterator it2;
+      for (it2 = it1->second.begin (); it2 != it1->second.end (); ++it2)
+        {
+          NS_ASSERT (it2->measId == measId);
+          NS_LOG_LOGIC (this << " canceling entering time-to-trigger event at "
+                             << Simulator::GetDelayLeft (it2->timer).GetSeconds ());
+          Simulator::Cancel (it2->timer);
+        }
+
+      it1->second.clear ();
+    }
+}
+
+void
+LteUeRrc::CancelEnteringTrigger (uint8_t measId, uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) measId << cellId);
+
+  std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
+    it1 = m_enteringTriggerQueue.find (measId);
+  NS_ASSERT (it1 != m_enteringTriggerQueue.end ());
+
+  std::list<PendingTrigger_t>::iterator it2 = it1->second.begin ();
+  while (it2 != it1->second.end ())
+    {
+      NS_ASSERT (it2->measId == measId);
+
+      ConcernedCells_t::iterator it3;
+      for (it3 = it2->concernedCells.begin ();
+           it3 != it2->concernedCells.end (); ++it3)
+        {
+          if (*it3 == cellId)
+            {
+              it3 = it2->concernedCells.erase (it3);
+            }
+        }
+
+      if (it2->concernedCells.empty ())
+        {
+          NS_LOG_LOGIC (this << " canceling entering time-to-trigger event at "
+                             << Simulator::GetDelayLeft (it2->timer).GetSeconds ());
+          Simulator::Cancel (it2->timer);
+          it2 = it1->second.erase (it2);
+        }
+      else
+        {
+          it2++;
+        }
+    }
+}
+
+void
+LteUeRrc::CancelLeavingTrigger (uint8_t measId)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) measId);
+
+  std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
+    it1 = m_leavingTriggerQueue.find (measId);
+  NS_ASSERT (it1 != m_leavingTriggerQueue.end ());
+
+  if (!it1->second.empty ())
+    {
+      std::list<PendingTrigger_t>::iterator it2;
+      for (it2 = it1->second.begin (); it2 != it1->second.end (); ++it2)
+        {
+          NS_ASSERT (it2->measId == measId);
+          NS_LOG_LOGIC (this << " canceling leaving time-to-trigger event at "
+                             << Simulator::GetDelayLeft (it2->timer).GetSeconds ());
+          Simulator::Cancel (it2->timer);
+        }
+
+      it1->second.clear ();
+    }
+}
+
+void
+LteUeRrc::CancelLeavingTrigger (uint8_t measId, uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) measId << cellId);
+
+  std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
+    it1 = m_leavingTriggerQueue.find (measId);
+  NS_ASSERT (it1 != m_leavingTriggerQueue.end ());
+
+  std::list<PendingTrigger_t>::iterator it2 = it1->second.begin ();
+  while (it2 != it1->second.end ())
+    {
+      NS_ASSERT (it2->measId == measId);
+
+      ConcernedCells_t::iterator it3;
+      for (it3 = it2->concernedCells.begin ();
+           it3 != it2->concernedCells.end (); ++it3)
+        {
+          if (*it3 == cellId)
+            {
+              it3 = it2->concernedCells.erase (it3);
+            }
+        }
+
+      if (it2->concernedCells.empty ())
+        {
+          NS_LOG_LOGIC (this << " canceling leaving time-to-trigger event at "
+                             << Simulator::GetDelayLeft (it2->timer).GetSeconds ());
+          Simulator::Cancel (it2->timer);
+          it2 = it1->second.erase (it2);
+        }
+      else
+        {
+          it2++;
+        }
+    }
+}
+
+void
+LteUeRrc::VarMeasReportListAdd (uint8_t measId, ConcernedCells_t enteringCells)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) measId);
+  NS_ASSERT (!enteringCells.empty ());
+
+  std::map<uint8_t, VarMeasReport>::iterator
+    measReportIt = m_varMeasReportList.find (measId);
+
+  if (measReportIt == m_varMeasReportList.end ())
+    {
+      VarMeasReport r;
+      r.measId = measId;
+      std::pair<uint8_t, VarMeasReport> val (measId, r);
+      std::pair<std::map<uint8_t, VarMeasReport>::iterator, bool>
+        ret = m_varMeasReportList.insert (val);
+      NS_ASSERT_MSG (ret.second == true, "element already existed");
+      measReportIt = ret.first;
+    }
+
+  NS_ASSERT (measReportIt != m_varMeasReportList.end ());
+
+  for (ConcernedCells_t::const_iterator it = enteringCells.begin ();
+       it != enteringCells.end ();
+       ++it)
+    {
+      measReportIt->second.cellsTriggeredList.insert (*it);
+    }
+
+  NS_ASSERT (!measReportIt->second.cellsTriggeredList.empty ());
+  measReportIt->second.numberOfReportsSent = 0;
+  measReportIt->second.periodicReportTimer
+    = Simulator::Schedule (UE_MEASUREMENT_REPORT_DELAY,
+                           &LteUeRrc::SendMeasurementReport,
+                           this, measId);
+
+  std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
+    enteringTriggerIt = m_enteringTriggerQueue.find (measId);
+  NS_ASSERT (enteringTriggerIt != m_enteringTriggerQueue.end ());
+  if (!enteringTriggerIt->second.empty ())
+    {
+      /*
+       * Assumptions at this point:
+       *  - the call to this function was delayed by time-to-trigger;
+       *  - the time-to-trigger delay is fixed (not adaptive/dynamic); and
+       *  - the first element in the list is associated with this function call.
+       */
+      enteringTriggerIt->second.pop_front ();
+
+      if (!enteringTriggerIt->second.empty ())
+        {
+          /*
+           * To prevent the same set of cells triggering again in the future,
+           * we clean up the time-to-trigger queue. This case might occur when
+           * time-to-trigger > 200 ms.
+           */
+          for (ConcernedCells_t::const_iterator it = enteringCells.begin ();
+               it != enteringCells.end (); ++it)
+            {
+              CancelEnteringTrigger (measId, *it);
+            }
+        }
+
+    } // end of if (!enteringTriggerIt->second.empty ())
+
+} // end of LteUeRrc::VarMeasReportListAdd
+
+void
+LteUeRrc::VarMeasReportListErase (uint8_t measId, ConcernedCells_t leavingCells,
+                                  bool reportOnLeave)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) measId);
+  NS_ASSERT (!leavingCells.empty ());
+
+  std::map<uint8_t, VarMeasReport>::iterator
+    measReportIt = m_varMeasReportList.find (measId);
+  NS_ASSERT (measReportIt != m_varMeasReportList.end ());
+
+  for (ConcernedCells_t::const_iterator it = leavingCells.begin ();
+       it != leavingCells.end ();
+       ++it)
+    {
+      measReportIt->second.cellsTriggeredList.erase (*it);
+    }
+
+  if (reportOnLeave)
+    {
+      // runs immediately without UE_MEASUREMENT_REPORT_DELAY
+      SendMeasurementReport (measId);
+    }
+
+  if (measReportIt->second.cellsTriggeredList.empty ())
+    {
+      measReportIt->second.periodicReportTimer.Cancel ();
+      m_varMeasReportList.erase (measReportIt);
+    }
+
+  std::map<uint8_t, std::list<PendingTrigger_t> >::iterator
+    leavingTriggerIt = m_leavingTriggerQueue.find (measId);
+  NS_ASSERT (leavingTriggerIt != m_leavingTriggerQueue.end ());
+  if (!leavingTriggerIt->second.empty ())
+    {
+      /*
+       * Assumptions at this point:
+       *  - the call to this function was delayed by time-to-trigger; and
+       *  - the time-to-trigger delay is fixed (not adaptive/dynamic); and
+       *  - the first element in the list is associated with this function call.
+       */
+      leavingTriggerIt->second.pop_front ();
+
+      if (!leavingTriggerIt->second.empty ())
+        {
+          /*
+           * To prevent the same set of cells triggering again in the future,
+           * we clean up the time-to-trigger queue. This case might occur when
+           * time-to-trigger > 200 ms.
+           */
+          for (ConcernedCells_t::const_iterator it = leavingCells.begin ();
+               it != leavingCells.end (); ++it)
+            {
+              CancelLeavingTrigger (measId, *it);
+            }
+        }
+
+    } // end of if (!leavingTriggerIt->second.empty ())
+
+} // end of LteUeRrc::VarMeasReportListErase
+
+void
+LteUeRrc::VarMeasReportListClear (uint8_t measId)
+{
+  NS_LOG_FUNCTION (this << (uint16_t) measId);
+
+  // remove the measurement reporting entry for this measId from the VarMeasReportList
+  std::map<uint8_t, VarMeasReport>::iterator
+    measReportIt = m_varMeasReportList.find (measId);
+  if (measReportIt != m_varMeasReportList.end ())
+    {
+      NS_LOG_LOGIC (this << " deleting existing report for measId " << (uint16_t) measId);
+      measReportIt->second.periodicReportTimer.Cancel ();
+      m_varMeasReportList.erase (measReportIt);
+    }
+
+  CancelEnteringTrigger (measId);
+  CancelLeavingTrigger (measId);
+}
+
 void 
 LteUeRrc::SendMeasurementReport (uint8_t measId)
 {
-  NS_LOG_FUNCTION (this << (uint32_t) measId);
+  NS_LOG_FUNCTION (this << (uint16_t) measId);
   //  3GPP TS 36.331 section 5.5.5 Measurement reporting
 
   std::map<uint8_t, LteRrcSap::MeasIdToAddMod>::iterator 
     measIdIt = m_varMeasConfig.measIdList.find (measId);
   NS_ASSERT (measIdIt != m_varMeasConfig.measIdList.end ());
-  
+
   std::map<uint8_t, LteRrcSap::ReportConfigToAddMod>::iterator 
     reportConfigIt = m_varMeasConfig.reportConfigList.find (measIdIt->second.reportConfigId);
   NS_ASSERT (reportConfigIt != m_varMeasConfig.reportConfigList.end ());
@@ -1432,7 +2560,7 @@
   LteRrcSap::MeasurementReport measurementReport;
   LteRrcSap::MeasResults& measResults = measurementReport.measResults;
   measResults.measId = measId;
-  
+
   std::map<uint16_t, MeasValues>::iterator servingMeasIt = m_storedMeasValues.find (m_cellId);
   NS_ASSERT (servingMeasIt != m_storedMeasValues.end ());
   measResults.rsrpResult = EutranMeasurementMapping::Dbm2RsrpRange (servingMeasIt->second.rsrp);
@@ -1450,9 +2578,7 @@
     {
       if (!(measReportIt->second.cellsTriggeredList.empty ()))
         {
-          measResults.haveMeasResultNeighCells = true;
-          
-          std::multimap<double, uint16_t> sortedNeighCells;         
+          std::multimap<double, uint16_t> sortedNeighCells;
           for (std::set<uint16_t>::iterator cellsTriggeredIt = measReportIt->second.cellsTriggeredList.begin ();
                cellsTriggeredIt != measReportIt->second.cellsTriggeredList.end ();
                ++cellsTriggeredIt)
@@ -1461,7 +2587,7 @@
               if (cellId != m_cellId)
                 {
                   std::map<uint16_t, MeasValues>::iterator neighborMeasIt = m_storedMeasValues.find (cellId);
-                  double triggerValue;             
+                  double triggerValue;
                   switch (reportConfigEutra.triggerQuantity)
                     {
                     case LteRrcSap::ReportConfigEutra::RSRP:
@@ -1473,11 +2599,11 @@
                     default:
                       NS_FATAL_ERROR ("unsupported triggerQuantity");
                       break;
-                    }  
+                    }
                   sortedNeighCells.insert (std::pair<double, uint16_t> (triggerValue, cellId));
                 }
             }
-          
+
           std::multimap<double, uint16_t>::reverse_iterator sortedNeighCellsIt;
           uint32_t count;
           for (sortedNeighCellsIt = sortedNeighCells.rbegin (), count = 0;
@@ -1486,49 +2612,90 @@
             {
               uint16_t cellId = sortedNeighCellsIt->second;
               std::map<uint16_t, MeasValues>::iterator neighborMeasIt = m_storedMeasValues.find (cellId);
-              NS_ASSERT (neighborMeasIt != m_storedMeasValues.end ());            
+              NS_ASSERT (neighborMeasIt != m_storedMeasValues.end ());
               LteRrcSap::MeasResultEutra measResultEutra;
               measResultEutra.physCellId = cellId;
               measResultEutra.haveCgiInfo = false;
               measResultEutra.haveRsrpResult = true;
               measResultEutra.rsrpResult = EutranMeasurementMapping::Dbm2RsrpRange (neighborMeasIt->second.rsrp);
               measResultEutra.haveRsrqResult = true;
-              measResultEutra.rsrqResult = EutranMeasurementMapping::Db2RsrqRange (neighborMeasIt->second.rsrq);           
+              measResultEutra.rsrqResult = EutranMeasurementMapping::Db2RsrqRange (neighborMeasIt->second.rsrq);
               NS_LOG_INFO (this << " reporting neighbor cell " << (uint32_t) measResultEutra.physCellId 
-                           << " RSRP " << (uint32_t) measResultEutra.rsrpResult 
-                           << " (" << neighborMeasIt->second.rsrp << " dBm) "
-                           << " RSRQ " << (uint32_t) measResultEutra.rsrqResult 
-                           << " (" << neighborMeasIt->second.rsrq << " dB)"); 
+                                << " RSRP " << (uint32_t) measResultEutra.rsrpResult
+                                << " (" << neighborMeasIt->second.rsrp << " dBm)"
+                                << " RSRQ " << (uint32_t) measResultEutra.rsrqResult
+                                << " (" << neighborMeasIt->second.rsrq << " dB)");
               measResults.measResultListEutra.push_back (measResultEutra);
+              measResults.haveMeasResultNeighCells = true;
             }
         }
       else
         {
           NS_LOG_WARN (this << " cellsTriggeredList is empty");
         }
+
+      /*
+       * The current LteRrcSap implementation is broken in that it does not
+       * allow for infinite values of reportAmount, which is probably the most
+       * reasonable setting. So we just always assume infinite reportAmount.
+       */
       measReportIt->second.numberOfReportsSent++;
       measReportIt->second.periodicReportTimer.Cancel ();
-            
-      // the current LteRrcSap implementation is broken in that it does not allow for infinite values
-      // which is probably the most reasonable setting. So we just assume infinite reportAmount
-      // if (measReportIt->numberOfReportsSent < reportConfigEutra.reportAmount)
-      uint32_t intervalMs;
+
+      Time reportInterval;
       switch (reportConfigEutra.reportInterval)
         {
+        case LteRrcSap::ReportConfigEutra::MS120:
+          reportInterval = MilliSeconds (120);
+          break;
+        case LteRrcSap::ReportConfigEutra::MS240:
+          reportInterval = MilliSeconds (240);
+          break;
         case LteRrcSap::ReportConfigEutra::MS480:
-          intervalMs = 480;
+          reportInterval = MilliSeconds (480);
+          break;
+        case LteRrcSap::ReportConfigEutra::MS640:
+          reportInterval = MilliSeconds (640);
+          break;
+        case LteRrcSap::ReportConfigEutra::MS1024:
+          reportInterval = MilliSeconds (1024);
+          break;
+        case LteRrcSap::ReportConfigEutra::MS2048:
+          reportInterval = MilliSeconds (2048);
+          break;
+        case LteRrcSap::ReportConfigEutra::MS5120:
+          reportInterval = MilliSeconds (5120);
+          break;
+        case LteRrcSap::ReportConfigEutra::MS10240:
+          reportInterval = MilliSeconds (10240);
+          break;
+        case LteRrcSap::ReportConfigEutra::MIN1:
+          reportInterval = Seconds (60);
+          break;
+        case LteRrcSap::ReportConfigEutra::MIN6:
+          reportInterval = Seconds (360);
+          break;
+        case LteRrcSap::ReportConfigEutra::MIN12:
+          reportInterval = Seconds (720);
+          break;
+        case LteRrcSap::ReportConfigEutra::MIN30:
+          reportInterval = Seconds (1800);
+          break;
+        case LteRrcSap::ReportConfigEutra::MIN60:
+          reportInterval = Seconds (3600);
           break;
-          
         default:
-          NS_FATAL_ERROR ("unsupported reportInterval");
-          break;          
+          NS_FATAL_ERROR ("Unsupported reportInterval " << (uint16_t) reportConfigEutra.reportInterval);
+          break;
         }
+
+      // schedule the next measurement reporting
       measReportIt->second.periodicReportTimer 
-        = Simulator::Schedule (MilliSeconds (intervalMs), 
+        = Simulator::Schedule (reportInterval,
                                &LteUeRrc::SendMeasurementReport,
-                               this,
-                               measId);
+                               this, measId);
 
+      // send the measurement report to eNodeB
       m_rrcSapUser->SendMeasurementReport (measurementReport);
     } 
 }
@@ -1536,9 +2703,11 @@
 void 
 LteUeRrc::StartConnection ()
 {
-  NS_LOG_FUNCTION (this);
-  m_connectionPending = false;
-  SwitchToState (IDLE_RANDOM_ACCESS);        
+  NS_LOG_FUNCTION (this << m_imsi);
+  NS_ASSERT (m_hasReceivedMib);
+  NS_ASSERT (m_hasReceivedSib2);
+  m_connectionPending = false; // reset the flag
+  SwitchToState (IDLE_RANDOM_ACCESS);
   m_cmacSapProvider->StartContentionBasedRandomAccessProcedure ();
 }
 
@@ -1578,49 +2747,55 @@
 void 
 LteUeRrc::SwitchToState (State newState)
 {
-  NS_LOG_FUNCTION (this << newState);
+  NS_LOG_FUNCTION (this << ToString (newState));
   State oldState = m_state;
   m_state = newState;
-  NS_LOG_INFO ("IMSI " << m_imsi << " RNTI " << m_rnti << " UeRrc " << ToString (oldState) << " --> " << ToString (newState));
+  NS_LOG_INFO (this << "IMSI " << m_imsi << " RNTI " << m_rnti << " UeRrc "
+                    << ToString (oldState) << " --> " << ToString (newState));
   m_stateTransitionTrace (m_imsi, m_cellId, m_rnti, oldState, newState);
 
   switch (newState)
     {
-    case IDLE_CELL_SELECTION:
+    case IDLE_START:
+      NS_FATAL_ERROR ("cannot switch to an initial state");
       break;
 
-    case IDLE_WAIT_SYSTEM_INFO:
+    case IDLE_CELL_SEARCH:
+    case IDLE_WAIT_MIB_SIB1:
+    case IDLE_WAIT_MIB:
+    case IDLE_WAIT_SIB1:
       break;
 
     case IDLE_CAMPED_NORMALLY:
       if (m_connectionPending)
         {
-          StartConnection ();
+          SwitchToState (IDLE_WAIT_SIB2);
         }
       break;
 
-    case IDLE_RANDOM_ACCESS:
+    case IDLE_WAIT_SIB2:
+      if (m_hasReceivedSib2)
+        {
+          NS_ASSERT (m_connectionPending);
+          StartConnection ();
+        }
       break;
 
+    case IDLE_RANDOM_ACCESS:
     case IDLE_CONNECTING:
-      break;
- 
     case CONNECTED_NORMALLY:
-      break;
-
-    case CONNECTED_REESTABLISHING:
-      break;
-
     case CONNECTED_HANDOVER:
+    case CONNECTED_PHY_PROBLEM:
+    case CONNECTED_REESTABLISHING:
       break;
  
     default:
       break;
     }
 }
-  
 
-    
-  
+
+
+
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/lte/model/lte-ue-rrc.h ns-3.19/src/lte/model/lte-ue-rrc.h
--- ns-3.18.1/src/lte/model/lte-ue-rrc.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/lte-ue-rrc.h	2013-12-20 09:44:50.000000000 -0800
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: Nicola Baldo <nbaldo@cttc.es>
+ *         Budiarto Herman <budiarto.herman@magister.fi>
  */
 
 #ifndef LTE_UE_RRC_H
@@ -35,13 +36,32 @@
 
 namespace ns3 {
 
+
+/**
+ * \brief Artificial delay of UE measurements procedure.
+ *
+ * i.e. the period between the time layer-1-filtered measurements from PHY
+ * layer is received and the earliest time the actual measurement report
+ * submission to the serving cell is invoked.
+ *
+ * This delay exists because of racing condition between several UE measurements
+ * functions which happen to be scheduled at the same time. The delay ensures
+ * that:
+ *  - measurements (e.g., layer-3 filtering) are always performed before
+ *    reporting, thus the latter always use the latest measured RSRP and RSRQ;
+ *    and
+ *  - time-to-trigger check is always performed before the reporting, so there
+ *    would still be chance for it to cancel the reporting if necessary.
+ */
+static const Time UE_MEASUREMENT_REPORT_DELAY = MicroSeconds (1);
+
+
 class LteRlc;
 class LteMacSapProvider;
 class LteUeCmacSapUser;
 class LteUeCmacSapProvider;
 class LteDataRadioBearerInfo;
 class LteSignalingRadioBearerInfo;
-class LteEnbRrc;
 
 /**
  *
@@ -64,17 +84,22 @@
    * 
    */
   enum State
-    {
-      IDLE_CELL_SELECTION = 0,
-      IDLE_WAIT_SYSTEM_INFO,
-      IDLE_CAMPED_NORMALLY,
-      IDLE_RANDOM_ACCESS,
-      IDLE_CONNECTING,
-      CONNECTED_NORMALLY,
-      CONNECTED_REESTABLISHING,
-      CONNECTED_HANDOVER,
-      NUM_STATES
-    };
+  {
+    IDLE_START = 0,
+    IDLE_CELL_SEARCH,
+    IDLE_WAIT_MIB_SIB1,
+    IDLE_WAIT_MIB,
+    IDLE_WAIT_SIB1,
+    IDLE_CAMPED_NORMALLY,
+    IDLE_WAIT_SIB2,
+    IDLE_RANDOM_ACCESS,
+    IDLE_CONNECTING,
+    CONNECTED_NORMALLY,
+    CONNECTED_HANDOVER,
+    CONNECTED_PHY_PROBLEM,
+    CONNECTED_REESTABLISHING,
+    NUM_STATES
+  };
 
 
   /**
@@ -174,8 +199,7 @@
    *
    * \return imsi the unique UE identifier
    */
-  uint64_t GetImsi (void);
-
+  uint64_t GetImsi (void) const;
 
   /**
    *
@@ -183,14 +207,12 @@
    */
   uint16_t GetRnti () const;
 
-
   /**
    *
    * \return the CellId of the attached Enb
    */
   uint16_t GetCellId () const;
 
-
   /** 
    * \return the uplink bandwidth in RBs
    */
@@ -201,7 +223,7 @@
    */
   uint8_t GetDlBandwidth () const;
 
-  /** 
+  /**
    * \return the downlink carrier frequency (EARFCN)
    */
   uint16_t GetDlEarfcn () const;
@@ -211,11 +233,11 @@
    */
   uint16_t GetUlEarfcn () const;
 
-  /** 
-   * 
+  /**
+   *
    * \return the current state
    */
-  State GetState ();
+  State GetState () const;
 
   /** 
    * 
@@ -237,31 +259,210 @@
   void DoNotifyRandomAccessFailed ();
  
   // LTE AS SAP methods
-  void DoForceCampedOnEnb (uint16_t cellId, uint16_t earfcn);
+  void DoSetCsgWhiteList (uint32_t csgId);
+  void DoForceCampedOnEnb (uint16_t cellId, uint16_t dlEarfcn);
+  void DoStartCellSelection (uint16_t dlEarfcn);
   void DoConnect ();
   void DoSendData (Ptr<Packet> packet, uint8_t bid);
   void DoDisconnect ();
 
   // CPHY SAP methods
-  void DoRecvMasterInformationBlock (LteRrcSap::MasterInformationBlock msg);
+  void DoRecvMasterInformationBlock (uint16_t cellId,
+                                     LteRrcSap::MasterInformationBlock msg);
+  void DoRecvSystemInformationBlockType1 (uint16_t cellId,
+                                          LteRrcSap::SystemInformationBlockType1 msg);
   void DoReportUeMeasurements (LteUeCphySapUser::UeMeasurementsParameters params);
 
   // RRC SAP methods
+
+  /// Part of the RRC protocol. Implement the LteUeRrcSapProvider::CompleteSetup interface.
   void DoCompleteSetup (LteUeRrcSapProvider::CompleteSetupParameters params);
-  void DoRecvSystemInformationBlockType1 (LteRrcSap::SystemInformationBlockType1 msg);
+  /// Part of the RRC protocol. Implement the LteUeRrcSapProvider::RecvSystemInformation interface.
   void DoRecvSystemInformation (LteRrcSap::SystemInformation msg);
+  /// Part of the RRC protocol. Implement the LteUeRrcSapProvider::RecvRrcConnectionSetup interface.
   void DoRecvRrcConnectionSetup (LteRrcSap::RrcConnectionSetup msg);
+  /// Part of the RRC protocol. Implement the LteUeRrcSapProvider::RecvRrcConnectionReconfiguration interface.
   void DoRecvRrcConnectionReconfiguration (LteRrcSap::RrcConnectionReconfiguration msg);
+  /// Part of the RRC protocol. Implement the LteUeRrcSapProvider::RecvRrcConnectionReestablishment interface.
   void DoRecvRrcConnectionReestablishment (LteRrcSap::RrcConnectionReestablishment msg);
+  /// Part of the RRC protocol. Implement the LteUeRrcSapProvider::RecvRrcConnectionReestablishmentReject interface.
   void DoRecvRrcConnectionReestablishmentReject (LteRrcSap::RrcConnectionReestablishmentReject msg);
+  /// Part of the RRC protocol. Implement the LteUeRrcSapProvider::RecvRrcConnectionRelease interface.
   void DoRecvRrcConnectionRelease (LteRrcSap::RrcConnectionRelease msg);
+  /// Part of the RRC protocol. Implement the LteUeRrcSapProvider::RecvRrcConnectionReject interface.
   void DoRecvRrcConnectionReject (LteRrcSap::RrcConnectionReject msg);
 
  
-  // internal methods
-  void ApplyRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated rrcd);
+  // INTERNAL METHODS
+
+  /**
+   * \brief Go through the list of measurement results, choose the one with the
+   *        strongest RSRP, and tell PHY to synchronize to it.
+   *
+   * \warning This function is a part of the *initial cell selection* procedure,
+   *          hence must be only executed during IDLE mode.
+   */
+  void SynchronizeToStrongestCell ();
+
+  /**
+   * \brief Performs cell selection evaluation to the current serving cell.
+   *
+   * \warning This function is a part of the *initial cell selection* procedure,
+   *          hence must be only executed during IDLE mode and specifically
+   *          during the state when the UE just received the first SIB1 message
+   *          from the serving cell.
+   *
+   * This function assumes that the required information for the evaluation
+   * procedure have been readily gathered, such as *measurement results*, MIB,
+   * and SIB1. Please refer to the LTE module's Design Documentation for more
+   * details on the evaluation process.
+   *
+   * If the cell passes the evaluation, the UE will immediately camp to it.
+   * Otherwise, the UE will pick another cell and restart the cell selection
+   * procedure.
+   */
+  void EvaluateCellForSelection ();
+
+  /**
+   * \brief Update the current measurement configuration #m_varMeasConfig.
+   * \param mc measurements to be performed by the UE
+   *
+   * Implements Section 5.5.2 "Measurement configuration" of 3GPP TS 36.331.
+   * The supported subfunctions are:
+   * - Measurement object removal
+   * - Measurement object addition/ modification
+   * - Reporting configuration removal
+   * - Reporting configuration addition/ modification
+   * - Quantity configuration
+   * - Measurement identity removal
+   * - Measurement identity addition/ modification
+   *
+   * The subfunctions that will be invoked are determined by the content of
+   * the given measurement configuration.
+   *
+   * Note the existence of some chain reaction behaviours:
+   * - Removal of measurement object or reporting configuration also removes any
+   *   impacted measurement identities.
+   * - Removal of measurement identity also removes any associated *reporting
+   *   entry* from #m_varMeasReportList.
+   * - Modification to measurement object or reporting configuration also
+   *   removes any reporting entries of the impacted measurement identities
+   *   from #m_varMeasReportList.
+   * - Modification to quantity configuration also removes all existing
+   *   reporting entries from #m_varMeasReportList, regardless of measurement
+   *   identity.
+   *
+   * Some unsupported features:
+   * - List of neighbouring cells
+   * - List of black cells
+   * - CGI reporting
+   * - Periodical reporting configuration
+   * - Measurement gaps
+   * - s-Measure
+   * - Speed-dependent scaling
+   *
+   * \warning There is a possibility that the input argument (of type
+   *          LteRrcSap::MeasConfig) may contain information in fields related
+   *          to the unsupported features. In such case, the function will raise
+   *          an error.
+   *
+   * The measurement configuration given as an argument is typically provided by
+   * the serving eNodeB. It is transmitted through the RRC protocol when the UE
+   * joins the cell, e.g., by connection establishment or by incoming handover.
+   * The information inside the argument can be configured from the eNodeB side,
+   * which would then equally apply to all other UEs attached to the same
+   * eNodeB. See the LTE module's User Documentation for more information on
+   * configuring this.
+   *
+   * \sa LteRrcSap::MeasConfig, LteUeRrc::m_varMeasReportList
+   */
   void ApplyMeasConfig (LteRrcSap::MeasConfig mc);
+
+  /**
+   * \brief Keep the given measurement result as the latest measurement figures,
+   *        to be utilised by UE RRC functions.
+   * \param cellId the cell ID of the measured cell
+   * \param rsrp measured RSRP value to be saved (in dBm)
+   * \param rsrq measured RSRQ value to be saved (in dB)
+   * \param useLayer3Filtering
+   * \todo Remove the useLayer3Filtering argument
+   *
+   * Implements Section 5.5.3.2 "Layer 3 filtering" of 3GPP TS 36.331. *Layer-3
+   * filtering* is applied to the given measurement results before saved to
+   * #m_storedMeasValues. The filtering is however disabled when the UE is in
+   * IDLE mode, i.e., saving unfiltered values.
+   *
+   * Layer-3 filtering is influenced by a filter coefficient, which determines
+   * the strength of the filtering. This coefficient is provided by the active
+   * *quantity configuration* in #m_varMeasConfig, which is configured by the
+   * LteUeRrc::ApplyMeasConfig. Details on how the coefficient works and how to
+   * modify it can be found in LTE module's Design Documentation.
+   *
+   * \sa LteUeRrc::m_storedMeasValues
+   */
+  void SaveUeMeasurements (uint16_t cellId, double rsrp, double rsrq,
+                           bool useLayer3Filtering);
+
+  /**
+   * \brief Evaluate the reporting criteria of a measurement identity and
+   *        invoke some reporting actions based on the result.
+   * \param measId the measurement identity to be evaluated
+   *
+   * Implements Section 5.5.4.1 "Measurement report triggering - General" of
+   * 3GPP TS 36.331. This function take into use the latest measurement results
+   * and evaluate them against the *entering condition* and the *leaving
+   * condition* of the measurement identity's reporting criteria. The evaluation
+   * also take into account other defined criteria, such as *hysteresis* and
+   * *time-to-trigger*.
+   *
+   * The entering and leaving condition to be evaluated are determined by the
+   * *event type* of the measurement identity's reporting criteria. As defined
+   * in LteRrcSap::ReportConfigEutra, there 5 supported events. The gore details
+   * of these events can be found in Section 5.5.4 of 3GPP TS 36.331.
+   *
+   * An applicable entering condition (i.e., the condition evaluates to true)
+   * will insert a new *reporting entry* to #m_varMeasReportList, so
+   * *measurement reports* would be produced and submitted to eNodeB. On the
+   * other hand, an applicable leaving condition will remove the related
+   * reporting entry from #m_varMeasReportList, so submission of related
+   * measurement reports to eNodeB will be suspended.
+   */
+  void MeasurementReportTriggering (uint8_t measId);
+
+  /**
+   * \brief Produce a proper measurement report from the given measurement
+   *        identity's reporting entry in #m_varMeasReportList and then submit
+   *        it to the serving eNodeB.
+   * \param measId the measurement identity which report is to be submitted.
+   *
+   * Implements Section 5.5.5 "Measurement reporting" of 3GPP TS 36.331.
+   * Producing a *measurement report* involves several tasks such as:
+   * - including the measurement results of the serving cell into the report;
+   * - selecting some neighbour cells which triggered the reporting (i.e., those
+   *   in *cellsTriggeredList*) to be included in the report;
+   * - sorting the order of neighbour cells in the report by their RSRP or RSRQ
+   *   measurement results (the highest comes first); and
+   * - ensuring the number of neighbour cells in the report is under the
+   *   *maxReportCells* limit defined by the measurement identity's reporting
+   *   configuration.
+   *
+   * The RSRP and RSRQ measurement results included in the report are expressed
+   * in 3GPP-specified range format. They are converted from dBm and dB units
+   * using EutranMeasurementMapping::Dbm2RsrpRange and
+   * EutranMeasurementMapping::Db2RsrqRange functions.
+   *
+   * Measurement report is submitted to the serving eNodeB through the *RRC
+   * protocol*. The LteUeRrcSapUser::SendMeasurementReport method of the *UE RRC
+   * SAP* facilitates this submission.
+   *
+   * After the submission, the function will repeat itself after a certain
+   * interval. The interval length may vary from 120 ms to 60 minutes and is
+   * determined by the *report interval* parameter specified by the measurement
+   * identity's reporting configuration.
+   */
   void SendMeasurementReport (uint8_t measId);
+
+  void ApplyRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated rrcd);
   void StartConnection ();
   void LeaveConnectedMode ();
   void DisposeOldSrb1 ();
@@ -281,7 +482,7 @@
 
   LteMacSapProvider* m_macSapProvider;
   LtePdcpSapUser* m_drbPdcpSapUser;
-  
+
   LteAsSapProvider* m_asSapProvider;
   LteAsSapUser* m_asSapUser;
 
@@ -295,7 +496,7 @@
   Ptr<LteSignalingRadioBearerInfo> m_srb1;
   Ptr<LteSignalingRadioBearerInfo> m_srb1Old;
   std::map <uint8_t, Ptr<LteDataRadioBearerInfo> > m_drbMap;
-  
+
   bool m_useRlcSm;
 
   uint8_t m_lastRrcTransactionIdentifier;
@@ -306,65 +507,296 @@
   uint16_t m_dlEarfcn;  /**< downlink carrier frequency */
   uint16_t m_ulEarfcn;  /**< uplink carrier frequency */
 
-  //             imsi      cellid    rnti   
+  //             imsi      cellId    rnti,     sourceCellId
+  TracedCallback<uint64_t, uint16_t, uint16_t, uint16_t> m_mibReceivedTrace;
+  //             imsi      cellId    rnti,     sourceCellId
+  TracedCallback<uint64_t, uint16_t, uint16_t, uint16_t> m_sib1ReceivedTrace;
+  //             imsi      cellId    rnti
+  TracedCallback<uint64_t, uint16_t, uint16_t> m_sib2ReceivedTrace;
+  //             imsi      cellId    rnti
   TracedCallback<uint64_t, uint16_t, uint16_t, State, State> m_stateTransitionTrace;
-  //             imsi      cellid    rnti   
+  //             imsi      cellId
+  TracedCallback<uint64_t, uint16_t> m_initialCellSelectionEndOkTrace;
+  //             imsi      cellId
+  TracedCallback<uint64_t, uint16_t> m_initialCellSelectionEndErrorTrace;
+  //             imsi      cellId    rnti
   TracedCallback<uint64_t, uint16_t, uint16_t> m_randomAccessSuccessfulTrace;
-  //             imsi      cellid    rnti   
+  //             imsi      cellId    rnti
+  TracedCallback<uint64_t, uint16_t, uint16_t> m_randomAccessErrorTrace;
+  //             imsi      cellId    rnti
   TracedCallback<uint64_t, uint16_t, uint16_t> m_connectionEstablishedTrace;
-  //             imsi      cellid    rnti   
+  //             imsi      cellId    rnti
   TracedCallback<uint64_t, uint16_t, uint16_t> m_connectionReconfigurationTrace;
-  //             imsi      cellid    rnti     targetCellId
+  //             imsi      cellId    rnti      targetCellId
   TracedCallback<uint64_t, uint16_t, uint16_t, uint16_t> m_handoverStartTrace;
-  //             imsi      cellid    rnti    
+  //             imsi      cellId    rnti
   TracedCallback<uint64_t, uint16_t, uint16_t> m_handoverEndOkTrace;
+  //             imsi      cellId    rnti
+  TracedCallback<uint64_t, uint16_t, uint16_t> m_handoverEndErrorTrace;
 
   bool m_connectionPending; /**< true if a connection request by upper layers is pending */
-  bool m_receivedMib; /**< true if MIB was received for the current cell  */
-  bool m_receivedSib2; /**< true if SIB2 was received for the current cell  */
+  bool m_hasReceivedMib; /**< true if MIB was received for the current cell  */
+  bool m_hasReceivedSib1; /**< true if SIB1 was received for the current cell  */
+  bool m_hasReceivedSib2; /**< true if SIB2 was received for the current cell  */
+
+  /// Stored content of the last SIB1 received.
+  LteRrcSap::SystemInformationBlockType1 m_lastSib1;
+
+  /// List of cell ID of acceptable cells for cell selection that have been detected.
+  std::set<uint16_t> m_acceptableCell;
 
+  /// List of CSG ID which this UE entity has access to.
+  uint32_t m_csgWhiteList;
+
+
+  // INTERNAL DATA STRUCTURE RELATED TO UE MEASUREMENTS
 
   /**
-   * Includes the accumulated configuration of the measurements to be
-   * performed by the UE, see TS 36.331 section 7.1. Also note that some
-   * optional variables in the specs are omitted.
-   * 
+   * \brief Includes the accumulated configuration of the measurements to be
+   *        performed by the UE.
+   *
+   * Based on 3GPP TS 36.331 section 7.1. Also note that some optional variables
+   * in the specification are omitted.
    */
   struct VarMeasConfig
   {
-    std::map<uint8_t, LteRrcSap::MeasIdToAddMod>   measIdList;
+    std::map<uint8_t, LteRrcSap::MeasIdToAddMod> measIdList;
     std::map<uint8_t, LteRrcSap::MeasObjectToAddMod> measObjectList;
     std::map<uint8_t, LteRrcSap::ReportConfigToAddMod> reportConfigList;
     LteRrcSap::QuantityConfig quantityConfig; 
     double aRsrp;
     double aRsrq;
   };
-  
+
+  /**
+   * \brief Includes the accumulated configuration of the measurements to be
+   *        performed by the UE.
+   *
+   * Based on 3GPP TS 36.331 section 7.1.
+   */
+  VarMeasConfig m_varMeasConfig;
+
+  /**
+   * \brief Represents a single measurement reporting entry., which includes
+   *        information about a measurement for which the triggering conditions
+   *        have been met.
+   *
+   * Based on 3GPP TS 36.331 section 7.1.
+   */
   struct VarMeasReport
   {
     uint8_t measId;
-    std::set<uint16_t> cellsTriggeredList; // note: only EUTRA is
-                                            // supported
+    std::set<uint16_t> cellsTriggeredList; // note: only E-UTRA is supported.
     uint32_t numberOfReportsSent;
     EventId periodicReportTimer;
   };
-  
-  VarMeasConfig m_varMeasConfig;
-  //       measId
+
+  /**
+   * \brief The list of active reporting entries, indexed by the measurement
+   *        identity which triggered the reporting. Includes information about
+   *        measurements for which the triggering conditions have been met.
+   */
   std::map<uint8_t, VarMeasReport> m_varMeasReportList;
-  
+
+  /**
+   * \brief List of cell IDs which are responsible for a certain trigger.
+   */
+  typedef std::list<uint16_t> ConcernedCells_t;
+
+  /**
+   * \brief Compose a new reporting entry of the given measurement identity,
+   *        insert it into #m_varMeasReportList, and set it up for submission
+   *        to eNodeB.
+   * \param measId the measurement identity which the new reporting entry will
+   *               be based upon
+   * \param enteringCells the cells which are responsible for triggering the
+   *                      reporting (i.e., successfully fulfilling the entering
+   *                      condition of the measurement identity) and will be
+   *                      included in the measurement report.
+   *
+   * \note If an existing reporting entry with the same measurement identity has
+   *       already existed in #m_varMeasReportList, the function will update it
+   *       by adding the entering cells into the existing reporting entry.
+   * \note When time-to-trigger is enabled for this measurement identity, the
+   *       function will also remove the related trigger from the
+   *       #m_enteringTriggerQueue.
+   */
+  void VarMeasReportListAdd (uint8_t measId, ConcernedCells_t enteringCells);
+
+  /**
+   * \brief Remove some cells from an existing reporting entry in
+   *        #m_varMeasReportList.
+   * \param measId the measurement identity to be removed from
+   *               #m_varMeasReportList, must already exists there, otherwise
+   *               an error would be raised
+   * \param leavingCells the cells which are about to be removed
+   * \param reportOnLeave when true, will make the function send one last
+   *                      measurement report to eNodeB before removing it
+   *
+   * \note If a given cell is not found in the reporting entry, the function
+   *       will quietly continue.
+   * \note If the removal has removed all the cells in the reporting entry, the
+   *       function will remove the reporting entry as well.
+   * \note When time-to-trigger is enabled for this measurement identity, the
+   *       function will also remove the related trigger from the
+   *       #m_leavingTriggerQueue.
+   */
+  void VarMeasReportListErase (uint8_t measId, ConcernedCells_t leavingCells,
+                               bool reportOnLeave);
+
+  /**
+   * \brief Remove the reporting entry of the given measurement identity from
+   *        #m_varMeasReportList.
+   * \param measId the measurement identity to be removed from
+   *               #m_varMeasReportList, must already exists there, otherwise
+   *               an error would be raised
+   *
+   * Any events or triggers related with this measurement identity will be
+   * canceled as well.
+   */
+  void VarMeasReportListClear (uint8_t measId);
+
+  /**
+   * \brief Represents a measurement result from a certain cell.
+   */
   struct MeasValues
   {
-    double rsrp;
-    double rsrq;
-    Time timestamp;
+    double rsrp; ///< Measured RSRP in dBm.
+    double rsrq; ///< Measured RSRQ in dB.
+    Time timestamp; ///< Not used. \todo Should be removed.
   };
 
-  /////////cellId
+  /**
+   * \brief Internal storage of the latest measurement results from all detected
+   *        detected cells, indexed by the cell ID where the measurement was
+   *        taken from.
+   *
+   * Each *measurement result* comprises of RSRP (in dBm) and RSRQ (in dB).
+   *
+   * In IDLE mode, the measurement results are used by the *initial cell
+   * selection* procedure. While in CONNECTED mode, *layer-3 filtering* is
+   * applied to the measurement results and they are used by *UE measurements*
+   * function (LteUeRrc::MeasurementReportTriggering and
+   * LteUeRrc::SendMeasurementReport).
+   */
   std::map<uint16_t, MeasValues> m_storedMeasValues;
-  
 
-};
+  /**
+   * \brief Represents a single triggered event from a measurement identity
+   *        which reporting criteria have been fulfilled, but delayed by
+   *        time-to-trigger.
+   */
+  struct PendingTrigger_t
+  {
+    uint8_t measId; ///< The measurement identity which raised the trigger.
+    ConcernedCells_t concernedCells; ///< The list of cells responsible for this trigger.
+    EventId timer; ///< The pending reporting event, scheduled at the end of the time-to-trigger.
+  };
+
+  /**
+   * \brief List of triggers that were raised because entering condition have
+   *        been true, but are still delayed from reporting it by
+   *        time-to-trigger.
+   *
+   * The list is indexed by the measurement identity where the trigger
+   * originates from. The enclosed event will run at the end of the
+   * time-to-trigger and insert a *reporting entry* to #m_varMeasReportList.
+   */
+  std::map<uint8_t, std::list<PendingTrigger_t> > m_enteringTriggerQueue;
+
+  /**
+   * \brief List of triggers that were raised because leaving condition have
+   *        been true, but are still delayed from stopping the reporting by
+   *        time-to-trigger.
+   *
+   * The list is indexed by the measurement identity where the trigger
+   * originates from. The enclosed event will run at the end of the
+   * time-to-trigger and remove the associated *reporting entry* from
+   * #m_varMeasReportList.
+   */
+  std::map<uint8_t, std::list<PendingTrigger_t> > m_leavingTriggerQueue;
+
+  /**
+   * \brief Clear all the waiting triggers in #m_enteringTriggerQueue which are
+   *        associated with the given measurement identity.
+   * \param measId the measurement identity to be processed, must already exists
+   *               in #m_enteringTriggerQueue, otherwise an error would be
+   *               raised
+   *
+   * \note The function may conclude that there is nothing to be removed. In
+   *       this case, the function will simply ignore quietly.
+   *
+   * This function is used when the entering condition of the measurement
+   * identity becomes no longer true. Therefore all the waiting triggers for
+   * this measurement identity in #m_enteringTriggerQueue have become invalid
+   * and must be canceled.
+   *
+   * \sa LteUeRrc::m_enteringTriggerQueue
+   */
+  void CancelEnteringTrigger (uint8_t measId);
+
+  /**
+   * \brief Remove a specific cell from the waiting triggers in
+   *        #m_enteringTriggerQueue which belong to the given measurement
+   *        identity.
+   * \param measId the measurement identity to be processed, must already exists
+   *               in #m_enteringTriggerQueue, otherwise an error would be
+   *               raised
+   * \param cellId the cell ID to be removed from the waiting triggers
+   *
+   * \note The function may conclude that there is nothing to be removed. In
+   *       this case, the function will simply ignore quietly.
+   *
+   * This function is used when a specific neighbour cell no longer fulfills
+   * the entering condition of the measurement identity. Thus the cell must be
+   * removed from all the waiting triggers for this measurement identity in
+   * #m_enteringTriggerQueue.
+   *
+   * \sa LteUeRrc::m_enteringTriggerQueue
+   */
+  void CancelEnteringTrigger (uint8_t measId, uint16_t cellId);
+
+  /**
+   * \brief Clear all the waiting triggers in #m_leavingTriggerQueue which are
+   *        associated with the given measurement identity.
+   * \param measId the measurement identity to be processed, must already exists
+   *               in #m_leavingTriggerQueue, otherwise an error would be
+   *               raised
+   *
+   * \note The function may conclude that there is nothing to be removed. In
+   *       this case, the function will simply ignore quietly.
+   *
+   * This function is used when the leaving condition of the measurement
+   * identity becomes no longer true. Therefore all the waiting triggers for
+   * this measurement identity in #m_leavingTriggerQueue have become invalid
+   * and must be canceled.
+   *
+   * \sa LteUeRrc::m_leavingTriggerQueue
+   */
+  void CancelLeavingTrigger (uint8_t measId);
+
+  /**
+   * \brief Remove a specific cell from the waiting triggers in
+   *        #m_leavingTriggerQueue which belong to the given measurement
+   *        identity.
+   * \param measId the measurement identity to be processed, must already exists
+   *               in #m_leavingTriggerQueue, otherwise an error would be
+   *               raised
+   * \param cellId the cell ID to be removed from the waiting triggers
+   *
+   * \note The function may conclude that there is nothing to be removed. In
+   *       this case, the function will simply ignore quietly.
+   *
+   * This function is used when a specific neighbour cell no longer fulfills
+   * the leaving condition of the measurement identity. Thus the cell must be
+   * removed from all the waiting triggers for this measurement identity in
+   * #m_leavingTriggerQueue.
+   *
+   * \sa LteUeRrc::m_leavingTriggerQueue
+   */
+  void CancelLeavingTrigger (uint8_t measId, uint16_t cellId);
+
+}; // end of class LteUeRrc
 
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/lte/model/no-op-handover-algorithm.cc ns-3.19/src/lte/model/no-op-handover-algorithm.cc
--- ns-3.18.1/src/lte/model/no-op-handover-algorithm.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/no-op-handover-algorithm.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,98 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#include "no-op-handover-algorithm.h"
+#include <ns3/log.h>
+
+NS_LOG_COMPONENT_DEFINE ("NoOpHandoverAlgorithm");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (NoOpHandoverAlgorithm)
+  ;
+
+
+NoOpHandoverAlgorithm::NoOpHandoverAlgorithm ()
+  : m_handoverManagementSapUser (0)
+{
+  NS_LOG_FUNCTION (this);
+  m_handoverManagementSapProvider = new MemberLteHandoverManagementSapProvider<NoOpHandoverAlgorithm> (this);
+}
+
+
+NoOpHandoverAlgorithm::~NoOpHandoverAlgorithm ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+
+void
+NoOpHandoverAlgorithm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  delete m_handoverManagementSapProvider;
+}
+
+
+TypeId
+NoOpHandoverAlgorithm::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::NoOpHandoverAlgorithm")
+    .SetParent<LteHandoverAlgorithm> ()
+    .AddConstructor<NoOpHandoverAlgorithm> ()
+  ;
+  return tid;
+}
+
+
+void
+NoOpHandoverAlgorithm::SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s)
+{
+  NS_LOG_FUNCTION (this << s);
+  m_handoverManagementSapUser = s;
+}
+
+
+LteHandoverManagementSapProvider*
+NoOpHandoverAlgorithm::GetLteHandoverManagementSapProvider ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_handoverManagementSapProvider;
+}
+
+
+void
+NoOpHandoverAlgorithm::DoInitialize ()
+{
+  NS_LOG_FUNCTION (this);
+  LteHandoverAlgorithm::DoInitialize ();
+}
+
+
+void
+NoOpHandoverAlgorithm::DoReportUeMeas (uint16_t rnti,
+                                       LteRrcSap::MeasResults measResults)
+{
+  NS_LOG_FUNCTION (this << rnti << (uint16_t) measResults.measId);
+}
+
+
+} // end of namespace ns3
diff -Naur ns-3.18.1/src/lte/model/no-op-handover-algorithm.h ns-3.19/src/lte/model/no-op-handover-algorithm.h
--- ns-3.18.1/src/lte/model/no-op-handover-algorithm.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/model/no-op-handover-algorithm.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,80 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#ifndef NO_OP_HANDOVER_ALGORITHM_H
+#define NO_OP_HANDOVER_ALGORITHM_H
+
+#include <ns3/lte-handover-algorithm.h>
+#include <ns3/lte-handover-management-sap.h>
+#include <ns3/lte-rrc-sap.h>
+
+namespace ns3 {
+
+
+/**
+ * \brief Handover algorithm implementation which simply does nothing.
+ *
+ * Selecting this handover algorithm is equivalent to disabling automatic
+ * triggering of handover. This is the default choice.
+ *
+ * To enable automatic handover, please select another handover algorithm, i.e.,
+ * another child class of LteHandoverAlgorithm.
+ */
+class NoOpHandoverAlgorithm : public LteHandoverAlgorithm
+{
+public:
+  /**
+   * \brief Creates a No-op handover algorithm instance.
+   */
+  NoOpHandoverAlgorithm ();
+
+  virtual ~NoOpHandoverAlgorithm ();
+
+  // inherited from Object
+  static TypeId GetTypeId ();
+
+  // inherited from LteHandoverAlgorithm
+  virtual void SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s);
+  virtual LteHandoverManagementSapProvider* GetLteHandoverManagementSapProvider ();
+
+  // let the forwarder class access the protected and private members
+  friend class MemberLteHandoverManagementSapProvider<NoOpHandoverAlgorithm>;
+
+protected:
+  // inherited from Object
+  virtual void DoInitialize ();
+  virtual void DoDispose ();
+
+  // inherited from LteHandoverAlgorithm as a Handover Management SAP implementation
+  void DoReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults);
+
+private:
+  // Handover Management SAPs
+  LteHandoverManagementSapUser* m_handoverManagementSapUser;
+  LteHandoverManagementSapProvider* m_handoverManagementSapProvider;
+
+}; // end of class NoOpHandoverAlgorithm
+
+
+} // end of namespace ns3
+
+
+#endif /* NO_OP_HANDOVER_ALGORITHM_H */
diff -Naur ns-3.18.1/src/lte/model/pf-ff-mac-scheduler.cc ns-3.19/src/lte/model/pf-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/pf-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/pf-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -42,7 +42,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler)
+  ;
 
 
 
@@ -649,6 +650,14 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -689,7 +698,45 @@
           m_rachAllocationMap.at (i) = (*itRach).m_rnti;
         }
       rbStart = rbStart + rbLen;
-
+      
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+      
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -951,6 +998,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
 
 
   for (int i = 0; i < rbgNum; i++)
@@ -1404,12 +1461,6 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
 
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
@@ -1417,7 +1468,7 @@
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/pss-ff-mac-scheduler.cc ns-3.19/src/lte/model/pss-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/pss-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/pss-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -46,7 +46,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (PssFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (PssFfMacScheduler)
+  ;
 
 
 
@@ -678,6 +679,13 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -719,6 +727,44 @@
         }
       rbStart = rbStart + rbLen;
 
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -980,6 +1026,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
 
   std::map <uint16_t, pssFlowPerf_t>::iterator it;
   std::map <uint16_t, pssFlowPerf_t> tdUeSet; // the result of TD scheduler
@@ -1711,20 +1767,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
-
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/rem-spectrum-phy.cc ns-3.19/src/lte/model/rem-spectrum-phy.cc
--- ns-3.18.1/src/lte/model/rem-spectrum-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/rem-spectrum-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RemSpectrumPhy);
+NS_OBJECT_ENSURE_REGISTERED (RemSpectrumPhy)
+  ;
 
 RemSpectrumPhy::RemSpectrumPhy ()
   : m_mobility (0),    
diff -Naur ns-3.18.1/src/lte/model/rr-ff-mac-scheduler.cc ns-3.19/src/lte/model/rr-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/rr-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/rr-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -46,7 +46,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (RrFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (RrFfMacScheduler)
+  ;
 
 
 class RrSchedulerMemberCschedSapProvider : public FfMacCschedSapProvider
@@ -617,6 +618,13 @@
   std::set <uint16_t> rntiAllocated;
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -658,6 +666,44 @@
         }
       rbStart = rbStart + rbLen;
 
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -920,6 +966,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
   // Get the actual active flows (queue!=0)
   std::list<FfMacSchedSapProvider::SchedDlRlcBufferReqParameters>::iterator it;
   m_rlcBufferReq.sort (SortRlcBufferReq);
@@ -1249,19 +1305,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/tdbet-ff-mac-scheduler.cc ns-3.19/src/lte/model/tdbet-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/tdbet-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/tdbet-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,7 +43,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (TdBetFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (TdBetFfMacScheduler)
+  ;
 
 
 
@@ -650,6 +651,13 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -691,6 +699,44 @@
         }
       rbStart = rbStart + rbLen;
 
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -952,6 +998,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
 
   std::map <uint16_t, tdbetsFlowPerf_t>::iterator it;
   std::map <uint16_t, tdbetsFlowPerf_t>::iterator itMax = m_flowStatsDl.end ();
@@ -1304,20 +1360,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
-
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/tdmt-ff-mac-scheduler.cc ns-3.19/src/lte/model/tdmt-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/tdmt-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/tdmt-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,7 +43,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (TdMtFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (TdMtFfMacScheduler)
+  ;
 
 
 
@@ -639,6 +640,13 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -680,6 +688,44 @@
         }
       rbStart = rbStart + rbLen;
 
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -941,6 +987,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
 
   std::set <uint16_t>::iterator it;
   std::set <uint16_t>::iterator itMax = m_flowStatsDl.end ();
@@ -1301,20 +1357,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
-
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/tdtbfq-ff-mac-scheduler.cc ns-3.19/src/lte/model/tdtbfq-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/tdtbfq-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/tdtbfq-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -44,7 +44,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (TdTbfqFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (TdTbfqFfMacScheduler)
+  ;
 
 
 
@@ -694,6 +695,13 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -735,6 +743,44 @@
         }
       rbStart = rbStart + rbLen;
 
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -996,6 +1042,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
 
   // update token pool, counter and bank size
   std::map <uint16_t, tdtbfqsFlowPerf_t>::iterator itStats;
@@ -1398,20 +1454,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
-
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/model/trace-fading-loss-model.cc ns-3.19/src/lte/model/trace-fading-loss-model.cc
--- ns-3.18.1/src/lte/model/trace-fading-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/trace-fading-loss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TraceFadingLossModel);
+NS_OBJECT_ENSURE_REGISTERED (TraceFadingLossModel)
+  ;
   
 
 
diff -Naur ns-3.18.1/src/lte/model/trace-fading-loss-model.h ns-3.19/src/lte/model/trace-fading-loss-model.h
--- ns-3.18.1/src/lte/model/trace-fading-loss-model.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/trace-fading-loss-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -69,14 +69,12 @@
   
 private:
   /**
-   * @param txPower set of values vs frequency representing the
-   * transmission power. See SpectrumChannel for details.
-   *
-   * @param a sender mobility
-   * @param b receiver mobility
-   *
-   * @return set of values vs frequency representing the received
-   * power in the same units used for the txPower parameter.
+   * \param txPsd set of values vs frequency representing the
+   *              transmission power. See SpectrumChannel for details.
+   * \param a sender mobility
+   * \param b receiver mobility
+   * \return set of values vs frequency representing the received
+   *         power in the same units used for the txPsd parameter.
    */
   Ptr<SpectrumValue> DoCalcRxPowerSpectralDensity (Ptr<const SpectrumValue> txPsd,
                                                    Ptr<const MobilityModel> a,
diff -Naur ns-3.18.1/src/lte/model/tta-ff-mac-scheduler.cc ns-3.19/src/lte/model/tta-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/model/tta-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/model/tta-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,7 +43,8 @@
 };  // see table 7.1.6.1-1 of 36.213
 
 
-NS_OBJECT_ENSURE_REGISTERED (TtaFfMacScheduler);
+NS_OBJECT_ENSURE_REGISTERED (TtaFfMacScheduler)
+  ;
 
 
 
@@ -639,6 +640,13 @@
   rbgMap.resize (m_cschedCellConfig.m_dlBandwidth / rbgSize, false);
   FfMacSchedSapUser::SchedDlConfigIndParameters ret;
 
+  //   update UL HARQ proc id
+  std::map <uint16_t, uint8_t>::iterator itProcId;
+  for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
+    {
+      (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
+    }
+
   // RACH Allocation
   m_rachAllocationMap.resize (m_cschedCellConfig.m_ulBandwidth, 0);
   uint16_t rbStart = 0;
@@ -680,6 +688,44 @@
         }
       rbStart = rbStart + rbLen;
 
+      if (m_harqOn == true)
+        {
+          // generate UL-DCI for HARQ retransmissions
+          UlDciListElement_s uldci;
+          uldci.m_rnti = newRar.m_rnti;
+          uldci.m_rbLen = rbLen;
+          uldci.m_rbStart = rbStart;
+          uldci.m_mcs = m_ulGrantMcs;
+          uldci.m_tbSize = tbSizeBits / 8;
+          uldci.m_ndi = 1;
+          uldci.m_cceIndex = 0;
+          uldci.m_aggrLevel = 1;
+          uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF
+          uldci.m_hopping = false;
+          uldci.m_n2Dmrs = 0;
+          uldci.m_tpc = 0; // no power control
+          uldci.m_cqiRequest = false; // only period CQI at this stage
+          uldci.m_ulIndex = 0; // TDD parameter
+          uldci.m_dai = 1; // TDD parameter
+          uldci.m_freqHopping = 0;
+          uldci.m_pdcchPowerOffset = 0; // not used
+
+          uint8_t harqId = 0;
+          std::map <uint16_t, uint8_t>::iterator itProcId;
+          itProcId = m_ulHarqCurrentProcessId.find (uldci.m_rnti);
+          if (itProcId == m_ulHarqCurrentProcessId.end ())
+            {
+              NS_FATAL_ERROR ("No info find in HARQ buffer for UE " << uldci.m_rnti);
+            }
+          harqId = (*itProcId).second;
+          std::map <uint16_t, UlHarqProcessesDciBuffer_t>::iterator itDci = m_ulHarqProcessesDciBuffer.find (uldci.m_rnti);
+          if (itDci == m_ulHarqProcessesDciBuffer.end ())
+            {
+              NS_FATAL_ERROR ("Unable to find RNTI entry in UL DCI HARQ buffer for RNTI " << uldci.m_rnti);
+            }
+          (*itDci).second.at (harqId) = uldci;
+        }
+
       ret.m_buildRarList.push_back (newRar);
     }
   m_rachList.clear ();
@@ -941,6 +987,16 @@
   m_dlInfoListBuffered.clear ();
   m_dlInfoListBuffered = dlInfoListUntxed;
 
+  if (rbgAllocatedNum == rbgNum)
+    {
+      // all the RBGs are already allocated -> exit
+      if ((ret.m_buildDataList.size () > 0) || (ret.m_buildRarList.size () > 0))
+        {
+          m_schedSapUser->SchedDlConfigInd (ret);
+        }
+      return;
+    }
+
 
 
   for (int i = 0; i < rbgNum; i++)
@@ -1380,20 +1436,13 @@
   if (m_harqOn == true)
     {
       //   Process UL HARQ feedback
-      //   update UL HARQ proc id
-      std::map <uint16_t, uint8_t>::iterator itProcId;
-      for (itProcId = m_ulHarqCurrentProcessId.begin (); itProcId != m_ulHarqCurrentProcessId.end (); itProcId++)
-        {
-          (*itProcId).second = ((*itProcId).second + 1) % HARQ_PROC_NUM;
-        }
-
       for (uint16_t i = 0; i < params.m_ulInfoList.size (); i++)
         {        
           if (params.m_ulInfoList.at (i).m_receptionStatus == UlInfoListElement_s::NotOk)
             {
               // retx correspondent block: retrieve the UL-DCI
               uint16_t rnti = params.m_ulInfoList.at (i).m_rnti;
-              itProcId = m_ulHarqCurrentProcessId.find (rnti);
+              std::map <uint16_t, uint8_t>::iterator itProcId = m_ulHarqCurrentProcessId.find (rnti);
               if (itProcId == m_ulHarqCurrentProcessId.end ())
                 {
                   NS_LOG_ERROR ("No info find in HARQ buffer for UE (might change eNB) " << rnti);
diff -Naur ns-3.18.1/src/lte/test/epc-test-s1u-downlink.cc ns-3.19/src/lte/test/epc-test-s1u-downlink.cc
--- ns-3.18.1/src/lte/test/epc-test-s1u-downlink.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/epc-test-s1u-downlink.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,7 @@
 #include "ns3/simulator.h"
 #include "ns3/log.h"
 #include "ns3/test.h"
-#include "ns3/epc-helper.h"
+#include "ns3/point-to-point-epc-helper.h"
 #include "ns3/epc-enb-application.h"
 #include "ns3/packet-sink-helper.h"
 #include "ns3/udp-echo-helper.h"
@@ -44,7 +44,8 @@
 namespace ns3 {
 
 
-NS_LOG_COMPONENT_DEFINE ("EpcTestS1uDownlink");
+NS_LOG_COMPONENT_DEFINE ("EpcTestS1uDownlink")
+  ;
 
 
 
@@ -97,7 +98,7 @@
 void 
 EpcS1uDlTestCase::DoRun ()
 {
-  Ptr<EpcHelper> epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
   Ptr<Node> pgw = epcHelper->GetPgwNode ();
 
   // allow jumbo packets
diff -Naur ns-3.18.1/src/lte/test/epc-test-s1u-uplink.cc ns-3.19/src/lte/test/epc-test-s1u-uplink.cc
--- ns-3.18.1/src/lte/test/epc-test-s1u-uplink.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/epc-test-s1u-uplink.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,7 @@
 #include "ns3/simulator.h"
 #include "ns3/log.h"
 #include "ns3/test.h"
-#include "ns3/epc-helper.h"
+#include "ns3/point-to-point-epc-helper.h"
 #include "ns3/epc-enb-application.h"
 #include "ns3/packet-sink-helper.h"
 #include "ns3/point-to-point-helper.h"
@@ -52,7 +52,8 @@
 
 
 
-NS_LOG_COMPONENT_DEFINE ("EpcTestS1uUplink");
+NS_LOG_COMPONENT_DEFINE ("EpcTestS1uUplink")
+  ;
 
 /*
  * A Udp client. Sends UDP packet carrying sequence number and time
@@ -293,7 +294,7 @@
 void 
 EpcS1uUlTestCase::DoRun ()
 {
-  Ptr<EpcHelper> epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
   Ptr<Node> pgw = epcHelper->GetPgwNode ();
 
   // allow jumbo packets
diff -Naur ns-3.18.1/src/lte/test/lte-simple-helper.cc ns-3.19/src/lte/test/lte-simple-helper.cc
--- ns-3.18.1/src/lte/test/lte-simple-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-simple-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper);
+NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper)
+  ;
 
 LteSimpleHelper::LteSimpleHelper (void)
 {
diff -Naur ns-3.18.1/src/lte/test/lte-simple-net-device.cc ns-3.19/src/lte/test/lte-simple-net-device.cc
--- ns-3.18.1/src/lte/test/lte-simple-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-simple-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (LteSimpleNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (LteSimpleNetDevice)
+  ;
 
 
 TypeId LteSimpleNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/lte/test/lte-test-cell-selection.cc ns-3.19/src/lte/test/lte-test-cell-selection.cc
--- ns-3.18.1/src/lte/test/lte-test-cell-selection.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-cell-selection.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,431 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#include "lte-test-cell-selection.h"
+
+#include <ns3/simulator.h>
+#include <ns3/log.h>
+#include <ns3/boolean.h>
+#include <ns3/double.h>
+#include <ns3/integer.h>
+
+#include <ns3/mobility-helper.h>
+#include <ns3/lte-helper.h>
+#include <ns3/point-to-point-epc-helper.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/point-to-point-helper.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/ipv4-static-routing-helper.h>
+
+#include <ns3/node-container.h>
+#include <ns3/net-device-container.h>
+#include <ns3/ipv4-interface-container.h>
+
+#include <ns3/lte-ue-net-device.h>
+#include <ns3/lte-ue-rrc.h>
+#include <ns3/lte-enb-net-device.h>
+
+NS_LOG_COMPONENT_DEFINE ("LteCellSelectionTest");
+
+namespace ns3 {
+
+
+/*
+ * Test Suite
+ */
+
+
+LteCellSelectionTestSuite::LteCellSelectionTestSuite ()
+  : TestSuite ("lte-cell-selection", SYSTEM)
+{
+  std::vector<LteCellSelectionTestCase::UeSetup_t> w;
+
+  // REAL RRC PROTOCOL
+
+  w.clear ();
+  //                                                x     y    csgMember
+  //                                                checkPoint     cell1, cell2
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (0.0, 0.55, false,
+                                                    MilliSeconds (283), 1, 0));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (0.0, 0.45, false,
+                                                    MilliSeconds (283), 1, 0));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (0.5, 0.45, false,
+                                                    MilliSeconds (363), 1, 3));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (0.5, 0.0,  true,
+                                                    MilliSeconds (283), 2, 4));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (1.0, 0.55, true,
+                                                    MilliSeconds (283), 3, 0));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (1.0, 0.45, true,
+                                                    MilliSeconds (283), 4, 0));
+
+  AddTestCase (new LteCellSelectionTestCase ("EPC, real RRC, RngNum=1",
+                                             true, false, 60.0, w, 1),
+               //                                        isd       rngrun
+               TestCase::QUICK);
+
+  // IDEAL RRC PROTOCOL
+
+  w.clear ();
+  //                                                x     y    csgMember
+  //                                                checkPoint     cell1, cell2
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (0.0, 0.55, false,
+                                                    MilliSeconds (266), 1, 0));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (0.0, 0.45, false,
+                                                    MilliSeconds (266), 1, 0));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (0.5, 0.45, false,
+                                                    MilliSeconds (346), 1, 3));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (0.5, 0.0,  true,
+                                                    MilliSeconds (266), 2, 4));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (1.0, 0.55, true,
+                                                    MilliSeconds (266), 3, 0));
+  w.push_back (LteCellSelectionTestCase::UeSetup_t (1.0, 0.45, true,
+                                                    MilliSeconds (266), 4, 0));
+
+  AddTestCase (new LteCellSelectionTestCase ("EPC, ideal RRC, RngNum=1",
+                                             true, true, 60.0, w, 1),
+               //                                        isd      rngrun
+               TestCase::QUICK);
+
+} // end of LteCellSelectionTestSuite::LteCellSelectionTestSuite ()
+
+
+static LteCellSelectionTestSuite g_lteCellSelectionTestSuite;
+
+
+
+/*
+ * Test Case
+ */
+
+
+LteCellSelectionTestCase::UeSetup_t::UeSetup_t (
+  double relPosX, double relPosY, bool isCsgMember, Time checkPoint,
+  uint16_t expectedCellId1, uint16_t expectedCellId2)
+  : position (Vector (relPosX, relPosY, 0.0)),
+    isCsgMember (isCsgMember),
+    checkPoint (checkPoint),
+    expectedCellId1 (expectedCellId1),
+    expectedCellId2 (expectedCellId2)
+{
+}
+
+
+LteCellSelectionTestCase::LteCellSelectionTestCase (
+  std::string name, bool isEpcMode, bool isIdealRrc,
+  double interSiteDistance,
+  std::vector<UeSetup_t> ueSetupList, int64_t rngRun)
+  : TestCase (name),
+    m_isEpcMode (isEpcMode),
+    m_isIdealRrc (isIdealRrc),
+    m_interSiteDistance (interSiteDistance),
+    m_ueSetupList (ueSetupList),
+    m_rngRun (rngRun)
+{
+  NS_LOG_FUNCTION (this << GetName ());
+  m_lastState.resize (m_ueSetupList.size (), LteUeRrc::NUM_STATES);
+}
+
+
+LteCellSelectionTestCase::~LteCellSelectionTestCase ()
+{
+  NS_LOG_FUNCTION (this << GetName ());
+}
+
+
+void
+LteCellSelectionTestCase::DoRun ()
+{
+  NS_LOG_FUNCTION (this << GetName ());
+
+  Config::SetGlobal ("RngRun", IntegerValue (m_rngRun));
+
+  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+  lteHelper->SetAttribute ("PathlossModel",
+                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (m_isIdealRrc));
+
+  Ptr<PointToPointEpcHelper> epcHelper;
+
+  if (m_isEpcMode)
+    {
+      epcHelper = CreateObject<PointToPointEpcHelper> ();
+      lteHelper->SetEpcHelper (epcHelper);
+    }
+
+  /*
+   * The topology is the following (the number on the node indicate the cell ID)
+   *
+   *      [1]        [3]
+   *    non-CSG -- non-CSG
+   *       |          |
+   *       |          | 60 m
+   *       |          |
+   *      [2]        [4]
+   *      CSG ------ CSG
+   *           60 m
+   */
+
+  // Create Nodes
+  NodeContainer enbNodes;
+  enbNodes.Create (4);
+  NodeContainer ueNodes;
+  uint16_t nUe = m_ueSetupList.size ();
+  ueNodes.Create (nUe);
+
+  // Assign nodes to position
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+  // eNodeB
+  positionAlloc->Add (Vector (                0.0, m_interSiteDistance, 0.0));
+  positionAlloc->Add (Vector (                0.0,                 0.0, 0.0));
+  positionAlloc->Add (Vector (m_interSiteDistance, m_interSiteDistance, 0.0));
+  positionAlloc->Add (Vector (m_interSiteDistance,                 0.0, 0.0));
+  // UE
+  std::vector<UeSetup_t>::const_iterator itSetup;
+  for (itSetup = m_ueSetupList.begin ();
+       itSetup != m_ueSetupList.end (); itSetup++)
+    {
+      Vector uePos (m_interSiteDistance * itSetup->position.x,
+                    m_interSiteDistance * itSetup->position.y,
+                    m_interSiteDistance * itSetup->position.z);
+      NS_LOG_INFO ("UE position " << uePos);
+      positionAlloc->Add (uePos);
+    }
+
+  MobilityHelper mobility;
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.SetPositionAllocator (positionAlloc);
+  mobility.Install (enbNodes);
+  mobility.Install (ueNodes);
+
+  // Create Devices and install them in the Nodes (eNB and UE)
+  int64_t stream = 1;
+  NetDeviceContainer enbDevs;
+
+  // cell ID 1 is a non-CSG cell
+  lteHelper->SetEnbDeviceAttribute ("CsgId", UintegerValue (0));
+  lteHelper->SetEnbDeviceAttribute ("CsgIndication", BooleanValue (false));
+  enbDevs.Add (lteHelper->InstallEnbDevice (enbNodes.Get (0)));
+
+  // cell ID 2 is a CSG cell
+  lteHelper->SetEnbDeviceAttribute ("CsgId", UintegerValue (1));
+  lteHelper->SetEnbDeviceAttribute ("CsgIndication", BooleanValue (true));
+  enbDevs.Add (lteHelper->InstallEnbDevice (enbNodes.Get (1)));
+
+  // cell ID 3 is a non-CSG cell
+  lteHelper->SetEnbDeviceAttribute ("CsgId", UintegerValue (0));
+  lteHelper->SetEnbDeviceAttribute ("CsgIndication", BooleanValue (false));
+  enbDevs.Add (lteHelper->InstallEnbDevice (enbNodes.Get (2)));
+
+  // cell ID 4 is a CSG cell
+  lteHelper->SetEnbDeviceAttribute ("CsgId", UintegerValue (1));
+  lteHelper->SetEnbDeviceAttribute ("CsgIndication", BooleanValue (true));
+  enbDevs.Add (lteHelper->InstallEnbDevice (enbNodes.Get (3)));
+
+  NetDeviceContainer ueDevs;
+  Time lastCheckPoint = MilliSeconds (0);
+  NS_ASSERT (m_ueSetupList.size () == ueNodes.GetN ());
+  NodeContainer::Iterator itNode;
+  for (itSetup = m_ueSetupList.begin (), itNode = ueNodes.Begin ();
+       itSetup != m_ueSetupList.end () || itNode != ueNodes.End ();
+       itSetup++, itNode++)
+    {
+      if (itSetup->isCsgMember)
+        {
+          lteHelper->SetUeDeviceAttribute ("CsgId", UintegerValue (1));
+        }
+      else
+        {
+          lteHelper->SetUeDeviceAttribute ("CsgId", UintegerValue (0));
+        }
+
+      NetDeviceContainer devs = lteHelper->InstallUeDevice (*itNode);
+      Ptr<LteUeNetDevice> ueDev = devs.Get (0)->GetObject<LteUeNetDevice> ();
+      NS_ASSERT (ueDev != 0);
+      ueDevs.Add (devs);
+      Simulator::Schedule (itSetup->checkPoint,
+                           &LteCellSelectionTestCase::CheckPoint,
+                           this, ueDev,
+                           itSetup->expectedCellId1, itSetup->expectedCellId2);
+
+      if (lastCheckPoint < itSetup->checkPoint)
+        {
+          lastCheckPoint = itSetup->checkPoint;
+        }
+    }
+
+  stream += lteHelper->AssignStreams (enbDevs, stream);
+  stream += lteHelper->AssignStreams (ueDevs, stream);
+
+  // Tests
+  NS_ASSERT (m_ueSetupList.size () == ueDevs.GetN ());
+  NetDeviceContainer::Iterator itDev;
+  for (itSetup = m_ueSetupList.begin (), itDev = ueDevs.Begin ();
+       itSetup != m_ueSetupList.end () || itDev != ueDevs.End ();
+       itSetup++, itDev++)
+    {
+      Ptr<LteUeNetDevice> ueDev = (*itDev)->GetObject<LteUeNetDevice> ();
+    }
+
+  if (m_isEpcMode)
+    {
+      // Create P-GW node
+      Ptr<Node> pgw = epcHelper->GetPgwNode ();
+
+      // Create a single RemoteHost
+      NodeContainer remoteHostContainer;
+      remoteHostContainer.Create (1);
+      Ptr<Node> remoteHost = remoteHostContainer.Get (0);
+      InternetStackHelper internet;
+      internet.Install (remoteHostContainer);
+
+      // Create the Internet
+      PointToPointHelper p2ph;
+      p2ph.SetDeviceAttribute ("DataRate", DataRateValue (DataRate ("100Gb/s")));
+      p2ph.SetDeviceAttribute ("Mtu", UintegerValue (1500));
+      p2ph.SetChannelAttribute ("Delay", TimeValue (Seconds (0.010)));
+      NetDeviceContainer internetDevices = p2ph.Install (pgw, remoteHost);
+      Ipv4AddressHelper ipv4h;
+      ipv4h.SetBase ("1.0.0.0", "255.0.0.0");
+      Ipv4InterfaceContainer internetIpIfaces = ipv4h.Assign (internetDevices);
+
+      // Routing of the Internet Host (towards the LTE network)
+      Ipv4StaticRoutingHelper ipv4RoutingHelper;
+      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());
+      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);
+
+      // Install the IP stack on the UEs
+      internet.Install (ueNodes);
+      Ipv4InterfaceContainer ueIpIfaces;
+      ueIpIfaces = epcHelper->AssignUeIpv4Address (NetDeviceContainer (ueDevs));
+
+      // Assign IP address to UEs
+      for (uint32_t u = 0; u < ueNodes.GetN (); ++u)
+        {
+          Ptr<Node> ueNode = ueNodes.Get (u);
+          // Set the default gateway for the UE
+          Ptr<Ipv4StaticRouting> ueStaticRouting = ipv4RoutingHelper.GetStaticRouting (ueNode->GetObject<Ipv4> ());
+          ueStaticRouting->SetDefaultRoute (epcHelper->GetUeDefaultGatewayAddress (), 1);
+        }
+
+    } // end of if (m_isEpcMode)
+  else
+    {
+      NS_FATAL_ERROR ("No support yet for LTE-only simulations");
+    }
+
+  // Connect to trace sources in UEs
+  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/StateTransition",
+                   MakeCallback (&LteCellSelectionTestCase::StateTransitionCallback,
+                                 this));
+  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/InitialCellSelectionEndOk",
+                   MakeCallback (&LteCellSelectionTestCase::InitialCellSelectionEndOkCallback,
+                                 this));
+  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/InitialCellSelectionEndError",
+                   MakeCallback (&LteCellSelectionTestCase::InitialCellSelectionEndErrorCallback,
+                                 this));
+  Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/ConnectionEstablished",
+                   MakeCallback (&LteCellSelectionTestCase::ConnectionEstablishedCallback,
+                                 this));
+
+  // Enable Idle mode cell selection
+  lteHelper->Attach (ueDevs);
+
+  // Run simulation
+  Simulator::Stop (lastCheckPoint);
+  Simulator::Run ();
+
+  NS_LOG_INFO ("Simulation ends");
+  Simulator::Destroy ();
+
+} // end of void LteCellSelectionTestCase::DoRun ()
+
+
+void
+LteCellSelectionTestCase::CheckPoint (Ptr<LteUeNetDevice> ueDev,
+                                      uint16_t expectedCellId1,
+                                      uint16_t expectedCellId2)
+{
+  uint16_t actualCellId = ueDev->GetRrc ()->GetCellId ();
+
+  if (expectedCellId2 == 0)
+    {
+      NS_TEST_ASSERT_MSG_EQ (actualCellId, expectedCellId1,
+                             "IMSI " << ueDev->GetImsi ()
+                                     << " has attached to an unexpected cell");
+    }
+  else
+    {
+      bool pass = (actualCellId == expectedCellId1) ||
+        (actualCellId == expectedCellId2);
+      NS_TEST_ASSERT_MSG_EQ (pass, true,
+                             "IMSI " << ueDev->GetImsi ()
+                                     << " has attached to an unexpected cell"
+                                     << " (actual: " << actualCellId << ","
+                                     << " expected: " << expectedCellId1
+                                     << " or " << expectedCellId2 << ")");
+    }
+
+  if (expectedCellId1 > 0)
+    {
+      NS_TEST_ASSERT_MSG_EQ (m_lastState.at (ueDev->GetImsi () - 1),
+                             LteUeRrc::CONNECTED_NORMALLY,
+                             "UE " << ueDev->GetImsi ()
+                                   << " is not at CONNECTED_NORMALLY state");
+    }
+}
+
+
+void
+LteCellSelectionTestCase::StateTransitionCallback (
+  std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti,
+  LteUeRrc::State oldState, LteUeRrc::State newState)
+{
+  NS_LOG_FUNCTION (this << imsi << cellId << rnti << oldState << newState);
+  m_lastState.at (imsi - 1) = newState;
+}
+
+
+void
+LteCellSelectionTestCase::InitialCellSelectionEndOkCallback (
+  std::string context, uint64_t imsi, uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << imsi << cellId);
+}
+
+
+void
+LteCellSelectionTestCase::InitialCellSelectionEndErrorCallback (
+  std::string context, uint64_t imsi, uint16_t cellId)
+{
+  NS_LOG_FUNCTION (this << imsi << cellId);
+}
+
+
+void
+LteCellSelectionTestCase::ConnectionEstablishedCallback (
+  std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti)
+{
+  NS_LOG_FUNCTION (this << imsi << cellId << rnti);
+}
+
+
+
+} // end of namespace ns3
diff -Naur ns-3.18.1/src/lte/test/lte-test-cell-selection.h ns-3.19/src/lte/test/lte-test-cell-selection.h
--- ns-3.18.1/src/lte/test/lte-test-cell-selection.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-cell-selection.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,130 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#ifndef LTE_TEST_CELL_SELECTION_H
+#define LTE_TEST_CELL_SELECTION_H
+
+#include <ns3/test.h>
+#include <ns3/nstime.h>
+#include <ns3/node-container.h>
+#include <ns3/vector.h>
+#include <ns3/lte-ue-rrc.h>
+#include <vector>
+
+namespace ns3 {
+
+
+/**
+ * \brief Test suite for executing the cell selection test cases in without-EPC
+ *        and with-EPC scenarios.
+ *
+ * \sa ns3::LteCellSelectionTestCase
+ */
+class LteCellSelectionTestSuite : public TestSuite
+{
+public:
+  LteCellSelectionTestSuite ();
+};
+
+
+
+class LteUeNetDevice;
+
+/**
+ * \brief Testing the initial cell selection procedure by UE at IDLE state in
+ *        the beginning of simulation.
+ */
+class LteCellSelectionTestCase : public TestCase
+{
+public:
+  /**
+   * \brief A set of input parameters for setting up a UE in the simulation.
+   */
+  struct UeSetup_t
+  {
+    Vector position; ///< The position, relative to the inter site distance, where the UE will be spawned in the simulation.
+    bool isCsgMember; ///< Whether UE is allowed access to CSG cell.
+    Time checkPoint; ///< The time in simulation when the UE is verified by the test script.
+    uint16_t expectedCellId1; ///< The cell ID that the UE is expected to attach to (0 means that the UE should not attach to any cell).
+    uint16_t expectedCellId2; ///< An alternative cell ID that the UE is expected to attach to (0 means that this no alternative cell is expected).
+    UeSetup_t (double relPosX, double relPosY, bool isCsgMember, Time checkPoint,
+               uint16_t expectedCellId1, uint16_t expectedCellId2);
+  };
+
+  /**
+   * \brief Creates an instance of the initial cell selection test case.
+   * \param name name of this test
+   * \param isEpcMode set to true for setting up simulation with EPC enabled
+   * \param isIdealRrc if true, simulation uses Ideal RRC protocol, otherwise
+   *                   simulation uses Real RRC protocol
+   * \param interSiteDistance the distance between eNodeB in meters
+   * \param ueSetupList a list of UE configuration to be installed in the
+   *                    simulation
+   * \param rngRun the number of run to be used by the random number generator
+   */
+  LteCellSelectionTestCase (std::string name, bool isEpcMode, bool isIdealRrc,
+                            double interSiteDistance,
+                            std::vector<UeSetup_t> ueSetupList,
+                            int64_t rngRun);
+
+  virtual ~LteCellSelectionTestCase ();
+
+private:
+  /**
+   * \brief Setup the simulation according to the configuration set by the
+   *        class constructor, run it, and verify the result.
+   */
+  virtual void DoRun ();
+
+  /**
+   * \brief Verifies if the given UE is attached to either of the given two
+   *        cells and in a CONNECTED_NORMALLY state.
+   */
+  void CheckPoint (Ptr<LteUeNetDevice> ueDev, uint16_t expectedCellId1,
+                   uint16_t expectedCellId2);
+
+  void StateTransitionCallback (std::string context, uint64_t imsi,
+                                uint16_t cellId, uint16_t rnti,
+                                LteUeRrc::State oldState, LteUeRrc::State newState);
+  void InitialCellSelectionEndOkCallback (std::string context, uint64_t imsi,
+                                          uint16_t cellId);
+  void InitialCellSelectionEndErrorCallback (std::string context, uint64_t imsi,
+                                             uint16_t cellId);
+  void ConnectionEstablishedCallback (std::string context, uint64_t imsi,
+                                      uint16_t cellId, uint16_t rnti);
+
+  bool m_isEpcMode;
+  bool m_isIdealRrc;
+  double m_interSiteDistance;
+  std::vector<UeSetup_t> m_ueSetupList;
+  int64_t m_rngRun;
+
+  /// The current UE RRC state.
+  std::vector<LteUeRrc::State> m_lastState;
+
+}; // end of class LteCellSelectionTestCase
+
+
+
+} // end of namespace ns3
+
+
+#endif /* LTE_TEST_CELL_SELECTION_H */
diff -Naur ns-3.18.1/src/lte/test/lte-test-entities.cc ns-3.19/src/lte/test/lte-test-entities.cc
--- ns-3.18.1/src/lte/test/lte-test-entities.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-entities.cc	2013-12-20 09:44:50.000000000 -0800
@@ -608,7 +608,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (EpcTestRrc);
+NS_OBJECT_ENSURE_REGISTERED (EpcTestRrc)
+  ;
 
 EpcTestRrc::EpcTestRrc ()
   : m_s1SapProvider (0)
diff -Naur ns-3.18.1/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc ns-3.19/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -49,7 +49,7 @@
 #include <ns3/boolean.h>
 #include <ns3/enum.h>
 
-#include "ns3/epc-helper.h"
+#include "ns3/point-to-point-epc-helper.h"
 #include "ns3/network-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
 #include "ns3/internet-module.h"
@@ -267,7 +267,7 @@
   Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (true));
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper>  epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper>  epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
 
   //LogComponentEnable ("FdTbfqFfMacScheduler", LOG_DEBUG);
@@ -515,7 +515,7 @@
 
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper>  epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper>  epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
 
   Ptr<Node> pgw = epcHelper->GetPgwNode ();
diff -Naur ns-3.18.1/src/lte/test/lte-test-pathloss-model.cc ns-3.19/src/lte/test/lte-test-pathloss-model.cc
--- ns-3.18.1/src/lte/test/lte-test-pathloss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-pathloss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -78,8 +78,6 @@
 LtePathlossModelTestSuite::LtePathlossModelTestSuite ()
   : TestSuite ("lte-pathloss-model", SYSTEM)
 {
- 
-  
   // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);
   // LogComponentEnable ("LteHelper", logLevel);
   // LogComponentEnable ("LtePathlossModelTest", logLevel);
@@ -214,10 +212,10 @@
   lteHelper->EnableRlcTraces ();
   lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::HybridBuildingsPropagationLossModel"));
 
-  // set frequency. This is important because it changes the behavior of the pathloss model
+  // set frequency. This is important because it changes the behavior of the path loss model
   lteHelper->SetEnbDeviceAttribute ("DlEarfcn", UintegerValue (200));
+  lteHelper->SetUeDeviceAttribute ("DlEarfcn", UintegerValue (200));
 
-  
   // remove shadowing component
   lteHelper->SetPathlossModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0));
   lteHelper->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));
@@ -263,7 +261,6 @@
   // Attach a UE to a eNB
   lteHelper->Attach (ueDevs, enbDevs.Get (0));
 
-  
   // Activate an EPS bearer
   enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
   EpsBearer bearer (q);
diff -Naur ns-3.18.1/src/lte/test/lte-test-phy-error-model.cc ns-3.19/src/lte/test/lte-test-phy-error-model.cc
--- ns-3.18.1/src/lte/test/lte-test-phy-error-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-phy-error-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -46,76 +46,111 @@
 #include <ns3/config.h>
 #include <ns3/boolean.h>
 #include <ns3/enum.h>
+#include <ns3/integer.h>
 #include <ns3/unused.h>
 #include <ns3/ff-mac-scheduler.h>
 #include <ns3/buildings-helper.h>
 
 #include "lte-test-phy-error-model.h"
 
-NS_LOG_COMPONENT_DEFINE ("LenaTestPhyErrorModel");
+NS_LOG_COMPONENT_DEFINE ("LteTestPhyErrorModel");
 
 namespace ns3 {
 
 
-LenaTestPhyErrorModelrSuite::LenaTestPhyErrorModelrSuite ()
+LenaTestPhyErrorModelSuite::LenaTestPhyErrorModelSuite ()
   : TestSuite ("lte-phy-error-model", SYSTEM)
 {
   NS_LOG_INFO ("creating LenaTestPhyErrorModelTestCase");
   
   
-  // Tests on DL Control Channels (PCFICH+PDDCH)
-  // 1 interfering eNB SINR -2.0 BLER 0.007 TB size 217
-  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (2, 1078, 217, 0.007), TestCase::QUICK);
-  // 2 interfering eNBs SINR -4.0 BLER 0.037 TB size 217
-  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (3, 1040, 217, 0.045), TestCase::EXTENSIVE);
-  // 3 interfering eNBs SINR -6.0 BLER 0.21 TB size 133
-  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (4, 1250, 133, 0.206), TestCase::EXTENSIVE);
-  // 4 interfering eNBs SINR -7.0 BLER 0.34 TB size 133
-  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (5, 1260, 81, 0.343), TestCase::EXTENSIVE);
-
-  // Tests on DL Data channels (PDSCH)
-  // the tolerance is calculated with the following octave code:
-  //
-  // n =  1000;
-  // for p=1-[0.33 0.11 0.2 0.3 0.55 0.14]
-  //    tol = n*p - binoinv(0.005, n, p)
-  // endfor
-
-  // MCS 2 TB size of 256 bits BLER 0.33 SINR -5.51
-  AddTestCase (new LenaDataPhyErrorModelTestCase (4, 1800, 32, 0.33, 39), TestCase::QUICK);
-// MCS 2 TB size of 528 bits BLER 0.11 SINR -5.51
-  AddTestCase (new LenaDataPhyErrorModelTestCase (2, 1800, 66, 0.11, 26), TestCase::EXTENSIVE);
-// MCS 2 TB size of 1088 bits BLER 0.02 SINR -5.51
-  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 1800, 136, 0.02, 33), TestCase::EXTENSIVE);
-  // MCS 12 TB size of 4800 bits  BLER 0.3  SINR 4.43
-  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 600, 600, 0.3, 38), TestCase::EXTENSIVE);
-// MCS 12 TB size of 1632 bits  BLER 0.55  SINR 4.43
-  AddTestCase (new LenaDataPhyErrorModelTestCase (3, 600, 204, 0.55, 40), TestCase::EXTENSIVE);
-// MCS 16 TB size of 7272 bits (3648 x 3584) BLER 0.14 SINR 8.48
-// BLER 0.14 = 1 - ((1-0.075)*(1-0.075))
-  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 470, 781, 0.14, 29), TestCase::EXTENSIVE);
+  for (uint32_t rngRun = 1; rngRun <= 3; ++rngRun)
+    {
+
+      // Tests on DL Control Channels (PCFICH+PDCCH)
+      // the tolerance is calculated with the following octave code:
+      //
+      // n =  1000; # TX packets
+      // for p=1-[0.007 0.045 0.206 0.343]
+      //    tol = n*p - binoinv(0.001, n, p)
+      // endfor
+
+      // 1 interfering eNB SINR -2.0 BLER 0.007 TB size 217
+      AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (2, 1078, 0.007, 9,
+                                                        Seconds (0.04), rngRun),
+                   (rngRun == 1) ? TestCase::QUICK : TestCase::TAKES_FOREVER);
+      // 2 interfering eNBs SINR -4.0 BLER 0.037 TB size 217
+      AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (3, 1040, 0.045, 21,
+                                                        Seconds (0.04), rngRun),
+                   (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER);
+      // 3 interfering eNBs SINR -6.0 BLER 0.21 TB size 133
+      AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (4, 1250, 0.206, 40,
+                                                        Seconds (0.12), rngRun),
+                   (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER);
+      // 4 interfering eNBs SINR -7.0 BLER 0.34 TB size 133
+      AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (5, 1260, 0.343, 47,
+                                                        Seconds (0.12), rngRun),
+                   (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER);
+
+      // Tests on DL Data channels (PDSCH)
+      // the tolerance is calculated with the following octave code:
+      //
+      // n =  1000; # TX packets
+      // for p=1-[0.33 0.11 0.2 0.3 0.55 0.14]
+      //    tol = n*p - binoinv(0.005, n, p)
+      // endfor
+
+      // MCS 2 TB size of 256 bits BLER 0.33 SINR -5.51
+      AddTestCase (new LenaDataPhyErrorModelTestCase (4, 1800, 0.33, 39,
+                                                      Seconds (0.04), rngRun),
+                   (rngRun == 1) ? TestCase::QUICK : TestCase::TAKES_FOREVER);
+      // MCS 2 TB size of 528 bits BLER 0.11 SINR -5.51
+      AddTestCase (new LenaDataPhyErrorModelTestCase (2, 1800, 0.11, 26,
+                                                      Seconds (0.04), rngRun),
+                   (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER);
+      // MCS 2 TB size of 1088 bits BLER 0.02 SINR -5.51
+      AddTestCase (new LenaDataPhyErrorModelTestCase (1, 1800, 0.02, 33,
+                                                      Seconds (0.04), rngRun),
+                   (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER);
+      // MCS 12 TB size of 4800 bits  BLER 0.3  SINR 4.43
+      AddTestCase (new LenaDataPhyErrorModelTestCase (1, 600, 0.3, 38,
+                                                      Seconds (0.04), rngRun),
+                   (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER);
+      // MCS 12 TB size of 1632 bits  BLER 0.55  SINR 4.43
+      AddTestCase (new LenaDataPhyErrorModelTestCase (3, 600, 0.55, 40,
+                                                      Seconds (0.04), rngRun),
+                   (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER);
+      // MCS 16 TB size of 7272 bits (3648 x 3584) BLER 0.14 SINR 8.48
+      // BLER 0.14 = 1 - ((1-0.075)*(1-0.075))
+      AddTestCase (new LenaDataPhyErrorModelTestCase (1, 470, 0.14, 29,
+                                                      Seconds (0.04), rngRun),
+                   (rngRun == 1) ? TestCase::EXTENSIVE : TestCase::TAKES_FOREVER);
 
- 
+    }
 
 }
 
-static LenaTestPhyErrorModelrSuite lenaTestPhyErrorModelrSuite;
+static LenaTestPhyErrorModelSuite lenaTestPhyErrorModelSuite;
 
 std::string 
-LenaDataPhyErrorModelTestCase::BuildNameString (uint16_t nUser, uint16_t dist)
+LenaDataPhyErrorModelTestCase::BuildNameString (uint16_t nUser, uint16_t dist, uint32_t rngRun)
 {
   std::ostringstream oss;
-  oss << nUser << " UEs, distance " << dist << " m";
+  oss << "DataPhyErrorModel " <<  nUser << " UEs, distance " << dist << " m, RngRun " << rngRun;
   return oss.str ();
 }
 
-LenaDataPhyErrorModelTestCase::LenaDataPhyErrorModelTestCase (uint16_t nUser, uint16_t dist, uint16_t tbSize, double blerRef, uint16_t toleranceRxPackets)
-  : TestCase (BuildNameString (nUser, dist)),              
+LenaDataPhyErrorModelTestCase::LenaDataPhyErrorModelTestCase (
+  uint16_t nUser, uint16_t dist, double blerRef,
+  uint16_t toleranceRxPackets, Time statsStartTime, uint32_t rngRun)
+  : TestCase (BuildNameString (nUser, dist, rngRun)),
     m_nUser (nUser),
     m_dist (dist),
     m_blerRef (blerRef),
-    m_toleranceRxPackets (toleranceRxPackets)
-{  
+    m_toleranceRxPackets (toleranceRxPackets),
+    m_statsStartTime (statsStartTime),
+    m_rngRun (rngRun)
+{
 }
 
 LenaDataPhyErrorModelTestCase::~LenaDataPhyErrorModelTestCase ()
@@ -132,12 +167,13 @@
   Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (false));
   Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (true));
   Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false));
+  Config::SetGlobal ("RngRun", IntegerValue (m_rngRun));
 
-
-  /**
+  /*
    * Initialize Simulation Scenario: 1 eNB and m_nUser UEs
    */
 
+  int64_t stream = 1;
   Ptr<LteHelper> lena = CreateObject<LteHelper> ();
   
   // Create Nodes: eNodeB and UE
@@ -168,7 +204,9 @@
   lena->SetSchedulerAttribute ("UlCqiFilter", EnumValue (FfMacScheduler::PUSCH_UL_CQI));
   
   enbDevs = lena->InstallEnbDevice (enbNodes);
+  stream += lena->AssignStreams (enbDevs, stream);
   ueDevs = lena->InstallUeDevice (ueNodes);
+  stream += lena->AssignStreams (ueDevs, stream);
 
   // Attach a UE to a eNB
   lena->Attach (ueDevs, enbDevs.Get (0));
@@ -198,14 +236,13 @@
       uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
     }
     
-  lena->EnableRlcTraces ();
-  Time simulationTime = Seconds (1.000);
-
-  Simulator::Stop (simulationTime);
+  Time statsDuration = Seconds (1.0);
+  Simulator::Stop (m_statsStartTime + statsDuration - Seconds (0.0001));
 
+  lena->EnableRlcTraces ();
   Ptr<RadioBearerStatsCalculator> rlcStats = lena->GetRlcStats ();
-  rlcStats->SetAttribute ("EpochDuration", TimeValue (simulationTime));
-
+  rlcStats->SetAttribute ("StartTime", TimeValue (m_statsStartTime));
+  rlcStats->SetAttribute ("EpochDuration", TimeValue (statsDuration));
 
   Simulator::Run ();
 
@@ -223,23 +260,21 @@
       double expectedDlRxPackets = dlTxPackets -dlTxPackets*m_blerRef;
       NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " DOWNLINK"
                    << " pkts rx " << dlRxPackets << " tx " << dlTxPackets
-                   << " BLER " << dlBler << " Err " << std::fabs (m_blerRef - dlBler) 
-                   << " expected rx " << expectedDlRxPackets 
-                   << " difference " << std::abs (expectedDlRxPackets - dlRxPackets) 
+                   << " BLER " << dlBler << " Err " << std::fabs (m_blerRef - dlBler)
+                   << " expected rx " << expectedDlRxPackets
+                   << " difference " << std::abs (expectedDlRxPackets - dlRxPackets)
                    << " tolerance " << m_toleranceRxPackets);
       NS_UNUSED (dlBler);
 
-      // sanity check for whether the tx packets reported by the stats are correct 
-      // we expect one packet per TTI, excluding the initial RRC connection establishment period
-      double expectedDlMinTxPackets = simulationTime.GetMilliSeconds () - 50;
-      NS_TEST_ASSERT_MSG_GT (dlTxPackets, expectedDlMinTxPackets, " too few DL TX packets reported");
-
-      // the quantiles are evaluated offline according to a Bernoulli 
-      // ditribution with n equal to the number of packet sent and p equal 
-      // to the BLER (see /reference/bernuolliDistribution.m for details)
-      NS_TEST_ASSERT_MSG_EQ_TOL (dlRxPackets, expectedDlRxPackets, m_toleranceRxPackets, " Unexpected DL BLER distribution!");
-
-
+      // sanity check for whether the tx packets reported by the stats are correct
+      // we expect one packet per TTI
+      double expectedDlTxPackets = statsDuration.GetMilliSeconds ();
+      NS_TEST_ASSERT_MSG_EQ_TOL (dlTxPackets, expectedDlTxPackets, expectedDlTxPackets * 0.005, 
+                                 " too different DL TX packets reported");
+
+      // this is the main test condition: check that the RX packets are within the expected range
+      NS_TEST_ASSERT_MSG_EQ_TOL (dlRxPackets, expectedDlRxPackets, m_toleranceRxPackets, 
+                                 " too different DL RX packets reported");
     }
 
 
@@ -250,19 +285,24 @@
 
 
 std::string 
-LenaDlCtrlPhyErrorModelTestCase::BuildNameString (uint16_t nEnb, uint16_t dist)
+LenaDlCtrlPhyErrorModelTestCase::BuildNameString (uint16_t nEnb, uint16_t dist, uint32_t rngRun)
 {
   std::ostringstream oss;
-  oss << nEnb << " eNBs, distance " << dist << " m";
+  oss << "DlCtrlPhyErrorModel " << nEnb << " eNBs, distance " << dist << " m, RngRun " << rngRun;
   return oss.str ();
 }
 
 
-LenaDlCtrlPhyErrorModelTestCase::LenaDlCtrlPhyErrorModelTestCase (uint16_t nEnb, uint16_t dist, uint16_t tbSize, double blerRef)
-: TestCase (BuildNameString (nEnb, dist)),              
-m_nEnb (nEnb),
-m_dist (dist),
-m_blerRef (blerRef)
+LenaDlCtrlPhyErrorModelTestCase::LenaDlCtrlPhyErrorModelTestCase (
+  uint16_t nEnb, uint16_t dist, double blerRef,
+  uint16_t toleranceRxPackets, Time statsStartTime, uint32_t rngRun)
+  : TestCase (BuildNameString (nEnb, dist, rngRun)),
+    m_nEnb (nEnb),
+    m_dist (dist),
+    m_blerRef (blerRef),
+    m_toleranceRxPackets (toleranceRxPackets),
+    m_statsStartTime (statsStartTime),
+    m_rngRun (rngRun)
 {
 }
 
@@ -280,11 +320,13 @@
   Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (true));
   Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));
   Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false));
-  
-  /**
-  * Initialize Simulation Scenario: 1 eNB and m_nUser UEs
-  */
-  
+  Config::SetGlobal ("RngRun", IntegerValue (m_rngRun));
+
+  /*
+   * Initialize Simulation Scenario: 1 eNB and m_nUser UEs
+   */
+
+  int64_t stream = 1;
   Ptr<LteHelper> lena = CreateObject<LteHelper> ();
   
   // Create Nodes: eNodeB and UE
@@ -315,7 +357,9 @@
   lena->SetSchedulerAttribute ("UlCqiFilter", EnumValue (FfMacScheduler::PUSCH_UL_CQI));
   
   enbDevs = lena->InstallEnbDevice (enbNodes);
+  stream += lena->AssignStreams (enbDevs, stream);
   ueDevs = lena->InstallUeDevice (ueNodes);
+  stream += lena->AssignStreams (ueDevs, stream);
   
   // Attach a UE to one eNB (the others are interfering ones)
   lena->Attach (ueDevs, enbDevs.Get (0));
@@ -345,16 +389,14 @@
   uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
   uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
   
-  
+  Time statsDuration = Seconds (1.0);
+  Simulator::Stop (m_statsStartTime + statsDuration - Seconds (0.0001));
+
   lena->EnableRlcTraces ();
-  Time simulationTime = Seconds (1.000);
-  
-  Simulator::Stop (simulationTime);
-  
   Ptr<RadioBearerStatsCalculator> rlcStats = lena->GetRlcStats ();
-  rlcStats->SetAttribute ("EpochDuration", TimeValue (simulationTime));
-  
-  
+  rlcStats->SetAttribute ("StartTime", TimeValue (m_statsStartTime));
+  rlcStats->SetAttribute ("EpochDuration", TimeValue (statsDuration));
+
   Simulator::Run ();
   
   NS_LOG_INFO ("\tTest downlink control channels (PCFICH+PDCCH)");
@@ -367,19 +409,27 @@
       uint8_t lcId = 3;
       double dlRxPackets = rlcStats->GetDlRxPackets (imsi, lcId);
       double dlTxPackets = rlcStats->GetDlTxPackets (imsi, lcId);
-      double bler = 1.0 - (dlRxPackets/dlTxPackets);
-      NS_LOG_INFO ("\tUser " << i << " imsi " << imsi 
+      double dlBler = 1.0 - (dlRxPackets/dlTxPackets);
+      double expectedDlRxPackets = dlTxPackets -dlTxPackets*m_blerRef;
+      NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " DOWNLINK"
                    << " pkts rx " << dlRxPackets << " tx " << dlTxPackets
-                   << " BLER " << bler << " Err " << fabs (m_blerRef - bler));
-      NS_UNUSED (bler);
+                   << " BLER " << dlBler << " Err " << std::fabs (m_blerRef - dlBler)
+                   << " expected rx " << expectedDlRxPackets
+                   << " difference " << std::abs (expectedDlRxPackets - dlRxPackets)
+                   << " tolerance " << m_toleranceRxPackets);
+      NS_UNUSED (dlBler);
 
-      // sanity check for whether the tx packets reported by the stats are correct 
-      // we expect one packet per TTI, excluding the initial RRC connection establishment period
-      double expectedMinDlTxPackets = simulationTime.GetMilliSeconds () - 50;
-      NS_TEST_ASSERT_MSG_GT (dlTxPackets, expectedMinDlTxPackets, " too few TX packets reported");
+      // sanity check for whether the tx packets reported by the stats are correct
+      // we expect one packet per TTI
+      double expectedDlTxPackets = statsDuration.GetMilliSeconds ();
+      NS_TEST_ASSERT_MSG_EQ_TOL (dlTxPackets, expectedDlTxPackets, expectedDlTxPackets * 0.005, 
+                                 " too different DL TX packets reported");
+
+      // this is the main test condition: check that the RX packets are within the expected range
+      NS_TEST_ASSERT_MSG_EQ_TOL (dlRxPackets, expectedDlRxPackets, m_toleranceRxPackets,
+                                 "too different DL RX packets reported");
 
-      NS_TEST_ASSERT_MSG_EQ_TOL (bler, m_blerRef, 0.1, " Unexpected BLER distribution!");
-    }  
+    }
   
   Simulator::Destroy ();
 }
diff -Naur ns-3.18.1/src/lte/test/lte-test-phy-error-model.h ns-3.19/src/lte/test/lte-test-phy-error-model.h
--- ns-3.18.1/src/lte/test/lte-test-phy-error-model.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-phy-error-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -21,8 +21,9 @@
 #ifndef LENA_TEST_PHY_ERROR_MODEL_H
 #define LENA_TEST_PHY_ERROR_MODEL_H
 
-#include "ns3/simulator.h"
-#include "ns3/test.h"
+#include <ns3/simulator.h>
+#include <ns3/test.h>
+#include <ns3/nstime.h>
 
 
 namespace ns3 {
@@ -38,16 +39,20 @@
 class LenaDataPhyErrorModelTestCase : public TestCase
 {
 public:
-  LenaDataPhyErrorModelTestCase (uint16_t nUser, uint16_t dist, uint16_t tbSize, double refBler, uint16_t toleranceRxPackets);
+  LenaDataPhyErrorModelTestCase (uint16_t nUser, uint16_t dist,
+                                 double blerRef, uint16_t toleranceRxPackets,
+                                 Time statsStartTime, uint32_t rngRun);
   virtual ~LenaDataPhyErrorModelTestCase ();
 
 private:
   virtual void DoRun (void);
-  static std::string BuildNameString (uint16_t nUser, uint16_t dist);
+  static std::string BuildNameString (uint16_t nUser, uint16_t dist, uint32_t rngRun);
   uint16_t m_nUser;
   uint16_t m_dist;
   double m_blerRef;
   uint16_t m_toleranceRxPackets;
+  Time m_statsStartTime; ///< Extra time in the beginning of simulation to allow RRC connection establishment + SRS
+  uint32_t m_rngRun;
 
 };
 
@@ -55,25 +60,30 @@
 
 class LenaDlCtrlPhyErrorModelTestCase : public TestCase
 {
-  public:
-    LenaDlCtrlPhyErrorModelTestCase (uint16_t nEnbr, uint16_t dist, uint16_t tbSize, double refBler);
-    virtual ~LenaDlCtrlPhyErrorModelTestCase ();
-    
-  private:
-    virtual void DoRun (void);
-    static std::string BuildNameString (uint16_t nUser, uint16_t dist);
-    uint16_t m_nEnb;
-    uint16_t m_dist;
-    double m_blerRef;
-    
+public:
+  LenaDlCtrlPhyErrorModelTestCase (uint16_t nEnb, uint16_t dist,
+                                   double blerRef, uint16_t toleranceRxPackets,
+                                   Time statsStartTime, uint32_t rngRun);
+  virtual ~LenaDlCtrlPhyErrorModelTestCase ();
+
+private:
+  virtual void DoRun (void);
+  static std::string BuildNameString (uint16_t nUser, uint16_t dist, uint32_t rngRun);
+  uint16_t m_nEnb;
+  uint16_t m_dist;
+  double m_blerRef;
+  uint16_t m_toleranceRxPackets;
+  Time m_statsStartTime; ///< Extra time in the beginning of simulation to allow RRC connection establishment + SRS
+  uint32_t m_rngRun;
+
 };
 
 
 
-class LenaTestPhyErrorModelrSuite : public TestSuite
+class LenaTestPhyErrorModelSuite : public TestSuite
 {
 public:
-  LenaTestPhyErrorModelrSuite ();
+  LenaTestPhyErrorModelSuite ();
 };
 
 
diff -Naur ns-3.18.1/src/lte/test/lte-test-pss-ff-mac-scheduler.cc ns-3.19/src/lte/test/lte-test-pss-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/test/lte-test-pss-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-pss-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -49,7 +49,7 @@
 #include <ns3/boolean.h>
 #include <ns3/enum.h>
 
-#include "ns3/epc-helper.h"
+#include "ns3/point-to-point-epc-helper.h"
 #include "ns3/network-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
 #include "ns3/internet-module.h"
@@ -268,7 +268,7 @@
   Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (true));
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper>  epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper>  epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
 
   //LogComponentEnable ("PssFfMacScheduler", LOG_DEBUG);
@@ -516,7 +516,7 @@
 
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper>  epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper>  epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
 
   Ptr<Node> pgw = epcHelper->GetPgwNode ();
diff -Naur ns-3.18.1/src/lte/test/lte-test-rr-ff-mac-scheduler.cc ns-3.19/src/lte/test/lte-test-rr-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -60,7 +60,7 @@
 
   bool errorModel = true;
 
-  
+
   // DOWNLINK- DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.213)
   // 1 user -> 24 PRB at Itbs 26 -> 2196 -> 2196000 bytes/sec
   // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 bytes/sec
@@ -184,8 +184,9 @@
       Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));
     }
   Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (false));
-//   LogComponentDisableAll (LOG_LEVEL_ALL);
-  //LogComponentEnable ("LenaTestRrFfMacCheduler", LOG_LEVEL_ALL);
+
+  // This is needed as the RR scheduler does not allocate resources properly for retransmission
+  Config::SetDefault ("ns3::LteRlcAm::TxOpportunityForRetxAlwaysBigEnough", BooleanValue (true));
 
   /**
    * Initialize Simulation Scenario: 1 eNB and m_nUser UEs
diff -Naur ns-3.18.1/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc ns-3.19/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc
--- ns-3.18.1/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -49,7 +49,7 @@
 #include <ns3/boolean.h>
 #include <ns3/enum.h>
 
-#include "ns3/epc-helper.h"
+#include "ns3/point-to-point-epc-helper.h"
 #include "ns3/network-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
 #include "ns3/internet-module.h"
@@ -267,7 +267,7 @@
   Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (true));
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper>  epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper>  epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
 
   //LogComponentEnable ("TdTbfqFfMacScheduler", LOG_DEBUG);
@@ -515,7 +515,7 @@
 
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper>  epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper>  epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
 
   Ptr<Node> pgw = epcHelper->GetPgwNode ();
diff -Naur ns-3.18.1/src/lte/test/lte-test-ue-measurements.cc ns-3.19/src/lte/test/lte-test-ue-measurements.cc
--- ns-3.18.1/src/lte/test/lte-test-ue-measurements.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-ue-measurements.cc	2013-12-20 09:44:50.000000000 -0800
@@ -18,27 +18,39 @@
  * Author: Manuel Requena <manuel.requena@cttc.es>
  *         Nicola Baldo <nbaldo@cttc.es>
  *         Marco Miozzo <mmiozzo@cttc.es>
+ *         Budiarto Herman <budiarto.herman@magister.fi>
  */
 
-#include "ns3/simulator.h"
-#include "ns3/log.h"
-#include "ns3/string.h"
-#include "ns3/double.h"
+#include <ns3/simulator.h>
+#include <ns3/log.h>
+#include <ns3/callback.h>
+#include <ns3/config.h>
+#include <ns3/string.h>
+#include <ns3/double.h>
 #include <ns3/enum.h>
-#include "ns3/boolean.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/lte-helper.h"
-#include "ns3/ff-mac-scheduler.h"
+#include <ns3/boolean.h>
 
-#include "ns3/lte-enb-phy.h"
-#include "ns3/lte-enb-net-device.h"
-
-#include "ns3/lte-ue-phy.h"
-#include "ns3/lte-ue-net-device.h"
+#include <ns3/mobility-helper.h>
+#include <ns3/lte-helper.h>
+#include <ns3/point-to-point-epc-helper.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/point-to-point-helper.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/ipv4-static-routing-helper.h>
+
+#include <ns3/node-container.h>
+#include <ns3/net-device-container.h>
+#include <ns3/ipv4-interface-container.h>
+
+#include <ns3/ff-mac-scheduler.h>
+#include <ns3/lte-enb-net-device.h>
+#include <ns3/lte-enb-phy.h>
 #include <ns3/lte-enb-rrc.h>
+#include <ns3/lte-ue-net-device.h>
+#include <ns3/lte-ue-phy.h>
+#include <ns3/lte-ue-rrc.h>
 
 #include "lte-test-ue-measurements.h"
-
 #include "lte-test-sinr-chunk-processor.h"
 #include <ns3/lte-common.h>
 
@@ -47,23 +59,27 @@
 namespace ns3 {
 
 
+// ===== LTE-UE-MEASUREMENTS TEST SUITE ==================================== //
+
 void
-ReportUeMeasurementsCallback (LteUeMeasurementsTestCase *testcase, std::string path,
-                             uint16_t rnti, uint16_t cellId, double rsrp, double rsrq, bool servingCell)
+ReportUeMeasurementsCallback (LteUeMeasurementsTestCase *testcase,
+                              std::string path, uint16_t rnti, uint16_t cellId,
+                              double rsrp, double rsrq, bool servingCell)
 {
   testcase->ReportUeMeasurements (rnti, cellId, rsrp, rsrq, servingCell);
 }
 
 void
-RecvMeasurementReportCallback (LteUeMeasurementsTestCase *testcase, std::string path,
-                             uint64_t imsi, uint16_t rnti, uint16_t cellId, LteRrcSap::MeasurementReport meas)
+RecvMeasurementReportCallback (LteUeMeasurementsTestCase *testcase,
+                               std::string path, uint64_t imsi, uint16_t cellId,
+                               uint16_t rnti, LteRrcSap::MeasurementReport meas)
 {
-  testcase->RecvMeasurementReport (imsi, rnti, cellId, meas);
+  testcase->RecvMeasurementReport (imsi, cellId, rnti, meas);
 }
 
 
-/**
- * TestSuite
+/*
+ * Test Suite
  */
 
 LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite ()
@@ -88,18 +104,21 @@
   AddTestCase (new LteUeMeasurementsTestCase ("d1=200000, d2=10000",  200000.000000, 10000.000000, -139.760302, -113.739702, -29.502549, -3.481949), TestCase::EXTENSIVE);
   AddTestCase (new LteUeMeasurementsTestCase ("d1=500000, d2=10000",  500000.000000, 10000.000000, -147.719102, -113.739702, -37.453160, -3.473760), TestCase::EXTENSIVE);
   AddTestCase (new LteUeMeasurementsTestCase ("d1=1000000, d2=10000",  1000000.000000, 10000.000000, -153.739702, -113.739702, -43.472589, -3.472589), TestCase::EXTENSIVE);
-
-
 }
 
 static LteUeMeasurementsTestSuite lteUeMeasurementsTestSuite;
 
 
-/**
- * TestCase
+/*
+ * Test Case
  */
 
-LteUeMeasurementsTestCase::LteUeMeasurementsTestCase (std::string name, double d1, double d2, double rsrpDbmUe1, double rsrpDbmUe2, double rsrqDbUe1, double rsrqDbUe2)
+LteUeMeasurementsTestCase::LteUeMeasurementsTestCase (std::string name,
+                                                      double d1, double d2,
+                                                      double rsrpDbmUe1,
+                                                      double rsrpDbmUe2,
+                                                      double rsrqDbUe1,
+                                                      double rsrqDbUe2)
   : TestCase (name),
     m_d1 (d1),
     m_d2 (d2),
@@ -118,7 +137,7 @@
 void
 LteUeMeasurementsTestCase::DoRun (void)
 {
-  NS_LOG_INFO (this << GetName ());
+  NS_LOG_INFO (this << " " << GetName ());
 
   Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (false));
   Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));
@@ -128,8 +147,8 @@
   lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
   lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (false));
 
-  LogComponentEnable ("LteUeMeasurementsTest", LOG_LEVEL_ALL);
-  
+  // LogComponentEnable ("LteUeMeasurementsTest", LOG_LEVEL_ALL);
+
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;
   NodeContainer ueNodes1;
@@ -137,7 +156,7 @@
   enbNodes.Create (2);
   ueNodes1.Create (1);
   ueNodes2.Create (1);
-  NodeContainer allNodes = NodeContainer ( enbNodes, ueNodes1, ueNodes2);
+  NodeContainer allNodes = NodeContainer (enbNodes, ueNodes1, ueNodes2);
 
   // the topology is the following:
   //         d2
@@ -167,6 +186,7 @@
   ueDevs1 = lteHelper->InstallUeDevice (ueNodes1);
   ueDevs2 = lteHelper->InstallUeDevice (ueNodes2);
 
+  // Attach UEs to eNodeBs
   lteHelper->Attach (ueDevs1, enbDevs.Get (0));
   lteHelper->Attach (ueDevs2, enbDevs.Get (1));
 
@@ -208,8 +228,7 @@
   Config::Connect ("/NodeList/1/DeviceList/0/LteEnbRrc/RecvMeasurementReport",
                    MakeBoundCallback (&RecvMeasurementReportCallback, this));
 
-  
-// need to allow for RRC connection establishment + SRS
+  // need to allow for RRC connection establishment + SRS
   Simulator::Stop (Seconds (0.800));
   Simulator::Run ();
 
@@ -217,9 +236,10 @@
 
 }
 
-
 void
-LteUeMeasurementsTestCase::ReportUeMeasurements (uint16_t rnti, uint16_t cellId, double rsrp, double rsrq, bool servingCell)
+LteUeMeasurementsTestCase::ReportUeMeasurements (uint16_t rnti, uint16_t cellId,
+                                                 double rsrp, double rsrq,
+                                                 bool servingCell)
 {
   // need to allow for RRC connection establishment + CQI feedback reception + UE measurements filtering (200 ms)
   if (Simulator::Now () > MilliSeconds (400))
@@ -228,38 +248,1692 @@
         {
           NS_LOG_DEBUG ("UE serving cellId " << cellId << " Rxed RSRP " << rsrp << " thr " << m_rsrpDbmUeServingCell << " RSRQ " << rsrq << " thr " << m_rsrqDbUeServingCell);
           NS_TEST_ASSERT_MSG_EQ_TOL (m_rsrpDbmUeServingCell, rsrp, 0.2, "Wrong RSRP UE 1");
-          NS_TEST_ASSERT_MSG_EQ_TOL (m_rsrqDbUeServingCell, rsrq, 0.2 , "Wrong RSRQ UE 1");
+          NS_TEST_ASSERT_MSG_EQ_TOL (m_rsrqDbUeServingCell, rsrq, 0.2, "Wrong RSRQ UE 1");
         }
       else
         {
           NS_LOG_DEBUG ("UE neighbor cellId " << cellId << " Rxed RSRP " << rsrp << " thr " << m_rsrpDbmUeNeighborCell << " RSRQ " << rsrq << " thr " << m_rsrqDbUeNeighborCell);
-          NS_TEST_ASSERT_MSG_EQ_TOL (m_rsrpDbmUeNeighborCell, rsrp, 0.2 , "Wrong RSRP UE 2");
-          NS_TEST_ASSERT_MSG_EQ_TOL (m_rsrqDbUeNeighborCell, rsrq, 0.2 , "Wrong RSRQ UE ");
+          NS_TEST_ASSERT_MSG_EQ_TOL (m_rsrpDbmUeNeighborCell, rsrp, 0.2, "Wrong RSRP UE 2");
+          NS_TEST_ASSERT_MSG_EQ_TOL (m_rsrqDbUeNeighborCell, rsrq, 0.2, "Wrong RSRQ UE ");
         }
     }
 }
 
-
 void
-LteUeMeasurementsTestCase::RecvMeasurementReport (uint64_t imsi, uint16_t cellId, uint16_t rnti, LteRrcSap::MeasurementReport meas)
+LteUeMeasurementsTestCase::RecvMeasurementReport (uint64_t imsi, uint16_t cellId, uint16_t rnti,
+                                                  LteRrcSap::MeasurementReport meas)
 {
   // need to allow for RRC connection establishment + CQI feedback reception + UE measurements filtering (200 ms)
   if (Simulator::Now () > MilliSeconds (400))
     {
       if (cellId == imsi)
         {
-          NS_LOG_DEBUG ("Serving Cell: received IMSI " << imsi << " CellId " << cellId << " RNTI " << rnti  << " thr " << (uint16_t)EutranMeasurementMapping::Dbm2RsrpRange (m_rsrpDbmUeServingCell) << " RSRP " << (uint16_t)meas.measResults.rsrpResult << " RSRQ " << (uint16_t)meas.measResults.rsrqResult << " thr " << (uint16_t)EutranMeasurementMapping::Db2RsrqRange (m_rsrqDbUeServingCell));
-          NS_TEST_ASSERT_MSG_EQ (meas.measResults.rsrpResult, EutranMeasurementMapping::Dbm2RsrpRange (m_rsrpDbmUeServingCell), "Wrong RSRP ");
-          NS_TEST_ASSERT_MSG_EQ (meas.measResults.rsrqResult, EutranMeasurementMapping::Db2RsrqRange (m_rsrqDbUeServingCell), "Wrong RSRQ ");
+          NS_LOG_DEBUG (this << "Serving Cell: received IMSI " << imsi << " CellId " << cellId << " RNTI " << rnti
+                             << " thr " << (uint16_t) EutranMeasurementMapping::Dbm2RsrpRange (m_rsrpDbmUeServingCell)
+                             << " RSRP " << (uint16_t) meas.measResults.rsrpResult
+                             << " RSRQ " << (uint16_t)meas.measResults.rsrqResult
+                             << " thr " << (uint16_t) EutranMeasurementMapping::Db2RsrqRange (m_rsrqDbUeServingCell));
+          NS_TEST_ASSERT_MSG_EQ (meas.measResults.rsrpResult,
+                                 EutranMeasurementMapping::Dbm2RsrpRange (m_rsrpDbmUeServingCell),
+                                 "Wrong RSRP ");
+          NS_TEST_ASSERT_MSG_EQ (meas.measResults.rsrqResult,
+                                 EutranMeasurementMapping::Db2RsrqRange (m_rsrqDbUeServingCell),
+                                 "Wrong RSRQ ");
         }
       else
         {
-          NS_LOG_DEBUG ("Neighbor cell: received IMSI " << imsi << " CellId " << cellId << " RNTI " << rnti  << " thr " << (uint16_t)EutranMeasurementMapping::Dbm2RsrpRange (m_rsrpDbmUeNeighborCell) << " RSRP " << (uint16_t)meas.measResults.rsrpResult << " RSRQ " << (uint16_t)meas.measResults.rsrqResult << " thr " << (uint16_t)EutranMeasurementMapping::Db2RsrqRange (m_rsrqDbUeNeighborCell));
-          NS_TEST_ASSERT_MSG_EQ (meas.measResults.rsrpResult, EutranMeasurementMapping::Dbm2RsrpRange (m_rsrpDbmUeNeighborCell), "Wrong RSRP ");
-          NS_TEST_ASSERT_MSG_EQ (meas.measResults.rsrqResult, EutranMeasurementMapping::Db2RsrqRange (m_rsrqDbUeNeighborCell), "Wrong RSRQ ");
+          NS_LOG_DEBUG (this << "Neighbor cell: received IMSI " << imsi << " CellId " << cellId << " RNTI " << rnti
+                             << " thr " << (uint16_t) EutranMeasurementMapping::Dbm2RsrpRange (m_rsrpDbmUeNeighborCell)
+                             << " RSRP " << (uint16_t) meas.measResults.rsrpResult
+                             << " RSRQ " << (uint16_t)meas.measResults.rsrqResult
+                             << " thr " << (uint16_t) EutranMeasurementMapping::Db2RsrqRange (m_rsrqDbUeNeighborCell));
+          NS_TEST_ASSERT_MSG_EQ (meas.measResults.rsrpResult,
+                                 EutranMeasurementMapping::Dbm2RsrpRange (m_rsrpDbmUeNeighborCell),
+                                 "Wrong RSRP ");
+          NS_TEST_ASSERT_MSG_EQ (meas.measResults.rsrqResult,
+                                 EutranMeasurementMapping::Db2RsrqRange (m_rsrqDbUeNeighborCell),
+                                 "Wrong RSRQ ");
         }
     }
 }
 
+
+// ===== LTE-UE-MEASUREMENTS-PIECEWISE-1 TEST SUITE ======================== //
+
+/*
+ * Overloaded operators, for the convenience of defining test cases
+ */
+
+std::vector<Time>&
+operator<< (std::vector<Time>& v, const uint64_t& ms)
+{
+  /*
+   * Prior attempt to use seconds as unit of choice resulted in precision lost.
+   * Therefore milliseconds are used now instead.
+   */
+  v.push_back (MilliSeconds (ms) + UE_MEASUREMENT_REPORT_DELAY);
+  return v;
+}
+
+std::vector<uint8_t>&
+operator<< (std::vector<uint8_t>& v, const uint8_t& range)
+{
+  v.push_back (range);
+  return v;
+}
+
+
+/*
+ * Test Suite
+ */
+
+LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1 ()
+  : TestSuite ("lte-ue-measurements-piecewise-1", SYSTEM)
+{
+  std::vector<Time> expectedTime;
+  std::vector<uint8_t> expectedRsrp;
+
+  // === Event A1 (serving cell becomes better than threshold) ===
+
+  // With very low threshold
+  LteRrcSap::ReportConfigEutra config;
+  config.triggerType = LteRrcSap::ReportConfigEutra::EVENT;
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  config.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRP;
+  config.threshold1.range = 0;
+  config.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRP;
+  config.reportInterval = LteRrcSap::ReportConfigEutra::MS120;
+  expectedTime.clear ();
+  expectedTime << 200 << 320 << 440 << 560 << 680 << 800 << 920 << 1040 << 1160 << 1280
+               << 1400 << 1520 << 1640 << 1760 << 1880 << 2000 << 2120;
+  expectedRsrp.clear ();
+  expectedRsrp << 67 << 67 << 57 << 57 << 66 << 47 << 47 << 66 << 66 << 57
+               << 51 << 51 << 47 << 47 << 51 << 57 << 57;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with very low threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With normal threshold
+  config.threshold1.range = 54;
+  expectedTime.clear ();
+  expectedTime << 200 << 320 << 440 << 560 << 680 << 1000 << 1120 << 1240 << 1360 << 2000
+               << 2120;
+  expectedRsrp.clear ();
+  expectedRsrp << 67 << 67 << 57 << 57 << 66 << 66 << 66 << 57 << 57 << 57
+               << 57;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with normal threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With short time-to-trigger
+  config.timeToTrigger = 64;
+  expectedTime.clear ();
+  expectedTime << 264 << 384 << 504 << 624 << 744 << 1064 << 1184 << 1304 << 1424 << 2064
+               << 2184;
+  expectedRsrp.clear ();
+  expectedRsrp << 67 << 67 << 57 << 66 << 66 << 66 << 66 << 57 << 51 << 57
+               << 57;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with short time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With long time-to-trigger
+  config.timeToTrigger = 128;
+  expectedTime.clear ();
+  expectedTime << 328 << 448 << 568 << 688 << 808 << 1128 << 1248 << 1368 << 1488 << 2128;
+  expectedRsrp.clear ();
+  expectedRsrp << 67 << 57 << 57 << 66 << 47 << 66 << 57 << 57 << 51 << 57;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with long time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With super time-to-trigger
+  config.timeToTrigger = 256;
+  expectedTime.clear ();
+  expectedTime << 456 << 576 << 696 << 816 << 936 << 1056 << 1176 << 1296 << 1416 << 1536;
+  expectedRsrp.clear ();
+  expectedRsrp << 57 << 57 << 66 << 47 << 47 << 66 << 66 << 57 << 51 << 51;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with super time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With hysteresis
+  config.hysteresis = 8;
+  config.timeToTrigger = 0;
+  expectedTime.clear ();
+  expectedTime << 200 << 320 << 440 << 560 << 680 << 1000 << 1120 << 1240 << 1360 << 1480
+               << 2200;
+  expectedRsrp.clear ();
+  expectedRsrp << 67 << 67 << 57 << 57 << 66 << 66 << 66 << 57 << 57 << 51
+               << 67;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with hysteresis",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With very high threshold
+  config.threshold1.range = 97;
+  config.hysteresis = 0;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with very high threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // === Event A2 (serving cell becomes worse than threshold) ===
+
+  // With very low threshold
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  config.threshold1.range = 0;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A2 with very low threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With normal threshold
+  config.threshold1.range = 54;
+  expectedTime.clear ();
+  expectedTime << 800 << 920 << 1400 << 1520 << 1640 << 1760 << 1880;
+  expectedRsrp.clear ();
+  expectedRsrp << 47 << 47 << 51 << 51 << 47 << 47 << 51;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A2 with normal threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With short time-to-trigger
+  config.timeToTrigger = 64;
+  expectedTime.clear ();
+  expectedTime << 864 << 984 << 1464 << 1584 << 1704 << 1824 << 1944;
+  expectedRsrp.clear ();
+  expectedRsrp << 47 << 47 << 51 << 51 << 47 << 51 << 51;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A2 with short time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With long time-to-trigger
+  config.timeToTrigger = 128;
+  expectedTime.clear ();
+  expectedTime << 928 << 1048 << 1528 << 1648 << 1768 << 1888 << 2008;
+  expectedRsrp.clear ();
+  expectedRsrp << 47 << 66 << 51 << 47 << 47 << 51 << 57;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A2 with long time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With super time-to-trigger
+  config.timeToTrigger = 256;
+  expectedTime.clear ();
+  expectedTime << 1656 << 1776 << 1896 << 2016 << 2136;
+  expectedRsrp.clear ();
+  expectedRsrp << 47 << 47 << 51 << 57 << 57;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A2 with super time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With hysteresis
+  config.hysteresis = 8;
+  config.timeToTrigger = 0;
+  expectedTime.clear ();
+  expectedTime << 800 << 920 << 1600 << 1720 << 1840 << 1960 << 2080;
+  expectedRsrp.clear ();
+  expectedRsrp << 47 << 47 << 47 << 47 << 51 << 51 << 57;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A2 with hysteresis",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With very high threshold
+  config.threshold1.range = 97;
+  config.hysteresis = 0;
+  expectedTime.clear ();
+  expectedTime << 200 << 320 << 440 << 560 << 680 << 800 << 920 << 1040 << 1160 << 1280
+               << 1400 << 1520 << 1640 << 1760 << 1880 << 2000 << 2120;
+  expectedRsrp.clear ();
+  expectedRsrp << 67 << 67 << 57 << 57 << 66 << 47 << 47 << 66 << 66 << 57
+               << 51 << 51 << 47 << 47 << 51 << 57 << 57;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A2 with very high threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  /*
+   * Event A3, A4, and A5 are not tested intensively here because they depend on
+   * the existence of at least one neighbouring cell, which is not available in
+   * this configuration. Piecewise configuration #2 includes a neighbouring
+   * cell, hence more thorough tests on these events are performed there.
+   */
+
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+
+  // === Event A3 (neighbour becomes offset better than PCell) ===
+
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  config.a3Offset = 0;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A3",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // === Event A4 (neighbour becomes better than threshold) ===
+
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  config.threshold1.range = 54;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A4",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // === Event A5 (PCell becomes worse than absolute threshold1 AND neighbour becomes better than another absolute threshold2) ===
+
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A5;
+  config.threshold2.range = 58;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A5",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+} // end of LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1
+
+static LteUeMeasurementsPiecewiseTestSuite1 lteUeMeasurementsPiecewiseTestSuite1;
+
+
+/*
+ * Test Case
+ */
+
+LteUeMeasurementsPiecewiseTestCase1::LteUeMeasurementsPiecewiseTestCase1 (
+  std::string name, LteRrcSap::ReportConfigEutra config,
+  std::vector<Time> expectedTime, std::vector<uint8_t> expectedRsrp)
+  : TestCase (name),
+    m_config (config),
+    m_expectedTime (expectedTime),
+    m_expectedRsrp (expectedRsrp)
+{
+  // input sanity check
+  uint16_t size = m_expectedTime.size ();
+
+  if (size != m_expectedRsrp.size ())
+    {
+      NS_FATAL_ERROR ("Vectors of expected results are not of the same size");
+    }
+
+  m_itExpectedTime = m_expectedTime.begin ();
+  m_itExpectedRsrp = m_expectedRsrp.begin ();
+
+  NS_LOG_INFO (this << " name=" << name);
+}
+
+LteUeMeasurementsPiecewiseTestCase1::~LteUeMeasurementsPiecewiseTestCase1 ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase1::DoRun ()
+{
+  NS_LOG_INFO (this << " " << GetName ());
+
+  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+  lteHelper->SetAttribute ("PathlossModel",
+                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));
+
+  // Create Nodes: eNodeB and UE
+  NodeContainer enbNodes;
+  NodeContainer ueNodes;
+  enbNodes.Create (1);
+  ueNodes.Create (1);
+
+  /*
+   * The topology is the following:
+   *
+   * eNodeB     UE
+   *    |       |
+   *    x ----- x --------- x --------------- x ------------------- x
+   *      100 m |   200 m   |      300 m      |        400 m        |
+   *            |           |                 |                     |
+   *         VeryNear      Near              Far                 VeryFar
+   */
+
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+  positionAlloc->Add (Vector (0.0, 0.0, 0.0)); // eNodeB
+  positionAlloc->Add (Vector (100.0, 0.0, 0.0)); // UE
+  MobilityHelper mobility;
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.SetPositionAllocator (positionAlloc);
+  mobility.Install (enbNodes);
+  mobility.Install (ueNodes);
+  m_ueMobility = ueNodes.Get (0)->GetObject<MobilityModel> ();
+
+  // Disable layer-3 filtering
+  Config::SetDefault ("ns3::LteEnbRrc::RsrpFilterCoefficient",
+                      UintegerValue (0));
+
+  // Create Devices and install them in the Nodes (eNB and UE)
+  NetDeviceContainer enbDevs;
+  NetDeviceContainer ueDevs;
+  lteHelper->SetSchedulerType ("ns3::RrFfMacScheduler");
+  lteHelper->SetSchedulerAttribute ("UlCqiFilter",
+                                    EnumValue (FfMacScheduler::PUSCH_UL_CQI));
+  enbDevs = lteHelper->InstallEnbDevice (enbNodes);
+  ueDevs = lteHelper->InstallUeDevice (ueNodes);
+
+  // Setup UE measurement configuration
+  Ptr<LteEnbRrc> enbRrc = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ()->GetRrc ();
+  m_expectedMeasId = enbRrc->AddUeMeasReportConfig (m_config);
+
+  // Attach UE to eNodeB
+  lteHelper->Attach (ueDevs.Get (0), enbDevs.Get (0));
+
+  // Activate an EPS bearer
+  enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
+  EpsBearer bearer (q);
+  lteHelper->ActivateDataRadioBearer (ueDevs, bearer);
+
+  // Connect to trace sources
+  Config::Connect ("/NodeList/0/DeviceList/0/LteEnbRrc/RecvMeasurementReport",
+                   MakeCallback (&LteUeMeasurementsPiecewiseTestCase1::RecvMeasurementReportCallback,
+                                 this));
+
+  /*
+   * Schedule "teleports"
+   *          0                   1                   2
+   *          +-------------------+-------------------+---------> time
+   * VeryNear |------  ----    ----                    --------
+   *     Near |                    ----            ----
+   *      Far |                        ----    ----
+   *  VeryFar |      --    ----            ----
+   */
+  Simulator::Schedule (MilliSeconds (301),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportVeryFar, this);
+  Simulator::Schedule (MilliSeconds (401),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportVeryNear, this);
+  Simulator::Schedule (MilliSeconds (601),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportVeryFar, this);
+  Simulator::Schedule (MilliSeconds (801),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportVeryNear, this);
+  Simulator::Schedule (MilliSeconds (1001),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportNear, this);
+  Simulator::Schedule (MilliSeconds (1201),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportFar, this);
+  Simulator::Schedule (MilliSeconds (1401),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportVeryFar, this);
+  Simulator::Schedule (MilliSeconds (1601),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportFar, this);
+  Simulator::Schedule (MilliSeconds (1801),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportNear, this);
+  Simulator::Schedule (MilliSeconds (2001),
+                       &LteUeMeasurementsPiecewiseTestCase1::TeleportVeryNear, this);
+
+  // Run simulation
+  Simulator::Stop (Seconds (2.201));
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+} // end of void LteUeMeasurementsPiecewiseTestCase1::DoRun ()
+
+void
+LteUeMeasurementsPiecewiseTestCase1::DoTeardown ()
+{
+  NS_LOG_FUNCTION (this);
+  bool hasEnded = m_itExpectedTime == m_expectedTime.end ();
+  NS_TEST_ASSERT_MSG_EQ (hasEnded, true,
+                         "Reporting should have occurred at " << m_itExpectedTime->GetSeconds () << "s");
+  hasEnded = m_itExpectedRsrp == m_expectedRsrp.end ();
+  NS_ASSERT (hasEnded);
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase1::RecvMeasurementReportCallback (
+  std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti,
+  LteRrcSap::MeasurementReport report)
+{
+  NS_LOG_FUNCTION (this << context);
+  NS_ASSERT (rnti == 1);
+  NS_ASSERT (cellId == 1);
+
+  if (report.measResults.measId == m_expectedMeasId)
+    {
+      // verifying the report completeness
+      LteRrcSap::MeasResults measResults = report.measResults;
+      NS_LOG_DEBUG (this << " rsrp=" << (uint16_t) measResults.rsrpResult
+                         << " (" << EutranMeasurementMapping::RsrpRange2Dbm (measResults.rsrpResult) << " dBm)"
+                         << " rsrq=" << (uint16_t) measResults.rsrqResult
+                         << " (" << EutranMeasurementMapping::RsrqRange2Db (measResults.rsrqResult) << " dB)");
+      NS_TEST_ASSERT_MSG_EQ (measResults.haveMeasResultNeighCells, false,
+                             "Report should not have neighboring cells information");
+      NS_TEST_ASSERT_MSG_EQ (measResults.measResultListEutra.size (), 0,
+                             "Unexpected report size");
+
+      bool hasEnded = m_itExpectedTime == m_expectedTime.end ();
+      NS_TEST_ASSERT_MSG_EQ (hasEnded, false,
+                             "Reporting should not have occurred at "
+                             << Simulator::Now ().GetSeconds () << "s");
+      if (!hasEnded)
+        {
+          hasEnded = m_itExpectedRsrp == m_expectedRsrp.end ();
+          NS_ASSERT (!hasEnded);
+
+          // using milliseconds to avoid floating-point comparison
+          uint64_t timeNowMs = Simulator::Now ().GetMilliSeconds ();
+          uint64_t timeExpectedMs = m_itExpectedTime->GetMilliSeconds ();
+          m_itExpectedTime++;
+
+          uint16_t observedRsrp = measResults.rsrpResult;
+          uint16_t referenceRsrp = *m_itExpectedRsrp;
+          m_itExpectedRsrp++;
+
+          NS_TEST_ASSERT_MSG_EQ (timeNowMs, timeExpectedMs,
+                                 "Reporting should not have occurred at this time");
+          NS_TEST_ASSERT_MSG_EQ (observedRsrp, referenceRsrp,
+                                 "The RSRP observed differs with the reference RSRP");
+        } // end of if (!hasEnded)
+
+    } // end of if (measResults.measId == m_expectedMeasId)
+
+} // end of LteUeMeasurementsPiecewiseTestCase1::RecvMeasurementReportCallback
+
+void
+LteUeMeasurementsPiecewiseTestCase1::TeleportVeryNear ()
+{
+  NS_LOG_FUNCTION (this);
+  m_ueMobility->SetPosition (Vector (100.0, 0.0, 0.0));
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase1::TeleportNear ()
+{
+  NS_LOG_FUNCTION (this);
+  m_ueMobility->SetPosition (Vector (300.0, 0.0, 0.0));
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase1::TeleportFar ()
+{
+  NS_LOG_FUNCTION (this);
+  m_ueMobility->SetPosition (Vector (600.0, 0.0, 0.0));
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase1::TeleportVeryFar ()
+{
+  NS_LOG_FUNCTION (this);
+  m_ueMobility->SetPosition (Vector (1000.0, 0.0, 0.0));
+}
+
+
+// ===== LTE-UE-MEASUREMENTS-PIECEWISE-2 TEST SUITE ======================== //
+
+/*
+ * Test Suite
+ */
+
+LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2 ()
+  : TestSuite ("lte-ue-measurements-piecewise-2", SYSTEM)
+{
+  std::vector<Time> expectedTime;
+  std::vector<uint8_t> expectedRsrp;
+
+  /*
+   * Higher level of fullness/duration are given to Event A1 and A2 because they
+   * are supposed to be more intensively tested in Piecewise configuration #1.
+   */
+
+  // === Event A1 (serving cell becomes better than threshold) ===
+
+  // With very low threshold
+  LteRrcSap::ReportConfigEutra config;
+  config.triggerType = LteRrcSap::ReportConfigEutra::EVENT;
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  config.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRP;
+  config.threshold1.range = 0;
+  config.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRP;
+  config.reportInterval = LteRrcSap::ReportConfigEutra::MS240;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 920 << 1160 << 1400 << 1640 << 1880 << 2120;
+  expectedRsrp.clear ();
+  expectedRsrp << 73 << 63 << 72 << 52 << 72 << 56 << 52 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A1 with very low threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With normal threshold
+  config.threshold1.range = 58;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 1000 << 1240 << 2000;
+  expectedRsrp.clear ();
+  expectedRsrp << 73 << 63 << 72 << 72 << 59 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A1 with normal threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With hysteresis
+  config.hysteresis = 6;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 1000 << 1240 << 1480 << 2200;
+  expectedRsrp.clear ();
+  expectedRsrp << 73 << 63 << 72 << 72 << 59 << 56 << 72;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A1 with hysteresis",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With very high threshold
+  config.threshold1.range = 97;
+  config.hysteresis = 0;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A1 with very high threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // === Event A2 (serving cell becomes worse than threshold) ===
+
+  // With very low threshold
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  config.threshold1.range = 0;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A2 with very low threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With normal threshold
+  config.threshold1.range = 58;
+  expectedTime.clear ();
+  expectedTime << 800 << 1400 << 1640 << 1880;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 52 << 56;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A2 with normal threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With hysteresis
+  config.hysteresis = 6;
+  expectedTime.clear ();
+  expectedTime << 800 << 1600 << 1840 << 2080;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 52 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A2 with hysteresis",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With very high threshold
+  config.threshold1.range = 97;
+  config.hysteresis = 0;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 920 << 1160 << 1400 << 1640 << 1880 << 2120;
+  expectedRsrp.clear ();
+  expectedRsrp << 73 << 63 << 72 << 52 << 72 << 56 << 52 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A2 with very high threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // === Event A3 (neighbour becomes offset better than PCell) ===
+
+  // With positive offset
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  config.threshold1.range = 0;
+  config.a3Offset = 7;
+  expectedTime.clear ();
+  expectedTime << 800 << 1600;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 52;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A3 with positive offset",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With zero offset
+  config.a3Offset = 0;
+  expectedTime.clear ();
+  expectedTime << 800 << 1400 << 1640 << 1880;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 52 << 56;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A3 with zero offset",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With short time-to-trigger
+  config.timeToTrigger = 160;
+  expectedTime.clear ();
+  expectedTime << 960 << 1560 << 1800 << 2040;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A3 with short time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With super time-to-trigger
+  config.timeToTrigger = 320;
+  expectedTime.clear ();
+  expectedTime << 1720 << 1960 << 2200;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 72;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A3 with super time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With hysteresis and reportOnLeave
+  config.hysteresis = 6;
+  config.reportOnLeave = true;
+  config.timeToTrigger = 0;
+  expectedTime.clear ();
+  expectedTime << 800 << 1000 << 1600 << 1840 << 2080 << 2200;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 72 << 52 << 56 << 59 << 72;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A3 with hysteresis",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With negative offset
+  config.a3Offset = -7;
+  config.hysteresis = 0;
+  config.reportOnLeave = false;
+  expectedTime.clear ();
+  expectedTime << 400 << 800 << 1200 << 1440 << 1680 << 1920 << 2160;
+  expectedRsrp.clear ();
+  expectedRsrp << 63 << 52 << 59 << 56 << 52 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A3 with negative offset",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // === Event A4 (neighbour becomes better than threshold) ===
+
+  // With very low threshold
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  config.threshold1.range = 0;
+  config.a3Offset = 0;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 920 << 1160 << 1400 << 1640 << 1880 << 2120;
+  expectedRsrp.clear ();
+  expectedRsrp << 73 << 63 << 72 << 52 << 72 << 56 << 52 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A4 with very low threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With normal threshold
+  config.threshold1.range = 58;
+  expectedTime.clear ();
+  expectedTime << 400 << 800 << 1400 << 1640 << 1880;
+  expectedRsrp.clear ();
+  expectedRsrp << 63 << 52 << 56 << 52 << 56;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A4 with normal threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With short time-to-trigger
+  config.timeToTrigger = 160;
+  expectedTime.clear ();
+  expectedTime << 560 << 960 << 1560 << 1800 << 2040;
+  expectedRsrp.clear ();
+  expectedRsrp << 63 << 52 << 56 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A4 with short time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With super time-to-trigger
+  config.timeToTrigger = 320;
+  expectedTime.clear ();
+  expectedTime << 1720 << 1960 << 2200;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 72;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A4 with super time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With hysteresis
+  config.hysteresis = 6;
+  config.timeToTrigger = 0;
+  expectedTime.clear ();
+  expectedTime << 400 << 800 << 1600 << 1840 << 2080;
+  expectedRsrp.clear ();
+  expectedRsrp << 63 << 52 << 52 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A4 with hysteresis",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With very high threshold
+  config.threshold1.range = 97;
+  config.hysteresis = 0;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A4 with very high threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // === Event A5 (PCell becomes worse than absolute threshold1 AND neighbour becomes better than another absolute threshold2) ===
+
+  // With low-low threshold
+  config.eventId = LteRrcSap::ReportConfigEutra::EVENT_A5;
+  config.threshold1.range = 0;
+  config.threshold2.range = 0;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with low-low threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With low-normal threshold
+  config.threshold2.range = 58;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with low-normal threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With low-high threshold
+  config.threshold2.range = 97;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with low-high threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With normal-low threshold
+  config.threshold1.range = 58;
+  config.threshold2.range = 0;
+  expectedTime.clear ();
+  expectedTime << 800 << 1400 << 1640 << 1880;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 52 << 56;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with normal-low threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With normal-normal threshold
+  config.threshold2.range = 58;
+  expectedTime.clear ();
+  expectedTime << 800 << 1400 << 1640 << 1880;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 52 << 56;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with normal-normal threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With short time-to-trigger
+  config.timeToTrigger = 160;
+  expectedTime.clear ();
+  expectedTime << 960 << 1560 << 1800 << 2040;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with short time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With super time-to-trigger
+  config.timeToTrigger = 320;
+  expectedTime.clear ();
+  expectedTime << 1720 << 1960 << 2200;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 56 << 72;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with super time-to-trigger",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With hysteresis
+  config.hysteresis = 6;
+  config.timeToTrigger = 0;
+  expectedTime.clear ();
+  expectedTime << 800 << 1600 << 1840 << 2080;
+  expectedRsrp.clear ();
+  expectedRsrp << 52 << 52 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with hysteresis",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::QUICK);
+
+  // With normal-high threshold
+  config.threshold2.range = 97;
+  config.hysteresis = 0;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with normal-high threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With high-low threshold
+  config.threshold1.range = 97;
+  config.threshold2.range = 0;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 920 << 1160 << 1400 << 1640 << 1880 << 2120;
+  expectedRsrp.clear ();
+  expectedRsrp << 73 << 63 << 72 << 52 << 72 << 56 << 52 << 56 << 59;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with high-low threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+  // With high-normal threshold
+  config.threshold2.range = 58;
+  expectedTime.clear ();
+  expectedTime << 400 << 800 << 1400 << 1640 << 1880;
+  expectedRsrp.clear ();
+  expectedRsrp << 63 << 52 << 56 << 52 << 56;
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with high-normal threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::TAKES_FOREVER);
+
+  // With high-high threshold
+  config.threshold2.range = 97;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with high-high threshold",
+                                                        config, expectedTime, expectedRsrp),
+               TestCase::EXTENSIVE);
+
+} // end of LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2
+
+static LteUeMeasurementsPiecewiseTestSuite2 lteUeMeasurementsPiecewiseTestSuite2;
+
+
+/*
+ * Test Case
+ */
+
+LteUeMeasurementsPiecewiseTestCase2::LteUeMeasurementsPiecewiseTestCase2 (
+  std::string name, LteRrcSap::ReportConfigEutra config,
+  std::vector<Time> expectedTime, std::vector<uint8_t> expectedRsrp)
+  : TestCase (name),
+    m_config (config),
+    m_expectedTime (expectedTime),
+    m_expectedRsrp (expectedRsrp)
+{
+  // input sanity check
+  uint16_t size = m_expectedTime.size ();
+
+  if (size != m_expectedRsrp.size ())
+    {
+      NS_FATAL_ERROR ("Vectors of expected results are not of the same size");
+    }
+
+  m_itExpectedTime = m_expectedTime.begin ();
+  m_itExpectedRsrp = m_expectedRsrp.begin ();
+
+  NS_LOG_INFO (this << " name=" << name);
+}
+
+LteUeMeasurementsPiecewiseTestCase2::~LteUeMeasurementsPiecewiseTestCase2 ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase2::DoRun ()
+{
+  NS_LOG_INFO (this << " " << GetName ());
+
+  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+  lteHelper->SetAttribute ("PathlossModel",
+                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));
+
+  // Create Nodes: eNodeB and UE
+  NodeContainer enbNodes;
+  NodeContainer ueNodes;
+  enbNodes.Create (2);
+  ueNodes.Create (1);
+
+  /*
+   * The topology is the following:
+   *
+   * eNodeB    UE                                                eNodeB
+   *    |      |                                                    |
+   *    x ---- x --------------- x ------- x --------------- x ---- x
+   *      50 m |      200 m      |  100 m  |      200 m      | 50 m
+   *           |                 |         |                 |
+   *        VeryNear            Near      Far             VeryFar
+   */
+
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+  positionAlloc->Add (Vector (0.0, 0.0, 0.0)); // Serving eNodeB
+  positionAlloc->Add (Vector (600.0, 0.0, 0.0)); // Neighbour eNodeB
+  positionAlloc->Add (Vector (50.0, 0.0, 0.0)); // UE
+  MobilityHelper mobility;
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.SetPositionAllocator (positionAlloc);
+  mobility.Install (enbNodes);
+  mobility.Install (ueNodes);
+  m_ueMobility = ueNodes.Get (0)->GetObject<MobilityModel> ();
+
+  // Disable layer-3 filtering
+  Config::SetDefault ("ns3::LteEnbRrc::RsrpFilterCoefficient",
+                      UintegerValue (0));
+
+  // Create Devices and install them in the Nodes (eNB and UE)
+  NetDeviceContainer enbDevs;
+  NetDeviceContainer ueDevs;
+  lteHelper->SetSchedulerType ("ns3::RrFfMacScheduler");
+  lteHelper->SetSchedulerAttribute ("UlCqiFilter",
+                                    EnumValue (FfMacScheduler::PUSCH_UL_CQI));
+  enbDevs = lteHelper->InstallEnbDevice (enbNodes);
+  ueDevs = lteHelper->InstallUeDevice (ueNodes);
+
+  // Setup UE measurement configuration in serving cell
+  Ptr<LteEnbRrc> enbRrc1 = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ()->GetRrc ();
+  m_expectedMeasId = enbRrc1->AddUeMeasReportConfig (m_config);
+
+  // Disable handover in neighbour cell
+  Ptr<LteEnbRrc> enbRrc2 = enbDevs.Get (1)->GetObject<LteEnbNetDevice> ()->GetRrc ();
+  enbRrc2->SetAttribute ("AdmitHandoverRequest", BooleanValue (false));
+
+  // Attach UE to serving eNodeB
+  lteHelper->Attach (ueDevs.Get (0), enbDevs.Get (0));
+
+  // Activate an EPS bearer
+  enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
+  EpsBearer bearer (q);
+  lteHelper->ActivateDataRadioBearer (ueDevs, bearer);
+
+  // Connect to trace sources in serving eNodeB
+  Config::Connect ("/NodeList/0/DeviceList/0/LteEnbRrc/RecvMeasurementReport",
+                   MakeCallback (&LteUeMeasurementsPiecewiseTestCase2::RecvMeasurementReportCallback,
+                                 this));
+
+  /*
+   * Schedule "teleports"
+   *          0                   1                   2
+   *          +-------------------+-------------------+---------> time
+   * VeryNear |------  ----    ----                    --------
+   *     Near |                    ----            ----
+   *      Far |                        ----    ----
+   *  VeryFar |      --    ----            ----
+   */
+  Simulator::Schedule (MilliSeconds (301),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportVeryFar, this);
+  Simulator::Schedule (MilliSeconds (401),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportVeryNear, this);
+  Simulator::Schedule (MilliSeconds (601),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportVeryFar, this);
+  Simulator::Schedule (MilliSeconds (801),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportVeryNear, this);
+  Simulator::Schedule (MilliSeconds (1001),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportNear, this);
+  Simulator::Schedule (MilliSeconds (1201),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportFar, this);
+  Simulator::Schedule (MilliSeconds (1401),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportVeryFar, this);
+  Simulator::Schedule (MilliSeconds (1601),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportFar, this);
+  Simulator::Schedule (MilliSeconds (1801),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportNear, this);
+  Simulator::Schedule (MilliSeconds (2001),
+                       &LteUeMeasurementsPiecewiseTestCase2::TeleportVeryNear, this);
+
+  // Run simulation
+  Simulator::Stop (Seconds (2.201));
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+} // end of void LteUeMeasurementsPiecewiseTestCase2::DoRun ()
+
+void
+LteUeMeasurementsPiecewiseTestCase2::DoTeardown ()
+{
+  NS_LOG_FUNCTION (this);
+  bool hasEnded = m_itExpectedTime == m_expectedTime.end ();
+  NS_TEST_ASSERT_MSG_EQ (hasEnded, true,
+                         "Reporting should have occurred at " << m_itExpectedTime->GetSeconds () << "s");
+  hasEnded = m_itExpectedRsrp == m_expectedRsrp.end ();
+  NS_ASSERT (hasEnded);
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase2::RecvMeasurementReportCallback (
+  std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti,
+  LteRrcSap::MeasurementReport report)
+{
+  NS_LOG_FUNCTION (this << context);
+  NS_ASSERT (rnti == 1);
+  NS_ASSERT (cellId == 1);
+
+  if (report.measResults.measId == m_expectedMeasId)
+    {
+      // verifying the report completeness
+      LteRrcSap::MeasResults measResults = report.measResults;
+      NS_LOG_DEBUG (this << " Serving cellId=" << cellId
+                         << " rsrp=" << (uint16_t) measResults.rsrpResult
+                         << " (" << EutranMeasurementMapping::RsrpRange2Dbm (measResults.rsrpResult) << " dBm)"
+                         << " rsrq=" << (uint16_t) measResults.rsrqResult
+                         << " (" << EutranMeasurementMapping::RsrqRange2Db (measResults.rsrqResult) << " dB)");
+
+      // verifying reported best cells
+      if (measResults.measResultListEutra.size () == 0)
+        {
+          NS_TEST_ASSERT_MSG_EQ (measResults.haveMeasResultNeighCells, false,
+                                 "Unexpected report content");
+        }
+      else
+        {
+          NS_TEST_ASSERT_MSG_EQ (measResults.haveMeasResultNeighCells, true,
+                                 "Unexpected report content");
+          std::list<LteRrcSap::MeasResultEutra>::iterator it = measResults.measResultListEutra.begin ();
+          NS_ASSERT (it != measResults.measResultListEutra.end ());
+          NS_ASSERT (it->physCellId == 2);
+          NS_TEST_ASSERT_MSG_EQ (it->haveCgiInfo, false,
+                                 "Report contains cgi-info, which is not supported");
+          NS_TEST_ASSERT_MSG_EQ (it->haveRsrpResult, true,
+                                 "Report does not contain measured RSRP result");
+          NS_TEST_ASSERT_MSG_EQ (it->haveRsrqResult, true,
+                                 "Report does not contain measured RSRQ result");
+          NS_LOG_DEBUG (this << " Neighbour cellId=" << it->physCellId
+                             << " rsrp=" << (uint16_t) it->rsrpResult
+                             << " (" << EutranMeasurementMapping::RsrpRange2Dbm (it->rsrpResult) << " dBm)"
+                             << " rsrq=" << (uint16_t) it->rsrqResult
+                             << " (" << EutranMeasurementMapping::RsrqRange2Db (it->rsrqResult) << " dB)");
+
+        } // end of else of if (measResults.measResultListEutra.size () == 0)
+
+      // verifying the report timing
+      bool hasEnded = m_itExpectedTime == m_expectedTime.end ();
+      NS_TEST_ASSERT_MSG_EQ (hasEnded, false,
+                             "Reporting should not have occurred at "
+                             << Simulator::Now ().GetSeconds () << "s");
+      if (!hasEnded)
+        {
+          hasEnded = m_itExpectedRsrp == m_expectedRsrp.end ();
+          NS_ASSERT (!hasEnded);
+
+          // using milliseconds to avoid floating-point comparison
+          uint64_t timeNowMs = Simulator::Now ().GetMilliSeconds ();
+          uint64_t timeExpectedMs = m_itExpectedTime->GetMilliSeconds ();
+          m_itExpectedTime++;
+
+          uint16_t observedRsrp = measResults.rsrpResult;
+          uint16_t referenceRsrp = *m_itExpectedRsrp;
+          m_itExpectedRsrp++;
+
+          NS_TEST_ASSERT_MSG_EQ (timeNowMs, timeExpectedMs,
+                                 "Reporting should not have occurred at this time");
+          NS_TEST_ASSERT_MSG_EQ (observedRsrp, referenceRsrp,
+                                 "The RSRP observed differs with the reference RSRP");
+
+        } // end of if (!hasEnded)
+
+    } // end of if (report.measResults.measId == m_expectedMeasId)
+
+} // end of void LteUeMeasurementsPiecewiseTestCase2::RecvMeasurementReportCallback
+
+void
+LteUeMeasurementsPiecewiseTestCase2::TeleportVeryNear ()
+{
+  NS_LOG_FUNCTION (this);
+  m_ueMobility->SetPosition (Vector (50.0, 0.0, 0.0));
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase2::TeleportNear ()
+{
+  NS_LOG_FUNCTION (this);
+  m_ueMobility->SetPosition (Vector (250.0, 0.0, 0.0));
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase2::TeleportFar ()
+{
+  NS_LOG_FUNCTION (this);
+  m_ueMobility->SetPosition (Vector (350.0, 0.0, 0.0));
+}
+
+void
+LteUeMeasurementsPiecewiseTestCase2::TeleportVeryFar ()
+{
+  NS_LOG_FUNCTION (this);
+  m_ueMobility->SetPosition (Vector (550.0, 0.0, 0.0));
+}
+
+
+// ===== LTE-UE-MEASUREMENTS-HANDOVER TEST SUITE =========================== //
+
+/*
+ * Test Suite
+ */
+
+LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite ()
+  : TestSuite ("lte-ue-measurements-handover", SYSTEM)
+{
+  std::list<LteRrcSap::ReportConfigEutra> sourceConfigList;
+  std::list<LteRrcSap::ReportConfigEutra> targetConfigList;
+  std::vector<Time> expectedTime;
+  std::vector<uint8_t> expectedRsrp;
+
+  LteRrcSap::ReportConfigEutra sourceConfig;
+  sourceConfig.triggerType = LteRrcSap::ReportConfigEutra::EVENT;
+  sourceConfig.eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  sourceConfig.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRP;
+  sourceConfig.threshold1.range = 0;
+  sourceConfig.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRP;
+  sourceConfig.reportInterval = LteRrcSap::ReportConfigEutra::MS240;
+  sourceConfigList.push_back (sourceConfig);
+
+  LteRrcSap::ReportConfigEutra targetConfig;
+  targetConfig.triggerType = LteRrcSap::ReportConfigEutra::EVENT;
+  targetConfig.eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  targetConfig.threshold1.choice = LteRrcSap::ThresholdEutra::THRESHOLD_RSRP;
+  targetConfig.threshold1.range = 0;
+  targetConfig.triggerQuantity = LteRrcSap::ReportConfigEutra::RSRP;
+  targetConfig.reportInterval = LteRrcSap::ReportConfigEutra::MS240;
+  targetConfigList.push_back (targetConfig);
+
+  // === Report interval difference ===
+
+  // decreasing report interval
+  sourceConfigList.front ().reportInterval = LteRrcSap::ReportConfigEutra::MS480;
+  targetConfigList.front ().reportInterval = LteRrcSap::ReportConfigEutra::MS240;
+  expectedTime.clear ();
+  expectedTime << 200 << 680 << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 55 << 55 << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - decreasing report interval",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::TAKES_FOREVER);
+
+  // increasing report interval
+  sourceConfigList.front ().reportInterval = LteRrcSap::ReportConfigEutra::MS120;
+  targetConfigList.front ().reportInterval = LteRrcSap::ReportConfigEutra::MS640;
+  expectedTime.clear ();
+  expectedTime << 200 << 320 << 440 << 560 << 680 << 800 << 920 << 1200 << 1840;
+  expectedRsrp.clear ();
+  expectedRsrp << 55 << 55 << 55 << 55 << 55 << 55 << 55 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - increasing report interval",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::QUICK);
+
+  // === Event difference ===
+
+  sourceConfigList.front ().reportInterval = LteRrcSap::ReportConfigEutra::MS240;
+  targetConfigList.front ().reportInterval = LteRrcSap::ReportConfigEutra::MS240;
+  sourceConfigList.front ().threshold1.range = 54;
+  sourceConfigList.front ().threshold2.range = 54;
+  sourceConfigList.front ().a3Offset = 1;
+  targetConfigList.front ().threshold1.range = 54;
+  targetConfigList.front ().threshold2.range = 54;
+  targetConfigList.front ().a3Offset = 1;
+
+  // Event A1 to Event A2
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 920 << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 55 << 55 << 55 << 55 << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A1 to Event A2",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::EXTENSIVE);
+
+  // Event A2 to Event A1
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A2 to Event A1",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::TAKES_FOREVER);
+
+  // Event A3 to Event A4
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  expectedTime.clear ();
+  expectedTime << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A3 to Event A4",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::TAKES_FOREVER);
+
+  // Event A4 to Event A3
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  expectedTime.clear ();
+  expectedTime << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A4 to Event A3",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::QUICK);
+
+  // Event A2 to Event A3
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  expectedTime.clear ();
+  expectedTime << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A2 to Event A3",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::EXTENSIVE);
+
+  // Event A3 to Event A2
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  expectedTime.clear ();
+  expectedTime << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A3 to Event A2",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::TAKES_FOREVER);
+
+  // Event A4 to Event A5
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A5;
+  expectedTime.clear ();
+  expectedTime << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A4 to Event A5",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::TAKES_FOREVER);
+
+  // Event A5 to Event A4
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A5;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  expectedTime.clear ();
+  expectedTime << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A5 to Event A4",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::EXTENSIVE);
+
+  // === Threshold/offset difference ===
+
+  sourceConfigList.front ().threshold1.range = 52;
+  targetConfigList.front ().threshold1.range = 56;
+
+  // Event A1
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 920;
+  expectedRsrp.clear ();
+  expectedRsrp << 55 << 55 << 55 << 55;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A1 threshold difference",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::EXTENSIVE);
+
+  // Event A2
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A2;
+  expectedTime.clear ();
+  expectedTime << 1200 << 1440 << 1680 << 1920;
+  expectedRsrp.clear ();
+  expectedRsrp << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A2 threshold difference",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::QUICK);
+
+  // Event A3
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  sourceConfigList.front ().a3Offset = -30;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A3;
+  targetConfigList.front ().a3Offset = 30;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 920;
+  expectedRsrp.clear ();
+  expectedRsrp << 55 << 55 << 55 << 55;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A3 offset difference",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::QUICK);
+
+  // Event A4
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A4;
+  expectedTime.clear ();
+  expectedTime << 200 << 440 << 680 << 920;
+  expectedRsrp.clear ();
+  expectedRsrp << 55 << 55 << 55 << 55;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A4 threshold difference",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::EXTENSIVE);
+
+  // Event A5
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A5;
+  sourceConfigList.front ().threshold2.range = 52;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A5;
+  targetConfigList.front ().threshold2.range = 56;
+  expectedTime.clear ();
+  expectedRsrp.clear ();
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - Event A5 threshold difference",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::EXTENSIVE);
+
+  // === Time-to-trigger (TTT) difference ===
+
+  sourceConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  sourceConfigList.front ().a3Offset = 1;
+  sourceConfigList.front ().threshold1.range = 0;
+  sourceConfigList.front ().threshold2.range = 0;
+  targetConfigList.front ().eventId = LteRrcSap::ReportConfigEutra::EVENT_A1;
+  targetConfigList.front ().a3Offset = 1;
+  targetConfigList.front ().threshold1.range = 0;
+  targetConfigList.front ().threshold2.range = 0;
+
+  // decreasing time-to-trigger (short duration)
+  sourceConfigList.front ().timeToTrigger = 1024;
+  targetConfigList.front ().timeToTrigger = 100;
+  expectedTime.clear ();
+  expectedTime << 1300 << 1540 << 1780;
+  expectedRsrp.clear ();
+  expectedRsrp << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - decreasing TTT (short)",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (2)),
+               TestCase::QUICK);
+
+  // decreasing time-to-trigger (longer duration)
+  sourceConfigList.front ().timeToTrigger = 1024;
+  targetConfigList.front ().timeToTrigger = 640;
+  expectedTime.clear ();
+  expectedTime << 1224 << 1464 << 1704 << 1944 << 2840 << 3080 << 3320 << 3560 << 3800 << 4040;
+  expectedRsrp.clear ();
+  expectedRsrp << 55 << 55 << 55 << 55 << 53 << 53 << 53 << 53 << 53 << 53;
+  AddTestCase (new LteUeMeasurementsHandoverTestCase ("Handover test case - decreasing TTT (long)",
+                                                      sourceConfigList, targetConfigList,
+                                                      expectedTime, expectedRsrp,
+                                                      Seconds (4.2)),
+               TestCase::EXTENSIVE);
+
+} // end of LteUeMeasurementsHandoverTestSuite::LteUeMeasurementsHandoverTestSuite
+
+static LteUeMeasurementsHandoverTestSuite lteUeMeasurementsHandoverTestSuite;
+
+
+/*
+ * Test Case
+ */
+
+LteUeMeasurementsHandoverTestCase::LteUeMeasurementsHandoverTestCase (
+  std::string name,
+  std::list<LteRrcSap::ReportConfigEutra> sourceConfigList,
+  std::list<LteRrcSap::ReportConfigEutra> targetConfigList,
+  std::vector<Time> expectedTime, std::vector<uint8_t> expectedRsrp,
+  Time duration)
+  : TestCase (name),
+    m_sourceConfigList (sourceConfigList),
+    m_targetConfigList (targetConfigList),
+    m_expectedTime (expectedTime),
+    m_expectedRsrp (expectedRsrp),
+    m_duration (duration)
+{
+  // input sanity check
+  uint16_t size = m_expectedTime.size ();
+
+  if (size != m_expectedRsrp.size ())
+    {
+      NS_FATAL_ERROR ("Vectors of expected results are not of the same size");
+    }
+
+  m_itExpectedTime = m_expectedTime.begin ();
+  m_itExpectedRsrp = m_expectedRsrp.begin ();
+
+  NS_LOG_INFO (this << " name=" << name);
+}
+
+LteUeMeasurementsHandoverTestCase::~LteUeMeasurementsHandoverTestCase ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+LteUeMeasurementsHandoverTestCase::DoRun ()
+{
+  NS_LOG_INFO (this << " " << GetName ());
+
+  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
+  lteHelper->SetEpcHelper (epcHelper);
+  lteHelper->SetAttribute ("PathlossModel",
+                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));
+
+  // Create Nodes: eNodeB and UE
+  NodeContainer enbNodes;
+  NodeContainer ueNodes;
+  enbNodes.Create (2);
+  ueNodes.Create (1);
+
+  /*
+   * The topology is the following:
+   *
+   * eNodeB                   UE                     eNodeB
+   *    |                     |                         |
+   *    x ------------------- x ----------------------- x
+   *             400 m                   500 m
+   */
+
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+  positionAlloc->Add (Vector (0.0, 0.0, 0.0)); // Source eNodeB
+  positionAlloc->Add (Vector (900.0, 0.0, 0.0)); // Target eNodeB
+  positionAlloc->Add (Vector (400.0, 0.0, 0.0)); // UE
+  MobilityHelper mobility;
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.SetPositionAllocator (positionAlloc);
+  mobility.Install (enbNodes);
+  mobility.Install (ueNodes);
+
+  // Create P-GW node
+  Ptr<Node> pgw = epcHelper->GetPgwNode ();
+
+  // Create a single RemoteHost
+  NodeContainer remoteHostContainer;
+  remoteHostContainer.Create (1);
+  Ptr<Node> remoteHost = remoteHostContainer.Get (0);
+  InternetStackHelper internet;
+  internet.Install (remoteHostContainer);
+
+  // Create the Internet
+  PointToPointHelper p2ph;
+  p2ph.SetDeviceAttribute ("DataRate", DataRateValue (DataRate ("100Gb/s")));
+  p2ph.SetDeviceAttribute ("Mtu", UintegerValue (1500));
+  p2ph.SetChannelAttribute ("Delay", TimeValue (Seconds (0.010)));
+  NetDeviceContainer internetDevices = p2ph.Install (pgw, remoteHost);
+  Ipv4AddressHelper ipv4h;
+  ipv4h.SetBase ("1.0.0.0", "255.0.0.0");
+  Ipv4InterfaceContainer internetIpIfaces = ipv4h.Assign (internetDevices);
+
+  // Routing of the Internet Host (towards the LTE network)
+  Ipv4StaticRoutingHelper ipv4RoutingHelper;
+  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());
+  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);
+
+  // Enable layer-3 filtering
+  Config::SetDefault ("ns3::LteEnbRrc::RsrpFilterCoefficient",
+                      UintegerValue (4));
+
+  // Disable control channel error model
+  Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled",
+                      BooleanValue (false));
+
+  // Create Devices and install them in the Nodes (eNB and UE)
+  NetDeviceContainer enbDevs;
+  NetDeviceContainer ueDevs;
+  enbDevs = lteHelper->InstallEnbDevice (enbNodes);
+  ueDevs = lteHelper->InstallUeDevice (ueNodes);
+
+  // Setup UE measurement configuration in eNodeBs
+  uint8_t measId;
+  std::list<LteRrcSap::ReportConfigEutra>::const_iterator itReportConfig;
+  Ptr<LteEnbRrc> enbRrc1 = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ()->GetRrc ();
+  Ptr<LteEnbRrc> enbRrc2 = enbDevs.Get (1)->GetObject<LteEnbNetDevice> ()->GetRrc ();
+
+  for (itReportConfig = m_sourceConfigList.begin ();
+       itReportConfig != m_sourceConfigList.end (); itReportConfig++)
+    {
+      measId = enbRrc1->AddUeMeasReportConfig (*itReportConfig);
+      m_expectedSourceCellMeasId.insert (measId);
+    }
+
+  for (itReportConfig = m_targetConfigList.begin ();
+       itReportConfig != m_targetConfigList.end (); itReportConfig++)
+    {
+      measId = enbRrc2->AddUeMeasReportConfig (*itReportConfig);
+      m_expectedTargetCellMeasId.insert (measId);
+    }
+
+  // Install the IP stack on the UEs
+  internet.Install (ueNodes);
+  Ipv4InterfaceContainer ueIpIfaces;
+  ueIpIfaces = epcHelper->AssignUeIpv4Address (NetDeviceContainer (ueDevs));
+
+  // Assign IP address to UEs
+  for (uint32_t u = 0; u < ueNodes.GetN (); ++u)
+    {
+      Ptr<Node> ueNode = ueNodes.Get (u);
+      // Set the default gateway for the UE
+      Ptr<Ipv4StaticRouting> ueStaticRouting = ipv4RoutingHelper.GetStaticRouting (ueNode->GetObject<Ipv4> ());
+      ueStaticRouting->SetDefaultRoute (epcHelper->GetUeDefaultGatewayAddress (), 1);
+    }
+
+  // Attach UE to serving eNodeB
+  lteHelper->Attach (ueDevs.Get (0), enbDevs.Get (0));
+
+  // Add X2 interface
+  lteHelper->AddX2Interface (enbNodes);
+
+  // Connect to trace sources in source eNodeB
+  Config::Connect ("/NodeList/1/DeviceList/0/LteEnbRrc/RecvMeasurementReport",
+                   MakeCallback (&LteUeMeasurementsHandoverTestCase::RecvMeasurementReportCallback,
+                                 this));
+
+  // Connect to trace sources in target eNodeB
+  Config::Connect ("/NodeList/2/DeviceList/0/LteEnbRrc/RecvMeasurementReport",
+                   MakeCallback (&LteUeMeasurementsHandoverTestCase::RecvMeasurementReportCallback,
+                                 this));
+
+  // Schedule handover
+  lteHelper->HandoverRequest (MilliSeconds (m_duration.GetMilliSeconds () / 2),
+                              ueDevs.Get (0), enbDevs.Get (0), enbDevs.Get (1));
+
+  // Run simulation
+  Simulator::Stop (m_duration);
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+} // end of void LteUeMeasurementsHandoverTestCase::DoRun ()
+
+void
+LteUeMeasurementsHandoverTestCase::DoTeardown ()
+{
+  NS_LOG_FUNCTION (this);
+  bool hasEnded = m_itExpectedTime == m_expectedTime.end ();
+  NS_TEST_ASSERT_MSG_EQ (hasEnded, true,
+                         "Reporting should have occurred at " << m_itExpectedTime->GetSeconds () << "s");
+  hasEnded = m_itExpectedRsrp == m_expectedRsrp.end ();
+  NS_ASSERT (hasEnded);
+}
+
+void
+LteUeMeasurementsHandoverTestCase::RecvMeasurementReportCallback (
+  std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti,
+  LteRrcSap::MeasurementReport report)
+{
+  uint8_t measId = report.measResults.measId;
+  NS_LOG_FUNCTION (this << context << (uint16_t) measId);
+
+  bool isCorrectMeasId;
+  if (cellId == 1)
+    {
+      std::set<uint8_t>::iterator itMeasId = m_expectedSourceCellMeasId.find (measId);
+      isCorrectMeasId = (itMeasId != m_expectedSourceCellMeasId.end ());
+    }
+  else if (cellId == 2)
+    {
+      std::set<uint8_t>::iterator itMeasId = m_expectedTargetCellMeasId.find (measId);
+      isCorrectMeasId = (itMeasId != m_expectedTargetCellMeasId.end ());
+    }
+  else
+    {
+      NS_FATAL_ERROR ("Invalid cell ID " << cellId);
+    }
+
+  if (isCorrectMeasId)
+    {
+      // verifying the report completeness
+      LteRrcSap::MeasResults measResults = report.measResults;
+      NS_LOG_DEBUG (this << " Serving cellId=" << cellId
+                         << " rsrp=" << (uint16_t) measResults.rsrpResult
+                         << " (" << EutranMeasurementMapping::RsrpRange2Dbm (measResults.rsrpResult) << " dBm)"
+                         << " rsrq=" << (uint16_t) measResults.rsrqResult
+                         << " (" << EutranMeasurementMapping::RsrqRange2Db (measResults.rsrqResult) << " dB)");
+
+      // verifying reported best cells
+      if (measResults.measResultListEutra.size () == 0)
+        {
+          NS_TEST_ASSERT_MSG_EQ (measResults.haveMeasResultNeighCells, false,
+                                 "Unexpected report content");
+        }
+      else
+        {
+          NS_TEST_ASSERT_MSG_EQ (measResults.haveMeasResultNeighCells, true,
+                                 "Unexpected report content");
+          std::list<LteRrcSap::MeasResultEutra>::iterator it = measResults.measResultListEutra.begin ();
+          NS_ASSERT (it != measResults.measResultListEutra.end ());
+          NS_ASSERT (it->physCellId != cellId);
+          NS_ASSERT (it->physCellId <= 2);
+          NS_TEST_ASSERT_MSG_EQ (it->haveCgiInfo, false,
+                                 "Report contains cgi-info, which is not supported");
+          NS_TEST_ASSERT_MSG_EQ (it->haveRsrpResult, true,
+                                 "Report does not contain measured RSRP result");
+          NS_TEST_ASSERT_MSG_EQ (it->haveRsrqResult, true,
+                                 "Report does not contain measured RSRQ result");
+          NS_LOG_DEBUG (this << " Neighbour cellId=" << it->physCellId
+                             << " rsrp=" << (uint16_t) it->rsrpResult
+                             << " (" << EutranMeasurementMapping::RsrpRange2Dbm (it->rsrpResult) << " dBm)"
+                             << " rsrq=" << (uint16_t) it->rsrqResult
+                             << " (" << EutranMeasurementMapping::RsrqRange2Db (it->rsrqResult) << " dB)");
+
+        } // end of else of if (measResults.measResultListEutra.size () == 0)
+
+      // verifying the report timing
+      bool hasEnded = m_itExpectedTime == m_expectedTime.end ();
+      NS_TEST_ASSERT_MSG_EQ (hasEnded, false,
+                             "Reporting should not have occurred at "
+                             << Simulator::Now ().GetSeconds () << "s");
+      if (!hasEnded)
+        {
+          hasEnded = m_itExpectedRsrp == m_expectedRsrp.end ();
+          NS_ASSERT (!hasEnded);
+
+          // using milliseconds to avoid floating-point comparison
+          uint64_t timeNowMs = Simulator::Now ().GetMilliSeconds ();
+          uint64_t timeExpectedMs = m_itExpectedTime->GetMilliSeconds ();
+          m_itExpectedTime++;
+
+          uint16_t observedRsrp = measResults.rsrpResult;
+          uint16_t referenceRsrp = *m_itExpectedRsrp;
+          m_itExpectedRsrp++;
+
+          NS_TEST_ASSERT_MSG_EQ (timeNowMs, timeExpectedMs,
+                                 "Reporting should not have occurred at this time");
+          NS_TEST_ASSERT_MSG_EQ (observedRsrp, referenceRsrp,
+                                 "The RSRP observed differs with the reference RSRP");
+
+        } // end of if (!hasEnded)
+
+    } // end of if (report.measResults.measId == correctMeasId)
+
+} // end of void LteUeMeasurementsHandoverTestCase::RecvMeasurementReportCallback
+
+
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/lte/test/lte-test-ue-measurements.h ns-3.19/src/lte/test/lte-test-ue-measurements.h
--- ns-3.18.1/src/lte/test/lte-test-ue-measurements.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-ue-measurements.h	2013-12-20 09:44:50.000000000 -0800
@@ -17,8 +17,9 @@
  *
  * Author: Manuel Requena <manuel.requena@cttc.es>
  *         Nicola Baldo <nbaldo@cttc.es>
- *         Marco Miozzo <mmiozzo@cttc.es> 
+ *         Marco Miozzo <mmiozzo@cttc.es>
  *              adapt lte-test-interference.cc to lte-ue-measurements.cc
+ *         Budiarto Herman <budiarto.herman@magister.fi>
  */
 
 #ifndef LTE_TEST_UE_MEASUREMENTS_H
@@ -26,13 +27,22 @@
 
 #include <ns3/test.h>
 #include <ns3/lte-rrc-sap.h>
-
+#include <ns3/nstime.h>
+#include <list>
+#include <set>
+#include <vector>
 
 namespace ns3 {
 
 
+class MobilityModel;
+
+
+// ===== LTE-UE-MEASUREMENTS TEST SUITE ==================================== //
+
+
 /**
- * Test that UE Measurements (see 36.214) calculation works fine in a 
+ * Test that UE Measurements (see 36.214) calculation works fine in a
  * multi-cell interference scenario.
  */
 class LteUeMeasurementsTestSuite : public TestSuite
@@ -55,17 +65,346 @@
 private:
   virtual void DoRun (void);
 
-
   double m_d1;
   double m_d2;
   double m_rsrpDbmUeServingCell;
   double m_rsrpDbmUeNeighborCell;
   double m_rsrqDbUeServingCell;
   double m_rsrqDbUeNeighborCell;
-  
+
+};
+
+
+
+// ===== LTE-UE-MEASUREMENTS-PIECEWISE-1 TEST SUITE ======================== //
+
+
+/**
+ * \brief Test suite for generating calls to UE measurements test case
+ *        ns3::LteUeMeasurementsPiecewiseTestCase1.
+ */
+class LteUeMeasurementsPiecewiseTestSuite1 : public TestSuite
+{
+public:
+  LteUeMeasurementsPiecewiseTestSuite1 ();
+};
+
+
+/**
+ * \brief Testing UE measurements in LTE with simulation of 1 eNodeB and 1 UE in
+ *        piecewise configuration and 120 ms report interval.
+ */
+class LteUeMeasurementsPiecewiseTestCase1 : public TestCase
+{
+public:
+  LteUeMeasurementsPiecewiseTestCase1 (std::string name,
+                                       LteRrcSap::ReportConfigEutra config,
+                                       std::vector<Time> expectedTime,
+                                       std::vector<uint8_t> expectedRsrp);
+
+  virtual ~LteUeMeasurementsPiecewiseTestCase1 ();
+
+  /**
+   * \brief Triggers when eNodeB receives measurement report from UE, then
+   *        perform verification on it.
+   *
+   * The trigger is set up beforehand by connecting to the
+   * `LteUeRrc::RecvMeasurementReport` trace source.
+   *
+   * Verification consists of checking whether the report carries the right
+   * value of RSRP or not, and whether it occurs at the expected time or not.
+   */
+  void RecvMeasurementReportCallback (std::string context, uint64_t imsi,
+                                      uint16_t cellId, uint16_t rnti,
+                                      LteRrcSap::MeasurementReport report);
+
+private:
+  /**
+   * \brief Setup the simulation with the intended UE measurement reporting
+   *        configuration, run it, and connect the
+   *        `RecvMeasurementReportCallback` function to the
+   *        `LteUeRrc::RecvMeasurementReport` trace source.
+   */
+  virtual void DoRun ();
+
+  /**
+   * \brief Runs at the end of the simulation, verifying that all expected
+   *        measurement reports have been examined.
+   */
+  virtual void DoTeardown ();
+
+  void TeleportVeryNear ();
+  void TeleportNear ();
+  void TeleportFar ();
+  void TeleportVeryFar ();
+
+  /**
+   * \brief The active report triggering configuration.
+   */
+  LteRrcSap::ReportConfigEutra m_config;
+
+  /**
+   * \brief The list of expected time when measurement reports are received by
+   *        eNodeB.
+   */
+  std::vector<Time> m_expectedTime;
+
+  /**
+   * \brief The list of expected values of RSRP (in 3GPP range unit) from the
+   *        measurement reports received.
+   */
+  std::vector<uint8_t> m_expectedRsrp;
+
+  /**
+   * \brief Pointer to the element of `m_expectedTime` which is expected to
+   *        occur next in the simulation.
+   */
+  std::vector<Time>::iterator m_itExpectedTime;
+
+  /**
+   * \brief Pointer to the element of `m_expectedRsrp` which is expected to
+   *        occur next in the simulation.
+   */
+  std::vector<uint8_t>::iterator m_itExpectedRsrp;
+
+  /**
+   * \brief The measurement identity being tested. Measurement reports with
+   *        different measurement identity (e.g. from handover algorithm) will
+   *        be ignored.
+   */
+  uint8_t m_expectedMeasId;
+
+  Ptr<MobilityModel> m_ueMobility;
+
+}; // end of class LteUeMeasurementsPiecewiseTestCase1
+
+
+
+// ===== LTE-UE-MEASUREMENTS-PIECEWISE-2 TEST SUITE ======================== //
+
+
+/**
+ * \brief Test suite for generating calls to UE measurements test case
+ *        ns3::LteUeMeasurementsPiecewiseTestCase2.
+ */
+class LteUeMeasurementsPiecewiseTestSuite2 : public TestSuite
+{
+public:
+  LteUeMeasurementsPiecewiseTestSuite2 ();
+};
+
+
+/**
+ * \brief Testing UE measurements in LTE with simulation of 2 eNodeB and 1 UE in
+ *        piecewise configuration and 240 ms report interval.
+ */
+class LteUeMeasurementsPiecewiseTestCase2 : public TestCase
+{
+public:
+  LteUeMeasurementsPiecewiseTestCase2 (std::string name,
+                                       LteRrcSap::ReportConfigEutra config,
+                                       std::vector<Time> expectedTime,
+                                       std::vector<uint8_t> expectedRsrp);
+
+  virtual ~LteUeMeasurementsPiecewiseTestCase2 ();
+
+  /**
+   * \brief Triggers when eNodeB receives measurement report from UE, then
+   *        perform verification on it.
+   *
+   * The trigger is set up beforehand by connecting to the
+   * `LteUeRrc::RecvMeasurementReport` trace source.
+   *
+   * Verification consists of checking whether the report carries the right
+   * value of RSRP or not, and whether it occurs at the expected time or not.
+   */
+  void RecvMeasurementReportCallback (std::string context, uint64_t imsi,
+                                      uint16_t cellId, uint16_t rnti,
+                                      LteRrcSap::MeasurementReport report);
+
+private:
+  /**
+   * \brief Setup the simulation with the intended UE measurement reporting
+   *        configuration, run it, and connect the
+   *        `RecvMeasurementReportCallback` function to the
+   *        `LteUeRrc::RecvMeasurementReport` trace source.
+   */
+  virtual void DoRun ();
+
+  /**
+   * \brief Runs at the end of the simulation, verifying that all expected
+   *        measurement reports have been examined.
+   */
+  virtual void DoTeardown ();
+
+  void TeleportVeryNear ();
+  void TeleportNear ();
+  void TeleportFar ();
+  void TeleportVeryFar ();
+
+  /**
+   * \brief The active report triggering configuration.
+   */
+  LteRrcSap::ReportConfigEutra m_config;
+
+  /**
+   * \brief The list of expected time when measurement reports are received by
+   *        eNodeB.
+   */
+  std::vector<Time> m_expectedTime;
+
+  /**
+   * \brief The list of expected values of RSRP (in 3GPP range unit) from the
+   *        measurement reports received.
+   */
+  std::vector<uint8_t> m_expectedRsrp;
+
+  /**
+   * \brief Pointer to the element of `m_expectedTime` which is expected to
+   *        occur next in the simulation.
+   */
+  std::vector<Time>::iterator m_itExpectedTime;
+
+  /**
+   * \brief Pointer to the element of `m_expectedRsrp` which is expected to
+   *        occur next in the simulation.
+   */
+  std::vector<uint8_t>::iterator m_itExpectedRsrp;
+
+  /**
+   * \brief The measurement identity being tested. Measurement reports with
+   *        different measurement identity (e.g. from handover algorithm) will
+   *        be ignored.
+   */
+  uint8_t m_expectedMeasId;
+
+  Ptr<MobilityModel> m_ueMobility;
+
+}; // end of class LteUeMeasurementsPiecewiseTestCase2
+
+
+
+// ===== LTE-UE-MEASUREMENTS-HANDOVER TEST SUITE =========================== //
+
+
+/**
+ * \brief Test suite for generating calls to UE measurements test case
+ *        ns3::LteUeMeasurementsHandoverTestCase.
+ */
+class LteUeMeasurementsHandoverTestSuite : public TestSuite
+{
+public:
+  LteUeMeasurementsHandoverTestSuite ();
 };
 
 
+/**
+ * \brief Testing UE measurements in LTE with simulation of 2 eNodeB and 1 UE in
+ *        a handover configuration.
+ *
+ * The simulation will run for the specified duration, while the handover
+ * command will be issued exactly at the middle of simulation.
+ */
+class LteUeMeasurementsHandoverTestCase : public TestCase
+{
+public:
+  LteUeMeasurementsHandoverTestCase (std::string name,
+                                     std::list<LteRrcSap::ReportConfigEutra> sourceConfigList,
+                                     std::list<LteRrcSap::ReportConfigEutra> targetConfigList,
+                                     std::vector<Time> expectedTime,
+                                     std::vector<uint8_t> expectedRsrp,
+                                     Time duration);
+
+  virtual ~LteUeMeasurementsHandoverTestCase ();
+
+  /**
+   * \brief Triggers when either one of the eNodeBs receives measurement report
+   *        from UE, then perform verification on it.
+   *
+   * The trigger is set up beforehand by connecting to the
+   * `LteUeRrc::RecvMeasurementReport` trace source.
+   *
+   * Verification consists of checking whether the report carries the right
+   * value of RSRP or not, and whether it occurs at the expected time or not.
+   */
+  void RecvMeasurementReportCallback (std::string context, uint64_t imsi,
+                                      uint16_t cellId, uint16_t rnti,
+                                      LteRrcSap::MeasurementReport report);
+
+private:
+  /**
+   * \brief Setup the simulation with the intended UE measurement reporting
+   *        configuration, run it, and connect the
+   *        `RecvMeasurementReportCallback` function to the
+   *        `LteUeRrc::RecvMeasurementReport` trace source.
+   */
+  virtual void DoRun ();
+
+  /**
+   * \brief Runs at the end of the simulation, verifying that all expected
+   *        measurement reports have been examined.
+   */
+  virtual void DoTeardown ();
+
+  /**
+   * \brief The list of active report triggering configuration for the source
+   *        eNodeB.
+   */
+  std::list<LteRrcSap::ReportConfigEutra> m_sourceConfigList;
+
+  /**
+   * \brief The list of active report triggering configuration for the target
+   *        eNodeB.
+   */
+  std::list<LteRrcSap::ReportConfigEutra> m_targetConfigList;
+
+  /**
+   * \brief The list of expected time when measurement reports are received by
+   *        eNodeB.
+   */
+  std::vector<Time> m_expectedTime;
+
+  /**
+   * \brief The list of expected values of RSRP (in 3GPP range unit) from the
+   *        measurement reports received.
+   */
+  std::vector<uint8_t> m_expectedRsrp;
+
+  /**
+   * \brief Pointer to the element of `m_expectedTime` which is expected to
+   *        occur next in the simulation.
+   */
+  std::vector<Time>::iterator m_itExpectedTime;
+
+  /**
+   * \brief Pointer to the element of `m_expectedRsrp` which is expected to
+   *        occur next in the simulation.
+   */
+  std::vector<uint8_t>::iterator m_itExpectedRsrp;
+
+  /**
+   * \brief Duration of simulation.
+   */
+  Time m_duration;
+
+  /**
+   * \brief The list of measurement identities being tested in the source cell.
+   *        Measurement reports with different measurement identity (e.g. from
+   *        handover algorithm and ANR) will be ignored.
+   */
+  std::set<uint8_t> m_expectedSourceCellMeasId;
+
+  /**
+   * \brief The list of measurement identities being tested in the target cell.
+   *        Measurement reports with different measurement identity (e.g. from
+   *        handover algorithm and ANR) will be ignored.
+   */
+  std::set<uint8_t> m_expectedTargetCellMeasId;
+
+}; // end of class LteUeMeasurementsHandoverTestCase
+
+
+
 } // namespace ns3
 
 
diff -Naur ns-3.18.1/src/lte/test/lte-test-ue-phy.cc ns-3.19/src/lte/test/lte-test-ue-phy.cc
--- ns-3.18.1/src/lte/test/lte-test-ue-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-ue-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 namespace ns3 {
 
  
-NS_OBJECT_ENSURE_REGISTERED (LteTestUePhy);
+NS_OBJECT_ENSURE_REGISTERED (LteTestUePhy)
+  ;
 
 LteTestUePhy::LteTestUePhy ()
 {
diff -Naur ns-3.18.1/src/lte/test/lte-test-uplink-sinr.cc ns-3.19/src/lte/test/lte-test-uplink-sinr.cc
--- ns-3.18.1/src/lte/test/lte-test-uplink-sinr.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/lte-test-uplink-sinr.cc	2013-12-20 09:44:50.000000000 -0800
@@ -337,7 +337,7 @@
   */
   
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  lteHelper->EnableLogComponents ();
+  // lteHelper->EnableLogComponents ();
   Ptr<LteSpectrumPhy> dlPhy = CreateObject<LteSpectrumPhy> ();
   Ptr<LteSpectrumPhy> ulPhy = CreateObject<LteSpectrumPhy> ();
   Ptr<LteTestUePhy> uePhy = CreateObject<LteTestUePhy> (dlPhy, ulPhy);
diff -Naur ns-3.18.1/src/lte/test/test-lte-epc-e2e-data.cc ns-3.19/src/lte/test/test-lte-epc-e2e-data.cc
--- ns-3.18.1/src/lte/test/test-lte-epc-e2e-data.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/test-lte-epc-e2e-data.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,7 @@
 #include "ns3/log.h"
 #include "ns3/test.h"
 #include "ns3/lte-helper.h"
-#include "ns3/epc-helper.h"
+#include "ns3/point-to-point-epc-helper.h"
 #include "ns3/packet-sink-helper.h"
 #include "ns3/udp-client-server-helper.h"
 #include "ns3/udp-echo-helper.h"
@@ -47,7 +47,8 @@
 namespace ns3 {
 
 
-NS_LOG_COMPONENT_DEFINE ("LteEpcE2eData");
+NS_LOG_COMPONENT_DEFINE ("LteEpcE2eData")
+  ;
 
 
 
@@ -116,7 +117,7 @@
   Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));  
   Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (true));
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper> epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
 
   lteHelper->SetAttribute("PathlossModel",
@@ -272,16 +273,16 @@
                UintegerValue (2 * 1024 * 1024));
 
 
-  Time simulationTime = Seconds (2.0);
-
-  double statsStartTime = 0.040; // need to allow for RRC connection establishment + SRS 
+  double statsStartTime = 0.040; // need to allow for RRC connection establishment + SRS
+  double statsDuration = 2.0;
+    
   lteHelper->EnablePdcpTraces ();
 
   lteHelper->GetPdcpStats ()->SetAttribute ("StartTime", TimeValue (Seconds (statsStartTime)));
-  lteHelper->GetPdcpStats ()->SetAttribute ("EpochDuration", TimeValue (simulationTime));
+  lteHelper->GetPdcpStats ()->SetAttribute ("EpochDuration", TimeValue (Seconds (statsDuration)));
   
   
-  Simulator::Stop (simulationTime);  
+  Simulator::Stop (Seconds (statsStartTime + statsDuration - 0.0001));  
   Simulator::Run ();
 
   uint64_t imsiCounter = 0;
diff -Naur ns-3.18.1/src/lte/test/test-lte-handover-delay.cc ns-3.19/src/lte/test/test-lte-handover-delay.cc
--- ns-3.18.1/src/lte/test/test-lte-handover-delay.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/test-lte-handover-delay.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,7 @@
 #include <ns3/ipv4-interface-container.h>
 
 #include <ns3/lte-helper.h>
-#include <ns3/epc-helper.h>
+#include <ns3/point-to-point-epc-helper.h>
 #include <ns3/internet-stack-helper.h>
 #include <ns3/point-to-point-helper.h>
 #include <ns3/ipv4-address-helper.h>
@@ -96,7 +96,7 @@
       << " handover time = " << m_handoverTime.GetSeconds () << "-----");
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  Ptr<EpcHelper> epcHelper = CreateObject<EpcHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
   lteHelper->SetEpcHelper (epcHelper);
   lteHelper->SetAttribute ("UseIdealRrc", BooleanValue(m_useIdealRrc));
 
diff -Naur ns-3.18.1/src/lte/test/test-lte-handover-target.cc ns-3.19/src/lte/test/test-lte-handover-target.cc
--- ns-3.18.1/src/lte/test/test-lte-handover-target.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/lte/test/test-lte-handover-target.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,434 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Budiarto Herman
+ *
+ * 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: Budiarto Herman <budiarto.herman@magister.fi>
+ *
+ */
+
+#include <ns3/test.h>
+
+#include <ns3/log.h>
+#include <ns3/nstime.h>
+#include <ns3/callback.h>
+#include <ns3/config.h>
+#include <ns3/boolean.h>
+#include <ns3/double.h>
+#include <ns3/uinteger.h>
+#include <ns3/simulator.h>
+
+#include <ns3/node-container.h>
+#include <ns3/net-device-container.h>
+#include <ns3/ipv4-interface-container.h>
+
+#include <ns3/lte-helper.h>
+#include <ns3/point-to-point-epc-helper.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/point-to-point-helper.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/ipv4-static-routing-helper.h>
+#include <ns3/mobility-helper.h>
+
+#include <ns3/data-rate.h>
+#include <ns3/ipv4-static-routing.h>
+#include <ns3/position-allocator.h>
+#include <ns3/lte-enb-net-device.h>
+#include <ns3/lte-enb-phy.h>
+
+NS_LOG_COMPONENT_DEFINE ("LteHandoverTargetTest");
+
+namespace ns3 {
+
+
+/**
+ * \brief Testing a handover algorithm, verifying that it selects the right
+ *        target cell when more than one options available.
+ *
+ * Part of the `lte-handover-target` test suite.
+ *
+ * The test case will run a 1-second LTE-EPC simulation using the parameters
+ * provided to the constructor function.
+ *
+ * \sa ns3::LteHandoverTargetTestCase
+ */
+class LteHandoverTargetTestCase : public TestCase
+{
+public:
+  /**
+   * \brief Construct a new test case and providing input parameters for the
+   *        simulation.
+   * \param name the name of the test case, to be displayed in the test result
+   * \param uePosition the point in (x, y, z) coordinate where the UE will be
+   *                   placed in the simulation
+   * \param gridSizeX number of eNodeBs in a row
+   * \param gridSizeY number of eNodeBs in a column
+   * \param sourceCellId the cell ID of the eNodeB which the UE will be
+   *                     initially attached to in the beginning of simulation,
+   *                     and also the eNodeB which will "shutdown" in the
+   *                     middle of simulation
+   * \param targetCellId the cell ID of the expected eNodeB where the UE will
+   *                     perform handover to after the "shutdown" of the source
+   *                     cell
+   * \param handoverAlgorithmType the type of handover algorithm to be used in
+   *                              all eNodeBs
+   */
+  LteHandoverTargetTestCase (std::string name, Vector uePosition,
+                             uint8_t gridSizeX, uint8_t gridSizeY,
+                             uint16_t sourceCellId, uint16_t targetCellId,
+                             std::string handoverAlgorithmType);
+
+  virtual ~LteHandoverTargetTestCase ();
+
+  /**
+   * \brief Triggers when an eNodeB starts a handover and then verifies that
+   *        the handover has the right source and target cells.
+   *
+   * The trigger is set up beforehand by connecting to the
+   * `LteEnbRrc::HandoverStart` trace source.
+   */
+  void HandoverStartCallback (std::string context, uint64_t imsi,
+                              uint16_t sourceCellId, uint16_t rnti,
+                              uint16_t targetCellId);
+
+  /**
+   * \brief A trigger that can be scheduled to "shutdown" the cell pointed by
+   *        `m_sourceCellId` by reducing its power to 1 dB.
+   */
+  void CellShutdownCallback ();
+
+private:
+  /**
+   * \brief Run a simulation of a micro-cell network using the parameters
+   *        provided to the constructor function.
+   */
+  virtual void DoRun ();
+
+  /**
+   * \brief Called at the end of simulation and verifies that a handover has
+   *        occurred in the simulation.
+   */
+  virtual void DoTeardown ();
+
+  // simulation parameters
+  Vector m_uePosition;
+  uint8_t m_gridSizeX;
+  uint8_t m_gridSizeY;
+  uint16_t m_sourceCellId;
+  uint16_t m_targetCellId;
+  std::string m_handoverAlgorithmType;
+
+  Ptr<LteEnbNetDevice> m_sourceEnbDev;
+  bool m_hasHandoverOccurred;
+
+}; // end of class LteHandoverTargetTestCase
+
+
+LteHandoverTargetTestCase::LteHandoverTargetTestCase (std::string name, Vector uePosition,
+                                                      uint8_t gridSizeX, uint8_t gridSizeY,
+                                                      uint16_t sourceCellId, uint16_t targetCellId,
+                                                      std::string handoverAlgorithmType)
+  : TestCase (name),
+    m_uePosition (uePosition),
+    m_gridSizeX (gridSizeX),
+    m_gridSizeY (gridSizeY),
+    m_sourceCellId (sourceCellId),
+    m_targetCellId (targetCellId),
+    m_handoverAlgorithmType (handoverAlgorithmType),
+    m_sourceEnbDev (0),
+    m_hasHandoverOccurred (false)
+{
+  NS_LOG_INFO (this << " name=" << name);
+
+  // SANITY CHECK
+
+  uint16_t nEnb = gridSizeX * gridSizeY;
+
+  if (sourceCellId > nEnb)
+    {
+      NS_FATAL_ERROR ("Invalid source cell ID " << sourceCellId);
+    }
+
+  if (targetCellId > nEnb)
+    {
+      NS_FATAL_ERROR ("Invalid target cell ID " << targetCellId);
+    }
+}
+
+
+LteHandoverTargetTestCase::~LteHandoverTargetTestCase ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+
+void
+LteHandoverTargetTestCase::HandoverStartCallback (std::string context, uint64_t imsi,
+                                                  uint16_t sourceCellId, uint16_t rnti,
+                                                  uint16_t targetCellId)
+{
+  NS_LOG_FUNCTION (this << context << imsi << sourceCellId << rnti << targetCellId);
+
+  uint64_t timeNowMs = Simulator::Now ().GetMilliSeconds ();
+  NS_TEST_ASSERT_MSG_GT (timeNowMs, 500,
+                         "Handover occured but too early");
+  NS_TEST_ASSERT_MSG_EQ (sourceCellId, m_sourceCellId,
+                         "Handover occured but with wrong source cell");
+  NS_TEST_ASSERT_MSG_EQ (targetCellId, m_targetCellId,
+                         "Handover occured but with wrong target cell");
+  m_hasHandoverOccurred = true;
+}
+
+
+void
+LteHandoverTargetTestCase::CellShutdownCallback ()
+{
+  NS_LOG_FUNCTION (this);
+
+  if (m_sourceEnbDev != 0)
+    {
+      // set the Tx power to 1 dBm
+      NS_ASSERT (m_sourceEnbDev->GetCellId () == m_sourceCellId);
+      NS_LOG_INFO ("Shutting down cell " << m_sourceCellId);
+      Ptr<LteEnbPhy> phy = m_sourceEnbDev->GetPhy ();
+      phy->SetTxPower (1);
+    }
+}
+
+
+void
+LteHandoverTargetTestCase::DoRun ()
+{
+  NS_LOG_INFO (this << " " << GetName ());
+
+  Config::SetDefault ("ns3::LteEnbPhy::TxPower", DoubleValue (38)); // micro cell
+  Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled",
+                      BooleanValue (false)); // disable control channel error model
+
+  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
+  Ptr<PointToPointEpcHelper> epcHelper = CreateObject<PointToPointEpcHelper> ();
+  lteHelper->SetEpcHelper (epcHelper);
+  lteHelper->SetAttribute ("PathlossModel",
+                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));
+
+  if (m_handoverAlgorithmType == "ns3::A2A4RsrqHandoverAlgorithm")
+    {
+      lteHelper->SetHandoverAlgorithmType ("ns3::A2A4RsrqHandoverAlgorithm");
+      lteHelper->SetHandoverAlgorithmAttribute ("ServingCellThreshold",
+                                                UintegerValue (30));
+      lteHelper->SetHandoverAlgorithmAttribute ("NeighbourCellOffset",
+                                                UintegerValue (1));
+    }
+  else if (m_handoverAlgorithmType == "ns3::A3RsrpHandoverAlgorithm")
+    {
+      lteHelper->SetHandoverAlgorithmType ("ns3::A3RsrpHandoverAlgorithm");
+      lteHelper->SetHandoverAlgorithmAttribute ("Hysteresis",
+                                                DoubleValue (1.5));
+      lteHelper->SetHandoverAlgorithmAttribute ("TimeToTrigger",
+                                                TimeValue (MilliSeconds (128)));
+    }
+  else
+    {
+      NS_FATAL_ERROR ("Unknown handover algorithm " << m_handoverAlgorithmType);
+    }
+
+  // Create Nodes: eNodeB and UE
+  NodeContainer enbNodes;
+  NodeContainer ueNodes;
+  enbNodes.Create (m_gridSizeX * m_gridSizeY);
+  ueNodes.Create (1);
+
+  /*
+   * The size of the grid is determined by m_gridSizeX and m_gridSizeY. The
+   * following figure is the topology when m_gridSizeX = 4 and m_gridSizeY = 3.
+   *
+   *                  9 -- 10 -- 11 -- 12
+   *                  |     |     |     |
+   *                  |     |     |     |
+   *                  5 --- 6 --- 7 --- 8
+   *                  |     |     |     |
+   *                  |     |     |     |
+   *   (0, 0, 0) ---> 1 --- 2 --- 3 --- 4
+   *
+   * The grid starts at (0, 0, 0) point on the bottom left corner. The distance
+   * between two adjacent eNodeBs is 130 m.
+   */
+
+  // Set up eNodeB position
+  MobilityHelper enbMobility;
+  enbMobility.SetPositionAllocator ("ns3::GridPositionAllocator",
+                                    "MinX", DoubleValue (0.0),
+                                    "MinY", DoubleValue (0.0),
+                                    "DeltaX", DoubleValue (130.0),
+                                    "DeltaY", DoubleValue (130.0),
+                                    "GridWidth", UintegerValue (m_gridSizeX),
+                                    "LayoutType", StringValue ("RowFirst"));
+  enbMobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  enbMobility.Install (enbNodes);
+
+  // Setup UE position
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+  positionAlloc->Add (m_uePosition);
+  MobilityHelper ueMobility;
+  ueMobility.SetPositionAllocator (positionAlloc);
+  ueMobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  ueMobility.Install (ueNodes);
+
+  // Create P-GW node
+  Ptr<Node> pgw = epcHelper->GetPgwNode ();
+
+  // Create a single RemoteHost
+  NodeContainer remoteHostContainer;
+  remoteHostContainer.Create (1);
+  Ptr<Node> remoteHost = remoteHostContainer.Get (0);
+  InternetStackHelper internet;
+  internet.Install (remoteHostContainer);
+
+  // Create the Internet
+  PointToPointHelper p2ph;
+  p2ph.SetDeviceAttribute ("DataRate", DataRateValue (DataRate ("100Gb/s")));
+  p2ph.SetDeviceAttribute ("Mtu", UintegerValue (1500));
+  p2ph.SetChannelAttribute ("Delay", TimeValue (Seconds (0.010)));
+  NetDeviceContainer internetDevices = p2ph.Install (pgw, remoteHost);
+  Ipv4AddressHelper ipv4h;
+  ipv4h.SetBase ("1.0.0.0", "255.0.0.0");
+  Ipv4InterfaceContainer internetIpIfaces = ipv4h.Assign (internetDevices);
+
+  // Routing of the Internet Host (towards the LTE network)
+  Ipv4StaticRoutingHelper ipv4RoutingHelper;
+  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());
+  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);
+
+  // Create Devices and install them in the Nodes (eNB and UE)
+  NetDeviceContainer enbDevs;
+  NetDeviceContainer ueDevs;
+  enbDevs = lteHelper->InstallEnbDevice (enbNodes);
+  ueDevs = lteHelper->InstallUeDevice (ueNodes);
+
+  // Install the IP stack on the UEs
+  internet.Install (ueNodes);
+  Ipv4InterfaceContainer ueIpIfaces;
+  ueIpIfaces = epcHelper->AssignUeIpv4Address (NetDeviceContainer (ueDevs));
+
+  // Assign IP address to UEs
+  for (uint32_t u = 0; u < ueNodes.GetN (); ++u)
+    {
+      Ptr<Node> ueNode = ueNodes.Get (u);
+      // Set the default gateway for the UE
+      Ptr<Ipv4StaticRouting> ueStaticRouting = ipv4RoutingHelper.GetStaticRouting (ueNode->GetObject<Ipv4> ());
+      ueStaticRouting->SetDefaultRoute (epcHelper->GetUeDefaultGatewayAddress (), 1);
+    }
+
+  // Add X2 interface
+  lteHelper->AddX2Interface (enbNodes);
+
+  // Connect to trace sources in all eNodeB
+  Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverStart",
+                   MakeCallback (&LteHandoverTargetTestCase::HandoverStartCallback,
+                                 this));
+
+  // Get the source eNodeB
+  Ptr<NetDevice> sourceEnb = enbDevs.Get (m_sourceCellId - 1);
+  m_sourceEnbDev = sourceEnb->GetObject<LteEnbNetDevice> ();
+  NS_ASSERT (m_sourceEnbDev != 0);
+  NS_ASSERT (m_sourceEnbDev->GetCellId () == m_sourceCellId);
+
+  // Attach UE to the source eNodeB
+  lteHelper->Attach (ueDevs.Get (0), sourceEnb);
+
+  // Schedule a "shutdown" of the source eNodeB
+  Simulator::Schedule (Seconds (0.5),
+                       &LteHandoverTargetTestCase::CellShutdownCallback, this);
+
+  // Run simulation
+  Simulator::Stop (Seconds (1));
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+} // end of void LteX2HandoverTargetTestCase::DoRun ()
+
+
+void
+LteHandoverTargetTestCase::DoTeardown ()
+{
+  NS_LOG_FUNCTION (this);
+  NS_TEST_ASSERT_MSG_EQ (m_hasHandoverOccurred, true, "Handover did not occur");
+}
+
+
+
+/**
+ * \brief Test suite ``lte-handover-target``, verifying that handover
+ *        algorithms are able to select the right target cell.
+ *
+ * Handover algorithm tested in this test suite:
+ * - A2-A4-RSRQ handover algorithm (ns3::A2A4RsrqHandoverAlgorithm)
+ * - Strongest cell handover algorithm (ns3::A3RsrpHandoverAlgorithm)
+ */
+class LteHandoverTargetTestSuite : public TestSuite
+{
+public:
+  LteHandoverTargetTestSuite ();
+};
+
+
+LteHandoverTargetTestSuite::LteHandoverTargetTestSuite ()
+  : TestSuite ("lte-handover-target", SYSTEM)
+{
+  // LogComponentEnable ("LteHandoverTargetTest", LOG_PREFIX_ALL);
+  // LogComponentEnable ("LteHandoverTargetTest", LOG_LEVEL_ALL);
+  // LogComponentEnable ("A2A4RsrqHandoverAlgorithm", LOG_PREFIX_ALL);
+  // LogComponentEnable ("A2A4RsrqHandoverAlgorithm", LOG_LEVEL_ALL);
+  // LogComponentEnable ("A3RsrpHandoverAlgorithm", LOG_PREFIX_ALL);
+  // LogComponentEnable ("A3RsrpHandoverAlgorithm", LOG_LEVEL_ALL);
+
+  /*
+   *    3 --- 4
+   *    |     |
+   *    |o    |
+   *    1 --- 2   o = UE
+   */
+  AddTestCase (new LteHandoverTargetTestCase ("4 cells and A2-A4-RSRQ algorithm",
+                                              Vector (20, 40, 0), 2, 2, 1, 3,
+                                              "ns3::A2A4RsrqHandoverAlgorithm"),
+               TestCase::QUICK);
+  AddTestCase (new LteHandoverTargetTestCase ("4 cells and strongest cell algorithm",
+                                              Vector (20, 40, 0), 2, 2, 1, 3,
+                                              "ns3::A3RsrpHandoverAlgorithm"),
+               TestCase::QUICK);
+
+  /*
+   *    4 --- 5 --- 6
+   *    |     |o    |
+   *    |     |     |
+   *    1 --- 2 --- 3   o = UE
+   */
+  AddTestCase (new LteHandoverTargetTestCase ("6 cells and A2-A4-RSRQ algorithm",
+                                              Vector (150, 90, 0), 3, 2, 5, 2,
+                                              "ns3::A2A4RsrqHandoverAlgorithm"),
+               TestCase::EXTENSIVE);
+  AddTestCase (new LteHandoverTargetTestCase ("6 cells and strongest cell algorithm",
+                                              Vector (150, 90, 0), 3, 2, 5, 2,
+                                              "ns3::A3RsrpHandoverAlgorithm"),
+               TestCase::EXTENSIVE);
+
+} // end of LteHandoverTargetTestSuite ()
+
+
+static LteHandoverTargetTestSuite g_lteHandoverTargetTestSuiteInstance;
+
+
+} // end of namespace ns3
diff -Naur ns-3.18.1/src/lte/test/test-lte-x2-handover.cc ns-3.19/src/lte/test/test-lte-x2-handover.cc
--- ns-3.18.1/src/lte/test/test-lte-x2-handover.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/test-lte-x2-handover.cc	2013-12-20 09:44:50.000000000 -0800
@@ -72,7 +72,7 @@
   bool m_admitHo;
   bool     m_useIdealRrc;
   Ptr<LteHelper> m_lteHelper;
-  Ptr<EpcHelper> m_epcHelper;
+  Ptr<PointToPointEpcHelper> m_epcHelper;
   
   struct BearerData
   {
@@ -156,6 +156,7 @@
   m_lteHelper = CreateObject<LteHelper> ();
   m_lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
   m_lteHelper->SetSchedulerType (m_schedulerType);
+  m_lteHelper->SetHandoverAlgorithmType ("ns3::NoOpHandoverAlgorithm"); // disable automatic handover
   m_lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (m_useIdealRrc));
   
 
@@ -166,7 +167,7 @@
 
   if (m_epc)
     {
-      m_epcHelper = CreateObject<EpcHelper> ();
+      m_epcHelper = CreateObject<PointToPointEpcHelper> ();
       m_lteHelper->SetEpcHelper (m_epcHelper);      
     }
 
@@ -579,39 +580,39 @@
 
   std::string hel1name ("1 fwd");
   std::list<HandoverEvent> hel1;
-  hel1.push_back (ue1fwd);  
+  hel1.push_back (ue1fwd);
 
   std::string hel2name ("1 fwd & bwd");
   std::list<HandoverEvent> hel2;
-  hel2.push_back (ue1fwd);     
-  hel2.push_back (ue1bwd);    
+  hel2.push_back (ue1fwd);
+  hel2.push_back (ue1bwd);
 
   std::string hel3name ("1 fwd & bwd & fwd");
   std::list<HandoverEvent> hel3;
-  hel3.push_back (ue1fwd);     
-  hel3.push_back (ue1bwd);     
-  hel3.push_back (ue1fwdagain);     
+  hel3.push_back (ue1fwd);
+  hel3.push_back (ue1bwd);
+  hel3.push_back (ue1fwdagain);
 
   std::string hel4name ("1+2 fwd");
   std::list<HandoverEvent> hel4;
-  hel4.push_back (ue1fwd);  
+  hel4.push_back (ue1fwd);
   hel4.push_back (ue2fwd);
 
   std::string hel5name ("1+2 fwd & bwd");
   std::list<HandoverEvent> hel5;
-  hel5.push_back (ue1fwd);     
-  hel5.push_back (ue1bwd);    
-  hel5.push_back (ue2fwd);     
-  hel5.push_back (ue2bwd);    
+  hel5.push_back (ue1fwd);
+  hel5.push_back (ue1bwd);
+  hel5.push_back (ue2fwd);
+  hel5.push_back (ue2bwd);
 
   std::string hel6name ("2 fwd");
   std::list<HandoverEvent> hel6;
-  hel6.push_back (ue2fwd);     
+  hel6.push_back (ue2fwd);
 
   std::string hel7name ("2 fwd & bwd");
   std::list<HandoverEvent> hel7;
-  hel7.push_back (ue2fwd);     
-  hel7.push_back (ue2bwd);    
+  hel7.push_back (ue2fwd);
+  hel7.push_back (ue2bwd);
 
   std::vector<std::string> schedulers;
   schedulers.push_back ("ns3::RrFfMacScheduler");
@@ -619,7 +620,7 @@
   for (std::vector<std::string>::iterator schedIt = schedulers.begin (); schedIt != schedulers.end (); ++schedIt)
     {
       for (int32_t useIdealRrc = 1; useIdealRrc >= 0; --useIdealRrc)
-        {          
+        {
           //                                     nUes, nDBearers, helist, name, useUdp, sched, admitHo, idealRrc
           AddTestCase (new LteX2HandoverTestCase (  1,    0,    hel0, hel0name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
           AddTestCase (new LteX2HandoverTestCase (  2,    0,    hel0, hel0name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
diff -Naur ns-3.18.1/src/lte/test/test-lte-x2-handover-measures.cc ns-3.19/src/lte/test/test-lte-x2-handover-measures.cc
--- ns-3.18.1/src/lte/test/test-lte-x2-handover-measures.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/test/test-lte-x2-handover-measures.cc	2013-12-20 09:44:50.000000000 -0800
@@ -46,8 +46,8 @@
       checkInterval (interval),
       ueDeviceIndex (ueIndex),
       enbDeviceIndex (enbIndex)
-    {
-    }
+  {
+  }
 };
 
 
@@ -63,17 +63,26 @@
    * \param checkPointEventList
    * \param checkPointEventListName
    * \param useUdp true if UDP is to be used, false if TCP is to be used
+   * \param schedulerType type of scheduler to be used (e.g. "ns3::PfFfMacScheduler")
+   * \param handoverAlgorithmType type of handover algorithm to be used (e.g. "ns3::A3RsrpHandoverAlgorithm")
+   * \param admitHo
+   * \param useIdealRrc true if ideal RRC is to be used, false if real RRC is to be used
    *
    * \return
    */
   LteX2HandoverMeasuresTestCase (uint32_t nEnbs, uint32_t nUes, uint32_t nDedicatedBearers,
-                                 std::list<CheckPointEvent> checkPointEventList, std::string checkPointEventListName,
-                                 bool useUdp, std::string schedulerType, bool admitHo, bool useIdealRrc);
+                                 std::list<CheckPointEvent> checkPointEventList,
+                                 std::string checkPointEventListName,
+                                 bool useUdp, std::string schedulerType,
+                                 std::string handoverAlgorithmType, bool admitHo,
+                                 bool useIdealRrc);
 
 private:
   static std::string BuildNameString (uint32_t nEnbs, uint32_t nUes, uint32_t nDedicatedBearers,
                                       std::string checkPointEventListName,
-                                      bool useUdp, std::string schedulerType, bool admitHo, bool useIdealRrc);
+                                      bool useUdp, std::string schedulerType,
+                                      std::string handoverAlgorithmType, bool admitHo,
+                                      bool useIdealRrc);
   virtual void DoRun (void);
   void CheckConnected (Ptr<NetDevice> ueDevice, Ptr<NetDevice> enbDevice);
 
@@ -85,10 +94,11 @@
   bool m_epc;
   bool m_useUdp;
   std::string m_schedulerType;
+  std::string m_handoverAlgorithmType;
   bool m_admitHo;
   bool m_useIdealRrc;
   Ptr<LteHelper> m_lteHelper;
-  Ptr<EpcHelper> m_epcHelper;
+  Ptr<PointToPointEpcHelper> m_epcHelper;
 
   struct BearerData
   {
@@ -120,7 +130,9 @@
 std::string
 LteX2HandoverMeasuresTestCase::BuildNameString (uint32_t nEnbs, uint32_t nUes, uint32_t nDedicatedBearers,
                                                 std::string checkPointEventListName,
-                                                bool useUdp, std::string schedulerType, bool admitHo, bool useIdealRrc)
+                                                bool useUdp, std::string schedulerType,
+                                                std::string handoverAlgorithmType, bool admitHo,
+                                                bool useIdealRrc)
 {
   std::ostringstream oss;
   oss << "nEnbs=" << nEnbs
@@ -128,6 +140,7 @@
       << " nDedicatedBearers=" << nDedicatedBearers
       << " udp=" << useUdp
       << " " << schedulerType
+      << " " << handoverAlgorithmType
       << " admitHo=" << admitHo
       << " hoList: " << checkPointEventListName;
   if (useIdealRrc)
@@ -142,9 +155,14 @@
 }
 
 LteX2HandoverMeasuresTestCase::LteX2HandoverMeasuresTestCase (uint32_t nEnbs, uint32_t nUes, uint32_t nDedicatedBearers,
-                                                              std::list<CheckPointEvent> checkPointEventList, std::string checkPointEventListName,
-                                                              bool useUdp, std::string schedulerType, bool admitHo, bool useIdealRrc)
-  : TestCase (BuildNameString (nEnbs, nUes, nDedicatedBearers, checkPointEventListName, useUdp, schedulerType, admitHo, useIdealRrc)),
+                                                              std::list<CheckPointEvent> checkPointEventList,
+                                                              std::string checkPointEventListName,
+                                                              bool useUdp, std::string schedulerType,
+                                                              std::string handoverAlgorithmType, bool admitHo,
+                                                              bool useIdealRrc)
+  : TestCase (BuildNameString (nEnbs, nUes, nDedicatedBearers,
+                               checkPointEventListName, useUdp, schedulerType,
+                               handoverAlgorithmType, admitHo, useIdealRrc)),
     m_nEnbs (nEnbs),
     m_nUes (nUes),
     m_nDedicatedBearers (nDedicatedBearers),
@@ -153,6 +171,7 @@
     m_epc (true),
     m_useUdp (useUdp),
     m_schedulerType (schedulerType),
+    m_handoverAlgorithmType (handoverAlgorithmType),
     m_admitHo (admitHo),
     m_useIdealRrc (useIdealRrc),
     m_maxHoDuration (Seconds (0.1)),
@@ -167,14 +186,14 @@
 {
   NS_LOG_FUNCTION (this << BuildNameString (m_nEnbs, m_nUes, m_nDedicatedBearers,
                                             m_checkPointEventListName,
-                                            m_useUdp, m_schedulerType, m_admitHo, m_useIdealRrc));
+                                            m_useUdp, m_schedulerType,
+                                            m_handoverAlgorithmType, m_admitHo,
+                                            m_useIdealRrc));
 
   Config::Reset ();
   Config::SetDefault ("ns3::UdpClient::Interval", TimeValue (m_udpClientInterval));
   Config::SetDefault ("ns3::UdpClient::MaxPackets", UintegerValue (1000000));
   Config::SetDefault ("ns3::UdpClient::PacketSize", UintegerValue (m_udpClientPktSize));
-  Config::SetDefault ("ns3::LteEnbRrc::ServingCellHandoverThreshold", UintegerValue (30));
-  Config::SetDefault ("ns3::LteEnbRrc::NeighbourCellHandoverOffset", UintegerValue (1));
   Config::SetDefault ("ns3::LteEnbRrc::HandoverJoiningTimeoutDuration", TimeValue (MilliSeconds (200)));
   Config::SetDefault ("ns3::LteEnbPhy::TxPower", DoubleValue (20));
 
@@ -183,9 +202,29 @@
 
   m_lteHelper = CreateObject<LteHelper> ();
   m_lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
-  m_lteHelper->SetSchedulerType (m_schedulerType);
   m_lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (m_useIdealRrc));
+  m_lteHelper->SetSchedulerType (m_schedulerType);
 
+  if (m_handoverAlgorithmType == "ns3::A2A4RsrqHandoverAlgorithm")
+    {
+      m_lteHelper->SetHandoverAlgorithmType ("ns3::A2A4RsrqHandoverAlgorithm");
+      m_lteHelper->SetHandoverAlgorithmAttribute ("ServingCellThreshold",
+                                                  UintegerValue (30));
+      m_lteHelper->SetHandoverAlgorithmAttribute ("NeighbourCellOffset",
+                                                  UintegerValue (1));
+    }
+  else if (m_handoverAlgorithmType == "ns3::A3RsrpHandoverAlgorithm")
+    {
+      m_lteHelper->SetHandoverAlgorithmType ("ns3::A3RsrpHandoverAlgorithm");
+      m_lteHelper->SetHandoverAlgorithmAttribute ("Hysteresis",
+                                                  DoubleValue (1.5));
+      m_lteHelper->SetHandoverAlgorithmAttribute ("TimeToTrigger",
+                                                  TimeValue (MilliSeconds (128)));
+    }
+  else
+    {
+      NS_FATAL_ERROR ("Unknown handover algorithm " << m_handoverAlgorithmType);
+    }
 
   double distance = 1000.0; // m
   double speed = 150;       // m/s
@@ -197,7 +236,7 @@
 
   if (m_epc)
     {
-      m_epcHelper = CreateObject<EpcHelper> ();
+      m_epcHelper = CreateObject<PointToPointEpcHelper> ();
       m_lteHelper->SetEpcHelper (m_epcHelper);
     }
 
@@ -210,18 +249,20 @@
       enbPositionAlloc->Add (enbPosition);
     }
   MobilityHelper enbMobility;
-  enbMobility.SetMobilityModel("ns3::ConstantPositionMobilityModel");
-  enbMobility.SetPositionAllocator(enbPositionAlloc);
-  enbMobility.Install(enbNodes);
+  enbMobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  enbMobility.SetPositionAllocator (enbPositionAlloc);
+  enbMobility.Install (enbNodes);
 
   // Install Mobility Model in UE
   // UE moves with a constant speed along the X axis
   MobilityHelper ueMobility;
   ueMobility.SetMobilityModel ("ns3::ConstantVelocityMobilityModel");
-  ueMobility.Install(ueNodes);
-  ueNodes.Get (0)->GetObject<MobilityModel> ()->SetPosition (Vector (0, 0, 0));
-  ueNodes.Get (0)->GetObject<ConstantVelocityMobilityModel> ()->SetVelocity (Vector (speed, 0, 0));
-
+  ueMobility.Install (ueNodes);
+  for (uint16_t i = 0; i < m_nUes; i++)
+    {
+      ueNodes.Get (i)->GetObject<MobilityModel> ()->SetPosition (Vector (0, 0, 0));
+      ueNodes.Get (i)->GetObject<ConstantVelocityMobilityModel> ()->SetVelocity (Vector (speed, 0, 0));
+    }
 
   NetDeviceContainer enbDevices;
   enbDevices = m_lteHelper->InstallEnbDevice (enbNodes);
@@ -604,64 +645,72 @@
   std::string cel1name ("ho: 0 -> 1");
   std::list<CheckPointEvent> cel1;
   cel1.push_back (CheckPointEvent (Seconds (1), Seconds (10.1), checkInterval, 0, 0));
-  cel1.push_back (CheckPointEvent (Seconds (11), Seconds (37), checkInterval, 0, 1));
+  cel1.push_back (CheckPointEvent (Seconds (11), Seconds (17), checkInterval, 0, 1));
 
   std::string cel2name ("ho: 0 -> 1 -> 2");
   std::list<CheckPointEvent> cel2;
-  cel2.push_back (CheckPointEvent (Seconds (1), Seconds (10.1), Seconds (1), 0, 0));
-  cel2.push_back (CheckPointEvent (Seconds (11), Seconds (17.1), Seconds (1), 0, 1));
-  cel2.push_back (CheckPointEvent (Seconds (18), Seconds (37), Seconds (1), 0, 2));
+  cel2.push_back (CheckPointEvent (Seconds (1), Seconds (10.1), checkInterval, 0, 0));
+  cel2.push_back (CheckPointEvent (Seconds (11), Seconds (17.1), checkInterval, 0, 1));
+  cel2.push_back (CheckPointEvent (Seconds (18), Seconds (24), checkInterval, 0, 2));
 
   std::string cel3name ("ho: 0 -> 1 -> 2 -> 3");
   std::list<CheckPointEvent> cel3;
-  cel3.push_back (CheckPointEvent (Seconds (1), Seconds (10.1), Seconds (1),  0, 0));
-  cel3.push_back (CheckPointEvent (Seconds (11), Seconds (17.1), Seconds (1), 0, 1));
-  cel3.push_back (CheckPointEvent (Seconds (18), Seconds (24.1), Seconds (1), 0, 2));
-  cel3.push_back (CheckPointEvent (Seconds (25), Seconds (37), Seconds (1), 0, 3));
+  cel3.push_back (CheckPointEvent (Seconds (1), Seconds (10.1), checkInterval,  0, 0));
+  cel3.push_back (CheckPointEvent (Seconds (11), Seconds (17.1), checkInterval, 0, 1));
+  cel3.push_back (CheckPointEvent (Seconds (18), Seconds (24.1), checkInterval, 0, 2));
+  cel3.push_back (CheckPointEvent (Seconds (25), Seconds (37), checkInterval, 0, 3));
 
 
   int32_t useIdealRrc;
-  std::vector<std::string> schedulers;
-  schedulers.push_back ("ns3::PfFfMacScheduler");
-  for (std::vector<std::string>::iterator schedIt = schedulers.begin (); schedIt != schedulers.end (); ++schedIt)
+  std::string sched = "ns3::PfFfMacScheduler";
+  std::string ho = "ns3::A2A4RsrqHandoverAlgorithm";
+  for (useIdealRrc = 1; useIdealRrc >= 0; --useIdealRrc)
     {
-      for (useIdealRrc = 1; useIdealRrc >= 0; --useIdealRrc)
-        {
-          //                                             nEnbs, nUes, nDBearers, celist, name, useUdp, sched, admitHo, idealRrc
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  2,   1,    0,      cel1, cel1name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  2,   1,    1,      cel1, cel1name, true, *schedIt, true,  useIdealRrc), TestCase::QUICK);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  2,   1,    2,      cel1, cel1name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  3,   1,    0,      cel2, cel2name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  3,   1,    1,      cel2, cel2name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  3,   1,    2,      cel2, cel2name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  4,   1,    0,      cel3, cel3name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  4,   1,    1,      cel3, cel3name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  4,   1,    2,      cel3, cel3name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-        }
+      //                                          nEnbs, nUes, nDBearers, celist, name, useUdp, sched, ho, admitHo, idealRrc
+      AddTestCase (new LteX2HandoverMeasuresTestCase (2,   1,    0,    cel1, cel1name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (2,   1,    1,    cel1, cel1name, true, sched, ho, true, useIdealRrc), TestCase::QUICK);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (2,   1,    2,    cel1, cel1name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (3,   1,    0,    cel2, cel2name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (3,   1,    1,    cel2, cel2name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (3,   1,    2,    cel2, cel2name, true, sched, ho, true, useIdealRrc), TestCase::EXTENSIVE);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (4,   1,    0,    cel3, cel3name, true, sched, ho, true, useIdealRrc), TestCase::EXTENSIVE);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (4,   1,    1,    cel3, cel3name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (4,   1,    2,    cel3, cel3name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
     }
 
-  schedulers.resize (0);
-  schedulers.push_back ("ns3::RrFfMacScheduler");
-  for (std::vector<std::string>::iterator schedIt = schedulers.begin (); schedIt != schedulers.end (); ++schedIt)
+  sched = "ns3::RrFfMacScheduler";
+  for (useIdealRrc = 1; useIdealRrc >= 0; --useIdealRrc)
     {
-      for (useIdealRrc = 1; useIdealRrc >= 0; --useIdealRrc)
-        {
-          //                                             nEnbs, nUes, nDBearers, celist, name, useUdp, sched, admitHo, idealRrc
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  2,   1,    0,      cel1, cel1name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-//           AddTestCase (new LteX2HandoverMeasuresTestCase (  2,   1,    1,      cel1b, cel1bname, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-//           AddTestCase (new LteX2HandoverMeasuresTestCase (  2,   1,    2,      cel1, cel1name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  3,   1,    0,      cel2, cel2name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-//           AddTestCase (new LteX2HandoverMeasuresTestCase (  3,   1,    1,      cel2, cel2name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-//           AddTestCase (new LteX2HandoverMeasuresTestCase (  3,   1,    2,      cel2, cel2name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-          AddTestCase (new LteX2HandoverMeasuresTestCase (  4,   1,    0,      cel3, cel3name, true, *schedIt, true,  useIdealRrc), TestCase::EXTENSIVE);
-//           AddTestCase (new LteX2HandoverMeasuresTestCase (  4,   1,    1,      cel3, cel3name, true, *schedIt, true,  useIdealRrc), TestCase::QUICK);
-//           AddTestCase (new LteX2HandoverMeasuresTestCase (  4,   1,    2,      cel3, cel3name, true, *schedIt, true,  useIdealRrc), TestCase::QUICK);
-        }
+      //                                          nEnbs, nUes, nDBearers, celist, name, useUdp, sched, admitHo, idealRrc
+      AddTestCase (new LteX2HandoverMeasuresTestCase (2,   1,    0,    cel1, cel1name, true, sched, ho, true, useIdealRrc), TestCase::EXTENSIVE);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (3,   1,    0,    cel2, cel2name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (4,   1,    0,    cel3, cel3name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
     }
 
-}
+  ho = "ns3::A3RsrpHandoverAlgorithm";
+  sched = "ns3::PfFfMacScheduler";
+  for (useIdealRrc = 1; useIdealRrc >= 0; --useIdealRrc)
+    {
+      //                                          nEnbs, nUes, nDBearers, celist, name, useUdp, sched, admitHo, idealRrc
+      AddTestCase (new LteX2HandoverMeasuresTestCase (2,   1,    0,    cel1, cel1name, true, sched, ho, true, useIdealRrc), TestCase::EXTENSIVE);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (3,   1,    0,    cel2, cel2name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (4,   1,    0,    cel3, cel3name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+    }
+
+  sched = "ns3::RrFfMacScheduler";
+  for (useIdealRrc = 1; useIdealRrc >= 0; --useIdealRrc)
+    {
+      //                                          nEnbs, nUes, nDBearers, celist, name, useUdp, sched, admitHo, idealRrc
+      AddTestCase (new LteX2HandoverMeasuresTestCase (2,   1,    0,    cel1, cel1name, true, sched, ho, true, useIdealRrc), TestCase::QUICK);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (3,   1,    0,    cel2, cel2name, true, sched, ho, true, useIdealRrc), TestCase::TAKES_FOREVER);
+      AddTestCase (new LteX2HandoverMeasuresTestCase (4,   1,    0,    cel3, cel3name, true, sched, ho, true, useIdealRrc), TestCase::EXTENSIVE);
+    }
+
+} // end of LteX2HandoverMeasuresTestSuite ()
 
 static LteX2HandoverMeasuresTestSuite g_lteX2HandoverMeasuresTestSuiteInstance;
 
 
+
 } // namespace ns3
+
diff -Naur ns-3.18.1/src/lte/wscript ns-3.19/src/lte/wscript
--- ns-3.18.1/src/lte/wscript	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/lte/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -40,6 +40,7 @@
         'helper/lte-helper.cc',
         'helper/lte-stats-calculator.cc',
         'helper/epc-helper.cc',
+        'helper/point-to-point-epc-helper.cc',
         'helper/radio-bearer-stats-calculator.cc',
         'helper/radio-bearer-stats-connector.cc',
         'helper/phy-stats-calculator.cc',
@@ -98,6 +99,13 @@
         'model/epc-mme.cc',
         'model/lte-asn1-header.cc',
         'model/lte-rrc-header.cc',
+        'model/lte-handover-management-sap.cc',
+        'model/lte-handover-algorithm.cc',
+        'model/a2-a4-rsrq-handover-algorithm.cc',
+        'model/a3-rsrp-handover-algorithm.cc',
+        'model/no-op-handover-algorithm.cc',
+        'model/lte-anr-sap.cc',
+        'model/lte-anr.cc',
         ]
 
     module_test = bld.create_ns3_module_test_library('lte')
@@ -142,7 +150,9 @@
         'test/test-lte-x2-handover-measures.cc',
         'test/test-asn1-encoding.cc',
         'test/lte-test-ue-measurements.cc',
+        'test/lte-test-cell-selection.cc',
         'test/test-lte-handover-delay.cc',
+        'test/test-lte-handover-target.cc',
         ]
 
     headers = bld(features='ns3header')
@@ -184,6 +194,7 @@
         'helper/lte-helper.h',
         'helper/lte-stats-calculator.h',
         'helper/epc-helper.h',
+        'helper/point-to-point-epc-helper.h',
         'helper/phy-stats-calculator.h',
         'helper/mac-stats-calculator.h',
         'helper/phy-tx-stats-calculator.h',
@@ -242,6 +253,13 @@
         'model/epc-mme.h',
         'model/lte-asn1-header.h',
         'model/lte-rrc-header.h',
+        'model/lte-handover-management-sap.h',
+        'model/lte-handover-algorithm.h',
+        'model/a2-a4-rsrq-handover-algorithm.h',
+        'model/a3-rsrp-handover-algorithm.h',
+        'model/no-op-handover-algorithm.h',
+        'model/lte-anr-sap.h',
+        'model/lte-anr.h',
         ]
 
     if (bld.env['ENABLE_EXAMPLES']):
diff -Naur ns-3.18.1/src/mesh/bindings/modulegen__gcc_ILP32.py ns-3.19/src/mesh/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/mesh/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -33,7 +33,7 @@
     ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
     module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'], import_from_module='ns.wifi')
     ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration]
-    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA'], import_from_module='ns.wifi')
+    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'], import_from_module='ns.wifi')
     ## ctrl-headers.h (module 'wifi'): ns3::BlockAckType [enumeration]
     module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'], import_from_module='ns.wifi')
     ## address.h (module 'network'): ns3::Address [class]
@@ -157,7 +157,7 @@
     ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]
     module.add_class('TraceSourceInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
     ## wifi-helper.h (module 'wifi'): ns3::WifiHelper [class]
-    module.add_class('WifiHelper', import_from_module='ns.wifi')
+    module.add_class('WifiHelper', allow_subclassing=True, import_from_module='ns.wifi')
     ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper [class]
     module.add_class('WifiMacHelper', allow_subclassing=True, import_from_module='ns.wifi')
     ## wifi-mode.h (module 'wifi'): ns3::WifiMode [class]
@@ -237,7 +237,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -247,7 +247,7 @@
     ## 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'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    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]
@@ -1988,10 +1988,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3326,17 +3327,17 @@
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::NodeContainer', 'c')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::Ptr<ns3::Node> node) const [member function]
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::Ptr< ns3::Node >', 'node')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, std::string nodeName) const [member function]
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('std::string', 'nodeName')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetRemoteStationManager(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
     cls.add_method('SetRemoteStationManager', 
                    'void', 
@@ -3344,7 +3345,8 @@
     ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('SetStandard', 
                    'void', 
-                   [param('ns3::WifiPhyStandard', 'standard')])
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_virtual=True)
     return
 
 def register_Ns3WifiMacHelper_methods(root_module, cls):
@@ -3540,8 +3542,8 @@
     cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
     cls.add_constructor([])
-    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
-    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
@@ -3597,10 +3599,10 @@
     cls.add_method('SetShortGuardInterval', 
                    'void', 
                    [param('bool', 'guardinterval')])
-    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
-                   [param('bool', 'stbcsatuts')])
+                   [param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
     cls.add_method('SetTxPowerLevel', 
                    'void', 
@@ -4670,6 +4672,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4680,6 +4687,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4695,6 +4707,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4720,6 +4737,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5616,10 +5638,10 @@
     cls.add_method('SetProbeResp', 
                    'void', 
                    [])
-    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function]
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
     cls.add_method('SetQosAckPolicy', 
                    'void', 
-                   [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')])
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
     cls.add_method('SetQosAmsdu', 
                    'void', 
@@ -6295,15 +6317,15 @@
                    'void', 
                    [param('bool', 'greenfield')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
     cls.add_method('SetGuardInterval', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('bool', 'guardInterval')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
     cls.add_method('SetLdpc', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [param('bool', 'ldpc')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
@@ -7205,10 +7227,10 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immeadiateAck) [member function]
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immediateAck) [member function]
     cls.add_method('SetHtImmediateAck', 
                    'void', 
-                   [param('bool', 'immeadiateAck')])
+                   [param('bool', 'immediateAck')])
     ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedFragment(uint16_t seq, uint8_t frag) [member function]
     cls.add_method('SetReceivedFragment', 
                    'void', 
@@ -8924,6 +8946,31 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::DcaTxop> ns3::RegularWifiMac::GetDcaTxop() const [member function]
+    cls.add_method('GetDcaTxop', 
+                   'ns3::Ptr< ns3::DcaTxop >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVOQueue() const [member function]
+    cls.add_method('GetVOQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVIQueue() const [member function]
+    cls.add_method('GetVIQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBEQueue() const [member function]
+    cls.add_method('GetBEQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBKQueue() const [member function]
+    cls.add_method('GetBKQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
     ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('FinishConfigureStandard', 
                    'void', 
diff -Naur ns-3.18.1/src/mesh/bindings/modulegen__gcc_LP64.py ns-3.19/src/mesh/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/mesh/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -33,7 +33,7 @@
     ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
     module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'], import_from_module='ns.wifi')
     ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration]
-    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA'], import_from_module='ns.wifi')
+    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'], import_from_module='ns.wifi')
     ## ctrl-headers.h (module 'wifi'): ns3::BlockAckType [enumeration]
     module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'], import_from_module='ns.wifi')
     ## address.h (module 'network'): ns3::Address [class]
@@ -157,7 +157,7 @@
     ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]
     module.add_class('TraceSourceInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
     ## wifi-helper.h (module 'wifi'): ns3::WifiHelper [class]
-    module.add_class('WifiHelper', import_from_module='ns.wifi')
+    module.add_class('WifiHelper', allow_subclassing=True, import_from_module='ns.wifi')
     ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper [class]
     module.add_class('WifiMacHelper', allow_subclassing=True, import_from_module='ns.wifi')
     ## wifi-mode.h (module 'wifi'): ns3::WifiMode [class]
@@ -237,7 +237,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -247,7 +247,7 @@
     ## 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'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    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]
@@ -1988,10 +1988,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3326,17 +3327,17 @@
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::NodeContainer', 'c')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::Ptr<ns3::Node> node) const [member function]
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::Ptr< ns3::Node >', 'node')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, std::string nodeName) const [member function]
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('std::string', 'nodeName')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetRemoteStationManager(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
     cls.add_method('SetRemoteStationManager', 
                    'void', 
@@ -3344,7 +3345,8 @@
     ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('SetStandard', 
                    'void', 
-                   [param('ns3::WifiPhyStandard', 'standard')])
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_virtual=True)
     return
 
 def register_Ns3WifiMacHelper_methods(root_module, cls):
@@ -3540,8 +3542,8 @@
     cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
     cls.add_constructor([])
-    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
-    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
@@ -3597,10 +3599,10 @@
     cls.add_method('SetShortGuardInterval', 
                    'void', 
                    [param('bool', 'guardinterval')])
-    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
-                   [param('bool', 'stbcsatuts')])
+                   [param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
     cls.add_method('SetTxPowerLevel', 
                    'void', 
@@ -4670,6 +4672,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4680,6 +4687,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4695,6 +4707,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4720,6 +4737,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5616,10 +5638,10 @@
     cls.add_method('SetProbeResp', 
                    'void', 
                    [])
-    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function]
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
     cls.add_method('SetQosAckPolicy', 
                    'void', 
-                   [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')])
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
     cls.add_method('SetQosAmsdu', 
                    'void', 
@@ -6295,15 +6317,15 @@
                    'void', 
                    [param('bool', 'greenfield')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
     cls.add_method('SetGuardInterval', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('bool', 'guardInterval')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
     cls.add_method('SetLdpc', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [param('bool', 'ldpc')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
@@ -7205,10 +7227,10 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immeadiateAck) [member function]
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immediateAck) [member function]
     cls.add_method('SetHtImmediateAck', 
                    'void', 
-                   [param('bool', 'immeadiateAck')])
+                   [param('bool', 'immediateAck')])
     ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedFragment(uint16_t seq, uint8_t frag) [member function]
     cls.add_method('SetReceivedFragment', 
                    'void', 
@@ -8924,6 +8946,31 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::DcaTxop> ns3::RegularWifiMac::GetDcaTxop() const [member function]
+    cls.add_method('GetDcaTxop', 
+                   'ns3::Ptr< ns3::DcaTxop >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVOQueue() const [member function]
+    cls.add_method('GetVOQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVIQueue() const [member function]
+    cls.add_method('GetVIQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBEQueue() const [member function]
+    cls.add_method('GetBEQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBKQueue() const [member function]
+    cls.add_method('GetBKQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
     ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('FinishConfigureStandard', 
                    'void', 
diff -Naur ns-3.18.1/src/mesh/helper/dot11s/dot11s-installer.cc ns-3.19/src/mesh/helper/dot11s/dot11s-installer.cc
--- ns-3.18.1/src/mesh/helper/dot11s/dot11s-installer.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/helper/dot11s/dot11s-installer.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,9 @@
 
 namespace ns3 {
 using namespace dot11s;
-NS_OBJECT_ENSURE_REGISTERED (Dot11sStack);
+NS_OBJECT_ENSURE_REGISTERED (Dot11sStack)
+  ;
+  
 TypeId
 Dot11sStack::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/mesh/helper/flame/flame-installer.cc ns-3.19/src/mesh/helper/flame/flame-installer.cc
--- ns-3.18.1/src/mesh/helper/flame/flame-installer.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/helper/flame/flame-installer.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,9 @@
 namespace ns3
 {
 using namespace flame;
-NS_OBJECT_ENSURE_REGISTERED (FlameStack);
+NS_OBJECT_ENSURE_REGISTERED (FlameStack)
+  ;
+  
 TypeId
 FlameStack::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/mesh/model/dot11s/airtime-metric.cc ns-3.19/src/mesh/model/dot11s/airtime-metric.cc
--- ns-3.18.1/src/mesh/model/dot11s/airtime-metric.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/dot11s/airtime-metric.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,9 @@
 
 namespace ns3 {
 namespace dot11s {
-NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator);
+NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator)
+  ;
+  
 TypeId
 AirtimeLinkMetricCalculator::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/mesh/model/dot11s/hwmp-protocol.cc ns-3.19/src/mesh/model/dot11s/hwmp-protocol.cc
--- ns-3.18.1/src/mesh/model/dot11s/hwmp-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/dot11s/hwmp-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -41,7 +41,9 @@
 namespace ns3 {
 namespace dot11s {
 
-NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol);
+NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol)
+  ;
+  
 TypeId
 HwmpProtocol::GetTypeId ()
 {
diff -Naur ns-3.18.1/src/mesh/model/dot11s/hwmp-rtable.cc ns-3.19/src/mesh/model/dot11s/hwmp-rtable.cc
--- ns-3.18.1/src/mesh/model/dot11s/hwmp-rtable.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/dot11s/hwmp-rtable.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("HwmpRtable");
 
-NS_OBJECT_ENSURE_REGISTERED (HwmpRtable);
+NS_OBJECT_ENSURE_REGISTERED (HwmpRtable)
+  ;
 
 TypeId
 HwmpRtable::GetTypeId ()
diff -Naur ns-3.18.1/src/mesh/model/dot11s/hwmp-tag.cc ns-3.19/src/mesh/model/dot11s/hwmp-tag.cc
--- ns-3.18.1/src/mesh/model/dot11s/hwmp-tag.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/dot11s/hwmp-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,9 @@
 namespace ns3 {
 namespace dot11s {
 
-NS_OBJECT_ENSURE_REGISTERED (HwmpTag);
+NS_OBJECT_ENSURE_REGISTERED (HwmpTag)
+  ;
+  
 //Class HwmpTag:
 HwmpTag::HwmpTag () :
   m_address (Mac48Address::GetBroadcast ()), m_ttl (0), m_metric (0), m_seqno (0)
diff -Naur ns-3.18.1/src/mesh/model/dot11s/peer-link.cc ns-3.19/src/mesh/model/dot11s/peer-link.cc
--- ns-3.18.1/src/mesh/model/dot11s/peer-link.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/dot11s/peer-link.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 namespace ns3 {
 namespace dot11s {
 
-NS_OBJECT_ENSURE_REGISTERED ( PeerLink);
+NS_OBJECT_ENSURE_REGISTERED ( PeerLink)
+  ;
 
 TypeId
 PeerLink::GetTypeId ()
diff -Naur ns-3.18.1/src/mesh/model/dot11s/peer-link-frame.cc ns-3.19/src/mesh/model/dot11s/peer-link-frame.cc
--- ns-3.18.1/src/mesh/model/dot11s/peer-link-frame.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/dot11s/peer-link-frame.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 namespace dot11s {
-NS_OBJECT_ENSURE_REGISTERED (PeerLinkFrameStart);
+NS_OBJECT_ENSURE_REGISTERED (PeerLinkFrameStart)
+  ;
 
 PeerLinkFrameStart::PeerLinkFrameStart () :
   m_subtype (255), m_capability (0), m_aid (0), m_rates (SupportedRates ()), m_meshId (),
diff -Naur ns-3.18.1/src/mesh/model/dot11s/peer-management-protocol.cc ns-3.19/src/mesh/model/dot11s/peer-management-protocol.cc
--- ns-3.18.1/src/mesh/model/dot11s/peer-management-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/dot11s/peer-management-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -39,7 +39,8 @@
 /***************************************************
  * PeerManager
  ***************************************************/
-NS_OBJECT_ENSURE_REGISTERED (PeerManagementProtocol);
+NS_OBJECT_ENSURE_REGISTERED (PeerManagementProtocol)
+  ;
 
 TypeId
 PeerManagementProtocol::GetTypeId (void)
diff -Naur ns-3.18.1/src/mesh/model/flame/flame-header.cc ns-3.19/src/mesh/model/flame/flame-header.cc
--- ns-3.18.1/src/mesh/model/flame/flame-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/flame/flame-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 namespace ns3 {
 namespace flame {
 
-NS_OBJECT_ENSURE_REGISTERED (FlameHeader);
+NS_OBJECT_ENSURE_REGISTERED (FlameHeader)
+  ;
 
 FlameHeader::FlameHeader () :
   m_cost (0), m_seqno (0), m_origDst (Mac48Address ()), m_origSrc (Mac48Address ())
diff -Naur ns-3.18.1/src/mesh/model/flame/flame-protocol.cc ns-3.19/src/mesh/model/flame/flame-protocol.cc
--- ns-3.18.1/src/mesh/model/flame/flame-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/flame/flame-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,8 +38,10 @@
 //-----------------------------------------------------------------------------
 // FlameTag
 //-----------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (FlameTag);
-NS_OBJECT_ENSURE_REGISTERED (FlameProtocol);
+NS_OBJECT_ENSURE_REGISTERED (FlameTag)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (FlameProtocol)
+  ;
 
 TypeId
 FlameTag::GetTypeId ()
diff -Naur ns-3.18.1/src/mesh/model/flame/flame-rtable.cc ns-3.19/src/mesh/model/flame/flame-rtable.cc
--- ns-3.18.1/src/mesh/model/flame/flame-rtable.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/flame/flame-rtable.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("FlameRtable");
 
-NS_OBJECT_ENSURE_REGISTERED (FlameRtable);
+NS_OBJECT_ENSURE_REGISTERED (FlameRtable)
+  ;
 
 TypeId
 FlameRtable::GetTypeId ()
diff -Naur ns-3.18.1/src/mesh/model/mesh-l2-routing-protocol.cc ns-3.19/src/mesh/model/mesh-l2-routing-protocol.cc
--- ns-3.18.1/src/mesh/model/mesh-l2-routing-protocol.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/mesh-l2-routing-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol);
+NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol)
+  ;
 
 TypeId
 MeshL2RoutingProtocol::GetTypeId (void)
diff -Naur ns-3.18.1/src/mesh/model/mesh-point-device.cc ns-3.19/src/mesh/model/mesh-point-device.cc
--- ns-3.18.1/src/mesh/model/mesh-point-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/mesh-point-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice);
+NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice)
+  ;
 
 TypeId
 MeshPointDevice::GetTypeId ()
diff -Naur ns-3.18.1/src/mesh/model/mesh-wifi-interface-mac.cc ns-3.19/src/mesh/model/mesh-wifi-interface-mac.cc
--- ns-3.18.1/src/mesh/model/mesh-wifi-interface-mac.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mesh/model/mesh-wifi-interface-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac);
+NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac)
+  ;
 
 TypeId
 MeshWifiInterfaceMac::GetTypeId ()
diff -Naur ns-3.18.1/src/mobility/bindings/modulegen__gcc_ILP32.py ns-3.19/src/mobility/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/mobility/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -125,7 +125,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1009,10 +1009,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -2303,6 +2304,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2313,6 +2319,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2328,6 +2339,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2353,6 +2369,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/mobility/bindings/modulegen__gcc_LP64.py ns-3.19/src/mobility/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/mobility/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -125,7 +125,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1009,10 +1009,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -2303,6 +2304,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2313,6 +2319,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2328,6 +2339,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2353,6 +2369,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/mobility/doc/mobility.rst ns-3.19/src/mobility/doc/mobility.rst
--- ns-3.18.1/src/mobility/doc/mobility.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/doc/mobility.rst	2013-12-20 09:44:50.000000000 -0800
@@ -140,7 +140,9 @@
 The |ns2| mobility format is a widely used mobility trace format.  The
 documentation is available at: http://www.isi.edu/nsnam/ns/doc/node172.html
 
-Valid trace files use the following ns2 statements: ::
+Valid trace files use the following ns2 statements:
+
+.. sourcecode:: bash
 
    $node set X_ x1
    $node set Y_ y1
@@ -166,14 +168,14 @@
 
 Some examples of external tools that can export in this format include:
 
-- BonnMotion http://net.cs.uni-bonn.de/wg/cs/applications/bonnmotion/
+- `BonnMotion <http://net.cs.uni-bonn.de/wg/cs/applications/bonnmotion/>`_
 
-  - Some installation instructions for BonnMotion can be found here:  http://www.nsnam.org/wiki/HOWTO_use_ns-3_with_BonnMotion_mobility_generator_and_analysis_tool
-  - Documentation on using BonnMotion with |ns3| is posted here: http://www.ida.liu.se/~rikno/files/mobility_generation.pdf  
+  - `Installation instructions <http://www.nsnam.org/wiki/HOWTO_use_ns-3_with_BonnMotion_mobility_generator_and_analysis_tool>`_ and
+  - `Documentation <http://www.ida.liu.se/~rikno/files/mobility_generation.pdf>`_ for using BonnMotion with |ns3|
 
-- SUMO http://sourceforge.net/apps/mediawiki/sumo/index.php?title=Main_Page
-- TraNS http://trans.epfl.ch/
-- the ``setdest`` utility in |ns2|, documented here: http://www.winlab.rutgers.edu/~zhibinwu/html/ns2_wireless_scene.htm
+- `SUMO <http://sourceforge.net/apps/mediawiki/sumo/index.php?title=Main_Page>`_
+- `TraNS <http://trans.epfl.ch/>`_
+- |ns2| `setdest <http://www.winlab.rutgers.edu/~zhibinwu/html/ns2_wireless_scene.htm>`_ utility
 
 A special Ns2MobilityHelper object can be used to parse these files
 and convert the statements into |ns3| mobility events.  The underlying
@@ -208,7 +210,7 @@
 First, the user instantiates a ``MobilityHelper`` object and sets some
 ``Attributes`` controlling the "position allocator" functionality.
 
-::
+.. sourcecode:: cpp
 
   MobilityHelper mobility;
 
@@ -227,14 +229,14 @@
 
 Next, the user typically sets the MobilityModel subclass; e.g.:
 
-::
+.. sourcecode:: cpp
 
   mobility.SetMobilityModel ("ns3::RandomWalk2dMobilityModel",
     "Bounds", RectangleValue (Rectangle (-50, 50, -50, 50)));
 
 Once the helper is configured, it is typically passed a container, such as:
 
-::
+.. sourcecode:: cpp
 
   mobility.Install (wifiStaNodes);
 
@@ -270,13 +272,17 @@
 
 Example usage:
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "ns2-mobility-trace --traceFile=src/mobility/examples/default.ns_movements --nodeNum=2 --duration=100.0 --logFile=ns2-mob.log"
+  $ ./waf --run "ns2-mobility-trace \
+  --traceFile=src/mobility/examples/default.ns_movements \
+  --nodeNum=2 \
+  --duration=100.0 \
+  --logFile=ns2-mob.log"
 
 Sample log file output:
 
-::
+.. sourcecode:: text
 
   +0.0ns POS: x=150, y=93.986, z=0; VEL:0, y=50.4038, z=0
   +0.0ns POS: x=195.418, y=150, z=0; VEL:50.1186, y=0, z=0
@@ -299,7 +305,7 @@
 
 The program ``bonnmotion-ns2-example.cc`` will output the following to stdout:
 
-::
+.. sourcecode:: text
 
   At 0.00 node 0: Position(329.82, 66.06, 0.00);   Speed(0.53, -0.22, 0.00)
   At 100.00 node 0: Position(378.38, 45.59, 0.00);   Speed(0.00, 0.00, 0.00)
@@ -322,7 +328,7 @@
 The output of the |ns2| ``bonnmotion-example.tcl`` program is shown below
 for comparison (file ``bonnmotion-example.tr``):
 
-::
+.. sourcecode:: text
 
   M 0.00000 0 (329.82, 66.06, 0.00), (378.38, 45.59), 0.57
   M 100.00000 0 (378.38, 45.59, 0.00), (378.38, 45.59), 0.57
@@ -362,7 +368,7 @@
 Class ``MobilityModel`` and class ``PositionAllocator`` both have public
 API to assign streams to underlying random variables:
 
-::
+.. sourcecode:: cpp
 
   /**
    * Assign a fixed random variable stream number to the random variables
@@ -377,7 +383,7 @@
 The class ``MobilityHelper`` also provides this API.  The typical usage 
 pattern when using the helper is:
 
-::
+.. sourcecode:: cpp
 
   int64_t streamIndex = /*some positive integer */  
   MobilityHelper mobility;
diff -Naur ns-3.18.1/src/mobility/helper/mobility-helper.cc ns-3.19/src/mobility/helper/mobility-helper.cc
--- ns-3.18.1/src/mobility/helper/mobility-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/helper/mobility-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("MobilityHelper");
+NS_LOG_COMPONENT_DEFINE ("MobilityHelper")
+  ;
 
 MobilityHelper::MobilityHelper ()
 {
diff -Naur ns-3.18.1/src/mobility/model/constant-acceleration-mobility-model.cc ns-3.19/src/mobility/model/constant-acceleration-mobility-model.cc
--- ns-3.18.1/src/mobility/model/constant-acceleration-mobility-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/constant-acceleration-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -20,7 +20,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ConstantAccelerationMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (ConstantAccelerationMobilityModel)
+  ;
 
 TypeId ConstantAccelerationMobilityModel::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/mobility/model/constant-position-mobility-model.cc ns-3.19/src/mobility/model/constant-position-mobility-model.cc
--- ns-3.18.1/src/mobility/model/constant-position-mobility-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/constant-position-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -21,7 +21,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ConstantPositionMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (ConstantPositionMobilityModel)
+  ;
 
 TypeId
 ConstantPositionMobilityModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/mobility/model/constant-velocity-mobility-model.cc ns-3.19/src/mobility/model/constant-velocity-mobility-model.cc
--- ns-3.18.1/src/mobility/model/constant-velocity-mobility-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/constant-velocity-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ConstantVelocityMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (ConstantVelocityMobilityModel)
+  ;
 
 TypeId ConstantVelocityMobilityModel::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/mobility/model/gauss-markov-mobility-model.cc ns-3.19/src/mobility/model/gauss-markov-mobility-model.cc
--- ns-3.18.1/src/mobility/model/gauss-markov-mobility-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/gauss-markov-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (GaussMarkovMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (GaussMarkovMobilityModel)
+  ;
 
 TypeId
 GaussMarkovMobilityModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/mobility/model/hierarchical-mobility-model.cc ns-3.19/src/mobility/model/hierarchical-mobility-model.cc
--- ns-3.18.1/src/mobility/model/hierarchical-mobility-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/hierarchical-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel)
+  ;
 
 TypeId 
 HierarchicalMobilityModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/mobility/model/mobility-model.cc ns-3.19/src/mobility/model/mobility-model.cc
--- ns-3.18.1/src/mobility/model/mobility-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (MobilityModel)
+  ;
 
 TypeId 
 MobilityModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/mobility/model/position-allocator.cc ns-3.19/src/mobility/model/position-allocator.cc
--- ns-3.18.1/src/mobility/model/position-allocator.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/position-allocator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (PositionAllocator)
+  ;
 
 TypeId 
 PositionAllocator::GetTypeId (void)
@@ -48,7 +49,8 @@
 {
 }
 
-NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator)
+  ;
 
 TypeId
 ListPositionAllocator::GetTypeId (void)
@@ -85,7 +87,8 @@
   return 0;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator)
+  ;
 
 TypeId 
 GridPositionAllocator::GetTypeId (void)
@@ -213,7 +216,8 @@
   return 0;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator)
+  ;
 
 TypeId
 RandomRectanglePositionAllocator::GetTypeId (void)
@@ -269,7 +273,8 @@
   return 2;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (RandomBoxPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (RandomBoxPositionAllocator)
+  ;
 
 TypeId
 RandomBoxPositionAllocator::GetTypeId (void)
@@ -337,7 +342,8 @@
   return 3;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator)
+  ;
 
 TypeId
 RandomDiscPositionAllocator::GetTypeId (void)
@@ -418,7 +424,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (UniformDiscPositionAllocator);
+NS_OBJECT_ENSURE_REGISTERED (UniformDiscPositionAllocator)
+  ;
 
 TypeId
 UniformDiscPositionAllocator::GetTypeId (void)
diff -Naur ns-3.18.1/src/mobility/model/random-direction-2d-mobility-model.cc ns-3.19/src/mobility/model/random-direction-2d-mobility-model.cc
--- ns-3.18.1/src/mobility/model/random-direction-2d-mobility-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/random-direction-2d-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 const double RandomDirection2dMobilityModel::PI = 3.14159265358979323846;
 
-NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/mobility/model/random-walk-2d-mobility-model.cc ns-3.19/src/mobility/model/random-walk-2d-mobility-model.cc
--- ns-3.18.1/src/mobility/model/random-walk-2d-mobility-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/mobility/model/random-walk-2d-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel)
+  ;
 
 TypeId
 RandomWalk2dMobilityModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/mobility/model/random-waypoint-mobility-model.cc ns-3.19/src/mobility/model/random-waypoint-mobility-model.cc
--- ns-3.18.1/src/mobility/model/random-waypoint-mobility-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mobility/model/random-waypoint-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel)
+  ;
 
 TypeId
 RandomWaypointMobilityModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/mobility/model/steady-state-random-waypoint-mobility-model.cc ns-3.19/src/mobility/model/steady-state-random-waypoint-mobility-model.cc
--- ns-3.18.1/src/mobility/model/steady-state-random-waypoint-mobility-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mobility/model/steady-state-random-waypoint-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SteadyStateRandomWaypointMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (SteadyStateRandomWaypointMobilityModel)
+  ;
 
 TypeId
 SteadyStateRandomWaypointMobilityModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/mobility/model/waypoint-mobility-model.cc ns-3.19/src/mobility/model/waypoint-mobility-model.cc
--- ns-3.18.1/src/mobility/model/waypoint-mobility-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mobility/model/waypoint-mobility-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel);
+NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/mpi/bindings/modulegen__gcc_ILP32.py ns-3.19/src/mpi/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/mpi/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -40,20 +40,14 @@
     module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList::Iterator'])
     ## callback.h (module 'core'): ns3::CallbackBase [class]
     module.add_class('CallbackBase', import_from_module='ns.core')
-    ## event-id.h (module 'core'): ns3::EventId [class]
-    module.add_class('EventId', import_from_module='ns.core')
     ## hash.h (module 'core'): ns3::Hasher [class]
     module.add_class('Hasher', import_from_module='ns.core')
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::LbtsMessage [class]
-    module.add_class('LbtsMessage')
     ## mpi-interface.h (module 'mpi'): ns3::MpiInterface [class]
     module.add_class('MpiInterface')
     ## object-base.h (module 'core'): ns3::ObjectBase [class]
     module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core')
     ## object.h (module 'core'): ns3::ObjectDeleter [struct]
     module.add_class('ObjectDeleter', import_from_module='ns.core')
-    ## object-factory.h (module 'core'): ns3::ObjectFactory [class]
-    module.add_class('ObjectFactory', import_from_module='ns.core')
     ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class]
     module.add_class('PacketMetadata', import_from_module='ns.network')
     ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct]
@@ -72,8 +66,8 @@
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
     module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
-    ## mpi-interface.h (module 'mpi'): ns3::SentBuffer [class]
-    module.add_class('SentBuffer')
+    ## parallel-communication-interface.h (module 'mpi'): ns3::ParallelCommunicationInterface [class]
+    module.add_class('ParallelCommunicationInterface', allow_subclassing=True)
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## tag.h (module 'network'): ns3::Tag [class]
@@ -100,12 +94,6 @@
     module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
     ## object.h (module 'core'): ns3::Object::AggregateIterator [class]
     module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object'])
-    ## scheduler.h (module 'core'): ns3::Scheduler [class]
-    module.add_class('Scheduler', import_from_module='ns.core', parent=root_module['ns3::Object'])
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event [struct]
-    module.add_class('Event', import_from_module='ns.core', outer_class=root_module['ns3::Scheduler'])
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey [struct]
-    module.add_class('EventKey', import_from_module='ns.core', outer_class=root_module['ns3::Scheduler'])
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > [class]
@@ -114,8 +102,6 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
-    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
-    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
@@ -124,12 +110,10 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Packet>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
-    ## simulator-impl.h (module 'core'): ns3::SimulatorImpl [class]
-    module.add_class('SimulatorImpl', import_from_module='ns.core', parent=root_module['ns3::Object'])
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -148,20 +132,12 @@
     module.add_class('CallbackImplBase', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     ## callback.h (module 'core'): ns3::CallbackValue [class]
     module.add_class('CallbackValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::DistributedSimulatorImpl [class]
-    module.add_class('DistributedSimulatorImpl', parent=root_module['ns3::SimulatorImpl'])
     ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
     module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
-    ## event-impl.h (module 'core'): ns3::EventImpl [class]
-    module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     ## mpi-receiver.h (module 'mpi'): ns3::MpiReceiver [class]
     module.add_class('MpiReceiver', parent=root_module['ns3::Object'])
     ## nix-vector.h (module 'network'): ns3::NixVector [class]
     module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class]
-    module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class]
-    module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
@@ -228,13 +204,10 @@
     register_Ns3ByteTagListIterator_methods(root_module, root_module['ns3::ByteTagList::Iterator'])
     register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
-    register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
     register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
-    register_Ns3LbtsMessage_methods(root_module, root_module['ns3::LbtsMessage'])
     register_Ns3MpiInterface_methods(root_module, root_module['ns3::MpiInterface'])
     register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
     register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
-    register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
     register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata'])
     register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item'])
     register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator'])
@@ -242,7 +215,7 @@
     register_Ns3PacketTagIteratorItem_methods(root_module, root_module['ns3::PacketTagIterator::Item'])
     register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList'])
     register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData'])
-    register_Ns3SentBuffer_methods(root_module, root_module['ns3::SentBuffer'])
+    register_Ns3ParallelCommunicationInterface_methods(root_module, root_module['ns3::ParallelCommunicationInterface'])
     register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
     register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
     register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
@@ -255,19 +228,14 @@
     register_Ns3Header_methods(root_module, root_module['ns3::Header'])
     register_Ns3Object_methods(root_module, root_module['ns3::Object'])
     register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator'])
-    register_Ns3Scheduler_methods(root_module, root_module['ns3::Scheduler'])
-    register_Ns3SchedulerEvent_methods(root_module, root_module['ns3::Scheduler::Event'])
-    register_Ns3SchedulerEventKey_methods(root_module, root_module['ns3::Scheduler::EventKey'])
     register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
-    register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
-    register_Ns3SimulatorImpl_methods(root_module, root_module['ns3::SimulatorImpl'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
     register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
@@ -277,13 +245,9 @@
     register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
     register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
     register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
-    register_Ns3DistributedSimulatorImpl_methods(root_module, root_module['ns3::DistributedSimulatorImpl'])
     register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
-    register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
     register_Ns3MpiReceiver_methods(root_module, root_module['ns3::MpiReceiver'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
-    register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
-    register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
@@ -703,51 +667,6 @@
                    is_static=True, visibility='protected')
     return
 
-def register_Ns3EventId_methods(root_module, cls):
-    cls.add_binary_comparison_operator('!=')
-    cls.add_binary_comparison_operator('==')
-    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::EventId const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::EventId const &', 'arg0')])
-    ## event-id.h (module 'core'): ns3::EventId::EventId() [constructor]
-    cls.add_constructor([])
-    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::Ptr<ns3::EventImpl> const & impl, uint64_t ts, uint32_t context, uint32_t uid) [constructor]
-    cls.add_constructor([param('ns3::Ptr< ns3::EventImpl > const &', 'impl'), param('uint64_t', 'ts'), param('uint32_t', 'context'), param('uint32_t', 'uid')])
-    ## event-id.h (module 'core'): void ns3::EventId::Cancel() [member function]
-    cls.add_method('Cancel', 
-                   'void', 
-                   [])
-    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetContext() const [member function]
-    cls.add_method('GetContext', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): uint64_t ns3::EventId::GetTs() const [member function]
-    cls.add_method('GetTs', 
-                   'uint64_t', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetUid() const [member function]
-    cls.add_method('GetUid', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): bool ns3::EventId::IsExpired() const [member function]
-    cls.add_method('IsExpired', 
-                   'bool', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): bool ns3::EventId::IsRunning() const [member function]
-    cls.add_method('IsRunning', 
-                   'bool', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): ns3::EventImpl * ns3::EventId::PeekEventImpl() const [member function]
-    cls.add_method('PeekEventImpl', 
-                   'ns3::EventImpl *', 
-                   [], 
-                   is_const=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')])
@@ -777,35 +696,6 @@
                    [])
     return
 
-def register_Ns3LbtsMessage_methods(root_module, cls):
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::LbtsMessage::LbtsMessage(ns3::LbtsMessage const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::LbtsMessage const &', 'arg0')])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::LbtsMessage::LbtsMessage() [constructor]
-    cls.add_constructor([])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::LbtsMessage::LbtsMessage(uint32_t rxc, uint32_t txc, uint32_t id, bool isFinished, ns3::Time const & t) [constructor]
-    cls.add_constructor([param('uint32_t', 'rxc'), param('uint32_t', 'txc'), param('uint32_t', 'id'), param('bool', 'isFinished'), param('ns3::Time const &', 't')])
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::LbtsMessage::GetMyId() [member function]
-    cls.add_method('GetMyId', 
-                   'uint32_t', 
-                   [])
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::LbtsMessage::GetRxCount() [member function]
-    cls.add_method('GetRxCount', 
-                   'uint32_t', 
-                   [])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::Time ns3::LbtsMessage::GetSmallestTime() [member function]
-    cls.add_method('GetSmallestTime', 
-                   'ns3::Time', 
-                   [])
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::LbtsMessage::GetTxCount() [member function]
-    cls.add_method('GetTxCount', 
-                   'uint32_t', 
-                   [])
-    ## distributed-simulator-impl.h (module 'mpi'): bool ns3::LbtsMessage::IsFinished() [member function]
-    cls.add_method('IsFinished', 
-                   'bool', 
-                   [])
-    return
-
 def register_Ns3MpiInterface_methods(root_module, cls):
     ## mpi-interface.h (module 'mpi'): ns3::MpiInterface::MpiInterface() [constructor]
     cls.add_constructor([])
@@ -826,11 +716,6 @@
                    'void', 
                    [param('int *', 'pargc'), param('char * * *', 'pargv')], 
                    is_static=True)
-    ## mpi-interface.h (module 'mpi'): static uint32_t ns3::MpiInterface::GetRxCount() [member function]
-    cls.add_method('GetRxCount', 
-                   'uint32_t', 
-                   [], 
-                   is_static=True)
     ## mpi-interface.h (module 'mpi'): static uint32_t ns3::MpiInterface::GetSize() [member function]
     cls.add_method('GetSize', 
                    'uint32_t', 
@@ -841,31 +726,16 @@
                    'uint32_t', 
                    [], 
                    is_static=True)
-    ## mpi-interface.h (module 'mpi'): static uint32_t ns3::MpiInterface::GetTxCount() [member function]
-    cls.add_method('GetTxCount', 
-                   'uint32_t', 
-                   [], 
-                   is_static=True)
     ## mpi-interface.h (module 'mpi'): static bool ns3::MpiInterface::IsEnabled() [member function]
     cls.add_method('IsEnabled', 
                    'bool', 
                    [], 
                    is_static=True)
-    ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::ReceiveMessages() [member function]
-    cls.add_method('ReceiveMessages', 
-                   'void', 
-                   [], 
-                   is_static=True)
     ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::SendPacket(ns3::Ptr<ns3::Packet> p, ns3::Time const & rxTime, uint32_t node, uint32_t dev) [member function]
     cls.add_method('SendPacket', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Time const &', 'rxTime'), param('uint32_t', 'node'), param('uint32_t', 'dev')], 
                    is_static=True)
-    ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::TestSendComplete() [member function]
-    cls.add_method('TestSendComplete', 
-                   'void', 
-                   [], 
-                   is_static=True)
     return
 
 def register_Ns3ObjectBase_methods(root_module, cls):
@@ -941,42 +811,6 @@
                    is_static=True)
     return
 
-def register_Ns3ObjectFactory_methods(root_module, cls):
-    cls.add_output_stream_operator()
-    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')])
-    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor]
-    cls.add_constructor([])
-    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(std::string typeId) [constructor]
-    cls.add_constructor([param('std::string', 'typeId')])
-    ## object-factory.h (module 'core'): ns3::Ptr<ns3::Object> ns3::ObjectFactory::Create() const [member function]
-    cls.add_method('Create', 
-                   'ns3::Ptr< ns3::Object >', 
-                   [], 
-                   is_const=True)
-    ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_const=True)
-    ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function]
-    cls.add_method('Set', 
-                   'void', 
-                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
-    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function]
-    cls.add_method('SetTypeId', 
-                   'void', 
-                   [param('ns3::TypeId', 'tid')])
-    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function]
-    cls.add_method('SetTypeId', 
-                   'void', 
-                   [param('char const *', 'tid')])
-    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function]
-    cls.add_method('SetTypeId', 
-                   'void', 
-                   [param('std::string', 'tid')])
-    return
-
 def register_Ns3PacketMetadata_methods(root_module, cls):
     ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor]
     cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')])
@@ -1168,23 +1002,46 @@
     cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
     return
 
-def register_Ns3SentBuffer_methods(root_module, cls):
-    ## mpi-interface.h (module 'mpi'): ns3::SentBuffer::SentBuffer(ns3::SentBuffer const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::SentBuffer const &', 'arg0')])
-    ## mpi-interface.h (module 'mpi'): ns3::SentBuffer::SentBuffer() [constructor]
-    cls.add_constructor([])
-    ## mpi-interface.h (module 'mpi'): uint8_t * ns3::SentBuffer::GetBuffer() [member function]
-    cls.add_method('GetBuffer', 
-                   'uint8_t *', 
-                   [])
-    ## mpi-interface.h (module 'mpi'): MPI_Request * ns3::SentBuffer::GetRequest() [member function]
-    cls.add_method('GetRequest', 
-                   'MPI_Request *', 
-                   [])
-    ## mpi-interface.h (module 'mpi'): void ns3::SentBuffer::SetBuffer(uint8_t * buffer) [member function]
-    cls.add_method('SetBuffer', 
+def register_Ns3ParallelCommunicationInterface_methods(root_module, cls):
+    ## parallel-communication-interface.h (module 'mpi'): ns3::ParallelCommunicationInterface::ParallelCommunicationInterface() [constructor]
+    cls.add_constructor([])
+    ## parallel-communication-interface.h (module 'mpi'): ns3::ParallelCommunicationInterface::ParallelCommunicationInterface(ns3::ParallelCommunicationInterface const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ParallelCommunicationInterface const &', 'arg0')])
+    ## parallel-communication-interface.h (module 'mpi'): void ns3::ParallelCommunicationInterface::Destroy() [member function]
+    cls.add_method('Destroy', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): void ns3::ParallelCommunicationInterface::Disable() [member function]
+    cls.add_method('Disable', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): void ns3::ParallelCommunicationInterface::Enable(int * pargc, char * * * pargv) [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [param('int *', 'pargc'), param('char * * *', 'pargv')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): uint32_t ns3::ParallelCommunicationInterface::GetSize() [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): uint32_t ns3::ParallelCommunicationInterface::GetSystemId() [member function]
+    cls.add_method('GetSystemId', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): bool ns3::ParallelCommunicationInterface::IsEnabled() [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): void ns3::ParallelCommunicationInterface::SendPacket(ns3::Ptr<ns3::Packet> p, ns3::Time const & rxTime, uint32_t node, uint32_t dev) [member function]
+    cls.add_method('SendPacket', 
                    'void', 
-                   [param('uint8_t *', 'buffer')])
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Time const &', 'rxTime'), param('uint32_t', 'node'), param('uint32_t', 'dev')], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls):
@@ -1718,71 +1575,6 @@
                    [])
     return
 
-def register_Ns3Scheduler_methods(root_module, cls):
-    ## scheduler.h (module 'core'): ns3::Scheduler::Scheduler() [constructor]
-    cls.add_constructor([])
-    ## scheduler.h (module 'core'): ns3::Scheduler::Scheduler(ns3::Scheduler const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::Scheduler const &', 'arg0')])
-    ## scheduler.h (module 'core'): static ns3::TypeId ns3::Scheduler::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## scheduler.h (module 'core'): void ns3::Scheduler::Insert(ns3::Scheduler::Event const & ev) [member function]
-    cls.add_method('Insert', 
-                   'void', 
-                   [param('ns3::Scheduler::Event const &', 'ev')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## scheduler.h (module 'core'): bool ns3::Scheduler::IsEmpty() const [member function]
-    cls.add_method('IsEmpty', 
-                   'bool', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event ns3::Scheduler::PeekNext() const [member function]
-    cls.add_method('PeekNext', 
-                   'ns3::Scheduler::Event', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## scheduler.h (module 'core'): void ns3::Scheduler::Remove(ns3::Scheduler::Event const & ev) [member function]
-    cls.add_method('Remove', 
-                   'void', 
-                   [param('ns3::Scheduler::Event const &', 'ev')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event ns3::Scheduler::RemoveNext() [member function]
-    cls.add_method('RemoveNext', 
-                   'ns3::Scheduler::Event', 
-                   [], 
-                   is_pure_virtual=True, is_virtual=True)
-    return
-
-def register_Ns3SchedulerEvent_methods(root_module, cls):
-    cls.add_binary_comparison_operator('<')
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event::Event() [constructor]
-    cls.add_constructor([])
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event::Event(ns3::Scheduler::Event const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::Scheduler::Event const &', 'arg0')])
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event::impl [variable]
-    cls.add_instance_attribute('impl', 'ns3::EventImpl *', is_const=False)
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event::key [variable]
-    cls.add_instance_attribute('key', 'ns3::Scheduler::EventKey', is_const=False)
-    return
-
-def register_Ns3SchedulerEventKey_methods(root_module, cls):
-    cls.add_binary_comparison_operator('<')
-    cls.add_binary_comparison_operator('>')
-    cls.add_binary_comparison_operator('!=')
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::EventKey() [constructor]
-    cls.add_constructor([])
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::EventKey(ns3::Scheduler::EventKey const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::Scheduler::EventKey const &', 'arg0')])
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::m_context [variable]
-    cls.add_instance_attribute('m_context', 'uint32_t', is_const=False)
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::m_ts [variable]
-    cls.add_instance_attribute('m_ts', 'uint64_t', is_const=False)
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::m_uid [variable]
-    cls.add_instance_attribute('m_uid', 'uint32_t', is_const=False)
-    return
-
 def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -1831,18 +1623,6 @@
                    is_static=True)
     return
 
-def register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, cls):
-    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount() [constructor]
-    cls.add_constructor([])
-    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount(ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > const & o) [copy constructor]
-    cls.add_constructor([param('ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter< ns3::EventImpl > > const &', 'o')])
-    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::Cleanup() [member function]
-    cls.add_method('Cleanup', 
-                   'void', 
-                   [], 
-                   is_static=True)
-    return
-
 def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -1891,108 +1671,6 @@
                    is_static=True)
     return
 
-def register_Ns3SimulatorImpl_methods(root_module, cls):
-    ## simulator-impl.h (module 'core'): ns3::SimulatorImpl::SimulatorImpl() [constructor]
-    cls.add_constructor([])
-    ## simulator-impl.h (module 'core'): ns3::SimulatorImpl::SimulatorImpl(ns3::SimulatorImpl const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::SimulatorImpl const &', 'arg0')])
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Cancel(ns3::EventId const & ev) [member function]
-    cls.add_method('Cancel', 
-                   'void', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Destroy() [member function]
-    cls.add_method('Destroy', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): uint32_t ns3::SimulatorImpl::GetContext() const [member function]
-    cls.add_method('GetContext', 
-                   'uint32_t', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::Time ns3::SimulatorImpl::GetDelayLeft(ns3::EventId const & id) const [member function]
-    cls.add_method('GetDelayLeft', 
-                   'ns3::Time', 
-                   [param('ns3::EventId const &', 'id')], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::Time ns3::SimulatorImpl::GetMaximumSimulationTime() const [member function]
-    cls.add_method('GetMaximumSimulationTime', 
-                   'ns3::Time', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): uint32_t ns3::SimulatorImpl::GetSystemId() const [member function]
-    cls.add_method('GetSystemId', 
-                   'uint32_t', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): static ns3::TypeId ns3::SimulatorImpl::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## simulator-impl.h (module 'core'): bool ns3::SimulatorImpl::IsExpired(ns3::EventId const & ev) const [member function]
-    cls.add_method('IsExpired', 
-                   'bool', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): bool ns3::SimulatorImpl::IsFinished() const [member function]
-    cls.add_method('IsFinished', 
-                   'bool', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::Time ns3::SimulatorImpl::Now() const [member function]
-    cls.add_method('Now', 
-                   'ns3::Time', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Remove(ns3::EventId const & ev) [member function]
-    cls.add_method('Remove', 
-                   'void', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Run() [member function]
-    cls.add_method('Run', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::EventId ns3::SimulatorImpl::Schedule(ns3::Time const & time, ns3::EventImpl * event) [member function]
-    cls.add_method('Schedule', 
-                   'ns3::EventId', 
-                   [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::EventId ns3::SimulatorImpl::ScheduleDestroy(ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleDestroy', 
-                   'ns3::EventId', 
-                   [param('ns3::EventImpl *', 'event')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::EventId ns3::SimulatorImpl::ScheduleNow(ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleNow', 
-                   'ns3::EventId', 
-                   [param('ns3::EventImpl *', 'event')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::ScheduleWithContext(uint32_t context, ns3::Time const & time, ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleWithContext', 
-                   'void', 
-                   [param('uint32_t', 'context'), param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function]
-    cls.add_method('SetScheduler', 
-                   'void', 
-                   [param('ns3::ObjectFactory', 'schedulerFactory')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Stop() [member function]
-    cls.add_method('Stop', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Stop(ns3::Time const & time) [member function]
-    cls.add_method('Stop', 
-                   'void', 
-                   [param('ns3::Time const &', 'time')], 
-                   is_pure_virtual=True, is_virtual=True)
-    return
-
 def register_Ns3Time_methods(root_module, cls):
     cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
     cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
@@ -2052,6 +1730,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2062,6 +1745,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2077,6 +1765,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2102,6 +1795,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -2362,113 +2060,6 @@
                    [param('ns3::CallbackBase', 'base')])
     return
 
-def register_Ns3DistributedSimulatorImpl_methods(root_module, cls):
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::DistributedSimulatorImpl::DistributedSimulatorImpl(ns3::DistributedSimulatorImpl const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::DistributedSimulatorImpl const &', 'arg0')])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::DistributedSimulatorImpl::DistributedSimulatorImpl() [constructor]
-    cls.add_constructor([])
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Cancel(ns3::EventId const & ev) [member function]
-    cls.add_method('Cancel', 
-                   'void', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Destroy() [member function]
-    cls.add_method('Destroy', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::DistributedSimulatorImpl::GetContext() const [member function]
-    cls.add_method('GetContext', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::Time ns3::DistributedSimulatorImpl::GetDelayLeft(ns3::EventId const & id) const [member function]
-    cls.add_method('GetDelayLeft', 
-                   'ns3::Time', 
-                   [param('ns3::EventId const &', 'id')], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::Time ns3::DistributedSimulatorImpl::GetMaximumSimulationTime() const [member function]
-    cls.add_method('GetMaximumSimulationTime', 
-                   'ns3::Time', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::DistributedSimulatorImpl::GetSystemId() const [member function]
-    cls.add_method('GetSystemId', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): static ns3::TypeId ns3::DistributedSimulatorImpl::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## distributed-simulator-impl.h (module 'mpi'): bool ns3::DistributedSimulatorImpl::IsExpired(ns3::EventId const & ev) const [member function]
-    cls.add_method('IsExpired', 
-                   'bool', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): bool ns3::DistributedSimulatorImpl::IsFinished() const [member function]
-    cls.add_method('IsFinished', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::Time ns3::DistributedSimulatorImpl::Now() const [member function]
-    cls.add_method('Now', 
-                   'ns3::Time', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Remove(ns3::EventId const & ev) [member function]
-    cls.add_method('Remove', 
-                   'void', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Run() [member function]
-    cls.add_method('Run', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::EventId ns3::DistributedSimulatorImpl::Schedule(ns3::Time const & time, ns3::EventImpl * event) [member function]
-    cls.add_method('Schedule', 
-                   'ns3::EventId', 
-                   [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::EventId ns3::DistributedSimulatorImpl::ScheduleDestroy(ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleDestroy', 
-                   'ns3::EventId', 
-                   [param('ns3::EventImpl *', 'event')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::EventId ns3::DistributedSimulatorImpl::ScheduleNow(ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleNow', 
-                   'ns3::EventId', 
-                   [param('ns3::EventImpl *', 'event')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::ScheduleWithContext(uint32_t context, ns3::Time const & time, ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleWithContext', 
-                   'void', 
-                   [param('uint32_t', 'context'), param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function]
-    cls.add_method('SetScheduler', 
-                   'void', 
-                   [param('ns3::ObjectFactory', 'schedulerFactory')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Stop() [member function]
-    cls.add_method('Stop', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Stop(ns3::Time const & time) [member function]
-    cls.add_method('Stop', 
-                   'void', 
-                   [param('ns3::Time const &', 'time')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   visibility='private', is_virtual=True)
-    return
-
 def register_Ns3EmptyAttributeValue_methods(root_module, cls):
     ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])
@@ -2491,30 +2082,6 @@
                    is_const=True, visibility='private', is_virtual=True)
     return
 
-def register_Ns3EventImpl_methods(root_module, cls):
-    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::EventImpl const &', 'arg0')])
-    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl() [constructor]
-    cls.add_constructor([])
-    ## event-impl.h (module 'core'): void ns3::EventImpl::Cancel() [member function]
-    cls.add_method('Cancel', 
-                   'void', 
-                   [])
-    ## event-impl.h (module 'core'): void ns3::EventImpl::Invoke() [member function]
-    cls.add_method('Invoke', 
-                   'void', 
-                   [])
-    ## event-impl.h (module 'core'): bool ns3::EventImpl::IsCancelled() [member function]
-    cls.add_method('IsCancelled', 
-                   'bool', 
-                   [])
-    ## event-impl.h (module 'core'): void ns3::EventImpl::Notify() [member function]
-    cls.add_method('Notify', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3MpiReceiver_methods(root_module, cls):
     ## mpi-receiver.h (module 'mpi'): ns3::MpiReceiver::MpiReceiver() [constructor]
     cls.add_constructor([])
@@ -2584,46 +2151,6 @@
                    is_const=True)
     return
 
-def register_Ns3ObjectFactoryChecker_methods(root_module, cls):
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor]
-    cls.add_constructor([])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')])
-    return
-
-def register_Ns3ObjectFactoryValue_methods(root_module, cls):
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor]
-    cls.add_constructor([])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor]
-    cls.add_constructor([param('ns3::ObjectFactory const &', 'value')])
-    ## object-factory.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::ObjectFactoryValue::Copy() const [member function]
-    cls.add_method('Copy', 
-                   'ns3::Ptr< ns3::AttributeValue >', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
-    cls.add_method('DeserializeFromString', 
-                   'bool', 
-                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
-                   is_virtual=True)
-    ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function]
-    cls.add_method('Get', 
-                   'ns3::ObjectFactory', 
-                   [], 
-                   is_const=True)
-    ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
-    cls.add_method('SerializeToString', 
-                   'std::string', 
-                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
-                   is_const=True, is_virtual=True)
-    ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function]
-    cls.add_method('Set', 
-                   'void', 
-                   [param('ns3::ObjectFactory const &', 'value')])
-    return
-
 def register_Ns3Packet_methods(root_module, cls):
     cls.add_output_stream_operator()
     ## packet.h (module 'network'): ns3::Packet::Packet() [constructor]
diff -Naur ns-3.18.1/src/mpi/bindings/modulegen__gcc_LP64.py ns-3.19/src/mpi/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/mpi/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -40,20 +40,14 @@
     module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList::Iterator'])
     ## callback.h (module 'core'): ns3::CallbackBase [class]
     module.add_class('CallbackBase', import_from_module='ns.core')
-    ## event-id.h (module 'core'): ns3::EventId [class]
-    module.add_class('EventId', import_from_module='ns.core')
     ## hash.h (module 'core'): ns3::Hasher [class]
     module.add_class('Hasher', import_from_module='ns.core')
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::LbtsMessage [class]
-    module.add_class('LbtsMessage')
     ## mpi-interface.h (module 'mpi'): ns3::MpiInterface [class]
     module.add_class('MpiInterface')
     ## object-base.h (module 'core'): ns3::ObjectBase [class]
     module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core')
     ## object.h (module 'core'): ns3::ObjectDeleter [struct]
     module.add_class('ObjectDeleter', import_from_module='ns.core')
-    ## object-factory.h (module 'core'): ns3::ObjectFactory [class]
-    module.add_class('ObjectFactory', import_from_module='ns.core')
     ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class]
     module.add_class('PacketMetadata', import_from_module='ns.network')
     ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct]
@@ -72,8 +66,8 @@
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
     module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
-    ## mpi-interface.h (module 'mpi'): ns3::SentBuffer [class]
-    module.add_class('SentBuffer')
+    ## parallel-communication-interface.h (module 'mpi'): ns3::ParallelCommunicationInterface [class]
+    module.add_class('ParallelCommunicationInterface', allow_subclassing=True)
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## tag.h (module 'network'): ns3::Tag [class]
@@ -100,12 +94,6 @@
     module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
     ## object.h (module 'core'): ns3::Object::AggregateIterator [class]
     module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object'])
-    ## scheduler.h (module 'core'): ns3::Scheduler [class]
-    module.add_class('Scheduler', import_from_module='ns.core', parent=root_module['ns3::Object'])
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event [struct]
-    module.add_class('Event', import_from_module='ns.core', outer_class=root_module['ns3::Scheduler'])
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey [struct]
-    module.add_class('EventKey', import_from_module='ns.core', outer_class=root_module['ns3::Scheduler'])
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > [class]
@@ -114,8 +102,6 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
-    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
-    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
@@ -124,12 +110,10 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Packet>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
-    ## simulator-impl.h (module 'core'): ns3::SimulatorImpl [class]
-    module.add_class('SimulatorImpl', import_from_module='ns.core', parent=root_module['ns3::Object'])
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -148,20 +132,12 @@
     module.add_class('CallbackImplBase', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     ## callback.h (module 'core'): ns3::CallbackValue [class]
     module.add_class('CallbackValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::DistributedSimulatorImpl [class]
-    module.add_class('DistributedSimulatorImpl', parent=root_module['ns3::SimulatorImpl'])
     ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
     module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
-    ## event-impl.h (module 'core'): ns3::EventImpl [class]
-    module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     ## mpi-receiver.h (module 'mpi'): ns3::MpiReceiver [class]
     module.add_class('MpiReceiver', parent=root_module['ns3::Object'])
     ## nix-vector.h (module 'network'): ns3::NixVector [class]
     module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class]
-    module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class]
-    module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
@@ -228,13 +204,10 @@
     register_Ns3ByteTagListIterator_methods(root_module, root_module['ns3::ByteTagList::Iterator'])
     register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
-    register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
     register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
-    register_Ns3LbtsMessage_methods(root_module, root_module['ns3::LbtsMessage'])
     register_Ns3MpiInterface_methods(root_module, root_module['ns3::MpiInterface'])
     register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
     register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
-    register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
     register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata'])
     register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item'])
     register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator'])
@@ -242,7 +215,7 @@
     register_Ns3PacketTagIteratorItem_methods(root_module, root_module['ns3::PacketTagIterator::Item'])
     register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList'])
     register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData'])
-    register_Ns3SentBuffer_methods(root_module, root_module['ns3::SentBuffer'])
+    register_Ns3ParallelCommunicationInterface_methods(root_module, root_module['ns3::ParallelCommunicationInterface'])
     register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
     register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
     register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
@@ -255,19 +228,14 @@
     register_Ns3Header_methods(root_module, root_module['ns3::Header'])
     register_Ns3Object_methods(root_module, root_module['ns3::Object'])
     register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator'])
-    register_Ns3Scheduler_methods(root_module, root_module['ns3::Scheduler'])
-    register_Ns3SchedulerEvent_methods(root_module, root_module['ns3::Scheduler::Event'])
-    register_Ns3SchedulerEventKey_methods(root_module, root_module['ns3::Scheduler::EventKey'])
     register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
-    register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
-    register_Ns3SimulatorImpl_methods(root_module, root_module['ns3::SimulatorImpl'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
     register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
@@ -277,13 +245,9 @@
     register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
     register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
     register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
-    register_Ns3DistributedSimulatorImpl_methods(root_module, root_module['ns3::DistributedSimulatorImpl'])
     register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
-    register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
     register_Ns3MpiReceiver_methods(root_module, root_module['ns3::MpiReceiver'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
-    register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
-    register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
@@ -703,51 +667,6 @@
                    is_static=True, visibility='protected')
     return
 
-def register_Ns3EventId_methods(root_module, cls):
-    cls.add_binary_comparison_operator('!=')
-    cls.add_binary_comparison_operator('==')
-    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::EventId const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::EventId const &', 'arg0')])
-    ## event-id.h (module 'core'): ns3::EventId::EventId() [constructor]
-    cls.add_constructor([])
-    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::Ptr<ns3::EventImpl> const & impl, uint64_t ts, uint32_t context, uint32_t uid) [constructor]
-    cls.add_constructor([param('ns3::Ptr< ns3::EventImpl > const &', 'impl'), param('uint64_t', 'ts'), param('uint32_t', 'context'), param('uint32_t', 'uid')])
-    ## event-id.h (module 'core'): void ns3::EventId::Cancel() [member function]
-    cls.add_method('Cancel', 
-                   'void', 
-                   [])
-    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetContext() const [member function]
-    cls.add_method('GetContext', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): uint64_t ns3::EventId::GetTs() const [member function]
-    cls.add_method('GetTs', 
-                   'uint64_t', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetUid() const [member function]
-    cls.add_method('GetUid', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): bool ns3::EventId::IsExpired() const [member function]
-    cls.add_method('IsExpired', 
-                   'bool', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): bool ns3::EventId::IsRunning() const [member function]
-    cls.add_method('IsRunning', 
-                   'bool', 
-                   [], 
-                   is_const=True)
-    ## event-id.h (module 'core'): ns3::EventImpl * ns3::EventId::PeekEventImpl() const [member function]
-    cls.add_method('PeekEventImpl', 
-                   'ns3::EventImpl *', 
-                   [], 
-                   is_const=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')])
@@ -777,35 +696,6 @@
                    [])
     return
 
-def register_Ns3LbtsMessage_methods(root_module, cls):
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::LbtsMessage::LbtsMessage(ns3::LbtsMessage const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::LbtsMessage const &', 'arg0')])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::LbtsMessage::LbtsMessage() [constructor]
-    cls.add_constructor([])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::LbtsMessage::LbtsMessage(uint32_t rxc, uint32_t txc, uint32_t id, bool isFinished, ns3::Time const & t) [constructor]
-    cls.add_constructor([param('uint32_t', 'rxc'), param('uint32_t', 'txc'), param('uint32_t', 'id'), param('bool', 'isFinished'), param('ns3::Time const &', 't')])
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::LbtsMessage::GetMyId() [member function]
-    cls.add_method('GetMyId', 
-                   'uint32_t', 
-                   [])
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::LbtsMessage::GetRxCount() [member function]
-    cls.add_method('GetRxCount', 
-                   'uint32_t', 
-                   [])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::Time ns3::LbtsMessage::GetSmallestTime() [member function]
-    cls.add_method('GetSmallestTime', 
-                   'ns3::Time', 
-                   [])
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::LbtsMessage::GetTxCount() [member function]
-    cls.add_method('GetTxCount', 
-                   'uint32_t', 
-                   [])
-    ## distributed-simulator-impl.h (module 'mpi'): bool ns3::LbtsMessage::IsFinished() [member function]
-    cls.add_method('IsFinished', 
-                   'bool', 
-                   [])
-    return
-
 def register_Ns3MpiInterface_methods(root_module, cls):
     ## mpi-interface.h (module 'mpi'): ns3::MpiInterface::MpiInterface() [constructor]
     cls.add_constructor([])
@@ -826,11 +716,6 @@
                    'void', 
                    [param('int *', 'pargc'), param('char * * *', 'pargv')], 
                    is_static=True)
-    ## mpi-interface.h (module 'mpi'): static uint32_t ns3::MpiInterface::GetRxCount() [member function]
-    cls.add_method('GetRxCount', 
-                   'uint32_t', 
-                   [], 
-                   is_static=True)
     ## mpi-interface.h (module 'mpi'): static uint32_t ns3::MpiInterface::GetSize() [member function]
     cls.add_method('GetSize', 
                    'uint32_t', 
@@ -841,31 +726,16 @@
                    'uint32_t', 
                    [], 
                    is_static=True)
-    ## mpi-interface.h (module 'mpi'): static uint32_t ns3::MpiInterface::GetTxCount() [member function]
-    cls.add_method('GetTxCount', 
-                   'uint32_t', 
-                   [], 
-                   is_static=True)
     ## mpi-interface.h (module 'mpi'): static bool ns3::MpiInterface::IsEnabled() [member function]
     cls.add_method('IsEnabled', 
                    'bool', 
                    [], 
                    is_static=True)
-    ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::ReceiveMessages() [member function]
-    cls.add_method('ReceiveMessages', 
-                   'void', 
-                   [], 
-                   is_static=True)
     ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::SendPacket(ns3::Ptr<ns3::Packet> p, ns3::Time const & rxTime, uint32_t node, uint32_t dev) [member function]
     cls.add_method('SendPacket', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Time const &', 'rxTime'), param('uint32_t', 'node'), param('uint32_t', 'dev')], 
                    is_static=True)
-    ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::TestSendComplete() [member function]
-    cls.add_method('TestSendComplete', 
-                   'void', 
-                   [], 
-                   is_static=True)
     return
 
 def register_Ns3ObjectBase_methods(root_module, cls):
@@ -941,42 +811,6 @@
                    is_static=True)
     return
 
-def register_Ns3ObjectFactory_methods(root_module, cls):
-    cls.add_output_stream_operator()
-    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')])
-    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor]
-    cls.add_constructor([])
-    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(std::string typeId) [constructor]
-    cls.add_constructor([param('std::string', 'typeId')])
-    ## object-factory.h (module 'core'): ns3::Ptr<ns3::Object> ns3::ObjectFactory::Create() const [member function]
-    cls.add_method('Create', 
-                   'ns3::Ptr< ns3::Object >', 
-                   [], 
-                   is_const=True)
-    ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_const=True)
-    ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function]
-    cls.add_method('Set', 
-                   'void', 
-                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
-    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function]
-    cls.add_method('SetTypeId', 
-                   'void', 
-                   [param('ns3::TypeId', 'tid')])
-    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function]
-    cls.add_method('SetTypeId', 
-                   'void', 
-                   [param('char const *', 'tid')])
-    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function]
-    cls.add_method('SetTypeId', 
-                   'void', 
-                   [param('std::string', 'tid')])
-    return
-
 def register_Ns3PacketMetadata_methods(root_module, cls):
     ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor]
     cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')])
@@ -1168,23 +1002,46 @@
     cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
     return
 
-def register_Ns3SentBuffer_methods(root_module, cls):
-    ## mpi-interface.h (module 'mpi'): ns3::SentBuffer::SentBuffer(ns3::SentBuffer const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::SentBuffer const &', 'arg0')])
-    ## mpi-interface.h (module 'mpi'): ns3::SentBuffer::SentBuffer() [constructor]
-    cls.add_constructor([])
-    ## mpi-interface.h (module 'mpi'): uint8_t * ns3::SentBuffer::GetBuffer() [member function]
-    cls.add_method('GetBuffer', 
-                   'uint8_t *', 
-                   [])
-    ## mpi-interface.h (module 'mpi'): MPI_Request * ns3::SentBuffer::GetRequest() [member function]
-    cls.add_method('GetRequest', 
-                   'MPI_Request *', 
-                   [])
-    ## mpi-interface.h (module 'mpi'): void ns3::SentBuffer::SetBuffer(uint8_t * buffer) [member function]
-    cls.add_method('SetBuffer', 
+def register_Ns3ParallelCommunicationInterface_methods(root_module, cls):
+    ## parallel-communication-interface.h (module 'mpi'): ns3::ParallelCommunicationInterface::ParallelCommunicationInterface() [constructor]
+    cls.add_constructor([])
+    ## parallel-communication-interface.h (module 'mpi'): ns3::ParallelCommunicationInterface::ParallelCommunicationInterface(ns3::ParallelCommunicationInterface const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ParallelCommunicationInterface const &', 'arg0')])
+    ## parallel-communication-interface.h (module 'mpi'): void ns3::ParallelCommunicationInterface::Destroy() [member function]
+    cls.add_method('Destroy', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): void ns3::ParallelCommunicationInterface::Disable() [member function]
+    cls.add_method('Disable', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): void ns3::ParallelCommunicationInterface::Enable(int * pargc, char * * * pargv) [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [param('int *', 'pargc'), param('char * * *', 'pargv')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): uint32_t ns3::ParallelCommunicationInterface::GetSize() [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): uint32_t ns3::ParallelCommunicationInterface::GetSystemId() [member function]
+    cls.add_method('GetSystemId', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): bool ns3::ParallelCommunicationInterface::IsEnabled() [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## parallel-communication-interface.h (module 'mpi'): void ns3::ParallelCommunicationInterface::SendPacket(ns3::Ptr<ns3::Packet> p, ns3::Time const & rxTime, uint32_t node, uint32_t dev) [member function]
+    cls.add_method('SendPacket', 
                    'void', 
-                   [param('uint8_t *', 'buffer')])
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Time const &', 'rxTime'), param('uint32_t', 'node'), param('uint32_t', 'dev')], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls):
@@ -1718,71 +1575,6 @@
                    [])
     return
 
-def register_Ns3Scheduler_methods(root_module, cls):
-    ## scheduler.h (module 'core'): ns3::Scheduler::Scheduler() [constructor]
-    cls.add_constructor([])
-    ## scheduler.h (module 'core'): ns3::Scheduler::Scheduler(ns3::Scheduler const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::Scheduler const &', 'arg0')])
-    ## scheduler.h (module 'core'): static ns3::TypeId ns3::Scheduler::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## scheduler.h (module 'core'): void ns3::Scheduler::Insert(ns3::Scheduler::Event const & ev) [member function]
-    cls.add_method('Insert', 
-                   'void', 
-                   [param('ns3::Scheduler::Event const &', 'ev')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## scheduler.h (module 'core'): bool ns3::Scheduler::IsEmpty() const [member function]
-    cls.add_method('IsEmpty', 
-                   'bool', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event ns3::Scheduler::PeekNext() const [member function]
-    cls.add_method('PeekNext', 
-                   'ns3::Scheduler::Event', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## scheduler.h (module 'core'): void ns3::Scheduler::Remove(ns3::Scheduler::Event const & ev) [member function]
-    cls.add_method('Remove', 
-                   'void', 
-                   [param('ns3::Scheduler::Event const &', 'ev')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event ns3::Scheduler::RemoveNext() [member function]
-    cls.add_method('RemoveNext', 
-                   'ns3::Scheduler::Event', 
-                   [], 
-                   is_pure_virtual=True, is_virtual=True)
-    return
-
-def register_Ns3SchedulerEvent_methods(root_module, cls):
-    cls.add_binary_comparison_operator('<')
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event::Event() [constructor]
-    cls.add_constructor([])
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event::Event(ns3::Scheduler::Event const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::Scheduler::Event const &', 'arg0')])
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event::impl [variable]
-    cls.add_instance_attribute('impl', 'ns3::EventImpl *', is_const=False)
-    ## scheduler.h (module 'core'): ns3::Scheduler::Event::key [variable]
-    cls.add_instance_attribute('key', 'ns3::Scheduler::EventKey', is_const=False)
-    return
-
-def register_Ns3SchedulerEventKey_methods(root_module, cls):
-    cls.add_binary_comparison_operator('<')
-    cls.add_binary_comparison_operator('>')
-    cls.add_binary_comparison_operator('!=')
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::EventKey() [constructor]
-    cls.add_constructor([])
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::EventKey(ns3::Scheduler::EventKey const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::Scheduler::EventKey const &', 'arg0')])
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::m_context [variable]
-    cls.add_instance_attribute('m_context', 'uint32_t', is_const=False)
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::m_ts [variable]
-    cls.add_instance_attribute('m_ts', 'uint64_t', is_const=False)
-    ## scheduler.h (module 'core'): ns3::Scheduler::EventKey::m_uid [variable]
-    cls.add_instance_attribute('m_uid', 'uint32_t', is_const=False)
-    return
-
 def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -1831,18 +1623,6 @@
                    is_static=True)
     return
 
-def register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, cls):
-    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount() [constructor]
-    cls.add_constructor([])
-    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount(ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > const & o) [copy constructor]
-    cls.add_constructor([param('ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter< ns3::EventImpl > > const &', 'o')])
-    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::Cleanup() [member function]
-    cls.add_method('Cleanup', 
-                   'void', 
-                   [], 
-                   is_static=True)
-    return
-
 def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -1891,108 +1671,6 @@
                    is_static=True)
     return
 
-def register_Ns3SimulatorImpl_methods(root_module, cls):
-    ## simulator-impl.h (module 'core'): ns3::SimulatorImpl::SimulatorImpl() [constructor]
-    cls.add_constructor([])
-    ## simulator-impl.h (module 'core'): ns3::SimulatorImpl::SimulatorImpl(ns3::SimulatorImpl const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::SimulatorImpl const &', 'arg0')])
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Cancel(ns3::EventId const & ev) [member function]
-    cls.add_method('Cancel', 
-                   'void', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Destroy() [member function]
-    cls.add_method('Destroy', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): uint32_t ns3::SimulatorImpl::GetContext() const [member function]
-    cls.add_method('GetContext', 
-                   'uint32_t', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::Time ns3::SimulatorImpl::GetDelayLeft(ns3::EventId const & id) const [member function]
-    cls.add_method('GetDelayLeft', 
-                   'ns3::Time', 
-                   [param('ns3::EventId const &', 'id')], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::Time ns3::SimulatorImpl::GetMaximumSimulationTime() const [member function]
-    cls.add_method('GetMaximumSimulationTime', 
-                   'ns3::Time', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): uint32_t ns3::SimulatorImpl::GetSystemId() const [member function]
-    cls.add_method('GetSystemId', 
-                   'uint32_t', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): static ns3::TypeId ns3::SimulatorImpl::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## simulator-impl.h (module 'core'): bool ns3::SimulatorImpl::IsExpired(ns3::EventId const & ev) const [member function]
-    cls.add_method('IsExpired', 
-                   'bool', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): bool ns3::SimulatorImpl::IsFinished() const [member function]
-    cls.add_method('IsFinished', 
-                   'bool', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::Time ns3::SimulatorImpl::Now() const [member function]
-    cls.add_method('Now', 
-                   'ns3::Time', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Remove(ns3::EventId const & ev) [member function]
-    cls.add_method('Remove', 
-                   'void', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Run() [member function]
-    cls.add_method('Run', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::EventId ns3::SimulatorImpl::Schedule(ns3::Time const & time, ns3::EventImpl * event) [member function]
-    cls.add_method('Schedule', 
-                   'ns3::EventId', 
-                   [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::EventId ns3::SimulatorImpl::ScheduleDestroy(ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleDestroy', 
-                   'ns3::EventId', 
-                   [param('ns3::EventImpl *', 'event')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): ns3::EventId ns3::SimulatorImpl::ScheduleNow(ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleNow', 
-                   'ns3::EventId', 
-                   [param('ns3::EventImpl *', 'event')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::ScheduleWithContext(uint32_t context, ns3::Time const & time, ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleWithContext', 
-                   'void', 
-                   [param('uint32_t', 'context'), param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function]
-    cls.add_method('SetScheduler', 
-                   'void', 
-                   [param('ns3::ObjectFactory', 'schedulerFactory')], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Stop() [member function]
-    cls.add_method('Stop', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, is_virtual=True)
-    ## simulator-impl.h (module 'core'): void ns3::SimulatorImpl::Stop(ns3::Time const & time) [member function]
-    cls.add_method('Stop', 
-                   'void', 
-                   [param('ns3::Time const &', 'time')], 
-                   is_pure_virtual=True, is_virtual=True)
-    return
-
 def register_Ns3Time_methods(root_module, cls):
     cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
     cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
@@ -2052,6 +1730,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2062,6 +1745,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2077,6 +1765,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2102,6 +1795,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -2362,113 +2060,6 @@
                    [param('ns3::CallbackBase', 'base')])
     return
 
-def register_Ns3DistributedSimulatorImpl_methods(root_module, cls):
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::DistributedSimulatorImpl::DistributedSimulatorImpl(ns3::DistributedSimulatorImpl const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::DistributedSimulatorImpl const &', 'arg0')])
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::DistributedSimulatorImpl::DistributedSimulatorImpl() [constructor]
-    cls.add_constructor([])
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Cancel(ns3::EventId const & ev) [member function]
-    cls.add_method('Cancel', 
-                   'void', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Destroy() [member function]
-    cls.add_method('Destroy', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::DistributedSimulatorImpl::GetContext() const [member function]
-    cls.add_method('GetContext', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::Time ns3::DistributedSimulatorImpl::GetDelayLeft(ns3::EventId const & id) const [member function]
-    cls.add_method('GetDelayLeft', 
-                   'ns3::Time', 
-                   [param('ns3::EventId const &', 'id')], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::Time ns3::DistributedSimulatorImpl::GetMaximumSimulationTime() const [member function]
-    cls.add_method('GetMaximumSimulationTime', 
-                   'ns3::Time', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): uint32_t ns3::DistributedSimulatorImpl::GetSystemId() const [member function]
-    cls.add_method('GetSystemId', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): static ns3::TypeId ns3::DistributedSimulatorImpl::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## distributed-simulator-impl.h (module 'mpi'): bool ns3::DistributedSimulatorImpl::IsExpired(ns3::EventId const & ev) const [member function]
-    cls.add_method('IsExpired', 
-                   'bool', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): bool ns3::DistributedSimulatorImpl::IsFinished() const [member function]
-    cls.add_method('IsFinished', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::Time ns3::DistributedSimulatorImpl::Now() const [member function]
-    cls.add_method('Now', 
-                   'ns3::Time', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Remove(ns3::EventId const & ev) [member function]
-    cls.add_method('Remove', 
-                   'void', 
-                   [param('ns3::EventId const &', 'ev')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Run() [member function]
-    cls.add_method('Run', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::EventId ns3::DistributedSimulatorImpl::Schedule(ns3::Time const & time, ns3::EventImpl * event) [member function]
-    cls.add_method('Schedule', 
-                   'ns3::EventId', 
-                   [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::EventId ns3::DistributedSimulatorImpl::ScheduleDestroy(ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleDestroy', 
-                   'ns3::EventId', 
-                   [param('ns3::EventImpl *', 'event')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): ns3::EventId ns3::DistributedSimulatorImpl::ScheduleNow(ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleNow', 
-                   'ns3::EventId', 
-                   [param('ns3::EventImpl *', 'event')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::ScheduleWithContext(uint32_t context, ns3::Time const & time, ns3::EventImpl * event) [member function]
-    cls.add_method('ScheduleWithContext', 
-                   'void', 
-                   [param('uint32_t', 'context'), param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function]
-    cls.add_method('SetScheduler', 
-                   'void', 
-                   [param('ns3::ObjectFactory', 'schedulerFactory')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Stop() [member function]
-    cls.add_method('Stop', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::Stop(ns3::Time const & time) [member function]
-    cls.add_method('Stop', 
-                   'void', 
-                   [param('ns3::Time const &', 'time')], 
-                   is_virtual=True)
-    ## distributed-simulator-impl.h (module 'mpi'): void ns3::DistributedSimulatorImpl::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   visibility='private', is_virtual=True)
-    return
-
 def register_Ns3EmptyAttributeValue_methods(root_module, cls):
     ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])
@@ -2491,30 +2082,6 @@
                    is_const=True, visibility='private', is_virtual=True)
     return
 
-def register_Ns3EventImpl_methods(root_module, cls):
-    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::EventImpl const &', 'arg0')])
-    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl() [constructor]
-    cls.add_constructor([])
-    ## event-impl.h (module 'core'): void ns3::EventImpl::Cancel() [member function]
-    cls.add_method('Cancel', 
-                   'void', 
-                   [])
-    ## event-impl.h (module 'core'): void ns3::EventImpl::Invoke() [member function]
-    cls.add_method('Invoke', 
-                   'void', 
-                   [])
-    ## event-impl.h (module 'core'): bool ns3::EventImpl::IsCancelled() [member function]
-    cls.add_method('IsCancelled', 
-                   'bool', 
-                   [])
-    ## event-impl.h (module 'core'): void ns3::EventImpl::Notify() [member function]
-    cls.add_method('Notify', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3MpiReceiver_methods(root_module, cls):
     ## mpi-receiver.h (module 'mpi'): ns3::MpiReceiver::MpiReceiver() [constructor]
     cls.add_constructor([])
@@ -2584,46 +2151,6 @@
                    is_const=True)
     return
 
-def register_Ns3ObjectFactoryChecker_methods(root_module, cls):
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor]
-    cls.add_constructor([])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')])
-    return
-
-def register_Ns3ObjectFactoryValue_methods(root_module, cls):
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor]
-    cls.add_constructor([])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')])
-    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor]
-    cls.add_constructor([param('ns3::ObjectFactory const &', 'value')])
-    ## object-factory.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::ObjectFactoryValue::Copy() const [member function]
-    cls.add_method('Copy', 
-                   'ns3::Ptr< ns3::AttributeValue >', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
-    cls.add_method('DeserializeFromString', 
-                   'bool', 
-                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
-                   is_virtual=True)
-    ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function]
-    cls.add_method('Get', 
-                   'ns3::ObjectFactory', 
-                   [], 
-                   is_const=True)
-    ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
-    cls.add_method('SerializeToString', 
-                   'std::string', 
-                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
-                   is_const=True, is_virtual=True)
-    ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function]
-    cls.add_method('Set', 
-                   'void', 
-                   [param('ns3::ObjectFactory const &', 'value')])
-    return
-
 def register_Ns3Packet_methods(root_module, cls):
     cls.add_output_stream_operator()
     ## packet.h (module 'network'): ns3::Packet::Packet() [constructor]
diff -Naur ns-3.18.1/src/mpi/doc/distributed.rst ns-3.19/src/mpi/doc/distributed.rst
--- ns-3.18.1/src/mpi/doc/distributed.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/doc/distributed.rst	2013-12-20 09:44:50.000000000 -0800
@@ -32,10 +32,39 @@
 events in time-stamped order to ensure proper simulation execution. If a LP
 receives a message containing an event from the past, clearly this is an issue,
 since this event could change other events which have already been executed. To
-address this problem, a conservative synchronization algorithm with lookahead is
+address this problem, two conservative synchronization algorithm with lookahead are
 used in |ns3|. For more information on different synchronization approaches and
 parallel and distributed simulation in general, please refer to "Parallel and
-Distributed Simulation Systems" by Richard Fujimoto.
+Distributed Simulation Systems" by Richard Fujimoto.   
+
+The default parallel synchronization strategy implemented in the
+DistributedSimulatorImpl class is based on a globally synchronized
+algorithm using an MPI collective operation to synchronize simulation
+time across all LPs.  A second synchronization strategy based on local
+communication and null messages is implemented in the
+NullMessageSimulatorImpl class, For the null message strategy the
+global all to all gather is not required; LPs only need to
+communication with LPs that have shared point-to-point links.  The
+algorithm to use is controlled by which the |ns3| global value
+SimulatorImplementationType.
+
+The best algorithm to use is dependent on the communication and event
+scheduling pattern for the application.  In general, null message
+synchronization algorithms will scale better due to local
+communication scaling better than a global all-to-all gather that is
+required by DistributedSimulatorImpl.  There are two known cases where
+the global synchronization performs better.  The first is when most
+LPs have point-to-point link with most other LPs, in other words the
+LPs are nearly fully connected.  In this case the null message
+algorithm will generate more message passing traffic than the
+all-to-all gather.  A second case where the global all-to-all gather
+is more efficient is when there are long periods of simulation time
+when no events are occurring.  The all-to-all gather algorithm is able
+to quickly determine then next event time globally.  The nearest
+neighbor behavior of the null message algorithm will require more
+communications to propagate that knowledge; each LP is only aware of
+neighbor next event times.
+
 
 Remote point-to-point links
 +++++++++++++++++++++++++++
@@ -68,6 +97,7 @@
 
 Prerequisites
 +++++++++++++
+.. highlight:: bash
 
 Ensure that MPI is installed, as well as mpic++. In Ubuntu repositories, 
 these are openmpi-bin, openmpi-common, openmpi-doc, libopenmpi-dev. In 
@@ -78,31 +108,33 @@
 There is a conflict on some Fedora systems between libotf and openmpi. A 
 possible "quick-fix" is to yum remove libotf before installing openmpi. 
 This will remove conflict, but it will also remove emacs. Alternatively, 
-these steps could be followed to resolve the conflict:::
+these steps could be followed to resolve the conflict:
 
-    1) Rename the tiny otfdump which emacs says it needs:
+    1) Rename the tiny otfdump which emacs says it needs::
 
-         mv /usr/bin/otfdump /usr/bin/otfdump.emacs-version
+         $ mv /usr/bin/otfdump /usr/bin/otfdump.emacs-version
 
-    2) Manually resolve openmpi dependencies:
+    2) Manually resolve openmpi dependencies::
 
-         sudo yum install libgfortran libtorque numactl
+         $ sudo yum install libgfortran libtorque numactl
 
     3) Download rpm packages: 
 
+       .. sourcecode:: text
+
          openmpi-1.3.1-1.fc11.i586.rpm
          openmpi-devel-1.3.1-1.fc11.i586.rpm
          openmpi-libs-1.3.1-1.fc11.i586.rpm
          openmpi-vt-1.3.1-1.fc11.i586.rpm
 
-         from
+       from http://mirrors.kernel.org/fedora/releases/11/Everything/i386/os/Packages/
 
-         http://mirrors.kernel.org/fedora/releases/11/Everything/i386/os/Packages/
+    4) Force the packages in::
 
-    4) Force the packages in:
-
-         sudo rpm -ivh --force openmpi-1.3.1-1.fc11.i586.rpm
-         openmpi-libs-1.3.1-1.fc11.i586.rpm openmpi-devel-1.3.1-1.fc11.i586.rpm
+         $ sudo rpm -ivh --force \
+         openmpi-1.3.1-1.fc11.i586.rpm \
+         openmpi-libs-1.3.1-1.fc11.i586.rpm \
+         openmpi-devel-1.3.1-1.fc11.i586.rpm \
          openmpi-vt-1.3.1-1.fc11.i586.rpm
 
 Also, it may be necessary to add the openmpi bin directory to PATH in order to
@@ -111,17 +143,17 @@
 to open shared libraries, such as libmpi_cxx.so.0, it may be necessary to add
 the openmpi lib directory to LD_LIBRARY_PATH.
 
-Here is an example of setting up PATH and LD_LIBRARY_PATH using a bash shell:::
+Here is an example of setting up PATH and LD_LIBRARY_PATH using a bash shell:
 
-     For a 32-bit Linux distribution:
+    * For a 32-bit Linux distribution::
          
-          export PATH=$PATH:/usr/lib/openmpi/bin
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/openmpi/lib      
+         $ export PATH=$PATH:/usr/lib/openmpi/bin
+         $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/openmpi/lib      
     
-     For a 64-bit Linux distribution:
+     For a 64-bit Linux distribution::
      
-          export PATH=$PATH:/usr/lib64/openmpi/bin
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/openmpi/lib          
+         $ export PATH=$PATH:/usr/lib64/openmpi/bin
+         $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/openmpi/lib          
 
 These lines can be added into ~/.bash_profile or ~/.bashrc to avoid having to
 retype them when a new shell is opened.
@@ -129,30 +161,37 @@
 Building and Running Examples
 +++++++++++++++++++++++++++++
 
-If you already built |ns3| without MPI enabled, you must re-build:::
+If you already built |ns3| without MPI enabled, you must re-build::
 
-    ./waf distclean
+    $ ./waf distclean
 
-Configure |ns3| with the --enable-mpi option:::
+Configure |ns3| with the --enable-mpi option::
 
-    ./waf -d debug configure --enable-examples --enable-tests --enable-mpi
+    $ ./waf -d debug configure --enable-examples --enable-tests --enable-mpi
 
 Ensure that MPI is enabled by checking the optional features shown from the
 output of configure.
 
-Next, build |ns3|:::
+Next, build |ns3|::
 
-    ./waf
+    $ ./waf
 
-After building |ns3| with mpi enabled, the example programs are now ready to run
-with mpirun. Here are a few examples (from the root |ns3| directory):::
+After building |ns3| with mpi enabled, the example programs are now
+ready to run with mpirun. Here are a few examples (from the root |ns3|
+directory)::
 
-    mpirun -np 2 ./waf --run simple-distributed
-    mpirun -np 4 -machinefile mpihosts ./waf --run 'nms-udp-nix --LAN=2 --CN=4 --nix=1'
+    $ mpirun -np 2 ./waf --run simple-distributed
+    $ mpirun -np 4 -machinefile mpihosts ./waf --run 'nms-udp-nix --LAN=2 --CN=4 --nix=1'
             
+An examle using the null message synchronization algorithm::
+
+    $ mpirun -np 2 ./waf --run simple-distributed --nullmsg
+
 The np switch is the number of logical processors to use. The machinefile switch
 is which machines to use. In order to use machinefile, the target file must
-exist (in this case mpihosts). This can simply contain something like:::
+exist (in this case mpihosts). This can simply contain something like:
+
+.. sourcecode:: text
 
     localhost
     localhost
@@ -162,14 +201,42 @@
 Or if you have a cluster of machines, you can name them.
 
 NOTE: Some users have experienced issues using mpirun and waf together. An
-alternative way to run distributed examples is shown below:::
+alternative way to run distributed examples is shown below::
+
+    $ ./waf shell
+    $ cd build/debug
+    $ mpirun -np 2 src/mpi/examples/simple-distributed
+
+Setting synchronization algorithm to use
+++++++++++++++++++++++++++++++++++++++++
+
+The global value SimulatorImplementationType is used to set the
+synchronization algorithm to use.  This value must be set before the
+MpiInterface::Enable method is invoked if the default
+DistributedSimulatorImpl is not used.  Here is an example code snippet
+showing how to add a command line argument to control the
+synchronization algorithm choice:::
+
+  cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization", nullmsg);
+  if(nullmsg) 
+    {
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::NullMessageSimulatorImpl"));
+    } 
+  else 
+    {
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::DistributedSimulatorImpl"));
+    }
+
+  // Enable parallel simulator with the command line arguments
+  MpiInterface::Enable (&argc, &argv);
+
 
-    ./waf shell
-    cd build/debug
-    mpirun -np 2 src/mpi/examples/simple-distributed
 
 Creating custom topologies
 ++++++++++++++++++++++++++
+.. highlight:: cpp
 
 The example programs in src/mpi/examples give a good idea of how to create different
 topologies for distributed simulation. The main points are assigning system ids
@@ -178,14 +245,14 @@
 target node.
 
 Assigning system ids to nodes is simple and can be handled two different ways.
-First, a NodeContainer can be used to create the nodes and assign system ids:::
+First, a NodeContainer can be used to create the nodes and assign system ids::
 
     NodeContainer nodes;
     nodes.Create (5, 1); // Creates 5 nodes with system id 1.
 
 Alternatively, nodes can be created individually, assigned system ids, and added
 to a NodeContainer. This is useful if a NodeContainer holds nodes with different
-system ids:::
+system ids::
 
     NodeContainer nodes;
     Ptr<Node> node1 = CreateObject<Node> (0); // Create node1 with system id 0
@@ -213,7 +280,7 @@
 keep track of different traces is to just name the trace files or pcaps
 differently, based on the system id of the simulator. For example, something
 like this should work well, assuming all of these local variables were
-previously defined:::
+previously defined::
 
     if (MpiInterface::GetSystemId () == 0)
       {
diff -Naur ns-3.18.1/src/mpi/examples/nms-p2p-nix-distributed.cc ns-3.19/src/mpi/examples/nms-p2p-nix-distributed.cc
--- ns-3.18.1/src/mpi/examples/nms-p2p-nix-distributed.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/examples/nms-p2p-nix-distributed.cc	2013-12-20 09:44:50.000000000 -0800
@@ -37,6 +37,7 @@
 #include <cstdlib>
 #include <sys/time.h>
 #include <fstream>
+#include <vector>
 
 #include "ns3/core-module.h"
 #include "ns3/internet-module.h"
@@ -49,10 +50,6 @@
 #include "ns3/ipv4-list-routing-helper.h"
 #include "ns3/ipv4-nix-vector-helper.h"
 
-#ifdef NS3_MPI
-#include <mpi.h>
-#endif
-
 using namespace ns3;
 
 typedef struct timeval TIMER_TYPE;
@@ -62,16 +59,23 @@
 
 NS_LOG_COMPONENT_DEFINE ("CampusNetworkModelDistributed");
 
-  /**
-   *  \internal
-   *  \c #defines for \c nCN and \c nLANClients are a temporary fix,
-   *  see \bugid{1560}
-   */
 int
 main (int argc, char *argv[])
 {
 #ifdef NS3_MPI
-  // Enable MPI with the command line arguments
+
+  typedef std::vector<NodeContainer> vectorOfNodeContainer;
+  typedef std::vector<vectorOfNodeContainer> vectorOfVectorOfNodeContainer;
+  typedef std::vector<vectorOfVectorOfNodeContainer> vectorOfVectorOfVectorOfNodeContainer;  
+
+  typedef std::vector<Ipv4InterfaceContainer> vectorOfIpv4InterfaceContainer;
+  typedef std::vector<vectorOfIpv4InterfaceContainer> vectorOfVectorOfIpv4InterfaceContainer;
+  typedef std::vector<vectorOfVectorOfIpv4InterfaceContainer> vectorOfVectorOfVectorOfIpv4InterfaceContainer;
+ 
+  typedef std::vector<NetDeviceContainer> vectorOfNetDeviceContainer;
+  typedef std::vector<vectorOfNetDeviceContainer> vectorOfVectorOfNetDeviceContainer;
+
+  // Enable parallel simulator with the command line arguments
   MpiInterface::Enable (&argc, &argv);
 
   TIMER_TYPE t0, t1, t2;
@@ -84,17 +88,14 @@
   uint32_t systemId = MpiInterface::GetSystemId ();
   uint32_t systemCount = MpiInterface::GetSize ();
 
-  //temporary fix see bug 1560
-  #define nCN (2)
-  #define nLANClients (42)
-  //uint32_t nCN = 2, nLANClients = 42;
+  uint32_t nCN = 2, nLANClients = 42;
   int32_t single = 0;
   int nBytes = 500000; // Bytes for each on/off app
   bool nix = true;
 
   CommandLine cmd;
-  //cmd.AddValue ("CN", "Number of total CNs [2]", nCN);
-  //cmd.AddValue ("LAN", "Number of nodes per LAN [42]", nLANClients);
+  cmd.AddValue ("CN", "Number of total CNs [2]", nCN);
+  cmd.AddValue ("LAN", "Number of nodes per LAN [42]", nLANClients);
   cmd.AddValue ("single", "1 if use single flow", single);
   cmd.AddValue ("nBytes", "Number of bytes for each on/off app", nBytes);
   cmd.AddValue ("nix", "Toggle the use of nix-vector or global routing", nix);
@@ -114,15 +115,30 @@
     }
 
   std::cout << "Number of CNs: " << nCN << ", LAN nodes: " << nLANClients << std::endl;
+  
+
 
-  NodeContainer nodes_net0[nCN][3], nodes_net1[nCN][6], nodes_netLR[nCN],
-                nodes_net2[nCN][14], nodes_net2LAN[nCN][7][nLANClients],
-                nodes_net3[nCN][9], nodes_net3LAN[nCN][5][nLANClients];
+  vectorOfNodeContainer nodes_netLR(nCN);
+  vectorOfVectorOfNodeContainer nodes_net0(nCN,vectorOfNodeContainer(3));
+  vectorOfVectorOfNodeContainer nodes_net1(nCN,vectorOfNodeContainer(6));
+  vectorOfVectorOfNodeContainer nodes_net2(nCN,vectorOfNodeContainer(14));
+  vectorOfVectorOfNodeContainer nodes_net3(nCN,vectorOfNodeContainer(9));
+     
+  vectorOfVectorOfVectorOfNodeContainer nodes_net2LAN(nCN,vectorOfVectorOfNodeContainer(7,vectorOfNodeContainer(nLANClients)));
+  vectorOfVectorOfVectorOfNodeContainer nodes_net3LAN(nCN,vectorOfVectorOfNodeContainer(5,vectorOfNodeContainer(nLANClients)));
+  
   PointToPointHelper p2p_2gb200ms, p2p_1gb5ms, p2p_100mb1ms;
   InternetStackHelper stack;
-  Ipv4InterfaceContainer ifs, ifs0[nCN][3], ifs1[nCN][6], ifs2[nCN][14],
-                         ifs3[nCN][9], ifs2LAN[nCN][7][nLANClients],
-                         ifs3LAN[nCN][5][nLANClients];
+  
+  Ipv4InterfaceContainer ifs;  
+
+  vectorOfVectorOfIpv4InterfaceContainer ifs0(nCN,vectorOfIpv4InterfaceContainer(3));
+  vectorOfVectorOfIpv4InterfaceContainer ifs1(nCN,vectorOfIpv4InterfaceContainer(6));
+  vectorOfVectorOfIpv4InterfaceContainer ifs2(nCN,vectorOfIpv4InterfaceContainer(14));
+  vectorOfVectorOfIpv4InterfaceContainer ifs3(nCN,vectorOfIpv4InterfaceContainer(9));
+  vectorOfVectorOfVectorOfIpv4InterfaceContainer ifs2LAN(nCN,vectorOfVectorOfIpv4InterfaceContainer(7,vectorOfIpv4InterfaceContainer(nLANClients)));
+  vectorOfVectorOfVectorOfIpv4InterfaceContainer ifs3LAN(nCN,vectorOfVectorOfIpv4InterfaceContainer(5,vectorOfIpv4InterfaceContainer(nLANClients)));
+  
   Ipv4AddressHelper address;
   std::ostringstream oss;
   p2p_1gb5ms.SetDeviceAttribute ("DataRate", StringValue ("1Gbps"));
@@ -223,7 +239,7 @@
         {
           ndc2[i] = p2p_1gb5ms.Install (nodes_net2[z][i]);
         }
-      NetDeviceContainer ndc2LAN[7][nLANClients];
+      vectorOfVectorOfNetDeviceContainer ndc2LAN(7, vectorOfNetDeviceContainer(nLANClients));
       for (int i = 0; i < 7; ++i)
         {
           oss.str ("");
@@ -261,7 +277,7 @@
         {
           ndc3[i] = p2p_1gb5ms.Install (nodes_net3[z][i]);
         }
-      NetDeviceContainer ndc3LAN[5][nLANClients];
+      vectorOfVectorOfNetDeviceContainer ndc3LAN(5, vectorOfNetDeviceContainer(nLANClients));
       for (int i = 0; i < 5; ++i)
         {
           oss.str ("");
@@ -374,7 +390,7 @@
   if (nCN > 1)
     {
       std::cout << "Forming Ring Topology..." << std::endl;
-      NodeContainer nodes_ring[nCN];
+      vectorOfNodeContainer nodes_ring(nCN);
       for (uint32_t z = 0; z < nCN - 1; ++z)
         {
           nodes_ring[z].Add (nodes_net0[z][0].Get (0));
@@ -382,7 +398,7 @@
         }
       nodes_ring[nCN - 1].Add (nodes_net0[nCN - 1][0].Get (0));
       nodes_ring[nCN - 1].Add (nodes_net0[0][0].Get (0));
-      NetDeviceContainer ndc_ring[nCN];
+      vectorOfNetDeviceContainer ndc_ring(nCN);
       for (uint32_t z = 0; z < nCN; ++z)
         {
           ndc_ring[z] = p2p_2gb200ms.Install (nodes_ring[z]);
@@ -608,7 +624,7 @@
   TIMER_NOW (t2);
   std::cout << "Simulator finished." << std::endl;
   Simulator::Destroy ();
-  // Exit the MPI execution environment
+  // Exit the parallel execution environment
   MpiInterface::Disable ();
   double d1 = TIMER_DIFF (t1, t0), d2 = TIMER_DIFF (t2, t1);
   std::cout << "-----" << std::endl << "Runtime Stats:" << std::endl;
diff -Naur ns-3.18.1/src/mpi/examples/simple-distributed.cc ns-3.19/src/mpi/examples/simple-distributed.cc
--- ns-3.18.1/src/mpi/examples/simple-distributed.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/examples/simple-distributed.cc	2013-12-20 09:44:50.000000000 -0800
@@ -66,10 +66,32 @@
 main (int argc, char *argv[])
 {
 #ifdef NS3_MPI
-  // Distributed simulation setup
+
+  bool nix = true;
+  bool nullmsg = false;
+  bool tracing = false;
+
+  // Parse command line
+  CommandLine cmd;
+  cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix);
+  cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization", nullmsg);
+  cmd.AddValue ("tracing", "Enable pcap tracing", tracing);
+  cmd.Parse (argc, argv);
+
+  // Distributed simulation setup; by default use granted time window algorithm.
+  if(nullmsg) 
+    {
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::NullMessageSimulatorImpl"));
+    } 
+  else 
+    {
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::DistributedSimulatorImpl"));
+    }
+
+  // Enable parallel simulator with the command line arguments
   MpiInterface::Enable (&argc, &argv);
-  GlobalValue::Bind ("SimulatorImplementationType",
-                     StringValue ("ns3::DistributedSimulatorImpl"));
 
   LogComponentEnable ("PacketSink", LOG_LEVEL_INFO);
 
@@ -88,12 +110,6 @@
   Config::SetDefault ("ns3::OnOffApplication::PacketSize", UintegerValue (512));
   Config::SetDefault ("ns3::OnOffApplication::DataRate", StringValue ("1Mbps"));
   Config::SetDefault ("ns3::OnOffApplication::MaxBytes", UintegerValue (512));
-  bool nix = true;
-
-  // Parse command line
-  CommandLine cmd;
-  cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix);
-  cmd.Parse (argc, argv);
 
   // Create leaf nodes on left with system id 0
   NodeContainer leftLeafNodes;
@@ -206,6 +222,21 @@
       Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
     }
 
+  if (tracing == true)
+    {
+      if (systemId == 0)
+        {
+          routerLink.EnablePcap("router-left", routerDevices, true);
+          leafLink.EnablePcap("leaf-left", leftLeafDevices, true);
+        }
+      
+      if (systemId == 1)
+        {
+          routerLink.EnablePcap("router-right", routerDevices, true);
+          leafLink.EnablePcap("leaf-right", rightLeafDevices, true);
+        }
+    }
+
   // Create a packet sink on the right leafs to receive packets from left leafs
   uint16_t port = 50000;
   if (systemId == 1)
diff -Naur ns-3.18.1/src/mpi/examples/simple-distributed-empty-node.cc ns-3.19/src/mpi/examples/simple-distributed-empty-node.cc
--- ns-3.18.1/src/mpi/examples/simple-distributed-empty-node.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/examples/simple-distributed-empty-node.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,309 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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
+ *
+ *
+ * This test is equivalent to simple-distributed but tests boundary cases
+ * when one of the ranks has no Nodes on it.   When run on two tasks
+ * rank 0 will have all the Nodes and rank 1 will be empty:
+ * 
+ *                 -------   -------
+ *                  RANK 0    RANK 0
+ *                 ------- | -------
+ *                         |
+ * n0 ---------|           |           |---------- n6
+ *             |           |           |
+ * n1 -------\ |           |           | /------- n7
+ *            n4 ----------|---------- n5
+ * n2 -------/ |           |           | \------- n8
+ *             |           |           |
+ * n3 ---------|           |           |---------- n9
+ *
+ *
+ * When run on three tasks rank 1 has the left half of the Nodes and rank 2
+ * will be empty.
+ *
+ *                 -------   -------
+ *                  RANK 0    RANK 1
+ *                 ------- | -------
+ *                         |
+ * n0 ---------|           |           |---------- n6
+ *             |           |           |
+ * n1 -------\ |           |           | /------- n7
+ *            n4 ----------|---------- n5
+ * n2 -------/ |           |           | \------- n8
+ *             |           |           |
+ * n3 ---------|           |           |---------- n9
+ *
+ * OnOff clients are placed on each left leaf node. Each right leaf node
+ * is a packet sink for a left leaf node.  As a packet travels from one
+ * logical processor to another (the link between n4 and n5), MPI messages
+ * are passed containing the serialized packet. The message is then
+ * deserialized into a new packet and sent on as normal.
+ *
+ * One packet is sent from each left leaf node.  The packet sinks on the
+ * right leaf nodes output logging information when they receive the packet.
+ */
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/mpi-interface.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
+#include "ns3/point-to-point-helper.h"
+#include "ns3/internet-stack-helper.h"
+#include "ns3/ipv4-nix-vector-helper.h"
+#include "ns3/ipv4-address-helper.h"
+#include "ns3/on-off-helper.h"
+#include "ns3/packet-sink-helper.h"
+
+#ifdef NS3_MPI
+#include <mpi.h>
+#endif
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("SimpleDistributed");
+
+int
+main (int argc, char *argv[])
+{
+#ifdef NS3_MPI
+
+  bool nix = true;
+  bool nullmsg = false;
+  bool tracing = false;
+
+  // Parse command line
+  CommandLine cmd;
+  cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix);
+  cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization", nullmsg);
+  cmd.AddValue ("tracing", "Enable pcap tracing", tracing);
+  cmd.Parse (argc, argv);
+
+  // Distributed simulation setup; by default use granted time window algorithm.
+  if(nullmsg) 
+    {
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::NullMessageSimulatorImpl"));
+    } 
+  else 
+    {
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::DistributedSimulatorImpl"));
+    }
+
+  MpiInterface::Enable (&argc, &argv);
+
+  LogComponentEnable ("PacketSink", LOG_LEVEL_INFO);
+
+  uint32_t systemId = MpiInterface::GetSystemId ();
+  uint32_t systemCount = MpiInterface::GetSize ();
+
+  uint32_t rightHalfSystemId = 777;
+
+  // Check for valid distributed parameters.
+  // Must have 2 or 3 tasks.
+  if (systemCount == 2)
+    {
+      rightHalfSystemId = 0;
+    }
+  else if (systemCount == 3)
+    {
+      rightHalfSystemId = 1;
+    }
+  else
+    {
+      std::cout << "This simulation requires 2 or 3 logical processors." << std::endl;
+      return 1;
+    }
+    
+  // Some default values
+  Config::SetDefault ("ns3::OnOffApplication::PacketSize", UintegerValue (512));
+  Config::SetDefault ("ns3::OnOffApplication::DataRate", StringValue ("1Mbps"));
+  Config::SetDefault ("ns3::OnOffApplication::MaxBytes", UintegerValue (512));
+
+  // Create leaf nodes on left with system id 0
+  NodeContainer leftLeafNodes;
+  leftLeafNodes.Create (4, 0);
+
+  // Create router nodes.  Left router with system id 0, right router
+  // with system id dependent on number of processors using
+  // rightHalfSystemId
+  NodeContainer routerNodes;
+  Ptr<Node> routerNode1 = CreateObject<Node> (0);
+  Ptr<Node> routerNode2 = CreateObject<Node> (rightHalfSystemId);
+  routerNodes.Add (routerNode1);
+  routerNodes.Add (routerNode2);
+
+  // Create leaf nodes on left with system id rightHalfSystemId
+  NodeContainer rightLeafNodes;
+  rightLeafNodes.Create (4, rightHalfSystemId);
+
+  PointToPointHelper routerLink;
+  routerLink.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
+  routerLink.SetChannelAttribute ("Delay", StringValue ("5ms"));
+
+  PointToPointHelper leafLink;
+  leafLink.SetDeviceAttribute ("DataRate", StringValue ("1Mbps"));
+  leafLink.SetChannelAttribute ("Delay", StringValue ("2ms"));
+
+  // Add link connecting routers
+  NetDeviceContainer routerDevices;
+  routerDevices = routerLink.Install (routerNodes);
+
+  // Add links for left side leaf nodes to left router
+  NetDeviceContainer leftRouterDevices;
+  NetDeviceContainer leftLeafDevices;
+  for (uint32_t i = 0; i < 4; ++i)
+    {
+      NetDeviceContainer temp = leafLink.Install (leftLeafNodes.Get (i), routerNodes.Get (0));
+      leftLeafDevices.Add (temp.Get (0));
+      leftRouterDevices.Add (temp.Get (1));
+    }
+
+  // Add links for right side leaf nodes to right router
+  NetDeviceContainer rightRouterDevices;
+  NetDeviceContainer rightLeafDevices;
+  for (uint32_t i = 0; i < 4; ++i)
+    {
+      NetDeviceContainer temp = leafLink.Install (rightLeafNodes.Get (i), routerNodes.Get (1));
+      rightLeafDevices.Add (temp.Get (0));
+      rightRouterDevices.Add (temp.Get (1));
+    }
+
+  InternetStackHelper stack;
+  Ipv4NixVectorHelper nixRouting;
+  Ipv4StaticRoutingHelper staticRouting;
+
+  Ipv4ListRoutingHelper list;
+  list.Add (staticRouting, 0);
+  list.Add (nixRouting, 10);
+
+  if (nix)
+    {
+      stack.SetRoutingHelper (list); // has effect on the next Install ()
+    }
+
+  stack.InstallAll ();
+
+  Ipv4InterfaceContainer routerInterfaces;
+  Ipv4InterfaceContainer leftLeafInterfaces;
+  Ipv4InterfaceContainer leftRouterInterfaces;
+  Ipv4InterfaceContainer rightLeafInterfaces;
+  Ipv4InterfaceContainer rightRouterInterfaces;
+
+  Ipv4AddressHelper leftAddress;
+  leftAddress.SetBase ("10.1.1.0", "255.255.255.0");
+
+  Ipv4AddressHelper routerAddress;
+  routerAddress.SetBase ("10.2.1.0", "255.255.255.0");
+
+  Ipv4AddressHelper rightAddress;
+  rightAddress.SetBase ("10.3.1.0", "255.255.255.0");
+
+  // Router-to-Router interfaces
+  routerInterfaces = routerAddress.Assign (routerDevices);
+
+  // Left interfaces
+  for (uint32_t i = 0; i < 4; ++i)
+    {
+      NetDeviceContainer ndc;
+      ndc.Add (leftLeafDevices.Get (i));
+      ndc.Add (leftRouterDevices.Get (i));
+      Ipv4InterfaceContainer ifc = leftAddress.Assign (ndc);
+      leftLeafInterfaces.Add (ifc.Get (0));
+      leftRouterInterfaces.Add (ifc.Get (1));
+      leftAddress.NewNetwork ();
+    }
+
+  // Right interfaces
+  for (uint32_t i = 0; i < 4; ++i)
+    {
+      NetDeviceContainer ndc;
+      ndc.Add (rightLeafDevices.Get (i));
+      ndc.Add (rightRouterDevices.Get (i));
+      Ipv4InterfaceContainer ifc = rightAddress.Assign (ndc);
+      rightLeafInterfaces.Add (ifc.Get (0));
+      rightRouterInterfaces.Add (ifc.Get (1));
+      rightAddress.NewNetwork ();
+    }
+
+  if (!nix)
+    {
+      Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+    }
+
+  if (tracing == true)
+    {
+      if (systemId == 0)
+        {
+          routerLink.EnablePcap("router-left", routerDevices, true);
+          leafLink.EnablePcap("leaf-left", leftLeafDevices, true);
+        }
+      
+      if (systemId == rightHalfSystemId)
+        {
+          routerLink.EnablePcap("router-right", routerDevices, true);
+          leafLink.EnablePcap("leaf-right", rightLeafDevices, true);
+        }
+    }
+
+  // Create a packet sink on the right leafs to receive packets from left leafs
+  uint16_t port = 50000;
+  if (systemId == rightHalfSystemId)
+    {
+      Address sinkLocalAddress (InetSocketAddress (Ipv4Address::GetAny (), port));
+      PacketSinkHelper sinkHelper ("ns3::UdpSocketFactory", sinkLocalAddress);
+      ApplicationContainer sinkApp;
+      for (uint32_t i = 0; i < 4; ++i)
+        {
+          sinkApp.Add (sinkHelper.Install (rightLeafNodes.Get (i)));
+        }
+      sinkApp.Start (Seconds (1.0));
+      sinkApp.Stop (Seconds (5));
+    }
+
+  // Create the OnOff applications to send
+  if (systemId == 0)
+    {
+      OnOffHelper clientHelper ("ns3::UdpSocketFactory", Address ());
+      clientHelper.SetAttribute
+        ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
+      clientHelper.SetAttribute
+        ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
+
+      ApplicationContainer clientApps;
+      for (uint32_t i = 0; i < 4; ++i)
+        {
+          AddressValue remoteAddress
+            (InetSocketAddress (rightLeafInterfaces.GetAddress (i), port));
+          clientHelper.SetAttribute ("Remote", remoteAddress);
+          clientApps.Add (clientHelper.Install (leftLeafNodes.Get (i)));
+        }
+      clientApps.Start (Seconds (1.0));
+      clientApps.Stop (Seconds (5));
+    }
+
+  Simulator::Stop (Seconds (5));
+  Simulator::Run ();
+  Simulator::Destroy ();
+  // Exit the MPI execution environment
+  MpiInterface::Disable ();
+  return 0;
+#else
+  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
+#endif
+}
diff -Naur ns-3.18.1/src/mpi/examples/third-distributed.cc ns-3.19/src/mpi/examples/third-distributed.cc
--- ns-3.18.1/src/mpi/examples/third-distributed.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/examples/third-distributed.cc	2013-12-20 09:44:50.000000000 -0800
@@ -55,31 +55,18 @@
 main (int argc, char *argv[])
 {
 #ifdef NS3_MPI
-  // Distributed simulation setup
-  MpiInterface::Enable (&argc, &argv);
-  GlobalValue::Bind ("SimulatorImplementationType",
-                     StringValue ("ns3::DistributedSimulatorImpl"));
-
-  uint32_t systemId = MpiInterface::GetSystemId ();
-  uint32_t systemCount = MpiInterface::GetSize ();
-
-  // Check for valid distributed parameters.
-  // Must have 2 and only 2 Logical Processors (LPs)
-  if (systemCount != 2)
-    {
-      std::cout << "This simulation requires 2 and only 2 logical processors." << std::endl;
-      return 1;
-    }
 
   bool verbose = true;
   uint32_t nCsma = 3;
   uint32_t nWifi = 3;
+  bool nullmsg = false;
   bool tracing = false;
 
   CommandLine cmd;
   cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma);
   cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
   cmd.AddValue ("verbose", "Tell echo applications to log if true", verbose);
+  cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization", nullmsg);
   cmd.AddValue ("tracing", "Enable pcap tracing", tracing);
   cmd.Parse (argc,argv);
 
@@ -98,6 +85,32 @@
       LogComponentEnable ("UdpEchoServerApplication", LOG_LEVEL_INFO);
     }
 
+  // Distributed simulation setup; by default use granted time window algorithm.
+  if(nullmsg) 
+    {
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::NullMessageSimulatorImpl"));
+    } 
+  else 
+    {
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::DistributedSimulatorImpl"));
+    }
+
+  MpiInterface::Enable (&argc, &argv);
+
+  uint32_t systemId = MpiInterface::GetSystemId ();
+  uint32_t systemCount = MpiInterface::GetSize ();
+
+  // Check for valid distributed parameters.
+  // Must have 2 and only 2 Logical Processors (LPs)
+  if (systemCount != 2)
+    {
+      std::cout << "This simulation requires 2 and only 2 logical processors." << std::endl;
+      return 1;
+    }
+
+
   NodeContainer p2pNodes;
   Ptr<Node> p2pNode1 = CreateObject<Node> (0); // Create node with rank 0
   Ptr<Node> p2pNode2 = CreateObject<Node> (1); // Create node with rank 1
diff -Naur ns-3.18.1/src/mpi/examples/wscript ns-3.19/src/mpi/examples/wscript
--- ns-3.18.1/src/mpi/examples/wscript	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/examples/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -12,3 +12,7 @@
     obj = bld.create_ns3_program('nms-p2p-nix-distributed',
                                  ['point-to-point', 'internet', 'nix-vector-routing', 'applications'])
     obj.source = 'nms-p2p-nix-distributed.cc'
+
+    obj = bld.create_ns3_program('simple-distributed-empty-node',
+                                 ['point-to-point', 'internet', 'nix-vector-routing', 'applications'])
+    obj.source = 'simple-distributed-empty-node.cc'
diff -Naur ns-3.18.1/src/mpi/model/distributed-simulator-impl.cc ns-3.19/src/mpi/model/distributed-simulator-impl.cc
--- ns-3.18.1/src/mpi/model/distributed-simulator-impl.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/model/distributed-simulator-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -14,9 +14,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: George Riley <riley@ece.gatech.edu>
+ *
  */
 
 #include "distributed-simulator-impl.h"
+#include "granted-time-window-mpi-interface.h"
 #include "mpi-interface.h"
 
 #include "ns3/simulator.h"
@@ -39,7 +41,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (DistributedSimulatorImpl);
+NS_OBJECT_ENSURE_REGISTERED (DistributedSimulatorImpl)
+  ;
 
 LbtsMessage::~LbtsMessage ()
 {
@@ -88,6 +91,8 @@
 
 DistributedSimulatorImpl::DistributedSimulatorImpl ()
 {
+  NS_LOG_FUNCTION (this);
+
 #ifdef NS3_MPI
   m_myId = MpiInterface::GetSystemId ();
   m_systemCount = MpiInterface::GetSize ();
@@ -101,6 +106,7 @@
 #endif
 
   m_stop = false;
+  m_globalFinished = false;
   // uids are allocated from 4.
   // uid 0 is "invalid" events
   // uid 1 is "now" events
@@ -116,11 +122,14 @@
 
 DistributedSimulatorImpl::~DistributedSimulatorImpl ()
 {
+  NS_LOG_FUNCTION (this);
 }
 
 void
 DistributedSimulatorImpl::DoDispose (void)
 {
+  NS_LOG_FUNCTION (this);
+
   while (!m_events->IsEmpty ())
     {
       Scheduler::Event next = m_events->RemoveNext ();
@@ -134,6 +143,8 @@
 void
 DistributedSimulatorImpl::Destroy ()
 {
+  NS_LOG_FUNCTION (this);
+
   while (!m_destroyEvents.empty ())
     {
       Ptr<EventImpl> ev = m_destroyEvents.front ().PeekEventImpl ();
@@ -152,6 +163,8 @@
 void
 DistributedSimulatorImpl::CalculateLookAhead (void)
 {
+  NS_LOG_FUNCTION (this);
+
 #ifdef NS3_MPI
   if (MpiInterface::GetSize () <= 1)
     {
@@ -161,6 +174,7 @@
   else
     {
       DistributedSimulatorImpl::m_lookAhead = GetMaximumSimulationTime ();
+
       m_grantedTime = GetMaximumSimulationTime ();
 
       NodeContainer c = NodeContainer::GetGlobal ();
@@ -236,7 +250,7 @@
   long recvbuf;
 
   /* Tasks with no inter-task links do not contribute to max */
-  if (m_lookAhead == GetMaximumSimulationTime ()) 
+  if (m_lookAhead == GetMaximumSimulationTime ())
     {
       sendbuf = 0;
     }
@@ -253,7 +267,7 @@
    * will proceed without synchronization until a single AllGather
    * occurs when all tasks have finished.
    */
-  if (m_lookAhead == GetMaximumSimulationTime () && recvbuf != 0) 
+  if (m_lookAhead == GetMaximumSimulationTime () && recvbuf != 0)
     {
       m_lookAhead = Time (recvbuf);
       m_grantedTime = m_lookAhead;
@@ -267,6 +281,8 @@
 void
 DistributedSimulatorImpl::SetScheduler (ObjectFactory schedulerFactory)
 {
+  NS_LOG_FUNCTION (this << schedulerFactory);
+
   Ptr<Scheduler> scheduler = schedulerFactory.Create<Scheduler> ();
 
   if (m_events != 0)
@@ -283,6 +299,8 @@
 void
 DistributedSimulatorImpl::ProcessOneEvent (void)
 {
+  NS_LOG_FUNCTION (this);
+
   Scheduler::Event next = m_events->RemoveNext ();
 
   NS_ASSERT (next.key.m_ts >= m_currentTs);
@@ -311,11 +329,14 @@
 uint64_t
 DistributedSimulatorImpl::NextTs (void) const
 {
-  // If local MPI task is has no more events or stop was called 
+  // If local MPI task is has no more events or stop was called
   // next event time is infinity.
-  if (IsLocalFinished ()) {
+  if (IsLocalFinished ())
+    {
       return GetMaximumSimulationTime ().GetTimeStep ();
-    } else  {
+    }
+  else
+    {
       Scheduler::Event ev = m_events->PeekNext ();
       return ev.key.m_ts;
     }
@@ -330,6 +351,8 @@
 void
 DistributedSimulatorImpl::Run (void)
 {
+  NS_LOG_FUNCTION (this);
+
 #ifdef NS3_MPI
   CalculateLookAhead ();
   m_stop = false;
@@ -343,17 +366,17 @@
       // synchronizations with other tasks until all tasks have
       // completed.
       if (nextTime > m_grantedTime || IsLocalFinished () )
-        { 
-
+        {
           // Can't process next event, calculate a new LBTS
           // First receive any pending messages
-          MpiInterface::ReceiveMessages ();
+          GrantedTimeWindowMpiInterface::ReceiveMessages ();
           // reset next time
           nextTime = Next ();
           // And check for send completes
-          MpiInterface::TestSendComplete ();
+          GrantedTimeWindowMpiInterface::TestSendComplete ();
           // Finally calculate the lbts
-          LbtsMessage lMsg (MpiInterface::GetRxCount (), MpiInterface::GetTxCount (), m_myId, IsLocalFinished (), nextTime);
+          LbtsMessage lMsg (GrantedTimeWindowMpiInterface::GetRxCount (), GrantedTimeWindowMpiInterface::GetTxCount (), 
+                            m_myId, IsLocalFinished (), nextTime);
           m_pLBTS[m_myId] = lMsg;
           MPI_Allgather (&lMsg, sizeof (LbtsMessage), MPI_BYTE, m_pLBTS,
                          sizeof (LbtsMessage), MPI_BYTE, MPI_COMM_WORLD);
@@ -378,7 +401,7 @@
           if (totRx == totTx)
             {
               // If lookahead is infinite then granted time should be as well.
-              // Covers the edge case if all the tasks have no inter tasks 
+              // Covers the edge case if all the tasks have no inter tasks
               // links, prevents overflow of granted time.
               if (m_lookAhead == GetMaximumSimulationTime ())
                 {
@@ -416,12 +439,16 @@
 void
 DistributedSimulatorImpl::Stop (void)
 {
+  NS_LOG_FUNCTION (this);
+
   m_stop = true;
 }
 
 void
 DistributedSimulatorImpl::Stop (Time const &time)
 {
+  NS_LOG_FUNCTION (this << time.GetTimeStep ());
+
   Simulator::Schedule (time, &Simulator::Stop);
 }
 
@@ -431,6 +458,8 @@
 EventId
 DistributedSimulatorImpl::Schedule (Time const &time, EventImpl *event)
 {
+  NS_LOG_FUNCTION (this << time.GetTimeStep () << event);
+
   Time tAbsolute = time + TimeStep (m_currentTs);
 
   NS_ASSERT (tAbsolute.IsPositive ());
@@ -464,6 +493,8 @@
 EventId
 DistributedSimulatorImpl::ScheduleNow (EventImpl *event)
 {
+  NS_LOG_FUNCTION (this << event);
+
   Scheduler::Event ev;
   ev.impl = event;
   ev.key.m_ts = m_currentTs;
@@ -478,6 +509,8 @@
 EventId
 DistributedSimulatorImpl::ScheduleDestroy (EventImpl *event)
 {
+  NS_LOG_FUNCTION (this << event);
+
   EventId id (Ptr<EventImpl> (event, false), m_currentTs, 0xffffffff, 2);
   m_destroyEvents.push_back (id);
   m_uid++;
diff -Naur ns-3.18.1/src/mpi/model/distributed-simulator-impl.h ns-3.19/src/mpi/model/distributed-simulator-impl.h
--- ns-3.18.1/src/mpi/model/distributed-simulator-impl.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/model/distributed-simulator-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -14,10 +14,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: George Riley <riley@ece.gatech.edu>
+ *
  */
 
-#ifndef DISTRIBUTED_SIMULATOR_IMPL_H
-#define DISTRIBUTED_SIMULATOR_IMPL_H
+#ifndef NS3_DISTRIBUTED_SIMULATOR_IMPL_H
+#define NS3_DISTRIBUTED_SIMULATOR_IMPL_H
 
 #include "ns3/simulator-impl.h"
 #include "ns3/scheduler.h"
@@ -48,6 +49,7 @@
    * \param rxc received count
    * \param txc transmitted count
    * \param id mpi rank
+   * \param isFinished whether message is finished
    * \param t smallest time
    */
   LbtsMessage (uint32_t rxc, uint32_t txc, uint32_t id, bool isFinished, const Time& t)
@@ -70,14 +72,16 @@
    */
   uint32_t GetTxCount ();
   /**
-   * \return receieved count
+   * \return received count
    */
   uint32_t GetRxCount ();
   /**
    * \return id which corresponds to mpi rank
    */
   uint32_t GetMyId ();
-
+  /**
+   * \return true if system is finished
+   */
   bool IsFinished ();
 
 private:
@@ -92,7 +96,7 @@
  * \ingroup simulator
  * \ingroup mpi
  *
- * \brief distributed simulator implementation using lookahead
+ * \brief Distributed simulator implementation using lookahead
  */
 class DistributedSimulatorImpl : public SimulatorImpl
 {
@@ -154,4 +158,4 @@
 
 } // namespace ns3
 
-#endif /* DISTRIBUTED_SIMULATOR_IMPL_H */
+#endif /* NS3_DISTRIBUTED_SIMULATOR_IMPL_H */
diff -Naur ns-3.18.1/src/mpi/model/granted-time-window-mpi-interface.cc ns-3.19/src/mpi/model/granted-time-window-mpi-interface.cc
--- ns-3.18.1/src/mpi/model/granted-time-window-mpi-interface.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/granted-time-window-mpi-interface.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,337 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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: George Riley <riley@ece.gatech.edu>
+ *
+ */
+
+// This object contains static methods that provide an easy interface
+// to the necessary MPI information.
+
+#include <iostream>
+#include <iomanip>
+#include <list>
+
+#include "granted-time-window-mpi-interface.h"
+#include "mpi-receiver.h"
+#include "mpi-interface.h"
+
+#include "ns3/node.h"
+#include "ns3/node-list.h"
+#include "ns3/net-device.h"
+#include "ns3/simulator.h"
+#include "ns3/simulator-impl.h"
+#include "ns3/nstime.h"
+#include "ns3/log.h"
+
+#ifdef NS3_MPI
+#include <mpi.h>
+#endif
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("GrantedTimeWindowMpiInterface");
+
+
+SentBuffer::SentBuffer ()
+{
+  m_buffer = 0;
+  m_request = 0;
+}
+
+SentBuffer::~SentBuffer ()
+{
+  delete [] m_buffer;
+}
+
+uint8_t*
+SentBuffer::GetBuffer ()
+{
+  return m_buffer;
+}
+
+void
+SentBuffer::SetBuffer (uint8_t* buffer)
+{
+  m_buffer = buffer;
+}
+
+#ifdef NS3_MPI
+MPI_Request*
+SentBuffer::GetRequest ()
+{
+  return &m_request;
+}
+#endif
+
+uint32_t              GrantedTimeWindowMpiInterface::m_sid = 0;
+uint32_t              GrantedTimeWindowMpiInterface::m_size = 1;
+bool                  GrantedTimeWindowMpiInterface::m_initialized = false;
+bool                  GrantedTimeWindowMpiInterface::m_enabled = false;
+uint32_t              GrantedTimeWindowMpiInterface::m_rxCount = 0;
+uint32_t              GrantedTimeWindowMpiInterface::m_txCount = 0;
+std::list<SentBuffer> GrantedTimeWindowMpiInterface::m_pendingTx;
+
+#ifdef NS3_MPI
+MPI_Request* GrantedTimeWindowMpiInterface::m_requests;
+char**       GrantedTimeWindowMpiInterface::m_pRxBuffers;
+#endif
+
+TypeId 
+GrantedTimeWindowMpiInterface::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::GrantedTimeWindowMpiInterface")
+    .SetParent<Object> ()
+  ;
+  return tid;
+}
+
+void
+GrantedTimeWindowMpiInterface::Destroy ()
+{
+  NS_LOG_FUNCTION (this);
+
+#ifdef NS3_MPI
+  for (uint32_t i = 0; i < GetSize (); ++i)
+    {
+      delete [] m_pRxBuffers[i];
+    }
+  delete [] m_pRxBuffers;
+  delete [] m_requests;
+
+  m_pendingTx.clear ();
+#endif
+}
+
+uint32_t
+GrantedTimeWindowMpiInterface::GetRxCount ()
+{
+  return m_rxCount;
+}
+
+uint32_t
+GrantedTimeWindowMpiInterface::GetTxCount ()
+{
+  return m_txCount;
+}
+
+uint32_t
+GrantedTimeWindowMpiInterface::GetSystemId ()
+{
+  if (!m_initialized)
+    {
+      Simulator::GetImplementation ();
+      m_initialized = true;
+    }
+  return m_sid;
+}
+
+uint32_t
+GrantedTimeWindowMpiInterface::GetSize ()
+{
+  if (!m_initialized)
+    {
+      Simulator::GetImplementation ();
+      m_initialized = true;
+    }
+  return m_size;
+}
+
+bool
+GrantedTimeWindowMpiInterface::IsEnabled ()
+{
+  if (!m_initialized)
+    {
+      Simulator::GetImplementation ();
+      m_initialized = true;
+    }
+  return m_enabled;
+}
+
+void
+GrantedTimeWindowMpiInterface::Enable (int* pargc, char*** pargv)
+{
+  NS_LOG_FUNCTION (this << pargc << pargv); 
+
+#ifdef NS3_MPI
+  // Initialize the MPI interface
+  MPI_Init (pargc, pargv);
+  MPI_Barrier (MPI_COMM_WORLD);
+  MPI_Comm_rank (MPI_COMM_WORLD, reinterpret_cast <int *> (&m_sid));
+  MPI_Comm_size (MPI_COMM_WORLD, reinterpret_cast <int *> (&m_size));
+  m_enabled = true;
+  m_initialized = true;
+  // Post a non-blocking receive for all peers
+  m_pRxBuffers = new char*[m_size];
+  m_requests = new MPI_Request[m_size];
+  for (uint32_t i = 0; i < GetSize (); ++i)
+    {
+      m_pRxBuffers[i] = new char[MAX_MPI_MSG_SIZE];
+      MPI_Irecv (m_pRxBuffers[i], MAX_MPI_MSG_SIZE, MPI_CHAR, MPI_ANY_SOURCE, 0,
+                 MPI_COMM_WORLD, &m_requests[i]);
+    }
+#else
+  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
+#endif
+}
+
+void
+GrantedTimeWindowMpiInterface::SendPacket (Ptr<Packet> p, const Time& rxTime, uint32_t node, uint32_t dev)
+{
+  NS_LOG_FUNCTION (this << p << rxTime.GetTimeStep () << node << dev);
+
+#ifdef NS3_MPI
+  SentBuffer sendBuf;
+  m_pendingTx.push_back (sendBuf);
+  std::list<SentBuffer>::reverse_iterator i = m_pendingTx.rbegin (); // Points to the last element
+
+  uint32_t serializedSize = p->GetSerializedSize ();
+  uint8_t* buffer =  new uint8_t[serializedSize + 16];
+  i->SetBuffer (buffer);
+  // Add the time, dest node and dest device
+  uint64_t t = rxTime.GetInteger ();
+  uint64_t* pTime = reinterpret_cast <uint64_t *> (buffer);
+  *pTime++ = t;
+  uint32_t* pData = reinterpret_cast<uint32_t *> (pTime);
+  *pData++ = node;
+  *pData++ = dev;
+  // Serialize the packet
+  p->Serialize (reinterpret_cast<uint8_t *> (pData), serializedSize);
+
+  // Find the system id for the destination node
+  Ptr<Node> destNode = NodeList::GetNode (node);
+  uint32_t nodeSysId = destNode->GetSystemId ();
+
+  MPI_Isend (reinterpret_cast<void *> (i->GetBuffer ()), serializedSize + 16, MPI_CHAR, nodeSysId,
+             0, MPI_COMM_WORLD, (i->GetRequest ()));
+  m_txCount++;
+#else
+  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
+#endif
+}
+
+void
+GrantedTimeWindowMpiInterface::ReceiveMessages ()
+{ 
+  NS_LOG_FUNCTION_NOARGS ();
+
+#ifdef NS3_MPI
+  // Poll the non-block reads to see if data arrived
+  while (true)
+    {
+      int flag = 0;
+      int index = 0;
+      MPI_Status status;
+
+      MPI_Testany (MpiInterface::GetSize (), m_requests, &index, &flag, &status);
+      if (!flag)
+        {
+          break;        // No more messages
+        }
+      int count;
+      MPI_Get_count (&status, MPI_CHAR, &count);
+      m_rxCount++; // Count this receive
+
+      // Get the meta data first
+      uint64_t* pTime = reinterpret_cast<uint64_t *> (m_pRxBuffers[index]);
+      uint64_t time = *pTime++;
+      uint32_t* pData = reinterpret_cast<uint32_t *> (pTime);
+      uint32_t node = *pData++;
+      uint32_t dev  = *pData++;
+
+      Time rxTime (time);
+
+      count -= sizeof (time) + sizeof (node) + sizeof (dev);
+
+      Ptr<Packet> p = Create<Packet> (reinterpret_cast<uint8_t *> (pData), count, true);
+
+      // Find the correct node/device to schedule receive event
+      Ptr<Node> pNode = NodeList::GetNode (node);
+      Ptr<MpiReceiver> pMpiRec = 0;
+      uint32_t nDevices = pNode->GetNDevices ();
+      for (uint32_t i = 0; i < nDevices; ++i)
+        {
+          Ptr<NetDevice> pThisDev = pNode->GetDevice (i);
+          if (pThisDev->GetIfIndex () == dev)
+            {
+              pMpiRec = pThisDev->GetObject<MpiReceiver> ();
+              break;
+            }
+        }
+
+      NS_ASSERT (pNode && pMpiRec);
+
+      // Schedule the rx event
+      Simulator::ScheduleWithContext (pNode->GetId (), rxTime - Simulator::Now (),
+                                      &MpiReceiver::Receive, pMpiRec, p);
+
+      // Re-queue the next read
+      MPI_Irecv (m_pRxBuffers[index], MAX_MPI_MSG_SIZE, MPI_CHAR, MPI_ANY_SOURCE, 0,
+                 MPI_COMM_WORLD, &m_requests[index]);
+    }
+#else
+  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
+#endif
+}
+
+void
+GrantedTimeWindowMpiInterface::TestSendComplete ()
+{
+  NS_LOG_FUNCTION_NOARGS ();
+
+#ifdef NS3_MPI
+  std::list<SentBuffer>::iterator i = m_pendingTx.begin ();
+  while (i != m_pendingTx.end ())
+    {
+      MPI_Status status;
+      int flag = 0;
+      MPI_Test (i->GetRequest (), &flag, &status);
+      std::list<SentBuffer>::iterator current = i; // Save current for erasing
+      i++;                                    // Advance to next
+      if (flag)
+        { // This message is complete
+          m_pendingTx.erase (current);
+        }
+    }
+#else
+  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
+#endif
+}
+
+void
+GrantedTimeWindowMpiInterface::Disable ()
+{
+  NS_LOG_FUNCTION_NOARGS ();
+
+#ifdef NS3_MPI
+  int flag = 0;
+  MPI_Initialized (&flag);
+  if (flag)
+    {
+      MPI_Finalize ();
+      m_enabled = false;
+      m_initialized = false;
+    }
+  else
+    {
+      NS_FATAL_ERROR ("Cannot disable MPI environment without Initializing it first");
+    }
+#else
+  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
+#endif
+}
+
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/mpi/model/granted-time-window-mpi-interface.h ns-3.19/src/mpi/model/granted-time-window-mpi-interface.h
--- ns-3.18.1/src/mpi/model/granted-time-window-mpi-interface.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/granted-time-window-mpi-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,175 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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: George Riley <riley@ece.gatech.edu>
+ *
+ */
+
+// This object contains static methods that provide an easy interface
+// to the necessary MPI information.
+
+#ifndef NS3_GRANTED_TIME_WINDOW_MPI_INTERFACE_H
+#define NS3_GRANTED_TIME_WINDOW_MPI_INTERFACE_H
+
+#include <stdint.h>
+#include <list>
+
+#include "ns3/nstime.h"
+#include "ns3/buffer.h"
+
+#include "parallel-communication-interface.h"
+
+#ifdef NS3_MPI
+#include "mpi.h"
+#else
+typedef void* MPI_Request;
+#endif
+
+namespace ns3 {
+
+/**
+ * maximum MPI message size for easy
+ * buffer creation
+ */
+const uint32_t MAX_MPI_MSG_SIZE = 2000;
+
+/**
+ * \ingroup mpi
+ *
+ * \brief Tracks non-blocking sends
+ *
+ * This class is used to keep track of the asynchronous non-blocking
+ * sends that have been posted.
+ */
+class SentBuffer
+{
+public:
+  SentBuffer ();
+  ~SentBuffer ();
+
+  /**
+   * \return pointer to sent buffer
+   */
+  uint8_t* GetBuffer ();
+  /**
+   * \param buffer pointer to sent buffer
+   */
+  void SetBuffer (uint8_t* buffer);
+  /**
+   * \return MPI request
+   */
+  MPI_Request* GetRequest ();
+
+private:
+  uint8_t* m_buffer;
+  MPI_Request m_request;
+};
+
+class Packet;
+
+/**
+ * \ingroup mpi
+ *
+ * \brief Interface between ns-3 and MPI
+ *
+ * Implements the interface used by the singleton parallel controller
+ * to interface between NS3 and the communications layer being
+ * used for inter-task packet transfers.
+ */
+class GrantedTimeWindowMpiInterface : public ParallelCommunicationInterface, Object
+{
+public:
+  static TypeId GetTypeId (void);
+
+  /**
+   * Delete all buffers
+   */
+  virtual void Destroy ();
+  /**
+   * \return MPI rank
+   */
+  virtual uint32_t GetSystemId ();
+  /**
+   * \return MPI size (number of systems)
+   */
+  virtual uint32_t GetSize ();
+  /**
+   * \return true if using MPI
+   */
+  virtual bool IsEnabled ();
+  /**
+   * \param pargc number of command line arguments
+   * \param pargv command line arguments
+   *
+   * Sets up MPI interface
+   */
+  virtual void Enable (int* pargc, char*** pargv);
+  /**
+   * Terminates the MPI environment by calling MPI_Finalize
+   * This function must be called after Destroy ()
+   * It also resets m_initialized, m_enabled
+   */
+  virtual void Disable ();
+  /**
+   * \param p packet to send
+   * \param rxTime received time at destination node
+   * \param node destination node
+   * \param dev destination device
+   *
+   * Serialize and send a packet to the specified node and net device
+   */
+  virtual void SendPacket (Ptr<Packet> p, const Time &rxTime, uint32_t node, uint32_t dev);
+  /**
+   * Check for received messages complete
+   */
+  static void ReceiveMessages ();
+  /**
+   * Check for completed sends
+   */
+  static void TestSendComplete ();
+  /**
+   * \return received count in packets
+   */
+  static uint32_t GetRxCount ();
+  /**
+   * \return transmitted count in packets
+   */
+  static uint32_t GetTxCount ();
+
+private:
+  static uint32_t m_sid;
+  static uint32_t m_size;
+
+  // Total packets received
+  static uint32_t m_rxCount;
+
+  // Total packets sent
+  static uint32_t m_txCount;
+  static bool     m_initialized;
+  static bool     m_enabled;
+
+  // Pending non-blocking receives
+  static MPI_Request* m_requests;
+
+  // Data buffers for non-blocking reads
+  static char**   m_pRxBuffers;
+
+  // List of pending non-blocking sends
+  static std::list<SentBuffer> m_pendingTx;
+};
+
+} // namespace ns3
+
+#endif /* NS3_GRANTED_TIME_WINDOW_MPI_INTERFACE_H */
diff -Naur ns-3.18.1/src/mpi/model/mpi-interface.cc ns-3.19/src/mpi/model/mpi-interface.cc
--- ns-3.18.1/src/mpi/model/mpi-interface.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/model/mpi-interface.cc	2013-12-20 09:44:50.000000000 -0800
@@ -1,5 +1,7 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
  * 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;
@@ -13,296 +15,114 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Author: George Riley <riley@ece.gatech.edu>
+ * Author: Steven Smith <smith84@llnl.gov>
+ *
  */
 
-// This object contains static methods that provide an easy interface
-// to the necessary MPI information.
-
-#include <iostream>
-#include <iomanip>
-#include <list>
-
 #include "mpi-interface.h"
-#include "mpi-receiver.h"
 
-#include "ns3/node.h"
-#include "ns3/node-list.h"
-#include "ns3/net-device.h"
-#include "ns3/simulator.h"
-#include "ns3/simulator-impl.h"
-#include "ns3/nstime.h"
-
-#ifdef NS3_MPI
-#include <mpi.h>
-#endif
-
-namespace ns3 {
-
-SentBuffer::SentBuffer ()
-{
-  m_buffer = 0;
-  m_request = 0;
-}
+#include <ns3/global-value.h>
+#include <ns3/string.h>
+#include <ns3/log.h>
 
-SentBuffer::~SentBuffer ()
-{
-  delete [] m_buffer;
-}
+#include "null-message-mpi-interface.h"
+#include "granted-time-window-mpi-interface.h"
 
-uint8_t*
-SentBuffer::GetBuffer ()
-{
-  return m_buffer;
-}
+NS_LOG_COMPONENT_DEFINE ("MpiInterface");
 
-void
-SentBuffer::SetBuffer (uint8_t* buffer)
-{
-  m_buffer = buffer;
-}
-
-#ifdef NS3_MPI
-MPI_Request*
-SentBuffer::GetRequest ()
-{
-  return &m_request;
-}
-#endif
+namespace ns3 {
 
-uint32_t              MpiInterface::m_sid = 0;
-uint32_t              MpiInterface::m_size = 1;
-bool                  MpiInterface::m_initialized = false;
-bool                  MpiInterface::m_enabled = false;
-uint32_t              MpiInterface::m_rxCount = 0;
-uint32_t              MpiInterface::m_txCount = 0;
-std::list<SentBuffer> MpiInterface::m_pendingTx;
-
-#ifdef NS3_MPI
-MPI_Request* MpiInterface::m_requests;
-char**       MpiInterface::m_pRxBuffers;
-#endif
+ParallelCommunicationInterface* MpiInterface::g_parallelCommunicationInterface = 0;
 
 void
 MpiInterface::Destroy ()
 {
-#ifdef NS3_MPI
-  for (uint32_t i = 0; i < GetSize (); ++i)
-    {
-      delete [] m_pRxBuffers[i];
-    }
-  delete [] m_pRxBuffers;
-  delete [] m_requests;
-
-  m_pendingTx.clear ();
-#endif
-}
-
-uint32_t
-MpiInterface::GetRxCount ()
-{
-  return m_rxCount;
-}
-
-uint32_t
-MpiInterface::GetTxCount ()
-{
-  return m_txCount;
+  NS_ASSERT (g_parallelCommunicationInterface);
+  g_parallelCommunicationInterface->Destroy ();
 }
 
 uint32_t
 MpiInterface::GetSystemId ()
 {
-  if (!m_initialized)
-    {
-      Simulator::GetImplementation ();
-      m_initialized = true;
-    }
-  return m_sid;
+  if ( g_parallelCommunicationInterface )
+    return g_parallelCommunicationInterface->GetSystemId ();
+  else
+    return 0;
 }
 
 uint32_t
 MpiInterface::GetSize ()
 {
-  if (!m_initialized)
-    {
-      Simulator::GetImplementation ();
-      m_initialized = true;
-    }
-  return m_size;
+  if ( g_parallelCommunicationInterface )
+    return g_parallelCommunicationInterface->GetSize ();
+  else
+    return 1;
 }
 
 bool
 MpiInterface::IsEnabled ()
 {
-  if (!m_initialized)
+  if (g_parallelCommunicationInterface)
     {
-      Simulator::GetImplementation ();
-      m_initialized = true;
+      return g_parallelCommunicationInterface->IsEnabled ();
     }
-  return m_enabled;
-}
-
-void
-MpiInterface::Enable (int* pargc, char*** pargv)
-{
-#ifdef NS3_MPI
-  // Initialize the MPI interface
-  MPI_Init (pargc, pargv);
-  MPI_Barrier (MPI_COMM_WORLD);
-  MPI_Comm_rank (MPI_COMM_WORLD, reinterpret_cast <int *> (&m_sid));
-  MPI_Comm_size (MPI_COMM_WORLD, reinterpret_cast <int *> (&m_size));
-  m_enabled = true;
-  m_initialized = true;
-  // Post a non-blocking receive for all peers
-  m_pRxBuffers = new char*[m_size];
-  m_requests = new MPI_Request[m_size];
-  for (uint32_t i = 0; i < GetSize (); ++i)
+  else
     {
-      m_pRxBuffers[i] = new char[MAX_MPI_MSG_SIZE];
-      MPI_Irecv (m_pRxBuffers[i], MAX_MPI_MSG_SIZE, MPI_CHAR, MPI_ANY_SOURCE, 0,
-                 MPI_COMM_WORLD, &m_requests[i]);
+      return false;
     }
-#else
-  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
-#endif
 }
 
 void
-MpiInterface::SendPacket (Ptr<Packet> p, const Time& rxTime, uint32_t node, uint32_t dev)
+MpiInterface::Enable (int* pargc, char*** pargv)
 {
-#ifdef NS3_MPI
-  SentBuffer sendBuf;
-  m_pendingTx.push_back (sendBuf);
-  std::list<SentBuffer>::reverse_iterator i = m_pendingTx.rbegin (); // Points to the last element
-
-  uint32_t serializedSize = p->GetSerializedSize ();
-  uint8_t* buffer =  new uint8_t[serializedSize + 16];
-  i->SetBuffer (buffer);
-  // Add the time, dest node and dest device
-  uint64_t t = rxTime.GetNanoSeconds ();
-  uint64_t* pTime = reinterpret_cast <uint64_t *> (buffer);
-  *pTime++ = t;
-  uint32_t* pData = reinterpret_cast<uint32_t *> (pTime);
-  *pData++ = node;
-  *pData++ = dev;
-  // Serialize the packet
-  p->Serialize (reinterpret_cast<uint8_t *> (pData), serializedSize);
-
-  // Find the system id for the destination node
-  Ptr<Node> destNode = NodeList::GetNode (node);
-  uint32_t nodeSysId = destNode->GetSystemId ();
-
-  MPI_Isend (reinterpret_cast<void *> (i->GetBuffer ()), serializedSize + 16, MPI_CHAR, nodeSysId,
-             0, MPI_COMM_WORLD, (i->GetRequest ()));
-  m_txCount++;
-#else
-  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
-#endif
-}
+  StringValue simulationTypeValue;
+  bool useDefault = true;
 
-void
-MpiInterface::ReceiveMessages ()
-{ // Poll the non-block reads to see if data arrived
-#ifdef NS3_MPI
-  while (true)
+  if (GlobalValue::GetValueByNameFailSafe ("SimulatorImplementationType", simulationTypeValue))
     {
-      int flag = 0;
-      int index = 0;
-      MPI_Status status;
+      std::string simulationType = simulationTypeValue.Get ();
 
-      MPI_Testany (GetSize (), m_requests, &index, &flag, &status);
-      if (!flag)
+      // Set communication interface based on the simulation type being used.
+      // Defaults to synchronous.
+      if (simulationType.compare ("ns3::NullMessageSimulatorImpl") == 0)
         {
-          break;        // No more messages
+          g_parallelCommunicationInterface = new NullMessageMpiInterface ();
+          useDefault = false;
         }
-      int count;
-      MPI_Get_count (&status, MPI_CHAR, &count);
-      m_rxCount++; // Count this receive
-
-      // Get the meta data first
-      uint64_t* pTime = reinterpret_cast<uint64_t *> (m_pRxBuffers[index]);
-      uint64_t nanoSeconds = *pTime++;
-      uint32_t* pData = reinterpret_cast<uint32_t *> (pTime);
-      uint32_t node = *pData++;
-      uint32_t dev  = *pData++;
-
-      Time rxTime = NanoSeconds (nanoSeconds);
-
-      count -= sizeof (nanoSeconds) + sizeof (node) + sizeof (dev);
-
-      Ptr<Packet> p = Create<Packet> (reinterpret_cast<uint8_t *> (pData), count, true);
-
-      // Find the correct node/device to schedule receive event
-      Ptr<Node> pNode = NodeList::GetNode (node);
-      Ptr<MpiReceiver> pMpiRec = 0;
-      uint32_t nDevices = pNode->GetNDevices ();
-      for (uint32_t i = 0; i < nDevices; ++i)
+      else if (simulationType.compare ("ns3::DistributedSimulatorImpl") == 0)
         {
-          Ptr<NetDevice> pThisDev = pNode->GetDevice (i);
-          if (pThisDev->GetIfIndex () == dev)
-            {
-              pMpiRec = pThisDev->GetObject<MpiReceiver> ();
-              break;
-            }
+          g_parallelCommunicationInterface = new GrantedTimeWindowMpiInterface ();
+          useDefault = false;
         }
+    }
 
-      NS_ASSERT (pNode && pMpiRec);
-
-      // Schedule the rx event
-      Simulator::ScheduleWithContext (pNode->GetId (), rxTime - Simulator::Now (),
-                                      &MpiReceiver::Receive, pMpiRec, p);
-
-      // Re-queue the next read
-      MPI_Irecv (m_pRxBuffers[index], MAX_MPI_MSG_SIZE, MPI_CHAR, MPI_ANY_SOURCE, 0,
-                 MPI_COMM_WORLD, &m_requests[index]);
+  // User did not specify a valid parallel simulator; use the default.
+  if (useDefault)
+    {
+      g_parallelCommunicationInterface = new GrantedTimeWindowMpiInterface ();
+      GlobalValue::Bind ("SimulatorImplementationType",
+                         StringValue ("ns3::DistributedSimulatorImpl"));
+      NS_LOG_WARN ("SimulatorImplementationType was set to non-parallel simulator; setting type to ns3::DistributedSimulatorImp");
     }
-#else
-  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
-#endif
+
+  g_parallelCommunicationInterface->Enable (pargc, pargv);
 }
 
 void
-MpiInterface::TestSendComplete ()
+MpiInterface::SendPacket (Ptr<Packet> p, const Time& rxTime, uint32_t node, uint32_t dev)
 {
-#ifdef NS3_MPI
-  std::list<SentBuffer>::iterator i = m_pendingTx.begin ();
-  while (i != m_pendingTx.end ())
-    {
-      MPI_Status status;
-      int flag = 0;
-      MPI_Test (i->GetRequest (), &flag, &status);
-      std::list<SentBuffer>::iterator current = i; // Save current for erasing
-      i++;                                    // Advance to next
-      if (flag)
-        { // This message is complete
-          m_pendingTx.erase (current);
-        }
-    }
-#else
-  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
-#endif
+  NS_ASSERT (g_parallelCommunicationInterface);
+  g_parallelCommunicationInterface->SendPacket (p, rxTime, node, dev);
 }
 
-void 
+
+void
 MpiInterface::Disable ()
 {
-#ifdef NS3_MPI
-  int flag = 0;
-  MPI_Initialized (&flag);
-  if (flag)
-    {
-      MPI_Finalize ();
-      m_enabled = false;
-      m_initialized = false;
-    }
-  else
-    {
-      NS_FATAL_ERROR ("Cannot disable MPI environment without Initializing it first");
-    }
-#else
-  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
-#endif
+  NS_ASSERT (g_parallelCommunicationInterface);
+  g_parallelCommunicationInterface->Disable ();
+  delete g_parallelCommunicationInterface;
+  g_parallelCommunicationInterface = 0;
 }
 
 
diff -Naur ns-3.18.1/src/mpi/model/mpi-interface.h ns-3.19/src/mpi/model/mpi-interface.h
--- ns-3.18.1/src/mpi/model/mpi-interface.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/model/mpi-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -1,5 +1,7 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
  * 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;
@@ -13,109 +15,74 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Author: George Riley <riley@ece.gatech.edu>
+ * Author: Steven Smith <smith84@llnl.gov>
+ *
  */
 
-// This object contains static methods that provide an easy interface
-// to the necessary MPI information.
-
 #ifndef NS3_MPI_INTERFACE_H
 #define NS3_MPI_INTERFACE_H
 
-#include <stdint.h>
-#include <list>
-
-#include "ns3/nstime.h"
-#include "ns3/buffer.h"
-
-#if defined(NS3_OPENMPI)
-struct ompi_request_t;
-typedef struct ompi_request_t* MPI_Request;
-#elif defined(NS3_MPICH)
-typedef int MPI_Request;
-#else
-typedef void* MPI_Request;
-#endif
+#include <ns3/nstime.h>
+#include <ns3/packet.h>
 
 namespace ns3 {
-
 /**
  * \defgroup mpi MPI Distributed Simulation
  *
  */
 
-/**
- * maximum MPI message size for easy
- * buffer creation
- */
-const uint32_t MAX_MPI_MSG_SIZE = 2000;
+class ParallelCommunicationInterface;
 
 /**
  * \ingroup mpi
  *
- * Define a class for tracking the non-block sends
- */
-class SentBuffer
-{
-public:
-  SentBuffer ();
-  ~SentBuffer ();
-
-  /**
-   * \return pointer to sent buffer
-   */
-  uint8_t* GetBuffer ();
-  /**
-   * \param buffer pointer to sent buffer
-   */
-  void SetBuffer (uint8_t* buffer);
-  /**
-   * \return MPI request
-   */
-  MPI_Request* GetRequest ();
-
-private:
-  uint8_t* m_buffer;
-  MPI_Request m_request;
-};
-
-class Packet;
-
-/**
- * \ingroup mpi
+ * \brief Singleton used to interface to the communications infrastructure
+ * when running NS3 in parallel.  
  *
- * Interface between ns-3 and MPI
+ * Delegates the implementation to the specific parallel
+ * infrastructure being used.  Implementation is defined in the
+ * ParallelCommunicationInterface virtual base class; this API mirrors
+ * that interface.  This singleton is responsible for instantiating an
+ * instance of the communication interface based on
+ * SimulatorImplementationType attribute in ns3::GlobalValues.  The
+ * attribute must be set before Enable is invoked.
  */
 class MpiInterface
 {
 public:
   /**
-   * Delete all buffers
+   * Deletes storage used by the parallel environment.
    */
   static void Destroy ();
   /**
-   * \return MPI rank
+   * \return system identification
+   *
+   * When running a sequential simulation this will return a systemID of 0.
    */
   static uint32_t GetSystemId ();
   /**
-   * \return MPI size (number of systems)
+   * \return number of parallel tasks
+   *
+   * When running a sequential simulation this will return a size of 1.
    */
   static uint32_t GetSize ();
   /**
-   * \return true if using MPI
+   * \return true if parallel communication is enabled
    */
   static bool IsEnabled ();
   /**
    * \param pargc number of command line arguments
    * \param pargv command line arguments
    *
-   * Sets up MPI interface
+   * \brief Sets up parallel communication interface.
+   *
+   * SimulatorImplementationType attribute in ns3::GlobalValues must be set before
+   * Enable is invoked.
    */
   static void Enable (int* pargc, char*** pargv);
   /**
-   * Terminates the MPI environment by calling MPI_Finalize
+   * Terminates the parallel environment.
    * This function must be called after Destroy ()
-   * It also resets m_initialized, m_enabled
    */
   static void Disable ();
   /**
@@ -127,43 +94,12 @@
    * Serialize and send a packet to the specified node and net device
    */
   static void SendPacket (Ptr<Packet> p, const Time &rxTime, uint32_t node, uint32_t dev);
-  /**
-   * Check for received messages complete
-   */
-  static void ReceiveMessages ();
-  /**
-   * Check for completed sends
-   */
-  static void TestSendComplete ();
-  /**
-   * \return received count in packets
-   */
-  static uint32_t GetRxCount ();
-  /**
-   * \return transmitted count in packets
-   */
-  static uint32_t GetTxCount ();
-
 private:
-  static uint32_t m_sid;
-  static uint32_t m_size;
-
-  // Total packets received
-  static uint32_t m_rxCount;
 
-  // Total packets sent
-  static uint32_t m_txCount;
-  static bool     m_initialized;
-  static bool     m_enabled;
-
-  // Pending non-blocking receives
-  static MPI_Request* m_requests;
-
-  // Data buffers for non-blocking reads
-  static char**   m_pRxBuffers;
-
-  // List of pending non-blocking sends
-  static std::list<SentBuffer> m_pendingTx;
+  /**
+   * Static instance of the instantiated parallel controller.
+   */
+  static ParallelCommunicationInterface* g_parallelCommunicationInterface;
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/mpi/model/mpi-receiver.cc ns-3.19/src/mpi/model/mpi-receiver.cc
--- ns-3.18.1/src/mpi/model/mpi-receiver.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/model/mpi-receiver.cc	2013-12-20 09:44:50.000000000 -0800
@@ -33,13 +33,13 @@
 {
 }
 
-void 
+void
 MpiReceiver::SetReceiveCallback (Callback<void, Ptr<Packet> > callback)
 {
   m_rxCallback = callback;
 }
 
-void 
+void
 MpiReceiver::Receive (Ptr<Packet> p)
 {
   NS_ASSERT (!m_rxCallback.IsNull ());
diff -Naur ns-3.18.1/src/mpi/model/mpi-receiver.h ns-3.19/src/mpi/model/mpi-receiver.h
--- ns-3.18.1/src/mpi/model/mpi-receiver.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/model/mpi-receiver.h	2013-12-20 09:44:50.000000000 -0800
@@ -16,7 +16,7 @@
  * Author: George Riley <riley@ece.gatech.edu>
  */
 
-// Provides an interface to aggregate to MPI-compatible NetDevices 
+// Provides an interface to aggregate to MPI-compatible NetDevices
 
 #ifndef NS3_MPI_RECEIVER_H
 #define NS3_MPI_RECEIVER_H
@@ -29,8 +29,8 @@
 /**
  * \ingroup mpi
  *
- * Class to aggregate to a NetDevice if it supports MPI capability
- * 
+ * \brief Class to aggregate to a NetDevice if it supports MPI capability
+ *
  * MpiInterface::ReceiveMessages () needs to send packets to a NetDevice
  * Receive() method.  Since each NetDevice's Receive() method is specific
  * to the derived class, and since we do not know whether such a NetDevice
diff -Naur ns-3.18.1/src/mpi/model/null-message-mpi-interface.cc ns-3.19/src/mpi/model/null-message-mpi-interface.cc
--- ns-3.18.1/src/mpi/model/null-message-mpi-interface.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/null-message-mpi-interface.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,460 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#include "null-message-mpi-interface.h"
+
+#include "null-message-simulator-impl.h"
+#include "remote-channel-bundle-manager.h"
+#include "remote-channel-bundle.h"
+
+#include "ns3/mpi-receiver.h"
+#include "ns3/node.h"
+#include "ns3/node-list.h"
+#include "ns3/net-device.h"
+#include "ns3/nstime.h"
+#include "ns3/simulator.h"
+#include "ns3/log.h"
+
+#ifdef NS3_MPI
+#include <mpi.h>
+#endif
+
+#include <iostream>
+#include <iomanip>
+#include <list>
+
+NS_LOG_COMPONENT_DEFINE ("NullMessageMpiInterface");
+
+namespace ns3 {
+
+/**
+ * maximum MPI message size for easy
+ * buffer creation
+ */
+const uint32_t NULL_MESSAGE_MAX_MPI_MSG_SIZE = 2000;
+
+
+NullMessageSentBuffer::NullMessageSentBuffer ()
+{
+  m_buffer = 0;
+  m_request = 0;
+}
+
+NullMessageSentBuffer::~NullMessageSentBuffer ()
+{
+  delete [] m_buffer;
+}
+
+uint8_t*
+NullMessageSentBuffer::GetBuffer ()
+{
+  return m_buffer;
+}
+
+void
+NullMessageSentBuffer::SetBuffer (uint8_t* buffer)
+{
+  m_buffer = buffer;
+}
+
+MPI_Request*
+NullMessageSentBuffer::GetRequest ()
+{
+  return &m_request;
+}
+
+uint32_t              NullMessageMpiInterface::g_sid = 0;
+uint32_t              NullMessageMpiInterface::g_size = 1;
+uint32_t              NullMessageMpiInterface::g_numNeighbors = 0;
+bool                  NullMessageMpiInterface::g_initialized = false;
+bool                  NullMessageMpiInterface::g_enabled = false;
+std::list<NullMessageSentBuffer> NullMessageMpiInterface::g_pendingTx;
+
+MPI_Request* NullMessageMpiInterface::g_requests;
+char**       NullMessageMpiInterface::g_pRxBuffers;
+
+NullMessageMpiInterface::NullMessageMpiInterface ()
+{
+  NS_LOG_FUNCTION (this);
+
+#ifndef NS3_MPI
+  /*
+   * This class can only be constructed if MPI is available.  Fail if an 
+   * attempt is made to instantiate this class without MPI.
+   */
+  NS_FATAL_ERROR ("Must compile with MPI if Null Message simulator is used, see --enable-mpi option for waf");
+#endif
+}
+
+NullMessageMpiInterface::~NullMessageMpiInterface ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+NullMessageMpiInterface::Destroy ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+uint32_t
+NullMessageMpiInterface::GetSystemId ()
+{
+  NS_ASSERT (g_enabled);
+  return g_sid;
+}
+
+uint32_t
+NullMessageMpiInterface::GetSize ()
+{
+  NS_ASSERT (g_enabled);
+  return g_size;
+}
+
+bool
+NullMessageMpiInterface::IsEnabled ()
+{
+  if (!g_initialized)
+    {
+      Simulator::GetImplementation ();
+      g_initialized = true;
+    }
+  return g_enabled;
+}
+
+void
+NullMessageMpiInterface::Enable (int* pargc, char*** pargv)
+{
+  NS_LOG_FUNCTION (this << *pargc);
+#ifdef NS3_MPI
+
+  // Initialize the MPI interface
+  MPI_Init (pargc, pargv);
+  MPI_Barrier (MPI_COMM_WORLD);
+
+  // SystemId and Size are unit32_t in interface but MPI uses int so convert.
+  int mpiSystemId;
+  int mpiSize;
+  MPI_Comm_rank (MPI_COMM_WORLD, &mpiSystemId);
+  MPI_Comm_size (MPI_COMM_WORLD, &mpiSize);
+
+  g_sid = mpiSystemId;
+  g_size = mpiSize;
+
+  g_enabled = true;
+  g_initialized = true;
+
+#endif
+}
+
+void 
+NullMessageMpiInterface::InitializeSendReceiveBuffers(void)
+{
+  NS_LOG_FUNCTION_NOARGS ();
+#ifdef NS3_MPI
+  NS_ASSERT (g_enabled);
+
+  g_numNeighbors = RemoteChannelBundleManager::Size();
+
+  // Post a non-blocking receive for all peers
+  g_requests = new MPI_Request[g_numNeighbors];
+  g_pRxBuffers = new char*[g_numNeighbors];
+  int index = 0;
+  for (uint32_t rank = 0; rank < g_size; ++rank)
+    {
+      Ptr<RemoteChannelBundle> bundle = RemoteChannelBundleManager::Find(rank);
+      if (bundle) 
+        {
+          g_pRxBuffers[index] = new char[NULL_MESSAGE_MAX_MPI_MSG_SIZE];
+          MPI_Irecv (g_pRxBuffers[index], NULL_MESSAGE_MAX_MPI_MSG_SIZE, MPI_CHAR, rank, 0,
+                     MPI_COMM_WORLD, &g_requests[index]);
+          ++index;
+        }
+    }
+#endif
+}
+
+void
+NullMessageMpiInterface::SendPacket (Ptr<Packet> p, const Time& rxTime, uint32_t node, uint32_t dev)
+{
+  NS_LOG_FUNCTION (this << p << rxTime.GetTimeStep () << node << dev);
+
+  NS_ASSERT (g_enabled);
+
+#ifdef NS3_MPI
+
+  // Find the system id for the destination node
+  Ptr<Node> destNode = NodeList::GetNode (node);
+  uint32_t nodeSysId = destNode->GetSystemId ();
+
+  NullMessageSentBuffer sendBuf;
+  g_pendingTx.push_back (sendBuf);
+  std::list<NullMessageSentBuffer>::reverse_iterator iter = g_pendingTx.rbegin (); // Points to the last element
+
+  uint32_t serializedSize = p->GetSerializedSize ();
+  uint32_t bufferSize = serializedSize + ( 2 * sizeof (uint64_t) ) + ( 2 * sizeof (uint32_t) );
+  uint8_t* buffer =  new uint8_t[bufferSize];
+  iter->SetBuffer (buffer);
+  // Add the time, dest node and dest device
+  uint64_t t = rxTime.GetInteger ();
+  uint64_t* pTime = reinterpret_cast <uint64_t *> (buffer);
+  *pTime++ = t;
+
+  Time guarantee_update = NullMessageSimulatorImpl::GetInstance ()->CalculateGuaranteeTime (nodeSysId);
+  *pTime++ = guarantee_update.GetTimeStep ();
+
+  uint32_t* pData = reinterpret_cast<uint32_t *> (pTime);
+  *pData++ = node;
+  *pData++ = dev;
+  // Serialize the packet
+  p->Serialize (reinterpret_cast<uint8_t *> (pData), serializedSize);
+
+  MPI_Isend (reinterpret_cast<void *> (iter->GetBuffer ()), bufferSize, MPI_CHAR, nodeSysId,
+             0, MPI_COMM_WORLD, (iter->GetRequest ()));
+
+  NullMessageSimulatorImpl::GetInstance ()->RescheduleNullMessageEvent (nodeSysId);
+
+#endif
+}
+
+void
+NullMessageMpiInterface::SendNullMessage (const Time& guarantee_update, Ptr<RemoteChannelBundle> bundle)
+{
+  NS_LOG_FUNCTION (guarantee_update.GetTimeStep () << bundle);
+
+  NS_ASSERT (g_enabled);
+
+#ifdef NS3_MPI
+
+  NullMessageSentBuffer sendBuf;
+  g_pendingTx.push_back (sendBuf);
+  std::list<NullMessageSentBuffer>::reverse_iterator iter = g_pendingTx.rbegin (); // Points to the last element
+
+  uint32_t bufferSize = 2 * sizeof (uint64_t) + 2 * sizeof (uint32_t);
+  uint8_t* buffer =  new uint8_t[bufferSize];
+  iter->SetBuffer (buffer);
+  // Add the time, dest node and dest device
+  uint64_t* pTime = reinterpret_cast <uint64_t *> (buffer);
+  *pTime++ = 0;
+  *pTime++ = guarantee_update.GetInteger ();
+  uint32_t* pData = reinterpret_cast<uint32_t *> (pTime);
+  *pData++ = 0;
+  *pData++ = 0;
+
+  // Find the system id for the destination MPI rank
+  uint32_t nodeSysId = bundle->GetSystemId ();
+
+  MPI_Isend (reinterpret_cast<void *> (iter->GetBuffer ()), bufferSize, MPI_CHAR, nodeSysId,
+             0, MPI_COMM_WORLD, (iter->GetRequest ()));
+#endif
+}
+
+void
+NullMessageMpiInterface::ReceiveMessagesBlocking ()
+{
+  NS_LOG_FUNCTION_NOARGS ();
+
+  ReceiveMessages(true);
+}
+
+
+void
+NullMessageMpiInterface::ReceiveMessagesNonBlocking ()
+{
+  NS_LOG_FUNCTION_NOARGS ();
+
+  ReceiveMessages(false);
+}
+
+
+void
+NullMessageMpiInterface::ReceiveMessages (bool blocking)
+{
+  NS_LOG_FUNCTION (blocking);
+
+  NS_ASSERT (g_enabled);
+
+#ifdef NS3_MPI
+
+  // stop flag set to true when no more messages are found to
+  // process.
+  bool stop = false;
+
+
+  if (!g_numNeighbors) {
+    // Not communicating with anyone.
+    return;
+  }
+
+  do
+    {
+      int messageReceived = 0;
+      int index = 0;
+      MPI_Status status;
+
+      if (blocking)
+        {
+          MPI_Waitany (g_numNeighbors, g_requests, &index, &status);
+          messageReceived = 1; /* Wait always implies message was received */
+          stop = true;
+        }
+      else
+        {
+          MPI_Testany (g_numNeighbors, g_requests, &index, &messageReceived, &status);
+        }
+
+      if (messageReceived)
+        {
+          int count;
+          MPI_Get_count (&status, MPI_CHAR, &count);
+
+          // Get the meta data first
+          uint64_t* pTime = reinterpret_cast<uint64_t *> (g_pRxBuffers[index]);
+          uint64_t time = *pTime++;
+          uint64_t guaranteeUpdate = *pTime++;
+
+          uint32_t* pData = reinterpret_cast<uint32_t *> (pTime);
+          uint32_t node = *pData++;
+          uint32_t dev  = *pData++;
+
+          Time rxTime (time);
+
+          // rxtime == 0 means this is a Null Message
+          if (rxTime > 0)
+            {
+              count -= sizeof (time) + sizeof (guaranteeUpdate) + sizeof (node) + sizeof (dev);
+
+              Ptr<Packet> p = Create<Packet> (reinterpret_cast<uint8_t *> (pData), count, true);
+
+              // Find the correct node/device to schedule receive event
+              Ptr<Node> pNode = NodeList::GetNode (node);
+              Ptr<MpiReceiver> pMpiRec = 0;
+              uint32_t nDevices = pNode->GetNDevices ();
+              for (uint32_t i = 0; i < nDevices; ++i)
+                {
+                  Ptr<NetDevice> pThisDev = pNode->GetDevice (i);
+                  if (pThisDev->GetIfIndex () == dev)
+                    {
+                      pMpiRec = pThisDev->GetObject<MpiReceiver> ();
+                      break;
+                    }
+                }
+              NS_ASSERT (pNode && pMpiRec);
+
+              // Schedule the rx event
+              Simulator::ScheduleWithContext (pNode->GetId (), rxTime - Simulator::Now (),
+                                              &MpiReceiver::Receive, pMpiRec, p);
+
+            }
+
+          // Update guarantee time for both packet receives and Null Messages.
+          Ptr<RemoteChannelBundle> bundle = RemoteChannelBundleManager::Find (status.MPI_SOURCE);
+          NS_ASSERT (bundle);
+
+          bundle->SetGuaranteeTime (Time (guaranteeUpdate));
+
+          // Re-queue the next read
+          MPI_Irecv (g_pRxBuffers[index], NULL_MESSAGE_MAX_MPI_MSG_SIZE, MPI_CHAR, status.MPI_SOURCE, 0,
+                     MPI_COMM_WORLD, &g_requests[index]);
+
+        }
+      else
+        {
+          // if non-blocking and no message received in testany then stop message loop
+          stop = true;
+        }
+    }
+  while (!stop);
+#endif
+}
+
+void
+NullMessageMpiInterface::TestSendComplete ()
+{
+  NS_LOG_FUNCTION_NOARGS ();
+
+  NS_ASSERT (g_enabled);
+
+#ifdef NS3_MPI
+  std::list<NullMessageSentBuffer>::iterator iter = g_pendingTx.begin ();
+  while (iter != g_pendingTx.end ())
+    {
+      MPI_Status status;
+      int flag = 0;
+      MPI_Test (iter->GetRequest (), &flag, &status);
+      std::list<NullMessageSentBuffer>::iterator current = iter; // Save current for erasing
+      ++iter; // Advance to next
+      if (flag)
+        { // This message is complete
+          g_pendingTx.erase (current);
+        }
+    }
+#endif
+}
+
+void
+NullMessageMpiInterface::Disable ()
+{
+  NS_LOG_FUNCTION (this);
+
+#ifdef NS3_MPI
+  int flag = 0;
+  MPI_Initialized (&flag);
+  if (flag)
+    {
+
+      for (std::list<NullMessageSentBuffer>::iterator iter = g_pendingTx.begin ();
+           iter != g_pendingTx.end ();
+           ++iter)
+        {
+          MPI_Cancel (iter->GetRequest ());
+          MPI_Request_free (iter->GetRequest ());
+        }
+
+      for (uint32_t i = 0; i < g_numNeighbors; ++i)
+        {
+          MPI_Cancel (&g_requests[i]);
+          MPI_Request_free (&g_requests[i]);
+        }
+
+      MPI_Finalize ();
+
+      for (uint32_t i = 0; i < g_numNeighbors; ++i)
+        {
+          delete [] g_pRxBuffers[i];
+        }
+      delete [] g_pRxBuffers;
+      delete [] g_requests;
+
+      g_pendingTx.clear ();
+
+      g_enabled = false;
+      g_initialized = false;
+
+    }
+  else
+    {
+      NS_FATAL_ERROR ("Cannot disable MPI environment without Initializing it first");
+    }
+#endif
+}
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/mpi/model/null-message-mpi-interface.h ns-3.19/src/mpi/model/null-message-mpi-interface.h
--- ns-3.18.1/src/mpi/model/null-message-mpi-interface.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/null-message-mpi-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,228 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#ifndef NS3_NULLMESSAGE_MPI_INTERFACE_H
+#define NS3_NULLMESSAGE_MPI_INTERFACE_H
+
+#include "parallel-communication-interface.h"
+
+#include <ns3/nstime.h>
+#include <ns3/buffer.h>
+
+#ifdef NS3_MPI
+#include "mpi.h"
+#else
+typedef void* MPI_Request;
+#endif
+
+#include <list>
+
+namespace ns3 {
+
+class RemoteChannelBundle;
+class Packet;
+
+/**
+ * \ingroup mpi
+ *
+ * \brief Non-blocking send buffers for Null Message implementation.
+ * 
+ * One buffer is allocated for each non-blocking send.
+ */
+class NullMessageSentBuffer
+{
+public:
+  NullMessageSentBuffer ();
+  ~NullMessageSentBuffer ();
+
+  /**
+   * \return pointer to sent buffer
+   */
+  uint8_t* GetBuffer ();
+  /**
+   * \param buffer pointer to sent buffer
+   */
+  void SetBuffer (uint8_t* buffer);
+  /**
+   * \return MPI request
+   */
+  MPI_Request* GetRequest ();
+
+private:
+
+  /**
+   * Buffer for send.
+   */
+  uint8_t* m_buffer;
+
+  /**
+   * MPI request posted for the send.
+   */
+  MPI_Request m_request;
+};
+
+/**
+ * \ingroup mpi
+ *
+ * \brief Interface between ns-3 and MPI for the Null Message
+ * distributed simulation implementation.
+ */
+class NullMessageMpiInterface : public ParallelCommunicationInterface
+{
+public:
+
+  NullMessageMpiInterface ();
+  ~NullMessageMpiInterface ();
+
+  /**
+   * Delete all buffers
+   */
+  virtual void Destroy ();
+  /**
+   * \return system id (MPI rank)
+   */
+  virtual uint32_t GetSystemId ();
+  /**
+   * \return number of systems (MPI size)
+   */
+  virtual uint32_t GetSize ();
+  /**
+   * \return true if interface is enabled
+   */
+  virtual bool IsEnabled ();
+  /**
+   * \param pargc number of command line arguments
+   * \param pargv command line arguments
+   *
+   * Sets up interface.   Calls MPI Init and 
+   * posts receives.
+   */
+  virtual void Enable (int* pargc, char*** pargv);
+  /**
+   * Terminates the MPI environment by calling MPI_Finalize This
+   * function must be called after Destroy ().  Resets m_initialized
+   * and m_enabled.
+   */
+  virtual void Disable ();
+  /**
+   * \param p packet to send
+   * \param rxTime received time at destination node
+   * \param node destination node
+   * \param dev destination device
+   *
+   * Serialize and send a packet to the specified node and net device.
+   *
+   * \internal
+   * The MPI buffer format packs a delivery information and the serialized packet.
+   *
+   * uint64_t time the packed should be delivered
+   * uint64_t guarantee time for the Null Message algorithm.
+   * uint32_t node id of destination
+   * unit32_t dev id on destination
+   * uint8_t[] serialized packet
+   * \endinternal
+   */
+  virtual void SendPacket (Ptr<Packet> p, const Time &rxTime, uint32_t node, uint32_t dev);
+  /**
+   * \param guaranteeUpdate guarantee update time for the Null Message
+   * \bundle the destination bundle for the Null Message.
+   *
+   * \brief Send a Null Message to across the specified bundle.  
+   *
+   * Guarantee update time is the lower bound time on the next
+   * possible event from this MPI task to the remote MPI task across
+   * the bundle.  Remote task may execute events up to time.
+   *
+   * Null Messages are sent when a packet has not been sent across
+   * this bundle in order to allow time advancement on the remote
+   * MPI task.
+   *
+   * \internal
+   * The Null Message MPI buffer format is based on the format for sending a packet with
+   * several fields set to 0 to signal that it is a Null Message.  Overloading the normal packet
+   * format simplifies receive logic.
+   *
+   * uint64_t 0 must be zero for Null Message
+   * uint64_t guarantee time
+   * uint32_t 0 must be zero for Null Message
+   * uint32_t 0 must be zero for Null Message
+   * \endinternal
+   */
+  static void SendNullMessage (const Time& guaranteeUpdate, Ptr<RemoteChannelBundle> bundle);
+  /**
+   * Non-blocking check for received messages complete.  Will
+   * receive all messages that are queued up locally.
+   */
+  static void ReceiveMessagesNonBlocking ();
+  /**
+   * Blocking message receive.  Will block until at least one message
+   * has been received.
+   */
+  static void ReceiveMessagesBlocking ();
+  /**
+   * Check for completed sends
+   */
+  static void TestSendComplete ();
+
+  /**
+   * \brief Initialize send and receive buffers.
+   *
+   * This method should be called after all links have been added to the RemoteChannelBundle
+   * manager to setup any required send and receive buffers.
+   */
+  static void InitializeSendReceiveBuffers (void);
+
+private:
+
+  /**
+   * Check for received messages complete.  Will block until message
+   * has been received if blocking flag is true.  When blocking will
+   * return after the first message is received.   Non-blocking mode will
+   * Non-blocking check for received messages complete.  Will
+   * receive all messages that are queued up locally.
+   */
+  static void ReceiveMessages (bool blocking = false);
+
+  // System ID (rank) for this task
+  static uint32_t g_sid;
+
+  // Size of the MPI COM_WORLD group.
+  static uint32_t g_size;
+
+  // Number of neighbor tasks, tasks that this task shares a link with.
+  static uint32_t g_numNeighbors;
+
+  static bool     g_initialized;
+  static bool     g_enabled;
+
+  // Pending non-blocking receives
+  static MPI_Request* g_requests;
+
+  // Data buffers for non-blocking receives
+  static char**   g_pRxBuffers;
+
+  // List of pending non-blocking sends
+  static std::list<NullMessageSentBuffer> g_pendingTx;
+};
+
+} // namespace ns3
+
+#endif /* NS3_NULL_MESSAGE_MPI_INTERFACE_H */
diff -Naur ns-3.18.1/src/mpi/model/null-message-simulator-impl.cc ns-3.19/src/mpi/model/null-message-simulator-impl.cc
--- ns-3.18.1/src/mpi/model/null-message-simulator-impl.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/null-message-simulator-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,603 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#include "null-message-simulator-impl.h"
+
+#include "null-message-mpi-interface.h"
+#include "remote-channel-bundle-manager.h"
+#include "remote-channel-bundle.h"
+#include "mpi-interface.h"
+
+#include <ns3/simulator.h>
+#include <ns3/scheduler.h>
+#include <ns3/event-impl.h>
+#include <ns3/channel.h>
+#include <ns3/node-container.h>
+#include <ns3/double.h>
+#include <ns3/ptr.h>
+#include <ns3/pointer.h>
+#include <ns3/assert.h>
+#include <ns3/log.h>
+
+#include <cmath>
+#include <iostream>
+#include <fstream>
+#include <iomanip>
+
+NS_LOG_COMPONENT_DEFINE ("NullMessageSimulatorImpl");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (NullMessageSimulatorImpl);
+
+NullMessageSimulatorImpl* NullMessageSimulatorImpl::g_instance = 0;
+
+TypeId
+NullMessageSimulatorImpl::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::NullMessageSimulatorImpl")
+    .SetParent<Object> ()
+    .AddConstructor<NullMessageSimulatorImpl> ()
+    .AddAttribute ("SchedulerTune", "Null Message scheduler tuning parameter",
+                   DoubleValue (1.0),
+                   MakeDoubleAccessor (&NullMessageSimulatorImpl::m_schedulerTune),
+                   MakeDoubleChecker<double> (0.01,1.0))
+  ;
+  return tid;
+}
+
+NullMessageSimulatorImpl::NullMessageSimulatorImpl ()
+{
+#ifdef NS3_MPI
+  NS_LOG_FUNCTION (this);
+
+  m_myId = MpiInterface::GetSystemId ();
+  m_systemCount = MpiInterface::GetSize ();
+
+  m_stop = false;
+  // uids are allocated from 4.
+  // uid 0 is "invalid" events
+  // uid 1 is "now" events
+  // uid 2 is "destroy" events
+  m_uid = 4;
+  // before ::Run is entered, the m_currentUid will be zero
+  m_currentUid = 0;
+  m_currentTs = 0;
+  m_currentContext = 0xffffffff;
+  m_unscheduledEvents = 0;
+  m_events = 0;
+
+  m_safeTime = Seconds (0);
+
+  NS_ASSERT (g_instance == 0);
+  g_instance = this;
+
+#else
+  NS_FATAL_ERROR ("Can't use Null Message simulator without MPI compiled in");
+#endif
+}
+
+NullMessageSimulatorImpl::~NullMessageSimulatorImpl ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+NullMessageSimulatorImpl::DoDispose (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  while (!m_events->IsEmpty ())
+    {
+      Scheduler::Event next = m_events->RemoveNext ();
+      next.impl->Unref ();
+    }
+  m_events = 0;
+  SimulatorImpl::DoDispose ();
+}
+
+void
+NullMessageSimulatorImpl::Destroy ()
+{
+  NS_LOG_FUNCTION (this);
+
+  while (!m_destroyEvents.empty ())
+    {
+      Ptr<EventImpl> ev = m_destroyEvents.front ().PeekEventImpl ();
+      m_destroyEvents.pop_front ();
+      NS_LOG_LOGIC ("handle destroy " << ev);
+      if (!ev->IsCancelled ())
+        {
+          ev->Invoke ();
+        }
+    }
+
+  RemoteChannelBundleManager::Destroy();
+  MpiInterface::Destroy ();
+}
+
+void
+NullMessageSimulatorImpl::CalculateLookAhead (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  int num_local_nodes = 0;
+
+  if (MpiInterface::GetSize () > 1)
+    {
+      NodeContainer c = NodeContainer::GetGlobal ();
+      for (NodeContainer::Iterator iter = c.Begin (); iter != c.End (); ++iter)
+        {
+          if ((*iter)->GetSystemId () != MpiInterface::GetSystemId ())
+            {
+              continue;
+            }
+
+          num_local_nodes++;
+
+          for (uint32_t i = 0; i < (*iter)->GetNDevices (); ++i)
+            {
+              Ptr<NetDevice> localNetDevice = (*iter)->GetDevice (i);
+              // only works for p2p links currently
+              if (!localNetDevice->IsPointToPoint ())
+                {
+                  continue;
+                }
+              Ptr<Channel> channel = localNetDevice->GetChannel ();
+              if (channel == 0)
+                {
+                  continue;
+                }
+
+              // grab the adjacent node
+              Ptr<Node> remoteNode;
+              if (channel->GetDevice (0) == localNetDevice)
+                {
+                  remoteNode = (channel->GetDevice (1))->GetNode ();
+                }
+              else
+                {
+                  remoteNode = (channel->GetDevice (0))->GetNode ();
+                }
+
+              // if it's not remote, don't consider it
+              if (remoteNode->GetSystemId () == MpiInterface::GetSystemId ())
+                {
+                  continue;
+                }
+
+              /**
+               * Add this channel to the remote channel bundle from this task to MPI task on other side of the channel.
+               */
+              Ptr<RemoteChannelBundle> remoteChannelBundle = RemoteChannelBundleManager::Find (remoteNode->GetSystemId ());
+              if (!remoteChannelBundle)
+                {
+                  remoteChannelBundle = RemoteChannelBundleManager::Add (remoteNode->GetSystemId ());
+                }
+
+              TimeValue delay;
+              channel->GetAttribute ("Delay", delay);
+              remoteChannelBundle->AddChannel (channel, delay.Get () );
+            }
+        }
+    }
+
+  // Completed setup of remote channel bundles.  Setup send and receive buffers.
+  NullMessageMpiInterface::InitializeSendReceiveBuffers ();
+
+  // Initialized to 0 as we don't have a simulation start time.
+  m_safeTime = Time (0);
+}
+
+void
+NullMessageSimulatorImpl::SetScheduler (ObjectFactory schedulerFactory)
+{
+  NS_LOG_FUNCTION (this << schedulerFactory);
+
+  Ptr<Scheduler> scheduler = schedulerFactory.Create<Scheduler> ();
+
+  if (m_events != 0)
+    {
+      while (!m_events->IsEmpty ())
+        {
+          Scheduler::Event next = m_events->RemoveNext ();
+          scheduler->Insert (next);
+        }
+    }
+  m_events = scheduler;
+}
+
+void
+NullMessageSimulatorImpl::ProcessOneEvent (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  Scheduler::Event next = m_events->RemoveNext ();
+
+  NS_ASSERT (next.key.m_ts >= m_currentTs);
+  m_unscheduledEvents--;
+
+  NS_LOG_LOGIC ("handle " << next.key.m_ts);
+  m_currentTs = next.key.m_ts;
+  m_currentContext = next.key.m_context;
+  m_currentUid = next.key.m_uid;
+  next.impl->Invoke ();
+  next.impl->Unref ();
+}
+
+bool
+NullMessageSimulatorImpl::IsFinished (void) const
+{
+  return m_events->IsEmpty () || m_stop;
+}
+
+Time
+NullMessageSimulatorImpl::Next (void) const
+{
+  NS_LOG_FUNCTION (this);
+
+  NS_ASSERT (!m_events->IsEmpty ());
+
+  Scheduler::Event ev = m_events->PeekNext ();
+  return TimeStep (ev.key.m_ts);
+}
+
+void
+NullMessageSimulatorImpl::ScheduleNullMessageEvent (Ptr<RemoteChannelBundle> bundle)
+{
+  NS_LOG_FUNCTION (this << bundle);
+
+  Time time (m_schedulerTune * bundle->GetDelay ().GetTimeStep ());
+
+  bundle->SetEventId (Simulator::Schedule (time, &NullMessageSimulatorImpl::NullMessageEventHandler, 
+                                           this, PeekPointer(bundle)));
+}
+
+void
+NullMessageSimulatorImpl::RescheduleNullMessageEvent (Ptr<RemoteChannelBundle> bundle)
+{
+  NS_LOG_FUNCTION (this << bundle);
+
+  Simulator::Cancel (bundle->GetEventId ());
+
+  Time time (m_schedulerTune * bundle->GetDelay ().GetTimeStep ());
+
+  bundle->SetEventId (Simulator::Schedule (time, &NullMessageSimulatorImpl::NullMessageEventHandler, 
+                                           this, PeekPointer(bundle)));
+}
+
+void
+NullMessageSimulatorImpl::RescheduleNullMessageEvent (uint32_t nodeSysId)
+{
+  NS_LOG_FUNCTION (this << nodeSysId);
+
+  Ptr<RemoteChannelBundle> bundle = RemoteChannelBundleManager::Find (nodeSysId);
+  NS_ASSERT (bundle);
+
+  RescheduleNullMessageEvent (bundle);
+}
+
+void
+NullMessageSimulatorImpl::Run (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  CalculateLookAhead ();
+
+  RemoteChannelBundleManager::InitializeNullMessageEvents ();
+
+  // Stop will be set if stop is called by simulation.
+  m_stop = false;
+  while (!IsFinished ())
+    {
+      Time nextTime = Next ();
+
+      if ( nextTime <= GetSafeTime () )
+        {
+          ProcessOneEvent ();
+          HandleArrivingMessagesNonBlocking ();
+        }
+      else
+        {
+          // Block until packet or Null Message has been received.
+          HandleArrivingMessagesBlocking ();
+        }
+    }
+}
+
+void
+NullMessageSimulatorImpl::HandleArrivingMessagesNonBlocking (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  NullMessageMpiInterface::ReceiveMessagesNonBlocking ();
+
+  CalculateSafeTime ();
+
+  // Check for send completes
+  NullMessageMpiInterface::TestSendComplete ();
+}
+
+void
+NullMessageSimulatorImpl::HandleArrivingMessagesBlocking (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  NullMessageMpiInterface::ReceiveMessagesBlocking ();
+
+  CalculateSafeTime ();
+
+  // Check for send completes
+  NullMessageMpiInterface::TestSendComplete ();
+}
+
+void
+NullMessageSimulatorImpl::CalculateSafeTime ()
+{
+  NS_LOG_FUNCTION (this);
+
+  m_safeTime = RemoteChannelBundleManager::GetSafeTime ();
+  NS_ASSERT (m_safeTime >= m_currentTs);
+}
+
+Time
+NullMessageSimulatorImpl::GetSafeTime ()
+{
+  return m_safeTime;
+}
+
+
+uint32_t
+NullMessageSimulatorImpl::GetSystemId () const
+{
+  return m_myId;
+}
+
+void
+NullMessageSimulatorImpl::RunOneEvent (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  ProcessOneEvent ();
+}
+
+void
+NullMessageSimulatorImpl::Stop (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  m_stop = true;
+}
+
+void
+NullMessageSimulatorImpl::Stop (Time const &time)
+{
+  NS_LOG_FUNCTION (this << time.GetTimeStep ());
+
+  Simulator::Schedule (time, &Simulator::Stop);
+}
+
+//
+// Schedule an event for a _relative_ time in the future.
+//
+EventId
+NullMessageSimulatorImpl::Schedule (Time const &time, EventImpl *event)
+{
+  NS_LOG_FUNCTION (this << time.GetTimeStep () << event);
+
+  Time tAbsolute = time + TimeStep (m_currentTs);
+
+  NS_ASSERT (tAbsolute.IsPositive ());
+  NS_ASSERT (tAbsolute >= TimeStep (m_currentTs));
+  Scheduler::Event ev;
+  ev.impl = event;
+  ev.key.m_ts = static_cast<uint64_t> (tAbsolute.GetTimeStep ());
+  ev.key.m_context = GetContext ();
+  ev.key.m_uid = m_uid;
+  m_uid++;
+  m_unscheduledEvents++;
+  m_events->Insert (ev);
+  return EventId (event, ev.key.m_ts, ev.key.m_context, ev.key.m_uid);
+}
+
+void
+NullMessageSimulatorImpl::ScheduleWithContext (uint32_t context, Time const &time, EventImpl *event)
+{
+  NS_LOG_FUNCTION (this << context << time.GetTimeStep () << m_currentTs << event);
+
+  Time tAbsolute(m_currentTs + time.GetTimeStep ());
+
+  NS_ASSERT (tAbsolute.IsPositive ());
+  NS_ASSERT (tAbsolute >= TimeStep (m_currentTs));
+
+  Scheduler::Event ev;
+  ev.impl = event;
+  ev.key.m_ts = tAbsolute.GetTimeStep ();
+  ev.key.m_context = context;
+  ev.key.m_uid = m_uid;
+  m_uid++;
+  m_unscheduledEvents++;
+  m_events->Insert (ev);
+}
+
+EventId
+NullMessageSimulatorImpl::ScheduleNow (EventImpl *event)
+{
+  NS_LOG_FUNCTION (this << event);
+
+  Scheduler::Event ev;
+  ev.impl = event;
+  ev.key.m_ts = m_currentTs;
+  ev.key.m_context = GetContext ();
+  ev.key.m_uid = m_uid;
+  m_uid++;
+  m_unscheduledEvents++;
+  m_events->Insert (ev);
+  return EventId (event, ev.key.m_ts, ev.key.m_context, ev.key.m_uid);
+}
+
+EventId
+NullMessageSimulatorImpl::ScheduleDestroy (EventImpl *event)
+{
+  NS_LOG_FUNCTION (this << event);
+
+  EventId id (Ptr<EventImpl> (event, false), m_currentTs, 0xffffffff, 2);
+  m_destroyEvents.push_back (id);
+  m_uid++;
+  return id;
+}
+
+Time
+NullMessageSimulatorImpl::Now (void) const
+{
+  return TimeStep (m_currentTs);
+}
+
+Time
+NullMessageSimulatorImpl::GetDelayLeft (const EventId &id) const
+{
+  if (IsExpired (id))
+    {
+      return TimeStep (0);
+    }
+  else
+    {
+      return TimeStep (id.GetTs () - m_currentTs);
+    }
+}
+
+void
+NullMessageSimulatorImpl::Remove (const EventId &id)
+{
+  if (id.GetUid () == 2)
+    {
+      // destroy events.
+      for (DestroyEvents::iterator i = m_destroyEvents.begin (); i != m_destroyEvents.end (); i++)
+        {
+          if (*i == id)
+            {
+              m_destroyEvents.erase (i);
+              break;
+            }
+        }
+      return;
+    }
+  if (IsExpired (id))
+    {
+      return;
+    }
+  Scheduler::Event event;
+  event.impl = id.PeekEventImpl ();
+  event.key.m_ts = id.GetTs ();
+  event.key.m_context = id.GetContext ();
+  event.key.m_uid = id.GetUid ();
+  m_events->Remove (event);
+  event.impl->Cancel ();
+  // whenever we remove an event from the event list, we have to unref it.
+  event.impl->Unref ();
+
+  m_unscheduledEvents--;
+}
+
+void
+NullMessageSimulatorImpl::Cancel (const EventId &id)
+{
+  if (!IsExpired (id))
+    {
+      id.PeekEventImpl ()->Cancel ();
+    }
+}
+
+bool
+NullMessageSimulatorImpl::IsExpired (const EventId &ev) const
+{
+  if (ev.GetUid () == 2)
+    {
+      if (ev.PeekEventImpl () == 0
+          || ev.PeekEventImpl ()->IsCancelled ())
+        {
+          return true;
+        }
+      // destroy events.
+      for (DestroyEvents::const_iterator i = m_destroyEvents.begin (); i != m_destroyEvents.end (); i++)
+        {
+          if (*i == ev)
+            {
+              return false;
+            }
+        }
+      return true;
+    }
+  if (ev.PeekEventImpl () == 0
+      || ev.GetTs () < m_currentTs
+      || (ev.GetTs () == m_currentTs
+          && ev.GetUid () <= m_currentUid)
+      || ev.PeekEventImpl ()->IsCancelled ())
+    {
+      return true;
+    }
+  else
+    {
+      return false;
+    }
+}
+
+Time
+NullMessageSimulatorImpl::GetMaximumSimulationTime (void) const
+{
+  // XXX: I am fairly certain other compilers use other non-standard
+  // post-fixes to indicate 64 bit constants.
+  return TimeStep (0x7fffffffffffffffLL);
+}
+
+uint32_t
+NullMessageSimulatorImpl::GetContext (void) const
+{
+  return m_currentContext;
+}
+
+Time NullMessageSimulatorImpl::CalculateGuaranteeTime (uint32_t nodeSysId)
+{
+  Ptr<RemoteChannelBundle> bundle = RemoteChannelBundleManager::Find (nodeSysId);
+  NS_ASSERT (bundle);
+
+  return Min (NullMessageSimulatorImpl::GetInstance ()->Next (), GetSafeTime ()) + bundle->GetDelay ();
+}
+
+void NullMessageSimulatorImpl::NullMessageEventHandler(RemoteChannelBundle* bundle)
+{
+  NS_LOG_FUNCTION (this << bundle);
+
+  Time time = Min (Next (), GetSafeTime ()) + bundle->GetDelay ();
+  NullMessageMpiInterface::SendNullMessage (time, bundle);
+
+  ScheduleNullMessageEvent (bundle);
+}
+
+
+NullMessageSimulatorImpl*
+NullMessageSimulatorImpl::GetInstance (void)
+{
+  NS_ASSERT (g_instance != 0);
+  return g_instance;
+}
+} // namespace ns3
+
diff -Naur ns-3.18.1/src/mpi/model/null-message-simulator-impl.h ns-3.19/src/mpi/model/null-message-simulator-impl.h
--- ns-3.18.1/src/mpi/model/null-message-simulator-impl.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/null-message-simulator-impl.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,212 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#ifndef NULLMESSAGE_SIMULATOR_IMPL_H
+#define NULLMESSAGE_SIMULATOR_IMPL_H
+
+#include <ns3/simulator-impl.h>
+#include <ns3/scheduler.h>
+#include <ns3/event-impl.h>
+#include <ns3/ptr.h>
+
+#include <list>
+#include <iostream>
+#include <fstream>
+
+namespace ns3 {
+
+class NullMessageEvent;
+class NullMessageMpiInterface;
+class RemoteChannelBundle;
+
+/**
+ * \ingroup mpi
+ *
+ * \brief Simulator implementation using MPI and a Null Message algorithm.
+ */
+class NullMessageSimulatorImpl : public SimulatorImpl
+{
+public:
+  static TypeId GetTypeId (void);
+
+  NullMessageSimulatorImpl ();
+
+  ~NullMessageSimulatorImpl ();
+
+  // virtual from SimulatorImpl
+  virtual void Destroy ();
+  virtual bool IsFinished (void) const;
+  virtual void Stop (void);
+  virtual void Stop (Time const &time);
+  virtual EventId Schedule (Time const &time, EventImpl *event);
+  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 &ev);
+  virtual void Cancel (const EventId &ev);
+  virtual bool IsExpired (const EventId &ev) const;
+  virtual void Run (void);
+  virtual void RunOneEvent (void);
+  virtual Time Now (void) const;
+  virtual Time GetDelayLeft (const EventId &id) const;
+  virtual Time GetMaximumSimulationTime (void) const;
+  virtual void SetScheduler (ObjectFactory schedulerFactory);
+  virtual uint32_t GetSystemId (void) const;
+  virtual uint32_t GetContext (void) const;
+
+  /**
+   * \return singleton instance
+   *
+   * Singleton accessor.
+   */
+  static NullMessageSimulatorImpl * GetInstance (void);
+
+private:
+  friend class NullMessageEvent;
+  friend class NullMessageMpiInterface;
+  friend class RemoteChannelBundleManager;
+
+  /**
+   * Non blocking receive of pending messages.  
+   */
+  void HandleArrivingMessagesNonBlocking (void);
+
+  /**
+   * Blocking receive of arriving messages.
+   */
+  void HandleArrivingMessagesBlocking (void);
+
+  virtual void DoDispose (void);
+
+  /**
+   * Calculate the look ahead allowable for this MPI task.   Basically
+   * the minimum latency on links to neighbor MPI tasks.
+   */
+  void CalculateLookAhead (void);
+
+  /**
+   * Process the next event on the queue.
+   */
+  void ProcessOneEvent (void);
+
+  /**
+   * \return next local event time.
+   */
+  Time Next (void) const;
+
+  /**
+   * Calculate the SafeTime. Should be called after message receives.
+   */
+  void CalculateSafeTime (void);
+
+  /**
+   * Get the current SafeTime; the maximum time that events can
+   * be processed based on information received from neighboring
+   * MPI tasks.
+   */
+  Time GetSafeTime (void);
+
+  /**
+   * \param bundle Bundle to schedule Null Message event for
+   *
+   * Schedule Null Message event for the specified RemoteChannelBundle.
+   */
+  void ScheduleNullMessageEvent (Ptr<RemoteChannelBundle> bundle);
+
+  /**
+   * \param bundle Bundle to reschedule Null Message event for
+   *
+   * Reschedule Null Message event for the specified
+   * RemoteChannelBundel.  Existing event will be canceled.
+   */
+  void RescheduleNullMessageEvent (Ptr<RemoteChannelBundle> bundle);
+
+  /**
+   * \param nodeSysId SystemID to reschedule null event for
+   *
+   * Reschedule Null Message event for the RemoteChannelBundel to the
+   * task nodeSysId.  Existing event will be canceled.
+   */
+  void RescheduleNullMessageEvent (uint32_t nodeSysId);
+
+  /**
+   * \param systemId SystemID to compute guarentee time for
+   *
+   * \return Guarentee time
+   *
+   * Calculate the guarantee time for incoming RemoteChannelBundel
+   * from task nodeSysId.  No message should arrive from task
+   * nodeSysId with a receive time less than the guarantee time.
+   */
+  Time CalculateGuaranteeTime (uint32_t systemId);
+
+  /**
+   * \param bundle remote channel bundle to schedule an event for.
+   *
+   * Null message event handler.   Scheduled to send a null message
+   * for the specified bundle at regular intervals.   Will canceled
+   * and rescheduled when packets are sent.
+   */
+  void NullMessageEventHandler(RemoteChannelBundle* bundle);
+
+  typedef std::list<EventId> DestroyEvents;
+
+  DestroyEvents m_destroyEvents;
+  bool m_stop;
+  Ptr<Scheduler> m_events;
+  uint32_t m_uid;
+  uint32_t m_currentUid;
+  uint64_t m_currentTs;
+  uint32_t m_currentContext;
+  // number of events that have been inserted but not yet scheduled,
+  // not counting the "destroy" events; this is used for validation
+  int m_unscheduledEvents;
+
+  uint32_t     m_myId;        // MPI Rank
+  uint32_t     m_systemCount; // MPI Size
+
+  /*
+   * The time for which it is safe for this task to execute events
+   * without danger of out-of-order events.
+   */
+  Time m_safeTime;
+
+  /*
+   * Null Message performance tuning parameter.  Controls when Null
+   * messages are sent.  When value is 1 the minimum number of Null
+   * messages are sent conserving bandwidth.  The delay in arrival of
+   * lookahead information is the greatest resulting in maximum
+   * unnecessary blocking of the receiver.  When the value is near 0
+   * Null Messages are sent with high frequency, costing more
+   * bandwidth and Null Message processing time, but there is minimum
+   * unnecessary block of the receiver.
+   */
+  double m_schedulerTune;
+
+  /*
+   * Singleton instance.
+   */
+  static NullMessageSimulatorImpl* g_instance;
+};
+
+} // namespace ns3
+
+#endif /* NULLMESSAGE_SIMULATOR_IMPL_H */
diff -Naur ns-3.18.1/src/mpi/model/parallel-communication-interface.h ns-3.19/src/mpi/model/parallel-communication-interface.h
--- ns-3.18.1/src/mpi/model/parallel-communication-interface.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/parallel-communication-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,99 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#ifndef NS3_PARALLEL_COMMUNICATION_INTERFACE_H
+#define NS3_PARALLEL_COMMUNICATION_INTERFACE_H
+
+#include <stdint.h>
+#include <list>
+
+#include <ns3/object.h>
+#include <ns3/nstime.h>
+#include <ns3/buffer.h>
+#include <ns3/packet.h>
+
+#if defined(NS3_MPI)
+#include "mpi.h"
+#endif
+
+namespace ns3 {
+
+/**
+ * \ingroup mpi
+ *
+ * \brief Pure virtual base class for the interface between ns-3 and
+ * the parallel communication layer being used.
+ *
+ * Each type of parallel communication layer is required to implement
+ * this interface.  This interface is called through the
+ * MpiInterface.
+ */
+  class ParallelCommunicationInterface
+{
+public:
+  /**
+    * Destructor
+    */
+  virtual ~ParallelCommunicationInterface() {}
+  /**
+   * Deletes storage used by the parallel environment.
+   */
+  virtual void Destroy () = 0;
+  /**
+   * \return system identification
+   */
+  virtual uint32_t GetSystemId () = 0;
+  /**
+   * \return number of parallel tasks
+   */
+  virtual uint32_t GetSize () = 0;
+  /**
+   * \return true if parallel communication is enabled
+   */
+  virtual bool IsEnabled () = 0;
+  /**
+   * \param pargc number of command line arguments
+   * \param pargv command line arguments
+   *
+   * Sets up parallel communication interface
+   */
+  virtual void Enable (int* pargc, char*** pargv) = 0;
+  /**
+   * Terminates the parallel environment.
+   * This function must be called after Destroy ()
+   */
+  virtual void Disable () = 0;
+  /**
+   * \param p packet to send
+   * \param rxTime received time at destination node
+   * \param node destination node
+   * \param dev destination device
+   *
+   * Serialize and send a packet to the specified node and net device
+   */
+  virtual void SendPacket (Ptr<Packet> p, const Time &rxTime, uint32_t node, uint32_t dev) = 0;
+
+private:
+};
+
+} // namespace ns3
+
+#endif /* NS3_PARALLEL_COMMUNICATION_INTERFACE_H */
diff -Naur ns-3.18.1/src/mpi/model/remote-channel-bundle.cc ns-3.19/src/mpi/model/remote-channel-bundle.cc
--- ns-3.18.1/src/mpi/model/remote-channel-bundle.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/remote-channel-bundle.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,130 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#include "remote-channel-bundle.h"
+
+#include "null-message-mpi-interface.h"
+#include "null-message-simulator-impl.h"
+
+#include <ns3/simulator.h>
+
+namespace ns3 {
+
+#define NS_TIME_INFINITY ns3::Time (0x7fffffffffffffffLL)
+
+TypeId RemoteChannelBundle::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::RemoteChannelBundle")
+    .SetParent<Object> ()
+    .AddConstructor <RemoteChannelBundle> ();
+  return tid;
+}
+
+RemoteChannelBundle::RemoteChannelBundle ()
+  : m_remoteSystemId (-1),
+    m_guaranteeTime (0),
+    m_delay (NS_TIME_INFINITY)
+{
+}
+
+RemoteChannelBundle::RemoteChannelBundle (const uint32_t remoteSystemId)
+  : m_remoteSystemId (remoteSystemId),
+    m_guaranteeTime (0),
+    m_delay (NS_TIME_INFINITY)
+{
+}
+
+void
+RemoteChannelBundle::AddChannel (Ptr<Channel> channel, Time delay)
+{
+  m_channels[channel->GetId ()] = channel;
+  m_delay = ns3::Min (m_delay, delay);
+}
+
+uint32_t
+RemoteChannelBundle::GetSystemId () const
+{
+  return m_remoteSystemId;
+}
+
+Time
+RemoteChannelBundle::GetGuaranteeTime (void) const
+{
+  return m_guaranteeTime;
+}
+
+void
+RemoteChannelBundle::SetGuaranteeTime (Time time)
+{
+  NS_ASSERT (time >= Simulator::Now ());
+
+  m_guaranteeTime = time;
+}
+
+Time
+RemoteChannelBundle::GetDelay (void) const
+{
+  return m_delay;
+}
+
+void
+RemoteChannelBundle::SetEventId (EventId id)
+{
+  m_nullEventId = id;
+}
+
+EventId
+RemoteChannelBundle::GetEventId (void) const
+{
+  return m_nullEventId;
+}
+
+int
+RemoteChannelBundle::GetSize (void) const
+{
+  return m_channels.size ();
+}
+
+void 
+RemoteChannelBundle::Send(Time time)
+{
+  NullMessageMpiInterface::SendNullMessage (time, this);  
+}
+
+std::ostream& operator<< (std::ostream& out, ns3::RemoteChannelBundle& bundle )
+{
+  out << "RemoteChannelBundle Rank = " << bundle.m_remoteSystemId
+      << ", GuaranteeTime = "  << bundle.m_guaranteeTime
+      << ", Delay = " << bundle.m_delay << std::endl;
+  
+  for (std::map < uint32_t, Ptr < Channel > > ::const_iterator pair = bundle.m_channels.begin ();
+       pair != bundle.m_channels.end ();
+       ++pair)
+    {
+      out << "\t" << (*pair).second << std::endl;
+    }
+  
+  return out;
+}
+
+
+} // namespace ns3
+
diff -Naur ns-3.18.1/src/mpi/model/remote-channel-bundle.h ns-3.19/src/mpi/model/remote-channel-bundle.h
--- ns-3.18.1/src/mpi/model/remote-channel-bundle.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/remote-channel-bundle.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,151 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#ifndef NS3_REMOTE_CHANNEL_BUNDLE
+#define NS3_REMOTE_CHANNEL_BUNDLE
+
+#include "null-message-simulator-impl.h"
+
+#include <ns3/channel.h>
+#include <ns3/ptr.h>
+#include <ns3/pointer.h>
+
+#include <map>
+
+namespace ns3 {
+
+/**
+ * \ingroup mpi
+ * 
+ * \brief Collection of NS3 channels between local and remote nodes.
+ * 
+ * An instance exists for each remote system that the local system is
+ * in communication with.  These are created and managed by the
+ * RemoteChannelBundleManager class.  Stores time information for each
+ * bundle.
+ */
+class RemoteChannelBundle : public Object
+{
+public:
+  static TypeId GetTypeId (void);
+
+  RemoteChannelBundle ();
+
+  RemoteChannelBundle (const uint32_t remoteSystemId);
+
+  ~RemoteChannelBundle ()
+  {
+  }
+
+  /**
+   * \param channel to add to the bundle
+   * \param delay time for the channel (usually the latency)
+   */
+  void AddChannel (Ptr<Channel> channel, Time delay);
+
+  /**
+   * \return SystemID for remote side of this bundle
+   */
+  uint32_t GetSystemId () const;
+
+  /**
+   * \return guarantee time
+   */
+  Time GetGuaranteeTime (void) const;
+
+  /**
+   * \param guarantee time
+   *
+   * Set the guarantee time for the bundle.  This should be called
+   * after a packet or Null Message received.
+   */
+  void SetGuaranteeTime (Time time);
+
+  /**
+   * \return the minimum delay along any channel in this bundle
+   */
+  Time GetDelay (void) const;
+
+  /**
+   * Set the event ID of the Null Message send event current scheduled
+   * for this channel.
+   */
+  void SetEventId (EventId id);
+
+  /**
+   * \return the event ID of the Null Message send event for this bundle
+   */
+  EventId GetEventId (void) const;
+
+  /**
+   * \return number of NS3 channels in this bundle
+   */
+  int GetSize (void) const;
+
+  /**
+   * \param time 
+   *
+   * Send Null Message to the remote task associated with this bundle.
+   * Message will be delivered at current simulation time + the time
+   * passed in.
+   */
+  void Send(Time time);
+
+  /**
+   * Output for debugging purposes.
+   */
+  friend std::ostream& operator<< (std::ostream& out, ns3::RemoteChannelBundle& bundle );
+
+private:
+  /*
+   * Remote rank.
+   */
+  uint32_t m_remoteSystemId;
+
+  /*
+   * NS3 Channels that are connected from nodes in this MPI task to remote_rank.
+   *
+   * Would be more efficient to use unordered_map when C++11 is adopted by NS3.
+   */
+  std::map < uint32_t, Ptr < Channel > > m_channels;
+
+  /*
+   * Guarentee time for the incoming Channels from MPI task remote_rank.
+   * No PacketMessage will ever arrive on any incoming channel in this bundle with a
+   * ReceiveTime less than this.  Intialized to StartTime.
+   */
+  Time m_guaranteeTime;
+
+  /*
+   * Delay for this Channel bundle.   min link delay over all incoming channels;
+   */
+  Time m_delay;
+
+  /*
+   * Event scheduled to send Null Message for this bundle.
+   */
+  EventId m_nullEventId;
+
+};
+
+}
+
+#endif
diff -Naur ns-3.18.1/src/mpi/model/remote-channel-bundle-manager.cc ns-3.19/src/mpi/model/remote-channel-bundle-manager.cc
--- ns-3.18.1/src/mpi/model/remote-channel-bundle-manager.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/remote-channel-bundle-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,112 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#include "remote-channel-bundle-manager.h"
+
+#include "remote-channel-bundle.h"
+#include "null-message-simulator-impl.h"
+
+#include "ns3/simulator.h"
+
+namespace ns3 {
+
+bool ns3::RemoteChannelBundleManager::g_initialized = false;
+ns3::RemoteChannelBundleManager::RemoteChannelMap ns3::RemoteChannelBundleManager::g_remoteChannelBundles;
+
+Ptr<RemoteChannelBundle>
+RemoteChannelBundleManager::Find (uint32_t systemId)
+{
+  ns3::RemoteChannelBundleManager::RemoteChannelMap::iterator kv = g_remoteChannelBundles.find (systemId);
+
+  if ( kv == g_remoteChannelBundles.end ())
+    {
+      return 0;
+    }
+  else
+    {
+      return kv->second;
+    }
+}
+
+Ptr<RemoteChannelBundle>
+RemoteChannelBundleManager::Add (uint32_t systemId)
+{
+  NS_ASSERT (!g_initialized);
+  NS_ASSERT (g_remoteChannelBundles.find (systemId) == g_remoteChannelBundles.end ());
+
+  Ptr<RemoteChannelBundle> remoteChannelBundle = Create<RemoteChannelBundle> (systemId);
+
+  g_remoteChannelBundles[systemId] = remoteChannelBundle;
+
+  return remoteChannelBundle;
+}
+
+uint32_t 
+RemoteChannelBundleManager::Size (void) 
+{
+  return g_remoteChannelBundles.size();
+}
+
+void
+RemoteChannelBundleManager::InitializeNullMessageEvents (void)
+{
+  NS_ASSERT (!g_initialized);
+
+  for ( RemoteChannelMap::const_iterator iter = g_remoteChannelBundles.begin ();
+        iter != g_remoteChannelBundles.end ();
+        ++iter )
+    {
+      Ptr<RemoteChannelBundle> bundle = iter->second;
+      bundle->Send (bundle->GetDelay ());
+
+      NullMessageSimulatorImpl::GetInstance ()->ScheduleNullMessageEvent (bundle);
+    }
+
+  g_initialized = true;
+}
+
+Time
+RemoteChannelBundleManager::GetSafeTime (void)
+{
+  NS_ASSERT (g_initialized);
+
+  Time safeTime = Simulator::GetMaximumSimulationTime ();
+
+  for (RemoteChannelMap::const_iterator kv = g_remoteChannelBundles.begin ();
+       kv != g_remoteChannelBundles.end ();
+       ++kv)
+    {
+      safeTime = Min (safeTime, kv->second->GetGuaranteeTime ());
+    }
+
+  return safeTime;
+}
+
+void
+RemoteChannelBundleManager::Destroy (void)
+{
+  NS_ASSERT (g_initialized);
+
+  g_remoteChannelBundles.clear();
+  g_initialized = false;
+}
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/mpi/model/remote-channel-bundle-manager.h ns-3.19/src/mpi/model/remote-channel-bundle-manager.h
--- ns-3.18.1/src/mpi/model/remote-channel-bundle-manager.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/mpi/model/remote-channel-bundle-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,107 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ *  Copyright 2013. Lawrence Livermore National Security, LLC.
+ *
+ * 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: Steven Smith <smith84@llnl.gov>
+ *
+ */
+
+#ifndef NS3_REMOTE_CHANNEL_BUNDLE_MANAGER
+#define NS3_REMOTE_CHANNEL_BUNDLE_MANAGER
+
+#include <ns3/nstime.h>
+#include <ns3/ptr.h>
+#include <map>
+
+namespace ns3 {
+
+class RemoteChannelBundle;
+
+/*
+ * \ingroup mpi
+ * 
+ * \brief Singleton for managing the RemoteChannelBundles for each process.
+ *
+ * Manages collective tasks associated with the bundle collection.
+ */
+class RemoteChannelBundleManager
+{
+
+public:
+  /**
+   * \return remote channel bundle for specified SystemId.
+   */
+  static Ptr<RemoteChannelBundle> Find (uint32_t systemId);
+
+  /**
+   * Add RemoteChannelBundle from this task to MPI task on other side of the link.
+   * Can not be invoked after InitializeNullMessageEvents has been invoked.
+   */
+  static Ptr<RemoteChannelBundle> Add (uint32_t systemId);
+
+  /**
+   * \return number of remote channel bundles
+   * 
+   */
+  static uint32_t Size (void);
+
+  /**
+   * Setup initial Null Message events for every RemoteChannelBundle.
+   * All RemoteChannelBundles should be added before this method is invoked.
+   */
+  static void InitializeNullMessageEvents (void);
+
+  /**
+   * \return safe time across all remote channels.
+   */
+  static Time GetSafeTime (void);
+
+  /**
+   * Destroy the singleton.
+   */
+  static void Destroy (void);
+
+private:
+
+  /**
+   * Private ctor to prevent creation outside of singleton pattern.
+   */
+  RemoteChannelBundleManager ()
+  {
+  }
+
+  ~RemoteChannelBundleManager ()
+  {
+  }
+
+  /*
+   * Container for all remote channel bundles for this task.
+   *
+   * Would be more efficient to use unordered_map when C++11 is adopted for NS3.
+   */
+  typedef std::map<uint32_t, Ptr<RemoteChannelBundle> > RemoteChannelMap;
+  static RemoteChannelMap g_remoteChannelBundles;
+
+  /*
+   * Protect manager class from being initialized twice or incorrect
+   * ordering of method calls.
+   */
+  static bool g_initialized;
+};
+
+} // namespace ns3
+
+#endif
diff -Naur ns-3.18.1/src/mpi/wscript ns-3.19/src/mpi/wscript
--- ns-3.18.1/src/mpi/wscript	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/mpi/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -36,16 +36,21 @@
     sim = bld.create_ns3_module('mpi', ['core', 'network'])
     sim.source = [
         'model/distributed-simulator-impl.cc',
-        'model/mpi-interface.cc',
+        'model/granted-time-window-mpi-interface.cc',
         'model/mpi-receiver.cc',
+        'model/null-message-simulator-impl.cc',
+        'model/null-message-mpi-interface.cc',
+        'model/remote-channel-bundle.cc',
+        'model/remote-channel-bundle-manager.cc',
+        'model/mpi-interface.cc', 
         ]
 
     headers = bld(features='ns3header')
     headers.module = 'mpi'
     headers.source = [
-        'model/distributed-simulator-impl.h',
-        'model/mpi-interface.h',
         'model/mpi-receiver.h',
+        'model/mpi-interface.h',
+        'model/parallel-communication-interface.h', 
         ]
 
     if env['ENABLE_MPI']:
diff -Naur ns-3.18.1/src/netanim/doc/animation.rst ns-3.19/src/netanim/doc/animation.rst
--- ns-3.18.1/src/netanim/doc/animation.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/netanim/doc/animation.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. toctree::
 
 Animation
 ---------
@@ -62,9 +63,11 @@
 If NetAnim is not already available in the |ns3| package you downloaded, you can do the following:
 
 Please ensure that you have installed mercurial.
-The latest version of NetAnim can be downloaded using mercurial with the following command::
+The latest version of NetAnim can be downloaded using mercurial with the following command:
 
-  hg clone http://code.nsnam.org/netanim
+.. sourcecode:: bash
+
+  $ hg clone http://code.nsnam.org/netanim
 
 Building NetAnim
 ================
@@ -72,35 +75,41 @@
 ~~~~~~~~~~~~~
 Qt4 (4.7 and over) is required to build NetAnim. This can be obtained using the following ways:
 
-For Debian/Ubuntu Linux distributions::
+For Debian/Ubuntu Linux distributions:
+
+.. sourcecode:: bash
 
-  apt-get install qt4-dev-tools
+  $ apt-get install qt4-dev-tools
 
-For Red Hat/Fedora based distribution::
+For Red Hat/Fedora based distribution:
 
-  yum install qt4
-  yum install qt4-devel
+.. sourcecode:: bash
 
-For Mac/OSX::
+  $ yum install qt4
+  $ yum install qt4-devel
 
-  http://qt.nokia.com/downloads/
+For Mac/OSX, see http://qt.nokia.com/downloads/
 
 Build steps
 ~~~~~~~~~~~
 
-To build NetAnim use the following commands::
+To build NetAnim use the following commands:
+
+.. sourcecode:: bash
 
-  cd netanim
-  make clean
-  qmake NetAnim.pro  (For MAC Users: qmake -spec macx-g++ NetAnim.pro)
-  make
+  $ cd netanim
+  $ make clean
+  $ qmake NetAnim.pro  (For MAC Users: qmake -spec macx-g++ NetAnim.pro)
+  $ make
 
 
 Note: qmake could be "qmake-qt4" in some systems
 
-This should create an executable named "NetAnim" in the same directory::
+This should create an executable named "NetAnim" in the same directory:
 
- john@john-VirtualBox:~/netanim$ ls -l NetAnim
+.. sourcecode:: bash
+
+  $ ls -l NetAnim
  -rwxr-xr-x 1 john john 390395 2012-05-22 08:32 NetAnim
 
 Usage
@@ -117,10 +126,12 @@
 to construct a timestamped ASCII file in XML format.
 
 Examples are found under src/netanim/examples
-Example::
+Example:
 
-  ./waf -d debug configure --enable-examples
-  ./waf --run "dumbbell-animation"
+.. sourcecode:: bash
+
+  $ ./waf -d debug configure --enable-examples
+  $ ./waf --run "dumbbell-animation"
 
 The above will create an XML file dumbbell-animation.xml
 
@@ -131,19 +142,22 @@
 2. Include the header [#include "ns3/netanim-module.h"] in your test program
 3. Add the statement
 
-::
+.. sourcecode:: cpp
 
-  AnimationInterface anim ("animation.xml"); 
-  where "animation.xml" is any arbitrary filename
+  AnimationInterface anim ("animation.xml");  // where "animation.xml" is any arbitrary filename
 
 [for versions before ns-3.13 you also have to use the line "anim.SetXMLOutput() to set the XML mode and also use anim.StartAnimation();]
 
 
 Optional
 ########
+
+.. highlight:: cpp
+
 The following are optional but useful steps::
 
-  1.anim.SetMobilityPollInterval (Seconds (1));
+  // Step 1
+  anim.SetMobilityPollInterval (Seconds (1));
 
 AnimationInterface records the position of all nodes every 250 ms by default. The statement above sets 
 the periodic interval at which AnimationInterface records the position of all nodes. If the nodes are 
@@ -151,31 +165,35 @@
 
 ::
 
-  2. anim.SetConstantPosition (Ptr< Node > n, double x, double y);
+  // Step 2
+  anim.SetConstantPosition (Ptr< Node > n, double x, double y);
 
 AnimationInterface requires that the position of all nodes be set. In |ns3| this is done by setting an associated MobilityModel. "SetConstantPosition" is a quick way to set the x-y coordinates of a node which is stationary.
 
 ::
 
-  3. anim.SetStartTime (Seconds(150)); and anim.SetStopTime (Seconds(150));
+  // Step 3
+  anim.SetStartTime (Seconds(150)); and anim.SetStopTime (Seconds(150));
 
 AnimationInterface can generate large XML files. The above statements restricts the window between which AnimationInterface does tracing. Restricting the window serves to focus only on relevant portions of the simulation and creating manageably small XML files
 
 ::
 
-  4. AnimationInterface anim ("animation.xml", 50000);
+  // Step 4
+  AnimationInterface anim ("animation.xml", 50000);
 
 Using the above constructor ensures that each animation XML trace file has only 50000 packets. For example, if AnimationInterface captures 150000 packets, using the above constructor splits the capture into 3 files
 
-animation.xml - containing the packet range 1-50000
+* animation.xml - containing the packet range 1-50000
 
-animation.xml-1 - containing the packet range 50001-100000 
+* animation.xml-1 - containing the packet range 50001-100000 
 
-animation.xml-2 - containing the packet range 100001-150000 
+* animation.xml-2 - containing the packet range 100001-150000 
 
 ::
 
-  5. anim.EnablePacketMetadata (true);
+  // Step 5
+  anim.EnablePacketMetadata (true);
 
 With the above statement, AnimationInterface records the meta-data of each packet in the xml trace file. Metadata can be used by NetAnim to provide better statistics and filter, along with providing some brief information about the packet such as TCP sequence number or source & destination IP address during packet animation.
 
@@ -229,16 +247,20 @@
 
 XML tags
 ~~~~~~~~
+.. highlight:: xml
+
 Nodes are identified by their unique Node id. The XML begins with the "information" element describing the rest of the elements
 
-1. <anim> element
+<anim> Element
+##############
 
 This is the XML root element. All other elements fall within this element.
   Attributes are::
 
     lp = Logical Processor Id (Used for distributed simulations only)
 
-2. <topology> element
+<topology> Element
+##################
 
 This elements contains the Node and Link elements.It describes, the co-ordinates of the canvas used for animation.
    Attributes are::
@@ -250,9 +272,10 @@
 
 Example::
 
- <topology minX = "-6.42025" minY = "-6.48444" maxX = "186.187" maxY = "188.049">
+  <topology minX = "-6.42025" minY = "-6.48444" maxX = "186.187" maxY = "188.049">
 
-3. <node> element
+<node> Element
+##############
 
 This element describes each Node's Id and X,Y co-ordinate (position).
   Attributes are::
@@ -265,7 +288,8 @@
 
   <node id = "8" locX = "107.599" locY = "96.9366" />
 
-4. <link> element
+<link> Element
+##############
 
 This element describes wired links between two nodes.
  Attributes are::
@@ -277,7 +301,8 @@
 
   <link fromId="0" toId="1"/>
 
-5. <p> element
+<p> Element
+###########
 
 This element describes a packet over wired links being transmitted at some node and received at another. 
 
@@ -298,7 +323,8 @@
 A packet over wired-links from Node 1 was received at Node 0. The first bit of the packet was transmitted at  the 1st second, the last bit was transmitted at the 1.000067199th second of the simulation Node 0 received the first bit of the packet at the 1.002th second and the last bit of the packet at the 1.002067199th second of the simulation
 NOTE: A packet with fromId == toId is a dummy packet used internally by the AnimationInterface. Please ignore this packet
 
-7. <wp> element
+<wp> Element
+############
 
 This element describes a packet over wireless links being transmitted at some node and received at another. 
 
diff -Naur ns-3.18.1/src/netanim/examples/uan-animation.cc ns-3.19/src/netanim/examples/uan-animation.cc
--- ns-3.18.1/src/netanim/examples/uan-animation.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/netanim/examples/uan-animation.cc	2013-12-20 09:44:50.000000000 -0800
@@ -47,7 +47,8 @@
 
 using namespace ns3;
 
-NS_LOG_COMPONENT_DEFINE ("UanCwExample");
+NS_LOG_COMPONENT_DEFINE ("UanCwExample")
+  ;
 
 NetAnimExperiment::NetAnimExperiment () 
   : m_numNodes (15),
diff -Naur ns-3.18.1/src/netanim/examples/wireless-animation.cc ns-3.19/src/netanim/examples/wireless-animation.cc
--- ns-3.18.1/src/netanim/examples/wireless-animation.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/netanim/examples/wireless-animation.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,6 +26,8 @@
 #include "ns3/mobility-module.h"
 #include "ns3/internet-module.h"
 #include "ns3/netanim-module.h"
+#include "ns3/basic-energy-source.h"
+#include "ns3/simple-device-energy-model.h"
 
 
 
@@ -115,6 +117,17 @@
   AnimationInterface::SetConstantPosition (p2pNodes.Get (1), 10, 30); 
   AnimationInterface::SetConstantPosition (csmaNodes.Get (1), 10, 33); 
 
+  Ptr<BasicEnergySource> energySource = CreateObject<BasicEnergySource>();
+  Ptr<SimpleDeviceEnergyModel> energyModel = CreateObject<SimpleDeviceEnergyModel>();
+
+  energySource->SetInitialEnergy (300);
+  energyModel->SetEnergySource (energySource);
+  energySource->AppendDeviceEnergyModel (energyModel);
+  energyModel->SetCurrentA (20);
+
+  // aggregate energy source to node
+  wifiApNode.Get (0)->AggregateObject (energySource);
+
   // Install internet stack
 
   InternetStackHelper stack;
@@ -152,7 +165,7 @@
   Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
   Simulator::Stop (Seconds (15.0));
   AnimationInterface::SetNodeDescription (wifiApNode, "AP"); // Optional
-  AnimationInterface::SetNodeDescription (wifiStaNodes, "STA"); // Optional
+  AnimationInterface::SetNodeDescription (wifiStaNodes, "STA"); //b Optional
   AnimationInterface::SetNodeDescription (csmaNodes, "CSMA"); // Optional
   AnimationInterface::SetNodeColor (wifiApNode, 0, 255, 0); // Optional
   AnimationInterface::SetNodeColor (wifiStaNodes, 255, 0, 0); // Optional
@@ -162,7 +175,7 @@
   AnimationInterface anim ("wireless-animation.xml"); // Mandatory
 
   anim.EnablePacketMetadata (true); // Optional
-  anim.EnableIpv4RouteTracking ("routingtable-wireless.xml", Seconds(0), Seconds(5), Seconds(0.25)); //Optional
+  anim.EnableIpv4RouteTracking ("routingtable-wireless.xml", Seconds (0), Seconds (5), Seconds (0.25)); //Optional
   Simulator::Run ();
   Simulator::Destroy ();
   return 0;
diff -Naur ns-3.18.1/src/netanim/model/animation-interface.cc ns-3.19/src/netanim/model/animation-interface.cc
--- ns-3.18.1/src/netanim/model/animation-interface.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/netanim/model/animation-interface.cc	2013-12-20 09:44:50.000000000 -0800
@@ -15,6 +15,7 @@
  *
  * Author: George F. Riley<riley@ece.gatech.edu>
  * Modified by: John Abraham <john.abraham@gatech.edu>
+ * Contributions: Eugene Kalishenko <ydginster@gmail.com> (Open Source and Linux Laboratory http://dev.osll.ru/)
  */
 
 // Interface between ns3 and the network animator
@@ -39,7 +40,8 @@
 #include "ns3/uan-net-device.h"
 #include "ns3/uan-mac.h"
 #include "ns3/ipv4.h"
-#include "ns3/ipv4-routing-protocol.h" 
+#include "ns3/ipv4-routing-protocol.h"
+#include "ns3/energy-source-container.h"
 
 #include <cstdio>
 #include <unistd.h>
@@ -63,11 +65,11 @@
 
 
 AnimationInterface::AnimationInterface (const std::string fn, uint64_t maxPktsPerFile, bool usingXML)
-  : m_routingF (0), m_xml (usingXML), m_mobilityPollInterval (Seconds(0.25)), 
+  : m_routingF (0), m_xml (usingXML), m_mobilityPollInterval (Seconds (0.25)), 
     m_outputFileName (fn),
     m_outputFileSet (false), gAnimUid (0), m_randomPosition (true),
     m_writeCallback (0), m_started (false), 
-    m_enablePacketMetadata (false), m_startTime (Seconds(0)), m_stopTime (Seconds(3600 * 1000)),
+    m_enablePacketMetadata (false), m_startTime (Seconds (0)), m_stopTime (Seconds (3600 * 1000)),
     m_maxPktsPerFile (maxPktsPerFile), m_originalFileName (fn),
     m_routingStopTime (Seconds (0)), m_routingFileName (""),
     m_routingPollInterval (Seconds (5))
@@ -116,7 +118,7 @@
   std::stringstream stream;
   Ptr<OutputStreamWrapper> routingstream = Create<OutputStreamWrapper> (&stream);
   ipv4->GetRoutingProtocol ()->PrintRoutingTable (routingstream);
-  return stream.str();
+  return stream.str ();
 
 }
 
@@ -315,7 +317,7 @@
 
 std::string AnimationInterface::GetNetAnimVersion ()
 {
-  return "netanim-3.103";
+  return "netanim-3.104";
 }
 
 void AnimationInterface::SetStartTime (Time t)
@@ -468,9 +470,9 @@
 Vector AnimationInterface::GetPosition (Ptr <Node> n)
 {
   #ifdef NS_LOG
-  if (m_nodeLocation.find (n->GetId()) == m_nodeLocation.end ())
+  if (m_nodeLocation.find (n->GetId ()) == m_nodeLocation.end ())
     {
-      NS_FATAL_ERROR ("Node:" <<n->GetId() << " not found in Location table");
+      NS_FATAL_ERROR ("Node:" <<n->GetId () << " not found in Location table");
     }  
   #endif
   return m_nodeLocation[n->GetId ()];
@@ -586,7 +588,7 @@
 
 std::string AnimationInterface::GetMacAddress (Ptr <NetDevice> nd)
 {
-  Address nodeAddr = nd->GetAddress();
+  Address nodeAddr = nd->GetAddress ();
   std::ostringstream oss;
   oss << nodeAddr;
   return oss.str ().substr (6); // Skip the first 6 chars to get the Mac
@@ -796,7 +798,7 @@
       uint32_t nDevices = n->GetNDevices ();
       for (uint32_t devIndex = 0; devIndex < nDevices; ++devIndex)
         {
-          Ptr <NetDevice> nd = n->GetDevice(devIndex);
+          Ptr <NetDevice> nd = n->GetDevice (devIndex);
           if (!nd)
             continue;
           Ptr<LteUeNetDevice> lteUeNetDevice = DynamicCast<LteUeNetDevice> (nd);
@@ -844,6 +846,8 @@
                    MakeCallback (&AnimationInterface::UanPhyGenTxTrace, this));
   Config::Connect ("/NodeList/*/DeviceList/*/$ns3::UanNetDevice/Phy/PhyRxBegin",
                    MakeCallback (&AnimationInterface::UanPhyGenRxTrace, this));
+  Config::Connect ("/NodeList/*/$ns3::BasicEnergySource/RemainingEnergy",
+                   MakeCallback (&AnimationInterface::RemainingEnergyTrace, this));
 
   ConnectLte ();
 
@@ -1016,6 +1020,19 @@
 }
 
 
+Ptr <Node>
+AnimationInterface::GetNodeFromContext (const std::string& context) const
+{
+  // Use "NodeList/*/ as reference
+  // where element [1] is the Node Id
+
+  std::vector <std::string> elements = GetElementsFromContext (context);
+  Ptr <Node> n = NodeList::GetNode (atoi (elements.at (1).c_str ()));
+  NS_ASSERT (n);
+
+  return n;
+}
+
 Ptr <NetDevice>
 AnimationInterface::GetNetDeviceFromContext (std::string context)
 {
@@ -1024,9 +1041,9 @@
   // element [2] is the NetDevice Id
 
   std::vector <std::string> elements = GetElementsFromContext (context);
-  Ptr <Node> n = NodeList::GetNode (atoi (elements[1].c_str ()));
-  NS_ASSERT (n);
-  return n->GetDevice (atoi (elements[3].c_str ()));
+  Ptr <Node> n = GetNodeFromContext (context);
+
+  return n->GetDevice (atoi (elements.at (3).c_str ()));
 }
 
 void AnimationInterface::AddPendingUanPacket (uint64_t AnimUid, AnimPacketInfo &pktinfo)
@@ -1123,6 +1140,27 @@
 
 }
 
+void AnimationInterface::RemainingEnergyTrace (std::string context, double previousEnergy, double currentEnergy)
+{
+  if (!m_started || !IsInTimeWindow ())
+    return;
+
+  const Ptr <const Node> node = GetNodeFromContext (context);
+  const uint32_t nodeId = node->GetId ();
+
+  NS_LOG_INFO ("Remaining energy on one of sources on node " << nodeId << ": " << currentEnergy);
+
+  const Ptr<EnergySource> energySource = node->GetObject<EnergySource> ();
+
+  NS_ASSERT (energySource);
+  // Don't call GetEnergyFraction () because of recursion
+  const double energyFraction = currentEnergy / energySource->GetInitialEnergy ();
+
+  NS_LOG_INFO ("Total energy fraction on node " << nodeId << ": " << energyFraction);
+
+  m_nodeEnergyFraction[nodeId] = energyFraction;
+  WriteNodeUpdate (nodeId);
+}
 
 void AnimationInterface::WifiPhyTxBeginTrace (std::string context,
                                           Ptr<const Packet> p)
@@ -1142,7 +1180,7 @@
   AnimPacketInfo pktinfo (ndev, Simulator::Now (), Simulator::Now (), UpdatePosition (n));
   AddPendingWifiPacket (gAnimUid, pktinfo);
   Ptr<WifiNetDevice> netDevice = DynamicCast<WifiNetDevice> (ndev);
-  Mac48Address nodeAddr = netDevice->GetMac()->GetAddress();
+  Mac48Address nodeAddr = netDevice->GetMac ()->GetAddress ();
   std::ostringstream oss; 
   oss << nodeAddr;
   m_macToNodeIdMap[oss.str ()] = n->GetId ();
@@ -1185,7 +1223,7 @@
       NS_LOG_WARN ("WifiPhyRxBeginTrace: unknown Uid");
       std::ostringstream oss;
       WifiMacHeader hdr;
-      if(!p->PeekHeader (hdr))
+      if (!p->PeekHeader (hdr))
       { 
         NS_LOG_WARN ("WifiMacHeader not present");
         return;
@@ -1589,6 +1627,14 @@
   return m_currentPktCount;
 }
 
+double AnimationInterface::GetNodeEnergyFraction (Ptr <const Node> node) const
+{
+  const EnergyFractionMap::const_iterator fractionIter = m_nodeEnergyFraction.find (node->GetId ());
+
+  NS_ASSERT (fractionIter != m_nodeEnergyFraction.end ());
+  return fractionIter->second;
+}
+
 int64_t
 AnimationInterface::AssignStreams (int64_t stream)
 {
@@ -1637,6 +1683,7 @@
     * g = Green component\n\
     * b = Blue component\n\
     * visible = Node visibility\n\
+    * rc = Residual energy (between 0 and 1)\n\
     p\n\
     * fId = From Node Id\n\
     * fbTx = First bit transmit time\n\
@@ -1736,10 +1783,7 @@
 {
   NS_ASSERT (NodeList::GetNode (nodeId));
   NS_LOG_INFO ("Setting node visibility for Node Id:" << nodeId); 
-  std::ostringstream oss;
-  oss << GetXMLOpenClose_nodeupdate (nodeId, show);
-  WriteN (oss.str (), m_f);
-
+  WriteNodeUpdate (nodeId);
 }
 
 void AnimationInterface::ShowNode (Ptr <Node> n, bool show)
@@ -1747,6 +1791,13 @@
   ShowNode (n, show);
 }
 
+void AnimationInterface::WriteNodeUpdate (uint32_t nodeId)
+{
+  std::ostringstream oss;
+  oss << GetXMLOpenClose_nodeupdate (nodeId);
+  WriteN (oss.str (), m_f);
+}
+
 void AnimationInterface::UpdateNodeColor (Ptr <Node> n, uint8_t r, uint8_t g, uint8_t b)
 {
   UpdateNodeColor (n->GetId (), r, g, b);
@@ -1758,9 +1809,7 @@
   NS_LOG_INFO ("Setting node color for Node Id:" << nodeId); 
   struct Rgb rgb = {r, g, b};
   nodeColors[nodeId] = rgb;
-  std::ostringstream oss;
-  oss << GetXMLOpenClose_nodeupdate (nodeId);
-  WriteN (oss.str (), m_f);
+  WriteNodeUpdate (nodeId);
 }
 
 
@@ -1808,7 +1857,7 @@
   /* DEBUG */
   /*
   for (std::map <P2pLinkNodeIdPair, LinkProperties>::const_iterator i = linkProperties.begin ();
-	i != linkProperties.end(); ++i)
+	i != linkProperties.end (); ++i)
    {
     P2pLinkNodeIdPair ppair = i->first;
     LinkProperties l = i->second;
@@ -1893,10 +1942,6 @@
 
 std::string AnimationInterface::GetXMLOpenClose_nodeupdate (uint32_t id, bool visible)
 {
-  struct Rgb rgb = nodeColors[id];
-  uint8_t r = rgb.r;
-  uint8_t g = rgb.g;
-  uint8_t b = rgb.b;
   std::ostringstream oss;
   oss << "<nodeupdate id=\"" << id << "\"";
   oss << " t=\"" << Simulator::Now ().GetSeconds () << "\"";
@@ -1904,16 +1949,12 @@
     oss << " visible=\"" << 1 << "\"";
   else
     oss << " visible=\"" << 0 << "\"";
-  if (nodeDescriptions.find (id) != nodeDescriptions.end ())
-    {
-      oss << " descr=\""<< nodeDescriptions[id] << "\"";
-    }
-  else
-    {
-      oss << " descr=\"\"";
-    }
-  oss << " r=\"" << (uint32_t)r << "\" "
-      << " g=\"" << (uint32_t)g << "\" b=\"" << (uint32_t)b <<"\"/>\n";
+  AppendXMLNodeDescription (oss, id);
+  AppendXMLNodeColor (oss, nodeColors[id]);
+  AppendXMLRemainingEnergy (oss, id);
+
+  oss  <<"/>\n";
+
   return oss.str ();
 
 }
@@ -1922,35 +1963,26 @@
 {
   std::ostringstream oss;
   oss <<"<node id=\"" << id << "\""; 
-  if (nodeDescriptions.find (id) != nodeDescriptions.end ())
-    {
-      oss << " descr=\""<< nodeDescriptions[id] << "\"";
-    }
-  else
-    {
-      oss << " descr=\"\"";
-    }
-  oss << " locX = \"" << locX << "\" " << "locY = \"" << locY << "\" />\n";
+  AppendXMLNodeDescription (oss, id);
+  oss << " locX = \"" << locX << "\" " << "locY = \"" << locY << "\"";
+  AppendXMLRemainingEnergy (oss, id);
+
+  oss  <<"/>\n";
+
   return oss.str ();
 }
 
 std::string AnimationInterface::GetXMLOpenClose_node (uint32_t lp, uint32_t id, double locX, double locY, struct Rgb rgb)
 {
-  uint8_t r = rgb.r;
-  uint8_t g = rgb.g;
-  uint8_t b = rgb.b;
   std::ostringstream oss;
   oss <<"<node id = \"" << id << "\"";
-  if (nodeDescriptions.find (id) != nodeDescriptions.end ())
-    {
-      oss << " descr=\""<< nodeDescriptions[id] << "\"";
-    }
-  else
-    {
-      oss << " descr=\"\"";
-    }
-  oss << " locX=\"" << locX << "\" " << "locY=\"" << locY << "\"" << " r=\"" << (uint32_t)r << "\" " 
-    << " g=\"" << (uint32_t)g << "\" b=\"" << (uint32_t)b <<"\"/>\n";
+  AppendXMLNodeDescription (oss, id);
+  oss << " locX=\"" << locX << "\" " << "locY=\"" << locY << "\"";
+  AppendXMLNodeColor (oss, rgb);
+  AppendXMLRemainingEnergy (oss, id);
+
+  oss  <<"/>\n";
+
   return oss.str ();
 }
 
@@ -1982,11 +2014,11 @@
 
   P2pLinkNodeIdPair p1 = { fromId, toId };
   P2pLinkNodeIdPair p2 = { toId, fromId };
-  if (linkProperties.find (p1) != linkProperties.end())
+  if (linkProperties.find (p1) != linkProperties.end ())
     {
       lprop = linkProperties[p1];
     }
-  else if (linkProperties.find (p2) != linkProperties.end())
+  else if (linkProperties.find (p2) != linkProperties.end ())
     {
       lprop = linkProperties[p2];
     }
@@ -2006,7 +2038,7 @@
   oss << "<p fId=\"" << fromId
       << "\" fbTx=\"" << fbTx
       << "\" lbTx=\"" << lbTx
-      << (auxInfo.empty()?"":"\" aux=\"") << auxInfo.c_str () << "\">";
+      << (auxInfo.empty ()?"":"\" aux=\"") << auxInfo.c_str () << "\">";
   return oss.str ();
 }
 
@@ -2105,7 +2137,7 @@
 }
 
 
-std::vector<std::string> AnimationInterface::GetElementsFromContext (std::string context)
+const std::vector<std::string> AnimationInterface::GetElementsFromContext (const std::string& context) const
 {
   std::vector <std::string> elements;
   size_t pos1=0, pos2;
@@ -2120,6 +2152,39 @@
   return elements;
 }
 
+void AnimationInterface::AppendXMLNodeDescription (std::ostream& ostream, uint32_t id) const
+{
+  if (nodeDescriptions.find (id) != nodeDescriptions.end ())
+    {
+      ostream << " descr=\""<< nodeDescriptions[id] << "\"";
+    }
+  else
+    {
+      ostream << " descr=\"\"";
+    }
+}
+
+void AnimationInterface::AppendXMLNodeColor (std::ostream& ostream, const Rgb& color) const
+{
+  const uint8_t r = color.r;
+  const uint8_t g = color.g;
+  const uint8_t b = color.b;
+
+  ostream << " r=\"" << (uint32_t)r << "\" "
+          << " g=\"" << (uint32_t)g << "\" "
+          << " b=\"" << (uint32_t)b <<"\" ";
+}
+
+void AnimationInterface::AppendXMLRemainingEnergy (std::ostream& ostream, uint32_t id) const
+{
+  const EnergyFractionMap::const_iterator fractionIter = m_nodeEnergyFraction.find (id);
+
+  if (fractionIter != m_nodeEnergyFraction.end ())
+    ostream << "rc = \"" << fractionIter->second <<"\" ";
+  else if (NodeList::GetNode (id)->GetObject<EnergySource>())
+    ostream << "rc = \"1\" ";
+}
+
 TypeId
 AnimByteTag::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/netanim/model/animation-interface.h ns-3.19/src/netanim/model/animation-interface.h
--- ns-3.18.1/src/netanim/model/animation-interface.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/netanim/model/animation-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -14,6 +14,7 @@
  *
  * Author: George F. Riley<riley@ece.gatech.edu>
  * Author: John Abraham <john.abraham@gatech.edu>
+ * Contributions: Eugene Kalishenko <ydginster@gmail.com> (Open Source and Linux Laboratory http://dev.osll.ru/)
  */
 
 // Interface between ns3 and the network animator
@@ -89,7 +90,7 @@
 } Ipv4RoutePathElement;
 
 /**
- * \defgroup netanim Netanim
+ * \defgroup netanim Network Animation
  *
  * This section documents the API of the ns-3 netanim module. For a generic functional description, please refer to the ns-3 manual.
  */
@@ -137,7 +138,7 @@
    *
    * \returns reference to this AnimationInterface object
    */
-  AnimationInterface & EnableIpv4RouteTracking (std::string fileName, Time startTime, Time stopTime, Time pollInterval = Seconds(5));
+  AnimationInterface & EnableIpv4RouteTracking (std::string fileName, Time startTime, Time stopTime, Time pollInterval = Seconds (5));
 
   /**
    * \brief Enable tracking of the Ipv4 routing table for a set of Nodes
@@ -151,7 +152,7 @@
    *
    * \returns reference to this AnimationInterface object
    */
-  AnimationInterface & EnableIpv4RouteTracking (std::string fileName, Time startTime, Time stopTime, NodeContainer nc, Time pollInterval = Seconds(5));
+  AnimationInterface & EnableIpv4RouteTracking (std::string fileName, Time startTime, Time stopTime, NodeContainer nc, Time pollInterval = Seconds (5));
 
   /**
    * \brief Check if AnimationInterface is initialized
@@ -233,7 +234,7 @@
    * \param minX X value of the lower left corner
    * \param minY Y value of the lower left corner
    * \param maxX X value of the upper right corner
-   * \param maxX Y value of the upper right corner
+   * \param maxY Y value of the upper right corner
    *
    */
   static void SetBoundary (double minX, double minY, double maxX, double maxY);
@@ -320,7 +321,7 @@
 
   /**
    * \brief Helper function to set the color of nodes in a container
-   * \param n Ptr to the node
+   * \param nc A Node Container of Nodes 
    * \param r Red component value (0-255)
    * \param g Green component value (0-255)
    * \param b Blue component value (0-255)
@@ -410,6 +411,15 @@
    */
   uint64_t GetTracePktCount ();
 
+  /**
+   *
+   * \brief Get node's energy fraction (This used only for testing)
+   *
+   * returns current node's remaining energy (between [0, 1])
+   *
+   */
+  double GetNodeEnergyFraction (Ptr <const Node> node) const;
+
  /**
   * Assign a fixed random variable stream number to the random variables
   * used by this model.  Return the number of streams (possibly zero) that
@@ -542,6 +552,8 @@
   void UanPhyGenRxTrace (std::string context,
                          Ptr<const Packet>);
 
+  void RemainingEnergyTrace (std::string context, double previousEnergy, double currentEnergy);
+
   void MobilityCourseChangeTrace (Ptr <const MobilityModel> mob);
 
   // Write a string to the specified handle;
@@ -606,20 +618,26 @@
   bool IsInTimeWindow ();
 
   // Path helper
-  std::vector<std::string> GetElementsFromContext (std::string context);
+  const std::vector<std::string> GetElementsFromContext (const std::string& context) const;
+  Ptr <Node> GetNodeFromContext (const std::string& context) const;
   Ptr <NetDevice> GetNetDeviceFromContext (std::string context);
 
+  typedef std::map <uint32_t, double> EnergyFractionMap;
+
   static std::map <uint32_t, Rgb> nodeColors;
   static std::map <uint32_t, std::string> nodeDescriptions;
   static std::map <P2pLinkNodeIdPair, LinkProperties, LinkPairCompare> linkProperties;
+  EnergyFractionMap m_nodeEnergyFraction;
   uint64_t m_currentPktCount;
 
-  void StartNewTraceFile();
+  void StartNewTraceFile ();
 
   std::string GetMacAddress (Ptr <NetDevice> nd);
   std::string GetIpv4Address (Ptr <NetDevice> nd);
   void WriteNonP2pLinkProperties (uint32_t id, std::string ipv4Address, std::string channelType);
 
+  void WriteNodeUpdate (uint32_t nodeId);
+
   std::string GetNetAnimVersion ();
 
   // XML helpers
@@ -651,7 +669,9 @@
   std::string GetXMLOpenClose_routing (uint32_t id, std::string routingInfo);
   std::string GetXMLOpenClose_rp (uint32_t nodeId, std::string destination, Ipv4RoutePathElements rpElements);
 
-
+  void AppendXMLNodeDescription (std::ostream& ostream, uint32_t id) const;
+  void AppendXMLNodeColor (std::ostream& ostream, const Rgb& color) const;
+  void AppendXMLRemainingEnergy (std::ostream& ostream, uint32_t id) const;
 
   /// Provides uniform random variables.
   Ptr<UniformRandomVariable> m_uniformRandomVariable;  
diff -Naur ns-3.18.1/src/netanim/test/netanim-test.cc ns-3.19/src/netanim/test/netanim-test.cc
--- ns-3.18.1/src/netanim/test/netanim-test.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/netanim/test/netanim-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -14,6 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: John Abraham <john.abraham@gatech.edu>
+ * Contributions: Eugene Kalishenko <ydginster@gmail.com> (Open Source and Linux Laboratory http://dev.osll.ru/)
  */
 
 #include <iostream>
@@ -26,21 +27,23 @@
 #include "ns3/netanim-module.h"
 #include "ns3/applications-module.h"
 #include "ns3/point-to-point-layout-module.h"
+#include "ns3/basic-energy-source.h"
+#include "ns3/simple-device-energy-model.h"
 
 namespace ns3 {
 
-class AnimationInterfaceTestCase : public TestCase
+class AbstractAnimationInterfaceTestCase : public TestCase
 {
 public:
   /**
    * \brief Constructor.
    */
-  AnimationInterfaceTestCase ();
+  AbstractAnimationInterfaceTestCase (std::string name);
   /**
    * \brief Destructor.
    */
   virtual
-  ~AnimationInterfaceTestCase ();
+  ~AbstractAnimationInterfaceTestCase ();
   /**
    * \brief Run unit tests for this class.
    * \return false if all tests have passed, false otherwise
@@ -48,33 +51,96 @@
   virtual void
   DoRun (void);
 
+protected:
+
+  NodeContainer m_nodes;
+  AnimationInterface* m_anim;
+
+private:
+
+  virtual void
+  PrepareNetwork () = 0;
+
+  virtual void
+  CheckLogic () = 0;
+
+  virtual void
+  CheckFileExistence ();
+
+  const char* m_traceFileName;
 };
 
-AnimationInterfaceTestCase::AnimationInterfaceTestCase () :
-  TestCase ("Verify AnimationInterface")
+AbstractAnimationInterfaceTestCase::AbstractAnimationInterfaceTestCase (std::string name) :
+  TestCase (name), m_anim (NULL), m_traceFileName ("netanim-test.xml")
 {
 }
 
-AnimationInterfaceTestCase::~AnimationInterfaceTestCase ()
+AbstractAnimationInterfaceTestCase::~AbstractAnimationInterfaceTestCase ()
+{
+  delete m_anim;
+}
+
+void
+AbstractAnimationInterfaceTestCase::DoRun (void)
+{
+  PrepareNetwork ();
+
+  m_anim = new AnimationInterface (m_traceFileName);
+
+  Simulator::Run ();
+  CheckLogic ();
+  CheckFileExistence ();
+  Simulator::Destroy ();
+}
+
+void
+AbstractAnimationInterfaceTestCase::CheckFileExistence ()
+{
+  FILE * fp = fopen (m_traceFileName, "r");
+  NS_TEST_ASSERT_MSG_NE (fp, 0, "Trace file was not created");
+  fclose (fp);
+  unlink (m_traceFileName);
+}
+
+class AnimationInterfaceTestCase : public AbstractAnimationInterfaceTestCase
+{
+public:
+  /**
+   * \brief Constructor.
+   */
+  AnimationInterfaceTestCase ();
+
+private:
+
+  virtual void
+  PrepareNetwork ();
+
+  virtual void
+  CheckLogic ();
+
+};
+
+AnimationInterfaceTestCase::AnimationInterfaceTestCase () :
+  AbstractAnimationInterfaceTestCase ("Verify AnimationInterface")
 {
 }
+
 void
-AnimationInterfaceTestCase::DoRun (void)
+AnimationInterfaceTestCase::PrepareNetwork (void)
 {
-  NodeContainer nodes;
-  nodes.Create (2);
-  AnimationInterface::SetConstantPosition (nodes.Get (0), 0 , 10);
-  AnimationInterface::SetConstantPosition (nodes.Get (1), 1 , 10);
+  m_nodes.Create (2);
+  AnimationInterface::SetConstantPosition (m_nodes.Get (0), 0 , 10);
+  AnimationInterface::SetConstantPosition (m_nodes.Get (1), 1 , 10);
 
   PointToPointHelper pointToPoint;
   pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
   pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms"));
 
   NetDeviceContainer devices;
-  devices = pointToPoint.Install (nodes);
+  devices = pointToPoint.Install (m_nodes);
 
   InternetStackHelper stack;
-  stack.Install (nodes);
+  stack.Install (m_nodes);
 
   Ipv4AddressHelper address;
   address.SetBase ("10.1.1.0", "255.255.255.0");
@@ -83,7 +149,7 @@
 
   UdpEchoServerHelper echoServer (9);
 
-  ApplicationContainer serverApps = echoServer.Install (nodes.Get (1));
+  ApplicationContainer serverApps = echoServer.Install (m_nodes.Get (1));
   serverApps.Start (Seconds (1.0));
   serverApps.Stop (Seconds (10.0));
 
@@ -92,18 +158,74 @@
   echoClient.SetAttribute ("Interval", TimeValue (Seconds (1.0)));
   echoClient.SetAttribute ("PacketSize", UintegerValue (1024));
 
-  ApplicationContainer clientApps = echoClient.Install (nodes.Get (0));
+  ApplicationContainer clientApps = echoClient.Install (m_nodes.Get (0));
   clientApps.Start (Seconds (2.0));
   clientApps.Stop (Seconds (10.0));
-  std::string traceFileName = "netanim-test.xml";
-  AnimationInterface anim(traceFileName.c_str ());
-  Simulator::Run ();
-  NS_TEST_ASSERT_MSG_EQ (anim.GetTracePktCount (), 32, "Expected 32 packets traced");
-  FILE * fp = fopen (traceFileName.c_str (), "r");
-  NS_TEST_ASSERT_MSG_NE (fp, 0, "Trace file was not created");
-  fclose (fp);
-  unlink (traceFileName.c_str ());
-  Simulator::Destroy ();
+}
+
+void
+AnimationInterfaceTestCase::CheckLogic (void)
+{
+  NS_TEST_ASSERT_MSG_EQ (m_anim->GetTracePktCount (), 32, "Expected 32 packets traced");
+}
+
+class AnimationRemainingEnergyTestCase : public AbstractAnimationInterfaceTestCase
+{
+public:
+  /**
+   * \brief Constructor.
+   */
+  AnimationRemainingEnergyTestCase ();
+
+private:
+
+  virtual void
+  PrepareNetwork ();
+
+  virtual void
+  CheckLogic ();
+
+  Ptr<BasicEnergySource> m_energySource;
+  Ptr<SimpleDeviceEnergyModel> m_energyModel;
+  const double m_initialEnergy;
+};
+
+AnimationRemainingEnergyTestCase::AnimationRemainingEnergyTestCase () :
+  AbstractAnimationInterfaceTestCase ("Verify Remaining energy tracing"),
+  m_initialEnergy (100)
+{
+}
+
+void
+AnimationRemainingEnergyTestCase::PrepareNetwork (void)
+{
+  m_energySource = CreateObject<BasicEnergySource>();
+  m_energyModel = CreateObject<SimpleDeviceEnergyModel>();
+
+  m_energySource->SetInitialEnergy (m_initialEnergy);
+  m_energyModel->SetEnergySource (m_energySource);
+  m_energySource->AppendDeviceEnergyModel (m_energyModel);
+  m_energyModel->SetCurrentA (20);
+
+  m_nodes.Create (1);
+  AnimationInterface::SetConstantPosition (m_nodes.Get (0), 0 , 10);
+
+  // aggregate energy source to node
+  m_nodes.Get (0)->AggregateObject (m_energySource);
+  // once node's energy will be depleted according to the model
+  Simulator::Stop (Seconds (2));
+}
+
+void
+AnimationRemainingEnergyTestCase::CheckLogic (void)
+{
+  const double remainingEnergy = m_energySource->GetRemainingEnergy ();
+
+  NS_TEST_ASSERT_MSG_EQ ((remainingEnergy < m_initialEnergy), true, "Energy hasn't depleted!");
+  NS_TEST_ASSERT_MSG_EQ_TOL (m_anim->GetNodeEnergyFraction (m_nodes.Get (0)),
+                            remainingEnergy / m_initialEnergy,
+                            1.0e-13,
+                            "Wrong remaining energy value was traced");
 }
 
 static class AnimationInterfaceTestSuite : public TestSuite
@@ -113,6 +235,7 @@
     TestSuite ("animation-interface", UNIT)
   {
     AddTestCase (new AnimationInterfaceTestCase (), TestCase::QUICK);
+    AddTestCase (new AnimationRemainingEnergyTestCase (), TestCase::QUICK);
   }
 } g_animationInterfaceTestSuite;
 
diff -Naur ns-3.18.1/src/netanim/wscript ns-3.19/src/netanim/wscript
--- ns-3.18.1/src/netanim/wscript	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/netanim/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -3,11 +3,11 @@
 import wutils
 
 # Required NetAnim version
-NETANIM_RELEASE_NAME = "netanim-3.103"
+NETANIM_RELEASE_NAME = "netanim-3.104"
 
 
 def build (bld) :
-	module = bld.create_ns3_module ('netanim', ['internet', 'mobility', 'wimax', 'wifi', 'csma', 'lte', 'uan'])
+	module = bld.create_ns3_module ('netanim', ['internet', 'mobility', 'wimax', 'wifi', 'csma', 'lte', 'uan', 'energy'])
 	module.includes = '.'
 	module.source = [
 			  'model/animation-interface.cc',
diff -Naur ns-3.18.1/src/network/bindings/modulegen__gcc_ILP32.py ns-3.19/src/network/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/network/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -267,7 +267,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1985,10 +1985,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -5402,6 +5403,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5412,6 +5418,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5427,6 +5438,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5452,6 +5468,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -9074,7 +9095,8 @@
     ## simple-channel.h (module 'network'): void ns3::SimpleChannel::Add(ns3::Ptr<ns3::SimpleNetDevice> device) [member function]
     cls.add_method('Add', 
                    'void', 
-                   [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')])
+                   [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')], 
+                   is_virtual=True)
     ## simple-channel.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::SimpleChannel::GetDevice(uint32_t i) const [member function]
     cls.add_method('GetDevice', 
                    'ns3::Ptr< ns3::NetDevice >', 
@@ -9093,7 +9115,8 @@
     ## simple-channel.h (module 'network'): void ns3::SimpleChannel::Send(ns3::Ptr<ns3::Packet> p, uint16_t protocol, ns3::Mac48Address to, ns3::Mac48Address from, ns3::Ptr<ns3::SimpleNetDevice> sender) [member function]
     cls.add_method('Send', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')])
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')], 
+                   is_virtual=True)
     return
 
 def register_Ns3SimpleNetDevice_methods(root_module, cls):
@@ -9414,14 +9437,14 @@
     cls.add_method('SetBurstRate', 
                    'void', 
                    [param('double', 'rate')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> burstSz) [member function]
     cls.add_method('SetRandomBurstSize', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'burstSz')])
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> ranVar) [member function]
     cls.add_method('SetRandomVariable', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'ranVar')])
     ## error-model.h (module 'network'): bool ns3::BurstErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('DoCorrupt', 
                    'bool', 
@@ -9666,6 +9689,10 @@
 
 def register_functions(root_module):
     module = root_module
+    ## crc32.h (module 'network'): extern uint32_t ns3::CRC32Calculate(uint8_t const * data, int length) [free function]
+    module.add_function('CRC32Calculate', 
+                        'uint32_t', 
+                        [param('uint8_t const *', 'data'), param('int', 'length')])
     ## address.h (module 'network'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeAddressChecker() [free function]
     module.add_function('MakeAddressChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
diff -Naur ns-3.18.1/src/network/bindings/modulegen__gcc_LP64.py ns-3.19/src/network/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/network/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -267,7 +267,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1985,10 +1985,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -5402,6 +5403,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5412,6 +5418,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5427,6 +5438,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5452,6 +5468,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -9074,7 +9095,8 @@
     ## simple-channel.h (module 'network'): void ns3::SimpleChannel::Add(ns3::Ptr<ns3::SimpleNetDevice> device) [member function]
     cls.add_method('Add', 
                    'void', 
-                   [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')])
+                   [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')], 
+                   is_virtual=True)
     ## simple-channel.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::SimpleChannel::GetDevice(uint32_t i) const [member function]
     cls.add_method('GetDevice', 
                    'ns3::Ptr< ns3::NetDevice >', 
@@ -9093,7 +9115,8 @@
     ## simple-channel.h (module 'network'): void ns3::SimpleChannel::Send(ns3::Ptr<ns3::Packet> p, uint16_t protocol, ns3::Mac48Address to, ns3::Mac48Address from, ns3::Ptr<ns3::SimpleNetDevice> sender) [member function]
     cls.add_method('Send', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')])
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')], 
+                   is_virtual=True)
     return
 
 def register_Ns3SimpleNetDevice_methods(root_module, cls):
@@ -9414,14 +9437,14 @@
     cls.add_method('SetBurstRate', 
                    'void', 
                    [param('double', 'rate')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> burstSz) [member function]
     cls.add_method('SetRandomBurstSize', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'burstSz')])
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> ranVar) [member function]
     cls.add_method('SetRandomVariable', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'ranVar')])
     ## error-model.h (module 'network'): bool ns3::BurstErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('DoCorrupt', 
                    'bool', 
@@ -9666,6 +9689,10 @@
 
 def register_functions(root_module):
     module = root_module
+    ## crc32.h (module 'network'): extern uint32_t ns3::CRC32Calculate(uint8_t const * data, int length) [free function]
+    module.add_function('CRC32Calculate', 
+                        'uint32_t', 
+                        [param('uint8_t const *', 'data'), param('int', 'length')])
     ## address.h (module 'network'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeAddressChecker() [free function]
     module.add_function('MakeAddressChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
diff -Naur ns-3.18.1/src/network/doc/packets.rst ns-3.19/src/network/doc/packets.rst
--- ns-3.18.1/src/network/doc/packets.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/doc/packets.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Packets
 -------
@@ -161,7 +162,7 @@
   Ptr<Packet> pkt = Create<Packet> ();
 
 What is the Uid (unique Id)?  It is an internal id that the system uses to
-identify packets.  It can be fetched via the following method:::
+identify packets.  It can be fetched via the following method::
 
   uint32_t uid = pkt->GetUid ();
 
@@ -179,14 +180,14 @@
 behave, when delays such as serialization or transmission delays are computed,
 to have a certain number of payload bytes, but the bytes will only be allocated
 on-demand when needed).  The command to do this is, when the packet is
-created:::
+created::
 
   Ptr<Packet> pkt = Create<Packet> (N);
 
 where N is a positive integer.  
 
 The packet now has a size of N bytes, which can be verified by the GetSize()
-method:::
+method::
 
   /**
    * \returns the size in bytes of the packet (including the zero-filled
@@ -196,11 +197,11 @@
 
 You can also initialize a packet with a character buffer. The input
 data is copied and the input buffer is untouched. The constructor
-applied is:::
+applied is::
 
   Packet (uint8_t const *buffer, uint32_t size);
 
-Here is an example:::
+Here is an example::
 
   Ptr<Packet> pkt1 = Create<Packet> (reinterpret_cast<const uint8_t*> ("hello"), 5);
 
@@ -421,14 +422,14 @@
   PacketTagIterator GetPacketTagIterator (void) const;
 
 Here is a simple example illustrating the use of tags from the
-code in ``src/internet/model/udp-socket-impl.cc``:::
+code in ``src/internet/model/udp-socket-impl.cc``::
 
   Ptr<Packet> p;  // pointer to a pre-existing packet
   SocketIpTtlTag tag
   tag.SetTtl (m_ipMulticastTtl); // Convey the TTL from UDP layer to IP layer
   p->AddPacketTag (tag);
 
-This tag is read at the IP layer, then stripped (``src/internet/model/ipv4-l3-protocol.cc``):::
+This tag is read at the IP layer, then stripped (``src/internet/model/ipv4-l3-protocol.cc``)::
 
   uint8_t ttl = m_defaultTtl;
   SocketIpTtlTag tag;
@@ -443,7 +444,7 @@
 
 Packets may be fragmented or merged together.  For example, to fragment a packet
 ``p`` of 90 bytes into two packets, one containing the first 10 bytes and the
-other containing the remaining 80, one may call the following code:::
+other containing the remaining 80, one may call the following code::
 
   Ptr<Packet> frag0 = p->CreateFragment (0, 10);
   Ptr<Packet> frag1 = p->CreateFragment (10, 90);
@@ -451,7 +452,7 @@
 As discussed above, the packet tags from ``p`` will follow to both packet
 fragments, and the byte tags will follow the byte ranges as needed.
 
-Now, to put them back together:::
+Now, to put them back together::
 
   frag0->AddAtEnd (frag1);
 
@@ -480,7 +481,7 @@
 the program.
 
 To enable this operation, users will typically insert one or both of these
-statements at the beginning of their programs:::
+statements at the beginning of their programs::
 
   Packet::EnablePrinting ();
   Packet::EnableChecking ();
@@ -496,7 +497,7 @@
 Private member variables
 ++++++++++++++++++++++++
 
-A Packet object's interface provides access to some private data:::
+A Packet object's interface provides access to some private data::
 
   Buffer m_buffer;
   ByteTagList m_byteTagList;
@@ -601,7 +602,7 @@
 Tags are found by the unique mapping between the Tag type and
 its underlying id. This is why at most one instance of any Tag
 can be stored in a packet. The mapping between Tag type and 
-underlying id is performed by a registration as follows:::
+underlying id is performed by a registration as follows::
 
     /* A sample Tag implementation
      */
diff -Naur ns-3.18.1/src/network/doc/queue.rst ns-3.19/src/network/doc/queue.rst
--- ns-3.18.1/src/network/doc/queue.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/doc/queue.rst	2013-12-20 09:44:50.000000000 -0800
@@ -85,7 +85,7 @@
 the queue type and attributes from the helper, such as this example
 from ``src/network/examples/red-tests.cc``:
 
-:: 
+.. sourcecode:: cpp
 
   PointToPointHelper p2p;
 
@@ -134,7 +134,7 @@
 the Enqueue, Dequeue, and Drop traces of these queues and print out 
 trace statements, such as the following from ``examples/udp/udp-echo.cc``:
 
-::
+.. sourcecode:: text
 
   + 2 /NodeList/0/DeviceList/1/$ns3::CsmaNetDevice/TxQueue/Enqueue ns3::EthernetHeader 
   ( length/type=0x806, source=00:00:00:00:00:01, destination=ff:ff:ff:ff:ff:ff) 
diff -Naur ns-3.18.1/src/network/doc/sockets-api.rst ns-3.19/src/network/doc/sockets-api.rst
--- ns-3.18.1/src/network/doc/sockets-api.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/doc/sockets-api.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 .. _Sockets-APIs:
 
@@ -104,14 +105,14 @@
 =============
 
 Below is a typical sequence of socket calls for a TCP client in a
-real implementation:
+real implementation::
 
-* ``sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);``
-* ``bind(sock, ...);``
-* ``connect(sock, ...);``
-* ``send(sock, ...);``
-* ``recv(sock, ...);``
-* ``close(sock);``
+    sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+    bind(sock, ...);
+    connect(sock, ...);
+    send(sock, ...);
+    recv(sock, ...);
+    close(sock);
 
 There are analogs to all of these calls in ns-3, but we will focus on  
 two aspects here.  First, most usage of sockets in real systems 
@@ -127,16 +128,16 @@
 :cpp:func:`ns3::Socket::SetSendCallback` callback is invoked.  
 An application can also ask the socket how much space is available 
 by calling :cpp:func:`ns3::Socket::GetTxAvailable`.  A typical sequence 
-of events for sending data (ignoring connection setup) might be:::
+of events for sending data (ignoring connection setup) might be::
 
-    * ``SetSendCallback (MakeCallback(&HandleSendCallback));``
-    * ``Send ();``
-    * ``Send ();``
-    * ...
-    * Send fails because buffer is full
-    * wait until :cpp:func:`HandleSendCallback` is called
-    * :cpp:func:`HandleSendCallback` is called by socket, since space now available
-    * ``Send (); // Start sending again``
+    SetSendCallback (MakeCallback(&HandleSendCallback));
+    Send ();
+    Send ();
+    ...
+    // Send fails because buffer is full
+    // Wait until HandleSendCallback is called
+    // HandleSendCallback is called by socket, since space now available
+    Send (); // Start sending again
 
 Similarly, on the receive side, the socket user does not block on
 a call to ``recv()``.  Instead, the application sets a callback
diff -Naur ns-3.18.1/src/network/helper/trace-helper.h ns-3.19/src/network/helper/trace-helper.h
--- ns-3.18.1/src/network/helper/trace-helper.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/helper/trace-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -67,23 +67,42 @@
   /**
    * @brief Let the pcap helper figure out a reasonable filename to use for a
    * pcap file associated with a device.
+   * 
+   * @param prefix prefix string
+   * @param device NetDevice
+   * @param useObjectNames use node and device names instead of indexes
    */
   std::string GetFilenameFromDevice (std::string prefix, Ptr<NetDevice> device, bool useObjectNames = true);
 
   /**
    * @brief Let the pcap helper figure out a reasonable filename to use for the
    * pcap file associated with a node.
+   * 
+   * @param prefix prefix string
+   * @param object interface (such as Ipv4Interface or Ipv6Interface)
+   * @param interface interface id
+   * @param useObjectNames use node and device names instead of indexes
    */
   std::string GetFilenameFromInterfacePair (std::string prefix, Ptr<Object> object, 
                                             uint32_t interface, bool useObjectNames = true);
 
   /**
    * @brief Create and initialize a pcap file.
+   * 
+   * @param filename file name
+   * @param filemode file mode
+   * @param dataLinkType data link type of packet data
+   * @param snapLen maximum length of packet data stored in records
+   * @param tzCorrection time zone correction to be applied to timestamps of packets
    */
   Ptr<PcapFileWrapper> CreateFile (std::string filename, std::ios::openmode filemode,
                                    uint32_t dataLinkType,  uint32_t snapLen = 65535, int32_t tzCorrection = 0);
   /**
    * @brief Hook a trace source to the default trace sink
+   * 
+   * @param object object
+   * @param traceName trace source name
+   * @param file file wrapper
    */
   template <typename T> void HookDefaultSink (Ptr<T> object, std::string traceName, Ptr<PcapFileWrapper> file);
 
@@ -122,12 +141,21 @@
   /**
    * @brief Let the ascii trace helper figure out a reasonable filename to use
    * for an ascii trace file associated with a device.
+   * 
+   * @param prefix prefix string
+   * @param device NetDevice
+   * @param useObjectNames use node and device names instead of indexes
    */
   std::string GetFilenameFromDevice (std::string prefix, Ptr<NetDevice> device, bool useObjectNames = true);
 
   /**
    * @brief Let the ascii trace helper figure out a reasonable filename to use
    * for an ascii trace file associated with a node.
+   * 
+   * @param prefix prefix string
+   * @param object interface (such as Ipv4Interface or Ipv6Interface)
+   * @param interface interface id
+   * @param useObjectNames use node and device names instead of indexes
    */
   std::string GetFilenameFromInterfacePair (std::string prefix, Ptr<Object> object, 
                                             uint32_t interface, bool useObjectNames = true);
@@ -151,6 +179,9 @@
    * run into object lifetime issues.  Ns-3 has a nice reference counted object
    * that can solve the problem so we use one of those to carry the stream
    * around and deal with the lifetime issues.
+   * 
+   * @param filename file name
+   * @param filemode file mode
    */
   Ptr<OutputStreamWrapper> CreateFileStream (std::string filename, 
                                              std::ios::openmode filemode = std::ios::out);
@@ -158,6 +189,10 @@
   /**
    * @brief Hook a trace source to the default enqueue operation trace sink that
    * does not accept nor log a trace context.
+   * 
+   * @param object object
+   * @param traceName trace source name
+   * @param stream output stream wrapper
    */
   template <typename T> 
   void HookDefaultEnqueueSinkWithoutContext (Ptr<T> object, std::string traceName, Ptr<OutputStreamWrapper> stream);
@@ -165,6 +200,11 @@
   /**
    * @brief Hook a trace source to the default enqueue operation trace sink that
    * does accept and log a trace context.
+   * 
+   * @param object object
+   * @param context context string
+   * @param traceName trace source name
+   * @param stream output stream wrapper
    */
   template <typename T> 
   void HookDefaultEnqueueSinkWithContext (Ptr<T> object, 
@@ -173,6 +213,10 @@
   /**
    * @brief Hook a trace source to the default drop operation trace sink that 
    * does not accept nor log a trace context.
+   * 
+   * @param object object
+   * @param traceName trace source name
+   * @param stream output stream wrapper
    */
   template <typename T> 
   void HookDefaultDropSinkWithoutContext (Ptr<T> object, std::string traceName, Ptr<OutputStreamWrapper> stream);
@@ -180,6 +224,11 @@
   /**
    * @brief Hook a trace source to the default drop operation trace sink that 
    * does accept and log a trace context.
+   * 
+   * @param object object
+   * @param context context string
+   * @param traceName trace source name
+   * @param stream output stream wrapper
    */
   template <typename T> 
   void HookDefaultDropSinkWithContext (Ptr<T> object, 
@@ -188,6 +237,10 @@
   /**
    * @brief Hook a trace source to the default dequeue operation trace sink
    * that does not accept nor log a trace context.
+   * 
+   * @param object object
+   * @param traceName trace source name
+   * @param stream output stream wrapper
    */
   template <typename T> 
   void HookDefaultDequeueSinkWithoutContext (Ptr<T> object, std::string traceName, Ptr<OutputStreamWrapper> stream);
@@ -195,6 +248,11 @@
   /**
    * @brief Hook a trace source to the default dequeue operation trace sink
    * that does accept and log a trace context.
+   * 
+   * @param object object
+   * @param context context string
+   * @param traceName trace source name
+   * @param stream output stream wrapper
    */
   template <typename T> 
   void HookDefaultDequeueSinkWithContext (Ptr<T> object, 
@@ -203,6 +261,10 @@
   /**
    * @brief Hook a trace source to the default receive operation trace sink
    * that does not accept nor log a trace context.
+   * 
+   * @param object object
+   * @param traceName trace source name
+   * @param stream output stream wrapper
    */
   template <typename T> 
   void HookDefaultReceiveSinkWithoutContext (Ptr<T> object, std::string traceName, Ptr<OutputStreamWrapper> stream);
@@ -210,6 +272,11 @@
   /**
    * @brief Hook a trace source to the default receive operation trace sink
    * that does accept and log a trace context.
+   * 
+   * @param object object
+   * @param context context string
+   * @param traceName trace source name
+   * @param stream output stream wrapper
    */
   template <typename T> 
   void HookDefaultReceiveSinkWithContext (Ptr<T> object, 
diff -Naur ns-3.18.1/src/network/model/address.cc ns-3.19/src/network/model/address.cc
--- ns-3.18.1/src/network/model/address.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/address.cc	2013-12-20 09:44:50.000000000 -0800
@@ -169,7 +169,7 @@
   buffer.Read (m_data, m_len);
 }
 
-ATTRIBUTE_HELPER_CPP (Address);
+ATTRIBUTE_HELPER_CPP (Address);   /// Macro to make help make class an ns-3 attribute
 
 
 bool operator == (const Address &a, const Address &b)
diff -Naur ns-3.18.1/src/network/model/address.h ns-3.19/src/network/model/address.h
--- ns-3.18.1/src/network/model/address.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/address.h	2013-12-20 09:44:50.000000000 -0800
@@ -224,7 +224,7 @@
  * \brief hold objects of type ns3::Address
  */
 
-ATTRIBUTE_HELPER_HEADER (Address);
+ATTRIBUTE_HELPER_HEADER (Address);  /// Macro to make help make class an ns-3 attribute
 
 bool operator == (const Address &a, const Address &b);
 bool operator != (const Address &a, const Address &b);
diff -Naur ns-3.18.1/src/network/model/application.cc ns-3.19/src/network/model/application.cc
--- ns-3.18.1/src/network/model/application.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/application.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Application);
+NS_OBJECT_ENSURE_REGISTERED (Application)
+  ;
 
 // Application Methods
 
diff -Naur ns-3.18.1/src/network/model/application.h ns-3.19/src/network/model/application.h
--- ns-3.18.1/src/network/model/application.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/application.h	2013-12-20 09:44:50.000000000 -0800
@@ -123,11 +123,11 @@
   virtual void DoDispose (void);
   virtual void DoInitialize (void);
 
-  Ptr<Node>       m_node;
-  Time m_startTime;
-  Time m_stopTime;
-  EventId m_startEvent;
-  EventId m_stopEvent;
+  Ptr<Node>       m_node;   /// The node that this application is installed on
+  Time m_startTime;         /// The simulation time that the appliacation will start
+  Time m_stopTime;          /// The simulation time that the appliacation will end
+  EventId m_startEvent;     /// The event that will fire at m_startTime to start the application
+  EventId m_stopEvent;      /// The event that will fire at m_stopTime to end the application
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/network/model/byte-tag-list.h ns-3.19/src/network/model/byte-tag-list.h
--- ns-3.18.1/src/network/model/byte-tag-list.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/byte-tag-list.h	2013-12-20 09:44:50.000000000 -0800
@@ -68,24 +68,53 @@
 class ByteTagList
 {
 public:
-
+  /*
+   * \brief An iterator for iterating through a byte tag list
+   *
+   * An iterator for iterating through a byte tag list
+   *
+   */
   class Iterator
   {
 public:
+    /*
+     * \brief An item specifies an individual tag within a byte buffer
+     *
+     * An item specifies an individual tag within a byte buffer
+     *
+     */
     struct Item 
     {
-      TypeId tid;
-      uint32_t size;
-      int32_t start;
-      int32_t end;
-      TagBuffer buf;
-      Item (TagBuffer buf);
+      TypeId tid;             /// type of the tag
+      uint32_t size;          /// size of tag data
+      int32_t start;          /// offset to the start of the tag from the virtual byte buffer 
+      int32_t end;            /// offset to the end of the tag from the virtual byte buffer
+      TagBuffer buf;          /// the data for the tag as generated by Tag::Serialize
+      Item (TagBuffer buf);   /// constructs an item with the given TagBuffer
 private:
       friend class ByteTagList;
       friend class ByteTagList::Iterator;
     };
+    
+    /*
+     * \brief Used to determine if the iterator is at the end of the byteTagList
+     *
+     * \returns true if there are more Items in the list
+     */
     bool HasNext (void) const;
+
+    /*
+     * \brief Returns the next Item from the ByteTagList
+     *
+     * \returns the next Item in the ByteTagList
+     */        
     struct ByteTagList::Iterator::Item Next (void);
+    
+    /*
+     * \brief Returns the offset from the start of the virtual byte buffer to the ByteTagList
+     *
+     * \returns offset to the start of this ByteTagList
+     */     
     uint32_t GetOffsetStart (void) const;
 private:
     friend class ByteTagList;
@@ -102,7 +131,26 @@
   };
 
   ByteTagList ();
+  
+  /**
+   * 
+   * Copy constructor, copies the data and increases reference count
+   *
+   * \param o The ByteTagList to copy
+   * \returns The newly created ByteTagList
+   *
+   */
   ByteTagList (const ByteTagList &o);
+  
+  /**
+   *
+   * Assignment operator, deallocates current data and assigns
+   * value of passed in ByteTagList.  Also increases reference count
+   *
+   * \param o reference to the ByteTagList to copy
+   * \returns reference to the assignee
+   *
+   */
   ByteTagList &operator = (const ByteTagList &o);
   ~ByteTagList ();
 
@@ -125,6 +173,10 @@
    */
   void Add (const ByteTagList &o);
 
+  /**
+   * 
+   * Removes all of the tags from the ByteTagList
+   */ 
   void RemoveAll (void);
 
   /**
@@ -144,12 +196,20 @@
    * Adjust the offsets stored internally by the adjustment delta and
    * make sure that all offsets are smaller than appendOffset which represents
    * the location where new bytes have been added to the byte buffer.
+   * 
+   * \param adjustment value to change stored offsets by
+   * \param appendOffset maximum offset value
+   *
    */
   void AddAtEnd (int32_t adjustment, int32_t appendOffset);
   /**
    * Adjust the offsets stored internally by the adjustment delta and
    * make sure that all offsets are bigger than prependOffset which represents
    * the location where new bytes have been added to the byte buffer.
+   *
+   * \param adjustment value to change stored offsets byte
+   * \param prependOffset minimum offset value
+   *
    */
   void AddAtStart (int32_t adjustment, int32_t prependOffset);
 
diff -Naur ns-3.18.1/src/network/model/channel.cc ns-3.19/src/network/model/channel.cc
--- ns-3.18.1/src/network/model/channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Channel);
+NS_OBJECT_ENSURE_REGISTERED (Channel)
+  ;
 
 TypeId 
 Channel::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/model/channel-list.cc ns-3.19/src/network/model/channel-list.cc
--- ns-3.18.1/src/network/model/channel-list.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/channel-list.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("ChannelList");
+NS_LOG_COMPONENT_DEFINE ("ChannelList")
+  ;
 
 /**
  * \brief private implementation detail of the ChannelList API.
@@ -55,7 +56,8 @@
   std::vector<Ptr<Channel> > m_channels;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (ChannelListPriv);
+NS_OBJECT_ENSURE_REGISTERED (ChannelListPriv)
+  ;
 
 TypeId 
 ChannelListPriv::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/model/chunk.cc ns-3.19/src/network/model/chunk.cc
--- ns-3.18.1/src/network/model/chunk.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/chunk.cc	2013-12-20 09:44:50.000000000 -0800
@@ -2,7 +2,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Chunk);
+NS_OBJECT_ENSURE_REGISTERED (Chunk)
+  ;
 
 TypeId 
 Chunk::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/model/header.cc ns-3.19/src/network/model/header.cc
--- ns-3.18.1/src/network/model/header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -5,7 +5,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Header);
+NS_OBJECT_ENSURE_REGISTERED (Header)
+  ;
 
 Header::~Header ()
 {
diff -Naur ns-3.18.1/src/network/model/net-device.cc ns-3.19/src/network/model/net-device.cc
--- ns-3.18.1/src/network/model/net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (NetDevice);
+NS_OBJECT_ENSURE_REGISTERED (NetDevice)
+  ;
 
 TypeId NetDevice::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/network/model/net-device.h ns-3.19/src/network/model/net-device.h
--- ns-3.18.1/src/network/model/net-device.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,7 @@
 
 /**
  * \ingroup network
- * \defgroup netdevice NetDevice
+ * \defgroup netdevice Network Device
  */
 /**
  * \ingroup netdevice
diff -Naur ns-3.18.1/src/network/model/nix-vector.cc ns-3.19/src/network/model/nix-vector.cc
--- ns-3.18.1/src/network/model/nix-vector.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/nix-vector.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,7 @@
 
 namespace ns3 {
 
-typedef std::vector<uint32_t> NixBits_t;
+typedef std::vector<uint32_t> NixBits_t;  ///typedef for the nixVector
 
 NixVector::NixVector ()
   : m_nixVector (0),
@@ -77,6 +77,7 @@
   return Ptr<NixVector> (new NixVector (*this), false);
 }
 
+/* For printing the nix vector */
 std::ostream & operator << (std::ostream &os, const NixVector &nix)
 {
   nix.DumpNixVector (os); 
diff -Naur ns-3.18.1/src/network/model/nix-vector.h ns-3.19/src/network/model/nix-vector.h
--- ns-3.18.1/src/network/model/nix-vector.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/nix-vector.h	2013-12-20 09:44:50.000000000 -0800
@@ -75,6 +75,8 @@
    */
   NixVector (const NixVector &o);
   /**
+   * \return a reference to the assignee
+   *
    * \param o the NixVector to copy to a new NixVector using the
    *          equals operator
    */
diff -Naur ns-3.18.1/src/network/model/node.cc ns-3.19/src/network/model/node.cc
--- ns-3.18.1/src/network/model/node.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/node.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Node);
+NS_OBJECT_ENSURE_REGISTERED (Node)
+  ;
 
 GlobalValue g_checksumEnabled  = GlobalValue ("ChecksumEnabled",
                                               "A global switch to enable all checksums for all protocols",
diff -Naur ns-3.18.1/src/network/model/node-list.cc ns-3.19/src/network/model/node-list.cc
--- ns-3.18.1/src/network/model/node-list.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/node-list.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("NodeList");
+NS_LOG_COMPONENT_DEFINE ("NodeList")
+  ;
 
 /**
  * \brief private implementation detail of the NodeList API.
@@ -56,7 +57,8 @@
   std::vector<Ptr<Node> > m_nodes;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (NodeListPriv);
+NS_OBJECT_ENSURE_REGISTERED (NodeListPriv)
+  ;
 
 TypeId 
 NodeListPriv::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/model/packet-tag-list.cc ns-3.19/src/network/model/packet-tag-list.cc
--- ns-3.18.1/src/network/model/packet-tag-list.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/packet-tag-list.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 #include "ns3/log.h"
 #include <cstring>
 
-NS_LOG_COMPONENT_DEFINE ("PacketTagList");
+NS_LOG_COMPONENT_DEFINE ("PacketTagList")
+  ;
 
 namespace ns3 {
 
diff -Naur ns-3.18.1/src/network/model/packet-tag-list.h ns-3.19/src/network/model/packet-tag-list.h
--- ns-3.18.1/src/network/model/packet-tag-list.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/packet-tag-list.h	2013-12-20 09:44:50.000000000 -0800
@@ -177,7 +177,7 @@
    * \param [in] o The PacketTagList to copy.
    *
    * This makes a light-weight copy by #RemoveAll, then
-   * pointing to the same #struct TagData as \pname{o}.
+   * pointing to the same \ref TagData as \pname{o}.
    */
   inline PacketTagList (PacketTagList const &o);
   /**
@@ -186,7 +186,7 @@
    * \param [in] o The PacketTagList to copy.
    *
    * This makes a light-weight copy by #RemoveAll, then
-   * pointing to the same #struct TagData as \pname{o}.
+   * pointing to the same \ref TagData as \pname{o}.
    */
   inline PacketTagList &operator = (PacketTagList const &o);
   /**
@@ -287,7 +287,7 @@
   bool ReplaceWriter (Tag & tag, bool preMerge, struct TagData * cur, struct TagData ** prevNext);
 
   /**
-   * Pointer to first #struct TagData on the list
+   * Pointer to first \ref TagData on the list
    */
   struct TagData *m_next;
 };
diff -Naur ns-3.18.1/src/network/model/socket.cc ns-3.19/src/network/model/socket.cc
--- ns-3.18.1/src/network/model/socket.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/socket.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Socket);
+NS_OBJECT_ENSURE_REGISTERED (Socket)
+  ;
 
 TypeId
 Socket::GetTypeId (void)
@@ -532,7 +533,8 @@
   return m_address;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag);
+NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag)
+  ;
 
 TypeId
 SocketAddressTag::GetTypeId (void)
@@ -592,7 +594,8 @@
   return m_ttl;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag);
+NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag)
+  ;
 
 TypeId
 SocketIpTtlTag::GetTypeId (void)
@@ -650,7 +653,8 @@
   return m_hopLimit;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (SocketIpv6HopLimitTag);
+NS_OBJECT_ENSURE_REGISTERED (SocketIpv6HopLimitTag)
+  ;
 
 TypeId
 SocketIpv6HopLimitTag::GetTypeId (void)
@@ -711,7 +715,8 @@
   return m_dontFragment;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag);
+NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag)
+  ;
 
 TypeId 
 SocketSetDontFragmentTag::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/model/socket-factory.cc ns-3.19/src/network/model/socket-factory.cc
--- ns-3.18.1/src/network/model/socket-factory.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/socket-factory.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SocketFactory);
+NS_OBJECT_ENSURE_REGISTERED (SocketFactory)
+  ;
 
 TypeId SocketFactory::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/network/model/socket.h ns-3.19/src/network/model/socket.h
--- ns-3.18.1/src/network/model/socket.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/socket.h	2013-12-20 09:44:50.000000000 -0800
@@ -66,11 +66,19 @@
 class Socket : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   Socket (void);
   virtual ~Socket (void);
 
+  /**
+   * \enum SocketErrno
+   * \brief Enumeration of the possible errors returned by a socket.
+   */
   enum SocketErrno {
     ERROR_NOTERROR,
     ERROR_ISCONN,
@@ -89,6 +97,10 @@
     SOCKET_ERRNO_LAST
   };
 
+  /**
+   * \enum SocketType
+   * \brief Enumeration of the possible socket types.
+   */
   enum SocketType {
     NS3_SOCK_STREAM,
     NS3_SOCK_SEQPACKET,
@@ -107,6 +119,8 @@
    */
   static Ptr<Socket> CreateSocket (Ptr<Node> node, TypeId tid);
   /**
+   * \brief Get last error number.
+   *
    * \return the errno associated to the last call which failed in this
    *         socket. Each socket's errno is initialized to zero
    *         when the socket is created.
@@ -117,7 +131,8 @@
     */
   virtual enum Socket::SocketType GetSocketType (void) const = 0;
   /**
-   * \returns the node this socket is associated with.
+   * \brief Return the node this socket is associated with.
+   * \returns the node
    */
   virtual Ptr<Node> GetNode (void) const = 0;
   /**
@@ -253,6 +268,7 @@
   /**
    * \brief Initiate a connection to a remote host
    * \param address Address of remote.
+   * \returns 0 on success, -1 on error (in which case errno is set).
    */
   virtual int Connect (const Address &address) = 0;
 
@@ -271,6 +287,8 @@
    *
    * For stream sockets, this returns the available space in bytes
    * left in the transmit buffer.
+   *
+   * \returns The number of bytes which can be sent in a single Send call.
    */
   virtual uint32_t GetTxAvailable (void) const = 0;
  
@@ -341,6 +359,9 @@
    * Return number of bytes which can be returned from one or 
    * multiple calls to Recv.
    * Must be possible to call this method from the Recv callback.
+   *
+   * \returns the number of bytes which can be returned from one or
+   *          multiple Recv calls.
    */
   virtual uint32_t GetRxAvailable (void) const = 0;
 
@@ -446,6 +467,8 @@
    * second parameter
    * \param size the number of bytes to copy from the buffer
    * \param flags Socket control flags
+   * \returns the number of bytes accepted for transmission if no error
+   *          occurs, and -1 otherwise.
    */
   int Send (const uint8_t* buf, uint32_t size, uint32_t flags);
 
@@ -531,6 +554,7 @@
   int RecvFrom (uint8_t* buf, uint32_t size, uint32_t flags,
                 Address &fromAddress);
   /**
+   * \brief Get socket address.
    * \param address the address name this socket is associated with.
    * \returns 0 if success, -1 otherwise
    */
@@ -613,7 +637,7 @@
    */
   bool IsRecvPktInfo () const;
 
-  /*
+  /**
    * \brief Manually set IP Type of Service field
    * 
    * This method corresponds to using setsockopt () IP_TOS of
@@ -626,7 +650,7 @@
    */
   void SetIpTos (uint8_t ipTos);
 
-  /*
+  /**
    * \brief Query the value of IP Type of Service of this socket
    *
    * This method corresponds to using getsockopt () IP_TOS of real network
@@ -655,11 +679,11 @@
    * This method corresponds to using getsockopt () IP_RECVTOS of real
    * network or BSD sockets.
    *
-   * \return Wheter the IP_RECVTOS is set
+   * \return Whether the IP_RECVTOS is set
    */
   bool IsIpRecvTos (void) const;
 
-  /*
+  /**
    * \brief Manually set IPv6 Traffic Class field
    * 
    * This method corresponds to using setsockopt () IPV6_TCLASS of
@@ -671,7 +695,7 @@
    */
   void SetIpv6Tclass (int ipTclass);
 
-  /*
+  /**
    * \brief Query the value of IPv6 Traffic Class field of this socket
    *
    * This method corresponds to using getsockopt () IPV6_TCLASS of real network
@@ -700,11 +724,11 @@
    * This method corresponds to using getsockopt () IPV6_RECVTCLASS of real
    * network or BSD sockets.
    *
-   * \return Wheter the IPV6_RECVTCLASS is set
+   * \return Whether the IPV6_RECVTCLASS is set
    */
   bool IsIpv6RecvTclass (void) const;
 
-  /*
+  /**
    * \brief Manually set IP Time to Live field
    * 
    * This method corresponds to using setsockopt () IP_TTL of
@@ -714,7 +738,7 @@
    */
   virtual void SetIpTtl (uint8_t ipTtl);
 
-  /*
+  /**
    * \brief Query the value of IP Time to Live field of this socket
    *
    * This method corresponds to using getsockopt () IP_TTL of real network
@@ -743,11 +767,11 @@
    * This method corresponds to using getsockopt () IP_RECVTTL of real
    * network or BSD sockets.
    *
-   * \return Wheter the IP_RECVTTL is set
+   * \return Whether the IP_RECVTTL is set
    */
   bool IsIpRecvTtl (void) const;
 
-  /*
+  /**
    * \brief Manually set IPv6 Hop Limit
    * 
    * This method corresponds to using setsockopt () IPV6_HOPLIMIT of
@@ -757,7 +781,7 @@
    */
   virtual void SetIpv6HopLimit (uint8_t ipHopLimit);
 
-  /*
+  /**
    * \brief Query the value of IP Hop Limit field of this socket
    *
    * This method corresponds to using getsockopt () IPV6_HOPLIMIT of real network
@@ -786,58 +810,135 @@
    * This method corresponds to using getsockopt () IPV6_RECVHOPLIMIT of real
    * network or BSD sockets.
    *
-   * \return Wheter the IPV6_RECVHOPLIMIT is set
+   * \return Whether the IPV6_RECVHOPLIMIT is set
    */
   bool IsIpv6RecvHopLimit (void) const;
  
 protected:
+  /**
+   * \brief Notify through the callback (if set) that the connection has been
+   *        established.
+   */
   void NotifyConnectionSucceeded (void);
+
+  /**
+   * \brief Notify through the callback (if set) that the connection has not been
+   *        established due to an error.
+   */
   void NotifyConnectionFailed (void);
+
+  /**
+   * \brief Notify through the callback (if set) that the connection has been
+   *        closed.
+   */
   void NotifyNormalClose (void);
+
+  /**
+   * \brief Notify through the callback (if set) that the connection has been
+   *        closed due to an error.
+   */
   void NotifyErrorClose (void);
+
+  /**
+   * \brief Notify through the callback (if set) that an incoming connection
+   *        is being requested by a remote host.
+   *
+   * This function returns true by default (i.e., accept all the incoming connections).
+   * The callback (if set) might restrict this behaviour by returning zero for a
+   * connection that should be refused.
+   *
+   * \param from the address the connection is incoming from
+   * \returns true if the connection must be accepted, false otherwise.
+   */
   bool NotifyConnectionRequest (const Address &from);
+
+  /**
+   * \brief Notify through the callback (if set) that a new connection has been
+   *        created.
+   */
   void NotifyNewConnectionCreated (Ptr<Socket> socket, const Address &from);
+
+  /**
+   * \brief Notify through the callback (if set) that some data have been sent.
+   *
+   * \param size number of sent bytes.
+   */
   void NotifyDataSent (uint32_t size);
+
+  /**
+   * \brief Notify through the callback (if set) that some data have been sent.
+   *
+   * \param spaceAvailable the number of bytes available in the transmission buffer.
+   */
   void NotifySend (uint32_t spaceAvailable);
+
+  /**
+   * \brief Notify through the callback (if set) that some data have been received.
+   */
   void NotifyDataRecv (void);
+
+  // inherited function, no doc necessary
   virtual void DoDispose (void);
 
+  /**
+   * \brief Checks if the socket has a specific IPv4 ToS set
+   *
+   * \returns true if the socket has a IPv4 ToS set, false otherwise.
+   */
   bool IsManualIpTos (void) const;
+
+  /**
+   * \brief Checks if the socket has a specific IPv6 Tclass set
+   *
+   * \returns true if the socket has a IPv6 Tclass set, false otherwise.
+   */
   bool IsManualIpv6Tclass (void) const;
+
+  /**
+   * \brief Checks if the socket has a specific IPv4 TTL set
+   *
+   * \returns true if the socket has a IPv4 TTL set, false otherwise.
+   */
   bool IsManualIpTtl (void) const;
+
+  /**
+   * \brief Checks if the socket has a specific IPv6 Hop Limit set
+   *
+   * \returns true if the socket has a IPv6 Hop Limit set, false otherwise.
+   */
   bool IsManualIpv6HopLimit (void) const;
 
-  Ptr<NetDevice> m_boundnetdevice;
-  bool m_recvPktInfo;
+  Ptr<NetDevice> m_boundnetdevice; //!< the device this socket is bound to (might be null).
+  bool m_recvPktInfo; //!< if the socket should add packet info tags to the packet forwarded to L4.
 
 private:
-  Callback<void, Ptr<Socket> >                   m_connectionSucceeded;
-  Callback<void, Ptr<Socket> >                   m_connectionFailed;
-  Callback<void, Ptr<Socket> >                   m_normalClose;
-  Callback<void, Ptr<Socket> >                   m_errorClose;
-  Callback<bool, Ptr<Socket>, const Address &>   m_connectionRequest;
-  Callback<void, Ptr<Socket>, const Address&>    m_newConnectionCreated;
-  Callback<void, Ptr<Socket>, uint32_t>          m_dataSent;
-  Callback<void, Ptr<Socket>, uint32_t >         m_sendCb;
-  Callback<void, Ptr<Socket> >                   m_receivedData;
+  Callback<void, Ptr<Socket> >                   m_connectionSucceeded;  //!< connection succeeded callback
+  Callback<void, Ptr<Socket> >                   m_connectionFailed;     //!< connection failed callback
+  Callback<void, Ptr<Socket> >                   m_normalClose;          //!< connection closed callback
+  Callback<void, Ptr<Socket> >                   m_errorClose;           //!< connection closed due to errors callback
+  Callback<bool, Ptr<Socket>, const Address &>   m_connectionRequest;    //!< connection request callback
+  Callback<void, Ptr<Socket>, const Address&>    m_newConnectionCreated; //!< connection created callback
+  Callback<void, Ptr<Socket>, uint32_t>          m_dataSent;             //!< data sent callback
+  Callback<void, Ptr<Socket>, uint32_t >         m_sendCb;               //!< packet sent callback
+  Callback<void, Ptr<Socket> >                   m_receivedData;         //!< data received callback
 
   //IPv4 options
-  bool m_manualIpTos;
-  bool m_manualIpTtl;
-  bool m_ipRecvTos;
-  bool m_ipRecvTtl;
+  bool m_manualIpTos; //!< socket has IPv4 TOS set
+  bool m_manualIpTtl; //!< socket has IPv4 TTL set
+  bool m_ipRecvTos;   //!< socket forwards IPv4 TOS tag to L4
+  bool m_ipRecvTtl;   //!< socket forwards IPv4 TTL tag to L4
 
-  uint8_t m_ipTos;
-  uint8_t m_ipTtl;
+  uint8_t m_ipTos; //!< the socket IPv4 TOS
+  uint8_t m_ipTtl; //!< the socket IPv4 TTL
 
   //IPv6 options
-  bool m_manualIpv6Tclass;
-  bool m_manualIpv6HopLimit;
-  bool m_ipv6RecvTclass;
-  bool m_ipv6RecvHopLimit;
+  bool m_manualIpv6Tclass;    //!< socket has IPv6 Tclass set
+  bool m_manualIpv6HopLimit;  //!< socket has IPv6 Hop Limit set
+  bool m_ipv6RecvTclass;      //!< socket forwards IPv6 Tclass tag to L4
+  bool m_ipv6RecvHopLimit;    //!< socket forwards IPv6 Hop Limit tag to L4
 
-  uint8_t m_ipv6Tclass;
-  uint8_t m_ipv6HopLimit;
+  uint8_t m_ipv6Tclass;     //!< the socket IPv6 Tclass
+  uint8_t m_ipv6HopLimit;   //!< the socket IPv6 Hop Limit
 };
 
 /**
@@ -848,18 +949,44 @@
 {
 public:
   SocketAddressTag ();
+
+  /**
+   * \brief Set the tag's address
+   *
+   * \param addr the address
+   */
   void SetAddress (Address addr);
+
+  /**
+   * \brief Get the tag's address
+   *
+   * \returns the address
+   */
   Address GetAddress (void) const;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
+
+  // inherited function, no need to doc.
   virtual TypeId GetInstanceTypeId (void) const;
+
+  // inherited function, no need to doc.
   virtual uint32_t GetSerializedSize (void) const;
+
+  // inherited function, no need to doc.
   virtual void Serialize (TagBuffer i) const;
+
+  // inherited function, no need to doc.
   virtual void Deserialize (TagBuffer i);
+
+  // inherited function, no need to doc.
   virtual void Print (std::ostream &os) const;
 
 private:
-  Address m_address;
+  Address m_address; //!< the address carried by the tag
 };
 
 /**
@@ -870,18 +997,44 @@
 {
 public:
   SocketIpTtlTag ();
+
+  /**
+   * \brief Set the tag's TTL
+   *
+   * \param ttl the TTL
+   */
   void SetTtl (uint8_t ttl);
+
+  /**
+   * \brief Get the tag's TTL
+   *
+   * \returns the TTL
+   */
   uint8_t GetTtl (void) const;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
+
+  // inherited function, no need to doc.
   virtual TypeId GetInstanceTypeId (void) const;
+
+  // inherited function, no need to doc.
   virtual uint32_t GetSerializedSize (void) const;
+
+  // inherited function, no need to doc.
   virtual void Serialize (TagBuffer i) const;
+
+  // inherited function, no need to doc.
   virtual void Deserialize (TagBuffer i);
+
+  // inherited function, no need to doc.
   virtual void Print (std::ostream &os) const;
 
 private:
-  uint8_t m_ttl;
+  uint8_t m_ttl; //!< the ttl carried by the tag
 };
 
 /**
@@ -892,82 +1045,188 @@
 {
 public:
   SocketIpv6HopLimitTag ();
+
+  /**
+   * \brief Set the tag's Hop Limit
+   *
+   * \param hopLimit the Hop Limit
+   */
   void SetHopLimit (uint8_t hopLimit);
+
+  /**
+   * \brief Get the tag's Hop Limit
+   *
+   * \returns the Hop Limit
+   */
   uint8_t GetHopLimit (void) const;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
+
+  // inherited function, no need to doc.
   virtual TypeId GetInstanceTypeId (void) const;
+
+  // inherited function, no need to doc.
   virtual uint32_t GetSerializedSize (void) const;
+
+  // inherited function, no need to doc.
   virtual void Serialize (TagBuffer i) const;
+
+  // inherited function, no need to doc.
   virtual void Deserialize (TagBuffer i);
+
+  // inherited function, no need to doc.
   virtual void Print (std::ostream &os) const;
 
 private:
-  uint8_t m_hopLimit;
+  uint8_t m_hopLimit; //!< the Hop Limit carried by the tag
 };
 
 /**
- * \brief indicated whether packets should be sent out with
- * the DF flag set.
+ * \brief indicates whether packets should be sent out with
+ * the DF (Don't Fragment) flag set.
  */
 class SocketSetDontFragmentTag : public Tag
 {
 public:
   SocketSetDontFragmentTag ();
+
+  /**
+   * \brief Enables the DF (Don't Fragment) flag
+   */
   void Enable (void);
+
+  /**
+   * \brief Disables the DF (Don't Fragment) flag
+   */
   void Disable (void);
+
+  /**
+   * \brief Checks if the DF (Don't Fragment) flag is set
+   *
+   * \returns true if DF is set.
+   */
   bool IsEnabled (void) const;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
+
+  // inherited function, no need to doc.
   virtual TypeId GetInstanceTypeId (void) const;
+
+  // inherited function, no need to doc.
   virtual uint32_t GetSerializedSize (void) const;
+
+  // inherited function, no need to doc.
   virtual void Serialize (TagBuffer i) const;
+
+  // inherited function, no need to doc.
   virtual void Deserialize (TagBuffer i);
+
+  // inherited function, no need to doc.
   virtual void Print (std::ostream &os) const;
 private:
-  bool m_dontFragment;
+  bool m_dontFragment; //!< DF bit value for outgoing packets.
 };
 
-/*
- * \brief indicated whether the socket has IP_TOS set.
+/**
+ * \brief indicates whether the socket has IP_TOS set.
  * This tag is for IPv4 socket.
  */
 class SocketIpTosTag : public Tag
 {
 public:
   SocketIpTosTag ();
+
+  /**
+   * \brief Set the tag's TOS
+   *
+   * \param tos the TOS
+   */
   void SetTos (uint8_t tos);
+
+  /**
+   * \brief Get the tag's TOS
+   *
+   * \returns the TOS
+   */
   uint8_t GetTos (void) const;
   
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
+
+  // inherited function, no need to doc.
   virtual TypeId GetInstanceTypeId (void) const;
+
+  // inherited function, no need to doc.
   virtual uint32_t GetSerializedSize (void) const;
+
+  // inherited function, no need to doc.
   virtual void Serialize (TagBuffer i) const;
+
+  // inherited function, no need to doc.
   virtual void Deserialize (TagBuffer i);
+
+  // inherited function, no need to doc.
   virtual void Print (std::ostream &os) const;
 private:
-  uint8_t m_ipTos;
+  uint8_t m_ipTos;  //!< the TOS carried by the tag
 };
 
-/*
- * \brief indicated whether the socket has IPV6_TCLASS set.
+/**
+ * \brief indicates whether the socket has IPV6_TCLASS set.
  * This tag is for IPv6 socket.
  */
 class SocketIpv6TclassTag : public Tag
 {
 public:
   SocketIpv6TclassTag ();
+
+  /**
+   * \brief Set the tag's Tclass
+   *
+   * \param tclass the Tclass
+   */
   void SetTclass (uint8_t tclass);
+
+  /**
+   * \brief Get the tag's Tclass
+   *
+   * \returns the Tclass
+   */
   uint8_t GetTclass (void) const;
   
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
+
+  // inherited function, no need to doc.
   virtual TypeId GetInstanceTypeId (void) const;
+
+  // inherited function, no need to doc.
   virtual uint32_t GetSerializedSize (void) const;
+
+  // inherited function, no need to doc.
   virtual void Serialize (TagBuffer i) const;
+
+  // inherited function, no need to doc.
   virtual void Deserialize (TagBuffer i);
+
+  // inherited function, no need to doc.
   virtual void Print (std::ostream &os) const;
 private:
-  uint8_t m_ipv6Tclass;
+  uint8_t m_ipv6Tclass; //!< the Tclass carried by the tag
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/network/model/tag.cc ns-3.19/src/network/model/tag.cc
--- ns-3.18.1/src/network/model/tag.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -21,7 +21,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Tag);
+NS_OBJECT_ENSURE_REGISTERED (Tag)
+  ;
 
 TypeId 
 Tag::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/model/trailer.cc ns-3.19/src/network/model/trailer.cc
--- ns-3.18.1/src/network/model/trailer.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/model/trailer.cc	2013-12-20 09:44:50.000000000 -0800
@@ -5,7 +5,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Trailer);
+NS_OBJECT_ENSURE_REGISTERED (Trailer)
+  ;
 
 Trailer::~Trailer ()
 {
diff -Naur ns-3.18.1/src/network/utils/address-utils.h ns-3.19/src/network/utils/address-utils.h
--- ns-3.18.1/src/network/utils/address-utils.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/address-utils.h	2013-12-20 09:44:50.000000000 -0800
@@ -30,18 +30,90 @@
 
 namespace ns3 {
 
+/**
+ * \brief Write an Ipv4Address to a Buffer
+ * \param i a reference to the buffer to write to
+ * \param ad the Ipv4Address
+ */
 void WriteTo (Buffer::Iterator &i, Ipv4Address ad);
+
+/**
+ * \brief Write an Ipv4Address to a Buffer
+ * \param i a reference to the buffer to write to
+ * \param ad the Ipv6Address
+ */
 void WriteTo (Buffer::Iterator &i, Ipv6Address ad);
+
+/**
+ * \brief Write an Address to a Buffer
+ * \param i a reference to the buffer to write to
+ * \param ad the Address
+ */
 void WriteTo (Buffer::Iterator &i, const Address &ad);
+
+/**
+ * \brief Write an Mac64Address to a Buffer
+ * \param i a reference to the buffer to write to
+ * \param ad the Mac64Address
+ */
 void WriteTo (Buffer::Iterator &i, Mac64Address ad);
+
+/**
+ * \brief Write an Mac48Address to a Buffer
+ * \param i a reference to the buffer to write to
+ * \param ad the Mac48Address
+ */
 void WriteTo (Buffer::Iterator &i, Mac48Address ad);
+
+/**
+ * \brief Write an Mac16Address to a Buffer
+ * \param i a reference to the buffer to write to
+ * \param ad the Mac16Address
+ */
 void WriteTo (Buffer::Iterator &i, Mac16Address ad);
 
+
+/**
+ * \brief Read an Ipv4Address from a Buffer
+ * \param i a reference to the buffer to read from
+ * \param ad a reference to the Ipv4Address to be read
+ */
 void ReadFrom (Buffer::Iterator &i, Ipv4Address &ad);
+
+/**
+ * \brief Read an Ipv6Address from a Buffer
+ * \param i a reference to the buffer to read from
+ * \param ad a reference to the Ipv6Address to be read
+ */
 void ReadFrom (Buffer::Iterator &i, Ipv6Address &ad);
+
+/**
+ * \brief Read an Address from a Buffer
+ * \param i a reference to the buffer to read from
+ * \param ad a reference to the Address to be read
+ * \param len the length of the Address
+ */
 void ReadFrom (Buffer::Iterator &i, Address &ad, uint32_t len);
+
+/**
+ * \brief Read a Mac64Address from a Buffer
+ * \param i a reference to the buffer to read from
+ * \param ad a reference to the Mac64Address to be read
+ */
 void ReadFrom (Buffer::Iterator &i, Mac64Address &ad);
+
+/**
+ * \brief Read a Mac48Address from a Buffer
+ * \param i a reference to the buffer to read from
+ * \param ad a reference to the Mac48Address to be read
+ */
 void ReadFrom (Buffer::Iterator &i, Mac48Address &ad);
+
+/**
+ * \brief Read a Mac16Address from a Buffer
+ * \param i a reference to the buffer to read from
+ * \param ad a reference to the Mac16Address to be read
+ */
 void ReadFrom (Buffer::Iterator &i, Mac16Address &ad);
 
 namespace addressUtils {
diff -Naur ns-3.18.1/src/network/utils/ascii-file.h ns-3.19/src/network/utils/ascii-file.h
--- ns-3.18.1/src/network/utils/ascii-file.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/ascii-file.h	2013-12-20 09:44:50.000000000 -0800
@@ -30,10 +30,11 @@
 namespace ns3 {
 
 
-/*
- * A class representing an ascii file.
+/**
+ * \brief A class representing an ascii file.
+ *
+ * This class represents an ascii file
  */
-
 class AsciiFile
 {
 public:
@@ -77,7 +78,7 @@
    * 
    * \param  f1         First ASCII file name
    * \param  f2         Second ASCII file name
-   * \param  lineNumbe   [out] Line number of first different line.
+   * \param  lineNumber   [out] Line number of first different line.
    */
   static bool Diff (std::string const & f1,
 		    std::string const & f2, 
diff -Naur ns-3.18.1/src/network/utils/crc32.cc ns-3.19/src/network/utils/crc32.cc
--- ns-3.18.1/src/network/utils/crc32.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/network/utils/crc32.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,80 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 PIOTR JURKIEWICZ
+ *
+ * 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: Piotr Jurkiewicz <piotr.jerzy.jurkiewicz@gmail.com>
+ */
+/*
+ * Note:  CRC tables such as below are found in many projects;
+ * below is the oldest reference (and copyright) to original work 
+ * of this nature that we could find.
+ *
+ * COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or
+ * code or tables extracted from it, as desired without restriction.
+ */
+#include <stdint.h>
+
+namespace ns3 {
+
+static uint32_t crc32table[256] = {
+0x00000000,0x77073096,0xEE0E612C,0x990951BA,0x076DC419,0x706AF48F,0xE963A535,0x9E6495A3,
+0x0EDB8832,0x79DCB8A4,0xE0D5E91E,0x97D2D988,0x09B64C2B,0x7EB17CBD,0xE7B82D07,0x90BF1D91,
+0x1DB71064,0x6AB020F2,0xF3B97148,0x84BE41DE,0x1ADAD47D,0x6DDDE4EB,0xF4D4B551,0x83D385C7,
+0x136C9856,0x646BA8C0,0xFD62F97A,0x8A65C9EC,0x14015C4F,0x63066CD9,0xFA0F3D63,0x8D080DF5,
+0x3B6E20C8,0x4C69105E,0xD56041E4,0xA2677172,0x3C03E4D1,0x4B04D447,0xD20D85FD,0xA50AB56B,
+0x35B5A8FA,0x42B2986C,0xDBBBC9D6,0xACBCF940,0x32D86CE3,0x45DF5C75,0xDCD60DCF,0xABD13D59,
+0x26D930AC,0x51DE003A,0xC8D75180,0xBFD06116,0x21B4F4B5,0x56B3C423,0xCFBA9599,0xB8BDA50F,
+0x2802B89E,0x5F058808,0xC60CD9B2,0xB10BE924,0x2F6F7C87,0x58684C11,0xC1611DAB,0xB6662D3D,
+0x76DC4190,0x01DB7106,0x98D220BC,0xEFD5102A,0x71B18589,0x06B6B51F,0x9FBFE4A5,0xE8B8D433,
+0x7807C9A2,0x0F00F934,0x9609A88E,0xE10E9818,0x7F6A0DBB,0x086D3D2D,0x91646C97,0xE6635C01,
+0x6B6B51F4,0x1C6C6162,0x856530D8,0xF262004E,0x6C0695ED,0x1B01A57B,0x8208F4C1,0xF50FC457,
+0x65B0D9C6,0x12B7E950,0x8BBEB8EA,0xFCB9887C,0x62DD1DDF,0x15DA2D49,0x8CD37CF3,0xFBD44C65,
+0x4DB26158,0x3AB551CE,0xA3BC0074,0xD4BB30E2,0x4ADFA541,0x3DD895D7,0xA4D1C46D,0xD3D6F4FB,
+0x4369E96A,0x346ED9FC,0xAD678846,0xDA60B8D0,0x44042D73,0x33031DE5,0xAA0A4C5F,0xDD0D7CC9,
+0x5005713C,0x270241AA,0xBE0B1010,0xC90C2086,0x5768B525,0x206F85B3,0xB966D409,0xCE61E49F,
+0x5EDEF90E,0x29D9C998,0xB0D09822,0xC7D7A8B4,0x59B33D17,0x2EB40D81,0xB7BD5C3B,0xC0BA6CAD,
+0xEDB88320,0x9ABFB3B6,0x03B6E20C,0x74B1D29A,0xEAD54739,0x9DD277AF,0x04DB2615,0x73DC1683,
+0xE3630B12,0x94643B84,0x0D6D6A3E,0x7A6A5AA8,0xE40ECF0B,0x9309FF9D,0x0A00AE27,0x7D079EB1,
+0xF00F9344,0x8708A3D2,0x1E01F268,0x6906C2FE,0xF762575D,0x806567CB,0x196C3671,0x6E6B06E7,
+0xFED41B76,0x89D32BE0,0x10DA7A5A,0x67DD4ACC,0xF9B9DF6F,0x8EBEEFF9,0x17B7BE43,0x60B08ED5,
+0xD6D6A3E8,0xA1D1937E,0x38D8C2C4,0x4FDFF252,0xD1BB67F1,0xA6BC5767,0x3FB506DD,0x48B2364B,
+0xD80D2BDA,0xAF0A1B4C,0x36034AF6,0x41047A60,0xDF60EFC3,0xA867DF55,0x316E8EEF,0x4669BE79,
+0xCB61B38C,0xBC66831A,0x256FD2A0,0x5268E236,0xCC0C7795,0xBB0B4703,0x220216B9,0x5505262F,
+0xC5BA3BBE,0xB2BD0B28,0x2BB45A92,0x5CB36A04,0xC2D7FFA7,0xB5D0CF31,0x2CD99E8B,0x5BDEAE1D,
+0x9B64C2B0,0xEC63F226,0x756AA39C,0x026D930A,0x9C0906A9,0xEB0E363F,0x72076785,0x05005713,
+0x95BF4A82,0xE2B87A14,0x7BB12BAE,0x0CB61B38,0x92D28E9B,0xE5D5BE0D,0x7CDCEFB7,0x0BDBDF21,
+0x86D3D2D4,0xF1D4E242,0x68DDB3F8,0x1FDA836E,0x81BE16CD,0xF6B9265B,0x6FB077E1,0x18B74777,
+0x88085AE6,0xFF0F6A70,0x66063BCA,0x11010B5C,0x8F659EFF,0xF862AE69,0x616BFFD3,0x166CCF45,
+0xA00AE278,0xD70DD2EE,0x4E048354,0x3903B3C2,0xA7672661,0xD06016F7,0x4969474D,0x3E6E77DB,
+0xAED16A4A,0xD9D65ADC,0x40DF0B66,0x37D83BF0,0xA9BCAE53,0xDEBB9EC5,0x47B2CF7F,0x30B5FFE9,
+0xBDBDF21C,0xCABAC28A,0x53B39330,0x24B4A3A6,0xBAD03605,0xCDD70693,0x54DE5729,0x23D967BF,
+0xB3667A2E,0xC4614AB8,0x5D681B02,0x2A6F2B94,0xB40BBE37,0xC30C8EA1,0x5A05DF1B,0x2D02EF8D 
+};
+
+uint32_t
+CRC32Calculate (const uint8_t *data, int length)
+{
+  uint32_t crc = 0xffffffff;
+
+  while (length--)
+    {
+      crc = (crc >> 8) ^ crc32table[(crc & 0xFF) ^ *data++];
+    }
+  return ~crc;
+}
+
+} // namespace ns3
+
diff -Naur ns-3.18.1/src/network/utils/crc32.h ns-3.19/src/network/utils/crc32.h
--- ns-3.18.1/src/network/utils/crc32.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/network/utils/crc32.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,36 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 PIOTR JURKIEWICZ
+ *
+ * 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: Piotr Jurkiewicz <piotr.jerzy.jurkiewicz@gmail.com>
+ */
+#ifndef CRC32_H
+#define CRC32_H
+#include <stdint.h>
+
+namespace ns3 {
+
+/**
+ * \param data buffer to calculate the checksum for
+ * \param length the length of the buffer (bytes)
+ * \returns the computed crc.
+ *
+ */
+uint32_t CRC32Calculate (const uint8_t *data, int length);
+
+} // namespace ns3
+
+#endif
diff -Naur ns-3.18.1/src/network/utils/data-rate.cc ns-3.19/src/network/utils/data-rate.cc
--- ns-3.18.1/src/network/utils/data-rate.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/data-rate.cc	2013-12-20 09:44:50.000000000 -0800
@@ -182,7 +182,7 @@
 
 namespace ns3 {
 
-ATTRIBUTE_HELPER_CPP (DataRate);
+ATTRIBUTE_HELPER_CPP (DataRate);  /// Macro to make help make data-rate an ns-3 attribute
 
 DataRate::DataRate ()
   : m_bps (0)
@@ -248,11 +248,13 @@
     }
 }
 
+/* For printing of data rate */
 std::ostream &operator << (std::ostream &os, const DataRate &rate)
 {
   os << rate.GetBitRate () << "bps";
   return os;
 }
+/* Initialize a data rate from an input stream */
 std::istream &operator >> (std::istream &is, DataRate &rate)
 {
   std::string value;
@@ -267,13 +269,26 @@
   return is;
 }
 
-
-
+/**
+  * \brief Multiply datarate by a time value
+  *
+  * Calculates the number of bits that have been transmitted over a period of time
+  * \param lhs rate
+  * \param rhs time
+  * \return the number of bits over the period of time
+  */
 double operator* (const DataRate& lhs, const Time& rhs)
 {
   return rhs.GetSeconds ()*lhs.GetBitRate ();
 }
-
+/**
+  * \brief Multiply time value by a data rate
+  *
+  * Calculates the number of bits that have been transmitted over a period of time
+  * \param lhs time
+  * \param rhs rate
+  * \return the number of bits over the period of time
+  */
 double operator* (const Time& lhs, const DataRate& rhs)
 {
   return lhs.GetSeconds ()*rhs.GetBitRate ();
diff -Naur ns-3.18.1/src/network/utils/data-rate.h ns-3.19/src/network/utils/data-rate.h
--- ns-3.18.1/src/network/utils/data-rate.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/data-rate.h	2013-12-20 09:44:50.000000000 -0800
@@ -81,13 +81,66 @@
    * \param bps bit/s value
    */
   DataRate (uint64_t bps);
+  /**
+   * \brief String constructor
+   *
+   * Construct a data rate from a string.  Many different unit strings are supported
+   * Supported unit strings:
+   * bps, b/s, Bps, B/s \n
+   * kbps, kb/s, Kbps, Kb/s, kBps, kB/s, KBps, KB/s, Kib/s, KiB/s \n
+   * Mbps, Mb/s, MBps, MB/s, Mib/s, MiB/s \n
+   * Gbps, Gb/s, GBps, GB/s, Gib/s, GiB/s \n
+   * 
+   * Examples:
+   * "56kbps" = 56,000 bits/s \n
+   * "128 kb/s" = 128,000 bits/s \n
+   * "8Kib/s" = 1 KiB/s = 8192 bits/s \n
+   * "1kB/s" = 8000 bits/s 
+   *
+   * \param rate string representing the desired rate
+   */
   DataRate (std::string rate);
 
+  /**
+   * \return true if this rate is less than rhs
+   *
+   * \param rhs the datarate to compare to this datarate
+   */  
   bool operator <  (const DataRate& rhs) const;
+
+  /**
+   * \return true if this rate is less than or equal to rhs
+   *
+   * \param rhs the datarate to compare to this datarate
+   */ 
   bool operator <= (const DataRate& rhs) const;
+  
+  /**
+   * \return true if this rate is greater than rhs
+   *
+   * \param rhs the datarate to compare to this datarate
+   */   
   bool operator >  (const DataRate& rhs) const;
+  
+  /**
+   * \return true if this rate is greather than or equal to rhs
+   *
+   * \param rhs the datarate to compare to this datarate
+   */   
   bool operator >= (const DataRate& rhs) const;
+  
+  /**
+   * \return true if this rate is equal to rhs
+   *
+   * \param rhs the datarate to compare to this datarate
+   */   
   bool operator == (const DataRate& rhs) const;
+  
+  /**
+   * \return true if this rate is not equal to rhs
+   *
+   * \param rhs the datarate to compare to this datarate
+   */   
   bool operator != (const DataRate& rhs) const;
 
   /**
@@ -118,7 +171,8 @@
  * \brief hold objects of type ns3::DataRate
  */
 
-ATTRIBUTE_HELPER_HEADER (DataRate);
+
+ATTRIBUTE_HELPER_HEADER (DataRate);   /// Macro to make help make data-rate an ns-3 attribute
 
 /**
  * \param lhs
diff -Naur ns-3.18.1/src/network/utils/drop-tail-queue.cc ns-3.19/src/network/utils/drop-tail-queue.cc
--- ns-3.18.1/src/network/utils/drop-tail-queue.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/drop-tail-queue.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (DropTailQueue);
+NS_OBJECT_ENSURE_REGISTERED (DropTailQueue)
+  ;
 
 TypeId DropTailQueue::GetTypeId (void) 
 {
diff -Naur ns-3.18.1/src/network/utils/error-model.cc ns-3.19/src/network/utils/error-model.cc
--- ns-3.18.1/src/network/utils/error-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/error-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -77,7 +77,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ErrorModel);
+NS_OBJECT_ENSURE_REGISTERED (ErrorModel)
+  ;
 
 TypeId ErrorModel::GetTypeId (void)
 { 
@@ -145,7 +146,8 @@
 // RateErrorModel
 //
 
-NS_OBJECT_ENSURE_REGISTERED (RateErrorModel);
+NS_OBJECT_ENSURE_REGISTERED (RateErrorModel)
+  ;
 
 TypeId RateErrorModel::GetTypeId (void)
 { 
@@ -284,7 +286,8 @@
 // BurstErrorModel
 //
 
-NS_OBJECT_ENSURE_REGISTERED (BurstErrorModel);
+NS_OBJECT_ENSURE_REGISTERED (BurstErrorModel)
+  ;
 
 TypeId BurstErrorModel::GetTypeId (void)
 {
@@ -412,7 +415,8 @@
 // ListErrorModel
 //
 
-NS_OBJECT_ENSURE_REGISTERED (ListErrorModel);
+NS_OBJECT_ENSURE_REGISTERED (ListErrorModel)
+  ;
 
 TypeId ListErrorModel::GetTypeId (void)
 { 
@@ -481,7 +485,8 @@
 // ReceiveListErrorModel
 //
 
-NS_OBJECT_ENSURE_REGISTERED (ReceiveListErrorModel);
+NS_OBJECT_ENSURE_REGISTERED (ReceiveListErrorModel)
+  ;
 
 TypeId ReceiveListErrorModel::GetTypeId (void)
 { 
diff -Naur ns-3.18.1/src/network/utils/error-model.h ns-3.19/src/network/utils/error-model.h
--- ns-3.18.1/src/network/utils/error-model.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/error-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -277,19 +277,19 @@
    */
   double GetBurstRate (void) const;
   /**
-   * \param burstRate the error rate to be used by the model
+   * \param rate the error rate to be used by the model
    */
   void SetBurstRate (double rate);
 
   /**
-   * \param ranVariable A random variable distribution to generate random variates
+   * \param ranVar A random variable distribution to generate random variates
    */
-  void SetRandomVariable (Ptr<RandomVariableStream>);
+  void SetRandomVariable (Ptr<RandomVariableStream> ranVar);
 
   /**
-   * \param burstSize A random variable distribution to generate random burst size
+   * \param burstSz A random variable distribution to generate random burst size
    */
-  void SetRandomBurstSize (Ptr<RandomVariableStream>);
+  void SetRandomBurstSize (Ptr<RandomVariableStream> burstSz);
 
   /**
     * Assign a fixed random variable stream number to the random variables
diff -Naur ns-3.18.1/src/network/utils/ethernet-header.cc ns-3.19/src/network/utils/ethernet-header.cc
--- ns-3.18.1/src/network/utils/ethernet-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/ethernet-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (EthernetHeader);
+NS_OBJECT_ENSURE_REGISTERED (EthernetHeader)
+  ;
 
 EthernetHeader::EthernetHeader (bool hasPreamble)
   : m_enPreambleSfd (hasPreamble),
diff -Naur ns-3.18.1/src/network/utils/ethernet-trailer.cc ns-3.19/src/network/utils/ethernet-trailer.cc
--- ns-3.18.1/src/network/utils/ethernet-trailer.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/ethernet-trailer.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,12 +22,14 @@
 #include "ns3/log.h"
 #include "ns3/trailer.h"
 #include "ethernet-trailer.h"
+#include "crc32.h"
 
 NS_LOG_COMPONENT_DEFINE ("EthernetTrailer");
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (EthernetTrailer);
+NS_OBJECT_ENSURE_REGISTERED (EthernetTrailer)
+  ;
 
 EthernetTrailer::EthernetTrailer ()
   : m_calcFcs (false),
@@ -58,7 +60,7 @@
 
   buffer = new uint8_t[len];
   p->CopyData (buffer, len);
-  crc = DoCalcFcs (buffer, len);
+  crc = CRC32Calculate (buffer, len);
   delete[] buffer;
   return (m_fcs == crc);
 }
@@ -77,7 +79,7 @@
 
   buffer = new uint8_t[len];
   p->CopyData (buffer, len);
-  m_fcs = DoCalcFcs (buffer, len);
+  m_fcs = CRC32Calculate (buffer, len);
   delete[] buffer;
 }
 
@@ -151,24 +153,4 @@
   return size;
 }
 
-// This code is copied from /lib/crc32.c in the linux kernel.
-// It assumes little endian ordering.
-uint32_t
-EthernetTrailer::DoCalcFcs (uint8_t const *buffer, size_t len) const
-{
-  NS_LOG_FUNCTION (this << &buffer << len);
-  uint32_t crc = 0xffffffff;
-  int i;
-
-  while (len--)
-    {
-      crc ^= *buffer++;
-      for (i = 0; i < 8; i++)
-        {
-          crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0);
-        }
-    }
-  return ~crc;
-}
-
 } // namespace ns3
diff -Naur ns-3.18.1/src/network/utils/ethernet-trailer.h ns-3.19/src/network/utils/ethernet-trailer.h
--- ns-3.18.1/src/network/utils/ethernet-trailer.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/ethernet-trailer.h	2013-12-20 09:44:50.000000000 -0800
@@ -104,8 +104,6 @@
   bool m_calcFcs;
   uint32_t m_fcs; /// Value of the fcs contained in the trailer
 
-  uint32_t DoCalcFcs (uint8_t const *buffer, size_t len) const;
-
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/network/utils/flow-id-tag.cc ns-3.19/src/network/utils/flow-id-tag.cc
--- ns-3.18.1/src/network/utils/flow-id-tag.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/flow-id-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (FlowIdTag);
+NS_OBJECT_ENSURE_REGISTERED (FlowIdTag)
+  ;
 
 TypeId 
 FlowIdTag::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/utils/flow-id-tag.h ns-3.19/src/network/utils/flow-id-tag.h
--- ns-3.18.1/src/network/utils/flow-id-tag.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/flow-id-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,9 +34,27 @@
   virtual void Deserialize (TagBuffer buf);
   virtual void Print (std::ostream &os) const;
   FlowIdTag ();
+  
+  /**
+   *  Constructs a FlowIdTag with the given flow id
+   *
+   *  \param flowId Id to use for the tag
+   */
   FlowIdTag (uint32_t flowId);
+  /**
+   *  Sets the flow id for the tag
+   *  \param flowId Id to assign to the tag
+   */
   void SetFlowId (uint32_t flowId);
+  /**
+   *  Gets the flow id for the tag
+   *  \returns current flow id for this tag
+   */
   uint32_t GetFlowId (void) const;
+  /**
+   *  Uses a static variable to generate sequential flow id
+   *  \returns flow id allocated
+   */
   static uint32_t AllocateFlowId (void);
 private:
   uint32_t m_flowId;
diff -Naur ns-3.18.1/src/network/utils/ipv4-address.cc ns-3.19/src/network/utils/ipv4-address.cc
--- ns-3.18.1/src/network/utils/ipv4-address.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/ipv4-address.cc	2013-12-20 09:44:50.000000000 -0800
@@ -417,7 +417,7 @@
   return !a.IsEqual (b);
 }
 
-ATTRIBUTE_HELPER_CPP (Ipv4Address);
-ATTRIBUTE_HELPER_CPP (Ipv4Mask);
+ATTRIBUTE_HELPER_CPP (Ipv4Address); /// Macro to make help make class an ns-3 attribute
+ATTRIBUTE_HELPER_CPP (Ipv4Mask);    /// Macro to make help make class an ns-3 attribute
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/network/utils/ipv4-address.h ns-3.19/src/network/utils/ipv4-address.h
--- ns-3.18.1/src/network/utils/ipv4-address.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/ipv4-address.h	2013-12-20 09:44:50.000000000 -0800
@@ -286,8 +286,8 @@
  * \brief hold objects of type ns3::Ipv4Mask
  */
 
-ATTRIBUTE_HELPER_HEADER (Ipv4Address);
-ATTRIBUTE_HELPER_HEADER (Ipv4Mask);
+ATTRIBUTE_HELPER_HEADER (Ipv4Address);  /// Macro to make help make class an ns-3 attribute
+ATTRIBUTE_HELPER_HEADER (Ipv4Mask);     /// Macro to make help make class an ns-3 attribute
 
 std::ostream& operator<< (std::ostream& os, Ipv4Address const& address);
 std::ostream& operator<< (std::ostream& os, Ipv4Mask const& mask);
diff -Naur ns-3.18.1/src/network/utils/ipv6-address.cc ns-3.19/src/network/utils/ipv6-address.cc
--- ns-3.18.1/src/network/utils/ipv6-address.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/ipv6-address.cc	2013-12-20 09:44:50.000000000 -0800
@@ -18,6 +18,29 @@
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
  */
 
+// Part of the Ipv6Address::Print function has been adapted from inet_ntop6 Linux function.
+// See http://www.net-snmp.org/dev/agent/inet__ntop_8c_source.html
+// Author: Paul Vixie, 1996.
+// The inet_ntop6 function was under the copyright below, which is
+// compatible with GPLv2, see http://www.gnu.org/licenses/license-list.html#GPLCompatibleLicenses.
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+
 #include <iomanip>
 #include <memory.h>
 
@@ -115,7 +138,12 @@
 
 /**
  * \brief Convert an IPv6 C-string into a 128-bit representation.
+ *
+ * \param address pointer to the char buffer with the address ascii representation
+ * \param addr the buffer to store the IPv6 address
+ *
  * \return true if success, false otherwise (bad format, ...)
+ *
  * \note This function is strongly inspired by inet_pton6() from Paul Vixie.
  * \todo Handle IPv6 address with decimal value for last four bytes.
  */
@@ -473,23 +501,96 @@
 void Ipv6Address::Print (std::ostream& os) const
 {
   NS_LOG_FUNCTION (this << &os);
-  os << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[0]
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[1] << ":"
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[2]
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[3] << ":"
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[4]
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[5] << ":"
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[6]
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[7] << ":"
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[8]
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[9] << ":"
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[10]
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[11] << ":"
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[12]
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[13] << ":"
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[14]
-     << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_address[15]
-     << std::dec << std::setfill (' ');
+
+  // note: part of this function has been adapted from inet_ntop6 Linux function.
+  // See http://www.net-snmp.org/dev/agent/inet__ntop_8c_source.html
+  // Author: Paul Vixie, 1996.
+
+  if (IsIpv4MappedAddress ())
+    {
+      os << "::ffff:"
+         << (unsigned int) m_address[12] << "."
+         << (unsigned int) m_address[13] << "."
+         << (unsigned int) m_address[14] << "."
+         << (unsigned int) m_address[15];
+      return;
+    }
+
+  uint16_t address[8];
+  uint8_t i;
+
+  for (i=0; i<8; i++)
+    {
+      address[i] = (uint16_t(m_address[2*i]) << 8) | uint16_t(m_address[2*i+1]);
+    }
+
+  int8_t bestBase = -1;
+  int8_t bestLen = 0;
+  int8_t curBase = -1;
+  int8_t curLen = 0;
+
+  for (i=0; i<8; i++)
+    {
+      if (address[i] == 0)
+        {
+          if (curBase == -1)
+            {
+              curBase = i;
+              curLen = 1;
+            }
+          else
+            {
+              curLen++;
+            }
+        }
+      else
+        {
+          if (curBase != -1)
+            {
+              if (bestBase == -1 || curLen > bestLen)
+                {
+                  bestBase = curBase;
+                  bestLen = curLen;
+                }
+              curBase = -1;
+            }
+        }
+    }
+  if (curBase != -1)
+    {
+      if (bestBase == -1 || curLen > bestLen)
+        {
+          bestBase = curBase;
+          bestLen = curLen;
+        }
+    }
+  if (bestBase != -1 && bestLen < 2)
+    {
+      bestBase = -1;
+    }
+
+  for (i = 0; i < 8;) {
+      // Are we inside the best run of 0x00's?
+      if (i == bestBase)
+        {
+          os << ':';
+          i += bestLen;
+          continue;
+        }
+      // Are we following an initial run of 0x00s or any real hex?
+      if (i != 0)
+        {
+          os << ':';
+        }
+      os << std::hex << (unsigned int) address[i];
+      i++;
+  }
+  // Was it a trailing run of 0x00's?
+  if (bestBase != -1 && (bestBase + bestLen) == 8)
+    {
+      os << ':';
+    }
+  os << std::dec;
 }
 
 bool Ipv6Address::IsLocalhost () const
@@ -519,7 +620,7 @@
   return false;
 }
 
-bool Ipv6Address::IsIpv4MappedAddress ()
+bool Ipv6Address::IsIpv4MappedAddress () const
 {
   NS_LOG_FUNCTION (this);
   uint8_t v4MappedPrefix[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -827,22 +928,8 @@
 void Ipv6Prefix::Print (std::ostream &os) const
 {
   NS_LOG_FUNCTION (this << &os);
-  os << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[0]
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[1] << ":"
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[2]
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[3] << ":"
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[4]
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[5] << ":"
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[6]
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[7] << ":"
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[8]
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[9] << ":"
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[10]
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[11] << ":"
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[12]
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[13] << ":"
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[14]
-  << std::hex << std::setw (2) << std::setfill ('0') << (unsigned int) m_prefix[15];
+
+  os << "/" << (unsigned int) GetPrefixLength();
 }
 
 Ipv6Prefix Ipv6Prefix::GetLoopback ()
@@ -915,16 +1002,6 @@
   return is;
 }
 
-bool operator == (Ipv6Prefix const &a, Ipv6Prefix const &b)
-{
-  return a.IsEqual (b);
-}
-
-bool operator != (Ipv6Prefix const &a, Ipv6Prefix const &b)
-{
-  return !a.IsEqual (b);
-}
-
 size_t Ipv6AddressHash::operator () (Ipv6Address const &x) const
 {
   uint8_t buf[16];
@@ -934,8 +1011,8 @@
   return lookuphash (buf, sizeof (buf), 0);
 }
 
-ATTRIBUTE_HELPER_CPP (Ipv6Address);
-ATTRIBUTE_HELPER_CPP (Ipv6Prefix);
+ATTRIBUTE_HELPER_CPP (Ipv6Address); /// Macro to make help make class an ns-3 attribute
+ATTRIBUTE_HELPER_CPP (Ipv6Prefix);  /// Macro to make help make class an ns-3 attribute
 
 } /* namespace ns3 */
 
diff -Naur ns-3.18.1/src/network/utils/ipv6-address.h ns-3.19/src/network/utils/ipv6-address.h
--- ns-3.18.1/src/network/utils/ipv6-address.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/ipv6-address.h	2013-12-20 09:44:50.000000000 -0800
@@ -269,7 +269,7 @@
    * \brief If the address is an IPv4-mapped address
    * \return true if address is an IPv4-mapped address, otherwise false.
    */
-  bool IsIpv4MappedAddress();
+  bool IsIpv4MappedAddress() const;
 
   /**
    * \brief Convert to Address object
@@ -350,8 +350,31 @@
    */
   uint8_t m_address[16];
 
+  /**
+   * \brief Equal to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the operands are equal
+   */
   friend bool operator == (Ipv6Address const &a, Ipv6Address const &b);
+
+  /**
+   * \brief Not equal to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the operands are not equal
+   */
   friend bool operator != (Ipv6Address const &a, Ipv6Address const &b);
+
+  /**
+   * \brief Less than to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the first operand is less than the second
+   */
   friend bool operator < (Ipv6Address const &a, Ipv6Address const &b);
 };
 
@@ -463,23 +486,72 @@
    * \brief The prefix representation.
    */
   uint8_t m_prefix[16];
+
+  /**
+   * \brief Equal to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the operands are equal
+   */
+  friend bool operator == (Ipv6Prefix const &a, Ipv6Prefix const &b);
+
+  /**
+   * \brief Not equal to operator.
+   *
+   * \param a the first operand
+   * \param b the first operand
+   * \returns true if the operands are not equal
+   */
+  friend bool operator != (Ipv6Prefix const &a, Ipv6Prefix const &b);
 };
 
 /**
  * \class ns3::Ipv6AddressValue
  * \brief Hold objects of type ns3::Ipv6Address
  */
-ATTRIBUTE_HELPER_HEADER (Ipv6Address);
+ATTRIBUTE_HELPER_HEADER (Ipv6Address);  /// Macro to make help make class an ns-3 attribute
 
 /**
  * \class ns3::Ipv6PrefixValue
  * \brief Hold objects of type ns3::Ipv6Prefix
  */
-ATTRIBUTE_HELPER_HEADER (Ipv6Prefix);
+ATTRIBUTE_HELPER_HEADER (Ipv6Prefix);   /// Macro to make help make class an ns-3 attribute
 
-std::ostream& operator << (std::ostream& os, Ipv6Address const& address);
-std::ostream& operator<< (std::ostream& os, Ipv6Prefix const& prefix);
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param address the Ipv6Address
+ * \returns the reference to the output stream
+ */
+std::ostream & operator << (std::ostream& os, Ipv6Address const& address);
+
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param prefix the Ipv6Prefix
+ * \returns the reference to the output stream
+ */
+std::ostream & operator << (std::ostream& os, Ipv6Prefix const& prefix);
+
+/**
+ * \brief Stream extraction operator.
+ *
+ * \param is the reference to the input stream
+ * \param address the Ipv6Address
+ * \returns the reference to the input stream
+ */
 std::istream & operator >> (std::istream &is, Ipv6Address &address);
+
+/**
+ * \brief Stream extraction operator.
+ *
+ * \param is the reference to the input stream
+ * \param prefix the Ipv6Preofix
+ * \returns the reference to the input stream
+ */
 std::istream & operator >> (std::istream &is, Ipv6Prefix &prefix);
 
 inline bool operator == (const Ipv6Address& a, const Ipv6Address& b)
@@ -497,6 +569,16 @@
   return (std::memcmp (a.m_address, b.m_address, 16) < 0);
 }
 
+inline bool operator == (const Ipv6Prefix& a, const Ipv6Prefix& b)
+{
+  return (!std::memcmp (a.m_prefix, b.m_prefix, 16));
+}
+
+inline bool operator != (const Ipv6Prefix& a, const Ipv6Prefix& b)
+{
+  return std::memcmp (a.m_prefix, b.m_prefix, 16);
+}
+
 /**
  * \class Ipv6AddressHash
  * \brief Hash function class for IPv6 addresses.
@@ -507,13 +589,11 @@
   /**
    * \brief Unary operator to hash IPv6 address.
    * \param x IPv6 address to hash
+   * \returns the hash of the address
    */
   size_t operator () (Ipv6Address const &x) const;
 };
 
-bool operator == (Ipv6Prefix const &a, Ipv6Prefix const &b);
-bool operator != (Ipv6Prefix const &a, Ipv6Prefix const &b);
-
 } /* namespace ns3 */
 
 #endif /* IPV6_ADDRESS_H */
diff -Naur ns-3.18.1/src/network/utils/llc-snap-header.cc ns-3.19/src/network/utils/llc-snap-header.cc
--- ns-3.18.1/src/network/utils/llc-snap-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/llc-snap-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader);
+NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader)
+  ;
 
 LlcSnapHeader::LlcSnapHeader ()
 {
diff -Naur ns-3.18.1/src/network/utils/mac16-address.cc ns-3.19/src/network/utils/mac16-address.cc
--- ns-3.18.1/src/network/utils/mac16-address.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/mac16-address.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,7 @@
 
 namespace ns3 {
 
-ATTRIBUTE_HELPER_CPP (Mac16Address);
+ATTRIBUTE_HELPER_CPP (Mac16Address);  /// Macro to make help make class an ns-3 attribute
 
 #define ASCII_a (0x41)
 #define ASCII_z (0x5a)
diff -Naur ns-3.18.1/src/network/utils/mac16-address.h ns-3.19/src/network/utils/mac16-address.h
--- ns-3.18.1/src/network/utils/mac16-address.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/mac16-address.h	2013-12-20 09:44:50.000000000 -0800
@@ -80,6 +80,7 @@
   static bool IsMatchingType (const Address &address);
   /**
    * Allocate a new Mac16Address.
+   * \returns newly allocated mac16Address
    */
   static Mac16Address Allocate (void);
 
@@ -104,7 +105,7 @@
  * \brief hold objects of type ns3::Mac16Address
  */
 
-ATTRIBUTE_HELPER_HEADER (Mac16Address);
+ATTRIBUTE_HELPER_HEADER (Mac16Address); /// Macro to make help make class an ns-3 attribute
 
 inline bool operator == (const Mac16Address &a, const Mac16Address &b)
 {
diff -Naur ns-3.18.1/src/network/utils/mac48-address.cc ns-3.19/src/network/utils/mac48-address.cc
--- ns-3.18.1/src/network/utils/mac48-address.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/mac48-address.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,7 @@
 
 namespace ns3 {
 
-ATTRIBUTE_HELPER_CPP (Mac48Address);
+ATTRIBUTE_HELPER_CPP (Mac48Address);  /// Macro to make help make class an ns-3 attribute
 
 #define ASCII_a (0x41)
 #define ASCII_z (0x5a)
diff -Naur ns-3.18.1/src/network/utils/mac48-address.h ns-3.19/src/network/utils/mac48-address.h
--- ns-3.18.1/src/network/utils/mac48-address.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/mac48-address.h	2013-12-20 09:44:50.000000000 -0800
@@ -84,6 +84,7 @@
   static bool IsMatchingType (const Address &address);
   /**
    * Allocate a new Mac48Address.
+   * \returns newly allocated mac48Address
    */
   static Mac48Address Allocate (void);
 
@@ -146,7 +147,7 @@
  * \brief hold objects of type ns3::Mac48Address
  */
 
-ATTRIBUTE_HELPER_HEADER (Mac48Address);
+ATTRIBUTE_HELPER_HEADER (Mac48Address); /// Macro to make help make class an ns-3 attribute
 
 inline bool operator == (const Mac48Address &a, const Mac48Address &b)
 {
diff -Naur ns-3.18.1/src/network/utils/mac64-address.cc ns-3.19/src/network/utils/mac64-address.cc
--- ns-3.18.1/src/network/utils/mac64-address.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/mac64-address.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,7 @@
 
 namespace ns3 {
 
-ATTRIBUTE_HELPER_CPP (Mac64Address);
+ATTRIBUTE_HELPER_CPP (Mac64Address);  /// Macro to make help make class an ns-3 attribute
 
 #define ASCII_a (0x41)
 #define ASCII_z (0x5a)
diff -Naur ns-3.18.1/src/network/utils/mac64-address.h ns-3.19/src/network/utils/mac64-address.h
--- ns-3.18.1/src/network/utils/mac64-address.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/mac64-address.h	2013-12-20 09:44:50.000000000 -0800
@@ -83,6 +83,7 @@
   static bool IsMatchingType (const Address &address);
   /**
    * Allocate a new Mac64Address.
+   * \returns newly allocated mac64Address   
    */
   static Mac64Address Allocate (void);
 private:
@@ -106,7 +107,7 @@
  * \brief hold objects of type ns3::Mac64Address
  */
 
-ATTRIBUTE_HELPER_HEADER (Mac64Address);
+ATTRIBUTE_HELPER_HEADER (Mac64Address); /// Macro to make help make class an ns-3 attribute
 
 inline bool operator == (const Mac64Address &a, const Mac64Address &b)
 {
diff -Naur ns-3.18.1/src/network/utils/packetbb.cc ns-3.19/src/network/utils/packetbb.cc
--- ns-3.18.1/src/network/utils/packetbb.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/packetbb.cc	2013-12-20 09:44:50.000000000 -0800
@@ -58,7 +58,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PbbPacket);
+NS_OBJECT_ENSURE_REGISTERED (PbbPacket)
+  ;
 
 PbbTlvBlock::PbbTlvBlock (void)
 {
diff -Naur ns-3.18.1/src/network/utils/packetbb.h ns-3.19/src/network/utils/packetbb.h
--- ns-3.18.1/src/network/utils/packetbb.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/packetbb.h	2013-12-20 09:44:50.000000000 -0800
@@ -55,8 +55,8 @@
 class PbbTlvBlock
 {
 public:
-  typedef std::list< Ptr<PbbTlv> >::iterator Iterator;
-  typedef std::list< Ptr<PbbTlv> >::const_iterator ConstIterator;
+  typedef std::list< Ptr<PbbTlv> >::iterator Iterator;              /// this is an iterator
+  typedef std::list< Ptr<PbbTlv> >::const_iterator ConstIterator;   /// this is a const iterator
 
   PbbTlvBlock (void);
   ~PbbTlvBlock (void);
@@ -192,7 +192,17 @@
    */
   void Print (std::ostream &os, int level) const;
 
+  /**
+   * \brief Equality operator for PbbTlvBlock
+   * \param other PbbTlvBlock to compare this one to
+   * \returns true if the blocks are equal
+   */
   bool operator== (const PbbTlvBlock &other) const;
+  /**
+   * \brief Inequality operator for PbbTlvBlock
+   * \param other PbbTlvBlock to compare this one to
+   * \returns true if the blocks are not equal
+   */  
   bool operator!= (const PbbTlvBlock &other) const;
 
 private:
@@ -207,8 +217,8 @@
 class PbbAddressTlvBlock
 {
 public:
-  typedef std::list< Ptr<PbbAddressTlv> >::iterator Iterator;
-  typedef std::list< Ptr<PbbAddressTlv> >::const_iterator ConstIterator;
+  typedef std::list< Ptr<PbbAddressTlv> >::iterator Iterator;               /// This is a PbbAddressTlv iterator for PbbAddressTlvBlock
+  typedef std::list< Ptr<PbbAddressTlv> >::const_iterator ConstIterator;    /// This is a const PbbAddressTlv iterator for PbbAddressTlvBlock
 
   PbbAddressTlvBlock (void);
   ~PbbAddressTlvBlock (void);
@@ -346,7 +356,18 @@
    */
   void Print (std::ostream &os, int level) const;
 
+  /**
+   * \brief Equality operator for PbbAddressTlvBlock
+   * \param other PbbAddressTlvBlock to compare to this one
+   * \returns true if PbbAddressTlvBlock are equal
+   */
   bool operator== (const PbbAddressTlvBlock &other) const;
+
+  /**
+   * \brief Inequality operator for PbbAddressTlvBlock
+   * \param other PbbAddressTlvBlock to compare to this one
+   * \returns true if PbbAddressTlvBlock are not equal
+   */  
   bool operator!= (const PbbAddressTlvBlock &other) const;
 
 private:
@@ -364,10 +385,10 @@
 class PbbPacket : public SimpleRefCount<PbbPacket,Header>
 {
 public:
-  typedef std::list< Ptr<PbbTlv> >::iterator TlvIterator;
-  typedef std::list< Ptr<PbbTlv> >::const_iterator ConstTlvIterator;
-  typedef std::list< Ptr<PbbMessage> >::iterator MessageIterator;
-  typedef std::list< Ptr<PbbMessage> >::const_iterator ConstMessageIterator;
+  typedef std::list< Ptr<PbbTlv> >::iterator TlvIterator;                       /// This is a PbbTlv iterator for PbbPacket
+  typedef std::list< Ptr<PbbTlv> >::const_iterator ConstTlvIterator;            /// This is a const PbbTlv iterator for PbbPacket
+  typedef std::list< Ptr<PbbMessage> >::iterator MessageIterator;               /// This is a PbbMessageIterator for PbbPacket
+  typedef std::list< Ptr<PbbMessage> >::const_iterator ConstMessageIterator;    /// This is a const PbbMessageIterator for PbbPacket
 
   PbbPacket (void);
   ~PbbPacket (void);
@@ -627,7 +648,18 @@
    */
   virtual void Print (std::ostream &os) const;
 
+  /**
+   * \brief Equality operator for PbbPacket
+   * \param other PbbPacket to compare to this one
+   * \returns true if PbbPacket are equal
+   */
   bool operator== (const PbbPacket &other) const;
+  
+  /**
+   * \brief Inequality operator for PbbPacket
+   * \param other PbbPacket to compare to this one
+   * \returns true if PbbPacket are not equal
+   */
   bool operator!= (const PbbPacket &other) const;
 
 protected:
@@ -652,10 +684,10 @@
 class PbbMessage : public SimpleRefCount<PbbMessage>
 {
 public:
-  typedef std::list< Ptr<PbbTlv> >::iterator TlvIterator;
-  typedef std::list< Ptr<PbbTlv> >::const_iterator ConstTlvIterator;
-  typedef std::list< Ptr<PbbAddressBlock> >::iterator AddressBlockIterator;
-  typedef std::list< Ptr<PbbAddressBlock> >::const_iterator ConstAddressBlockIterator;
+  typedef std::list< Ptr<PbbTlv> >::iterator TlvIterator;                                 /// This is a PbbTlv iterator for PbbMessage
+  typedef std::list< Ptr<PbbTlv> >::const_iterator ConstTlvIterator;                      /// This is a const PbbTlv iterator for PbbMessage
+  typedef std::list< Ptr<PbbAddressBlock> >::iterator AddressBlockIterator;               /// This is a PbbAddressBlock iterator for PbbMessage
+  typedef std::list< Ptr<PbbAddressBlock> >::const_iterator ConstAddressBlockIterator;    /// This is a const PbbAddressBlock iterator for PbbMessage
 
   PbbMessage ();
   virtual ~PbbMessage ();
@@ -1004,13 +1036,27 @@
    */
   void Print (std::ostream &os, int level) const;
 
+  /**
+   * \brief Equality operator for PbbMessage
+   * \param other PbbMessage to compare to this one
+   * \returns true if PbbMessages are equal
+   */
   bool operator== (const PbbMessage &other) const;
+  /**
+   * \brief Inequality operator for PbbMessage
+   * \param other PbbMessage to compare to this one
+   * \returns true if PbbMessages are not equal
+   */
   bool operator!= (const PbbMessage &other) const;
 
-protected:
-  /* PbbMessage size in bytes - 1.
+protected:  
+  /**
+   * \brief Returns address length (IPV4 3 or IPV6 15)
    *
-   * IPv4 = 4 - 1 = 3, IPv6 = 16 - 1 = 15
+   *  Returns message size in bytes - 1
+   *  IPv4 = 4 - 1 = 3, IPv6 = 16 - 1 = 15
+   *
+   * \returns Address length (IPV4 3 or IPV6 15)
    */
   virtual PbbAddressLength GetAddressLength (void) const = 0;
 
@@ -1051,6 +1097,14 @@
   virtual ~PbbMessageIpv4 ();
 
 protected:
+  /**
+   * \brief Returns address length (IPV4 3 or IPV6 15)
+   *
+   *  Returns message size in bytes - 1
+   *  IPv4 = 4 - 1 = 3, IPv6 = 16 - 1 = 15
+   *
+   * \returns Address length (IPV4 3 or IPV6 15)
+   */
   virtual PbbAddressLength GetAddressLength (void) const;
 
   virtual void SerializeOriginatorAddress (Buffer::Iterator &start) const;
@@ -1071,6 +1125,14 @@
   virtual ~PbbMessageIpv6 ();
 
 protected:
+  /**
+   * \brief Returns address length (IPV4 3 or IPV6 15)
+   *
+   *  Returns message size in bytes - 1
+   *  IPv4 = 4 - 1 = 3, IPv6 = 16 - 1 = 15
+   *
+   * \returns Address length (IPV4 3 or IPV6 15)
+   */
   virtual PbbAddressLength GetAddressLength (void) const;
 
   virtual void SerializeOriginatorAddress (Buffer::Iterator &start) const;
@@ -1089,14 +1151,14 @@
 class PbbAddressBlock : public SimpleRefCount<PbbAddressBlock>
 {
 public:
-  typedef std::list< Address >::iterator AddressIterator;
-  typedef std::list< Address >::const_iterator ConstAddressIterator;
+  typedef std::list< Address >::iterator AddressIterator;             /// this is an address iterator for PbbAddressBlock
+  typedef std::list< Address >::const_iterator ConstAddressIterator;  /// this is an const address iterator for PbbAddressBlock
 
-  typedef std::list<uint8_t>::iterator PrefixIterator;
-  typedef std::list<uint8_t>::const_iterator ConstPrefixIterator;
+  typedef std::list<uint8_t>::iterator PrefixIterator;                /// this is a prefix iterator for PbbAddressBlock
+  typedef std::list<uint8_t>::const_iterator ConstPrefixIterator;     /// this is a const prefix iterator for PbbAddressBlock
 
-  typedef PbbAddressTlvBlock::Iterator TlvIterator;
-  typedef PbbAddressTlvBlock::ConstIterator ConstTlvIterator;
+  typedef PbbAddressTlvBlock::Iterator TlvIterator;                   /// this is a tlvblock iterator for PbbAddressBlock
+  typedef PbbAddressTlvBlock::ConstIterator ConstTlvIterator;         /// this is a const tlvblock iterator for PbbAddressBlock
 
   PbbAddressBlock ();
   virtual ~PbbAddressBlock ();
@@ -1440,12 +1502,26 @@
    */
   void Print (std::ostream &os, int level) const;
 
+  /**
+   * \brief Equality operator for PbbAddressBlock
+   * \param other PbbAddressBlock to compare to this one
+   * \returns true if PbbMessages are equal
+   */
   bool operator== (const PbbAddressBlock &other) const;
+  
+  /**
+   * \brief Inequality operator for PbbAddressBlock
+   * \param other PbbAddressBlock to compare to this one
+   * \returns true if PbbAddressBlock are not equal
+   */  
   bool operator!= (const PbbAddressBlock &other) const;
 
 protected:
+  /**
+   * \brief Returns address length
+   * \returns Address length
+   */
   virtual uint8_t GetAddressLength (void) const = 0;
-
   virtual void SerializeAddress (uint8_t *buffer, ConstAddressIterator iter) const = 0;
   virtual Address DeserializeAddress (uint8_t *buffer) const = 0;
   virtual void PrintAddress (std::ostream &os, ConstAddressIterator iter) const = 0;
@@ -1473,8 +1549,11 @@
   virtual ~PbbAddressBlockIpv4 ();
 
 protected:
+  /**
+   * \brief Returns address length
+   * \returns Address length
+   */
   virtual uint8_t GetAddressLength (void) const;
-
   virtual void SerializeAddress (uint8_t *buffer, ConstAddressIterator iter) const;
   virtual Address DeserializeAddress (uint8_t *buffer) const;
   virtual void PrintAddress (std::ostream &os, ConstAddressIterator iter) const;
@@ -1492,8 +1571,11 @@
   virtual ~PbbAddressBlockIpv6 ();
 
 protected:
+  /**
+   * \brief Returns address length
+   * \returns Address length
+   */
   virtual uint8_t GetAddressLength (void) const;
-
   virtual void SerializeAddress (uint8_t *buffer, ConstAddressIterator iter) const;
   virtual Address DeserializeAddress (uint8_t *buffer) const;
   virtual void PrintAddress (std::ostream &os, ConstAddressIterator iter) const;
@@ -1620,7 +1702,18 @@
    */
   void Print (std::ostream &os, int level) const;
 
+  /**
+   * \brief Equality operator for PbbTlv
+   * \param other PbbTlv to compare to this one
+   * \returns true if PbbTlv are equal
+   */
   bool operator== (const PbbTlv &other) const;
+
+  /**
+   * \brief Inequality operator for PbbTlv
+   * \param other PbbTlv to compare to this one
+   * \returns true if PbbTlv are not equal
+   */
   bool operator!= (const PbbTlv &other) const;
 
 protected:
diff -Naur ns-3.18.1/src/network/utils/packet-burst.cc ns-3.19/src/network/utils/packet-burst.cc
--- ns-3.18.1/src/network/utils/packet-burst.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/packet-burst.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PacketBurst);
+NS_OBJECT_ENSURE_REGISTERED (PacketBurst)
+  ;
 
 TypeId
 PacketBurst::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/utils/packet-data-calculators.h ns-3.19/src/network/utils/packet-data-calculators.h
--- ns-3.18.1/src/network/utils/packet-data-calculators.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/packet-data-calculators.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,13 +31,30 @@
 /**
  * \ingroup stats
  *
+ *  A stat for counting packets
+ *
  */
 class PacketCounterCalculator : public CounterCalculator<uint32_t> {
 public:
   PacketCounterCalculator();
   virtual ~PacketCounterCalculator();
 
+  /**
+   * Increments the packet counter by one
+   *
+   * \param path not used in this method
+   * \param packet not used in this method
+   */
   void PacketUpdate (std::string path, Ptr<const Packet> packet);
+
+  /**
+   * Increments the packet counter by one
+   *
+   * \param path not used in this method
+   * \param packet not used in this method
+   * \param realto not used in this method
+   */
+
   void FrameUpdate (std::string path, Ptr<const Packet> packet,
                     Mac48Address realto);
 
@@ -51,14 +68,30 @@
 /**
  * \ingroup stats
  *
+ * A stat for collecting packet size statistics: min, max and average
+ *
  */
 class PacketSizeMinMaxAvgTotalCalculator :
   public MinMaxAvgTotalCalculator<uint32_t> {
 public:
   PacketSizeMinMaxAvgTotalCalculator();
   virtual ~PacketSizeMinMaxAvgTotalCalculator();
-
+  
+  /**
+   * Increments the packet stats by the size of the packet
+   *
+   * \param path not used in this method
+   * \param packet packet size used to update stats
+   */
   void PacketUpdate (std::string path, Ptr<const Packet> packet);
+  
+  /**
+   * Increments the packet stats by the size of the packet
+   *
+   * \param path not used in this method
+   * \param packet packet size used to update stats
+   * \param realto not used in this method
+   */  
   void FrameUpdate (std::string path, Ptr<const Packet> packet,
                     Mac48Address realto);
 
diff -Naur ns-3.18.1/src/network/utils/packet-probe.cc ns-3.19/src/network/utils/packet-probe.cc
--- ns-3.18.1/src/network/utils/packet-probe.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/packet-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PacketProbe);
+NS_OBJECT_ENSURE_REGISTERED (PacketProbe)
+  ;
 
 TypeId
 PacketProbe::GetTypeId ()
diff -Naur ns-3.18.1/src/network/utils/packet-socket.cc ns-3.19/src/network/utils/packet-socket.cc
--- ns-3.18.1/src/network/utils/packet-socket.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/packet-socket.cc	2013-12-20 09:44:50.000000000 -0800
@@ -33,7 +33,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PacketSocket);
+NS_OBJECT_ENSURE_REGISTERED (PacketSocket)
+  ;
 
 TypeId
 PacketSocket::GetTypeId (void)
@@ -536,7 +537,8 @@
   return m_destAddr;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (PacketSocketTag);
+NS_OBJECT_ENSURE_REGISTERED (PacketSocketTag)
+  ;
 
 TypeId
 PacketSocketTag::GetTypeId (void)
@@ -599,7 +601,8 @@
   return m_deviceName;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (DeviceNameTag);
+NS_OBJECT_ENSURE_REGISTERED (DeviceNameTag)
+  ;
 
 TypeId
 DeviceNameTag::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/utils/packet-socket-factory.cc ns-3.19/src/network/utils/packet-socket-factory.cc
--- ns-3.18.1/src/network/utils/packet-socket-factory.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/packet-socket-factory.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory);
+NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory)
+  ;
 
 TypeId 
 PacketSocketFactory::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/utils/pcap-file.cc ns-3.19/src/network/utils/pcap-file.cc
--- ns-3.18.1/src/network/utils/pcap-file.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/pcap-file.cc	2013-12-20 09:44:50.000000000 -0800
@@ -45,7 +45,6 @@
 
 const uint16_t VERSION_MAJOR = 2;             /**< Major version of supported pcap file format */
 const uint16_t VERSION_MINOR = 4;             /**< Minor version of supported pcap file format */
-const int32_t  SIGFIGS_DEFAULT = 0;           /**< Significant figures for timestamps (libpcap doesn't even bother) */
 
 PcapFile::PcapFile ()
   : m_file (),
diff -Naur ns-3.18.1/src/network/utils/pcap-file.h ns-3.19/src/network/utils/pcap-file.h
--- ns-3.18.1/src/network/utils/pcap-file.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/pcap-file.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,12 +31,14 @@
 class Packet;
 class Header;
 
-/*
+
+/**
+ * \brief A class representing a pcap file
+ * 
  * A class representing a pcap file.  This allows easy creation, writing and 
  * reading of files composed of stored packets; which may be viewed using
  * standard tools.
  */
-
 class PcapFile
 {
 public:
diff -Naur ns-3.18.1/src/network/utils/pcap-file-wrapper.cc ns-3.19/src/network/utils/pcap-file-wrapper.cc
--- ns-3.18.1/src/network/utils/pcap-file-wrapper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/pcap-file-wrapper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PcapFileWrapper);
+NS_OBJECT_ENSURE_REGISTERED (PcapFileWrapper)
+  ;
 
 TypeId 
 PcapFileWrapper::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/utils/queue.cc ns-3.19/src/network/utils/queue.cc
--- ns-3.18.1/src/network/utils/queue.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/queue.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Queue);
+NS_OBJECT_ENSURE_REGISTERED (Queue)
+  ;
 
 TypeId 
 Queue::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/utils/queue.h ns-3.19/src/network/utils/queue.h
--- ns-3.18.1/src/network/utils/queue.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/queue.h	2013-12-20 09:44:50.000000000 -0800
@@ -156,7 +156,11 @@
   virtual Ptr<const Packet> DoPeek (void) const = 0;
 
 protected:
-  // called by subclasses to notify parent of packet drops.
+  /**
+   *  \brief Drop a packet 
+   *  \param packet packet that was dropped
+   *  This method is called by subclasses to notify parent (this class) of packet drops.
+   */
   void Drop (Ptr<Packet> packet);
 
 private:
diff -Naur ns-3.18.1/src/network/utils/radiotap-header.cc ns-3.19/src/network/utils/radiotap-header.cc
--- ns-3.18.1/src/network/utils/radiotap-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/radiotap-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader);
+NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader)
+  ;
  
 RadiotapHeader::RadiotapHeader()
   : m_length (8),
diff -Naur ns-3.18.1/src/network/utils/red-queue.cc ns-3.19/src/network/utils/red-queue.cc
--- ns-3.18.1/src/network/utils/red-queue.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/red-queue.cc	2013-12-20 09:44:50.000000000 -0800
@@ -69,7 +69,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RedQueue);
+NS_OBJECT_ENSURE_REGISTERED (RedQueue)
+  ;
 
 TypeId RedQueue::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/network/utils/red-queue.h ns-3.19/src/network/utils/red-queue.h
--- ns-3.18.1/src/network/utils/red-queue.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/red-queue.h	2013-12-20 09:44:50.000000000 -0800
@@ -83,46 +83,43 @@
 {
 public:
   static TypeId GetTypeId (void);
-  /*
+  /**
    * \brief RedQueue Constructor
    *
    * Create a RED queue
    */
   RedQueue ();
 
-  /*
+  /**
    * \brief Destructor
    *
    * Destructor
    */ 
   virtual ~RedQueue ();
 
-  /*
+  /**
    * \brief Stats
    *
    */
   typedef struct
-  {
-    // Early probability drops
-    uint32_t unforcedDrop;
-    // Forced drops, qavg > max threshold
-    uint32_t forcedDrop;
-    // Drops due to queue limits
-    uint32_t qLimDrop;
+  {   
+    uint32_t unforcedDrop;  /// Early probability drops 
+    uint32_t forcedDrop;    /// Forced drops, qavg > max threshold
+    uint32_t qLimDrop;      /// Drops due to queue limits
   } Stats;
 
-  /* 
+  /** 
    * \brief Drop types
    *
    */
   enum
   {
-    DTYPE_NONE,        // Ok, no drop
-    DTYPE_FORCED,      // A "forced" drop
-    DTYPE_UNFORCED,    // An "unforced" (random) drop
+    DTYPE_NONE,        /// Ok, no drop
+    DTYPE_FORCED,      /// A "forced" drop
+    DTYPE_UNFORCED,    /// An "unforced" (random) drop
   };
 
-  /*
+  /**
    * \brief Set the operating mode of this queue.
    *  Set operating mode
    *
@@ -130,7 +127,7 @@
    */
   void SetMode (RedQueue::QueueMode mode);
 
-  /*
+  /**
    * \brief Get the encapsulation mode of this queue.
    * Get the encapsulation mode of this queue
    *
@@ -138,29 +135,29 @@
    */
   RedQueue::QueueMode GetMode (void);
 
-  /*
+  /**
    * \brief Get the current value of the queue in bytes or packets.
    *
    * \returns The queue size in bytes or packets.
    */
   uint32_t GetQueueSize (void);
 
-  /*
+  /**
    * \brief Set the limit of the queue.
    *
    * \param lim The limit in bytes or packets.
    */
   void SetQueueLimit (uint32_t lim);
 
-  /*
+  /**
    * \brief Set the thresh limits of RED.
    *
-   * \param min Minimum thresh in bytes or packets.
-   * \param max Maximum thresh in bytes or packets.
+   * \param minTh Minimum thresh in bytes or packets.
+   * \param maxTh Maximum thresh in bytes or packets.
    */
   void SetTh (double minTh, double maxTh);
 
-  /*
+  /**
    * \brief Get the RED statistics after running.
    *
    * \returns The drop statistics.
diff -Naur ns-3.18.1/src/network/utils/sequence-number.h ns-3.19/src/network/utils/sequence-number.h
--- ns-3.18.1/src/network/utils/sequence-number.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/sequence-number.h	2013-12-20 09:44:50.000000000 -0800
@@ -64,19 +64,30 @@
     : m_value (value)
   {}
 
-  // copy contructor
+  /**
+   * \brief Constructs a SequenceNumber from a copy
+   * \param value sequence number to copy
+   */
   SequenceNumber (SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> const &value)
     : m_value (value.m_value)
   {}
 
-  // assignment from a plain number
+  /**
+   * \brief Constructs a SequenceNumber from an assignment of given value
+   * \param value sequence number to copy
+   * \returns reference to the assignee
+   */
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE>& operator= (NUMERIC_TYPE value)
   {
     m_value = value;
     return *this;
   }
 
-  // assignment from a sequence number
+  /**
+   * \brief Constructs a SequenceNumber from an assignment of another sequence number
+   * \param value sequence number to copy
+   * \returns reference to the assignee
+   */
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE>& operator= (SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> const &value)
   {
     m_value = value.m_value;
@@ -100,14 +111,20 @@
     return m_value;
   }
 
-  // prefix ++
+  /**
+   * \brief Prefix increment operator
+   * \returns incremented sequence number
+   */ 
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> operator++ ()
   {
     m_value++;
     return *this;
   }
 
-  // postfix ++
+  /**
+   * \brief Postfix increment operator
+   * \returns incremented sequence number
+   */ 
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> operator++ (int)
   {
     SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> retval (m_value);
@@ -115,14 +132,20 @@
     return retval;
   }
 
-  // prefix --
+  /**
+   * \brief Prefix decrement operator
+   * \returns decremented sequence number
+   */ 
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> operator-- ()
   {
     m_value--;
     return *this;
   }
 
-  // postfix --
+   /**
+   * \brief Postfix decrement operator
+   * \returns incremented sequence number
+   */ 
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> operator-- (int)
   {
     SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> retval (m_value);
@@ -130,33 +153,63 @@
     return retval;
   }
 
+  /**
+   * \brief Plus equals operator
+   * \param value value to add to sequence number
+   * \returns incremented sequence number
+   */ 
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE>& operator+= (SIGNED_TYPE value)
   {
     m_value += value;
     return *this;
   }
-
+  
+  /**
+   * \brief Minus equals operator
+   * \param value value to subtract from sequence number
+   * \returns decremented sequence number
+   */ 
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE>& operator-= (SIGNED_TYPE value)
   {
     m_value -= value;
     return *this;
   }
 
+  /**
+   * \brief Operator defining addition of two sequence numbers
+   * \param other sequence number added to this
+   * \returns sequence number representing sum
+   */
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> operator + (const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &other) const
   {
     return SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> (m_value + other.m_value);
   }
 
+  /**
+   * \brief Addition operator for adding numeric value to sequence number
+   * \param delta value to add to sequence number
+   * \returns sequence number representing sum
+   */
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> operator + (SIGNED_TYPE delta) const
   {
     return SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> (m_value + delta);
   }
 
+  /**
+   * \brief Subtraction operator for subtracting numeric value from sequence number
+   * \param delta value to subtract from sequence number
+   * \returns sequence number representing difference
+   */
   SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> operator - (SIGNED_TYPE delta) const
   {
     return SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> (m_value - delta);
   }
 
+  /**
+   * \brief Subtraction operator for subtracting sequence number from sequence number
+   * \param other sequence number to subtract from this sequence number
+   * \returns numeric value representing the difference
+   */
   SIGNED_TYPE operator - (const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &other) const
   {
     static const NUMERIC_TYPE maxValue = std::numeric_limits<NUMERIC_TYPE>::max ();
@@ -199,16 +252,18 @@
       }
   }
 
-
-  // Here is the critical part, how the comparison is made taking into
-  // account wrap-around.  From RFC 3626:
-  //
-  //   The sequence number S1 is said to be "greater than" the sequence
-  //    number S2 if:
-  //
-  //           S1 > S2 AND S1 - S2 <= MAXVALUE/2 OR
-  //
-  //           S2 > S1 AND S2 - S1 > MAXVALUE/2
+  /**
+   * Here is the critical part, how the comparison is made taking into
+   * account wrap-around.  From RFC 3626:
+   *
+   * The sequence number S1 is said to be "greater than" the sequence
+   * number S2 if:
+   *      S1 > S2 AND S1 - S2 <= MAXVALUE/2 OR
+   *      S2 > S1 AND S2 - S1 > MAXVALUE/2
+   *
+   * \param other sequence number to compare to this one
+   * \returns true if this sequence number is greater than other
+   */
   bool operator > (const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &other) const
   {
     static const NUMERIC_TYPE halfMaxValue = std::numeric_limits<NUMERIC_TYPE>::max () / 2;
@@ -217,35 +272,71 @@
             || ((other.m_value > m_value) && (other.m_value - m_value) > halfMaxValue));
   }
 
+  /**
+   * \brief Equality operator for comparing sequence number
+   * \param other sequence number to compare to this sequence number
+   * \returns true if the sequence numbers are equal
+   */
   bool operator == (const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &other) const
   {
     return (m_value == other.m_value);
   }
 
+  /**
+   * \brief Inequality operator for comparing sequence numbers
+   * \param other sequence number to compare to this sequence number
+   * \returns true if the sequence numbers are not equal
+   */
   bool operator != (const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &other) const
   {
     return (m_value != other.m_value);
   }
 
+  /**
+   * \brief Less than or equal operator for comparing sequence numbers
+   * \param other sequence number to compare to this sequence number
+   * \returns true if this sequence number is less than or equal to other
+   */
   bool operator <= (const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &other) const
   {
     return (!this->operator> (other));
   }
 
+  /**
+   * \brief Greater than or equal operator for comparing sequence numbers
+   * \param other sequence number to compare to this sequence number
+   * \returns true if this sequence number is greater than or equal to other
+   */
   bool operator >= (const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &other) const
   {
     return (this->operator> (other) || this->operator== (other));
   }
 
+  /**
+   * \brief Less than operator for comparing sequence numbers
+   * \param other sequence number to compare to this sequence number
+   * \returns true if this sequence number is less than other
+   */
   bool operator < (const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &other) const
   {
     return !this->operator> (other) && m_value != other.m_value;
   }
 
-
+  /**
+   * \brief For printing sequence number
+   * \param os output stream
+   * \param val sequence number to display
+   * \returns output stream os
+   */
   template<typename NUMERIC_TYPE2, typename SIGNED_TYPE2>
   friend std::ostream & operator<< (std::ostream& os, const SequenceNumber<NUMERIC_TYPE2, SIGNED_TYPE2> &val);
 
+  /**
+   * \brief For loading sequence number from input streams
+   * \param is input stream
+   * \param val sequence number to load
+   * \returns input stream is
+   */
   template<typename NUMERIC_TYPE2, typename SIGNED_TYPE2>
   friend std::istream & operator >> (std::istream &is, const SequenceNumber<NUMERIC_TYPE2, SIGNED_TYPE2> &val);
 
@@ -271,7 +362,6 @@
   NUMERIC_TYPE m_value;
 };
 
-
 template<typename NUMERIC_TYPE, typename SIGNED_TYPE>
 std::ostream &
 operator<< (std::ostream& os, const SequenceNumber<NUMERIC_TYPE, SIGNED_TYPE> &val)
diff -Naur ns-3.18.1/src/network/utils/simple-channel.cc ns-3.19/src/network/utils/simple-channel.cc
--- ns-3.18.1/src/network/utils/simple-channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/simple-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SimpleChannel);
+NS_OBJECT_ENSURE_REGISTERED (SimpleChannel)
+  ;
 
 TypeId 
 SimpleChannel::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/utils/simple-channel.h ns-3.19/src/network/utils/simple-channel.h
--- ns-3.18.1/src/network/utils/simple-channel.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/simple-channel.h	2013-12-20 09:44:50.000000000 -0800
@@ -39,10 +39,27 @@
   static TypeId GetTypeId (void);
   SimpleChannel ();
 
-  void Send (Ptr<Packet> p, uint16_t protocol, Mac48Address to, Mac48Address from,
-             Ptr<SimpleNetDevice> sender);
+  /**
+   * A packet is sent by a net device.  A receive event will be 
+   * scheduled for all net device connected to the channel other 
+   * than the net device who sent the packet
+   *
+   * \param p packet to be sent
+   * \param protocol protocol number
+   * \param to address to send packet to
+   * \param from address the packet is coming from
+   * \param sender netdevice who sent the packet
+   *
+   */
+  virtual void Send (Ptr<Packet> p, uint16_t protocol, Mac48Address to, Mac48Address from,
+                     Ptr<SimpleNetDevice> sender);
 
-  void Add (Ptr<SimpleNetDevice> device);
+  /**
+   * Attached a net device to the channel.
+   *
+   * \param device the device to attach to the channel
+   */ 
+  virtual void Add (Ptr<SimpleNetDevice> device);
 
   // inherited from ns3::Channel
   virtual uint32_t GetNDevices (void) const;
diff -Naur ns-3.18.1/src/network/utils/simple-net-device.cc ns-3.19/src/network/utils/simple-net-device.cc
--- ns-3.18.1/src/network/utils/simple-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/simple-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice)
+  ;
 
 TypeId 
 SimpleNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/network/utils/simple-net-device.h ns-3.19/src/network/utils/simple-net-device.h
--- ns-3.18.1/src/network/utils/simple-net-device.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/utils/simple-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -48,7 +48,26 @@
   static TypeId GetTypeId (void);
   SimpleNetDevice ();
 
+  /**
+   * Receive a packet from a connected SimpleChannel.  The 
+   * SimpleNetDevice receives packets from its connected channel
+   * and then forwards them by calling its rx callback method
+   *
+   * \param packet Packet received on the channel
+   * \param protocol protocol number
+   * \param to address packet should be sent to
+   * \param from address packet was sent from
+   */
   void Receive (Ptr<Packet> packet, uint16_t protocol, Mac48Address to, Mac48Address from);
+  
+  /**
+   *
+   * Attach a channel to this net device.  This will be the 
+   * channel the net device sends on
+   * 
+   * \param channel channel to assign to this net device
+   *
+   */
   void SetChannel (Ptr<SimpleChannel> channel);
 
   /**
diff -Naur ns-3.18.1/src/network/wscript ns-3.19/src/network/wscript
--- ns-3.18.1/src/network/wscript	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/network/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -25,6 +25,7 @@
         'model/trailer.cc',
         'utils/address-utils.cc',
         'utils/ascii-file.cc',
+        'utils/crc32.cc',
         'utils/data-rate.cc',
         'utils/drop-tail-queue.cc',
         'utils/error-model.cc',
@@ -102,6 +103,7 @@
         'utils/address-utils.h',
         'utils/ascii-file.h',
         'utils/ascii-test.h',
+        'utils/crc32.h',
         'utils/data-rate.h',
         'utils/drop-tail-queue.h',
         'utils/error-model.h',
diff -Naur ns-3.18.1/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py ns-3.19/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -235,7 +235,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1574,10 +1574,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4092,6 +4093,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4102,6 +4108,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4117,6 +4128,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4142,6 +4158,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py ns-3.19/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -235,7 +235,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1574,10 +1574,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4092,6 +4093,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4102,6 +4108,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4117,6 +4128,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4142,6 +4158,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/nix-vector-routing/doc/nix-vector-routing.h ns-3.19/src/nix-vector-routing/doc/nix-vector-routing.h
--- ns-3.18.1/src/nix-vector-routing/doc/nix-vector-routing.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/nix-vector-routing/doc/nix-vector-routing.h	2013-12-20 09:44:50.000000000 -0800
@@ -19,7 +19,7 @@
  */
 
 /**
- * \defgroup nixvectorrouting Nix-Vector Routing
+ * \defgroup nix-vector-routing Nix-Vector Routing
  *
  * \section model Model
  *
diff -Naur ns-3.18.1/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc ns-3.19/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
--- ns-3.18.1/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ipv4NixVectorRouting);
+NS_OBJECT_ENSURE_REGISTERED (Ipv4NixVectorRouting)
+  ;
 
 TypeId 
 Ipv4NixVectorRouting::GetTypeId (void)
diff -Naur ns-3.18.1/src/nix-vector-routing/model/ipv4-nix-vector-routing.h ns-3.19/src/nix-vector-routing/model/ipv4-nix-vector-routing.h
--- ns-3.18.1/src/nix-vector-routing/model/ipv4-nix-vector-routing.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/nix-vector-routing/model/ipv4-nix-vector-routing.h	2013-12-20 09:44:50.000000000 -0800
@@ -35,15 +35,18 @@
 namespace ns3 {
 
 /**
+ * \ingroup nix-vector-routing
  * Map of Ipv4Address to NixVector
  */
 typedef std::map<Ipv4Address, Ptr<NixVector> > NixMap_t;
 /**
+ * \ingroup nix-vector-routing
  * Map of Ipv4Address to Ipv4Route
  */
 typedef std::map<Ipv4Address, Ptr<Ipv4Route> > Ipv4RouteMap_t;
 
 /**
+ * \ingroup nix-vector-routing
  * Nix-vector routing protocol
  */
 class Ipv4NixVectorRouting : public Ipv4RoutingProtocol
diff -Naur ns-3.18.1/src/olsr/bindings/modulegen__gcc_ILP32.py ns-3.19/src/olsr/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/olsr/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/olsr/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -237,7 +237,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1729,10 +1729,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4451,6 +4452,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4461,6 +4467,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4476,6 +4487,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4501,6 +4517,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/olsr/bindings/modulegen__gcc_LP64.py ns-3.19/src/olsr/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/olsr/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/olsr/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -237,7 +237,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1729,10 +1729,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4451,6 +4452,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -4461,6 +4467,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -4476,6 +4487,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -4501,6 +4517,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/olsr/doc/olsr.rst ns-3.19/src/olsr/doc/olsr.rst
--- ns-3.18.1/src/olsr/doc/olsr.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/olsr/doc/olsr.rst	2013-12-20 09:44:50.000000000 -0800
@@ -22,10 +22,10 @@
 
 The model is for IPv4 only.  
 
-* Mostly compliant with OLSR as documented in [rfc3626]_, 
+* Mostly compliant with OLSR as documented in :rfc:`3626`, 
 * The use of multiple interfaces was not supported by the NS-2 version, but is supported in NS-3;
 * OLSR does not respond to the routing event notifications corresponding to dynamic interface up and down (``ns3::RoutingProtocol::NotifyInterfaceUp`` and ``ns3::RoutingProtocol::NotifyInterfaceDown``) or address insertion/removal ``ns3::RoutingProtocol::NotifyAddAddress`` and ``ns3::RoutingProtocol::NotifyRemoveAddress``).
-* Unlike the NS-2 version, does not yet support MAC layer feedback as described in RFC 3626;
+* Unlike the NS-2 version, does not yet support MAC layer feedback as described in :rfc:`3626`;
 
 Host Network Association (HNA) is supported in this implementation
 of OLSR. Refer to ``examples/olsr-hna.cc`` to see how the API
@@ -34,7 +34,7 @@
 References
 ++++++++++
 
-.. [rfc3626] RFC 3626 *Optimized Link State Routing*
+.. [rfc3626] :rfc:`3626` *Optimized Link State Routing*
 
 Usage
 *****
diff -Naur ns-3.18.1/src/olsr/model/olsr-header.cc ns-3.19/src/olsr/model/olsr-header.cc
--- ns-3.18.1/src/olsr/model/olsr-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/olsr/model/olsr-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -96,7 +96,8 @@
 
 // ---------------- OLSR Packet -------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (PacketHeader);
+NS_OBJECT_ENSURE_REGISTERED (PacketHeader)
+  ;
 
 PacketHeader::PacketHeader ()
 {
@@ -153,7 +154,8 @@
 
 // ---------------- OLSR Message -------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (MessageHeader);
+NS_OBJECT_ENSURE_REGISTERED (MessageHeader)
+  ;
 
 MessageHeader::MessageHeader ()
   : m_messageType (MessageHeader::MessageType (0))
diff -Naur ns-3.18.1/src/olsr/model/olsr-routing-protocol.cc ns-3.19/src/olsr/model/olsr-routing-protocol.cc
--- ns-3.18.1/src/olsr/model/olsr-routing-protocol.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/olsr/model/olsr-routing-protocol.cc	2013-12-20 09:44:50.000000000 -0800
@@ -146,7 +146,8 @@
 
 /********** OLSR class **********/
 
-NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol);
+NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol)
+  ;
 
 TypeId 
 RoutingProtocol::GetTypeId (void)
diff -Naur ns-3.18.1/src/openflow/doc/openflow-switch.rst ns-3.19/src/openflow/doc/openflow-switch.rst
--- ns-3.18.1/src/openflow/doc/openflow-switch.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/openflow/doc/openflow-switch.rst	2013-12-20 09:44:51.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: bash
 
 OpenFlow switch support
 -----------------------
@@ -62,14 +63,18 @@
 The OpenFlow switch device behaves somewhat according to the diagram setup as a classical OFSID
 switch, with a few modifications made for a proper simulation environment.
 
-Normal OF-enabled Switch:::
+Normal OF-enabled Switch:
+
+.. sourcecode:: text
   
   | Secure Channel                  | <--OF Protocol--> | Controller is external |
   | Hardware or Software Flow Table |
  
 
-ns-3 OF-enabled Switch (module):::
+ns-3 OF-enabled Switch (module):
 
+.. sourcecode:: text
+  
   | m_controller->ReceiveFromSwitch() | <--OF Protocol--> | Controller is internal |
   | Software Flow Table, virtual TCAM |
 
@@ -132,42 +137,45 @@
 OFSID (OpenFlow Software Implementation Distribution) to ns-3.
 To do this:
 
-#1 Obtain the OFSID code. An ns-3 specific OFSID branch is provided to ensure
-operation with ns-3. Use mercurial to download this branch and waf to build 
-the library::: 
+1. Obtain the OFSID code.
+   An ns-3 specific OFSID branch is provided to ensure
+   operation with ns-3. Use mercurial to download this branch and waf to build 
+   the library::
 
-  $ hg clone http://code.nsnam.org/openflow
-  $ cd openflow
+     $ hg clone http://code.nsnam.org/openflow
+     $ cd openflow
 
-From the "openflow" directory, run:::
+   From the "openflow" directory, run::
      
-  $ ./waf configure
-  $ ./waf build
+     $ ./waf configure
+     $ ./waf build
 
-#2 Your OFSID is now built into a libopenflow.a library!   To
-link to an ns-3 build with this OpenFlow switch module, run from the ns-3-dev
-(or whatever you have named your distribution):::
+2. Your OFSID is now built into a libopenflow.a library!
+   To link to an ns-3 build with this OpenFlow switch module, run from the ns-3-dev
+   (or whatever you have named your distribution)::
 
-  $ ./waf configure --enable-examples --enable-tests --with-openflow=path/to/openflow
+     $ ./waf configure --enable-examples --enable-tests --with-openflow=path/to/openflow
 
-#3 Under ``---- Summary of optional NS-3 features:`` you should see:::
+3. Under ``---- Summary of optional NS-3 features:`` you should see:
 
-   "NS-3 OpenFlow Integration     : enabled"
+   .. sourcecode:: text
+  
+     "NS-3 OpenFlow Integration     : enabled"
 
-indicating the library has been linked to ns-3. Run:::
+   indicating the library has been linked to ns-3. Run::
 
-   $ ./waf build
+     $ ./waf build
 
 to build ns-3 and activate the OpenFlowSwitch module in ns-3.
 
 Examples
 ========
 For an example demonstrating its use in a simple learning controller/switch, 
-run:::
+run::
 
   $ ./waf --run openflow-switch
 
-To see it in detailed logging, run:::
+To see it in detailed logging, run::
 
   $ ./waf --run "openflow-switch -v"
 
@@ -219,7 +227,7 @@
 Validation
 **********
 
-This model has one test suite which can be run as follows:::
+This model has one test suite which can be run as follows::
 
   $ ./test.py --suite=openflow
 
diff -Naur ns-3.18.1/src/openflow/model/openflow-switch-net-device.cc ns-3.19/src/openflow/model/openflow-switch-net-device.cc
--- ns-3.18.1/src/openflow/model/openflow-switch-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/openflow/model/openflow-switch-net-device.cc	2013-12-20 09:44:51.000000000 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (OpenFlowSwitchNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (OpenFlowSwitchNetDevice)
+  ;
 
 const char *
 OpenFlowSwitchNetDevice::GetManufacturerDescription ()
diff -Naur ns-3.18.1/src/point-to-point/bindings/modulegen__gcc_ILP32.py ns-3.19/src/point-to-point/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/point-to-point/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:51.000000000 -0800
@@ -171,7 +171,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1445,10 +1445,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3352,6 +3353,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3362,6 +3368,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3377,6 +3388,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3402,6 +3418,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5544,14 +5565,14 @@
     cls.add_method('SetBurstRate', 
                    'void', 
                    [param('double', 'rate')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> burstSz) [member function]
     cls.add_method('SetRandomBurstSize', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'burstSz')])
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> ranVar) [member function]
     cls.add_method('SetRandomVariable', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'ranVar')])
     ## error-model.h (module 'network'): bool ns3::BurstErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('DoCorrupt', 
                    'bool', 
diff -Naur ns-3.18.1/src/point-to-point/bindings/modulegen__gcc_LP64.py ns-3.19/src/point-to-point/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/point-to-point/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:51.000000000 -0800
@@ -171,7 +171,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1445,10 +1445,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3352,6 +3353,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3362,6 +3368,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3377,6 +3388,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3402,6 +3418,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -5544,14 +5565,14 @@
     cls.add_method('SetBurstRate', 
                    'void', 
                    [param('double', 'rate')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomBurstSize(ns3::Ptr<ns3::RandomVariableStream> burstSz) [member function]
     cls.add_method('SetRandomBurstSize', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
-    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> arg0) [member function]
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'burstSz')])
+    ## error-model.h (module 'network'): void ns3::BurstErrorModel::SetRandomVariable(ns3::Ptr<ns3::RandomVariableStream> ranVar) [member function]
     cls.add_method('SetRandomVariable', 
                    'void', 
-                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'arg0')])
+                   [param('ns3::Ptr< ns3::RandomVariableStream >', 'ranVar')])
     ## error-model.h (module 'network'): bool ns3::BurstErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('DoCorrupt', 
                    'bool', 
diff -Naur ns-3.18.1/src/point-to-point/doc/point-to-point.rst ns-3.19/src/point-to-point/doc/point-to-point.rst
--- ns-3.18.1/src/point-to-point/doc/point-to-point.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/doc/point-to-point.rst	2013-12-20 09:44:51.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 PointToPoint NetDevice
 ----------------------
@@ -76,7 +77,7 @@
 The conceptual model of interest is that of a bare computer "husk" into which
 you plug net devices. The bare computers are created using a ``NodeContainer``
 helper. You just ask this helper to create as many computers (we call them
-``Nodes``) as you need on your network:::
+``Nodes``) as you need on your network::
 
   NodeContainer nodes;
   nodes.Create (2);
@@ -119,7 +120,7 @@
 When a packet is sent to the Point-to-Point net device for transmission it
 always passes through the transmit queue. The transmit queue in the
 PointToPointNetDevice inherits from Queue, and therefore inherits three trace
-sources:::
+sources:
 
 * An Enqueue operation source (see ns3::Queue::m_traceEnqueue);
 * A Dequeue operation source (see ns3::Queue::m_traceDequeue);
diff -Naur ns-3.18.1/src/point-to-point/helper/point-to-point-helper.cc ns-3.19/src/point-to-point/helper/point-to-point-helper.cc
--- ns-3.18.1/src/point-to-point/helper/point-to-point-helper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/helper/point-to-point-helper.cc	2013-12-20 09:44:51.000000000 -0800
@@ -241,6 +241,7 @@
   //use a normal p2p channel, otherwise use a remote channel
   bool useNormalChannel = true;
   Ptr<PointToPointChannel> channel = 0;
+
   if (MpiInterface::IsEnabled ())
     {
       uint32_t n1SystemId = a->GetSystemId ();
diff -Naur ns-3.18.1/src/point-to-point/model/point-to-point-channel.cc ns-3.19/src/point-to-point/model/point-to-point-channel.cc
--- ns-3.18.1/src/point-to-point/model/point-to-point-channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/model/point-to-point-channel.cc	2013-12-20 09:44:51.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel);
+NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel)
+  ;
 
 TypeId 
 PointToPointChannel::GetTypeId (void)
diff -Naur ns-3.18.1/src/point-to-point/model/point-to-point-net-device.cc ns-3.19/src/point-to-point/model/point-to-point-net-device.cc
--- ns-3.18.1/src/point-to-point/model/point-to-point-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/model/point-to-point-net-device.cc	2013-12-20 09:44:51.000000000 -0800
@@ -25,7 +25,6 @@
 #include "ns3/trace-source-accessor.h"
 #include "ns3/uinteger.h"
 #include "ns3/pointer.h"
-#include "ns3/mpi-interface.h"
 #include "point-to-point-net-device.h"
 #include "point-to-point-channel.h"
 #include "ppp-header.h"
@@ -34,7 +33,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice)
+  ;
 
 TypeId 
 PointToPointNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/point-to-point/model/point-to-point-net-device.h ns-3.19/src/point-to-point/model/point-to-point-net-device.h
--- ns-3.18.1/src/point-to-point/model/point-to-point-net-device.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/model/point-to-point-net-device.h	2013-12-20 09:44:51.000000000 -0800
@@ -38,7 +38,7 @@
 class ErrorModel;
 
 /**
- * \defgroup point-to-point PointToPointNetDevice
+ * \defgroup point-to-point Point-To-Point Network Device
  * This section documents the API of the ns-3 point-to-point module. For a generic functional description, please refer to the ns-3 manual.
  */
 
diff -Naur ns-3.18.1/src/point-to-point/model/point-to-point-remote-channel.cc ns-3.19/src/point-to-point/model/point-to-point-remote-channel.cc
--- ns-3.18.1/src/point-to-point/model/point-to-point-remote-channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/model/point-to-point-remote-channel.cc	2013-12-20 09:44:51.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PointToPointRemoteChannel);
+NS_OBJECT_ENSURE_REGISTERED (PointToPointRemoteChannel)
+  ;
 
 TypeId
 PointToPointRemoteChannel::GetTypeId (void)
diff -Naur ns-3.18.1/src/point-to-point/model/ppp-header.cc ns-3.19/src/point-to-point/model/ppp-header.cc
--- ns-3.18.1/src/point-to-point/model/ppp-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point/model/ppp-header.cc	2013-12-20 09:44:51.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PppHeader);
+NS_OBJECT_ENSURE_REGISTERED (PppHeader)
+  ;
 
 PppHeader::PppHeader ()
 {
diff -Naur ns-3.18.1/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py ns-3.19/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:51.000000000 -0800
@@ -265,7 +265,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1888,10 +1888,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4997,6 +4998,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5007,6 +5013,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5022,6 +5033,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5047,6 +5063,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -6475,10 +6496,10 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
-    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interfaceIndex, ns3::Ipv6Address address) [member function]
     cls.add_method('RemoveAddress', 
                    'bool', 
-                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   [param('uint32_t', 'interfaceIndex'), param('ns3::Ipv6Address', 'address')], 
                    is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
diff -Naur ns-3.18.1/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py ns-3.19/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:51.000000000 -0800
@@ -265,7 +265,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1888,10 +1888,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -4997,6 +4998,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5007,6 +5013,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5022,6 +5033,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5047,6 +5063,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -6475,10 +6496,10 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
-    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interfaceIndex, ns3::Ipv6Address address) [member function]
     cls.add_method('RemoveAddress', 
                    'bool', 
-                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   [param('uint32_t', 'interfaceIndex'), param('ns3::Ipv6Address', 'address')], 
                    is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
diff -Naur ns-3.18.1/src/point-to-point-layout/model/point-to-point-dumbbell.h ns-3.19/src/point-to-point-layout/model/point-to-point-dumbbell.h
--- ns-3.18.1/src/point-to-point-layout/model/point-to-point-dumbbell.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point-layout/model/point-to-point-dumbbell.h	2013-12-20 09:44:51.000000000 -0800
@@ -33,7 +33,7 @@
 namespace ns3 {
 
 /**
- * \ingroup pointtopointlayout
+ * \ingroup point-to-point-layout
  *
  * \brief A helper to make it easier to create a dumbbell topology
  * with p2p links
diff -Naur ns-3.18.1/src/point-to-point-layout/model/point-to-point-grid.h ns-3.19/src/point-to-point-layout/model/point-to-point-grid.h
--- ns-3.18.1/src/point-to-point-layout/model/point-to-point-grid.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point-layout/model/point-to-point-grid.h	2013-12-20 09:44:51.000000000 -0800
@@ -32,7 +32,7 @@
 namespace ns3 {
 
 /**
- * \ingroup pointtopointlayout
+ * \ingroup point-to-point-layout
  *
  * \brief A helper to make it easier to create a grid topology
  * with p2p links
diff -Naur ns-3.18.1/src/point-to-point-layout/model/point-to-point-star.h ns-3.19/src/point-to-point-layout/model/point-to-point-star.h
--- ns-3.18.1/src/point-to-point-layout/model/point-to-point-star.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/point-to-point-layout/model/point-to-point-star.h	2013-12-20 09:44:51.000000000 -0800
@@ -31,12 +31,12 @@
 namespace ns3 {
 
 /**
- * \defgroup pointtopointlayout Point-to-Point Layout Helpers
+ * \defgroup point-to-point-layout Point-to-Point Layout Helpers
  *
  */
 
 /**
- * \ingroup pointtopointlayout
+ * \ingroup point-to-point-layout
  *
  * \brief A helper to make it easier to create a star topology
  * with PointToPoint links
diff -Naur ns-3.18.1/src/propagation/bindings/modulegen__gcc_ILP32.py ns-3.19/src/propagation/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/propagation/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/propagation/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:51.000000000 -0800
@@ -91,7 +91,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1273,6 +1273,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -1283,6 +1288,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -1298,6 +1308,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -1323,6 +1338,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/propagation/bindings/modulegen__gcc_LP64.py ns-3.19/src/propagation/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/propagation/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:51.000000000 -0800
@@ -91,7 +91,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1273,6 +1273,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -1283,6 +1288,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -1298,6 +1308,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -1323,6 +1338,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/propagation/doc/propagation.rst ns-3.19/src/propagation/doc/propagation.rst
--- ns-3.18.1/src/propagation/doc/propagation.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/doc/propagation.rst	2013-12-20 09:44:51.000000000 -0800
@@ -111,6 +111,7 @@
 and for large cities
 
 .. math::
+
   C_\mathrm{H} = \left\{\begin{array}{ll} 8.29 (\log{(1.54h_M)})^2 -1.1 & \mbox{if } 150\leq f\leq 200 \\ 3.2(\log{(11.75h_M)})^2 -4.97 & \mbox{if } 200<f\leq 1500\end{array} \right.
 
 There extension for the standard OH in suburban is
diff -Naur ns-3.18.1/src/propagation/model/cost231-propagation-loss-model.cc ns-3.19/src/propagation/model/cost231-propagation-loss-model.cc
--- ns-3.18.1/src/propagation/model/cost231-propagation-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/cost231-propagation-loss-model.cc	2013-12-20 09:44:51.000000000 -0800
@@ -29,8 +29,10 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel");
-NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel);
+NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel)
+  ;
 
 TypeId
 Cost231PropagationLossModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc ns-3.19/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc
--- ns-3.18.1/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc	2013-12-20 09:44:51.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ItuR1411LosPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (ItuR1411LosPropagationLossModel)
+  ;
 
 TypeId
 ItuR1411LosPropagationLossModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc ns-3.19/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc
--- ns-3.18.1/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc	2013-12-20 09:44:51.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ItuR1411NlosOverRooftopPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (ItuR1411NlosOverRooftopPropagationLossModel)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/propagation/model/jakes-process.cc ns-3.19/src/propagation/model/jakes-process.cc
--- ns-3.18.1/src/propagation/model/jakes-process.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/jakes-process.cc	2013-12-20 09:44:51.000000000 -0800
@@ -43,7 +43,8 @@
   return (m_amplitude * std::cos (at.GetSeconds () * m_omega + m_phase));
 }
 
-NS_OBJECT_ENSURE_REGISTERED (JakesProcess);
+NS_OBJECT_ENSURE_REGISTERED (JakesProcess)
+  ;
 
 TypeId
 JakesProcess::GetTypeId ()
diff -Naur ns-3.18.1/src/propagation/model/jakes-propagation-loss-model.cc ns-3.19/src/propagation/model/jakes-propagation-loss-model.cc
--- ns-3.18.1/src/propagation/model/jakes-propagation-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/jakes-propagation-loss-model.cc	2013-12-20 09:44:51.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3
 {
-NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel)
+  ;
 
 
 const double JakesPropagationLossModel::PI = 3.14159265358979323846;
diff -Naur ns-3.18.1/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc ns-3.19/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc
--- ns-3.18.1/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc	2013-12-20 09:44:51.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Kun2600MhzPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (Kun2600MhzPropagationLossModel)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/propagation/model/okumura-hata-propagation-loss-model.cc ns-3.19/src/propagation/model/okumura-hata-propagation-loss-model.cc
--- ns-3.18.1/src/propagation/model/okumura-hata-propagation-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/okumura-hata-propagation-loss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (OkumuraHataPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (OkumuraHataPropagationLossModel)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/propagation/model/propagation-delay-model.cc ns-3.19/src/propagation/model/propagation-delay-model.cc
--- ns-3.18.1/src/propagation/model/propagation-delay-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/propagation-delay-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel);
+NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel)
+  ;
 
 TypeId 
 PropagationDelayModel::GetTypeId (void)
@@ -48,7 +49,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (RandomPropagationDelayModel);
+NS_OBJECT_ENSURE_REGISTERED (RandomPropagationDelayModel)
+  ;
 
 TypeId
 RandomPropagationDelayModel::GetTypeId (void)
@@ -84,7 +86,8 @@
   return 1;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (ConstantSpeedPropagationDelayModel);
+NS_OBJECT_ENSURE_REGISTERED (ConstantSpeedPropagationDelayModel)
+  ;
 
 TypeId
 ConstantSpeedPropagationDelayModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/propagation/model/propagation-loss-model.cc ns-3.19/src/propagation/model/propagation-loss-model.cc
--- ns-3.18.1/src/propagation/model/propagation-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/model/propagation-loss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (PropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (PropagationLossModel)
+  ;
 
 TypeId 
 PropagationLossModel::GetTypeId (void)
@@ -95,7 +96,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel)
+  ;
 
 TypeId 
 RandomPropagationLossModel::GetTypeId (void)
@@ -138,7 +140,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel)
+  ;
 
 const double FriisPropagationLossModel::PI = 3.14159265358979323846;
 
@@ -275,7 +278,8 @@
 // ------------------------------------------------------------------------- //
 // -- Two-Ray Ground Model ported from NS-2 -- tomhewer@mac.com -- Nov09 //
 
-NS_OBJECT_ENSURE_REGISTERED (TwoRayGroundPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (TwoRayGroundPropagationLossModel)
+  ;
 
 const double TwoRayGroundPropagationLossModel::PI = 3.14159265358979323846;
 
@@ -449,7 +453,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel)
+  ;
 
 TypeId
 LogDistancePropagationLossModel::GetTypeId (void)
@@ -537,7 +542,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (ThreeLogDistancePropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (ThreeLogDistancePropagationLossModel)
+  ;
 
 TypeId
 ThreeLogDistancePropagationLossModel::GetTypeId (void)
@@ -638,7 +644,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (NakagamiPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (NakagamiPropagationLossModel)
+  ;
 
 TypeId
 NakagamiPropagationLossModel::GetTypeId (void)
@@ -752,7 +759,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (FixedRssLossModel);
+NS_OBJECT_ENSURE_REGISTERED (FixedRssLossModel)
+  ;
 
 TypeId 
 FixedRssLossModel::GetTypeId (void)
@@ -798,7 +806,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (MatrixPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (MatrixPropagationLossModel)
+  ;
 
 TypeId 
 MatrixPropagationLossModel::GetTypeId (void)
@@ -877,7 +886,8 @@
 
 // ------------------------------------------------------------------------- //
 
-NS_OBJECT_ENSURE_REGISTERED (RangePropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (RangePropagationLossModel)
+  ;
 
 TypeId
 RangePropagationLossModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/propagation/test/itu-r-1411-los-test-suite.cc ns-3.19/src/propagation/test/itu-r-1411-los-test-suite.cc
--- ns-3.18.1/src/propagation/test/itu-r-1411-los-test-suite.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/test/itu-r-1411-los-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("ItuR1411LosPropagationLossModelTest");
+NS_LOG_COMPONENT_DEFINE ("ItuR1411LosPropagationLossModelTest")
+  ;
 
 
 class ItuR1411LosPropagationLossModelTestCase : public TestCase
diff -Naur ns-3.18.1/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc ns-3.19/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc
--- ns-3.18.1/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("ItuR1411NlosOverRooftopPropagationLossModelTest");
+NS_LOG_COMPONENT_DEFINE ("ItuR1411NlosOverRooftopPropagationLossModelTest")
+  ;
 
 
 class ItuR1411NlosOverRooftopPropagationLossModelTestCase : public TestCase
diff -Naur ns-3.18.1/src/propagation/test/kun-2600-mhz-test-suite.cc ns-3.19/src/propagation/test/kun-2600-mhz-test-suite.cc
--- ns-3.18.1/src/propagation/test/kun-2600-mhz-test-suite.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/test/kun-2600-mhz-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Kun2600MhzPropagationLossModelTest");
+NS_LOG_COMPONENT_DEFINE ("Kun2600MhzPropagationLossModelTest")
+  ;
 
 
 class Kun2600MhzPropagationLossModelTestCase : public TestCase
diff -Naur ns-3.18.1/src/propagation/test/okumura-hata-test-suite.cc ns-3.19/src/propagation/test/okumura-hata-test-suite.cc
--- ns-3.18.1/src/propagation/test/okumura-hata-test-suite.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/propagation/test/okumura-hata-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModelTest");
+NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModelTest")
+  ;
 
 
 class OkumuraHataPropagationLossModelTestCase : public TestCase
diff -Naur ns-3.18.1/src/sixlowpan/bindings/callbacks_list.py ns-3.19/src/sixlowpan/bindings/callbacks_list.py
--- ns-3.18.1/src/sixlowpan/bindings/callbacks_list.py	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/bindings/callbacks_list.py	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,4 @@
+callback_classes = [
+    ['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'],
+]
diff -Naur ns-3.18.1/src/sixlowpan/bindings/modulegen__gcc_ILP32.py ns-3.19/src/sixlowpan/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/sixlowpan/bindings/modulegen__gcc_ILP32.py	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,5163 @@
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
+
+
+import pybindgen.settings
+import warnings
+
+class ErrorHandler(pybindgen.settings.ErrorHandler):
+    def handle_error(self, wrapper, exception, traceback_):
+        warnings.warn("exception %r in wrapper %s" % (exception, wrapper))
+        return True
+pybindgen.settings.error_handler = ErrorHandler()
+
+
+import sys
+
+def module_init():
+    root_module = Module('ns.sixlowpan', cpp_namespace='::ns3')
+    return root_module
+
+def register_types(module):
+    root_module = module.get_root()
+    
+    ## address.h (module 'network'): ns3::Address [class]
+    module.add_class('Address', import_from_module='ns.network')
+    ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
+    module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network')
+    ## 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]
+    module.add_class('Item', import_from_module='ns.core', outer_class=root_module['ns3::AttributeConstructionList'])
+    ## buffer.h (module 'network'): ns3::Buffer [class]
+    module.add_class('Buffer', import_from_module='ns.network')
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator [class]
+    module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::Buffer'])
+    ## packet.h (module 'network'): ns3::ByteTagIterator [class]
+    module.add_class('ByteTagIterator', import_from_module='ns.network')
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item [class]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagIterator'])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList [class]
+    module.add_class('ByteTagList', import_from_module='ns.network')
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator [class]
+    module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList'])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item [struct]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList::Iterator'])
+    ## callback.h (module 'core'): ns3::CallbackBase [class]
+    module.add_class('CallbackBase', import_from_module='ns.core')
+    ## event-id.h (module 'core'): ns3::EventId [class]
+    module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
+    module.add_class('Ipv4Address', import_from_module='ns.network')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
+    root_module['ns3::Ipv4Address'].implicitly_converts_to(root_module['ns3::Address'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask [class]
+    module.add_class('Ipv4Mask', import_from_module='ns.network')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address [class]
+    module.add_class('Ipv6Address', import_from_module='ns.network')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address [class]
+    root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix [class]
+    module.add_class('Ipv6Prefix', import_from_module='ns.network')
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer [class]
+    module.add_class('NetDeviceContainer', import_from_module='ns.network')
+    ## object-base.h (module 'core'): ns3::ObjectBase [class]
+    module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core')
+    ## object.h (module 'core'): ns3::ObjectDeleter [struct]
+    module.add_class('ObjectDeleter', import_from_module='ns.core')
+    ## object-factory.h (module 'core'): ns3::ObjectFactory [class]
+    module.add_class('ObjectFactory', import_from_module='ns.core')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class]
+    module.add_class('PacketMetadata', import_from_module='ns.network')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata'])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [enumeration]
+    module.add_enum('', ['PAYLOAD', 'HEADER', 'TRAILER'], outer_class=root_module['ns3::PacketMetadata::Item'], import_from_module='ns.network')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator [class]
+    module.add_class('ItemIterator', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata'])
+    ## packet.h (module 'network'): ns3::PacketTagIterator [class]
+    module.add_class('PacketTagIterator', import_from_module='ns.network')
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item [class]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagIterator'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList [class]
+    module.add_class('PacketTagList', import_from_module='ns.network')
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
+    module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch [class]
+    module.add_class('SixLowPanDispatch')
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::Dispatch_e [enumeration]
+    module.add_enum('Dispatch_e', ['LOWPAN_NALP', 'LOWPAN_NALP_N', 'LOWPAN_NOTCOMPRESSED', 'LOWPAN_HC1', 'LOWPAN_BC0', 'LOWPAN_IPHC', 'LOWPAN_IPHC_N', 'LOWPAN_MESH', 'LOWPAN_MESH_N', 'LOWPAN_FRAG1', 'LOWPAN_FRAG1_N', 'LOWPAN_FRAGN', 'LOWPAN_FRAGN_N', 'LOWPAN_UNSUPPORTED'], outer_class=root_module['ns3::SixLowPanDispatch'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::NhcDispatch_e [enumeration]
+    module.add_enum('NhcDispatch_e', ['LOWPAN_NHC', 'LOWPAN_NHC_N', 'LOWPAN_UDPNHC', 'LOWPAN_UDPNHC_N', 'LOWPAN_NHCUNSUPPORTED'], outer_class=root_module['ns3::SixLowPanDispatch'])
+    ## sixlowpan-helper.h (module 'sixlowpan'): ns3::SixLowPanHelper [class]
+    module.add_class('SixLowPanHelper')
+    ## tag.h (module 'network'): ns3::Tag [class]
+    module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer [class]
+    module.add_class('TagBuffer', import_from_module='ns.network')
+    ## type-id.h (module 'core'): ns3::TypeId [class]
+    module.add_class('TypeId', import_from_module='ns.core')
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]
+    module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation [struct]
+    module.add_class('AttributeInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]
+    module.add_class('TraceSourceInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
+    ## empty.h (module 'core'): ns3::empty [class]
+    module.add_class('empty', import_from_module='ns.core')
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t [class]
+    module.add_class('int64x64_t', import_from_module='ns.core')
+    ## chunk.h (module 'network'): ns3::Chunk [class]
+    module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
+    ## header.h (module 'network'): ns3::Header [class]
+    module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
+    module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
+    module.add_enum('NextHeader_e', ['IPV6_EXT_HOP_BY_HOP', 'IPV6_IPV4', 'IPV6_TCP', 'IPV6_UDP', 'IPV6_IPV6', 'IPV6_EXT_ROUTING', 'IPV6_EXT_FRAGMENTATION', 'IPV6_EXT_CONFIDENTIALITY', 'IPV6_EXT_AUTHENTIFICATION', 'IPV6_ICMPV6', 'IPV6_EXT_END', 'IPV6_EXT_DESTINATION', 'IPV6_SCTP', 'IPV6_EXT_MOBILITY', 'IPV6_UDP_LITE'], outer_class=root_module['ns3::Ipv6Header'], import_from_module='ns.internet')
+    ## object.h (module 'core'): ns3::Object [class]
+    module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator [class]
+    module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object'])
+    ## random-variable-stream.h (module 'core'): ns3::RandomVariableStream [class]
+    module.add_class('RandomVariableStream', import_from_module='ns.core', parent=root_module['ns3::Object'])
+    ## random-variable-stream.h (module 'core'): ns3::SequentialRandomVariable [class]
+    module.add_class('SequentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeChecker', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeChecker>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Packet>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFrag1 [class]
+    module.add_class('SixLowPanFrag1', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFragN [class]
+    module.add_class('SixLowPanFragN', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1 [class]
+    module.add_class('SixLowPanHc1', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::LowPanHc1Addr_e [enumeration]
+    module.add_enum('LowPanHc1Addr_e', ['HC1_PIII', 'HC1_PIIC', 'HC1_PCII', 'HC1_PCIC'], outer_class=root_module['ns3::SixLowPanHc1'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::LowPanHc1NextHeader_e [enumeration]
+    module.add_enum('LowPanHc1NextHeader_e', ['HC1_NC', 'HC1_UDP', 'HC1_ICMP', 'HC1_TCP'], outer_class=root_module['ns3::SixLowPanHc1'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc [class]
+    module.add_class('SixLowPanIphc', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::TrafficClassFlowLabel_e [enumeration]
+    module.add_enum('TrafficClassFlowLabel_e', ['TF_FULL', 'TF_DSCP_ELIDED', 'TF_FL_ELIDED', 'TF_ELIDED'], outer_class=root_module['ns3::SixLowPanIphc'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::Hlim_e [enumeration]
+    module.add_enum('Hlim_e', ['HLIM_INLINE', 'HLIM_COMPR_1', 'HLIM_COMPR_64', 'HLIM_COMPR_255'], outer_class=root_module['ns3::SixLowPanIphc'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::HeaderCompression_e [enumeration]
+    module.add_enum('HeaderCompression_e', ['HC_INLINE', 'HC_COMPR_64', 'HC_COMPR_16', 'HC_COMPR_0'], outer_class=root_module['ns3::SixLowPanIphc'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension [class]
+    module.add_class('SixLowPanNhcExtension', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension::Eid_e [enumeration]
+    module.add_enum('Eid_e', ['EID_HOPBYHOP_OPTIONS_H', 'EID_ROUTING_H', 'EID_FRAGMENTATION_H', 'EID_DESTINATION_OPTIONS_H', 'EID_MOBILITY_H', 'EID_IPv6_H'], outer_class=root_module['ns3::SixLowPanNhcExtension'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension [class]
+    module.add_class('SixLowPanUdpNhcExtension', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension::Ports_e [enumeration]
+    module.add_enum('Ports_e', ['PORTS_INLINE', 'PORTS_ALL_SRC_LAST_DST', 'PORTS_LAST_SRC_ALL_DST', 'PORTS_LAST_SRC_LAST_DST'], outer_class=root_module['ns3::SixLowPanUdpNhcExtension'])
+    ## nstime.h (module 'core'): ns3::Time [class]
+    module.add_class('Time', import_from_module='ns.core')
+    ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    ## nstime.h (module 'core'): ns3::Time [class]
+    root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
+    module.add_class('TraceSourceAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
+    ## trailer.h (module 'network'): ns3::Trailer [class]
+    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'])
+    ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable [class]
+    module.add_class('UniformRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::WeibullRandomVariable [class]
+    module.add_class('WeibullRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::ZetaRandomVariable [class]
+    module.add_class('ZetaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::ZipfRandomVariable [class]
+    module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## 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]
+    module.add_class('AttributeChecker', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
+    ## attribute.h (module 'core'): ns3::AttributeValue [class]
+    module.add_class('AttributeValue', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
+    ## callback.h (module 'core'): ns3::CallbackChecker [class]
+    module.add_class('CallbackChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## callback.h (module 'core'): ns3::CallbackImplBase [class]
+    module.add_class('CallbackImplBase', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    ## callback.h (module 'core'): ns3::CallbackValue [class]
+    module.add_class('CallbackValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## random-variable-stream.h (module 'core'): ns3::ConstantRandomVariable [class]
+    module.add_class('ConstantRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable [class]
+    module.add_class('DeterministicRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]
+    module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
+    module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## random-variable-stream.h (module 'core'): ns3::ErlangRandomVariable [class]
+    module.add_class('ErlangRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## event-impl.h (module 'core'): ns3::EventImpl [class]
+    module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    ## random-variable-stream.h (module 'core'): ns3::ExponentialRandomVariable [class]
+    module.add_class('ExponentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable [class]
+    module.add_class('GammaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class]
+    module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class]
+    module.add_class('Ipv4AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker [class]
+    module.add_class('Ipv4MaskChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue [class]
+    module.add_class('Ipv4MaskValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker [class]
+    module.add_class('Ipv6AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue [class]
+    module.add_class('Ipv6AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker [class]
+    module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class]
+    module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## random-variable-stream.h (module 'core'): ns3::LogNormalRandomVariable [class]
+    module.add_class('LogNormalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## 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]
+    module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network')
+    ## nix-vector.h (module 'network'): ns3::NixVector [class]
+    module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    ## random-variable-stream.h (module 'core'): ns3::NormalRandomVariable [class]
+    module.add_class('NormalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class]
+    module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class]
+    module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## packet.h (module 'network'): ns3::Packet [class]
+    module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
+    ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
+    module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::SixLowPanNetDevice [class]
+    module.add_class('SixLowPanNetDevice', parent=root_module['ns3::NetDevice'])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::SixLowPanNetDevice::DropReason [enumeration]
+    module.add_enum('DropReason', ['DROP_FRAGMENT_TIMEOUT', 'DROP_FRAGMENT_BUFFER_FULL', 'DROP_UNKNOWN_EXTENSION'], outer_class=root_module['ns3::SixLowPanNetDevice'])
+    ## nstime.h (module 'core'): ns3::TimeValue [class]
+    module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
+    module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## type-id.h (module 'core'): ns3::TypeIdValue [class]
+    module.add_class('TypeIdValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## address.h (module 'network'): ns3::AddressChecker [class]
+    module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## address.h (module 'network'): ns3::AddressValue [class]
+    module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    
+    ## Register a nested module for the namespace FatalImpl
+    
+    nested_module = module.add_cpp_namespace('FatalImpl')
+    register_types_ns3_FatalImpl(nested_module)
+    
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+
+def register_types_ns3_FatalImpl(module):
+    root_module = module.get_root()
+    
+
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
+def register_methods(root_module):
+    register_Ns3Address_methods(root_module, root_module['ns3::Address'])
+    register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
+    register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
+    register_Ns3Buffer_methods(root_module, root_module['ns3::Buffer'])
+    register_Ns3BufferIterator_methods(root_module, root_module['ns3::Buffer::Iterator'])
+    register_Ns3ByteTagIterator_methods(root_module, root_module['ns3::ByteTagIterator'])
+    register_Ns3ByteTagIteratorItem_methods(root_module, root_module['ns3::ByteTagIterator::Item'])
+    register_Ns3ByteTagList_methods(root_module, root_module['ns3::ByteTagList'])
+    register_Ns3ByteTagListIterator_methods(root_module, root_module['ns3::ByteTagList::Iterator'])
+    register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
+    register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
+    register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    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'])
+    register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
+    register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
+    register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])
+    register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
+    register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
+    register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
+    register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata'])
+    register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item'])
+    register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator'])
+    register_Ns3PacketTagIterator_methods(root_module, root_module['ns3::PacketTagIterator'])
+    register_Ns3PacketTagIteratorItem_methods(root_module, root_module['ns3::PacketTagIterator::Item'])
+    register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList'])
+    register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData'])
+    register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
+    register_Ns3SixLowPanDispatch_methods(root_module, root_module['ns3::SixLowPanDispatch'])
+    register_Ns3SixLowPanHelper_methods(root_module, root_module['ns3::SixLowPanHelper'])
+    register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
+    register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
+    register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
+    register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation'])
+    register_Ns3TypeIdTraceSourceInformation_methods(root_module, root_module['ns3::TypeId::TraceSourceInformation'])
+    register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
+    register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t'])
+    register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
+    register_Ns3Header_methods(root_module, root_module['ns3::Header'])
+    register_Ns3Ipv6Header_methods(root_module, root_module['ns3::Ipv6Header'])
+    register_Ns3Object_methods(root_module, root_module['ns3::Object'])
+    register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator'])
+    register_Ns3RandomVariableStream_methods(root_module, root_module['ns3::RandomVariableStream'])
+    register_Ns3SequentialRandomVariable_methods(root_module, root_module['ns3::SequentialRandomVariable'])
+    register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
+    register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
+    register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
+    register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
+    register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
+    register_Ns3SixLowPanFrag1_methods(root_module, root_module['ns3::SixLowPanFrag1'])
+    register_Ns3SixLowPanFragN_methods(root_module, root_module['ns3::SixLowPanFragN'])
+    register_Ns3SixLowPanHc1_methods(root_module, root_module['ns3::SixLowPanHc1'])
+    register_Ns3SixLowPanIphc_methods(root_module, root_module['ns3::SixLowPanIphc'])
+    register_Ns3SixLowPanNhcExtension_methods(root_module, root_module['ns3::SixLowPanNhcExtension'])
+    register_Ns3SixLowPanUdpNhcExtension_methods(root_module, root_module['ns3::SixLowPanUdpNhcExtension'])
+    register_Ns3Time_methods(root_module, root_module['ns3::Time'])
+    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_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
+    register_Ns3WeibullRandomVariable_methods(root_module, root_module['ns3::WeibullRandomVariable'])
+    register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable'])
+    register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable'])
+    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'])
+    register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
+    register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
+    register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
+    register_Ns3ConstantRandomVariable_methods(root_module, root_module['ns3::ConstantRandomVariable'])
+    register_Ns3DeterministicRandomVariable_methods(root_module, root_module['ns3::DeterministicRandomVariable'])
+    register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])
+    register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
+    register_Ns3ErlangRandomVariable_methods(root_module, root_module['ns3::ErlangRandomVariable'])
+    register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
+    register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable'])
+    register_Ns3GammaRandomVariable_methods(root_module, root_module['ns3::GammaRandomVariable'])
+    register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
+    register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue'])
+    register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker'])
+    register_Ns3Ipv4MaskValue_methods(root_module, root_module['ns3::Ipv4MaskValue'])
+    register_Ns3Ipv6AddressChecker_methods(root_module, root_module['ns3::Ipv6AddressChecker'])
+    register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue'])
+    register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker'])
+    register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
+    register_Ns3LogNormalRandomVariable_methods(root_module, root_module['ns3::LogNormalRandomVariable'])
+    register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
+    register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
+    register_Ns3NormalRandomVariable_methods(root_module, root_module['ns3::NormalRandomVariable'])
+    register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
+    register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
+    register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
+    register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
+    register_Ns3SixLowPanNetDevice_methods(root_module, root_module['ns3::SixLowPanNetDevice'])
+    register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
+    register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
+    register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
+    register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
+    register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
+    return
+
+def register_Ns3Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## address.h (module 'network'): ns3::Address::Address() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor]
+    cls.add_constructor([param('uint8_t', 'type'), param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): ns3::Address::Address(ns3::Address const & address) [copy constructor]
+    cls.add_constructor([param('ns3::Address const &', 'address')])
+    ## address.h (module 'network'): bool ns3::Address::CheckCompatible(uint8_t type, uint8_t len) const [member function]
+    cls.add_method('CheckCompatible', 
+                   'bool', 
+                   [param('uint8_t', 'type'), param('uint8_t', 'len')], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyAllFrom(uint8_t const * buffer, uint8_t len) [member function]
+    cls.add_method('CopyAllFrom', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyAllTo(uint8_t * buffer, uint8_t len) const [member function]
+    cls.add_method('CopyAllTo', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint8_t', 'len')], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyFrom(uint8_t const * buffer, uint8_t len) [member function]
+    cls.add_method('CopyFrom', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyTo(uint8_t * buffer) const [member function]
+    cls.add_method('CopyTo', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer')], 
+                   is_const=True)
+    ## address.h (module 'network'): void ns3::Address::Deserialize(ns3::TagBuffer buffer) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'buffer')])
+    ## address.h (module 'network'): uint8_t ns3::Address::GetLength() const [member function]
+    cls.add_method('GetLength', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): bool ns3::Address::IsInvalid() const [member function]
+    cls.add_method('IsInvalid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): bool ns3::Address::IsMatchingType(uint8_t type) const [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('uint8_t', 'type')], 
+                   is_const=True)
+    ## address.h (module 'network'): static uint8_t ns3::Address::Register() [member function]
+    cls.add_method('Register', 
+                   'uint8_t', 
+                   [], 
+                   is_static=True)
+    ## address.h (module 'network'): void ns3::Address::Serialize(ns3::TagBuffer buffer) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'buffer')], 
+                   is_const=True)
+    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')])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::AttributeConstructionList() [constructor]
+    cls.add_constructor([])
+    ## attribute-construction-list.h (module 'core'): void ns3::AttributeConstructionList::Add(std::string name, ns3::Ptr<ns3::AttributeChecker const> checker, ns3::Ptr<ns3::AttributeValue> value) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker'), param('ns3::Ptr< ns3::AttributeValue >', 'value')])
+    ## attribute-construction-list.h (module 'core'): std::_List_const_iterator<ns3::AttributeConstructionList::Item> ns3::AttributeConstructionList::Begin() const [member function]
+    cls.add_method('Begin', 
+                   'std::_List_const_iterator< ns3::AttributeConstructionList::Item >', 
+                   [], 
+                   is_const=True)
+    ## attribute-construction-list.h (module 'core'): std::_List_const_iterator<ns3::AttributeConstructionList::Item> ns3::AttributeConstructionList::End() const [member function]
+    cls.add_method('End', 
+                   'std::_List_const_iterator< ns3::AttributeConstructionList::Item >', 
+                   [], 
+                   is_const=True)
+    ## attribute-construction-list.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeConstructionList::Find(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('Find', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True)
+    return
+
+def register_Ns3AttributeConstructionListItem_methods(root_module, cls):
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::Item() [constructor]
+    cls.add_constructor([])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::Item(ns3::AttributeConstructionList::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeConstructionList::Item const &', 'arg0')])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::checker [variable]
+    cls.add_instance_attribute('checker', 'ns3::Ptr< ns3::AttributeChecker const >', is_const=False)
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::value [variable]
+    cls.add_instance_attribute('value', 'ns3::Ptr< ns3::AttributeValue >', is_const=False)
+    return
+
+def register_Ns3Buffer_methods(root_module, cls):
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer() [constructor]
+    cls.add_constructor([])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize) [constructor]
+    cls.add_constructor([param('uint32_t', 'dataSize')])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize, bool initialize) [constructor]
+    cls.add_constructor([param('uint32_t', 'dataSize'), param('bool', 'initialize')])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(ns3::Buffer const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Buffer const &', 'o')])
+    ## buffer.h (module 'network'): bool ns3::Buffer::AddAtEnd(uint32_t end) [member function]
+    cls.add_method('AddAtEnd', 
+                   'bool', 
+                   [param('uint32_t', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::AddAtEnd(ns3::Buffer const & o) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::Buffer const &', 'o')])
+    ## buffer.h (module 'network'): bool ns3::Buffer::AddAtStart(uint32_t start) [member function]
+    cls.add_method('AddAtStart', 
+                   'bool', 
+                   [param('uint32_t', 'start')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   'ns3::Buffer::Iterator', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::CopyData(std::ostream * os, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'void', 
+                   [param('std::ostream *', 'os'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::CopyData(uint8_t * buffer, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFragment(uint32_t start, uint32_t length) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::Buffer', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFullCopy() const [member function]
+    cls.add_method('CreateFullCopy', 
+                   'ns3::Buffer', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::End() const [member function]
+    cls.add_method('End', 
+                   'ns3::Buffer::Iterator', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentEndOffset() const [member function]
+    cls.add_method('GetCurrentEndOffset', 
+                   'int32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentStartOffset() const [member function]
+    cls.add_method('GetCurrentStartOffset', 
+                   'int32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint8_t const * ns3::Buffer::PeekData() const [member function]
+    cls.add_method('PeekData', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtEnd(uint32_t end) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtStart(uint32_t start) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'start')])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3BufferIterator_methods(root_module, cls):
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator(ns3::Buffer::Iterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Buffer::Iterator const &', 'arg0')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator() [constructor]
+    cls.add_constructor([])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size) [member function]
+    cls.add_method('CalculateIpChecksum', 
+                   'uint16_t', 
+                   [param('uint16_t', 'size')])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size, uint32_t initialChecksum) [member function]
+    cls.add_method('CalculateIpChecksum', 
+                   'uint16_t', 
+                   [param('uint16_t', 'size'), param('uint32_t', 'initialChecksum')])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetDistanceFrom(ns3::Buffer::Iterator const & o) const [member function]
+    cls.add_method('GetDistanceFrom', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator const &', 'o')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsEnd() const [member function]
+    cls.add_method('IsEnd', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsStart() const [member function]
+    cls.add_method('IsStart', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next() [member function]
+    cls.add_method('Next', 
+                   'void', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next(uint32_t delta) [member function]
+    cls.add_method('Next', 
+                   'void', 
+                   [param('uint32_t', 'delta')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev() [member function]
+    cls.add_method('Prev', 
+                   'void', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev(uint32_t delta) [member function]
+    cls.add_method('Prev', 
+                   'void', 
+                   [param('uint32_t', 'delta')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Read(uint8_t * buffer, uint32_t size) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadLsbtohU16() [member function]
+    cls.add_method('ReadLsbtohU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadLsbtohU32() [member function]
+    cls.add_method('ReadLsbtohU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadLsbtohU64() [member function]
+    cls.add_method('ReadLsbtohU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadNtohU16() [member function]
+    cls.add_method('ReadNtohU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadNtohU32() [member function]
+    cls.add_method('ReadNtohU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadNtohU64() [member function]
+    cls.add_method('ReadNtohU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadU16() [member function]
+    cls.add_method('ReadU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadU32() [member function]
+    cls.add_method('ReadU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadU64() [member function]
+    cls.add_method('ReadU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint8_t ns3::Buffer::Iterator::ReadU8() [member function]
+    cls.add_method('ReadU8', 
+                   'uint8_t', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(ns3::Buffer::Iterator start, ns3::Buffer::Iterator end) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('ns3::Buffer::Iterator', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU16(uint16_t data) [member function]
+    cls.add_method('WriteHtolsbU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU32(uint32_t data) [member function]
+    cls.add_method('WriteHtolsbU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU64(uint64_t data) [member function]
+    cls.add_method('WriteHtolsbU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU16(uint16_t data) [member function]
+    cls.add_method('WriteHtonU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU32(uint32_t data) [member function]
+    cls.add_method('WriteHtonU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU64(uint64_t data) [member function]
+    cls.add_method('WriteHtonU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU16(uint16_t data) [member function]
+    cls.add_method('WriteU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU32(uint32_t data) [member function]
+    cls.add_method('WriteU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU64(uint64_t data) [member function]
+    cls.add_method('WriteU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data, uint32_t len) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'data'), param('uint32_t', 'len')])
+    return
+
+def register_Ns3ByteTagIterator_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::ByteTagIterator::ByteTagIterator(ns3::ByteTagIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagIterator const &', 'arg0')])
+    ## packet.h (module 'network'): bool ns3::ByteTagIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item ns3::ByteTagIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::ByteTagIterator::Item', 
+                   [])
+    return
+
+def register_Ns3ByteTagIteratorItem_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item::Item(ns3::ByteTagIterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagIterator::Item const &', 'arg0')])
+    ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetEnd() const [member function]
+    cls.add_method('GetEnd', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetStart() const [member function]
+    cls.add_method('GetStart', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::ByteTagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
+    cls.add_method('GetTag', 
+                   'void', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::TypeId ns3::ByteTagIterator::Item::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3ByteTagList_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList() [constructor]
+    cls.add_constructor([])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList(ns3::ByteTagList const & o) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList const &', 'o')])
+    ## byte-tag-list.h (module 'network'): ns3::TagBuffer ns3::ByteTagList::Add(ns3::TypeId tid, uint32_t bufferSize, int32_t start, int32_t end) [member function]
+    cls.add_method('Add', 
+                   'ns3::TagBuffer', 
+                   [param('ns3::TypeId', 'tid'), param('uint32_t', 'bufferSize'), param('int32_t', 'start'), param('int32_t', 'end')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::Add(ns3::ByteTagList const & o) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::ByteTagList const &', 'o')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtEnd(int32_t adjustment, int32_t appendOffset) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('int32_t', 'adjustment'), param('int32_t', 'appendOffset')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtStart(int32_t adjustment, int32_t prependOffset) [member function]
+    cls.add_method('AddAtStart', 
+                   'void', 
+                   [param('int32_t', 'adjustment'), param('int32_t', 'prependOffset')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator ns3::ByteTagList::Begin(int32_t offsetStart, int32_t offsetEnd) const [member function]
+    cls.add_method('Begin', 
+                   'ns3::ByteTagList::Iterator', 
+                   [param('int32_t', 'offsetStart'), param('int32_t', 'offsetEnd')], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::RemoveAll() [member function]
+    cls.add_method('RemoveAll', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3ByteTagListIterator_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Iterator(ns3::ByteTagList::Iterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList::Iterator const &', 'arg0')])
+    ## byte-tag-list.h (module 'network'): uint32_t ns3::ByteTagList::Iterator::GetOffsetStart() const [member function]
+    cls.add_method('GetOffsetStart', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): bool ns3::ByteTagList::Iterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item ns3::ByteTagList::Iterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::ByteTagList::Iterator::Item', 
+                   [])
+    return
+
+def register_Ns3ByteTagListIteratorItem_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::ByteTagList::Iterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList::Iterator::Item const &', 'arg0')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::TagBuffer buf) [constructor]
+    cls.add_constructor([param('ns3::TagBuffer', 'buf')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::buf [variable]
+    cls.add_instance_attribute('buf', 'ns3::TagBuffer', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::end [variable]
+    cls.add_instance_attribute('end', 'int32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::size [variable]
+    cls.add_instance_attribute('size', 'uint32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::start [variable]
+    cls.add_instance_attribute('start', 'int32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3CallbackBase_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::CallbackBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackBase const &', 'arg0')])
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::Ptr<ns3::CallbackImplBase> ns3::CallbackBase::GetImpl() const [member function]
+    cls.add_method('GetImpl', 
+                   'ns3::Ptr< ns3::CallbackImplBase >', 
+                   [], 
+                   is_const=True)
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::Ptr<ns3::CallbackImplBase> impl) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::CallbackImplBase >', 'impl')], 
+                        visibility='protected')
+    ## callback.h (module 'core'): static std::string ns3::CallbackBase::Demangle(std::string const & mangled) [member function]
+    cls.add_method('Demangle', 
+                   'std::string', 
+                   [param('std::string const &', 'mangled')], 
+                   is_static=True, visibility='protected')
+    return
+
+def register_Ns3EventId_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('==')
+    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::EventId const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventId const &', 'arg0')])
+    ## event-id.h (module 'core'): ns3::EventId::EventId() [constructor]
+    cls.add_constructor([])
+    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::Ptr<ns3::EventImpl> const & impl, uint64_t ts, uint32_t context, uint32_t uid) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::EventImpl > const &', 'impl'), param('uint64_t', 'ts'), param('uint32_t', 'context'), param('uint32_t', 'uid')])
+    ## event-id.h (module 'core'): void ns3::EventId::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetContext() const [member function]
+    cls.add_method('GetContext', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): uint64_t ns3::EventId::GetTs() const [member function]
+    cls.add_method('GetTs', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): bool ns3::EventId::IsExpired() const [member function]
+    cls.add_method('IsExpired', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): bool ns3::EventId::IsRunning() const [member function]
+    cls.add_method('IsRunning', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): ns3::EventImpl * ns3::EventId::PeekEventImpl() const [member function]
+    cls.add_method('PeekEventImpl', 
+                   'ns3::EventImpl *', 
+                   [], 
+                   is_const=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')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
+def register_Ns3Ipv4Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(uint32_t address) [constructor]
+    cls.add_constructor([param('uint32_t', 'address')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(char const * address) [constructor]
+    cls.add_constructor([param('char const *', 'address')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4Address::CombineMask(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('CombineMask', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::Deserialize(uint8_t const * buf) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Ipv4Address', 
+                   [param('uint8_t const *', 'buf')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Address::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetAny() [member function]
+    cls.add_method('GetAny', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetBroadcast() [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4Address::GetSubnetDirectedBroadcast(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('GetSubnetDirectedBroadcast', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsEqual(ns3::Ipv4Address const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv4Address const &', 'other')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsLocalMulticast() const [member function]
+    cls.add_method('IsLocalMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static bool ns3::Ipv4Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsSubnetDirectedBroadcast(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('IsSubnetDirectedBroadcast', 
+                   'bool', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Serialize(uint8_t * buf) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Set(uint32_t address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint32_t', 'address')])
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Set(char const * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('char const *', 'address')])
+    return
+
+def register_Ns3Ipv4Mask_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(ns3::Ipv4Mask const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4Mask const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(uint32_t mask) [constructor]
+    cls.add_constructor([param('uint32_t', 'mask')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(char const * mask) [constructor]
+    cls.add_constructor([param('char const *', 'mask')])
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Mask::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Mask::GetInverse() const [member function]
+    cls.add_method('GetInverse', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): uint16_t ns3::Ipv4Mask::GetPrefixLength() const [member function]
+    cls.add_method('GetPrefixLength', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Mask::IsEqual(ns3::Ipv4Mask other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv4Mask', 'other')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Mask::IsMatch(ns3::Ipv4Address a, ns3::Ipv4Address b) const [member function]
+    cls.add_method('IsMatch', 
+                   'bool', 
+                   [param('ns3::Ipv4Address', 'a'), param('ns3::Ipv4Address', 'b')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Mask::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Mask::Set(uint32_t mask) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint32_t', 'mask')])
+    return
+
+def register_Ns3Ipv6Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(char const * address) [constructor]
+    cls.add_constructor([param('char const *', 'address')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(uint8_t * address) [constructor]
+    cls.add_constructor([param('uint8_t *', 'address')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const & addr) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const &', 'addr')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const * addr) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const *', 'addr')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address ns3::Ipv6Address::CombinePrefix(ns3::Ipv6Prefix const & prefix) [member function]
+    cls.add_method('CombinePrefix', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Prefix const &', 'prefix')])
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::Deserialize(uint8_t const * buf) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Ipv6Address', 
+                   [param('uint8_t const *', 'buf')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllHostsMulticast() [member function]
+    cls.add_method('GetAllHostsMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllNodesMulticast() [member function]
+    cls.add_method('GetAllNodesMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllRoutersMulticast() [member function]
+    cls.add_method('GetAllRoutersMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAny() [member function]
+    cls.add_method('GetAny', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::GetBytes(uint8_t * buf) const [member function]
+    cls.add_method('GetBytes', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv6Address::GetIpv4MappedAddress() const [member function]
+    cls.add_method('GetIpv4MappedAddress', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllHostsMulticast() const [member function]
+    cls.add_method('IsAllHostsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function]
+    cls.add_method('IsAllNodesMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllRoutersMulticast() const [member function]
+    cls.add_method('IsAllRoutersMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAny() const [member function]
+    cls.add_method('IsAny', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv6Address const &', 'other')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
+    cls.add_method('IsIpv4MappedAddress', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
+    cls.add_method('IsLinkLocal', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocalMulticast() const [member function]
+    cls.add_method('IsLinkLocalMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLocalhost() const [member function]
+    cls.add_method('IsLocalhost', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static bool ns3::Ipv6Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsSolicitedMulticast() const [member function]
+    cls.add_method('IsSolicitedMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac48Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
+    cls.add_method('MakeIpv4MappedAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv4Address', 'addr')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeSolicitedAddress(ns3::Ipv6Address addr) [member function]
+    cls.add_method('MakeSolicitedAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Serialize(uint8_t * buf) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Set(char const * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('char const *', 'address')])
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Set(uint8_t * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint8_t *', 'address')])
+    return
+
+def register_Ns3Ipv6Prefix_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(uint8_t * prefix) [constructor]
+    cls.add_constructor([param('uint8_t *', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(char const * prefix) [constructor]
+    cls.add_constructor([param('char const *', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(uint8_t prefix) [constructor]
+    cls.add_constructor([param('uint8_t', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const & prefix) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const &', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const * prefix) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const *', 'prefix')])
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Prefix::GetBytes(uint8_t * buf) const [member function]
+    cls.add_method('GetBytes', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): uint8_t ns3::Ipv6Prefix::GetPrefixLength() const [member function]
+    cls.add_method('GetPrefixLength', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Prefix::IsEqual(ns3::Ipv6Prefix const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv6Prefix const &', 'other')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Prefix::IsMatch(ns3::Ipv6Address a, ns3::Ipv6Address b) const [member function]
+    cls.add_method('IsMatch', 
+                   'bool', 
+                   [param('ns3::Ipv6Address', 'a'), param('ns3::Ipv6Address', 'b')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Prefix::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    return
+
+def register_Ns3NetDeviceContainer_methods(root_module, cls):
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NetDeviceContainer const &', 'arg0')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer() [constructor]
+    cls.add_constructor([])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::Ptr<ns3::NetDevice> dev) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(std::string devName) [constructor]
+    cls.add_constructor([param('std::string', 'devName')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & a, ns3::NetDeviceContainer const & b) [constructor]
+    cls.add_constructor([param('ns3::NetDeviceContainer const &', 'a'), param('ns3::NetDeviceContainer const &', 'b')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(ns3::NetDeviceContainer other) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::NetDeviceContainer', 'other')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(ns3::Ptr<ns3::NetDevice> device) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(std::string deviceName) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'deviceName')])
+    ## net-device-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::NetDevice > const, std::vector< ns3::Ptr< ns3::NetDevice > > >', 
+                   [], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::End() const [member function]
+    cls.add_method('End', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::NetDevice > const, std::vector< ns3::Ptr< ns3::NetDevice > > >', 
+                   [], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::NetDeviceContainer::Get(uint32_t i) const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): uint32_t ns3::NetDeviceContainer::GetN() const [member function]
+    cls.add_method('GetN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3ObjectBase_methods(root_module, cls):
+    ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase() [constructor]
+    cls.add_constructor([])
+    ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectBase const &', 'arg0')])
+    ## object-base.h (module 'core'): void ns3::ObjectBase::GetAttribute(std::string name, ns3::AttributeValue & value) const [member function]
+    cls.add_method('GetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue &', 'value')], 
+                   is_const=True)
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::GetAttributeFailSafe(std::string name, ns3::AttributeValue & attribute) const [member function]
+    cls.add_method('GetAttributeFailSafe', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue &', 'attribute')], 
+                   is_const=True)
+    ## object-base.h (module 'core'): ns3::TypeId ns3::ObjectBase::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## object-base.h (module 'core'): static ns3::TypeId ns3::ObjectBase::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## object-base.h (module 'core'): void ns3::ObjectBase::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::SetAttributeFailSafe(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttributeFailSafe', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceConnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceConnect', 
+                   'bool', 
+                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceConnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceConnectWithoutContext', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceDisconnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceDisconnect', 
+                   'bool', 
+                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceDisconnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceDisconnectWithoutContext', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): void ns3::ObjectBase::ConstructSelf(ns3::AttributeConstructionList const & attributes) [member function]
+    cls.add_method('ConstructSelf', 
+                   'void', 
+                   [param('ns3::AttributeConstructionList const &', 'attributes')], 
+                   visibility='protected')
+    ## object-base.h (module 'core'): void ns3::ObjectBase::NotifyConstructionCompleted() [member function]
+    cls.add_method('NotifyConstructionCompleted', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ObjectDeleter_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::ObjectDeleter::ObjectDeleter() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): ns3::ObjectDeleter::ObjectDeleter(ns3::ObjectDeleter const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectDeleter const &', 'arg0')])
+    ## object.h (module 'core'): static void ns3::ObjectDeleter::Delete(ns3::Object * object) [member function]
+    cls.add_method('Delete', 
+                   'void', 
+                   [param('ns3::Object *', 'object')], 
+                   is_static=True)
+    return
+
+def register_Ns3ObjectFactory_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')])
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(std::string typeId) [constructor]
+    cls.add_constructor([param('std::string', 'typeId')])
+    ## object-factory.h (module 'core'): ns3::Ptr<ns3::Object> ns3::ObjectFactory::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::Object >', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('ns3::TypeId', 'tid')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('char const *', 'tid')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('std::string', 'tid')])
+    return
+
+def register_Ns3PacketMetadata_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor]
+    cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(ns3::PacketMetadata const & o) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata const &', 'o')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddAtEnd(ns3::PacketMetadata const & o) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::PacketMetadata const &', 'o')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddHeader(ns3::Header const & header, uint32_t size) [member function]
+    cls.add_method('AddHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddPaddingAtEnd(uint32_t end) [member function]
+    cls.add_method('AddPaddingAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddTrailer(ns3::Trailer const & trailer, uint32_t size) [member function]
+    cls.add_method('AddTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::PacketMetadata::BeginItem(ns3::Buffer buffer) const [member function]
+    cls.add_method('BeginItem', 
+                   'ns3::PacketMetadata::ItemIterator', 
+                   [param('ns3::Buffer', 'buffer')], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata ns3::PacketMetadata::CreateFragment(uint32_t start, uint32_t end) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::PacketMetadata', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'end')], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::Enable() [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::EnableChecking() [member function]
+    cls.add_method('EnableChecking', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): uint64_t ns3::PacketMetadata::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtEnd(uint32_t end) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtStart(uint32_t start) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'start')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveHeader(ns3::Header const & header, uint32_t size) [member function]
+    cls.add_method('RemoveHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveTrailer(ns3::Trailer const & trailer, uint32_t size) [member function]
+    cls.add_method('RemoveTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3PacketMetadataItem_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item() [constructor]
+    cls.add_constructor([])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item(ns3::PacketMetadata::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata::Item const &', 'arg0')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::current [variable]
+    cls.add_instance_attribute('current', 'ns3::Buffer::Iterator', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentSize [variable]
+    cls.add_instance_attribute('currentSize', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromEnd [variable]
+    cls.add_instance_attribute('currentTrimedFromEnd', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromStart [variable]
+    cls.add_instance_attribute('currentTrimedFromStart', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::isFragment [variable]
+    cls.add_instance_attribute('isFragment', 'bool', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3PacketMetadataItemIterator_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata::ItemIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata::ItemIterator const &', 'arg0')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata const * metadata, ns3::Buffer buffer) [constructor]
+    cls.add_constructor([param('ns3::PacketMetadata const *', 'metadata'), param('ns3::Buffer', 'buffer')])
+    ## packet-metadata.h (module 'network'): bool ns3::PacketMetadata::ItemIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item ns3::PacketMetadata::ItemIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::PacketMetadata::Item', 
+                   [])
+    return
+
+def register_Ns3PacketTagIterator_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::PacketTagIterator::PacketTagIterator(ns3::PacketTagIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagIterator const &', 'arg0')])
+    ## packet.h (module 'network'): bool ns3::PacketTagIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item ns3::PacketTagIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::PacketTagIterator::Item', 
+                   [])
+    return
+
+def register_Ns3PacketTagIteratorItem_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item::Item(ns3::PacketTagIterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagIterator::Item const &', 'arg0')])
+    ## packet.h (module 'network'): void ns3::PacketTagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
+    cls.add_method('GetTag', 
+                   'void', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::TypeId ns3::PacketTagIterator::Item::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3PacketTagList_methods(root_module, cls):
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList() [constructor]
+    cls.add_constructor([])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList(ns3::PacketTagList const & o) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagList const &', 'o')])
+    ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::Add(ns3::Tag const & tag) const [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData const * ns3::PacketTagList::Head() const [member function]
+    cls.add_method('Head', 
+                   'ns3::PacketTagList::TagData const *', 
+                   [], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Peek(ns3::Tag & tag) const [member function]
+    cls.add_method('Peek', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Remove(ns3::Tag & tag) [member function]
+    cls.add_method('Remove', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::RemoveAll() [member function]
+    cls.add_method('RemoveAll', 
+                   'void', 
+                   [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    return
+
+def register_Ns3PacketTagListTagData_methods(root_module, cls):
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData() [constructor]
+    cls.add_constructor([])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData(ns3::PacketTagList::TagData const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagList::TagData const &', 'arg0')])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::count [variable]
+    cls.add_instance_attribute('count', 'uint32_t', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::data [variable]
+    cls.add_instance_attribute('data', 'uint8_t [ 20 ]', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::next [variable]
+    cls.add_instance_attribute('next', 'ns3::PacketTagList::TagData *', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount(ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SixLowPanDispatch_methods(root_module, cls):
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::SixLowPanDispatch(ns3::SixLowPanDispatch const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanDispatch const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::SixLowPanDispatch() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::SixLowPanDispatch::Dispatch_e ns3::SixLowPanDispatch::GetDispatchType(uint8_t dispatch) [member function]
+    cls.add_method('GetDispatchType', 
+                   'ns3::SixLowPanDispatch::Dispatch_e', 
+                   [param('uint8_t', 'dispatch')], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::SixLowPanDispatch::NhcDispatch_e ns3::SixLowPanDispatch::GetNhcDispatchType(uint8_t dispatch) [member function]
+    cls.add_method('GetNhcDispatchType', 
+                   'ns3::SixLowPanDispatch::NhcDispatch_e', 
+                   [param('uint8_t', 'dispatch')], 
+                   is_static=True)
+    return
+
+def register_Ns3SixLowPanHelper_methods(root_module, cls):
+    ## sixlowpan-helper.h (module 'sixlowpan'): ns3::SixLowPanHelper::SixLowPanHelper(ns3::SixLowPanHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanHelper const &', 'arg0')])
+    ## sixlowpan-helper.h (module 'sixlowpan'): ns3::SixLowPanHelper::SixLowPanHelper() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-helper.h (module 'sixlowpan'): int64_t ns3::SixLowPanHelper::AssignStreams(ns3::NetDeviceContainer c, int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('ns3::NetDeviceContainer', 'c'), param('int64_t', 'stream')])
+    ## sixlowpan-helper.h (module 'sixlowpan'): ns3::NetDeviceContainer ns3::SixLowPanHelper::Install(ns3::NetDeviceContainer c) [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NetDeviceContainer', 'c')])
+    ## sixlowpan-helper.h (module 'sixlowpan'): void ns3::SixLowPanHelper::SetDeviceAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
+    cls.add_method('SetDeviceAttribute', 
+                   'void', 
+                   [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
+    return
+
+def register_Ns3Tag_methods(root_module, cls):
+    ## tag.h (module 'network'): ns3::Tag::Tag() [constructor]
+    cls.add_constructor([])
+    ## tag.h (module 'network'): ns3::Tag::Tag(ns3::Tag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Tag const &', 'arg0')])
+    ## tag.h (module 'network'): void ns3::Tag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## tag.h (module 'network'): uint32_t ns3::Tag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## tag.h (module 'network'): static ns3::TypeId ns3::Tag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## tag.h (module 'network'): void ns3::Tag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## tag.h (module 'network'): void ns3::Tag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3TagBuffer_methods(root_module, cls):
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(ns3::TagBuffer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TagBuffer const &', 'arg0')])
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(uint8_t * start, uint8_t * end) [constructor]
+    cls.add_constructor([param('uint8_t *', 'start'), param('uint8_t *', 'end')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::CopyFrom(ns3::TagBuffer o) [member function]
+    cls.add_method('CopyFrom', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'o')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::Read(uint8_t * buffer, uint32_t size) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+    ## tag-buffer.h (module 'network'): double ns3::TagBuffer::ReadDouble() [member function]
+    cls.add_method('ReadDouble', 
+                   'double', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint16_t ns3::TagBuffer::ReadU16() [member function]
+    cls.add_method('ReadU16', 
+                   'uint16_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint32_t ns3::TagBuffer::ReadU32() [member function]
+    cls.add_method('ReadU32', 
+                   'uint32_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint64_t ns3::TagBuffer::ReadU64() [member function]
+    cls.add_method('ReadU64', 
+                   'uint64_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint8_t ns3::TagBuffer::ReadU8() [member function]
+    cls.add_method('ReadU8', 
+                   'uint8_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::TrimAtEnd(uint32_t trim) [member function]
+    cls.add_method('TrimAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'trim')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::Write(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteDouble(double v) [member function]
+    cls.add_method('WriteDouble', 
+                   'void', 
+                   [param('double', 'v')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU16(uint16_t data) [member function]
+    cls.add_method('WriteU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU32(uint32_t data) [member function]
+    cls.add_method('WriteU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU64(uint64_t v) [member function]
+    cls.add_method('WriteU64', 
+                   'void', 
+                   [param('uint64_t', 'v')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU8(uint8_t v) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'v')])
+    return
+
+def register_Ns3TypeId_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor]
+    cls.add_constructor([param('char const *', 'name')])
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId(ns3::TypeId const & o) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId const &', 'o')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('AddAttribute', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('AddAttribute', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]
+    cls.add_method('AddTraceSource', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation ns3::TypeId::GetAttribute(uint32_t i) const [member function]
+    cls.add_method('GetAttribute', 
+                   'ns3::TypeId::AttributeInformation', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetAttributeFullName(uint32_t i) const [member function]
+    cls.add_method('GetAttributeFullName', 
+                   'std::string', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetAttributeN() const [member function]
+    cls.add_method('GetAttributeN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::Callback<ns3::ObjectBase*,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::TypeId::GetConstructor() const [member function]
+    cls.add_method('GetConstructor', 
+                   'ns3::Callback< ns3::ObjectBase *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetGroupName() const [member function]
+    cls.add_method('GetGroupName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::GetParent() const [member function]
+    cls.add_method('GetParent', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::GetRegistered(uint32_t i) [member function]
+    cls.add_method('GetRegistered', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'i')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static uint32_t ns3::TypeId::GetRegisteredN() [member function]
+    cls.add_method('GetRegisteredN', 
+                   'uint32_t', 
+                   [], 
+                   is_static=True)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation ns3::TypeId::GetTraceSource(uint32_t i) const [member function]
+    cls.add_method('GetTraceSource', 
+                   'ns3::TypeId::TraceSourceInformation', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetTraceSourceN() const [member function]
+    cls.add_method('GetTraceSourceN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint16_t ns3::TypeId::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::HasConstructor() const [member function]
+    cls.add_method('HasConstructor', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::HasParent() const [member function]
+    cls.add_method('HasParent', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::HideFromDocumentation() [member function]
+    cls.add_method('HideFromDocumentation', 
+                   'ns3::TypeId', 
+                   [])
+    ## type-id.h (module 'core'): bool ns3::TypeId::IsChildOf(ns3::TypeId other) const [member function]
+    cls.add_method('IsChildOf', 
+                   'bool', 
+                   [param('ns3::TypeId', 'other')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::LookupAttributeByName(std::string name, ns3::TypeId::AttributeInformation * info) const [member function]
+    cls.add_method('LookupAttributeByName', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
+                   is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
+    cls.add_method('LookupByName', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): ns3::Ptr<ns3::TraceSourceAccessor const> ns3::TypeId::LookupTraceSourceByName(std::string name) const [member function]
+    cls.add_method('LookupTraceSourceByName', 
+                   'ns3::Ptr< ns3::TraceSourceAccessor const >', 
+                   [param('std::string', 'name')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::MustHideFromDocumentation() const [member function]
+    cls.add_method('MustHideFromDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::SetAttributeInitialValue(uint32_t i, ns3::Ptr<ns3::AttributeValue const> initialValue) [member function]
+    cls.add_method('SetAttributeInitialValue', 
+                   'bool', 
+                   [param('uint32_t', 'i'), param('ns3::Ptr< ns3::AttributeValue const >', 'initialValue')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetGroupName(std::string groupName) [member function]
+    cls.add_method('SetGroupName', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'groupName')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetParent(ns3::TypeId tid) [member function]
+    cls.add_method('SetParent', 
+                   'ns3::TypeId', 
+                   [param('ns3::TypeId', 'tid')])
+    ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t tid) [member function]
+    cls.add_method('SetUid', 
+                   'void', 
+                   [param('uint16_t', 'tid')])
+    return
+
+def register_Ns3TypeIdAttributeInformation_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::AttributeInformation() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::AttributeInformation(ns3::TypeId::AttributeInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId::AttributeInformation const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::accessor [variable]
+    cls.add_instance_attribute('accessor', 'ns3::Ptr< ns3::AttributeAccessor const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::checker [variable]
+    cls.add_instance_attribute('checker', 'ns3::Ptr< ns3::AttributeChecker const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::flags [variable]
+    cls.add_instance_attribute('flags', 'uint32_t', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::help [variable]
+    cls.add_instance_attribute('help', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::initialValue [variable]
+    cls.add_instance_attribute('initialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::originalInitialValue [variable]
+    cls.add_instance_attribute('originalInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)
+    return
+
+def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::TraceSourceInformation() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::TraceSourceInformation(ns3::TypeId::TraceSourceInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId::TraceSourceInformation const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::accessor [variable]
+    cls.add_instance_attribute('accessor', 'ns3::Ptr< ns3::TraceSourceAccessor const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::help [variable]
+    cls.add_instance_attribute('help', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    return
+
+def register_Ns3Empty_methods(root_module, cls):
+    ## empty.h (module 'core'): ns3::empty::empty() [constructor]
+    cls.add_constructor([])
+    ## empty.h (module 'core'): ns3::empty::empty(ns3::empty const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::empty const &', 'arg0')])
+    return
+
+def register_Ns3Int64x64_t_methods(root_module, cls):
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_unary_numeric_operator('-')
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('>')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('<=')
+    cls.add_binary_comparison_operator('==')
+    cls.add_binary_comparison_operator('>=')
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
+    cls.add_constructor([])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(double v) [constructor]
+    cls.add_constructor([param('double', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long int v) [constructor]
+    cls.add_constructor([param('long int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long long int v) [constructor]
+    cls.add_constructor([param('long long int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(unsigned int v) [constructor]
+    cls.add_constructor([param('unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long unsigned int v) [constructor]
+    cls.add_constructor([param('long unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long long unsigned int v) [constructor]
+    cls.add_constructor([param('long long unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(int64_t hi, uint64_t lo) [constructor]
+    cls.add_constructor([param('int64_t', 'hi'), param('uint64_t', 'lo')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(ns3::int64x64_t const & o) [copy constructor]
+    cls.add_constructor([param('ns3::int64x64_t const &', 'o')])
+    ## int64x64-double.h (module 'core'): double ns3::int64x64_t::GetDouble() const [member function]
+    cls.add_method('GetDouble', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): int64_t ns3::int64x64_t::GetHigh() const [member function]
+    cls.add_method('GetHigh', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): uint64_t ns3::int64x64_t::GetLow() const [member function]
+    cls.add_method('GetLow', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): static ns3::int64x64_t ns3::int64x64_t::Invert(uint64_t v) [member function]
+    cls.add_method('Invert', 
+                   'ns3::int64x64_t', 
+                   [param('uint64_t', 'v')], 
+                   is_static=True)
+    ## int64x64-double.h (module 'core'): void ns3::int64x64_t::MulByInvert(ns3::int64x64_t const & o) [member function]
+    cls.add_method('MulByInvert', 
+                   'void', 
+                   [param('ns3::int64x64_t const &', 'o')])
+    return
+
+def register_Ns3Chunk_methods(root_module, cls):
+    ## chunk.h (module 'network'): ns3::Chunk::Chunk() [constructor]
+    cls.add_constructor([])
+    ## chunk.h (module 'network'): ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Chunk const &', 'arg0')])
+    ## chunk.h (module 'network'): uint32_t ns3::Chunk::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## chunk.h (module 'network'): static ns3::TypeId ns3::Chunk::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## chunk.h (module 'network'): void ns3::Chunk::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Header_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## header.h (module 'network'): ns3::Header::Header() [constructor]
+    cls.add_constructor([])
+    ## header.h (module 'network'): ns3::Header::Header(ns3::Header const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Header const &', 'arg0')])
+    ## header.h (module 'network'): uint32_t ns3::Header::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## header.h (module 'network'): uint32_t ns3::Header::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## header.h (module 'network'): static ns3::TypeId ns3::Header::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## header.h (module 'network'): void ns3::Header::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## header.h (module 'network'): void ns3::Header::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Ipv6Header_methods(root_module, cls):
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::Ipv6Header(ns3::Ipv6Header const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Header const &', 'arg0')])
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::Ipv6Header() [constructor]
+    cls.add_constructor([])
+    ## ipv6-header.h (module 'internet'): uint32_t ns3::Ipv6Header::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6Header::GetDestinationAddress() const [member function]
+    cls.add_method('GetDestinationAddress', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint32_t ns3::Ipv6Header::GetFlowLabel() const [member function]
+    cls.add_method('GetFlowLabel', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint8_t ns3::Ipv6Header::GetHopLimit() const [member function]
+    cls.add_method('GetHopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): ns3::TypeId ns3::Ipv6Header::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-header.h (module 'internet'): uint8_t ns3::Ipv6Header::GetNextHeader() const [member function]
+    cls.add_method('GetNextHeader', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint16_t ns3::Ipv6Header::GetPayloadLength() const [member function]
+    cls.add_method('GetPayloadLength', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint32_t ns3::Ipv6Header::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6Header::GetSourceAddress() const [member function]
+    cls.add_method('GetSourceAddress', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint8_t ns3::Ipv6Header::GetTrafficClass() const [member function]
+    cls.add_method('GetTrafficClass', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): static ns3::TypeId ns3::Ipv6Header::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetDestinationAddress(ns3::Ipv6Address dst) [member function]
+    cls.add_method('SetDestinationAddress', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetFlowLabel(uint32_t flow) [member function]
+    cls.add_method('SetFlowLabel', 
+                   'void', 
+                   [param('uint32_t', 'flow')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetHopLimit(uint8_t limit) [member function]
+    cls.add_method('SetHopLimit', 
+                   'void', 
+                   [param('uint8_t', 'limit')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetNextHeader(uint8_t next) [member function]
+    cls.add_method('SetNextHeader', 
+                   'void', 
+                   [param('uint8_t', 'next')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetPayloadLength(uint16_t len) [member function]
+    cls.add_method('SetPayloadLength', 
+                   'void', 
+                   [param('uint16_t', 'len')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetSourceAddress(ns3::Ipv6Address src) [member function]
+    cls.add_method('SetSourceAddress', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'src')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetTrafficClass(uint8_t traffic) [member function]
+    cls.add_method('SetTrafficClass', 
+                   'void', 
+                   [param('uint8_t', 'traffic')])
+    return
+
+def register_Ns3Object_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::Object::Object() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): void ns3::Object::AggregateObject(ns3::Ptr<ns3::Object> other) [member function]
+    cls.add_method('AggregateObject', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'other')])
+    ## object.h (module 'core'): void ns3::Object::Dispose() [member function]
+    cls.add_method('Dispose', 
+                   'void', 
+                   [])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator ns3::Object::GetAggregateIterator() const [member function]
+    cls.add_method('GetAggregateIterator', 
+                   'ns3::Object::AggregateIterator', 
+                   [], 
+                   is_const=True)
+    ## object.h (module 'core'): ns3::TypeId ns3::Object::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## object.h (module 'core'): static ns3::TypeId ns3::Object::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## object.h (module 'core'): void ns3::Object::Initialize() [member function]
+    cls.add_method('Initialize', 
+                   'void', 
+                   [])
+    ## object.h (module 'core'): ns3::Object::Object(ns3::Object const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Object const &', 'o')], 
+                        visibility='protected')
+    ## object.h (module 'core'): void ns3::Object::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## object.h (module 'core'): void ns3::Object::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## object.h (module 'core'): void ns3::Object::NotifyNewAggregate() [member function]
+    cls.add_method('NotifyNewAggregate', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::Object::AggregateIterator::AggregateIterator(ns3::Object::AggregateIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Object::AggregateIterator const &', 'arg0')])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator::AggregateIterator() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): bool ns3::Object::AggregateIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## object.h (module 'core'): ns3::Ptr<ns3::Object const> ns3::Object::AggregateIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::Ptr< ns3::Object const >', 
+                   [])
+    return
+
+def register_Ns3RandomVariableStream_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::RandomVariableStream::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::RandomVariableStream::RandomVariableStream() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): void ns3::RandomVariableStream::SetStream(int64_t stream) [member function]
+    cls.add_method('SetStream', 
+                   'void', 
+                   [param('int64_t', 'stream')])
+    ## random-variable-stream.h (module 'core'): int64_t ns3::RandomVariableStream::GetStream() const [member function]
+    cls.add_method('GetStream', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): void ns3::RandomVariableStream::SetAntithetic(bool isAntithetic) [member function]
+    cls.add_method('SetAntithetic', 
+                   'void', 
+                   [param('bool', 'isAntithetic')])
+    ## random-variable-stream.h (module 'core'): bool ns3::RandomVariableStream::IsAntithetic() const [member function]
+    cls.add_method('IsAntithetic', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::RandomVariableStream::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::RandomVariableStream::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## random-variable-stream.h (module 'core'): ns3::RngStream * ns3::RandomVariableStream::Peek() const [member function]
+    cls.add_method('Peek', 
+                   'ns3::RngStream *', 
+                   [], 
+                   is_const=True, visibility='protected')
+    return
+
+def register_Ns3SequentialRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::SequentialRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::SequentialRandomVariable::SequentialRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::SequentialRandomVariable::GetMin() const [member function]
+    cls.add_method('GetMin', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::SequentialRandomVariable::GetMax() const [member function]
+    cls.add_method('GetMax', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): ns3::Ptr<ns3::RandomVariableStream> ns3::SequentialRandomVariable::GetIncrement() const [member function]
+    cls.add_method('GetIncrement', 
+                   'ns3::Ptr< ns3::RandomVariableStream >', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::SequentialRandomVariable::GetConsecutive() const [member function]
+    cls.add_method('GetConsecutive', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::SequentialRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::SequentialRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter< ns3::AttributeAccessor > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter< ns3::AttributeChecker > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter< ns3::AttributeValue > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::SimpleRefCount(ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter< ns3::CallbackImplBase > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount(ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter< ns3::EventImpl > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount(ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter< ns3::NixVector > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter< ns3::Packet > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount(ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter< ns3::TraceSourceAccessor > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SixLowPanFrag1_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFrag1::SixLowPanFrag1(ns3::SixLowPanFrag1 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanFrag1 const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFrag1::SixLowPanFrag1() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanFrag1::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanFrag1::GetDatagramSize() const [member function]
+    cls.add_method('GetDatagramSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanFrag1::GetDatagramTag() const [member function]
+    cls.add_method('GetDatagramTag', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanFrag1::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanFrag1::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanFrag1::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFrag1::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFrag1::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFrag1::SetDatagramSize(uint16_t datagramSize) [member function]
+    cls.add_method('SetDatagramSize', 
+                   'void', 
+                   [param('uint16_t', 'datagramSize')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFrag1::SetDatagramTag(uint16_t datagramTag) [member function]
+    cls.add_method('SetDatagramTag', 
+                   'void', 
+                   [param('uint16_t', 'datagramTag')])
+    return
+
+def register_Ns3SixLowPanFragN_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFragN::SixLowPanFragN(ns3::SixLowPanFragN const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanFragN const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFragN::SixLowPanFragN() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanFragN::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanFragN::GetDatagramOffset() const [member function]
+    cls.add_method('GetDatagramOffset', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanFragN::GetDatagramSize() const [member function]
+    cls.add_method('GetDatagramSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanFragN::GetDatagramTag() const [member function]
+    cls.add_method('GetDatagramTag', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanFragN::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanFragN::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanFragN::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::SetDatagramOffset(uint8_t datagramOffset) [member function]
+    cls.add_method('SetDatagramOffset', 
+                   'void', 
+                   [param('uint8_t', 'datagramOffset')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::SetDatagramSize(uint16_t datagramSize) [member function]
+    cls.add_method('SetDatagramSize', 
+                   'void', 
+                   [param('uint16_t', 'datagramSize')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::SetDatagramTag(uint16_t datagramTag) [member function]
+    cls.add_method('SetDatagramTag', 
+                   'void', 
+                   [param('uint16_t', 'datagramTag')])
+    return
+
+def register_Ns3SixLowPanHc1_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::SixLowPanHc1(ns3::SixLowPanHc1 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanHc1 const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::SixLowPanHc1() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanHc1::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::LowPanHc1Addr_e ns3::SixLowPanHc1::GetDstCompression() const [member function]
+    cls.add_method('GetDstCompression', 
+                   'ns3::SixLowPanHc1::LowPanHc1Addr_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t const * ns3::SixLowPanHc1::GetDstInterface() const [member function]
+    cls.add_method('GetDstInterface', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t const * ns3::SixLowPanHc1::GetDstPrefix() const [member function]
+    cls.add_method('GetDstPrefix', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanHc1::GetFlowLabel() const [member function]
+    cls.add_method('GetFlowLabel', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanHc1::GetHopLimit() const [member function]
+    cls.add_method('GetHopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanHc1::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanHc1::GetNextHeader() const [member function]
+    cls.add_method('GetNextHeader', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanHc1::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::LowPanHc1Addr_e ns3::SixLowPanHc1::GetSrcCompression() const [member function]
+    cls.add_method('GetSrcCompression', 
+                   'ns3::SixLowPanHc1::LowPanHc1Addr_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t const * ns3::SixLowPanHc1::GetSrcInterface() const [member function]
+    cls.add_method('GetSrcInterface', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t const * ns3::SixLowPanHc1::GetSrcPrefix() const [member function]
+    cls.add_method('GetSrcPrefix', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanHc1::GetTrafficClass() const [member function]
+    cls.add_method('GetTrafficClass', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanHc1::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanHc1::IsHc2HeaderPresent() const [member function]
+    cls.add_method('IsHc2HeaderPresent', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanHc1::IsTcflCompression() const [member function]
+    cls.add_method('IsTcflCompression', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetDstCompression(ns3::SixLowPanHc1::LowPanHc1Addr_e dstCompression) [member function]
+    cls.add_method('SetDstCompression', 
+                   'void', 
+                   [param('ns3::SixLowPanHc1::LowPanHc1Addr_e', 'dstCompression')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetDstInterface(uint8_t const * dstInterface) [member function]
+    cls.add_method('SetDstInterface', 
+                   'void', 
+                   [param('uint8_t const *', 'dstInterface')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetDstPrefix(uint8_t const * dstPrefix) [member function]
+    cls.add_method('SetDstPrefix', 
+                   'void', 
+                   [param('uint8_t const *', 'dstPrefix')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetFlowLabel(uint32_t flowLabel) [member function]
+    cls.add_method('SetFlowLabel', 
+                   'void', 
+                   [param('uint32_t', 'flowLabel')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetHc2HeaderPresent(bool hc2HeaderPresent) [member function]
+    cls.add_method('SetHc2HeaderPresent', 
+                   'void', 
+                   [param('bool', 'hc2HeaderPresent')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetHopLimit(uint8_t limit) [member function]
+    cls.add_method('SetHopLimit', 
+                   'void', 
+                   [param('uint8_t', 'limit')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetNextHeader(uint8_t nextHeader) [member function]
+    cls.add_method('SetNextHeader', 
+                   'void', 
+                   [param('uint8_t', 'nextHeader')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetSrcCompression(ns3::SixLowPanHc1::LowPanHc1Addr_e srcCompression) [member function]
+    cls.add_method('SetSrcCompression', 
+                   'void', 
+                   [param('ns3::SixLowPanHc1::LowPanHc1Addr_e', 'srcCompression')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetSrcInterface(uint8_t const * srcInterface) [member function]
+    cls.add_method('SetSrcInterface', 
+                   'void', 
+                   [param('uint8_t const *', 'srcInterface')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetSrcPrefix(uint8_t const * srcPrefix) [member function]
+    cls.add_method('SetSrcPrefix', 
+                   'void', 
+                   [param('uint8_t const *', 'srcPrefix')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetTcflCompression(bool tcflCompression) [member function]
+    cls.add_method('SetTcflCompression', 
+                   'void', 
+                   [param('bool', 'tcflCompression')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetTrafficClass(uint8_t trafficClass) [member function]
+    cls.add_method('SetTrafficClass', 
+                   'void', 
+                   [param('uint8_t', 'trafficClass')])
+    return
+
+def register_Ns3SixLowPanIphc_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::SixLowPanIphc(ns3::SixLowPanIphc const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanIphc const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::SixLowPanIphc() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::SixLowPanIphc(uint8_t dispatch) [constructor]
+    cls.add_constructor([param('uint8_t', 'dispatch')])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanIphc::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetCid() const [member function]
+    cls.add_method('GetCid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetDac() const [member function]
+    cls.add_method('GetDac', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::HeaderCompression_e ns3::SixLowPanIphc::GetDam() const [member function]
+    cls.add_method('GetDam', 
+                   'ns3::SixLowPanIphc::HeaderCompression_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetDscp() const [member function]
+    cls.add_method('GetDscp', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::Ipv6Address ns3::SixLowPanIphc::GetDstAddress() const [member function]
+    cls.add_method('GetDstAddress', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetDstContextId() const [member function]
+    cls.add_method('GetDstContextId', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetEcn() const [member function]
+    cls.add_method('GetEcn', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanIphc::GetFlowLabel() const [member function]
+    cls.add_method('GetFlowLabel', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::Hlim_e ns3::SixLowPanIphc::GetHlim() const [member function]
+    cls.add_method('GetHlim', 
+                   'ns3::SixLowPanIphc::Hlim_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetHopLimit() const [member function]
+    cls.add_method('GetHopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanIphc::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetM() const [member function]
+    cls.add_method('GetM', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetNextHeader() const [member function]
+    cls.add_method('GetNextHeader', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetNh() const [member function]
+    cls.add_method('GetNh', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetSac() const [member function]
+    cls.add_method('GetSac', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::HeaderCompression_e ns3::SixLowPanIphc::GetSam() const [member function]
+    cls.add_method('GetSam', 
+                   'ns3::SixLowPanIphc::HeaderCompression_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanIphc::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::Ipv6Address ns3::SixLowPanIphc::GetSrcAddress() const [member function]
+    cls.add_method('GetSrcAddress', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetSrcContextId() const [member function]
+    cls.add_method('GetSrcContextId', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::TrafficClassFlowLabel_e ns3::SixLowPanIphc::GetTf() const [member function]
+    cls.add_method('GetTf', 
+                   'ns3::SixLowPanIphc::TrafficClassFlowLabel_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanIphc::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetCid(bool cidField) [member function]
+    cls.add_method('SetCid', 
+                   'void', 
+                   [param('bool', 'cidField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDac(bool dacField) [member function]
+    cls.add_method('SetDac', 
+                   'void', 
+                   [param('bool', 'dacField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDam(ns3::SixLowPanIphc::HeaderCompression_e damField) [member function]
+    cls.add_method('SetDam', 
+                   'void', 
+                   [param('ns3::SixLowPanIphc::HeaderCompression_e', 'damField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDscp(uint8_t dscp) [member function]
+    cls.add_method('SetDscp', 
+                   'void', 
+                   [param('uint8_t', 'dscp')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDstAddress(ns3::Ipv6Address dstAddress) [member function]
+    cls.add_method('SetDstAddress', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dstAddress')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDstContextId(uint8_t dstContextId) [member function]
+    cls.add_method('SetDstContextId', 
+                   'void', 
+                   [param('uint8_t', 'dstContextId')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetEcn(uint8_t ecn) [member function]
+    cls.add_method('SetEcn', 
+                   'void', 
+                   [param('uint8_t', 'ecn')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetFlowLabel(uint32_t flowLabel) [member function]
+    cls.add_method('SetFlowLabel', 
+                   'void', 
+                   [param('uint32_t', 'flowLabel')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetHlim(ns3::SixLowPanIphc::Hlim_e hlimField) [member function]
+    cls.add_method('SetHlim', 
+                   'void', 
+                   [param('ns3::SixLowPanIphc::Hlim_e', 'hlimField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetHopLimit(uint8_t hopLimit) [member function]
+    cls.add_method('SetHopLimit', 
+                   'void', 
+                   [param('uint8_t', 'hopLimit')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetM(bool mField) [member function]
+    cls.add_method('SetM', 
+                   'void', 
+                   [param('bool', 'mField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetNextHeader(uint8_t nextHeader) [member function]
+    cls.add_method('SetNextHeader', 
+                   'void', 
+                   [param('uint8_t', 'nextHeader')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetNh(bool nhField) [member function]
+    cls.add_method('SetNh', 
+                   'void', 
+                   [param('bool', 'nhField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetSac(bool sacField) [member function]
+    cls.add_method('SetSac', 
+                   'void', 
+                   [param('bool', 'sacField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetSam(ns3::SixLowPanIphc::HeaderCompression_e samField) [member function]
+    cls.add_method('SetSam', 
+                   'void', 
+                   [param('ns3::SixLowPanIphc::HeaderCompression_e', 'samField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetSrcAddress(ns3::Ipv6Address srcAddress) [member function]
+    cls.add_method('SetSrcAddress', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'srcAddress')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetSrcContextId(uint8_t srcContextId) [member function]
+    cls.add_method('SetSrcContextId', 
+                   'void', 
+                   [param('uint8_t', 'srcContextId')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetTf(ns3::SixLowPanIphc::TrafficClassFlowLabel_e tfField) [member function]
+    cls.add_method('SetTf', 
+                   'void', 
+                   [param('ns3::SixLowPanIphc::TrafficClassFlowLabel_e', 'tfField')])
+    return
+
+def register_Ns3SixLowPanNhcExtension_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension::SixLowPanNhcExtension(ns3::SixLowPanNhcExtension const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanNhcExtension const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension::SixLowPanNhcExtension() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanNhcExtension::CopyBlob(uint8_t * blob, uint32_t size) const [member function]
+    cls.add_method('CopyBlob', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'blob'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanNhcExtension::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension::Eid_e ns3::SixLowPanNhcExtension::GetEid() const [member function]
+    cls.add_method('GetEid', 
+                   'ns3::SixLowPanNhcExtension::Eid_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanNhcExtension::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanNhcExtension::GetNextHeader() const [member function]
+    cls.add_method('GetNextHeader', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanNhcExtension::GetNh() const [member function]
+    cls.add_method('GetNh', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::NhcDispatch_e ns3::SixLowPanNhcExtension::GetNhcDispatchType() const [member function]
+    cls.add_method('GetNhcDispatchType', 
+                   'ns3::SixLowPanDispatch::NhcDispatch_e', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanNhcExtension::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanNhcExtension::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::SetBlob(uint8_t const * blob, uint32_t size) [member function]
+    cls.add_method('SetBlob', 
+                   'void', 
+                   [param('uint8_t const *', 'blob'), param('uint32_t', 'size')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::SetEid(ns3::SixLowPanNhcExtension::Eid_e extensionHeaderType) [member function]
+    cls.add_method('SetEid', 
+                   'void', 
+                   [param('ns3::SixLowPanNhcExtension::Eid_e', 'extensionHeaderType')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::SetNextHeader(uint8_t nextHeader) [member function]
+    cls.add_method('SetNextHeader', 
+                   'void', 
+                   [param('uint8_t', 'nextHeader')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::SetNh(bool nhField) [member function]
+    cls.add_method('SetNh', 
+                   'void', 
+                   [param('bool', 'nhField')])
+    return
+
+def register_Ns3SixLowPanUdpNhcExtension_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension::SixLowPanUdpNhcExtension(ns3::SixLowPanUdpNhcExtension const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanUdpNhcExtension const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension::SixLowPanUdpNhcExtension() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanUdpNhcExtension::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanUdpNhcExtension::GetC() const [member function]
+    cls.add_method('GetC', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanUdpNhcExtension::GetChecksum() const [member function]
+    cls.add_method('GetChecksum', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanUdpNhcExtension::GetDstPort() const [member function]
+    cls.add_method('GetDstPort', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanUdpNhcExtension::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::NhcDispatch_e ns3::SixLowPanUdpNhcExtension::GetNhcDispatchType() const [member function]
+    cls.add_method('GetNhcDispatchType', 
+                   'ns3::SixLowPanDispatch::NhcDispatch_e', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension::Ports_e ns3::SixLowPanUdpNhcExtension::GetPorts() const [member function]
+    cls.add_method('GetPorts', 
+                   'ns3::SixLowPanUdpNhcExtension::Ports_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanUdpNhcExtension::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanUdpNhcExtension::GetSrcPort() const [member function]
+    cls.add_method('GetSrcPort', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanUdpNhcExtension::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetC(bool cField) [member function]
+    cls.add_method('SetC', 
+                   'void', 
+                   [param('bool', 'cField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetChecksum(uint16_t checksum) [member function]
+    cls.add_method('SetChecksum', 
+                   'void', 
+                   [param('uint16_t', 'checksum')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetDstPort(uint16_t port) [member function]
+    cls.add_method('SetDstPort', 
+                   'void', 
+                   [param('uint16_t', 'port')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetPorts(ns3::SixLowPanUdpNhcExtension::Ports_e port) [member function]
+    cls.add_method('SetPorts', 
+                   'void', 
+                   [param('ns3::SixLowPanUdpNhcExtension::Ports_e', 'port')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetSrcPort(uint16_t port) [member function]
+    cls.add_method('SetSrcPort', 
+                   'void', 
+                   [param('uint16_t', 'port')])
+    return
+
+def register_Ns3Time_methods(root_module, cls):
+    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('>')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
+    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('<=')
+    cls.add_binary_comparison_operator('==')
+    cls.add_binary_comparison_operator('>=')
+    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
+    cls.add_constructor([])
+    ## nstime.h (module 'core'): ns3::Time::Time(ns3::Time const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Time const &', 'o')])
+    ## nstime.h (module 'core'): ns3::Time::Time(double v) [constructor]
+    cls.add_constructor([param('double', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long int v) [constructor]
+    cls.add_constructor([param('long int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long long int v) [constructor]
+    cls.add_constructor([param('long long int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(unsigned int v) [constructor]
+    cls.add_constructor([param('unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long unsigned int v) [constructor]
+    cls.add_constructor([param('long unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long long unsigned int v) [constructor]
+    cls.add_constructor([param('long long unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(std::string const & s) [constructor]
+    cls.add_constructor([param('std::string const &', 's')])
+    ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & value) [constructor]
+    cls.add_constructor([param('ns3::int64x64_t const &', 'value')])
+    ## nstime.h (module 'core'): int ns3::Time::Compare(ns3::Time const & o) const [member function]
+    cls.add_method('Compare', 
+                   'int', 
+                   [param('ns3::Time const &', 'o')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & from, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('From', 
+                   'ns3::Time', 
+                   [param('ns3::int64x64_t const &', 'from'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value) [member function]
+    cls.add_method('From', 
+                   'ns3::Time', 
+                   [param('ns3::int64x64_t const &', 'value')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('FromDouble', 
+                   'ns3::Time', 
+                   [param('double', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('FromInteger', 
+                   'ns3::Time', 
+                   [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
+    cls.add_method('GetDouble', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetFemtoSeconds() const [member function]
+    cls.add_method('GetFemtoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
+    cls.add_method('GetInteger', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetMicroSeconds() const [member function]
+    cls.add_method('GetMicroSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetMilliSeconds() const [member function]
+    cls.add_method('GetMilliSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
+    cls.add_method('GetNanoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetPicoSeconds() const [member function]
+    cls.add_method('GetPicoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time::Unit ns3::Time::GetResolution() [member function]
+    cls.add_method('GetResolution', 
+                   'ns3::Time::Unit', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetSeconds() const [member function]
+    cls.add_method('GetSeconds', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetTimeStep() const [member function]
+    cls.add_method('GetTimeStep', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
+    cls.add_method('IsNegative', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsPositive() const [member function]
+    cls.add_method('IsPositive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyNegative() const [member function]
+    cls.add_method('IsStrictlyNegative', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyPositive() const [member function]
+    cls.add_method('IsStrictlyPositive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsZero() const [member function]
+    cls.add_method('IsZero', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
+    cls.add_method('SetResolution', 
+                   'void', 
+                   [param('ns3::Time::Unit', 'resolution')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('To', 
+                   'ns3::int64x64_t', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('ToDouble', 
+                   'double', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('ToInteger', 
+                   'int64_t', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    return
+
+def register_Ns3TraceSourceAccessor_methods(root_module, cls):
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor::TraceSourceAccessor(ns3::TraceSourceAccessor const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TraceSourceAccessor const &', 'arg0')])
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor::TraceSourceAccessor() [constructor]
+    cls.add_constructor([])
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::Connect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('Connect', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::ConnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('ConnectWithoutContext', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::Disconnect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('Disconnect', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::DisconnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('DisconnectWithoutContext', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Trailer_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## trailer.h (module 'network'): ns3::Trailer::Trailer() [constructor]
+    cls.add_constructor([])
+    ## trailer.h (module 'network'): ns3::Trailer::Trailer(ns3::Trailer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Trailer const &', 'arg0')])
+    ## trailer.h (module 'network'): uint32_t ns3::Trailer::Deserialize(ns3::Buffer::Iterator end) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'end')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## trailer.h (module 'network'): uint32_t ns3::Trailer::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trailer.h (module 'network'): static ns3::TypeId ns3::Trailer::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## trailer.h (module 'network'): void ns3::Trailer::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trailer.h (module 'network'): void ns3::Trailer::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3TriangularRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::TriangularRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::TriangularRandomVariable::TriangularRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetMean() const [member function]
+    cls.add_method('GetMean', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetMin() const [member function]
+    cls.add_method('GetMin', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetMax() const [member function]
+    cls.add_method('GetMax', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetValue(double mean, double min, double max) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mean'), param('double', 'min'), param('double', 'max')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::TriangularRandomVariable::GetInteger(uint32_t mean, uint32_t min, uint32_t max) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mean'), param('uint32_t', 'min'), param('uint32_t', 'max')])
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::TriangularRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3UniformRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::UniformRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable::UniformRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::UniformRandomVariable::GetMin() const [member function]
+    cls.add_method('GetMin', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::UniformRandomVariable::GetMax() const [member function]
+    cls.add_method('GetMax', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::UniformRandomVariable::GetValue(double min, double max) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'min'), param('double', 'max')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::UniformRandomVariable::GetInteger(uint32_t min, uint32_t max) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'min'), param('uint32_t', 'max')])
+    ## random-variable-stream.h (module 'core'): double ns3::UniformRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::UniformRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3WeibullRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::WeibullRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::WeibullRandomVariable::WeibullRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetScale() const [member function]
+    cls.add_method('GetScale', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetShape() const [member function]
+    cls.add_method('GetShape', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetBound() const [member function]
+    cls.add_method('GetBound', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetValue(double scale, double shape, double bound) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'scale'), param('double', 'shape'), param('double', 'bound')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::WeibullRandomVariable::GetInteger(uint32_t scale, uint32_t shape, uint32_t bound) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'scale'), param('uint32_t', 'shape'), param('uint32_t', 'bound')])
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::WeibullRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3ZetaRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ZetaRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ZetaRandomVariable::ZetaRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::ZetaRandomVariable::GetAlpha() const [member function]
+    cls.add_method('GetAlpha', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ZetaRandomVariable::GetValue(double alpha) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'alpha')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZetaRandomVariable::GetInteger(uint32_t alpha) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'alpha')])
+    ## random-variable-stream.h (module 'core'): double ns3::ZetaRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZetaRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3ZipfRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ZipfRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ZipfRandomVariable::ZipfRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZipfRandomVariable::GetN() const [member function]
+    cls.add_method('GetN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ZipfRandomVariable::GetAlpha() const [member function]
+    cls.add_method('GetAlpha', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ZipfRandomVariable::GetValue(uint32_t n, double alpha) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('uint32_t', 'n'), param('double', 'alpha')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZipfRandomVariable::GetInteger(uint32_t n, uint32_t alpha) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'n'), param('uint32_t', 'alpha')])
+    ## random-variable-stream.h (module 'core'): double ns3::ZipfRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZipfRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=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')])
+    ## attribute.h (module 'core'): ns3::AttributeAccessor::AttributeAccessor() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::Get(ns3::ObjectBase const * object, ns3::AttributeValue & attribute) const [member function]
+    cls.add_method('Get', 
+                   'bool', 
+                   [param('ns3::ObjectBase const *', 'object'), param('ns3::AttributeValue &', 'attribute')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::HasGetter() const [member function]
+    cls.add_method('HasGetter', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::HasSetter() const [member function]
+    cls.add_method('HasSetter', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::Set(ns3::ObjectBase * object, ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Set', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False), param('ns3::AttributeValue const &', 'value')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3AttributeChecker_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::AttributeChecker::AttributeChecker(ns3::AttributeChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeChecker const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::AttributeChecker::AttributeChecker() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::Check(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Check', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::Copy(ns3::AttributeValue const & source, ns3::AttributeValue & destination) const [member function]
+    cls.add_method('Copy', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'source'), param('ns3::AttributeValue &', 'destination')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::CreateValidValue(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('CreateValidValue', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_const=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeChecker::GetUnderlyingTypeInformation() const [member function]
+    cls.add_method('GetUnderlyingTypeInformation', 
+                   'std::string', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeChecker::GetValueTypeName() const [member function]
+    cls.add_method('GetValueTypeName', 
+                   'std::string', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::HasUnderlyingTypeInformation() const [member function]
+    cls.add_method('HasUnderlyingTypeInformation', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3AttributeValue_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::AttributeValue::AttributeValue(ns3::AttributeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeValue const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::AttributeValue::AttributeValue() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3CallbackChecker_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker(ns3::CallbackChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackChecker const &', 'arg0')])
+    return
+
+def register_Ns3CallbackImplBase_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackImplBase::CallbackImplBase() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackImplBase::CallbackImplBase(ns3::CallbackImplBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackImplBase const &', 'arg0')])
+    ## callback.h (module 'core'): bool ns3::CallbackImplBase::IsEqual(ns3::Ptr<ns3::CallbackImplBase const> other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::CallbackImplBase const >', 'other')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3CallbackValue_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue(ns3::CallbackValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackValue const &', 'arg0')])
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue(ns3::CallbackBase const & base) [constructor]
+    cls.add_constructor([param('ns3::CallbackBase const &', 'base')])
+    ## callback.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::CallbackValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## callback.h (module 'core'): bool ns3::CallbackValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## callback.h (module 'core'): std::string ns3::CallbackValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## callback.h (module 'core'): void ns3::CallbackValue::Set(ns3::CallbackBase base) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::CallbackBase', 'base')])
+    return
+
+def register_Ns3ConstantRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ConstantRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ConstantRandomVariable::ConstantRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::ConstantRandomVariable::GetConstant() const [member function]
+    cls.add_method('GetConstant', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ConstantRandomVariable::GetValue(double constant) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'constant')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ConstantRandomVariable::GetInteger(uint32_t constant) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'constant')])
+    ## random-variable-stream.h (module 'core'): double ns3::ConstantRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ConstantRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3DeterministicRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::DeterministicRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable::DeterministicRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): void ns3::DeterministicRandomVariable::SetValueArray(double * values, uint64_t length) [member function]
+    cls.add_method('SetValueArray', 
+                   'void', 
+                   [param('double *', 'values'), param('uint64_t', 'length')])
+    ## random-variable-stream.h (module 'core'): double ns3::DeterministicRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::DeterministicRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3EmpiricalRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable::EmpiricalRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): void ns3::EmpiricalRandomVariable::CDF(double v, double c) [member function]
+    cls.add_method('CDF', 
+                   'void', 
+                   [param('double', 'v'), param('double', 'c')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::EmpiricalRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::EmpiricalRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): double ns3::EmpiricalRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): double ns3::EmpiricalRandomVariable::Interpolate(double arg0, double arg1, double arg2, double arg3, double arg4) [member function]
+    cls.add_method('Interpolate', 
+                   'double', 
+                   [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3'), param('double', 'arg4')], 
+                   visibility='private', is_virtual=True)
+    ## random-variable-stream.h (module 'core'): void ns3::EmpiricalRandomVariable::Validate() [member function]
+    cls.add_method('Validate', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3EmptyAttributeValue_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EmptyAttributeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::EmptyAttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   visibility='private', is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::EmptyAttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3ErlangRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ErlangRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ErlangRandomVariable::ErlangRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ErlangRandomVariable::GetK() const [member function]
+    cls.add_method('GetK', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ErlangRandomVariable::GetLambda() const [member function]
+    cls.add_method('GetLambda', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ErlangRandomVariable::GetValue(uint32_t k, double lambda) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('uint32_t', 'k'), param('double', 'lambda')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ErlangRandomVariable::GetInteger(uint32_t k, uint32_t lambda) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'k'), param('uint32_t', 'lambda')])
+    ## random-variable-stream.h (module 'core'): double ns3::ErlangRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ErlangRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3EventImpl_methods(root_module, cls):
+    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventImpl const &', 'arg0')])
+    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl() [constructor]
+    cls.add_constructor([])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Invoke() [member function]
+    cls.add_method('Invoke', 
+                   'void', 
+                   [])
+    ## event-impl.h (module 'core'): bool ns3::EventImpl::IsCancelled() [member function]
+    cls.add_method('IsCancelled', 
+                   'bool', 
+                   [])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Notify() [member function]
+    cls.add_method('Notify', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ExponentialRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ExponentialRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ExponentialRandomVariable::ExponentialRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::ExponentialRandomVariable::GetMean() const [member function]
+    cls.add_method('GetMean', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ExponentialRandomVariable::GetBound() const [member function]
+    cls.add_method('GetBound', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ExponentialRandomVariable::GetValue(double mean, double bound) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mean'), param('double', 'bound')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ExponentialRandomVariable::GetInteger(uint32_t mean, uint32_t bound) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mean'), param('uint32_t', 'bound')])
+    ## random-variable-stream.h (module 'core'): double ns3::ExponentialRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ExponentialRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3GammaRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::GammaRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable::GammaRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::GammaRandomVariable::GetAlpha() const [member function]
+    cls.add_method('GetAlpha', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::GammaRandomVariable::GetBeta() const [member function]
+    cls.add_method('GetBeta', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::GammaRandomVariable::GetValue(double alpha, double beta) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'alpha'), param('double', 'beta')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::GammaRandomVariable::GetInteger(uint32_t alpha, uint32_t beta) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'alpha'), param('uint32_t', 'beta')])
+    ## random-variable-stream.h (module 'core'): double ns3::GammaRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::GammaRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3Ipv4AddressChecker_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker(ns3::Ipv4AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv4AddressValue_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue(ns3::Ipv4AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4AddressValue const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue(ns3::Ipv4Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Address const &', 'value')])
+    ## ipv4-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv4AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): std::string ns3::Ipv4AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4AddressValue::Set(ns3::Ipv4Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv4Address const &', 'value')])
+    return
+
+def register_Ns3Ipv4MaskChecker_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker::Ipv4MaskChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker::Ipv4MaskChecker(ns3::Ipv4MaskChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4MaskChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv4MaskValue_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue(ns3::Ipv4MaskValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4MaskValue const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue(ns3::Ipv4Mask const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Mask const &', 'value')])
+    ## ipv4-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv4MaskValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4MaskValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask ns3::Ipv4MaskValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): std::string ns3::Ipv4MaskValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4MaskValue::Set(ns3::Ipv4Mask const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv4Mask const &', 'value')])
+    return
+
+def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker::Ipv6AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker::Ipv6AddressChecker(ns3::Ipv6AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv6AddressValue_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6AddressValue const &', 'arg0')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const &', 'value')])
+    ## ipv6-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv6AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address ns3::Ipv6AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): std::string ns3::Ipv6AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6AddressValue::Set(ns3::Ipv6Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv6Address const &', 'value')])
+    return
+
+def register_Ns3Ipv6PrefixChecker_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker(ns3::Ipv6PrefixChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PrefixChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv6PrefixValue_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6PrefixValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PrefixValue const &', 'arg0')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6Prefix const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const &', 'value')])
+    ## ipv6-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv6PrefixValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6PrefixValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix ns3::Ipv6PrefixValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): std::string ns3::Ipv6PrefixValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6PrefixValue::Set(ns3::Ipv6Prefix const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv6Prefix const &', 'value')])
+    return
+
+def register_Ns3LogNormalRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::LogNormalRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::LogNormalRandomVariable::LogNormalRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::LogNormalRandomVariable::GetMu() const [member function]
+    cls.add_method('GetMu', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::LogNormalRandomVariable::GetSigma() const [member function]
+    cls.add_method('GetSigma', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::LogNormalRandomVariable::GetValue(double mu, double sigma) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mu'), param('double', 'sigma')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::LogNormalRandomVariable::GetInteger(uint32_t mu, uint32_t sigma) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mu'), param('uint32_t', 'sigma')])
+    ## random-variable-stream.h (module 'core'): double ns3::LogNormalRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::LogNormalRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3NetDevice_methods(root_module, cls):
+    ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
+    cls.add_constructor([])
+    ## net-device.h (module 'network'): ns3::NetDevice::NetDevice(ns3::NetDevice const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NetDevice const &', 'arg0')])
+    ## net-device.h (module 'network'): void ns3::NetDevice::AddLinkChangeCallback(ns3::Callback<void,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    cls.add_method('AddLinkChangeCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetBroadcast() const [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Ptr<ns3::Channel> ns3::NetDevice::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::Channel >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): uint32_t ns3::NetDevice::GetIfIndex() const [member function]
+    cls.add_method('GetIfIndex', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): uint16_t ns3::NetDevice::GetMtu() const [member function]
+    cls.add_method('GetMtu', 
+                   'uint16_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv4Address multicastGroup) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv4Address', 'multicastGroup')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Ptr<ns3::Node> ns3::NetDevice::GetNode() const [member function]
+    cls.add_method('GetNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): static ns3::TypeId ns3::NetDevice::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsBridge() const [member function]
+    cls.add_method('IsBridge', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsLinkUp() const [member function]
+    cls.add_method('IsLinkUp', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsPointToPoint() const [member function]
+    cls.add_method('IsPointToPoint', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::NeedsArp() const [member function]
+    cls.add_method('NeedsArp', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('Send', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('SendFrom', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetIfIndex(uint32_t const index) [member function]
+    cls.add_method('SetIfIndex', 
+                   'void', 
+                   [param('uint32_t const', 'index')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SetMtu(uint16_t const mtu) [member function]
+    cls.add_method('SetMtu', 
+                   'bool', 
+                   [param('uint16_t const', 'mtu')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetNode(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('SetNode', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetPromiscReceiveCallback(ns3::Callback<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> cb) [member function]
+    cls.add_method('SetPromiscReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< 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 >', 'cb')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetReceiveCallback(ns3::Callback<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> cb) [member function]
+    cls.add_method('SetReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< 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 >', 'cb')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3NixVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## nix-vector.h (module 'network'): ns3::NixVector::NixVector() [constructor]
+    cls.add_constructor([])
+    ## nix-vector.h (module 'network'): ns3::NixVector::NixVector(ns3::NixVector const & o) [copy constructor]
+    cls.add_constructor([param('ns3::NixVector const &', 'o')])
+    ## nix-vector.h (module 'network'): void ns3::NixVector::AddNeighborIndex(uint32_t newBits, uint32_t numberOfBits) [member function]
+    cls.add_method('AddNeighborIndex', 
+                   'void', 
+                   [param('uint32_t', 'newBits'), param('uint32_t', 'numberOfBits')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::BitCount(uint32_t numberOfNeighbors) const [member function]
+    cls.add_method('BitCount', 
+                   'uint32_t', 
+                   [param('uint32_t', 'numberOfNeighbors')], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): ns3::Ptr<ns3::NixVector> ns3::NixVector::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::NixVector >', 
+                   [], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Deserialize(uint32_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint32_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::ExtractNeighborIndex(uint32_t numberOfBits) [member function]
+    cls.add_method('ExtractNeighborIndex', 
+                   'uint32_t', 
+                   [param('uint32_t', 'numberOfBits')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetRemainingBits() [member function]
+    cls.add_method('GetRemainingBits', 
+                   'uint32_t', 
+                   [])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Serialize(uint32_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint32_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3NormalRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): ns3::NormalRandomVariable::INFINITE_VALUE [variable]
+    cls.add_static_attribute('INFINITE_VALUE', 'double const', is_const=True)
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::NormalRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::NormalRandomVariable::NormalRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetMean() const [member function]
+    cls.add_method('GetMean', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetVariance() const [member function]
+    cls.add_method('GetVariance', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetBound() const [member function]
+    cls.add_method('GetBound', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetValue(double mean, double variance, double bound=ns3::NormalRandomVariable::INFINITE_VALUE) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mean'), param('double', 'variance'), param('double', 'bound', default_value='ns3::NormalRandomVariable::INFINITE_VALUE')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::NormalRandomVariable::GetInteger(uint32_t mean, uint32_t variance, uint32_t bound) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mean'), param('uint32_t', 'variance'), param('uint32_t', 'bound')])
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::NormalRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3ObjectFactoryChecker_methods(root_module, cls):
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')])
+    return
+
+def register_Ns3ObjectFactoryValue_methods(root_module, cls):
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor]
+    cls.add_constructor([param('ns3::ObjectFactory const &', 'value')])
+    ## object-factory.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::ObjectFactoryValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::ObjectFactory', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::ObjectFactory const &', 'value')])
+    return
+
+def register_Ns3Packet_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## packet.h (module 'network'): ns3::Packet::Packet() [constructor]
+    cls.add_constructor([])
+    ## packet.h (module 'network'): ns3::Packet::Packet(ns3::Packet const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Packet const &', 'o')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint32_t size) [constructor]
+    cls.add_constructor([param('uint32_t', 'size')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size, bool magic) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<const ns3::Packet> packet) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet.h (module 'network'): void ns3::Packet::AddByteTag(ns3::Tag const & tag) const [member function]
+    cls.add_method('AddByteTag', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::AddHeader(ns3::Header const & header) [member function]
+    cls.add_method('AddHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header')])
+    ## packet.h (module 'network'): void ns3::Packet::AddPacketTag(ns3::Tag const & tag) const [member function]
+    cls.add_method('AddPacketTag', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::AddPaddingAtEnd(uint32_t size) [member function]
+    cls.add_method('AddPaddingAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::AddTrailer(ns3::Trailer const & trailer) [member function]
+    cls.add_method('AddTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer')])
+    ## packet.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::Packet::BeginItem() const [member function]
+    cls.add_method('BeginItem', 
+                   'ns3::PacketMetadata::ItemIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::Packet> ns3::Packet::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::CopyData(uint8_t * buffer, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::CopyData(std::ostream * os, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'void', 
+                   [param('std::ostream *', 'os'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::Packet> ns3::Packet::CreateFragment(uint32_t start, uint32_t length) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
+                   is_const=True)
+    ## packet.h (module 'network'): static void ns3::Packet::EnableChecking() [member function]
+    cls.add_method('EnableChecking', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet.h (module 'network'): static void ns3::Packet::EnablePrinting() [member function]
+    cls.add_method('EnablePrinting', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet.h (module 'network'): bool ns3::Packet::FindFirstMatchingByteTag(ns3::Tag & tag) const [member function]
+    cls.add_method('FindFirstMatchingByteTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::ByteTagIterator ns3::Packet::GetByteTagIterator() const [member function]
+    cls.add_method('GetByteTagIterator', 
+                   'ns3::ByteTagIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::NixVector> ns3::Packet::GetNixVector() const [member function]
+    cls.add_method('GetNixVector', 
+                   'ns3::Ptr< ns3::NixVector >', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::PacketTagIterator ns3::Packet::GetPacketTagIterator() const [member function]
+    cls.add_method('GetPacketTagIterator', 
+                   'ns3::PacketTagIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint64_t ns3::Packet::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint8_t const * ns3::Packet::PeekData() const [member function]
+    cls.add_method('PeekData', 
+                   'uint8_t const *', 
+                   [], 
+                   deprecated=True, is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::PeekHeader(ns3::Header & header) const [member function]
+    cls.add_method('PeekHeader', 
+                   'uint32_t', 
+                   [param('ns3::Header &', 'header')], 
+                   is_const=True)
+    ## packet.h (module 'network'): bool ns3::Packet::PeekPacketTag(ns3::Tag & tag) const [member function]
+    cls.add_method('PeekPacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::PeekTrailer(ns3::Trailer & trailer) [member function]
+    cls.add_method('PeekTrailer', 
+                   'uint32_t', 
+                   [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): void ns3::Packet::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::PrintByteTags(std::ostream & os) const [member function]
+    cls.add_method('PrintByteTags', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::PrintPacketTags(std::ostream & os) const [member function]
+    cls.add_method('PrintPacketTags', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAllByteTags() [member function]
+    cls.add_method('RemoveAllByteTags', 
+                   'void', 
+                   [])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAllPacketTags() [member function]
+    cls.add_method('RemoveAllPacketTags', 
+                   'void', 
+                   [])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAtEnd(uint32_t size) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAtStart(uint32_t size) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveHeader(ns3::Header & header) [member function]
+    cls.add_method('RemoveHeader', 
+                   'uint32_t', 
+                   [param('ns3::Header &', 'header')])
+    ## packet.h (module 'network'): bool ns3::Packet::RemovePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('RemovePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveTrailer(ns3::Trailer & trailer) [member function]
+    cls.add_method('RemoveTrailer', 
+                   'uint32_t', 
+                   [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::SetNixVector(ns3::Ptr<ns3::NixVector> arg0) [member function]
+    cls.add_method('SetNixVector', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
+    return
+
+def register_Ns3ParetoRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ParetoRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable::ParetoRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetMean() const [member function]
+    cls.add_method('GetMean', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetShape() const [member function]
+    cls.add_method('GetShape', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetBound() const [member function]
+    cls.add_method('GetBound', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetValue(double mean, double shape, double bound) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mean'), param('double', 'shape'), param('double', 'bound')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ParetoRandomVariable::GetInteger(uint32_t mean, uint32_t shape, uint32_t bound) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mean'), param('uint32_t', 'shape'), param('uint32_t', 'bound')])
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ParetoRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3SixLowPanNetDevice_methods(root_module, cls):
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::SixLowPanNetDevice::SixLowPanNetDevice() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::AddLinkChangeCallback(ns3::Callback<void,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    cls.add_method('AddLinkChangeCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): int64_t ns3::SixLowPanNetDevice::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Address ns3::SixLowPanNetDevice::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Address ns3::SixLowPanNetDevice::GetBroadcast() const [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Ptr<ns3::Channel> ns3::SixLowPanNetDevice::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::Channel >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): uint32_t ns3::SixLowPanNetDevice::GetIfIndex() const [member function]
+    cls.add_method('GetIfIndex', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): uint16_t ns3::SixLowPanNetDevice::GetMtu() const [member function]
+    cls.add_method('GetMtu', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Address ns3::SixLowPanNetDevice::GetMulticast(ns3::Ipv4Address multicastGroup) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv4Address', 'multicastGroup')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Address ns3::SixLowPanNetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Ptr<ns3::NetDevice> ns3::SixLowPanNetDevice::GetNetDevice() const [member function]
+    cls.add_method('GetNetDevice', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Ptr<ns3::Node> ns3::SixLowPanNetDevice::GetNode() const [member function]
+    cls.add_method('GetNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanNetDevice::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsBridge() const [member function]
+    cls.add_method('IsBridge', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsLinkUp() const [member function]
+    cls.add_method('IsLinkUp', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsPointToPoint() const [member function]
+    cls.add_method('IsPointToPoint', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::NeedsArp() const [member function]
+    cls.add_method('NeedsArp', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('Send', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('SendFrom', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetIfIndex(uint32_t const index) [member function]
+    cls.add_method('SetIfIndex', 
+                   'void', 
+                   [param('uint32_t const', 'index')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::SetMtu(uint16_t const mtu) [member function]
+    cls.add_method('SetMtu', 
+                   'bool', 
+                   [param('uint16_t const', 'mtu')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetNetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
+    cls.add_method('SetNetDevice', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetNode(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('SetNode', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetPromiscReceiveCallback(ns3::Callback<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> cb) [member function]
+    cls.add_method('SetPromiscReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< 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 >', 'cb')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetReceiveCallback(ns3::Callback<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> cb) [member function]
+    cls.add_method('SetReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< 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 >', 'cb')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3TimeValue_methods(root_module, cls):
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
+    cls.add_constructor([])
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::TimeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TimeValue const &', 'arg0')])
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::Time const & value) [constructor]
+    cls.add_constructor([param('ns3::Time const &', 'value')])
+    ## nstime.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::TimeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## nstime.h (module 'core'): bool ns3::TimeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## nstime.h (module 'core'): ns3::Time ns3::TimeValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): std::string ns3::TimeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## nstime.h (module 'core'): void ns3::TimeValue::Set(ns3::Time const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Time const &', 'value')])
+    return
+
+def register_Ns3TypeIdChecker_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker(ns3::TypeIdChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeIdChecker const &', 'arg0')])
+    return
+
+def register_Ns3TypeIdValue_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue(ns3::TypeIdValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeIdValue const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue(ns3::TypeId const & value) [constructor]
+    cls.add_constructor([param('ns3::TypeId const &', 'value')])
+    ## type-id.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::TypeIdValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## type-id.h (module 'core'): bool ns3::TypeIdValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeIdValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeIdValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## type-id.h (module 'core'): void ns3::TypeIdValue::Set(ns3::TypeId const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::TypeId const &', 'value')])
+    return
+
+def register_Ns3AddressChecker_methods(root_module, cls):
+    ## address.h (module 'network'): ns3::AddressChecker::AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::AddressChecker::AddressChecker(ns3::AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3AddressValue_methods(root_module, cls):
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue(ns3::AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AddressValue const &', 'arg0')])
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue(ns3::Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Address const &', 'value')])
+    ## address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## address.h (module 'network'): bool ns3::AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## address.h (module 'network'): ns3::Address ns3::AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Address', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): std::string ns3::AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## address.h (module 'network'): void ns3::AddressValue::Set(ns3::Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Address const &', 'value')])
+    return
+
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_functions(root_module):
+    module = root_module
+    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
+    return
+
+def register_functions_ns3_FatalImpl(module, root_module):
+    return
+
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
+def main():
+    out = FileCodeSink(sys.stdout)
+    root_module = module_init()
+    register_types(root_module)
+    register_methods(root_module)
+    register_functions(root_module)
+    root_module.generate(out)
+
+if __name__ == '__main__':
+    main()
+
diff -Naur ns-3.18.1/src/sixlowpan/bindings/modulegen__gcc_LP64.py ns-3.19/src/sixlowpan/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/sixlowpan/bindings/modulegen__gcc_LP64.py	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,5163 @@
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
+
+
+import pybindgen.settings
+import warnings
+
+class ErrorHandler(pybindgen.settings.ErrorHandler):
+    def handle_error(self, wrapper, exception, traceback_):
+        warnings.warn("exception %r in wrapper %s" % (exception, wrapper))
+        return True
+pybindgen.settings.error_handler = ErrorHandler()
+
+
+import sys
+
+def module_init():
+    root_module = Module('ns.sixlowpan', cpp_namespace='::ns3')
+    return root_module
+
+def register_types(module):
+    root_module = module.get_root()
+    
+    ## address.h (module 'network'): ns3::Address [class]
+    module.add_class('Address', import_from_module='ns.network')
+    ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
+    module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network')
+    ## 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]
+    module.add_class('Item', import_from_module='ns.core', outer_class=root_module['ns3::AttributeConstructionList'])
+    ## buffer.h (module 'network'): ns3::Buffer [class]
+    module.add_class('Buffer', import_from_module='ns.network')
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator [class]
+    module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::Buffer'])
+    ## packet.h (module 'network'): ns3::ByteTagIterator [class]
+    module.add_class('ByteTagIterator', import_from_module='ns.network')
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item [class]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagIterator'])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList [class]
+    module.add_class('ByteTagList', import_from_module='ns.network')
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator [class]
+    module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList'])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item [struct]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList::Iterator'])
+    ## callback.h (module 'core'): ns3::CallbackBase [class]
+    module.add_class('CallbackBase', import_from_module='ns.core')
+    ## event-id.h (module 'core'): ns3::EventId [class]
+    module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
+    module.add_class('Ipv4Address', import_from_module='ns.network')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
+    root_module['ns3::Ipv4Address'].implicitly_converts_to(root_module['ns3::Address'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask [class]
+    module.add_class('Ipv4Mask', import_from_module='ns.network')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address [class]
+    module.add_class('Ipv6Address', import_from_module='ns.network')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address [class]
+    root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix [class]
+    module.add_class('Ipv6Prefix', import_from_module='ns.network')
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer [class]
+    module.add_class('NetDeviceContainer', import_from_module='ns.network')
+    ## object-base.h (module 'core'): ns3::ObjectBase [class]
+    module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core')
+    ## object.h (module 'core'): ns3::ObjectDeleter [struct]
+    module.add_class('ObjectDeleter', import_from_module='ns.core')
+    ## object-factory.h (module 'core'): ns3::ObjectFactory [class]
+    module.add_class('ObjectFactory', import_from_module='ns.core')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class]
+    module.add_class('PacketMetadata', import_from_module='ns.network')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata'])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [enumeration]
+    module.add_enum('', ['PAYLOAD', 'HEADER', 'TRAILER'], outer_class=root_module['ns3::PacketMetadata::Item'], import_from_module='ns.network')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator [class]
+    module.add_class('ItemIterator', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata'])
+    ## packet.h (module 'network'): ns3::PacketTagIterator [class]
+    module.add_class('PacketTagIterator', import_from_module='ns.network')
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item [class]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagIterator'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList [class]
+    module.add_class('PacketTagList', import_from_module='ns.network')
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
+    module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch [class]
+    module.add_class('SixLowPanDispatch')
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::Dispatch_e [enumeration]
+    module.add_enum('Dispatch_e', ['LOWPAN_NALP', 'LOWPAN_NALP_N', 'LOWPAN_NOTCOMPRESSED', 'LOWPAN_HC1', 'LOWPAN_BC0', 'LOWPAN_IPHC', 'LOWPAN_IPHC_N', 'LOWPAN_MESH', 'LOWPAN_MESH_N', 'LOWPAN_FRAG1', 'LOWPAN_FRAG1_N', 'LOWPAN_FRAGN', 'LOWPAN_FRAGN_N', 'LOWPAN_UNSUPPORTED'], outer_class=root_module['ns3::SixLowPanDispatch'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::NhcDispatch_e [enumeration]
+    module.add_enum('NhcDispatch_e', ['LOWPAN_NHC', 'LOWPAN_NHC_N', 'LOWPAN_UDPNHC', 'LOWPAN_UDPNHC_N', 'LOWPAN_NHCUNSUPPORTED'], outer_class=root_module['ns3::SixLowPanDispatch'])
+    ## sixlowpan-helper.h (module 'sixlowpan'): ns3::SixLowPanHelper [class]
+    module.add_class('SixLowPanHelper')
+    ## tag.h (module 'network'): ns3::Tag [class]
+    module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer [class]
+    module.add_class('TagBuffer', import_from_module='ns.network')
+    ## type-id.h (module 'core'): ns3::TypeId [class]
+    module.add_class('TypeId', import_from_module='ns.core')
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]
+    module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation [struct]
+    module.add_class('AttributeInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]
+    module.add_class('TraceSourceInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
+    ## empty.h (module 'core'): ns3::empty [class]
+    module.add_class('empty', import_from_module='ns.core')
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t [class]
+    module.add_class('int64x64_t', import_from_module='ns.core')
+    ## chunk.h (module 'network'): ns3::Chunk [class]
+    module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
+    ## header.h (module 'network'): ns3::Header [class]
+    module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
+    module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
+    module.add_enum('NextHeader_e', ['IPV6_EXT_HOP_BY_HOP', 'IPV6_IPV4', 'IPV6_TCP', 'IPV6_UDP', 'IPV6_IPV6', 'IPV6_EXT_ROUTING', 'IPV6_EXT_FRAGMENTATION', 'IPV6_EXT_CONFIDENTIALITY', 'IPV6_EXT_AUTHENTIFICATION', 'IPV6_ICMPV6', 'IPV6_EXT_END', 'IPV6_EXT_DESTINATION', 'IPV6_SCTP', 'IPV6_EXT_MOBILITY', 'IPV6_UDP_LITE'], outer_class=root_module['ns3::Ipv6Header'], import_from_module='ns.internet')
+    ## object.h (module 'core'): ns3::Object [class]
+    module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator [class]
+    module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object'])
+    ## random-variable-stream.h (module 'core'): ns3::RandomVariableStream [class]
+    module.add_class('RandomVariableStream', import_from_module='ns.core', parent=root_module['ns3::Object'])
+    ## random-variable-stream.h (module 'core'): ns3::SequentialRandomVariable [class]
+    module.add_class('SequentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeChecker', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeChecker>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Packet>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFrag1 [class]
+    module.add_class('SixLowPanFrag1', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFragN [class]
+    module.add_class('SixLowPanFragN', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1 [class]
+    module.add_class('SixLowPanHc1', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::LowPanHc1Addr_e [enumeration]
+    module.add_enum('LowPanHc1Addr_e', ['HC1_PIII', 'HC1_PIIC', 'HC1_PCII', 'HC1_PCIC'], outer_class=root_module['ns3::SixLowPanHc1'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::LowPanHc1NextHeader_e [enumeration]
+    module.add_enum('LowPanHc1NextHeader_e', ['HC1_NC', 'HC1_UDP', 'HC1_ICMP', 'HC1_TCP'], outer_class=root_module['ns3::SixLowPanHc1'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc [class]
+    module.add_class('SixLowPanIphc', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::TrafficClassFlowLabel_e [enumeration]
+    module.add_enum('TrafficClassFlowLabel_e', ['TF_FULL', 'TF_DSCP_ELIDED', 'TF_FL_ELIDED', 'TF_ELIDED'], outer_class=root_module['ns3::SixLowPanIphc'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::Hlim_e [enumeration]
+    module.add_enum('Hlim_e', ['HLIM_INLINE', 'HLIM_COMPR_1', 'HLIM_COMPR_64', 'HLIM_COMPR_255'], outer_class=root_module['ns3::SixLowPanIphc'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::HeaderCompression_e [enumeration]
+    module.add_enum('HeaderCompression_e', ['HC_INLINE', 'HC_COMPR_64', 'HC_COMPR_16', 'HC_COMPR_0'], outer_class=root_module['ns3::SixLowPanIphc'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension [class]
+    module.add_class('SixLowPanNhcExtension', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension::Eid_e [enumeration]
+    module.add_enum('Eid_e', ['EID_HOPBYHOP_OPTIONS_H', 'EID_ROUTING_H', 'EID_FRAGMENTATION_H', 'EID_DESTINATION_OPTIONS_H', 'EID_MOBILITY_H', 'EID_IPv6_H'], outer_class=root_module['ns3::SixLowPanNhcExtension'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension [class]
+    module.add_class('SixLowPanUdpNhcExtension', parent=root_module['ns3::Header'])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension::Ports_e [enumeration]
+    module.add_enum('Ports_e', ['PORTS_INLINE', 'PORTS_ALL_SRC_LAST_DST', 'PORTS_LAST_SRC_ALL_DST', 'PORTS_LAST_SRC_LAST_DST'], outer_class=root_module['ns3::SixLowPanUdpNhcExtension'])
+    ## nstime.h (module 'core'): ns3::Time [class]
+    module.add_class('Time', import_from_module='ns.core')
+    ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    ## nstime.h (module 'core'): ns3::Time [class]
+    root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
+    module.add_class('TraceSourceAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
+    ## trailer.h (module 'network'): ns3::Trailer [class]
+    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'])
+    ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable [class]
+    module.add_class('UniformRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::WeibullRandomVariable [class]
+    module.add_class('WeibullRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::ZetaRandomVariable [class]
+    module.add_class('ZetaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::ZipfRandomVariable [class]
+    module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## 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]
+    module.add_class('AttributeChecker', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
+    ## attribute.h (module 'core'): ns3::AttributeValue [class]
+    module.add_class('AttributeValue', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
+    ## callback.h (module 'core'): ns3::CallbackChecker [class]
+    module.add_class('CallbackChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## callback.h (module 'core'): ns3::CallbackImplBase [class]
+    module.add_class('CallbackImplBase', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    ## callback.h (module 'core'): ns3::CallbackValue [class]
+    module.add_class('CallbackValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## random-variable-stream.h (module 'core'): ns3::ConstantRandomVariable [class]
+    module.add_class('ConstantRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable [class]
+    module.add_class('DeterministicRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]
+    module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
+    module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## random-variable-stream.h (module 'core'): ns3::ErlangRandomVariable [class]
+    module.add_class('ErlangRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## event-impl.h (module 'core'): ns3::EventImpl [class]
+    module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    ## random-variable-stream.h (module 'core'): ns3::ExponentialRandomVariable [class]
+    module.add_class('ExponentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable [class]
+    module.add_class('GammaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class]
+    module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class]
+    module.add_class('Ipv4AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker [class]
+    module.add_class('Ipv4MaskChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue [class]
+    module.add_class('Ipv4MaskValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker [class]
+    module.add_class('Ipv6AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue [class]
+    module.add_class('Ipv6AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker [class]
+    module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class]
+    module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## random-variable-stream.h (module 'core'): ns3::LogNormalRandomVariable [class]
+    module.add_class('LogNormalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## 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]
+    module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network')
+    ## nix-vector.h (module 'network'): ns3::NixVector [class]
+    module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    ## random-variable-stream.h (module 'core'): ns3::NormalRandomVariable [class]
+    module.add_class('NormalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class]
+    module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class]
+    module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## packet.h (module 'network'): ns3::Packet [class]
+    module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
+    ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
+    module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::SixLowPanNetDevice [class]
+    module.add_class('SixLowPanNetDevice', parent=root_module['ns3::NetDevice'])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::SixLowPanNetDevice::DropReason [enumeration]
+    module.add_enum('DropReason', ['DROP_FRAGMENT_TIMEOUT', 'DROP_FRAGMENT_BUFFER_FULL', 'DROP_UNKNOWN_EXTENSION'], outer_class=root_module['ns3::SixLowPanNetDevice'])
+    ## nstime.h (module 'core'): ns3::TimeValue [class]
+    module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
+    module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## type-id.h (module 'core'): ns3::TypeIdValue [class]
+    module.add_class('TypeIdValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## address.h (module 'network'): ns3::AddressChecker [class]
+    module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## address.h (module 'network'): ns3::AddressValue [class]
+    module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    
+    ## Register a nested module for the namespace FatalImpl
+    
+    nested_module = module.add_cpp_namespace('FatalImpl')
+    register_types_ns3_FatalImpl(nested_module)
+    
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+
+def register_types_ns3_FatalImpl(module):
+    root_module = module.get_root()
+    
+
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
+def register_methods(root_module):
+    register_Ns3Address_methods(root_module, root_module['ns3::Address'])
+    register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
+    register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
+    register_Ns3Buffer_methods(root_module, root_module['ns3::Buffer'])
+    register_Ns3BufferIterator_methods(root_module, root_module['ns3::Buffer::Iterator'])
+    register_Ns3ByteTagIterator_methods(root_module, root_module['ns3::ByteTagIterator'])
+    register_Ns3ByteTagIteratorItem_methods(root_module, root_module['ns3::ByteTagIterator::Item'])
+    register_Ns3ByteTagList_methods(root_module, root_module['ns3::ByteTagList'])
+    register_Ns3ByteTagListIterator_methods(root_module, root_module['ns3::ByteTagList::Iterator'])
+    register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
+    register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
+    register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    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'])
+    register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
+    register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
+    register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])
+    register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
+    register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
+    register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
+    register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata'])
+    register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item'])
+    register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator'])
+    register_Ns3PacketTagIterator_methods(root_module, root_module['ns3::PacketTagIterator'])
+    register_Ns3PacketTagIteratorItem_methods(root_module, root_module['ns3::PacketTagIterator::Item'])
+    register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList'])
+    register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData'])
+    register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
+    register_Ns3SixLowPanDispatch_methods(root_module, root_module['ns3::SixLowPanDispatch'])
+    register_Ns3SixLowPanHelper_methods(root_module, root_module['ns3::SixLowPanHelper'])
+    register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
+    register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
+    register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
+    register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation'])
+    register_Ns3TypeIdTraceSourceInformation_methods(root_module, root_module['ns3::TypeId::TraceSourceInformation'])
+    register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
+    register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t'])
+    register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
+    register_Ns3Header_methods(root_module, root_module['ns3::Header'])
+    register_Ns3Ipv6Header_methods(root_module, root_module['ns3::Ipv6Header'])
+    register_Ns3Object_methods(root_module, root_module['ns3::Object'])
+    register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator'])
+    register_Ns3RandomVariableStream_methods(root_module, root_module['ns3::RandomVariableStream'])
+    register_Ns3SequentialRandomVariable_methods(root_module, root_module['ns3::SequentialRandomVariable'])
+    register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
+    register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
+    register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
+    register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
+    register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
+    register_Ns3SixLowPanFrag1_methods(root_module, root_module['ns3::SixLowPanFrag1'])
+    register_Ns3SixLowPanFragN_methods(root_module, root_module['ns3::SixLowPanFragN'])
+    register_Ns3SixLowPanHc1_methods(root_module, root_module['ns3::SixLowPanHc1'])
+    register_Ns3SixLowPanIphc_methods(root_module, root_module['ns3::SixLowPanIphc'])
+    register_Ns3SixLowPanNhcExtension_methods(root_module, root_module['ns3::SixLowPanNhcExtension'])
+    register_Ns3SixLowPanUdpNhcExtension_methods(root_module, root_module['ns3::SixLowPanUdpNhcExtension'])
+    register_Ns3Time_methods(root_module, root_module['ns3::Time'])
+    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_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
+    register_Ns3WeibullRandomVariable_methods(root_module, root_module['ns3::WeibullRandomVariable'])
+    register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable'])
+    register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable'])
+    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'])
+    register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
+    register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
+    register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
+    register_Ns3ConstantRandomVariable_methods(root_module, root_module['ns3::ConstantRandomVariable'])
+    register_Ns3DeterministicRandomVariable_methods(root_module, root_module['ns3::DeterministicRandomVariable'])
+    register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])
+    register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
+    register_Ns3ErlangRandomVariable_methods(root_module, root_module['ns3::ErlangRandomVariable'])
+    register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
+    register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable'])
+    register_Ns3GammaRandomVariable_methods(root_module, root_module['ns3::GammaRandomVariable'])
+    register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
+    register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue'])
+    register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker'])
+    register_Ns3Ipv4MaskValue_methods(root_module, root_module['ns3::Ipv4MaskValue'])
+    register_Ns3Ipv6AddressChecker_methods(root_module, root_module['ns3::Ipv6AddressChecker'])
+    register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue'])
+    register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker'])
+    register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
+    register_Ns3LogNormalRandomVariable_methods(root_module, root_module['ns3::LogNormalRandomVariable'])
+    register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
+    register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
+    register_Ns3NormalRandomVariable_methods(root_module, root_module['ns3::NormalRandomVariable'])
+    register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
+    register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
+    register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
+    register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
+    register_Ns3SixLowPanNetDevice_methods(root_module, root_module['ns3::SixLowPanNetDevice'])
+    register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
+    register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
+    register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
+    register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
+    register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
+    return
+
+def register_Ns3Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## address.h (module 'network'): ns3::Address::Address() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor]
+    cls.add_constructor([param('uint8_t', 'type'), param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): ns3::Address::Address(ns3::Address const & address) [copy constructor]
+    cls.add_constructor([param('ns3::Address const &', 'address')])
+    ## address.h (module 'network'): bool ns3::Address::CheckCompatible(uint8_t type, uint8_t len) const [member function]
+    cls.add_method('CheckCompatible', 
+                   'bool', 
+                   [param('uint8_t', 'type'), param('uint8_t', 'len')], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyAllFrom(uint8_t const * buffer, uint8_t len) [member function]
+    cls.add_method('CopyAllFrom', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyAllTo(uint8_t * buffer, uint8_t len) const [member function]
+    cls.add_method('CopyAllTo', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint8_t', 'len')], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyFrom(uint8_t const * buffer, uint8_t len) [member function]
+    cls.add_method('CopyFrom', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyTo(uint8_t * buffer) const [member function]
+    cls.add_method('CopyTo', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer')], 
+                   is_const=True)
+    ## address.h (module 'network'): void ns3::Address::Deserialize(ns3::TagBuffer buffer) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'buffer')])
+    ## address.h (module 'network'): uint8_t ns3::Address::GetLength() const [member function]
+    cls.add_method('GetLength', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): bool ns3::Address::IsInvalid() const [member function]
+    cls.add_method('IsInvalid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): bool ns3::Address::IsMatchingType(uint8_t type) const [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('uint8_t', 'type')], 
+                   is_const=True)
+    ## address.h (module 'network'): static uint8_t ns3::Address::Register() [member function]
+    cls.add_method('Register', 
+                   'uint8_t', 
+                   [], 
+                   is_static=True)
+    ## address.h (module 'network'): void ns3::Address::Serialize(ns3::TagBuffer buffer) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'buffer')], 
+                   is_const=True)
+    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')])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::AttributeConstructionList() [constructor]
+    cls.add_constructor([])
+    ## attribute-construction-list.h (module 'core'): void ns3::AttributeConstructionList::Add(std::string name, ns3::Ptr<ns3::AttributeChecker const> checker, ns3::Ptr<ns3::AttributeValue> value) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker'), param('ns3::Ptr< ns3::AttributeValue >', 'value')])
+    ## attribute-construction-list.h (module 'core'): std::_List_const_iterator<ns3::AttributeConstructionList::Item> ns3::AttributeConstructionList::Begin() const [member function]
+    cls.add_method('Begin', 
+                   'std::_List_const_iterator< ns3::AttributeConstructionList::Item >', 
+                   [], 
+                   is_const=True)
+    ## attribute-construction-list.h (module 'core'): std::_List_const_iterator<ns3::AttributeConstructionList::Item> ns3::AttributeConstructionList::End() const [member function]
+    cls.add_method('End', 
+                   'std::_List_const_iterator< ns3::AttributeConstructionList::Item >', 
+                   [], 
+                   is_const=True)
+    ## attribute-construction-list.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeConstructionList::Find(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('Find', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True)
+    return
+
+def register_Ns3AttributeConstructionListItem_methods(root_module, cls):
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::Item() [constructor]
+    cls.add_constructor([])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::Item(ns3::AttributeConstructionList::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeConstructionList::Item const &', 'arg0')])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::checker [variable]
+    cls.add_instance_attribute('checker', 'ns3::Ptr< ns3::AttributeChecker const >', is_const=False)
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::value [variable]
+    cls.add_instance_attribute('value', 'ns3::Ptr< ns3::AttributeValue >', is_const=False)
+    return
+
+def register_Ns3Buffer_methods(root_module, cls):
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer() [constructor]
+    cls.add_constructor([])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize) [constructor]
+    cls.add_constructor([param('uint32_t', 'dataSize')])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize, bool initialize) [constructor]
+    cls.add_constructor([param('uint32_t', 'dataSize'), param('bool', 'initialize')])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(ns3::Buffer const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Buffer const &', 'o')])
+    ## buffer.h (module 'network'): bool ns3::Buffer::AddAtEnd(uint32_t end) [member function]
+    cls.add_method('AddAtEnd', 
+                   'bool', 
+                   [param('uint32_t', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::AddAtEnd(ns3::Buffer const & o) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::Buffer const &', 'o')])
+    ## buffer.h (module 'network'): bool ns3::Buffer::AddAtStart(uint32_t start) [member function]
+    cls.add_method('AddAtStart', 
+                   'bool', 
+                   [param('uint32_t', 'start')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   'ns3::Buffer::Iterator', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::CopyData(std::ostream * os, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'void', 
+                   [param('std::ostream *', 'os'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::CopyData(uint8_t * buffer, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFragment(uint32_t start, uint32_t length) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::Buffer', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFullCopy() const [member function]
+    cls.add_method('CreateFullCopy', 
+                   'ns3::Buffer', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::End() const [member function]
+    cls.add_method('End', 
+                   'ns3::Buffer::Iterator', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentEndOffset() const [member function]
+    cls.add_method('GetCurrentEndOffset', 
+                   'int32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentStartOffset() const [member function]
+    cls.add_method('GetCurrentStartOffset', 
+                   'int32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint8_t const * ns3::Buffer::PeekData() const [member function]
+    cls.add_method('PeekData', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtEnd(uint32_t end) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtStart(uint32_t start) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'start')])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3BufferIterator_methods(root_module, cls):
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator(ns3::Buffer::Iterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Buffer::Iterator const &', 'arg0')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator() [constructor]
+    cls.add_constructor([])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size) [member function]
+    cls.add_method('CalculateIpChecksum', 
+                   'uint16_t', 
+                   [param('uint16_t', 'size')])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size, uint32_t initialChecksum) [member function]
+    cls.add_method('CalculateIpChecksum', 
+                   'uint16_t', 
+                   [param('uint16_t', 'size'), param('uint32_t', 'initialChecksum')])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetDistanceFrom(ns3::Buffer::Iterator const & o) const [member function]
+    cls.add_method('GetDistanceFrom', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator const &', 'o')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsEnd() const [member function]
+    cls.add_method('IsEnd', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsStart() const [member function]
+    cls.add_method('IsStart', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next() [member function]
+    cls.add_method('Next', 
+                   'void', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next(uint32_t delta) [member function]
+    cls.add_method('Next', 
+                   'void', 
+                   [param('uint32_t', 'delta')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev() [member function]
+    cls.add_method('Prev', 
+                   'void', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev(uint32_t delta) [member function]
+    cls.add_method('Prev', 
+                   'void', 
+                   [param('uint32_t', 'delta')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Read(uint8_t * buffer, uint32_t size) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadLsbtohU16() [member function]
+    cls.add_method('ReadLsbtohU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadLsbtohU32() [member function]
+    cls.add_method('ReadLsbtohU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadLsbtohU64() [member function]
+    cls.add_method('ReadLsbtohU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadNtohU16() [member function]
+    cls.add_method('ReadNtohU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadNtohU32() [member function]
+    cls.add_method('ReadNtohU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadNtohU64() [member function]
+    cls.add_method('ReadNtohU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadU16() [member function]
+    cls.add_method('ReadU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadU32() [member function]
+    cls.add_method('ReadU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadU64() [member function]
+    cls.add_method('ReadU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint8_t ns3::Buffer::Iterator::ReadU8() [member function]
+    cls.add_method('ReadU8', 
+                   'uint8_t', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(ns3::Buffer::Iterator start, ns3::Buffer::Iterator end) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('ns3::Buffer::Iterator', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU16(uint16_t data) [member function]
+    cls.add_method('WriteHtolsbU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU32(uint32_t data) [member function]
+    cls.add_method('WriteHtolsbU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU64(uint64_t data) [member function]
+    cls.add_method('WriteHtolsbU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU16(uint16_t data) [member function]
+    cls.add_method('WriteHtonU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU32(uint32_t data) [member function]
+    cls.add_method('WriteHtonU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU64(uint64_t data) [member function]
+    cls.add_method('WriteHtonU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU16(uint16_t data) [member function]
+    cls.add_method('WriteU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU32(uint32_t data) [member function]
+    cls.add_method('WriteU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU64(uint64_t data) [member function]
+    cls.add_method('WriteU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data, uint32_t len) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'data'), param('uint32_t', 'len')])
+    return
+
+def register_Ns3ByteTagIterator_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::ByteTagIterator::ByteTagIterator(ns3::ByteTagIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagIterator const &', 'arg0')])
+    ## packet.h (module 'network'): bool ns3::ByteTagIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item ns3::ByteTagIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::ByteTagIterator::Item', 
+                   [])
+    return
+
+def register_Ns3ByteTagIteratorItem_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item::Item(ns3::ByteTagIterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagIterator::Item const &', 'arg0')])
+    ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetEnd() const [member function]
+    cls.add_method('GetEnd', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetStart() const [member function]
+    cls.add_method('GetStart', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::ByteTagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
+    cls.add_method('GetTag', 
+                   'void', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::TypeId ns3::ByteTagIterator::Item::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3ByteTagList_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList() [constructor]
+    cls.add_constructor([])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList(ns3::ByteTagList const & o) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList const &', 'o')])
+    ## byte-tag-list.h (module 'network'): ns3::TagBuffer ns3::ByteTagList::Add(ns3::TypeId tid, uint32_t bufferSize, int32_t start, int32_t end) [member function]
+    cls.add_method('Add', 
+                   'ns3::TagBuffer', 
+                   [param('ns3::TypeId', 'tid'), param('uint32_t', 'bufferSize'), param('int32_t', 'start'), param('int32_t', 'end')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::Add(ns3::ByteTagList const & o) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::ByteTagList const &', 'o')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtEnd(int32_t adjustment, int32_t appendOffset) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('int32_t', 'adjustment'), param('int32_t', 'appendOffset')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtStart(int32_t adjustment, int32_t prependOffset) [member function]
+    cls.add_method('AddAtStart', 
+                   'void', 
+                   [param('int32_t', 'adjustment'), param('int32_t', 'prependOffset')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator ns3::ByteTagList::Begin(int32_t offsetStart, int32_t offsetEnd) const [member function]
+    cls.add_method('Begin', 
+                   'ns3::ByteTagList::Iterator', 
+                   [param('int32_t', 'offsetStart'), param('int32_t', 'offsetEnd')], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::RemoveAll() [member function]
+    cls.add_method('RemoveAll', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3ByteTagListIterator_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Iterator(ns3::ByteTagList::Iterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList::Iterator const &', 'arg0')])
+    ## byte-tag-list.h (module 'network'): uint32_t ns3::ByteTagList::Iterator::GetOffsetStart() const [member function]
+    cls.add_method('GetOffsetStart', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): bool ns3::ByteTagList::Iterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item ns3::ByteTagList::Iterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::ByteTagList::Iterator::Item', 
+                   [])
+    return
+
+def register_Ns3ByteTagListIteratorItem_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::ByteTagList::Iterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList::Iterator::Item const &', 'arg0')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::TagBuffer buf) [constructor]
+    cls.add_constructor([param('ns3::TagBuffer', 'buf')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::buf [variable]
+    cls.add_instance_attribute('buf', 'ns3::TagBuffer', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::end [variable]
+    cls.add_instance_attribute('end', 'int32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::size [variable]
+    cls.add_instance_attribute('size', 'uint32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::start [variable]
+    cls.add_instance_attribute('start', 'int32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3CallbackBase_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::CallbackBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackBase const &', 'arg0')])
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::Ptr<ns3::CallbackImplBase> ns3::CallbackBase::GetImpl() const [member function]
+    cls.add_method('GetImpl', 
+                   'ns3::Ptr< ns3::CallbackImplBase >', 
+                   [], 
+                   is_const=True)
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::Ptr<ns3::CallbackImplBase> impl) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::CallbackImplBase >', 'impl')], 
+                        visibility='protected')
+    ## callback.h (module 'core'): static std::string ns3::CallbackBase::Demangle(std::string const & mangled) [member function]
+    cls.add_method('Demangle', 
+                   'std::string', 
+                   [param('std::string const &', 'mangled')], 
+                   is_static=True, visibility='protected')
+    return
+
+def register_Ns3EventId_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('==')
+    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::EventId const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventId const &', 'arg0')])
+    ## event-id.h (module 'core'): ns3::EventId::EventId() [constructor]
+    cls.add_constructor([])
+    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::Ptr<ns3::EventImpl> const & impl, uint64_t ts, uint32_t context, uint32_t uid) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::EventImpl > const &', 'impl'), param('uint64_t', 'ts'), param('uint32_t', 'context'), param('uint32_t', 'uid')])
+    ## event-id.h (module 'core'): void ns3::EventId::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetContext() const [member function]
+    cls.add_method('GetContext', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): uint64_t ns3::EventId::GetTs() const [member function]
+    cls.add_method('GetTs', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): bool ns3::EventId::IsExpired() const [member function]
+    cls.add_method('IsExpired', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): bool ns3::EventId::IsRunning() const [member function]
+    cls.add_method('IsRunning', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): ns3::EventImpl * ns3::EventId::PeekEventImpl() const [member function]
+    cls.add_method('PeekEventImpl', 
+                   'ns3::EventImpl *', 
+                   [], 
+                   is_const=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')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
+def register_Ns3Ipv4Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(uint32_t address) [constructor]
+    cls.add_constructor([param('uint32_t', 'address')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(char const * address) [constructor]
+    cls.add_constructor([param('char const *', 'address')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4Address::CombineMask(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('CombineMask', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::Deserialize(uint8_t const * buf) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Ipv4Address', 
+                   [param('uint8_t const *', 'buf')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Address::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetAny() [member function]
+    cls.add_method('GetAny', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetBroadcast() [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4Address::GetSubnetDirectedBroadcast(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('GetSubnetDirectedBroadcast', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsEqual(ns3::Ipv4Address const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv4Address const &', 'other')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsLocalMulticast() const [member function]
+    cls.add_method('IsLocalMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static bool ns3::Ipv4Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsSubnetDirectedBroadcast(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('IsSubnetDirectedBroadcast', 
+                   'bool', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Serialize(uint8_t * buf) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Set(uint32_t address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint32_t', 'address')])
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Set(char const * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('char const *', 'address')])
+    return
+
+def register_Ns3Ipv4Mask_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(ns3::Ipv4Mask const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4Mask const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(uint32_t mask) [constructor]
+    cls.add_constructor([param('uint32_t', 'mask')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(char const * mask) [constructor]
+    cls.add_constructor([param('char const *', 'mask')])
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Mask::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Mask::GetInverse() const [member function]
+    cls.add_method('GetInverse', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): uint16_t ns3::Ipv4Mask::GetPrefixLength() const [member function]
+    cls.add_method('GetPrefixLength', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Mask::IsEqual(ns3::Ipv4Mask other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv4Mask', 'other')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Mask::IsMatch(ns3::Ipv4Address a, ns3::Ipv4Address b) const [member function]
+    cls.add_method('IsMatch', 
+                   'bool', 
+                   [param('ns3::Ipv4Address', 'a'), param('ns3::Ipv4Address', 'b')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Mask::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Mask::Set(uint32_t mask) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint32_t', 'mask')])
+    return
+
+def register_Ns3Ipv6Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(char const * address) [constructor]
+    cls.add_constructor([param('char const *', 'address')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(uint8_t * address) [constructor]
+    cls.add_constructor([param('uint8_t *', 'address')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const & addr) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const &', 'addr')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const * addr) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const *', 'addr')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address ns3::Ipv6Address::CombinePrefix(ns3::Ipv6Prefix const & prefix) [member function]
+    cls.add_method('CombinePrefix', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Prefix const &', 'prefix')])
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::Deserialize(uint8_t const * buf) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Ipv6Address', 
+                   [param('uint8_t const *', 'buf')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllHostsMulticast() [member function]
+    cls.add_method('GetAllHostsMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllNodesMulticast() [member function]
+    cls.add_method('GetAllNodesMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllRoutersMulticast() [member function]
+    cls.add_method('GetAllRoutersMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAny() [member function]
+    cls.add_method('GetAny', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::GetBytes(uint8_t * buf) const [member function]
+    cls.add_method('GetBytes', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv6Address::GetIpv4MappedAddress() const [member function]
+    cls.add_method('GetIpv4MappedAddress', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllHostsMulticast() const [member function]
+    cls.add_method('IsAllHostsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function]
+    cls.add_method('IsAllNodesMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllRoutersMulticast() const [member function]
+    cls.add_method('IsAllRoutersMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAny() const [member function]
+    cls.add_method('IsAny', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv6Address const &', 'other')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
+    cls.add_method('IsIpv4MappedAddress', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
+    cls.add_method('IsLinkLocal', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocalMulticast() const [member function]
+    cls.add_method('IsLinkLocalMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLocalhost() const [member function]
+    cls.add_method('IsLocalhost', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static bool ns3::Ipv6Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsSolicitedMulticast() const [member function]
+    cls.add_method('IsSolicitedMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac48Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
+    cls.add_method('MakeIpv4MappedAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv4Address', 'addr')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeSolicitedAddress(ns3::Ipv6Address addr) [member function]
+    cls.add_method('MakeSolicitedAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Serialize(uint8_t * buf) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Set(char const * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('char const *', 'address')])
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Set(uint8_t * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint8_t *', 'address')])
+    return
+
+def register_Ns3Ipv6Prefix_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(uint8_t * prefix) [constructor]
+    cls.add_constructor([param('uint8_t *', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(char const * prefix) [constructor]
+    cls.add_constructor([param('char const *', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(uint8_t prefix) [constructor]
+    cls.add_constructor([param('uint8_t', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const & prefix) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const &', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const * prefix) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const *', 'prefix')])
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Prefix::GetBytes(uint8_t * buf) const [member function]
+    cls.add_method('GetBytes', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): uint8_t ns3::Ipv6Prefix::GetPrefixLength() const [member function]
+    cls.add_method('GetPrefixLength', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Prefix::IsEqual(ns3::Ipv6Prefix const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv6Prefix const &', 'other')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Prefix::IsMatch(ns3::Ipv6Address a, ns3::Ipv6Address b) const [member function]
+    cls.add_method('IsMatch', 
+                   'bool', 
+                   [param('ns3::Ipv6Address', 'a'), param('ns3::Ipv6Address', 'b')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Prefix::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    return
+
+def register_Ns3NetDeviceContainer_methods(root_module, cls):
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NetDeviceContainer const &', 'arg0')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer() [constructor]
+    cls.add_constructor([])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::Ptr<ns3::NetDevice> dev) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(std::string devName) [constructor]
+    cls.add_constructor([param('std::string', 'devName')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & a, ns3::NetDeviceContainer const & b) [constructor]
+    cls.add_constructor([param('ns3::NetDeviceContainer const &', 'a'), param('ns3::NetDeviceContainer const &', 'b')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(ns3::NetDeviceContainer other) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::NetDeviceContainer', 'other')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(ns3::Ptr<ns3::NetDevice> device) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(std::string deviceName) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'deviceName')])
+    ## net-device-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::NetDevice > const, std::vector< ns3::Ptr< ns3::NetDevice > > >', 
+                   [], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::End() const [member function]
+    cls.add_method('End', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::NetDevice > const, std::vector< ns3::Ptr< ns3::NetDevice > > >', 
+                   [], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::NetDeviceContainer::Get(uint32_t i) const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): uint32_t ns3::NetDeviceContainer::GetN() const [member function]
+    cls.add_method('GetN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3ObjectBase_methods(root_module, cls):
+    ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase() [constructor]
+    cls.add_constructor([])
+    ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectBase const &', 'arg0')])
+    ## object-base.h (module 'core'): void ns3::ObjectBase::GetAttribute(std::string name, ns3::AttributeValue & value) const [member function]
+    cls.add_method('GetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue &', 'value')], 
+                   is_const=True)
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::GetAttributeFailSafe(std::string name, ns3::AttributeValue & attribute) const [member function]
+    cls.add_method('GetAttributeFailSafe', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue &', 'attribute')], 
+                   is_const=True)
+    ## object-base.h (module 'core'): ns3::TypeId ns3::ObjectBase::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## object-base.h (module 'core'): static ns3::TypeId ns3::ObjectBase::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## object-base.h (module 'core'): void ns3::ObjectBase::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::SetAttributeFailSafe(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttributeFailSafe', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceConnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceConnect', 
+                   'bool', 
+                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceConnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceConnectWithoutContext', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceDisconnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceDisconnect', 
+                   'bool', 
+                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceDisconnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceDisconnectWithoutContext', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): void ns3::ObjectBase::ConstructSelf(ns3::AttributeConstructionList const & attributes) [member function]
+    cls.add_method('ConstructSelf', 
+                   'void', 
+                   [param('ns3::AttributeConstructionList const &', 'attributes')], 
+                   visibility='protected')
+    ## object-base.h (module 'core'): void ns3::ObjectBase::NotifyConstructionCompleted() [member function]
+    cls.add_method('NotifyConstructionCompleted', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ObjectDeleter_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::ObjectDeleter::ObjectDeleter() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): ns3::ObjectDeleter::ObjectDeleter(ns3::ObjectDeleter const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectDeleter const &', 'arg0')])
+    ## object.h (module 'core'): static void ns3::ObjectDeleter::Delete(ns3::Object * object) [member function]
+    cls.add_method('Delete', 
+                   'void', 
+                   [param('ns3::Object *', 'object')], 
+                   is_static=True)
+    return
+
+def register_Ns3ObjectFactory_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')])
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(std::string typeId) [constructor]
+    cls.add_constructor([param('std::string', 'typeId')])
+    ## object-factory.h (module 'core'): ns3::Ptr<ns3::Object> ns3::ObjectFactory::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::Object >', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('ns3::TypeId', 'tid')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('char const *', 'tid')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('std::string', 'tid')])
+    return
+
+def register_Ns3PacketMetadata_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor]
+    cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(ns3::PacketMetadata const & o) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata const &', 'o')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddAtEnd(ns3::PacketMetadata const & o) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::PacketMetadata const &', 'o')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddHeader(ns3::Header const & header, uint32_t size) [member function]
+    cls.add_method('AddHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddPaddingAtEnd(uint32_t end) [member function]
+    cls.add_method('AddPaddingAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddTrailer(ns3::Trailer const & trailer, uint32_t size) [member function]
+    cls.add_method('AddTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::PacketMetadata::BeginItem(ns3::Buffer buffer) const [member function]
+    cls.add_method('BeginItem', 
+                   'ns3::PacketMetadata::ItemIterator', 
+                   [param('ns3::Buffer', 'buffer')], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata ns3::PacketMetadata::CreateFragment(uint32_t start, uint32_t end) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::PacketMetadata', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'end')], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::Enable() [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::EnableChecking() [member function]
+    cls.add_method('EnableChecking', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): uint64_t ns3::PacketMetadata::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtEnd(uint32_t end) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtStart(uint32_t start) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'start')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveHeader(ns3::Header const & header, uint32_t size) [member function]
+    cls.add_method('RemoveHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveTrailer(ns3::Trailer const & trailer, uint32_t size) [member function]
+    cls.add_method('RemoveTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3PacketMetadataItem_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item() [constructor]
+    cls.add_constructor([])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item(ns3::PacketMetadata::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata::Item const &', 'arg0')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::current [variable]
+    cls.add_instance_attribute('current', 'ns3::Buffer::Iterator', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentSize [variable]
+    cls.add_instance_attribute('currentSize', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromEnd [variable]
+    cls.add_instance_attribute('currentTrimedFromEnd', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromStart [variable]
+    cls.add_instance_attribute('currentTrimedFromStart', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::isFragment [variable]
+    cls.add_instance_attribute('isFragment', 'bool', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3PacketMetadataItemIterator_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata::ItemIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata::ItemIterator const &', 'arg0')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata const * metadata, ns3::Buffer buffer) [constructor]
+    cls.add_constructor([param('ns3::PacketMetadata const *', 'metadata'), param('ns3::Buffer', 'buffer')])
+    ## packet-metadata.h (module 'network'): bool ns3::PacketMetadata::ItemIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item ns3::PacketMetadata::ItemIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::PacketMetadata::Item', 
+                   [])
+    return
+
+def register_Ns3PacketTagIterator_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::PacketTagIterator::PacketTagIterator(ns3::PacketTagIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagIterator const &', 'arg0')])
+    ## packet.h (module 'network'): bool ns3::PacketTagIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item ns3::PacketTagIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::PacketTagIterator::Item', 
+                   [])
+    return
+
+def register_Ns3PacketTagIteratorItem_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item::Item(ns3::PacketTagIterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagIterator::Item const &', 'arg0')])
+    ## packet.h (module 'network'): void ns3::PacketTagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
+    cls.add_method('GetTag', 
+                   'void', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::TypeId ns3::PacketTagIterator::Item::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3PacketTagList_methods(root_module, cls):
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList() [constructor]
+    cls.add_constructor([])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList(ns3::PacketTagList const & o) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagList const &', 'o')])
+    ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::Add(ns3::Tag const & tag) const [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData const * ns3::PacketTagList::Head() const [member function]
+    cls.add_method('Head', 
+                   'ns3::PacketTagList::TagData const *', 
+                   [], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Peek(ns3::Tag & tag) const [member function]
+    cls.add_method('Peek', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Remove(ns3::Tag & tag) [member function]
+    cls.add_method('Remove', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::RemoveAll() [member function]
+    cls.add_method('RemoveAll', 
+                   'void', 
+                   [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    return
+
+def register_Ns3PacketTagListTagData_methods(root_module, cls):
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData() [constructor]
+    cls.add_constructor([])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData(ns3::PacketTagList::TagData const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagList::TagData const &', 'arg0')])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::count [variable]
+    cls.add_instance_attribute('count', 'uint32_t', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::data [variable]
+    cls.add_instance_attribute('data', 'uint8_t [ 20 ]', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::next [variable]
+    cls.add_instance_attribute('next', 'ns3::PacketTagList::TagData *', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount(ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SixLowPanDispatch_methods(root_module, cls):
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::SixLowPanDispatch(ns3::SixLowPanDispatch const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanDispatch const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::SixLowPanDispatch() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::SixLowPanDispatch::Dispatch_e ns3::SixLowPanDispatch::GetDispatchType(uint8_t dispatch) [member function]
+    cls.add_method('GetDispatchType', 
+                   'ns3::SixLowPanDispatch::Dispatch_e', 
+                   [param('uint8_t', 'dispatch')], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::SixLowPanDispatch::NhcDispatch_e ns3::SixLowPanDispatch::GetNhcDispatchType(uint8_t dispatch) [member function]
+    cls.add_method('GetNhcDispatchType', 
+                   'ns3::SixLowPanDispatch::NhcDispatch_e', 
+                   [param('uint8_t', 'dispatch')], 
+                   is_static=True)
+    return
+
+def register_Ns3SixLowPanHelper_methods(root_module, cls):
+    ## sixlowpan-helper.h (module 'sixlowpan'): ns3::SixLowPanHelper::SixLowPanHelper(ns3::SixLowPanHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanHelper const &', 'arg0')])
+    ## sixlowpan-helper.h (module 'sixlowpan'): ns3::SixLowPanHelper::SixLowPanHelper() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-helper.h (module 'sixlowpan'): int64_t ns3::SixLowPanHelper::AssignStreams(ns3::NetDeviceContainer c, int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('ns3::NetDeviceContainer', 'c'), param('int64_t', 'stream')])
+    ## sixlowpan-helper.h (module 'sixlowpan'): ns3::NetDeviceContainer ns3::SixLowPanHelper::Install(ns3::NetDeviceContainer c) [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NetDeviceContainer', 'c')])
+    ## sixlowpan-helper.h (module 'sixlowpan'): void ns3::SixLowPanHelper::SetDeviceAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
+    cls.add_method('SetDeviceAttribute', 
+                   'void', 
+                   [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
+    return
+
+def register_Ns3Tag_methods(root_module, cls):
+    ## tag.h (module 'network'): ns3::Tag::Tag() [constructor]
+    cls.add_constructor([])
+    ## tag.h (module 'network'): ns3::Tag::Tag(ns3::Tag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Tag const &', 'arg0')])
+    ## tag.h (module 'network'): void ns3::Tag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## tag.h (module 'network'): uint32_t ns3::Tag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## tag.h (module 'network'): static ns3::TypeId ns3::Tag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## tag.h (module 'network'): void ns3::Tag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## tag.h (module 'network'): void ns3::Tag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3TagBuffer_methods(root_module, cls):
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(ns3::TagBuffer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TagBuffer const &', 'arg0')])
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(uint8_t * start, uint8_t * end) [constructor]
+    cls.add_constructor([param('uint8_t *', 'start'), param('uint8_t *', 'end')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::CopyFrom(ns3::TagBuffer o) [member function]
+    cls.add_method('CopyFrom', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'o')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::Read(uint8_t * buffer, uint32_t size) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+    ## tag-buffer.h (module 'network'): double ns3::TagBuffer::ReadDouble() [member function]
+    cls.add_method('ReadDouble', 
+                   'double', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint16_t ns3::TagBuffer::ReadU16() [member function]
+    cls.add_method('ReadU16', 
+                   'uint16_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint32_t ns3::TagBuffer::ReadU32() [member function]
+    cls.add_method('ReadU32', 
+                   'uint32_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint64_t ns3::TagBuffer::ReadU64() [member function]
+    cls.add_method('ReadU64', 
+                   'uint64_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint8_t ns3::TagBuffer::ReadU8() [member function]
+    cls.add_method('ReadU8', 
+                   'uint8_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::TrimAtEnd(uint32_t trim) [member function]
+    cls.add_method('TrimAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'trim')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::Write(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteDouble(double v) [member function]
+    cls.add_method('WriteDouble', 
+                   'void', 
+                   [param('double', 'v')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU16(uint16_t data) [member function]
+    cls.add_method('WriteU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU32(uint32_t data) [member function]
+    cls.add_method('WriteU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU64(uint64_t v) [member function]
+    cls.add_method('WriteU64', 
+                   'void', 
+                   [param('uint64_t', 'v')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU8(uint8_t v) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'v')])
+    return
+
+def register_Ns3TypeId_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor]
+    cls.add_constructor([param('char const *', 'name')])
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId(ns3::TypeId const & o) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId const &', 'o')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('AddAttribute', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('AddAttribute', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]
+    cls.add_method('AddTraceSource', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation ns3::TypeId::GetAttribute(uint32_t i) const [member function]
+    cls.add_method('GetAttribute', 
+                   'ns3::TypeId::AttributeInformation', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetAttributeFullName(uint32_t i) const [member function]
+    cls.add_method('GetAttributeFullName', 
+                   'std::string', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetAttributeN() const [member function]
+    cls.add_method('GetAttributeN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::Callback<ns3::ObjectBase*,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::TypeId::GetConstructor() const [member function]
+    cls.add_method('GetConstructor', 
+                   'ns3::Callback< ns3::ObjectBase *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetGroupName() const [member function]
+    cls.add_method('GetGroupName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::GetParent() const [member function]
+    cls.add_method('GetParent', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::GetRegistered(uint32_t i) [member function]
+    cls.add_method('GetRegistered', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'i')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static uint32_t ns3::TypeId::GetRegisteredN() [member function]
+    cls.add_method('GetRegisteredN', 
+                   'uint32_t', 
+                   [], 
+                   is_static=True)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation ns3::TypeId::GetTraceSource(uint32_t i) const [member function]
+    cls.add_method('GetTraceSource', 
+                   'ns3::TypeId::TraceSourceInformation', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetTraceSourceN() const [member function]
+    cls.add_method('GetTraceSourceN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint16_t ns3::TypeId::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::HasConstructor() const [member function]
+    cls.add_method('HasConstructor', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::HasParent() const [member function]
+    cls.add_method('HasParent', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::HideFromDocumentation() [member function]
+    cls.add_method('HideFromDocumentation', 
+                   'ns3::TypeId', 
+                   [])
+    ## type-id.h (module 'core'): bool ns3::TypeId::IsChildOf(ns3::TypeId other) const [member function]
+    cls.add_method('IsChildOf', 
+                   'bool', 
+                   [param('ns3::TypeId', 'other')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::LookupAttributeByName(std::string name, ns3::TypeId::AttributeInformation * info) const [member function]
+    cls.add_method('LookupAttributeByName', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
+                   is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
+    cls.add_method('LookupByName', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): ns3::Ptr<ns3::TraceSourceAccessor const> ns3::TypeId::LookupTraceSourceByName(std::string name) const [member function]
+    cls.add_method('LookupTraceSourceByName', 
+                   'ns3::Ptr< ns3::TraceSourceAccessor const >', 
+                   [param('std::string', 'name')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::MustHideFromDocumentation() const [member function]
+    cls.add_method('MustHideFromDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::SetAttributeInitialValue(uint32_t i, ns3::Ptr<ns3::AttributeValue const> initialValue) [member function]
+    cls.add_method('SetAttributeInitialValue', 
+                   'bool', 
+                   [param('uint32_t', 'i'), param('ns3::Ptr< ns3::AttributeValue const >', 'initialValue')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetGroupName(std::string groupName) [member function]
+    cls.add_method('SetGroupName', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'groupName')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetParent(ns3::TypeId tid) [member function]
+    cls.add_method('SetParent', 
+                   'ns3::TypeId', 
+                   [param('ns3::TypeId', 'tid')])
+    ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t tid) [member function]
+    cls.add_method('SetUid', 
+                   'void', 
+                   [param('uint16_t', 'tid')])
+    return
+
+def register_Ns3TypeIdAttributeInformation_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::AttributeInformation() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::AttributeInformation(ns3::TypeId::AttributeInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId::AttributeInformation const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::accessor [variable]
+    cls.add_instance_attribute('accessor', 'ns3::Ptr< ns3::AttributeAccessor const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::checker [variable]
+    cls.add_instance_attribute('checker', 'ns3::Ptr< ns3::AttributeChecker const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::flags [variable]
+    cls.add_instance_attribute('flags', 'uint32_t', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::help [variable]
+    cls.add_instance_attribute('help', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::initialValue [variable]
+    cls.add_instance_attribute('initialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::originalInitialValue [variable]
+    cls.add_instance_attribute('originalInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)
+    return
+
+def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::TraceSourceInformation() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::TraceSourceInformation(ns3::TypeId::TraceSourceInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId::TraceSourceInformation const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::accessor [variable]
+    cls.add_instance_attribute('accessor', 'ns3::Ptr< ns3::TraceSourceAccessor const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::help [variable]
+    cls.add_instance_attribute('help', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    return
+
+def register_Ns3Empty_methods(root_module, cls):
+    ## empty.h (module 'core'): ns3::empty::empty() [constructor]
+    cls.add_constructor([])
+    ## empty.h (module 'core'): ns3::empty::empty(ns3::empty const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::empty const &', 'arg0')])
+    return
+
+def register_Ns3Int64x64_t_methods(root_module, cls):
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_unary_numeric_operator('-')
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('>')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('<=')
+    cls.add_binary_comparison_operator('==')
+    cls.add_binary_comparison_operator('>=')
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
+    cls.add_constructor([])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(double v) [constructor]
+    cls.add_constructor([param('double', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long int v) [constructor]
+    cls.add_constructor([param('long int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long long int v) [constructor]
+    cls.add_constructor([param('long long int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(unsigned int v) [constructor]
+    cls.add_constructor([param('unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long unsigned int v) [constructor]
+    cls.add_constructor([param('long unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long long unsigned int v) [constructor]
+    cls.add_constructor([param('long long unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(int64_t hi, uint64_t lo) [constructor]
+    cls.add_constructor([param('int64_t', 'hi'), param('uint64_t', 'lo')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(ns3::int64x64_t const & o) [copy constructor]
+    cls.add_constructor([param('ns3::int64x64_t const &', 'o')])
+    ## int64x64-double.h (module 'core'): double ns3::int64x64_t::GetDouble() const [member function]
+    cls.add_method('GetDouble', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): int64_t ns3::int64x64_t::GetHigh() const [member function]
+    cls.add_method('GetHigh', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): uint64_t ns3::int64x64_t::GetLow() const [member function]
+    cls.add_method('GetLow', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): static ns3::int64x64_t ns3::int64x64_t::Invert(uint64_t v) [member function]
+    cls.add_method('Invert', 
+                   'ns3::int64x64_t', 
+                   [param('uint64_t', 'v')], 
+                   is_static=True)
+    ## int64x64-double.h (module 'core'): void ns3::int64x64_t::MulByInvert(ns3::int64x64_t const & o) [member function]
+    cls.add_method('MulByInvert', 
+                   'void', 
+                   [param('ns3::int64x64_t const &', 'o')])
+    return
+
+def register_Ns3Chunk_methods(root_module, cls):
+    ## chunk.h (module 'network'): ns3::Chunk::Chunk() [constructor]
+    cls.add_constructor([])
+    ## chunk.h (module 'network'): ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Chunk const &', 'arg0')])
+    ## chunk.h (module 'network'): uint32_t ns3::Chunk::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## chunk.h (module 'network'): static ns3::TypeId ns3::Chunk::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## chunk.h (module 'network'): void ns3::Chunk::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Header_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## header.h (module 'network'): ns3::Header::Header() [constructor]
+    cls.add_constructor([])
+    ## header.h (module 'network'): ns3::Header::Header(ns3::Header const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Header const &', 'arg0')])
+    ## header.h (module 'network'): uint32_t ns3::Header::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## header.h (module 'network'): uint32_t ns3::Header::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## header.h (module 'network'): static ns3::TypeId ns3::Header::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## header.h (module 'network'): void ns3::Header::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## header.h (module 'network'): void ns3::Header::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Ipv6Header_methods(root_module, cls):
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::Ipv6Header(ns3::Ipv6Header const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Header const &', 'arg0')])
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::Ipv6Header() [constructor]
+    cls.add_constructor([])
+    ## ipv6-header.h (module 'internet'): uint32_t ns3::Ipv6Header::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6Header::GetDestinationAddress() const [member function]
+    cls.add_method('GetDestinationAddress', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint32_t ns3::Ipv6Header::GetFlowLabel() const [member function]
+    cls.add_method('GetFlowLabel', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint8_t ns3::Ipv6Header::GetHopLimit() const [member function]
+    cls.add_method('GetHopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): ns3::TypeId ns3::Ipv6Header::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-header.h (module 'internet'): uint8_t ns3::Ipv6Header::GetNextHeader() const [member function]
+    cls.add_method('GetNextHeader', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint16_t ns3::Ipv6Header::GetPayloadLength() const [member function]
+    cls.add_method('GetPayloadLength', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint32_t ns3::Ipv6Header::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-header.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6Header::GetSourceAddress() const [member function]
+    cls.add_method('GetSourceAddress', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): uint8_t ns3::Ipv6Header::GetTrafficClass() const [member function]
+    cls.add_method('GetTrafficClass', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-header.h (module 'internet'): static ns3::TypeId ns3::Ipv6Header::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetDestinationAddress(ns3::Ipv6Address dst) [member function]
+    cls.add_method('SetDestinationAddress', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetFlowLabel(uint32_t flow) [member function]
+    cls.add_method('SetFlowLabel', 
+                   'void', 
+                   [param('uint32_t', 'flow')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetHopLimit(uint8_t limit) [member function]
+    cls.add_method('SetHopLimit', 
+                   'void', 
+                   [param('uint8_t', 'limit')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetNextHeader(uint8_t next) [member function]
+    cls.add_method('SetNextHeader', 
+                   'void', 
+                   [param('uint8_t', 'next')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetPayloadLength(uint16_t len) [member function]
+    cls.add_method('SetPayloadLength', 
+                   'void', 
+                   [param('uint16_t', 'len')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetSourceAddress(ns3::Ipv6Address src) [member function]
+    cls.add_method('SetSourceAddress', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'src')])
+    ## ipv6-header.h (module 'internet'): void ns3::Ipv6Header::SetTrafficClass(uint8_t traffic) [member function]
+    cls.add_method('SetTrafficClass', 
+                   'void', 
+                   [param('uint8_t', 'traffic')])
+    return
+
+def register_Ns3Object_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::Object::Object() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): void ns3::Object::AggregateObject(ns3::Ptr<ns3::Object> other) [member function]
+    cls.add_method('AggregateObject', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'other')])
+    ## object.h (module 'core'): void ns3::Object::Dispose() [member function]
+    cls.add_method('Dispose', 
+                   'void', 
+                   [])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator ns3::Object::GetAggregateIterator() const [member function]
+    cls.add_method('GetAggregateIterator', 
+                   'ns3::Object::AggregateIterator', 
+                   [], 
+                   is_const=True)
+    ## object.h (module 'core'): ns3::TypeId ns3::Object::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## object.h (module 'core'): static ns3::TypeId ns3::Object::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## object.h (module 'core'): void ns3::Object::Initialize() [member function]
+    cls.add_method('Initialize', 
+                   'void', 
+                   [])
+    ## object.h (module 'core'): ns3::Object::Object(ns3::Object const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Object const &', 'o')], 
+                        visibility='protected')
+    ## object.h (module 'core'): void ns3::Object::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## object.h (module 'core'): void ns3::Object::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## object.h (module 'core'): void ns3::Object::NotifyNewAggregate() [member function]
+    cls.add_method('NotifyNewAggregate', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::Object::AggregateIterator::AggregateIterator(ns3::Object::AggregateIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Object::AggregateIterator const &', 'arg0')])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator::AggregateIterator() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): bool ns3::Object::AggregateIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## object.h (module 'core'): ns3::Ptr<ns3::Object const> ns3::Object::AggregateIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::Ptr< ns3::Object const >', 
+                   [])
+    return
+
+def register_Ns3RandomVariableStream_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::RandomVariableStream::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::RandomVariableStream::RandomVariableStream() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): void ns3::RandomVariableStream::SetStream(int64_t stream) [member function]
+    cls.add_method('SetStream', 
+                   'void', 
+                   [param('int64_t', 'stream')])
+    ## random-variable-stream.h (module 'core'): int64_t ns3::RandomVariableStream::GetStream() const [member function]
+    cls.add_method('GetStream', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): void ns3::RandomVariableStream::SetAntithetic(bool isAntithetic) [member function]
+    cls.add_method('SetAntithetic', 
+                   'void', 
+                   [param('bool', 'isAntithetic')])
+    ## random-variable-stream.h (module 'core'): bool ns3::RandomVariableStream::IsAntithetic() const [member function]
+    cls.add_method('IsAntithetic', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::RandomVariableStream::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::RandomVariableStream::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## random-variable-stream.h (module 'core'): ns3::RngStream * ns3::RandomVariableStream::Peek() const [member function]
+    cls.add_method('Peek', 
+                   'ns3::RngStream *', 
+                   [], 
+                   is_const=True, visibility='protected')
+    return
+
+def register_Ns3SequentialRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::SequentialRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::SequentialRandomVariable::SequentialRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::SequentialRandomVariable::GetMin() const [member function]
+    cls.add_method('GetMin', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::SequentialRandomVariable::GetMax() const [member function]
+    cls.add_method('GetMax', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): ns3::Ptr<ns3::RandomVariableStream> ns3::SequentialRandomVariable::GetIncrement() const [member function]
+    cls.add_method('GetIncrement', 
+                   'ns3::Ptr< ns3::RandomVariableStream >', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::SequentialRandomVariable::GetConsecutive() const [member function]
+    cls.add_method('GetConsecutive', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::SequentialRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::SequentialRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter< ns3::AttributeAccessor > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter< ns3::AttributeChecker > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter< ns3::AttributeValue > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::SimpleRefCount(ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter< ns3::CallbackImplBase > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount(ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter< ns3::EventImpl > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount(ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter< ns3::NixVector > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter< ns3::Packet > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount(ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter< ns3::TraceSourceAccessor > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SixLowPanFrag1_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFrag1::SixLowPanFrag1(ns3::SixLowPanFrag1 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanFrag1 const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFrag1::SixLowPanFrag1() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanFrag1::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanFrag1::GetDatagramSize() const [member function]
+    cls.add_method('GetDatagramSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanFrag1::GetDatagramTag() const [member function]
+    cls.add_method('GetDatagramTag', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanFrag1::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanFrag1::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanFrag1::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFrag1::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFrag1::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFrag1::SetDatagramSize(uint16_t datagramSize) [member function]
+    cls.add_method('SetDatagramSize', 
+                   'void', 
+                   [param('uint16_t', 'datagramSize')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFrag1::SetDatagramTag(uint16_t datagramTag) [member function]
+    cls.add_method('SetDatagramTag', 
+                   'void', 
+                   [param('uint16_t', 'datagramTag')])
+    return
+
+def register_Ns3SixLowPanFragN_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFragN::SixLowPanFragN(ns3::SixLowPanFragN const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanFragN const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanFragN::SixLowPanFragN() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanFragN::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanFragN::GetDatagramOffset() const [member function]
+    cls.add_method('GetDatagramOffset', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanFragN::GetDatagramSize() const [member function]
+    cls.add_method('GetDatagramSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanFragN::GetDatagramTag() const [member function]
+    cls.add_method('GetDatagramTag', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanFragN::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanFragN::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanFragN::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::SetDatagramOffset(uint8_t datagramOffset) [member function]
+    cls.add_method('SetDatagramOffset', 
+                   'void', 
+                   [param('uint8_t', 'datagramOffset')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::SetDatagramSize(uint16_t datagramSize) [member function]
+    cls.add_method('SetDatagramSize', 
+                   'void', 
+                   [param('uint16_t', 'datagramSize')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanFragN::SetDatagramTag(uint16_t datagramTag) [member function]
+    cls.add_method('SetDatagramTag', 
+                   'void', 
+                   [param('uint16_t', 'datagramTag')])
+    return
+
+def register_Ns3SixLowPanHc1_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::SixLowPanHc1(ns3::SixLowPanHc1 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanHc1 const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::SixLowPanHc1() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanHc1::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::LowPanHc1Addr_e ns3::SixLowPanHc1::GetDstCompression() const [member function]
+    cls.add_method('GetDstCompression', 
+                   'ns3::SixLowPanHc1::LowPanHc1Addr_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t const * ns3::SixLowPanHc1::GetDstInterface() const [member function]
+    cls.add_method('GetDstInterface', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t const * ns3::SixLowPanHc1::GetDstPrefix() const [member function]
+    cls.add_method('GetDstPrefix', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanHc1::GetFlowLabel() const [member function]
+    cls.add_method('GetFlowLabel', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanHc1::GetHopLimit() const [member function]
+    cls.add_method('GetHopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanHc1::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanHc1::GetNextHeader() const [member function]
+    cls.add_method('GetNextHeader', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanHc1::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanHc1::LowPanHc1Addr_e ns3::SixLowPanHc1::GetSrcCompression() const [member function]
+    cls.add_method('GetSrcCompression', 
+                   'ns3::SixLowPanHc1::LowPanHc1Addr_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t const * ns3::SixLowPanHc1::GetSrcInterface() const [member function]
+    cls.add_method('GetSrcInterface', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t const * ns3::SixLowPanHc1::GetSrcPrefix() const [member function]
+    cls.add_method('GetSrcPrefix', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanHc1::GetTrafficClass() const [member function]
+    cls.add_method('GetTrafficClass', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanHc1::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanHc1::IsHc2HeaderPresent() const [member function]
+    cls.add_method('IsHc2HeaderPresent', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanHc1::IsTcflCompression() const [member function]
+    cls.add_method('IsTcflCompression', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetDstCompression(ns3::SixLowPanHc1::LowPanHc1Addr_e dstCompression) [member function]
+    cls.add_method('SetDstCompression', 
+                   'void', 
+                   [param('ns3::SixLowPanHc1::LowPanHc1Addr_e', 'dstCompression')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetDstInterface(uint8_t const * dstInterface) [member function]
+    cls.add_method('SetDstInterface', 
+                   'void', 
+                   [param('uint8_t const *', 'dstInterface')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetDstPrefix(uint8_t const * dstPrefix) [member function]
+    cls.add_method('SetDstPrefix', 
+                   'void', 
+                   [param('uint8_t const *', 'dstPrefix')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetFlowLabel(uint32_t flowLabel) [member function]
+    cls.add_method('SetFlowLabel', 
+                   'void', 
+                   [param('uint32_t', 'flowLabel')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetHc2HeaderPresent(bool hc2HeaderPresent) [member function]
+    cls.add_method('SetHc2HeaderPresent', 
+                   'void', 
+                   [param('bool', 'hc2HeaderPresent')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetHopLimit(uint8_t limit) [member function]
+    cls.add_method('SetHopLimit', 
+                   'void', 
+                   [param('uint8_t', 'limit')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetNextHeader(uint8_t nextHeader) [member function]
+    cls.add_method('SetNextHeader', 
+                   'void', 
+                   [param('uint8_t', 'nextHeader')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetSrcCompression(ns3::SixLowPanHc1::LowPanHc1Addr_e srcCompression) [member function]
+    cls.add_method('SetSrcCompression', 
+                   'void', 
+                   [param('ns3::SixLowPanHc1::LowPanHc1Addr_e', 'srcCompression')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetSrcInterface(uint8_t const * srcInterface) [member function]
+    cls.add_method('SetSrcInterface', 
+                   'void', 
+                   [param('uint8_t const *', 'srcInterface')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetSrcPrefix(uint8_t const * srcPrefix) [member function]
+    cls.add_method('SetSrcPrefix', 
+                   'void', 
+                   [param('uint8_t const *', 'srcPrefix')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetTcflCompression(bool tcflCompression) [member function]
+    cls.add_method('SetTcflCompression', 
+                   'void', 
+                   [param('bool', 'tcflCompression')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanHc1::SetTrafficClass(uint8_t trafficClass) [member function]
+    cls.add_method('SetTrafficClass', 
+                   'void', 
+                   [param('uint8_t', 'trafficClass')])
+    return
+
+def register_Ns3SixLowPanIphc_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::SixLowPanIphc(ns3::SixLowPanIphc const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanIphc const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::SixLowPanIphc() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::SixLowPanIphc(uint8_t dispatch) [constructor]
+    cls.add_constructor([param('uint8_t', 'dispatch')])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanIphc::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetCid() const [member function]
+    cls.add_method('GetCid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetDac() const [member function]
+    cls.add_method('GetDac', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::HeaderCompression_e ns3::SixLowPanIphc::GetDam() const [member function]
+    cls.add_method('GetDam', 
+                   'ns3::SixLowPanIphc::HeaderCompression_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetDscp() const [member function]
+    cls.add_method('GetDscp', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::Ipv6Address ns3::SixLowPanIphc::GetDstAddress() const [member function]
+    cls.add_method('GetDstAddress', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetDstContextId() const [member function]
+    cls.add_method('GetDstContextId', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetEcn() const [member function]
+    cls.add_method('GetEcn', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanIphc::GetFlowLabel() const [member function]
+    cls.add_method('GetFlowLabel', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::Hlim_e ns3::SixLowPanIphc::GetHlim() const [member function]
+    cls.add_method('GetHlim', 
+                   'ns3::SixLowPanIphc::Hlim_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetHopLimit() const [member function]
+    cls.add_method('GetHopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanIphc::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetM() const [member function]
+    cls.add_method('GetM', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetNextHeader() const [member function]
+    cls.add_method('GetNextHeader', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetNh() const [member function]
+    cls.add_method('GetNh', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanIphc::GetSac() const [member function]
+    cls.add_method('GetSac', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::HeaderCompression_e ns3::SixLowPanIphc::GetSam() const [member function]
+    cls.add_method('GetSam', 
+                   'ns3::SixLowPanIphc::HeaderCompression_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanIphc::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::Ipv6Address ns3::SixLowPanIphc::GetSrcAddress() const [member function]
+    cls.add_method('GetSrcAddress', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanIphc::GetSrcContextId() const [member function]
+    cls.add_method('GetSrcContextId', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanIphc::TrafficClassFlowLabel_e ns3::SixLowPanIphc::GetTf() const [member function]
+    cls.add_method('GetTf', 
+                   'ns3::SixLowPanIphc::TrafficClassFlowLabel_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanIphc::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetCid(bool cidField) [member function]
+    cls.add_method('SetCid', 
+                   'void', 
+                   [param('bool', 'cidField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDac(bool dacField) [member function]
+    cls.add_method('SetDac', 
+                   'void', 
+                   [param('bool', 'dacField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDam(ns3::SixLowPanIphc::HeaderCompression_e damField) [member function]
+    cls.add_method('SetDam', 
+                   'void', 
+                   [param('ns3::SixLowPanIphc::HeaderCompression_e', 'damField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDscp(uint8_t dscp) [member function]
+    cls.add_method('SetDscp', 
+                   'void', 
+                   [param('uint8_t', 'dscp')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDstAddress(ns3::Ipv6Address dstAddress) [member function]
+    cls.add_method('SetDstAddress', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dstAddress')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetDstContextId(uint8_t dstContextId) [member function]
+    cls.add_method('SetDstContextId', 
+                   'void', 
+                   [param('uint8_t', 'dstContextId')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetEcn(uint8_t ecn) [member function]
+    cls.add_method('SetEcn', 
+                   'void', 
+                   [param('uint8_t', 'ecn')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetFlowLabel(uint32_t flowLabel) [member function]
+    cls.add_method('SetFlowLabel', 
+                   'void', 
+                   [param('uint32_t', 'flowLabel')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetHlim(ns3::SixLowPanIphc::Hlim_e hlimField) [member function]
+    cls.add_method('SetHlim', 
+                   'void', 
+                   [param('ns3::SixLowPanIphc::Hlim_e', 'hlimField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetHopLimit(uint8_t hopLimit) [member function]
+    cls.add_method('SetHopLimit', 
+                   'void', 
+                   [param('uint8_t', 'hopLimit')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetM(bool mField) [member function]
+    cls.add_method('SetM', 
+                   'void', 
+                   [param('bool', 'mField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetNextHeader(uint8_t nextHeader) [member function]
+    cls.add_method('SetNextHeader', 
+                   'void', 
+                   [param('uint8_t', 'nextHeader')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetNh(bool nhField) [member function]
+    cls.add_method('SetNh', 
+                   'void', 
+                   [param('bool', 'nhField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetSac(bool sacField) [member function]
+    cls.add_method('SetSac', 
+                   'void', 
+                   [param('bool', 'sacField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetSam(ns3::SixLowPanIphc::HeaderCompression_e samField) [member function]
+    cls.add_method('SetSam', 
+                   'void', 
+                   [param('ns3::SixLowPanIphc::HeaderCompression_e', 'samField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetSrcAddress(ns3::Ipv6Address srcAddress) [member function]
+    cls.add_method('SetSrcAddress', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'srcAddress')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetSrcContextId(uint8_t srcContextId) [member function]
+    cls.add_method('SetSrcContextId', 
+                   'void', 
+                   [param('uint8_t', 'srcContextId')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanIphc::SetTf(ns3::SixLowPanIphc::TrafficClassFlowLabel_e tfField) [member function]
+    cls.add_method('SetTf', 
+                   'void', 
+                   [param('ns3::SixLowPanIphc::TrafficClassFlowLabel_e', 'tfField')])
+    return
+
+def register_Ns3SixLowPanNhcExtension_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension::SixLowPanNhcExtension(ns3::SixLowPanNhcExtension const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanNhcExtension const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension::SixLowPanNhcExtension() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanNhcExtension::CopyBlob(uint8_t * blob, uint32_t size) const [member function]
+    cls.add_method('CopyBlob', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'blob'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanNhcExtension::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanNhcExtension::Eid_e ns3::SixLowPanNhcExtension::GetEid() const [member function]
+    cls.add_method('GetEid', 
+                   'ns3::SixLowPanNhcExtension::Eid_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanNhcExtension::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint8_t ns3::SixLowPanNhcExtension::GetNextHeader() const [member function]
+    cls.add_method('GetNextHeader', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanNhcExtension::GetNh() const [member function]
+    cls.add_method('GetNh', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::NhcDispatch_e ns3::SixLowPanNhcExtension::GetNhcDispatchType() const [member function]
+    cls.add_method('GetNhcDispatchType', 
+                   'ns3::SixLowPanDispatch::NhcDispatch_e', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanNhcExtension::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanNhcExtension::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::SetBlob(uint8_t const * blob, uint32_t size) [member function]
+    cls.add_method('SetBlob', 
+                   'void', 
+                   [param('uint8_t const *', 'blob'), param('uint32_t', 'size')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::SetEid(ns3::SixLowPanNhcExtension::Eid_e extensionHeaderType) [member function]
+    cls.add_method('SetEid', 
+                   'void', 
+                   [param('ns3::SixLowPanNhcExtension::Eid_e', 'extensionHeaderType')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::SetNextHeader(uint8_t nextHeader) [member function]
+    cls.add_method('SetNextHeader', 
+                   'void', 
+                   [param('uint8_t', 'nextHeader')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanNhcExtension::SetNh(bool nhField) [member function]
+    cls.add_method('SetNh', 
+                   'void', 
+                   [param('bool', 'nhField')])
+    return
+
+def register_Ns3SixLowPanUdpNhcExtension_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension::SixLowPanUdpNhcExtension(ns3::SixLowPanUdpNhcExtension const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SixLowPanUdpNhcExtension const &', 'arg0')])
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension::SixLowPanUdpNhcExtension() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanUdpNhcExtension::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): bool ns3::SixLowPanUdpNhcExtension::GetC() const [member function]
+    cls.add_method('GetC', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanUdpNhcExtension::GetChecksum() const [member function]
+    cls.add_method('GetChecksum', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanUdpNhcExtension::GetDstPort() const [member function]
+    cls.add_method('GetDstPort', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::TypeId ns3::SixLowPanUdpNhcExtension::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanDispatch::NhcDispatch_e ns3::SixLowPanUdpNhcExtension::GetNhcDispatchType() const [member function]
+    cls.add_method('GetNhcDispatchType', 
+                   'ns3::SixLowPanDispatch::NhcDispatch_e', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): ns3::SixLowPanUdpNhcExtension::Ports_e ns3::SixLowPanUdpNhcExtension::GetPorts() const [member function]
+    cls.add_method('GetPorts', 
+                   'ns3::SixLowPanUdpNhcExtension::Ports_e', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint32_t ns3::SixLowPanUdpNhcExtension::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): uint16_t ns3::SixLowPanUdpNhcExtension::GetSrcPort() const [member function]
+    cls.add_method('GetSrcPort', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanUdpNhcExtension::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetC(bool cField) [member function]
+    cls.add_method('SetC', 
+                   'void', 
+                   [param('bool', 'cField')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetChecksum(uint16_t checksum) [member function]
+    cls.add_method('SetChecksum', 
+                   'void', 
+                   [param('uint16_t', 'checksum')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetDstPort(uint16_t port) [member function]
+    cls.add_method('SetDstPort', 
+                   'void', 
+                   [param('uint16_t', 'port')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetPorts(ns3::SixLowPanUdpNhcExtension::Ports_e port) [member function]
+    cls.add_method('SetPorts', 
+                   'void', 
+                   [param('ns3::SixLowPanUdpNhcExtension::Ports_e', 'port')])
+    ## sixlowpan-header.h (module 'sixlowpan'): void ns3::SixLowPanUdpNhcExtension::SetSrcPort(uint16_t port) [member function]
+    cls.add_method('SetSrcPort', 
+                   'void', 
+                   [param('uint16_t', 'port')])
+    return
+
+def register_Ns3Time_methods(root_module, cls):
+    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('>')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
+    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('<=')
+    cls.add_binary_comparison_operator('==')
+    cls.add_binary_comparison_operator('>=')
+    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
+    cls.add_constructor([])
+    ## nstime.h (module 'core'): ns3::Time::Time(ns3::Time const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Time const &', 'o')])
+    ## nstime.h (module 'core'): ns3::Time::Time(double v) [constructor]
+    cls.add_constructor([param('double', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long int v) [constructor]
+    cls.add_constructor([param('long int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long long int v) [constructor]
+    cls.add_constructor([param('long long int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(unsigned int v) [constructor]
+    cls.add_constructor([param('unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long unsigned int v) [constructor]
+    cls.add_constructor([param('long unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long long unsigned int v) [constructor]
+    cls.add_constructor([param('long long unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(std::string const & s) [constructor]
+    cls.add_constructor([param('std::string const &', 's')])
+    ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & value) [constructor]
+    cls.add_constructor([param('ns3::int64x64_t const &', 'value')])
+    ## nstime.h (module 'core'): int ns3::Time::Compare(ns3::Time const & o) const [member function]
+    cls.add_method('Compare', 
+                   'int', 
+                   [param('ns3::Time const &', 'o')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & from, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('From', 
+                   'ns3::Time', 
+                   [param('ns3::int64x64_t const &', 'from'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value) [member function]
+    cls.add_method('From', 
+                   'ns3::Time', 
+                   [param('ns3::int64x64_t const &', 'value')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('FromDouble', 
+                   'ns3::Time', 
+                   [param('double', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('FromInteger', 
+                   'ns3::Time', 
+                   [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
+    cls.add_method('GetDouble', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetFemtoSeconds() const [member function]
+    cls.add_method('GetFemtoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
+    cls.add_method('GetInteger', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetMicroSeconds() const [member function]
+    cls.add_method('GetMicroSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetMilliSeconds() const [member function]
+    cls.add_method('GetMilliSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
+    cls.add_method('GetNanoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetPicoSeconds() const [member function]
+    cls.add_method('GetPicoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time::Unit ns3::Time::GetResolution() [member function]
+    cls.add_method('GetResolution', 
+                   'ns3::Time::Unit', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetSeconds() const [member function]
+    cls.add_method('GetSeconds', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetTimeStep() const [member function]
+    cls.add_method('GetTimeStep', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
+    cls.add_method('IsNegative', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsPositive() const [member function]
+    cls.add_method('IsPositive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyNegative() const [member function]
+    cls.add_method('IsStrictlyNegative', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyPositive() const [member function]
+    cls.add_method('IsStrictlyPositive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsZero() const [member function]
+    cls.add_method('IsZero', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
+    cls.add_method('SetResolution', 
+                   'void', 
+                   [param('ns3::Time::Unit', 'resolution')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('To', 
+                   'ns3::int64x64_t', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('ToDouble', 
+                   'double', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('ToInteger', 
+                   'int64_t', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    return
+
+def register_Ns3TraceSourceAccessor_methods(root_module, cls):
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor::TraceSourceAccessor(ns3::TraceSourceAccessor const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TraceSourceAccessor const &', 'arg0')])
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor::TraceSourceAccessor() [constructor]
+    cls.add_constructor([])
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::Connect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('Connect', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::ConnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('ConnectWithoutContext', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::Disconnect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('Disconnect', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::DisconnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('DisconnectWithoutContext', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Trailer_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## trailer.h (module 'network'): ns3::Trailer::Trailer() [constructor]
+    cls.add_constructor([])
+    ## trailer.h (module 'network'): ns3::Trailer::Trailer(ns3::Trailer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Trailer const &', 'arg0')])
+    ## trailer.h (module 'network'): uint32_t ns3::Trailer::Deserialize(ns3::Buffer::Iterator end) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'end')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## trailer.h (module 'network'): uint32_t ns3::Trailer::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trailer.h (module 'network'): static ns3::TypeId ns3::Trailer::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## trailer.h (module 'network'): void ns3::Trailer::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trailer.h (module 'network'): void ns3::Trailer::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3TriangularRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::TriangularRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::TriangularRandomVariable::TriangularRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetMean() const [member function]
+    cls.add_method('GetMean', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetMin() const [member function]
+    cls.add_method('GetMin', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetMax() const [member function]
+    cls.add_method('GetMax', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetValue(double mean, double min, double max) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mean'), param('double', 'min'), param('double', 'max')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::TriangularRandomVariable::GetInteger(uint32_t mean, uint32_t min, uint32_t max) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mean'), param('uint32_t', 'min'), param('uint32_t', 'max')])
+    ## random-variable-stream.h (module 'core'): double ns3::TriangularRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::TriangularRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3UniformRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::UniformRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable::UniformRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::UniformRandomVariable::GetMin() const [member function]
+    cls.add_method('GetMin', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::UniformRandomVariable::GetMax() const [member function]
+    cls.add_method('GetMax', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::UniformRandomVariable::GetValue(double min, double max) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'min'), param('double', 'max')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::UniformRandomVariable::GetInteger(uint32_t min, uint32_t max) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'min'), param('uint32_t', 'max')])
+    ## random-variable-stream.h (module 'core'): double ns3::UniformRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::UniformRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3WeibullRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::WeibullRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::WeibullRandomVariable::WeibullRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetScale() const [member function]
+    cls.add_method('GetScale', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetShape() const [member function]
+    cls.add_method('GetShape', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetBound() const [member function]
+    cls.add_method('GetBound', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetValue(double scale, double shape, double bound) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'scale'), param('double', 'shape'), param('double', 'bound')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::WeibullRandomVariable::GetInteger(uint32_t scale, uint32_t shape, uint32_t bound) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'scale'), param('uint32_t', 'shape'), param('uint32_t', 'bound')])
+    ## random-variable-stream.h (module 'core'): double ns3::WeibullRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::WeibullRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3ZetaRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ZetaRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ZetaRandomVariable::ZetaRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::ZetaRandomVariable::GetAlpha() const [member function]
+    cls.add_method('GetAlpha', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ZetaRandomVariable::GetValue(double alpha) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'alpha')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZetaRandomVariable::GetInteger(uint32_t alpha) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'alpha')])
+    ## random-variable-stream.h (module 'core'): double ns3::ZetaRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZetaRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3ZipfRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ZipfRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ZipfRandomVariable::ZipfRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZipfRandomVariable::GetN() const [member function]
+    cls.add_method('GetN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ZipfRandomVariable::GetAlpha() const [member function]
+    cls.add_method('GetAlpha', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ZipfRandomVariable::GetValue(uint32_t n, double alpha) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('uint32_t', 'n'), param('double', 'alpha')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZipfRandomVariable::GetInteger(uint32_t n, uint32_t alpha) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'n'), param('uint32_t', 'alpha')])
+    ## random-variable-stream.h (module 'core'): double ns3::ZipfRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ZipfRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=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')])
+    ## attribute.h (module 'core'): ns3::AttributeAccessor::AttributeAccessor() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::Get(ns3::ObjectBase const * object, ns3::AttributeValue & attribute) const [member function]
+    cls.add_method('Get', 
+                   'bool', 
+                   [param('ns3::ObjectBase const *', 'object'), param('ns3::AttributeValue &', 'attribute')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::HasGetter() const [member function]
+    cls.add_method('HasGetter', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::HasSetter() const [member function]
+    cls.add_method('HasSetter', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::Set(ns3::ObjectBase * object, ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Set', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False), param('ns3::AttributeValue const &', 'value')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3AttributeChecker_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::AttributeChecker::AttributeChecker(ns3::AttributeChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeChecker const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::AttributeChecker::AttributeChecker() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::Check(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Check', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::Copy(ns3::AttributeValue const & source, ns3::AttributeValue & destination) const [member function]
+    cls.add_method('Copy', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'source'), param('ns3::AttributeValue &', 'destination')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::CreateValidValue(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('CreateValidValue', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_const=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeChecker::GetUnderlyingTypeInformation() const [member function]
+    cls.add_method('GetUnderlyingTypeInformation', 
+                   'std::string', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeChecker::GetValueTypeName() const [member function]
+    cls.add_method('GetValueTypeName', 
+                   'std::string', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::HasUnderlyingTypeInformation() const [member function]
+    cls.add_method('HasUnderlyingTypeInformation', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3AttributeValue_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::AttributeValue::AttributeValue(ns3::AttributeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeValue const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::AttributeValue::AttributeValue() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3CallbackChecker_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker(ns3::CallbackChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackChecker const &', 'arg0')])
+    return
+
+def register_Ns3CallbackImplBase_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackImplBase::CallbackImplBase() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackImplBase::CallbackImplBase(ns3::CallbackImplBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackImplBase const &', 'arg0')])
+    ## callback.h (module 'core'): bool ns3::CallbackImplBase::IsEqual(ns3::Ptr<ns3::CallbackImplBase const> other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::CallbackImplBase const >', 'other')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3CallbackValue_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue(ns3::CallbackValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackValue const &', 'arg0')])
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue(ns3::CallbackBase const & base) [constructor]
+    cls.add_constructor([param('ns3::CallbackBase const &', 'base')])
+    ## callback.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::CallbackValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## callback.h (module 'core'): bool ns3::CallbackValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## callback.h (module 'core'): std::string ns3::CallbackValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## callback.h (module 'core'): void ns3::CallbackValue::Set(ns3::CallbackBase base) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::CallbackBase', 'base')])
+    return
+
+def register_Ns3ConstantRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ConstantRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ConstantRandomVariable::ConstantRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::ConstantRandomVariable::GetConstant() const [member function]
+    cls.add_method('GetConstant', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ConstantRandomVariable::GetValue(double constant) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'constant')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ConstantRandomVariable::GetInteger(uint32_t constant) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'constant')])
+    ## random-variable-stream.h (module 'core'): double ns3::ConstantRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ConstantRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3DeterministicRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::DeterministicRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable::DeterministicRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): void ns3::DeterministicRandomVariable::SetValueArray(double * values, uint64_t length) [member function]
+    cls.add_method('SetValueArray', 
+                   'void', 
+                   [param('double *', 'values'), param('uint64_t', 'length')])
+    ## random-variable-stream.h (module 'core'): double ns3::DeterministicRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::DeterministicRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3EmpiricalRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable::EmpiricalRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): void ns3::EmpiricalRandomVariable::CDF(double v, double c) [member function]
+    cls.add_method('CDF', 
+                   'void', 
+                   [param('double', 'v'), param('double', 'c')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::EmpiricalRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::EmpiricalRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): double ns3::EmpiricalRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): double ns3::EmpiricalRandomVariable::Interpolate(double arg0, double arg1, double arg2, double arg3, double arg4) [member function]
+    cls.add_method('Interpolate', 
+                   'double', 
+                   [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3'), param('double', 'arg4')], 
+                   visibility='private', is_virtual=True)
+    ## random-variable-stream.h (module 'core'): void ns3::EmpiricalRandomVariable::Validate() [member function]
+    cls.add_method('Validate', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3EmptyAttributeValue_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EmptyAttributeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::EmptyAttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   visibility='private', is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::EmptyAttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3ErlangRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ErlangRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ErlangRandomVariable::ErlangRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ErlangRandomVariable::GetK() const [member function]
+    cls.add_method('GetK', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ErlangRandomVariable::GetLambda() const [member function]
+    cls.add_method('GetLambda', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ErlangRandomVariable::GetValue(uint32_t k, double lambda) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('uint32_t', 'k'), param('double', 'lambda')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ErlangRandomVariable::GetInteger(uint32_t k, uint32_t lambda) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'k'), param('uint32_t', 'lambda')])
+    ## random-variable-stream.h (module 'core'): double ns3::ErlangRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ErlangRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3EventImpl_methods(root_module, cls):
+    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventImpl const &', 'arg0')])
+    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl() [constructor]
+    cls.add_constructor([])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Invoke() [member function]
+    cls.add_method('Invoke', 
+                   'void', 
+                   [])
+    ## event-impl.h (module 'core'): bool ns3::EventImpl::IsCancelled() [member function]
+    cls.add_method('IsCancelled', 
+                   'bool', 
+                   [])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Notify() [member function]
+    cls.add_method('Notify', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ExponentialRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ExponentialRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ExponentialRandomVariable::ExponentialRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::ExponentialRandomVariable::GetMean() const [member function]
+    cls.add_method('GetMean', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ExponentialRandomVariable::GetBound() const [member function]
+    cls.add_method('GetBound', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ExponentialRandomVariable::GetValue(double mean, double bound) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mean'), param('double', 'bound')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ExponentialRandomVariable::GetInteger(uint32_t mean, uint32_t bound) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mean'), param('uint32_t', 'bound')])
+    ## random-variable-stream.h (module 'core'): double ns3::ExponentialRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ExponentialRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3GammaRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::GammaRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable::GammaRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::GammaRandomVariable::GetAlpha() const [member function]
+    cls.add_method('GetAlpha', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::GammaRandomVariable::GetBeta() const [member function]
+    cls.add_method('GetBeta', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::GammaRandomVariable::GetValue(double alpha, double beta) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'alpha'), param('double', 'beta')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::GammaRandomVariable::GetInteger(uint32_t alpha, uint32_t beta) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'alpha'), param('uint32_t', 'beta')])
+    ## random-variable-stream.h (module 'core'): double ns3::GammaRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::GammaRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3Ipv4AddressChecker_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker(ns3::Ipv4AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv4AddressValue_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue(ns3::Ipv4AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4AddressValue const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue(ns3::Ipv4Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Address const &', 'value')])
+    ## ipv4-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv4AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): std::string ns3::Ipv4AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4AddressValue::Set(ns3::Ipv4Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv4Address const &', 'value')])
+    return
+
+def register_Ns3Ipv4MaskChecker_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker::Ipv4MaskChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker::Ipv4MaskChecker(ns3::Ipv4MaskChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4MaskChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv4MaskValue_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue(ns3::Ipv4MaskValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4MaskValue const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue(ns3::Ipv4Mask const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Mask const &', 'value')])
+    ## ipv4-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv4MaskValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4MaskValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask ns3::Ipv4MaskValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): std::string ns3::Ipv4MaskValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4MaskValue::Set(ns3::Ipv4Mask const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv4Mask const &', 'value')])
+    return
+
+def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker::Ipv6AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker::Ipv6AddressChecker(ns3::Ipv6AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv6AddressValue_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6AddressValue const &', 'arg0')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const &', 'value')])
+    ## ipv6-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv6AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address ns3::Ipv6AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): std::string ns3::Ipv6AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6AddressValue::Set(ns3::Ipv6Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv6Address const &', 'value')])
+    return
+
+def register_Ns3Ipv6PrefixChecker_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker(ns3::Ipv6PrefixChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PrefixChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv6PrefixValue_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6PrefixValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PrefixValue const &', 'arg0')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6Prefix const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const &', 'value')])
+    ## ipv6-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv6PrefixValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6PrefixValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix ns3::Ipv6PrefixValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): std::string ns3::Ipv6PrefixValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6PrefixValue::Set(ns3::Ipv6Prefix const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv6Prefix const &', 'value')])
+    return
+
+def register_Ns3LogNormalRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::LogNormalRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::LogNormalRandomVariable::LogNormalRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::LogNormalRandomVariable::GetMu() const [member function]
+    cls.add_method('GetMu', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::LogNormalRandomVariable::GetSigma() const [member function]
+    cls.add_method('GetSigma', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::LogNormalRandomVariable::GetValue(double mu, double sigma) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mu'), param('double', 'sigma')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::LogNormalRandomVariable::GetInteger(uint32_t mu, uint32_t sigma) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mu'), param('uint32_t', 'sigma')])
+    ## random-variable-stream.h (module 'core'): double ns3::LogNormalRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::LogNormalRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3NetDevice_methods(root_module, cls):
+    ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
+    cls.add_constructor([])
+    ## net-device.h (module 'network'): ns3::NetDevice::NetDevice(ns3::NetDevice const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NetDevice const &', 'arg0')])
+    ## net-device.h (module 'network'): void ns3::NetDevice::AddLinkChangeCallback(ns3::Callback<void,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    cls.add_method('AddLinkChangeCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetBroadcast() const [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Ptr<ns3::Channel> ns3::NetDevice::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::Channel >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): uint32_t ns3::NetDevice::GetIfIndex() const [member function]
+    cls.add_method('GetIfIndex', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): uint16_t ns3::NetDevice::GetMtu() const [member function]
+    cls.add_method('GetMtu', 
+                   'uint16_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv4Address multicastGroup) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv4Address', 'multicastGroup')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Ptr<ns3::Node> ns3::NetDevice::GetNode() const [member function]
+    cls.add_method('GetNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): static ns3::TypeId ns3::NetDevice::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsBridge() const [member function]
+    cls.add_method('IsBridge', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsLinkUp() const [member function]
+    cls.add_method('IsLinkUp', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsPointToPoint() const [member function]
+    cls.add_method('IsPointToPoint', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::NeedsArp() const [member function]
+    cls.add_method('NeedsArp', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('Send', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('SendFrom', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetIfIndex(uint32_t const index) [member function]
+    cls.add_method('SetIfIndex', 
+                   'void', 
+                   [param('uint32_t const', 'index')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SetMtu(uint16_t const mtu) [member function]
+    cls.add_method('SetMtu', 
+                   'bool', 
+                   [param('uint16_t const', 'mtu')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetNode(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('SetNode', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetPromiscReceiveCallback(ns3::Callback<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> cb) [member function]
+    cls.add_method('SetPromiscReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< 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 >', 'cb')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetReceiveCallback(ns3::Callback<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> cb) [member function]
+    cls.add_method('SetReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< 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 >', 'cb')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3NixVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## nix-vector.h (module 'network'): ns3::NixVector::NixVector() [constructor]
+    cls.add_constructor([])
+    ## nix-vector.h (module 'network'): ns3::NixVector::NixVector(ns3::NixVector const & o) [copy constructor]
+    cls.add_constructor([param('ns3::NixVector const &', 'o')])
+    ## nix-vector.h (module 'network'): void ns3::NixVector::AddNeighborIndex(uint32_t newBits, uint32_t numberOfBits) [member function]
+    cls.add_method('AddNeighborIndex', 
+                   'void', 
+                   [param('uint32_t', 'newBits'), param('uint32_t', 'numberOfBits')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::BitCount(uint32_t numberOfNeighbors) const [member function]
+    cls.add_method('BitCount', 
+                   'uint32_t', 
+                   [param('uint32_t', 'numberOfNeighbors')], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): ns3::Ptr<ns3::NixVector> ns3::NixVector::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::NixVector >', 
+                   [], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Deserialize(uint32_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint32_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::ExtractNeighborIndex(uint32_t numberOfBits) [member function]
+    cls.add_method('ExtractNeighborIndex', 
+                   'uint32_t', 
+                   [param('uint32_t', 'numberOfBits')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetRemainingBits() [member function]
+    cls.add_method('GetRemainingBits', 
+                   'uint32_t', 
+                   [])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Serialize(uint32_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint32_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3NormalRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): ns3::NormalRandomVariable::INFINITE_VALUE [variable]
+    cls.add_static_attribute('INFINITE_VALUE', 'double const', is_const=True)
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::NormalRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::NormalRandomVariable::NormalRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetMean() const [member function]
+    cls.add_method('GetMean', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetVariance() const [member function]
+    cls.add_method('GetVariance', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetBound() const [member function]
+    cls.add_method('GetBound', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetValue(double mean, double variance, double bound=ns3::NormalRandomVariable::INFINITE_VALUE) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mean'), param('double', 'variance'), param('double', 'bound', default_value='ns3::NormalRandomVariable::INFINITE_VALUE')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::NormalRandomVariable::GetInteger(uint32_t mean, uint32_t variance, uint32_t bound) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mean'), param('uint32_t', 'variance'), param('uint32_t', 'bound')])
+    ## random-variable-stream.h (module 'core'): double ns3::NormalRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::NormalRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3ObjectFactoryChecker_methods(root_module, cls):
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')])
+    return
+
+def register_Ns3ObjectFactoryValue_methods(root_module, cls):
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor]
+    cls.add_constructor([param('ns3::ObjectFactory const &', 'value')])
+    ## object-factory.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::ObjectFactoryValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::ObjectFactory', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::ObjectFactory const &', 'value')])
+    return
+
+def register_Ns3Packet_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## packet.h (module 'network'): ns3::Packet::Packet() [constructor]
+    cls.add_constructor([])
+    ## packet.h (module 'network'): ns3::Packet::Packet(ns3::Packet const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Packet const &', 'o')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint32_t size) [constructor]
+    cls.add_constructor([param('uint32_t', 'size')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size, bool magic) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<const ns3::Packet> packet) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet.h (module 'network'): void ns3::Packet::AddByteTag(ns3::Tag const & tag) const [member function]
+    cls.add_method('AddByteTag', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::AddHeader(ns3::Header const & header) [member function]
+    cls.add_method('AddHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header')])
+    ## packet.h (module 'network'): void ns3::Packet::AddPacketTag(ns3::Tag const & tag) const [member function]
+    cls.add_method('AddPacketTag', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::AddPaddingAtEnd(uint32_t size) [member function]
+    cls.add_method('AddPaddingAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::AddTrailer(ns3::Trailer const & trailer) [member function]
+    cls.add_method('AddTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer')])
+    ## packet.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::Packet::BeginItem() const [member function]
+    cls.add_method('BeginItem', 
+                   'ns3::PacketMetadata::ItemIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::Packet> ns3::Packet::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::CopyData(uint8_t * buffer, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::CopyData(std::ostream * os, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'void', 
+                   [param('std::ostream *', 'os'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::Packet> ns3::Packet::CreateFragment(uint32_t start, uint32_t length) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
+                   is_const=True)
+    ## packet.h (module 'network'): static void ns3::Packet::EnableChecking() [member function]
+    cls.add_method('EnableChecking', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet.h (module 'network'): static void ns3::Packet::EnablePrinting() [member function]
+    cls.add_method('EnablePrinting', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet.h (module 'network'): bool ns3::Packet::FindFirstMatchingByteTag(ns3::Tag & tag) const [member function]
+    cls.add_method('FindFirstMatchingByteTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::ByteTagIterator ns3::Packet::GetByteTagIterator() const [member function]
+    cls.add_method('GetByteTagIterator', 
+                   'ns3::ByteTagIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::NixVector> ns3::Packet::GetNixVector() const [member function]
+    cls.add_method('GetNixVector', 
+                   'ns3::Ptr< ns3::NixVector >', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::PacketTagIterator ns3::Packet::GetPacketTagIterator() const [member function]
+    cls.add_method('GetPacketTagIterator', 
+                   'ns3::PacketTagIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint64_t ns3::Packet::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint8_t const * ns3::Packet::PeekData() const [member function]
+    cls.add_method('PeekData', 
+                   'uint8_t const *', 
+                   [], 
+                   deprecated=True, is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::PeekHeader(ns3::Header & header) const [member function]
+    cls.add_method('PeekHeader', 
+                   'uint32_t', 
+                   [param('ns3::Header &', 'header')], 
+                   is_const=True)
+    ## packet.h (module 'network'): bool ns3::Packet::PeekPacketTag(ns3::Tag & tag) const [member function]
+    cls.add_method('PeekPacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::PeekTrailer(ns3::Trailer & trailer) [member function]
+    cls.add_method('PeekTrailer', 
+                   'uint32_t', 
+                   [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): void ns3::Packet::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::PrintByteTags(std::ostream & os) const [member function]
+    cls.add_method('PrintByteTags', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::PrintPacketTags(std::ostream & os) const [member function]
+    cls.add_method('PrintPacketTags', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAllByteTags() [member function]
+    cls.add_method('RemoveAllByteTags', 
+                   'void', 
+                   [])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAllPacketTags() [member function]
+    cls.add_method('RemoveAllPacketTags', 
+                   'void', 
+                   [])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAtEnd(uint32_t size) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAtStart(uint32_t size) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveHeader(ns3::Header & header) [member function]
+    cls.add_method('RemoveHeader', 
+                   'uint32_t', 
+                   [param('ns3::Header &', 'header')])
+    ## packet.h (module 'network'): bool ns3::Packet::RemovePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('RemovePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveTrailer(ns3::Trailer & trailer) [member function]
+    cls.add_method('RemoveTrailer', 
+                   'uint32_t', 
+                   [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::SetNixVector(ns3::Ptr<ns3::NixVector> arg0) [member function]
+    cls.add_method('SetNixVector', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
+    return
+
+def register_Ns3ParetoRandomVariable_methods(root_module, cls):
+    ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ParetoRandomVariable::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable::ParetoRandomVariable() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetMean() const [member function]
+    cls.add_method('GetMean', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetShape() const [member function]
+    cls.add_method('GetShape', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetBound() const [member function]
+    cls.add_method('GetBound', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetValue(double mean, double shape, double bound) [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [param('double', 'mean'), param('double', 'shape'), param('double', 'bound')])
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ParetoRandomVariable::GetInteger(uint32_t mean, uint32_t shape, uint32_t bound) [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [param('uint32_t', 'mean'), param('uint32_t', 'shape'), param('uint32_t', 'bound')])
+    ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'double', 
+                   [], 
+                   is_virtual=True)
+    ## random-variable-stream.h (module 'core'): uint32_t ns3::ParetoRandomVariable::GetInteger() [member function]
+    cls.add_method('GetInteger', 
+                   'uint32_t', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3SixLowPanNetDevice_methods(root_module, cls):
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::SixLowPanNetDevice::SixLowPanNetDevice() [constructor]
+    cls.add_constructor([])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::AddLinkChangeCallback(ns3::Callback<void,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    cls.add_method('AddLinkChangeCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): int64_t ns3::SixLowPanNetDevice::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Address ns3::SixLowPanNetDevice::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Address ns3::SixLowPanNetDevice::GetBroadcast() const [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Ptr<ns3::Channel> ns3::SixLowPanNetDevice::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::Channel >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): uint32_t ns3::SixLowPanNetDevice::GetIfIndex() const [member function]
+    cls.add_method('GetIfIndex', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): uint16_t ns3::SixLowPanNetDevice::GetMtu() const [member function]
+    cls.add_method('GetMtu', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Address ns3::SixLowPanNetDevice::GetMulticast(ns3::Ipv4Address multicastGroup) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv4Address', 'multicastGroup')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Address ns3::SixLowPanNetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Ptr<ns3::NetDevice> ns3::SixLowPanNetDevice::GetNetDevice() const [member function]
+    cls.add_method('GetNetDevice', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [], 
+                   is_const=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): ns3::Ptr<ns3::Node> ns3::SixLowPanNetDevice::GetNode() const [member function]
+    cls.add_method('GetNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): static ns3::TypeId ns3::SixLowPanNetDevice::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsBridge() const [member function]
+    cls.add_method('IsBridge', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsLinkUp() const [member function]
+    cls.add_method('IsLinkUp', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::IsPointToPoint() const [member function]
+    cls.add_method('IsPointToPoint', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::NeedsArp() const [member function]
+    cls.add_method('NeedsArp', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('Send', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('SendFrom', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetIfIndex(uint32_t const index) [member function]
+    cls.add_method('SetIfIndex', 
+                   'void', 
+                   [param('uint32_t const', 'index')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::SetMtu(uint16_t const mtu) [member function]
+    cls.add_method('SetMtu', 
+                   'bool', 
+                   [param('uint16_t const', 'mtu')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetNetDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
+    cls.add_method('SetNetDevice', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetNode(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('SetNode', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetPromiscReceiveCallback(ns3::Callback<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> cb) [member function]
+    cls.add_method('SetPromiscReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< 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 >', 'cb')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::SetReceiveCallback(ns3::Callback<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> cb) [member function]
+    cls.add_method('SetReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< 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 >', 'cb')], 
+                   is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): bool ns3::SixLowPanNetDevice::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## sixlowpan-net-device.h (module 'sixlowpan'): void ns3::SixLowPanNetDevice::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3TimeValue_methods(root_module, cls):
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
+    cls.add_constructor([])
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::TimeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TimeValue const &', 'arg0')])
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::Time const & value) [constructor]
+    cls.add_constructor([param('ns3::Time const &', 'value')])
+    ## nstime.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::TimeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## nstime.h (module 'core'): bool ns3::TimeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## nstime.h (module 'core'): ns3::Time ns3::TimeValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): std::string ns3::TimeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## nstime.h (module 'core'): void ns3::TimeValue::Set(ns3::Time const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Time const &', 'value')])
+    return
+
+def register_Ns3TypeIdChecker_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker(ns3::TypeIdChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeIdChecker const &', 'arg0')])
+    return
+
+def register_Ns3TypeIdValue_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue(ns3::TypeIdValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeIdValue const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue(ns3::TypeId const & value) [constructor]
+    cls.add_constructor([param('ns3::TypeId const &', 'value')])
+    ## type-id.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::TypeIdValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## type-id.h (module 'core'): bool ns3::TypeIdValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeIdValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeIdValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## type-id.h (module 'core'): void ns3::TypeIdValue::Set(ns3::TypeId const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::TypeId const &', 'value')])
+    return
+
+def register_Ns3AddressChecker_methods(root_module, cls):
+    ## address.h (module 'network'): ns3::AddressChecker::AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::AddressChecker::AddressChecker(ns3::AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3AddressValue_methods(root_module, cls):
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue(ns3::AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AddressValue const &', 'arg0')])
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue(ns3::Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Address const &', 'value')])
+    ## address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## address.h (module 'network'): bool ns3::AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## address.h (module 'network'): ns3::Address ns3::AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Address', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): std::string ns3::AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## address.h (module 'network'): void ns3::AddressValue::Set(ns3::Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Address const &', 'value')])
+    return
+
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_functions(root_module):
+    module = root_module
+    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
+    return
+
+def register_functions_ns3_FatalImpl(module, root_module):
+    return
+
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
+def main():
+    out = FileCodeSink(sys.stdout)
+    root_module = module_init()
+    register_types(root_module)
+    register_methods(root_module)
+    register_functions(root_module)
+    root_module.generate(out)
+
+if __name__ == '__main__':
+    main()
+
diff -Naur ns-3.18.1/src/sixlowpan/doc/sixlowpan.rst ns-3.19/src/sixlowpan/doc/sixlowpan.rst
--- ns-3.18.1/src/sixlowpan/doc/sixlowpan.rst	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/doc/sixlowpan.rst	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,153 @@
+.. include:: replace.txt
+.. highlight:: cpp
+
+
+6LoWPAN: Transmission of IPv6 Packets over IEEE 802.15.4 Networks
+-----------------------------------------------------------------
+
+This chapter describes the implementation of |ns3| model for the
+compression of IPv6 packets over IEEE 802.15.4-Based Networks 
+as specified by :rfc:`4944` and :rfc:`6282`.
+
+Model Description
+*****************
+
+The source code for the sixlowpan module lives in the directory ``src/sixlowpan``.
+
+Design
+======
+
+The model design does not follow strictly the standard from an architectural 
+standpoint, as it does extend it beyond the original scope by supporting also
+other kinds of networks.
+
+Other than that, the module strictly follows :rfc:`4944` and :rfc:`6282`, with the 
+following exceptions:
+
+* MESH and LOWPAN_BC0 dispatch types are not supported
+* HC2 encoding is not supported
+* IPHC's SAC and DAC are not supported
+
+The MESH and LOWPAN_BC0 are not supported as they do apply only to mesh-under
+architecture, which is not one of the goals of the module development.
+
+The HC2 encoding is not supported, as it has been superseded by IPHC and NHC
+compression type (\ :rfc:`6282`).
+
+IPHC SAC and DAC are not yet supported, as they do require :rfc:`6775` for full 
+compliance. It is planned to support them in the future. 
+
+NetDevice
+#########
+
+The whole module is developed as a transparent NetDevice, which can act as a
+proxy between IPv6 and any NetDevice (the module has been successfully tested 
+with PointToPointNedevice, CsmaNetDevice and LrWpanNetDevice).
+
+For this reason, the module implements a virtual NetDevice, and all the calls are passed
+without modifications to the underlying NetDevice. The only important difference is in
+GetMtu behaviour. It will always return *at least* 1280 bytes, as is the minumum IPv6 MTU.
+
+The module does provide some attributes and some tracesources.
+The attributes are:
+
+* Rfc6282 (boolean, default true), used to activate HC1 (:rfc:`4944`) or IPHC (:rfc:`6282`) compression.
+* OmitUdpChecksum (boolean, default true), used to activate UDP checksum compression in IPHC.
+* FragmentReassemblyListSize (integer, default 0), indicating the number of packets that can be reassembled at the same time. If the limit is reached, the oldest packet is discarded. Zero means infinite.
+* FragmentExpirationTimeout (Time, default 60 seconds), being the timeout to wait for further fragments before discarding a partial packet.
+* ForceEtherType (boolean, default false), and
+* EtherType (unsigned 16 bits integer, default 0xFFFF), to force a particular L2 EtherType.
+
+The last two attributes are needed to use the module with a NetDevice other than 802.15.4, as
+neither IANA or IEEE did reserve an EtherType for 6LoWPAN. As a consequence there might be a
+conflict with the L2 multiplexer/demultiplexer which is based on EtherType. The default 
+value is 0xFFFF, which is reserved by IEEE (see [IANA802]_ and [Ethertype]_).
+The default module behaviour is to not change the EtherType, however this would not work with
+any NetDevice actually understanding and using the EtherType.
+
+Note that the `ForceEtherType` parameter have also a direct effect on the MAC address kind the
+module is expecting to handle:
+* ForceEtherType true: Mac48Address (Ethernet, WiFi, etc.).
+* ForceEtherType false: Mac16Address or Mac64Address (IEEE 802.15.4).
+
+Note that using 6LoWPAN over any NetDevice other than 802.15.4 will produce valid .pcap files,
+but they will not be correctly dissected by Wireshark.
+The reason lies on the fact that 6LoWPAN was really meant to be used only over 802.15.4, so
+Wireshark dissectors will not even try to decode 6LoWPAN headers on top of protocols other than
+802.15.4.
+
+The Trace sources are:
+
+* Tx - exposing packet (including 6LoWPAN header), SixLoWPanNetDevice Ptr, interface index.
+* Rx - exposing packet (including 6LoWPAN header), SixLoWPanNetDevice Ptr, interface index.
+* Drop - exposing DropReason, packet (including 6LoWPAN header), SixLoWPanNetDevice Ptr, interface index.
+
+The Tx and Rx traces are called as soon as a packet is received or sent. The Drop trace is
+invoked when a packet (or a fragment) is discarded.
+
+
+Scope and Limitations
+=====================
+
+Future versions of this module will support :rfc:`6775`, however no timeframe is guaranteed.
+
+Using 6LoWPAN with IPv4 (or other L3 protocols)
+###############################################
+
+As the name implies, 6LoWPAN can handle only IPv6 packets. Any other protocol will be discarded.
+Moreover, 6LoWPAN assumes that the network is uniform, as is all the devices connected by the
+same same channel are using 6LoWPAN. Mixed environments are not supported by the standard.
+The reason is simple: 802.15.4 frame doesn't have a "protocol" field. As a consequence,
+there is no demultiplexing at MAC layer and the protocol carried by L2 frames must be known
+in advance.
+
+In the |ns3| implementation it is possible, but not advisable, to violate this requirement
+if the underlying NetDevice is capable of discriminating different protocols. As an example,
+CsmaNetDevice can carry IPv4 and 6LoWPAN at the same time. However, this configuration has 
+not been tested.
+
+References
+==========
+
+.. [RFC4944] :rfc:`4944`, "Transmission of IPv6 Packets over IEEE 802.15.4 Networks"
+.. [RFC6282] :rfc:`6282`, "Compression Format for IPv6 Datagrams over IEEE 802.15.4-Based Networks"
+.. [RFC6775] :rfc:`6775`, "Neighbor Discovery Optimization for IPv6 over Low-Power Wireless Personal Area Networks (6LoWPANs)"
+.. [IANA802] IANA, assigned IEEE 802 numbers: http://www.iana.org/assignments/ieee-802-numbers/ieee-802-numbers.xml
+.. [Ethertype] IEEE Ethertype numbers: http://standards.ieee.org/develop/regauth/ethertype/eth.txt
+
+Usage
+*****
+
+Enabling sixlowpan
+==================
+
+Add ``sixlowpan`` to the list of modules built with |ns3|.
+
+Helper
+======
+
+The helper is patterned after other device helpers. 
+
+Examples
+========
+
+The following example can be found in ``src/sixlowpan/examples/``:
+
+* ``example-sixlowpan.cc``:  A simple example showing end-to-end data transfer.
+
+In particular, the example enables a very simplified end-to-end data
+transfer scenario, with a CSMA network forced to carry 6LoWPAN compressed packets.
+
+
+Tests
+=====
+
+The test provided checks the connection between two UDP clients and the correctness of the received packets.
+
+Validation
+**********
+
+The model has been validated against WireShark, checking whatever the packets are correctly
+interpreted and validated.
+
+
diff -Naur ns-3.18.1/src/sixlowpan/examples/example-sixlowpan.cc ns-3.19/src/sixlowpan/examples/example-sixlowpan.cc
--- ns-3.18.1/src/sixlowpan/examples/example-sixlowpan.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/examples/example-sixlowpan.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,139 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+
+// Network topology
+//
+//      n0                                      n1
+//  +---------+                             +--------+
+//  | UDP     |             r               | UDP    |
+//  +---------+    +---------+--------+     +--------+
+//  | IPv6    |    | IPv6    | IPv6   |     | IPv6   |
+//  +---------+    +---------+        |     |        |
+//  | 6LoWPAN |    | 6LoWPAN |        |     |        |
+//  +---------+    +---------+--------+     +--------+
+//  | CSMA    |    | CSMA    | CSMA   |     | CSMA   |
+//  +---------+    +---------+--------+     +--------+
+//       |              |        |               |
+//       ================        =================
+//
+// - Tracing of queues and packet receptions to file "example-sixlowpan.tr"
+// Note that the Pcap packet dissection will not be very meaningful.
+// See the module's documentation for a discussion about this.
+
+#include <fstream>
+#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/csma-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/ipv6-static-routing-helper.h"
+
+#include "ns3/ipv6-routing-table-entry.h"
+#include "ns3/sixlowpan-module.h"
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("ExampleSixlowpan")
+  ;
+
+int main (int argc, char** argv)
+{
+  bool verbose = false;
+
+  CommandLine cmd;
+  cmd.AddValue ("verbose", "turn on some relevant log components", verbose);
+  cmd.Parse (argc, argv);
+
+  if (verbose)
+    {
+      LogComponentEnable ("SixLowPanNetDevice", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
+    }
+
+  Packet::EnablePrinting ();
+  Packet::EnableChecking ();
+
+  NS_LOG_INFO ("Create nodes.");
+  Ptr<Node> n0 = CreateObject<Node> ();
+  Ptr<Node> r = CreateObject<Node> ();
+  Ptr<Node> n1 = CreateObject<Node> ();
+
+
+  NodeContainer net1 (n0, r);
+  NodeContainer net2 (r, n1);
+  NodeContainer all (n0, r, n1);
+
+  NS_LOG_INFO ("Create IPv6 Internet Stack");
+  InternetStackHelper internetv6;
+  internetv6.Install (all);
+
+  NS_LOG_INFO ("Create channels.");
+  CsmaHelper csma;
+  csma.SetChannelAttribute ("DataRate", DataRateValue (5000000));
+  csma.SetChannelAttribute ("Delay", TimeValue (MilliSeconds (2)));
+  NetDeviceContainer d2 = csma.Install (net2);
+  csma.SetDeviceAttribute ("Mtu", UintegerValue (150));
+  NetDeviceContainer d1 = csma.Install (net1);
+
+  SixLowPanHelper sixlowpan;
+  sixlowpan.SetDeviceAttribute ("ForceEtherType", BooleanValue (true) );
+  NetDeviceContainer six1 = sixlowpan.Install (d1);
+
+  NS_LOG_INFO ("Create networks and assign IPv6 Addresses.");
+  Ipv6AddressHelper ipv6;
+  ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
+  Ipv6InterfaceContainer i1 = ipv6.Assign (six1);
+  i1.SetForwarding (1, true);
+  i1.SetDefaultRouteInAllNodes (1);
+
+  ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
+  Ipv6InterfaceContainer i2 = ipv6.Assign (d2);
+  i2.SetForwarding (0, true);
+  i2.SetDefaultRouteInAllNodes (0);
+
+  /* Create a Ping6 application to send ICMPv6 echo request from n0 to n1 via r */
+  uint32_t packetSize = 200;
+  uint32_t maxPacketCount = 50;
+  Time interPacketInterval = Seconds (1.);
+  Ping6Helper ping6;
+
+  ping6.SetLocal (i1.GetAddress (0, 1));
+  ping6.SetRemote (i2.GetAddress (1, 1));
+
+  ping6.SetAttribute ("MaxPackets", UintegerValue (maxPacketCount));
+  ping6.SetAttribute ("Interval", TimeValue (interPacketInterval));
+  ping6.SetAttribute ("PacketSize", UintegerValue (packetSize));
+  ApplicationContainer apps = ping6.Install (net1.Get (0));
+
+  apps.Start (Seconds (5.0));
+  apps.Stop (Seconds (15.0));
+
+
+  AsciiTraceHelper ascii;
+  csma.EnableAsciiAll (ascii.CreateFileStream ("example-sixlowpan.tr"));
+  csma.EnablePcapAll (std::string ("example-sixlowpan"), true);
+
+  Simulator::Stop (Seconds (100));
+  NS_LOG_INFO ("Run Simulation.");
+  Simulator::Run ();
+  Simulator::Destroy ();
+  NS_LOG_INFO ("Done.");
+}
+
diff -Naur ns-3.18.1/src/sixlowpan/examples/wscript ns-3.19/src/sixlowpan/examples/wscript
--- ns-3.18.1/src/sixlowpan/examples/wscript	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/examples/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,9 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+    if not bld.env['ENABLE_EXAMPLES']:
+        return;
+
+    obj = bld.create_ns3_program('example-sixlowpan',
+                                 ['network', 'sixlowpan', 'internet', 'csma'])
+    obj.source = 'example-sixlowpan.cc'
diff -Naur ns-3.18.1/src/sixlowpan/helper/sixlowpan-helper.cc ns-3.19/src/sixlowpan/helper/sixlowpan-helper.cc
--- ns-3.18.1/src/sixlowpan/helper/sixlowpan-helper.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/helper/sixlowpan-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,83 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#include "sixlowpan-helper.h"
+#include "ns3/log.h"
+#include "ns3/sixlowpan-net-device.h"
+#include "ns3/node.h"
+#include "ns3/names.h"
+
+NS_LOG_COMPONENT_DEFINE ("SixLowPanHelper")
+  ;
+
+namespace ns3 {
+
+SixLowPanHelper::SixLowPanHelper ()
+{
+  NS_LOG_FUNCTION (this);
+  m_deviceFactory.SetTypeId ("ns3::SixLowPanNetDevice");
+}
+
+void SixLowPanHelper::SetDeviceAttribute (std::string n1,
+                                          const AttributeValue &v1)
+{
+  NS_LOG_FUNCTION (this);
+  m_deviceFactory.Set (n1, v1);
+}
+
+NetDeviceContainer SixLowPanHelper::Install (const NetDeviceContainer c)
+{
+  NS_LOG_FUNCTION (this);
+
+  NetDeviceContainer devs;
+
+  for (uint32_t i = 0; i < c.GetN (); ++i)
+    {
+      Ptr<NetDevice> device = c.Get (i);
+      NS_ASSERT_MSG (device != 0, "No NetDevice found in the node " << int(i) );
+
+      Ptr<Node> node = device->GetNode ();
+      NS_LOG_LOGIC ("**** Install 6LoWPAN on node " << node->GetId ());
+
+      Ptr<SixLowPanNetDevice> dev = m_deviceFactory.Create<SixLowPanNetDevice> ();
+      devs.Add (dev);
+      node->AddDevice (dev);
+      dev->SetNetDevice (device);
+    }
+  return devs;
+}
+
+int64_t SixLowPanHelper::AssignStreams (NetDeviceContainer c, int64_t stream)
+{
+  int64_t currentStream = stream;
+  Ptr<NetDevice> netDevice;
+  for (NetDeviceContainer::Iterator i = c.Begin (); i != c.End (); ++i)
+    {
+      netDevice = (*i);
+      Ptr<SixLowPanNetDevice> dev = DynamicCast<SixLowPanNetDevice> (netDevice);
+      if (dev)
+        {
+          currentStream += dev->AssignStreams (currentStream);
+        }
+    }
+  return (currentStream - stream);
+}
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/sixlowpan/helper/sixlowpan-helper.h ns-3.19/src/sixlowpan/helper/sixlowpan-helper.h
--- ns-3.18.1/src/sixlowpan/helper/sixlowpan-helper.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/helper/sixlowpan-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,102 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#ifndef SIXLOWPAN_HELPER_H
+#define SIXLOWPAN_HELPER_H
+
+#include "ns3/net-device-container.h"
+#include "ns3/object-factory.h"
+#include <string>
+
+namespace ns3 {
+
+class Node;
+class AttributeValue;
+
+/**
+ * \ingroup sixlowpan
+ *
+ * \brief Setup a sixlowpan stack to be used as a shim between IPv6 and a generic NetDevice.
+ */
+class SixLowPanHelper
+{
+public:
+  /*
+   * Construct a SixlowpanHelper
+   */
+  SixLowPanHelper ();
+  /**
+   * Set an attribute on each ns3::SixlowpanNetDevice created by
+   * SixlowpanHelper::Install.
+   *
+   * \param n1 the name of the attribute to set
+   * \param v1 the value of the attribute to set
+   */
+  void SetDeviceAttribute (std::string n1,
+                           const AttributeValue &v1);
+
+  /**
+   * \brief Install the SixLoWPAN stack on top of an existing NetDevice.
+   *
+   * This function requires a set of properly configured NetDevices
+   * passed in as the parameter "c". The new NetDevices will have to
+   * be used instead of the original ones. In this way these
+   * SixLoWPAN devices will behave as shims between the NetDevices
+   * passed in and IPv6.
+   *
+   * Note that only IPv6 (and related protocols, such as ICMPv6) can
+   * be transmitted over a 6LoWPAN interface.
+   * Any other protocol (e.g., IPv4) will be discarded by 6LoWPAN.
+   *
+   * Other protocols (e.g., IPv4) could be used on the original NetDevices
+   * with some limitations.
+   * See the manual for a complete discussion.
+   *
+   * \note IPv6 stack must be installed \a after SixLoWPAN,
+   * using the SixLoWPAN NetDevices. See the example in the
+   * examples directory.
+   *
+   *
+   * \param c the NetDevice container
+   * \return a container with the newly created SixLowPanNetDevices
+   */
+  NetDeviceContainer Install (NetDeviceContainer c);
+
+  /**
+  * Assign a fixed random variable stream number to the random variables
+  * used by this model. Return the number of streams (possibly zero) that
+  * have been assigned. The Install() method should have previously been
+  * called by the user.
+  *
+  * \param c NetDeviceContainer of the set of net devices for which the
+  *          SixLowPanNetDevice should be modified to use a fixed stream
+  * \param stream first stream index to use
+  * \return the number of stream indices assigned by this helper
+  */
+  int64_t AssignStreams (NetDeviceContainer c, int64_t stream);
+
+private:
+  ObjectFactory m_deviceFactory; //!< Object factory
+};
+
+} // namespace ns3
+
+
+#endif /* SIXLOWPAN_HELPER_H */
diff -Naur ns-3.18.1/src/sixlowpan/model/sixlowpan-header.cc ns-3.19/src/sixlowpan/model/sixlowpan-header.cc
--- ns-3.18.1/src/sixlowpan/model/sixlowpan-header.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/model/sixlowpan-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,1747 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ *         Michele Muccio <michelemuccio@virgilio.it>
+ */
+
+#include "ns3/assert.h"
+#include "ns3/log.h"
+#include "ns3/abort.h"
+#include "ns3/address-utils.h"
+#include "sixlowpan-header.h"
+
+
+namespace ns3 {
+
+/*
+ * SixLowPanDispatch
+ */
+
+
+SixLowPanDispatch::SixLowPanDispatch ()
+{
+}
+
+
+SixLowPanDispatch::Dispatch_e
+SixLowPanDispatch::GetDispatchType (uint8_t dispatch)
+{
+  if (dispatch <= LOWPAN_NALP_N)
+    {
+      return LOWPAN_NALP;
+    }
+  else if (dispatch == LOWPAN_NOTCOMPRESSED)
+    {
+      return LOWPAN_NOTCOMPRESSED;
+    }
+  else if (dispatch == LOWPAN_HC1)
+    {
+      return LOWPAN_HC1;
+    }
+  else if (dispatch == LOWPAN_BC0)
+    {
+      return LOWPAN_BC0;
+    }
+  else if ((dispatch >= LOWPAN_IPHC) && (dispatch <= LOWPAN_IPHC_N))
+    {
+      return LOWPAN_IPHC;
+    }
+  else if ((dispatch >= LOWPAN_MESH) && (dispatch <= LOWPAN_MESH_N))
+    {
+      return LOWPAN_MESH;
+    }
+  else if ((dispatch >= LOWPAN_FRAG1) && (dispatch <= LOWPAN_FRAG1_N))
+    {
+      return LOWPAN_FRAG1;
+    }
+  else if ((dispatch >= LOWPAN_FRAGN) && (dispatch <= LOWPAN_FRAGN_N))
+    {
+      return LOWPAN_FRAGN;
+    }
+  return LOWPAN_UNSUPPORTED;
+}
+
+SixLowPanDispatch::NhcDispatch_e
+SixLowPanDispatch::GetNhcDispatchType (uint8_t dispatch)
+{
+  if ((dispatch >= LOWPAN_NHC) && (dispatch <= LOWPAN_NHC_N))
+    {
+      return LOWPAN_NHC;
+    }
+  else if ((dispatch >= LOWPAN_UDPNHC) && (dispatch <= LOWPAN_UDPNHC_N))
+    {
+      return LOWPAN_UDPNHC;
+    }
+  return LOWPAN_NHCUNSUPPORTED;
+}
+
+
+/*
+ * SixLowPanHc1
+ */
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanHc1)
+  ;
+
+SixLowPanHc1::SixLowPanHc1 ()
+  : m_hopLimit (0)
+{
+}
+
+TypeId SixLowPanHc1::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::SixLowPanHc1").SetParent<Header> ().AddConstructor<SixLowPanHc1> ();
+  return tid;
+}
+
+TypeId SixLowPanHc1::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
+
+void SixLowPanHc1::Print (std::ostream & os) const
+{
+  uint8_t encoding;
+  encoding = m_srcCompression;
+  encoding <<= 2;
+  encoding |= m_dstCompression;
+  encoding <<= 1;
+  encoding |= m_tcflCompression;
+  encoding <<= 2;
+  encoding |= m_nextHeaderCompression;
+  encoding <<= 1;
+  encoding |= m_hc2HeaderPresent;
+
+  os << "encoding " << int(encoding) << ", hopLimit " << int(m_hopLimit);
+}
+
+uint32_t SixLowPanHc1::GetSerializedSize () const
+{
+  uint32_t serializedSize = 3;
+
+  switch (m_srcCompression)
+    {
+    case HC1_PIII:
+      serializedSize += 16;
+      break;
+    case HC1_PIIC:
+      serializedSize += 8;
+      break;
+    case HC1_PCII:
+      serializedSize += 8;
+      break;
+    case HC1_PCIC:
+      break;
+    }
+  switch (m_dstCompression)
+    {
+    case HC1_PIII:
+      serializedSize += 16;
+      break;
+    case HC1_PIIC:
+      serializedSize += 8;
+      break;
+    case HC1_PCII:
+      serializedSize += 8;
+      break;
+    case HC1_PCIC:
+      break;
+    }
+
+  if (m_tcflCompression == false )
+    {
+      serializedSize += 4;
+    }
+
+  if (m_nextHeaderCompression == HC1_NC )
+    {
+      serializedSize++;
+    }
+
+  return serializedSize;
+}
+
+void SixLowPanHc1::Serialize (Buffer::Iterator start) const
+{
+  Buffer::Iterator i = start;
+  uint8_t encoding;
+  encoding = m_srcCompression;
+  encoding <<= 2;
+  encoding |= m_dstCompression;
+  encoding <<= 1;
+  encoding |= m_tcflCompression;
+  encoding <<= 2;
+  encoding |= m_nextHeaderCompression;
+  encoding <<= 1;
+  encoding |= m_hc2HeaderPresent;
+
+  i.WriteU8 (SixLowPanDispatch::LOWPAN_HC1);
+  i.WriteU8 (encoding);
+  i.WriteU8 (m_hopLimit);
+  switch (m_srcCompression)
+    {
+    case HC1_PIII:
+      for ( int j = 0; j < 8; j++ )
+        {
+          i.WriteU8 (m_srcPrefix[j]);
+        }
+      for ( int j = 0; j < 8; j++ )
+        {
+          i.WriteU8 (m_srcInterface[j]);
+        }
+      break;
+    case HC1_PIIC:
+      for ( int j = 0; j < 8; j++ )
+        {
+          i.WriteU8 (m_srcPrefix[j]);
+        }
+      break;
+    case HC1_PCII:
+      for ( int j = 0; j < 8; j++ )
+        {
+          i.WriteU8 (m_srcInterface[j]);
+        }
+      break;
+    case HC1_PCIC:
+      break;
+    }
+  switch (m_dstCompression)
+    {
+    case HC1_PIII:
+      for ( int j = 0; j < 8; j++ )
+        {
+          i.WriteU8 (m_dstPrefix[j]);
+        }
+      for ( int j = 0; j < 8; j++ )
+        {
+          i.WriteU8 (m_dstInterface[j]);
+        }
+      break;
+    case HC1_PIIC:
+      for ( int j = 0; j < 8; j++ )
+        {
+          i.WriteU8 (m_dstPrefix[j]);
+        }
+      break;
+    case HC1_PCII:
+      for ( int j = 0; j < 8; j++ )
+        {
+          i.WriteU8 (m_dstInterface[j]);
+        }
+      break;
+    case HC1_PCIC:
+      break;
+    }
+
+  if ( m_tcflCompression == false )
+    {
+      i.WriteU8 (m_trafficClass);
+      uint8_t temp[3];
+      temp[0] = uint8_t (m_flowLabel & 0xff);
+      temp[1] = uint8_t ((m_flowLabel >> 8) & 0xff);
+      temp[2] = uint8_t ((m_flowLabel >> 16) & 0xff);
+      i.Write (temp, 3);
+    }
+
+  if (m_nextHeaderCompression == HC1_NC )
+    {
+      i.WriteU8 (m_nextHeader);
+    }
+
+  // TODO: HC2 is not yet supported. Should be.
+  NS_ASSERT_MSG ( m_hc2HeaderPresent != true, "Can not compress HC2, exiting. Very sorry." );
+}
+
+uint32_t SixLowPanHc1::Deserialize (Buffer::Iterator start)
+{
+  Buffer::Iterator i = start;
+  uint32_t serializedSize = 3;
+
+  uint8_t dispatch = i.ReadU8 ();
+  if (dispatch != SixLowPanDispatch::LOWPAN_HC1)
+    {
+      return 0;
+    }
+
+  uint8_t encoding = i.ReadU8 ();
+  m_hopLimit = i.ReadU8 ();
+
+  m_srcCompression = LowPanHc1Addr_e (encoding >> 6);
+  m_dstCompression = LowPanHc1Addr_e ( (encoding >> 4) & 0x3);
+  m_tcflCompression = (encoding >> 3) & 0x1;
+  m_nextHeaderCompression = LowPanHc1NextHeader_e ( (encoding >> 1) & 0x3);
+  m_hc2HeaderPresent = encoding & 0x1;
+
+  switch (m_srcCompression)
+    {
+    case HC1_PIII:
+      for ( int j = 0; j < 8; j++)
+        {
+          m_srcPrefix[j] = i.ReadU8 ();
+        }
+      for ( int j = 0; j < 8; j++)
+        {
+          m_srcInterface[j] = i.ReadU8 ();
+        }
+      serializedSize += 16;
+      break;
+    case HC1_PIIC:
+      for ( int j = 0; j < 8; j++)
+        {
+          m_srcPrefix[j] = i.ReadU8 ();
+        }
+      serializedSize += 8;
+      break;
+    case HC1_PCII:
+      for ( int j = 0; j < 8; j++)
+        {
+          m_srcInterface[j] = i.ReadU8 ();
+        }
+      serializedSize += 8;
+      break;
+    case HC1_PCIC:
+      break;
+    }
+  switch (m_dstCompression)
+    {
+    case HC1_PIII:
+      for ( int j = 0; j < 8; j++)
+        {
+          m_dstPrefix[j] = i.ReadU8 ();
+        }
+      for ( int j = 0; j < 8; j++)
+        {
+          m_dstInterface[j] = i.ReadU8 ();
+        }
+      serializedSize += 16;
+      break;
+    case HC1_PIIC:
+      for ( int j = 0; j < 8; j++)
+        {
+          m_dstPrefix[j] = i.ReadU8 ();
+        }
+      serializedSize += 8;
+      break;
+    case HC1_PCII:
+      for ( int j = 0; j < 8; j++)
+        {
+          m_dstInterface[j] = i.ReadU8 ();
+        }
+      serializedSize += 8;
+      break;
+    case HC1_PCIC:
+      break;
+    }
+
+  if ( m_tcflCompression == false )
+    {
+      m_trafficClass = i.ReadU8 ();
+      uint8_t temp[3];
+      i.Read (temp, 3);
+      m_flowLabel = temp[2];
+      m_flowLabel = (m_flowLabel << 8) | temp[1];
+      m_flowLabel = (m_flowLabel << 8) | temp[0];
+      serializedSize += 4;
+    }
+
+  switch ( m_nextHeaderCompression )
+    {
+    case HC1_NC:
+      m_nextHeader = i.ReadU8 ();
+      serializedSize++;
+      break;
+    case HC1_TCP:
+      m_nextHeader = Ipv6Header::IPV6_TCP;
+      break;
+    case HC1_UDP:
+      m_nextHeader = Ipv6Header::IPV6_UDP;
+      break;
+    case HC1_ICMP:
+      m_nextHeader = Ipv6Header::IPV6_ICMPV6;
+      break;
+    }
+
+  NS_ASSERT_MSG ( m_hc2HeaderPresent != true, "Can not compress HC2, exiting. Very sorry." );
+
+  return GetSerializedSize ();
+}
+
+void SixLowPanHc1::SetHopLimit (uint8_t limit)
+{
+  m_hopLimit = limit;
+}
+
+uint8_t SixLowPanHc1::GetHopLimit () const
+{
+  return m_hopLimit;
+}
+
+SixLowPanHc1::LowPanHc1Addr_e SixLowPanHc1::GetDstCompression () const
+{
+  return m_dstCompression;
+}
+
+const uint8_t* SixLowPanHc1::GetDstInterface () const
+{
+  return m_dstInterface;
+}
+
+const uint8_t* SixLowPanHc1::GetDstPrefix () const
+{
+  return m_dstPrefix;
+}
+
+uint32_t SixLowPanHc1::GetFlowLabel () const
+{
+  return m_flowLabel;
+}
+
+uint8_t SixLowPanHc1::GetNextHeader () const
+{
+  return m_nextHeader;
+}
+
+SixLowPanHc1::LowPanHc1Addr_e SixLowPanHc1::GetSrcCompression () const
+{
+  return m_srcCompression;
+}
+
+const uint8_t* SixLowPanHc1::GetSrcInterface () const
+{
+  return m_srcInterface;
+}
+
+const uint8_t* SixLowPanHc1::GetSrcPrefix () const
+{
+  return m_srcPrefix;
+}
+
+uint8_t SixLowPanHc1::GetTrafficClass () const
+{
+  return m_trafficClass;
+}
+
+bool SixLowPanHc1::IsTcflCompression () const
+{
+  return m_tcflCompression;
+}
+
+bool SixLowPanHc1::IsHc2HeaderPresent () const
+{
+  return m_hc2HeaderPresent;
+}
+
+void SixLowPanHc1::SetDstCompression (LowPanHc1Addr_e dstCompression)
+{
+  m_dstCompression = dstCompression;
+}
+
+void SixLowPanHc1::SetDstInterface (const uint8_t* dstInterface)
+{
+  for ( int i = 0; i < 8; i++)
+    {
+      m_dstInterface[i] = dstInterface[i];
+    }
+}
+
+void SixLowPanHc1::SetDstPrefix (const uint8_t* dstPrefix)
+{
+  for ( int i = 0; i < 8; i++)
+    {
+      m_dstPrefix[i] = dstPrefix[i];
+    }
+}
+
+void SixLowPanHc1::SetFlowLabel (uint32_t flowLabel)
+{
+  m_flowLabel = flowLabel;
+}
+
+void SixLowPanHc1::SetNextHeader (uint8_t nextHeader)
+{
+  m_nextHeader = nextHeader;
+
+  switch (m_nextHeader)
+    {
+    case Ipv6Header::IPV6_UDP:
+      m_nextHeaderCompression = HC1_UDP;
+      break;
+    case Ipv6Header::IPV6_TCP:
+      m_nextHeaderCompression = HC1_TCP;
+      break;
+    case Ipv6Header::IPV6_ICMPV6:
+      m_nextHeaderCompression = HC1_ICMP;
+      break;
+    default:
+      m_nextHeaderCompression = HC1_NC;
+      break;
+    }
+}
+
+void SixLowPanHc1::SetSrcCompression (LowPanHc1Addr_e srcCompression)
+{
+  m_srcCompression = srcCompression;
+}
+
+void SixLowPanHc1::SetSrcInterface (const uint8_t* srcInterface)
+{
+  for ( int i = 0; i < 8; i++)
+    {
+      m_srcInterface[i] = srcInterface[i];
+    }
+}
+
+void SixLowPanHc1::SetSrcPrefix (const uint8_t* srcPrefix)
+{
+  for ( int i = 0; i < 8; i++)
+    {
+      m_srcPrefix[i] = srcPrefix[i];
+    }
+}
+
+void SixLowPanHc1::SetTcflCompression (bool tcflCompression)
+{
+  m_tcflCompression = tcflCompression;
+}
+
+void SixLowPanHc1::SetTrafficClass (uint8_t trafficClass)
+{
+  m_trafficClass = trafficClass;
+}
+
+
+void SixLowPanHc1::SetHc2HeaderPresent (bool hc2HeaderPresent)
+{
+  m_hc2HeaderPresent = hc2HeaderPresent;
+}
+
+
+std::ostream & operator << (std::ostream & os, const SixLowPanHc1 & h)
+{
+  h.Print (os);
+  return os;
+}
+
+/*
+ * SixLowPanFrag1
+ */
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanFrag1)
+  ;
+
+SixLowPanFrag1::SixLowPanFrag1 ()
+  : m_datagramSize (0),
+    m_datagramTag (0)
+{
+}
+
+TypeId SixLowPanFrag1::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::SixLowPanFrag1").SetParent<Header> ().AddConstructor<SixLowPanFrag1> ();
+  return tid;
+}
+
+TypeId SixLowPanFrag1::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
+
+void SixLowPanFrag1::Print (std::ostream & os) const
+{
+  os << "datagram size " << m_datagramSize << " tag " << m_datagramTag;
+}
+
+uint32_t SixLowPanFrag1::GetSerializedSize () const
+{
+  return 4;
+}
+
+void SixLowPanFrag1::Serialize (Buffer::Iterator start) const
+{
+  Buffer::Iterator i = start;
+
+  uint16_t temp = m_datagramSize | ( uint16_t (SixLowPanDispatch::LOWPAN_FRAG1) << 8 );
+
+  i.WriteU8 (uint8_t (temp >> 8));
+  i.WriteU8 (uint8_t (temp & 0xff));
+
+  i.WriteU16 (m_datagramTag);
+}
+
+uint32_t SixLowPanFrag1::Deserialize (Buffer::Iterator start)
+{
+  Buffer::Iterator i = start;
+
+  uint8_t temp = i.ReadU8 ();
+  m_datagramSize = (uint16_t (temp) << 8) | i.ReadU8 ();
+  m_datagramSize &= 0x7FF;
+
+  m_datagramTag = i.ReadU16 ();
+  return GetSerializedSize ();
+}
+
+void SixLowPanFrag1::SetDatagramSize (uint16_t datagramSize)
+{
+  m_datagramSize = datagramSize & 0x7FF;
+}
+
+uint16_t SixLowPanFrag1::GetDatagramSize () const
+{
+  return m_datagramSize & 0x7FF;
+}
+
+void SixLowPanFrag1::SetDatagramTag (uint16_t datagramTag)
+{
+  m_datagramTag = datagramTag;
+}
+
+uint16_t SixLowPanFrag1::GetDatagramTag () const
+{
+  return m_datagramTag;
+}
+
+std::ostream & operator << (std::ostream & os, const SixLowPanFrag1 & h)
+{
+  h.Print (os);
+  return os;
+}
+
+
+/*
+ * SixLowPanFragN
+ */
+
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanFragN)
+  ;
+
+SixLowPanFragN::SixLowPanFragN ()
+  : m_datagramSize (0),
+    m_datagramTag (0),
+    m_datagramOffset (0)
+{
+}
+/*
+ * SixLowPanFragmentOffset
+ */
+TypeId SixLowPanFragN::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::SixLowPanFragN").SetParent<Header> ().AddConstructor<SixLowPanFragN> ();
+  return tid;
+}
+
+TypeId SixLowPanFragN::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
+
+void SixLowPanFragN::Print (std::ostream & os) const
+{
+  os << "datagram size " << m_datagramSize << " tag " << m_datagramTag << " offset " << int(m_datagramOffset);
+}
+
+uint32_t SixLowPanFragN::GetSerializedSize () const
+{
+  return 5;
+}
+
+void SixLowPanFragN::Serialize (Buffer::Iterator start) const
+{
+  Buffer::Iterator i = start;
+
+  uint16_t temp = m_datagramSize | ( uint16_t (SixLowPanDispatch::LOWPAN_FRAGN) << 8 );
+
+  i.WriteU8 (uint8_t (temp >> 8));
+  i.WriteU8 (uint8_t (temp & 0xff));
+
+  i.WriteU16 (m_datagramTag);
+  i.WriteU8 (m_datagramOffset);
+}
+
+uint32_t SixLowPanFragN::Deserialize (Buffer::Iterator start)
+{
+  Buffer::Iterator i = start;
+
+  uint8_t temp = i.ReadU8 ();
+  m_datagramSize = (uint16_t (temp) << 8) | i.ReadU8 ();
+  m_datagramSize &= 0x7FF;
+
+  m_datagramTag = i.ReadU16 ();
+  m_datagramOffset = i.ReadU8 ();
+
+  return GetSerializedSize ();
+}
+
+void SixLowPanFragN::SetDatagramSize (uint16_t datagramSize)
+{
+  m_datagramSize = datagramSize & 0x7FF;
+}
+
+uint16_t SixLowPanFragN::GetDatagramSize () const
+{
+  return m_datagramSize & 0x7FF;
+}
+
+void SixLowPanFragN::SetDatagramTag (uint16_t datagramTag)
+{
+  m_datagramTag = datagramTag;
+}
+
+uint16_t SixLowPanFragN::GetDatagramTag () const
+{
+  return m_datagramTag;
+}
+
+void SixLowPanFragN::SetDatagramOffset (uint8_t datagramOffset)
+{
+  m_datagramOffset = datagramOffset;
+}
+
+uint8_t SixLowPanFragN::GetDatagramOffset () const
+{
+  return m_datagramOffset;
+}
+
+std::ostream & operator << (std::ostream & os, const SixLowPanFragN & h)
+{
+  h.Print (os);
+  return os;
+}
+
+/*
+ * SixLowPanIphcHeader
+ */
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanIphc)
+  ;
+
+SixLowPanIphc::SixLowPanIphc ()
+{
+  // 011x xxxx xxxx xxxx
+  m_baseFormat = 0x6000;
+}
+
+SixLowPanIphc::SixLowPanIphc (uint8_t dispatch)
+{
+  // 011x xxxx xxxx xxxx
+  m_baseFormat = dispatch;
+  m_baseFormat <<= 8;
+}
+
+TypeId SixLowPanIphc::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::SixLowPanIphc").SetParent<Header> ().AddConstructor<SixLowPanIphc> ();
+  return tid;
+}
+
+TypeId SixLowPanIphc::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
+
+void SixLowPanIphc::Print (std::ostream & os) const
+{
+  os << "Compression kind: " << m_baseFormat;
+}
+
+uint32_t SixLowPanIphc::GetSerializedSize () const
+{
+  uint32_t serializedSize = 2;
+
+  if ( GetCid () )
+    {
+      serializedSize++;
+    }
+  switch ( GetTf () )
+    {
+    case TF_FULL:
+      serializedSize += 4;
+      break;
+    case TF_DSCP_ELIDED:
+      serializedSize += 3;
+      break;
+    case TF_FL_ELIDED:
+      serializedSize++;
+      break;
+    default:
+      break;
+    }
+  if ( GetNh () == false )
+    {
+      serializedSize++;
+    }
+  if ( GetHlim () == HLIM_INLINE)
+    {
+      serializedSize++;
+    }
+  switch (GetSam () )
+    {
+    case HC_INLINE:
+      if ( GetSac () == false )
+        {
+          serializedSize += 16;
+        }
+      break;
+    case HC_COMPR_64:
+      serializedSize += 8;
+      break;
+    case HC_COMPR_16:
+      serializedSize += 2;
+      break;
+    case HC_COMPR_0:
+    default:
+      break;
+    }
+  if ( GetM () == false)
+    {
+      switch (GetDam () )
+        {
+        case HC_INLINE:
+          if ( GetDac () == false )
+            {
+              serializedSize += 16;
+            }
+          break;
+        case HC_COMPR_64:
+          serializedSize += 8;
+          break;
+        case HC_COMPR_16:
+          serializedSize += 2;
+          break;
+        case HC_COMPR_0:
+        default:
+          break;
+        }
+    }
+  else
+    {
+      switch (GetDam () )
+        {
+        case HC_INLINE:
+          if ( GetDac () == false )
+            {
+              serializedSize += 16;
+            }
+          else
+            {
+              serializedSize += 6;
+            }
+          break;
+        case HC_COMPR_64:
+          if ( GetDac () == false )
+            {
+              serializedSize += 6;
+            }
+          break;
+        case HC_COMPR_16:
+          if ( GetDac () == false )
+            {
+              serializedSize += 4;
+            }
+          break;
+        case HC_COMPR_0:
+        default:
+          if ( GetDac () == false )
+            {
+              serializedSize++;
+            }
+          break;
+        }
+    }
+
+
+
+  return serializedSize;
+}
+
+void SixLowPanIphc::Serialize (Buffer::Iterator start) const
+{
+  Buffer::Iterator i = start;
+
+  i.WriteHtonU16 (m_baseFormat);
+
+  if ( GetCid () )
+    {
+      i.WriteU8 (m_srcdstContextId);
+    }
+  // Traffic Class and Flow Label
+  switch ( GetTf () )
+    {
+      uint8_t temp;
+    case TF_FULL:
+      temp = (m_ecn << 6) | m_dscp;
+      i.WriteU8 (temp);
+      temp = m_flowLabel >> 16;
+      i.WriteU8 (temp);
+      temp = (m_flowLabel >> 8) & 0xff;
+      i.WriteU8 (temp);
+      temp = m_flowLabel & 0xff;
+      i.WriteU8 (temp);
+      break;
+    case TF_DSCP_ELIDED:
+      temp = (m_ecn << 6) | (m_flowLabel >> 16 );
+      i.WriteU8 (temp);
+      temp = (m_flowLabel >> 8) & 0xff;
+      i.WriteU8 (temp);
+      temp = m_flowLabel & 0xff;
+      i.WriteU8 (temp);
+      break;
+    case TF_FL_ELIDED:
+      temp = (m_ecn << 6) | m_dscp;
+      i.WriteU8 (temp);
+      break;
+    default:
+      break;
+    }
+  // Next Header
+  if ( GetNh () == false )
+    {
+      i.WriteU8 (m_nextHeader);
+    }
+  // Hop Limit
+  if ( GetHlim () == HLIM_INLINE )
+    {
+      i.WriteU8 (m_hopLimit);
+    }
+  // Source Address
+  switch (GetSam () )
+    {
+      uint8_t temp[16];
+    case HC_INLINE:
+      if ( GetSac () == false )
+        {
+          uint8_t temp[16];
+          m_srcAddress.Serialize (temp);
+          i.Write (temp, 16);
+        }
+      break;
+    case HC_COMPR_64:
+      m_srcAddress.Serialize (temp);
+      i.Write (temp + 8, 8);
+      break;
+    case HC_COMPR_16:
+      m_srcAddress.Serialize (temp);
+      i.Write (temp + 14, 2);
+      break;
+    case HC_COMPR_0:
+    default:
+      break;
+    }
+  // Destination Address
+  if ( GetM () == false)
+    {
+      uint8_t temp[16];
+      switch (GetDam () )
+        {
+        case HC_INLINE:
+          if ( GetDac () == false )
+            {
+              m_dstAddress.Serialize (temp);
+              i.Write (temp, 16);
+            }
+          break;
+        case HC_COMPR_64:
+          m_dstAddress.Serialize (temp);
+          i.Write (temp + 8, 8);
+          break;
+        case HC_COMPR_16:
+          m_dstAddress.Serialize (temp);
+          i.Write (temp + 14, 2);
+          break;
+        case HC_COMPR_0:
+        default:
+          break;
+        }
+    }
+  else
+    {
+      switch (GetDam () )
+        {
+          uint8_t temp[16];
+        case HC_INLINE:
+          if ( GetDac () == false )
+            {
+              m_dstAddress.Serialize (temp);
+              i.Write (temp, 16);
+            }
+          else
+            {
+              m_dstAddress.Serialize (temp);
+              i.Write (temp + 1, 2);
+              i.Write (temp + 12, 4);
+            }
+          break;
+        case HC_COMPR_64:
+          if ( GetDac () == false )
+            {
+              m_dstAddress.Serialize (temp);
+              i.Write (temp + 1, 1);
+              i.Write (temp + 11, 5);
+            }
+          break;
+        case HC_COMPR_16:
+          if ( GetDac () == false )
+            {
+              m_dstAddress.Serialize (temp);
+              i.Write (temp + 1, 1);
+              i.Write (temp + 13, 3);
+            }
+          break;
+        case HC_COMPR_0:
+        default:
+          if ( GetDac () == false )
+            {
+              m_dstAddress.Serialize (temp);
+              i.WriteU8 (temp[15]);
+            }
+          break;
+        }
+    }
+}
+
+uint32_t SixLowPanIphc::Deserialize (Buffer::Iterator start)
+{
+  Buffer::Iterator i = start;
+
+  m_baseFormat = i.ReadNtohU16 ();
+
+  if ( GetCid () )
+    {
+      m_srcdstContextId = i.ReadU8 ();
+    }
+  // Traffic Class and Flow Label
+  switch ( GetTf () )
+    {
+      uint8_t temp;
+    case TF_FULL:
+      temp = i.ReadU8 ();
+      m_ecn = temp >> 6;
+      m_dscp = temp & 0x3F;
+      temp = i.ReadU8 ();
+      m_flowLabel = temp;
+      temp = i.ReadU8 ();
+      m_flowLabel = (m_flowLabel << 8) | temp;
+      temp = i.ReadU8 ();
+      m_flowLabel = (m_flowLabel << 8) | temp;
+      break;
+    case TF_DSCP_ELIDED:
+      temp = i.ReadU8 ();
+      m_ecn = temp >> 6;
+      m_flowLabel = temp & 0x3F;
+      temp = i.ReadU8 ();
+      m_flowLabel = (m_flowLabel << 8) | temp;
+      temp = i.ReadU8 ();
+      m_flowLabel = (m_flowLabel << 8) | temp;
+      break;
+    case TF_FL_ELIDED:
+      temp = i.ReadU8 ();
+      m_ecn = temp >> 6;
+      m_dscp = temp & 0x3F;
+      break;
+    default:
+      break;
+    }
+  // Next Header
+  if ( GetNh () == false )
+    {
+      m_nextHeader = i.ReadU8 ();
+    }
+  // Hop Limit
+  switch ( GetHlim () )
+    {
+    case HLIM_INLINE:
+      m_hopLimit = i.ReadU8 ();
+      break;
+    case HLIM_COMPR_1:
+      m_hopLimit = 1;
+      break;
+    case HLIM_COMPR_64:
+      m_hopLimit = 64;
+      break;
+    case HLIM_COMPR_255:
+    default:
+      m_hopLimit = 255;
+      break;
+
+    }
+  // Source Address
+  switch (GetSam () )
+    {
+      uint8_t temp[16];
+    case HC_INLINE:
+      if ( GetSac () == false )
+        {
+          i.Read (temp, 16);
+          m_srcAddress = Ipv6Address::Deserialize (temp);
+        }
+      break;
+    case HC_COMPR_64:
+      memset (temp, 0x00, sizeof (temp));
+      i.Read (temp + 8, 8);
+      temp[0] = 0xfe;
+      temp[1] = 0x80;
+      m_srcAddress = Ipv6Address::Deserialize (temp);
+      break;
+    case HC_COMPR_16:
+      memset (temp, 0x00, sizeof (temp));
+      i.Read (temp + 14, 2);
+      temp[0] = 0xfe;
+      temp[1] = 0x80;
+      temp[11] = 0xff;
+      temp[12] = 0xfe;
+      m_srcAddress = Ipv6Address::Deserialize (temp);
+      break;
+    case HC_COMPR_0:
+    default:
+      break;
+    }
+  if ( GetSac () == true )
+    {
+      PostProcessSac ();
+    }
+  // Destination Address
+  if ( GetM () == false)
+    {
+      uint8_t temp[16];
+      switch (GetDam () )
+        {
+        case HC_INLINE:
+          if ( GetDac () == false )
+            {
+              i.Read (temp, 16);
+              m_dstAddress = Ipv6Address::Deserialize (temp);
+            }
+          break;
+        case HC_COMPR_64:
+          memset (temp, 0x00, sizeof (temp));
+          i.Read (temp + 8, 8);
+          temp[0] = 0xfe;
+          temp[1] = 0x80;
+          m_dstAddress = Ipv6Address::Deserialize (temp);
+          break;
+        case HC_COMPR_16:
+          memset (temp, 0x00, sizeof (temp));
+          i.Read (temp + 14, 2);
+          temp[0] = 0xfe;
+          temp[1] = 0x80;
+          temp[11] = 0xff;
+          temp[12] = 0xfe;
+          m_dstAddress = Ipv6Address::Deserialize (temp);
+          break;
+        case HC_COMPR_0:
+        default:
+          break;
+        }
+    }
+  else
+    {
+      switch (GetDam () )
+        {
+          uint8_t temp[16];
+        case HC_INLINE:
+          if ( GetDac () == false )
+            {
+              i.Read (temp, 16);
+              m_dstAddress = Ipv6Address::Deserialize (temp);
+            }
+          else
+            {
+              memset (temp, 0x00, sizeof (temp));
+              i.Read (temp + 1, 2);
+              i.Read (temp + 12, 4);
+              temp[0] = 0xff;
+              m_dstAddress = Ipv6Address::Deserialize (temp);
+            }
+          break;
+        case HC_COMPR_64:
+          if ( GetDac () == false )
+            {
+              memset (temp, 0x00, sizeof (temp));
+              i.Read (temp + 1, 1);
+              i.Read (temp + 11, 5);
+              temp[0] = 0xff;
+              m_dstAddress = Ipv6Address::Deserialize (temp);
+            }
+          break;
+        case HC_COMPR_16:
+          if ( GetDac () == false )
+            {
+              memset (temp, 0x00, sizeof (temp));
+              i.Read (temp + 1, 1);
+              i.Read (temp + 13, 3);
+              temp[0] = 0xff;
+              m_dstAddress = Ipv6Address::Deserialize (temp);
+            }
+          break;
+        case HC_COMPR_0:
+        default:
+          if ( GetDac () == false )
+            {
+              memset (temp, 0x00, sizeof (temp));
+              temp[15] = i.ReadU8 ();
+              temp[0] = 0xff;
+              temp[1] = 0x02;
+              m_dstAddress = Ipv6Address::Deserialize (temp);
+            }
+          break;
+        }
+    }
+  if ( GetDac () == true )
+    {
+      PostProcessDac ();
+    }
+  return GetSerializedSize ();
+}
+
+void SixLowPanIphc::SetTf (TrafficClassFlowLabel_e tfField)
+{
+  uint16_t field = tfField;
+  m_baseFormat |= (field << 11);
+}
+
+SixLowPanIphc::TrafficClassFlowLabel_e SixLowPanIphc::GetTf (void) const
+{
+  return TrafficClassFlowLabel_e ((m_baseFormat >> 11) & 0x3);
+}
+
+void SixLowPanIphc::SetNh (bool nhField)
+{
+  uint16_t field = nhField;
+  m_baseFormat |= (field << 10);
+}
+
+bool SixLowPanIphc::GetNh (void) const
+{
+  return ((m_baseFormat >> 10) & 0x1);
+}
+
+void SixLowPanIphc::SetHlim (Hlim_e hlimField)
+{
+  uint16_t field = hlimField;
+  m_baseFormat |= (field << 8);
+}
+
+SixLowPanIphc::Hlim_e SixLowPanIphc::GetHlim (void) const
+{
+  return Hlim_e ((m_baseFormat >> 8) & 0x3);
+}
+
+void SixLowPanIphc::SetCid (bool cidField)
+{
+  uint16_t field = cidField;
+  m_baseFormat |= (field << 7);
+}
+
+bool SixLowPanIphc::GetCid (void) const
+{
+  return ((m_baseFormat >> 7) & 0x1);
+}
+
+void SixLowPanIphc::SetSac (bool sacField)
+{
+  uint16_t field = sacField;
+  m_baseFormat |= (field << 6);
+}
+
+bool SixLowPanIphc::GetSac (void) const
+{
+  return ((m_baseFormat >> 6) & 0x1);
+}
+
+void SixLowPanIphc::SetSam (HeaderCompression_e samField)
+{
+  uint16_t field = samField;
+  m_baseFormat |= (field << 4);
+}
+
+SixLowPanIphc::HeaderCompression_e SixLowPanIphc::GetSam (void) const
+{
+  return HeaderCompression_e ((m_baseFormat >> 4) & 0x3);
+}
+
+void SixLowPanIphc::SetM (bool mField)
+{
+  uint16_t field = mField;
+  m_baseFormat |= (field << 3);
+}
+
+bool SixLowPanIphc::GetM (void) const
+{
+  return ((m_baseFormat >> 3) & 0x1);
+}
+
+void SixLowPanIphc::SetDac (bool dacField)
+{
+  uint16_t field = dacField;
+  m_baseFormat |= (field << 2);
+}
+
+bool SixLowPanIphc::GetDac (void) const
+{
+  return ((m_baseFormat >> 2) & 0x1);
+}
+
+void SixLowPanIphc::SetDam (HeaderCompression_e damField)
+{
+  uint16_t field = damField;
+  m_baseFormat |= field;
+}
+
+SixLowPanIphc::HeaderCompression_e SixLowPanIphc::GetDam (void) const
+{
+  return HeaderCompression_e (m_baseFormat & 0x3);
+}
+
+void SixLowPanIphc::SetSrcContextId (uint8_t srcContextId)
+{
+  NS_ASSERT_MSG (srcContextId < 16,  "Src Context ID too large");
+  m_srcdstContextId |= srcContextId << 4;
+}
+
+uint8_t SixLowPanIphc::GetSrcContextId (void) const
+{
+  return ( m_srcdstContextId >> 4);
+}
+
+void SixLowPanIphc::SetDstContextId (uint8_t dstContextId)
+{
+  NS_ASSERT_MSG (dstContextId < 16,  "Dst Context ID too large");
+  m_srcdstContextId |= (dstContextId & 0xF);
+}
+
+uint8_t SixLowPanIphc::GetDstContextId (void) const
+{
+  return (m_srcdstContextId & 0xF);
+}
+
+void SixLowPanIphc::SetEcn (uint8_t ecn)
+{
+  NS_ASSERT_MSG (ecn < 4,  "ECN too large");
+  m_ecn = ecn;
+}
+
+uint8_t SixLowPanIphc::GetEcn (void) const
+{
+  return m_ecn;
+}
+
+void SixLowPanIphc::SetDscp (uint8_t dscp)
+{
+  NS_ASSERT_MSG (dscp < 64,  "DSCP too large");
+  m_dscp = dscp;
+}
+
+uint8_t SixLowPanIphc::GetDscp (void) const
+{
+  return m_dscp;
+}
+
+void SixLowPanIphc::SetFlowLabel (uint32_t flowLabel)
+{
+  NS_ASSERT_MSG (flowLabel < 0x100000,  "Flow Label too large");
+  m_flowLabel = flowLabel;
+}
+
+uint32_t SixLowPanIphc::GetFlowLabel (void) const
+{
+  return m_flowLabel;
+}
+
+void SixLowPanIphc::SetNextHeader (uint8_t nextHeader)
+{
+  m_nextHeader = nextHeader;
+}
+
+uint8_t SixLowPanIphc::GetNextHeader (void) const
+{
+  return m_nextHeader;
+}
+
+void SixLowPanIphc::SetHopLimit (uint8_t hopLimit)
+{
+  m_hopLimit = hopLimit;
+}
+
+uint8_t SixLowPanIphc::GetHopLimit (void) const
+{
+  return m_hopLimit;
+}
+
+void SixLowPanIphc::SetSrcAddress (Ipv6Address srcAddress)
+{
+  m_srcAddress = srcAddress;
+}
+
+Ipv6Address SixLowPanIphc::GetSrcAddress () const
+{
+  return m_srcAddress;
+}
+
+void SixLowPanIphc::SetDstAddress (Ipv6Address dstAddress)
+{
+  m_dstAddress = dstAddress;
+}
+
+Ipv6Address SixLowPanIphc::GetDstAddress () const
+{
+  return m_dstAddress;
+}
+
+void SixLowPanIphc::PostProcessSac ()
+{
+  NS_ABORT_MSG ("Unsupported; Context destination is not implemented");
+  return;
+}
+
+void SixLowPanIphc::PostProcessDac ()
+{
+  NS_ABORT_MSG ("Unsupported; Context destination is not implemented");
+  return;
+}
+
+std::ostream & operator << (std::ostream & os, const SixLowPanIphc & h)
+{
+  h.Print (os);
+  return os;
+}
+
+/*
+ * SixLowPanNhcExtensionHeader
+ */
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanNhcExtension)
+  ;
+
+SixLowPanNhcExtension::SixLowPanNhcExtension ()
+{
+  // 1110 xxxx
+  m_nhcExtensionHeader = 0xE0;
+  m_nhcNextHeader = 0;
+  m_nhcBlobLength = 0;
+}
+
+TypeId SixLowPanNhcExtension::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::SixLowPanNhcExtension")
+    .SetParent<Header> ()
+    .AddConstructor<SixLowPanNhcExtension> ();
+  return tid;
+}
+
+TypeId SixLowPanNhcExtension::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
+
+void SixLowPanNhcExtension::Print (std::ostream & os) const
+{
+  os << "Compression kind: " << int (m_nhcExtensionHeader) << " Size: " << int(GetSerializedSize ());
+}
+
+uint32_t SixLowPanNhcExtension::GetSerializedSize () const
+{
+  uint32_t serializedSize = 2;
+  if ( GetNh () == false )
+    {
+      serializedSize++;
+    }
+  return serializedSize + m_nhcBlobLength;
+}
+
+void SixLowPanNhcExtension::Serialize (Buffer::Iterator start) const
+{
+  Buffer::Iterator i = start;
+  i.WriteU8 (m_nhcExtensionHeader);
+  if ( GetNh () == false )
+    {
+      i.WriteU8 (m_nhcNextHeader);
+    }
+  i.WriteU8 (m_nhcBlobLength);
+  i.Write (m_nhcBlob, m_nhcBlobLength);
+}
+
+uint32_t SixLowPanNhcExtension::Deserialize (Buffer::Iterator start)
+{
+  Buffer::Iterator i = start;
+  m_nhcExtensionHeader = i.ReadU8 ();
+  if ( GetNh () == false )
+    {
+      m_nhcNextHeader = i.ReadU8 ();
+    }
+  m_nhcBlobLength = i.ReadU8 ();
+  i.Read (m_nhcBlob, m_nhcBlobLength);
+
+  return GetSerializedSize ();
+}
+
+SixLowPanDispatch::NhcDispatch_e
+SixLowPanNhcExtension::GetNhcDispatchType (void) const
+{
+  return SixLowPanDispatch::LOWPAN_NHC;
+}
+
+void SixLowPanNhcExtension::SetEid (Eid_e extensionHeaderType)
+{
+  uint8_t field = extensionHeaderType;
+  m_nhcExtensionHeader |= (field << 1);
+}
+
+SixLowPanNhcExtension::Eid_e SixLowPanNhcExtension::GetEid (void) const
+{
+  return Eid_e ((m_nhcExtensionHeader >> 1) & 0x7);
+}
+
+void SixLowPanNhcExtension::SetNextHeader (uint8_t nextHeader)
+{
+  m_nhcNextHeader = nextHeader;
+}
+
+uint8_t SixLowPanNhcExtension::GetNextHeader (void) const
+{
+  return m_nhcNextHeader;
+}
+
+void SixLowPanNhcExtension::SetNh (bool nhField)
+{
+  uint8_t field = nhField;
+  m_nhcExtensionHeader |= field;
+}
+
+bool SixLowPanNhcExtension::GetNh (void) const
+{
+  return m_nhcExtensionHeader & 0x01;
+}
+
+void SixLowPanNhcExtension::SetBlob (const uint8_t* blob, uint32_t size)
+{
+  NS_ASSERT_MSG ( size < 255, "Buffer too long" );
+
+  m_nhcBlobLength = size;
+  std::memcpy (m_nhcBlob, blob, size);
+}
+
+uint32_t SixLowPanNhcExtension::CopyBlob (uint8_t* blob, uint32_t size) const
+{
+  NS_ASSERT_MSG ( size > m_nhcBlobLength, "Buffer too short" );
+
+  std::memcpy (blob, m_nhcBlob, m_nhcBlobLength);
+  return m_nhcBlobLength;
+}
+
+std::ostream & operator << (std::ostream & os, const SixLowPanNhcExtension & h)
+{
+  h.Print (os);
+  return os;
+}
+
+/*
+ * SixLowPanUdpNhcExtension
+ */
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanUdpNhcExtension)
+  ;
+
+SixLowPanUdpNhcExtension::SixLowPanUdpNhcExtension ()
+{
+  // 1111 0xxx
+  m_baseFormat = 0xF0;
+  m_checksum = 0;
+  m_srcPort = 0;
+  m_dstPort = 0;
+}
+
+TypeId SixLowPanUdpNhcExtension::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::SixLowPanUdpNhcExtension")
+    .SetParent<Header> ()
+    .AddConstructor<SixLowPanUdpNhcExtension> ();
+  return tid;
+}
+
+TypeId SixLowPanUdpNhcExtension::GetInstanceTypeId (void) const
+{
+  return GetTypeId ();
+}
+
+void SixLowPanUdpNhcExtension::Print (std::ostream & os) const
+{
+  os << "Compression kind: " << uint8_t (m_baseFormat);
+}
+
+uint32_t SixLowPanUdpNhcExtension::GetSerializedSize () const
+{
+  uint32_t serializedSize = 1;
+  if ( !GetC () )
+    {
+      serializedSize += 2;
+    }
+  switch (GetPorts ())
+    {
+    case PORTS_INLINE:
+      serializedSize += 4;
+      break;
+    case PORTS_ALL_SRC_LAST_DST:
+    case PORTS_LAST_SRC_ALL_DST:
+      serializedSize += 3;
+      break;
+    case PORTS_LAST_SRC_LAST_DST:
+      serializedSize += 1;
+      break;
+    default:
+      break;
+    }
+  return serializedSize;
+}
+
+void SixLowPanUdpNhcExtension::Serialize (Buffer::Iterator start) const
+{
+  Buffer::Iterator i = start;
+  i.WriteU8 (m_baseFormat);
+  uint8_t temp;
+
+  // Ports
+  switch ( GetPorts () )
+    {
+    case PORTS_INLINE:
+      i.WriteHtonU16 (m_srcPort);
+      i.WriteHtonU16 (m_dstPort);
+      break;
+    case PORTS_ALL_SRC_LAST_DST:
+      i.WriteHtonU16 (m_srcPort);
+      i.WriteU8 (m_dstPort & 0xff);
+      break;
+    case PORTS_LAST_SRC_ALL_DST:
+      i.WriteU8 (m_srcPort & 0xff);
+      i.WriteHtonU16 (m_dstPort);
+      break;
+    case PORTS_LAST_SRC_LAST_DST:
+      temp = ((m_srcPort & 0xf) << 4) | (m_dstPort & 0xf);
+      i.WriteU8 (temp);
+      break;
+    default:
+      break;
+    }
+
+  // Checksum
+  if ( !GetC () )
+    {
+      i.WriteU16 (m_checksum);
+    }
+
+}
+
+uint32_t SixLowPanUdpNhcExtension::Deserialize (Buffer::Iterator start)
+{
+  Buffer::Iterator i = start;
+  m_baseFormat = i.ReadU8 ();
+  uint8_t temp;
+
+  // Ports
+  switch ( GetPorts () )
+    {
+    case PORTS_INLINE:
+      m_srcPort = i.ReadNtohU16 ();
+      m_dstPort = i.ReadNtohU16 ();
+      break;
+    case PORTS_ALL_SRC_LAST_DST:
+      m_srcPort = i.ReadNtohU16 ();
+      m_dstPort = i.ReadU8 ();
+      break;
+    case PORTS_LAST_SRC_ALL_DST:
+      m_srcPort = i.ReadU8 ();
+      m_dstPort = i.ReadNtohU16 ();
+      break;
+    case PORTS_LAST_SRC_LAST_DST:
+      temp = i.ReadU8 ();
+      m_srcPort = temp >> 4;
+      m_dstPort = temp & 0xf;
+      break;
+    default:
+      break;
+    }
+
+  // Checksum
+  if ( !GetC () )
+    {
+      m_checksum = i.ReadU16 ();
+    }
+
+  return GetSerializedSize ();
+}
+
+SixLowPanDispatch::NhcDispatch_e
+SixLowPanUdpNhcExtension::GetNhcDispatchType (void) const
+{
+  return SixLowPanDispatch::LOWPAN_UDPNHC;
+}
+
+void SixLowPanUdpNhcExtension::SetPorts (Ports_e ports)
+{
+  uint16_t field = ports;
+  m_baseFormat |= field;
+}
+
+SixLowPanUdpNhcExtension::Ports_e SixLowPanUdpNhcExtension::GetPorts (void) const
+{
+  return Ports_e (m_baseFormat & 0x3);
+}
+
+void SixLowPanUdpNhcExtension::SetSrcPort (uint16_t srcport)
+{
+  m_srcPort = srcport;
+}
+
+uint16_t SixLowPanUdpNhcExtension::GetSrcPort (void) const
+{
+  return m_srcPort;
+}
+
+void SixLowPanUdpNhcExtension::SetDstPort (uint16_t dstport)
+{
+  m_dstPort = dstport;
+}
+
+uint16_t SixLowPanUdpNhcExtension::GetDstPort (void) const
+{
+  return m_dstPort;
+}
+
+void SixLowPanUdpNhcExtension::SetC (bool cField)
+{
+  uint16_t field = cField;
+  m_baseFormat |= (field << 2);
+}
+
+bool SixLowPanUdpNhcExtension::GetC (void) const
+{
+  return ((m_baseFormat >> 2) & 0x1);
+}
+
+void SixLowPanUdpNhcExtension::SetChecksum (uint16_t checksum)
+{
+  m_checksum = checksum;
+}
+
+uint16_t SixLowPanUdpNhcExtension::GetChecksum (void) const
+{
+  return m_checksum;
+}
+
+std::ostream & operator << (std::ostream & os, const SixLowPanUdpNhcExtension & h)
+{
+  h.Print (os);
+  return os;
+}
+
+
+}
+
diff -Naur ns-3.18.1/src/sixlowpan/model/sixlowpan-header.h ns-3.19/src/sixlowpan/model/sixlowpan-header.h
--- ns-3.18.1/src/sixlowpan/model/sixlowpan-header.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/model/sixlowpan-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,1214 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ *         Michele Muccio <michelemuccio@virgilio.it>
+ */
+
+#ifndef SIXLOWPANHEADER_H_
+#define SIXLOWPANHEADER_H_
+
+#include "ns3/header.h"
+#include "ns3/ipv6-address.h"
+#include "ns3/packet.h"
+#include "ns3/ipv6-header.h"
+
+namespace ns3 {
+
+/**
+* \ingroup sixlowpan
+* \brief   Dispatch header helper. This class only purpose is to interpret
+* the Dispatch header into its correct type.
+*
+* The dispatch type is defined by a zero bit as the first bit and a one
+*  bit as the second bit.
+  \verbatim
+                        1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |0 1| Dispatch  |  type-specific header
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  \endverbatim
+*/
+class SixLowPanDispatch
+{
+public:
+  /**
+   *  \brief Dispatch values, as defined in RFC4944 and RFC6282
+  \verbatim
+     Pattern    Header Type
+   +------------+------------------------------------------------+
+   | 00  xxxxxx | NALP        - Not a LoWPAN frame               |
+   | 01  000000 | ESC         - Additional Dispatch byte follows |
+   | 01  000001 | IPv6        - Uncompressed IPv6 Addresses      |
+   | 01  000010 | LOWPAN_HC1  - LOWPAN_HC1 compressed IPv6       |
+   | 01  000011 | reserved    - Reserved for future use          |
+   |   ...      | reserved    - Reserved for future use          |
+   | 01  001111 | reserved    - Reserved for future use          |
+   | 01  010000 | LOWPAN_BC0  - LOWPAN_BC0 broadcast             |
+   | 01  010001 | reserved    - Reserved for future use          |
+   |   ...      | reserved    - Reserved for future use          |
+   | 01  1xxxxx | LOWPAN_IPHC - LOWPAN_IPHC compressed IPv6      |
+   | 10  xxxxxx | MESH        - Mesh Header                      |
+   | 11  000xxx | FRAG1       - Fragmentation Header (first)     |
+   | 11  001000 | reserved    - Reserved for future use          |
+   |   ...      | reserved    - Reserved for future use          |
+   | 11  011111 | reserved    - Reserved for future use          |
+   | 11  100xxx | FRAGN       - Fragmentation Header (subsequent)|
+   | 11  101000 | reserved    - Reserved for future use          |
+   |   ...      | reserved    - Reserved for future use          |
+   | 11  111111 | reserved    - Reserved for future use          |
+   +------------+------------------------------------------------+
+   \endverbatim
+   */
+  enum Dispatch_e
+  {
+    LOWPAN_NALP = 0x0,
+    LOWPAN_NALP_N = 0x3F,
+    LOWPAN_NOTCOMPRESSED = 0x41,
+    LOWPAN_HC1 = 0x42,
+    LOWPAN_BC0 = 0x50,
+    LOWPAN_IPHC = 0x60,
+    LOWPAN_IPHC_N = 0x7F,
+    LOWPAN_MESH = 0x80,
+    LOWPAN_MESH_N = 0xBF,
+    LOWPAN_FRAG1 = 0xC0,
+    LOWPAN_FRAG1_N = 0xC7,
+    LOWPAN_FRAGN = 0xE0,
+    LOWPAN_FRAGN_N = 0xE7,
+    LOWPAN_UNSUPPORTED = 0xFF
+  };
+
+  /**
+   *  \brief Dispatch values for Next Header compression.
+   *
+   *  The dispatch values reflect the dispatch use, since
+   *  some dispatch bits carry actual header compression bits.
+   */
+  enum NhcDispatch_e
+  {
+    LOWPAN_NHC = 0xE0,
+    LOWPAN_NHC_N = 0xEF,
+    LOWPAN_UDPNHC = 0xF0,
+    LOWPAN_UDPNHC_N = 0xF7,
+    LOWPAN_NHCUNSUPPORTED = 0xFF
+  };
+
+  SixLowPanDispatch (void);
+
+  /**
+   * \brief Get the Dispatch type.
+   * \param dispatch the dispatch value
+   * \return the Dispatch type
+   */
+  static Dispatch_e GetDispatchType (uint8_t dispatch);
+
+  /**
+   * \brief Get the NhcDispatch type.
+   * \param dispatch the dispatch value
+   * \return the NhcDispatch type
+   */
+  static NhcDispatch_e GetNhcDispatchType (uint8_t dispatch);
+
+};
+
+/**
+ * \ingroup sixlowpan
+ * \brief 6LoWPAN HC1 header - see RFC 4944
+ */
+class SixLowPanHc1 : public Header
+{
+public:
+  /**
+   * \brief Kind of address compression.
+   *
+   * The address compression is handled in 4 bits and might mean:
+   * PI: Prefix inline, PC: Prefix Compressed,
+   * II: Interface Identifier, Inline, IC: Interface Identifier Compressed
+   */
+  enum LowPanHc1Addr_e
+  {
+    HC1_PIII = 0x00,
+    HC1_PIIC = 0x01,
+    HC1_PCII = 0x02,
+    HC1_PCIC = 0x03
+  };
+
+  /**
+   * \brief Next header information.
+   *
+   * The Next header compression is handled in 4 bits and might mean:
+   * NC: Not Compressed, UDP, ICMP or TCP.
+   */
+  enum LowPanHc1NextHeader_e
+  {
+    HC1_NC = 0x00,
+    HC1_UDP = 0x01,
+    HC1_ICMP = 0x02,
+    HC1_TCP = 0x03
+  };
+
+  SixLowPanHc1 (void);
+
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
+  static TypeId GetTypeId (void);
+
+  /**
+   * \brief Return the instance type identifier.
+   * \return instance type ID
+   */
+
+  virtual TypeId GetInstanceTypeId (void) const;
+
+  virtual void Print (std::ostream& os) const;
+
+  /**
+   * \brief Get the serialized size of the packet.
+   * \return size
+   */
+  virtual uint32_t GetSerializedSize (void) const;
+
+  /**
+   * \brief Serialize the packet.
+   * \param start Buffer iterator
+   */
+  virtual void Serialize (Buffer::Iterator start) const;
+
+  /**
+   * \brief Deserialize the packet.
+   * \param start Buffer iterator
+   * \return size of the packet
+   */
+  virtual uint32_t Deserialize (Buffer::Iterator start);
+
+  /**
+   * \brief Get the Dispatch type.
+   * \return the Dispatch type
+   */
+  // virtual Dispatch_e GetDispatchType (void) const;
+
+  /**
+   * \brief Set the "Hop limit" field (TTL).
+   * \param limit the hop limit value
+   */
+  void SetHopLimit (uint8_t limit);
+
+  /**
+   * \brief Get the "Hop limit" field (TTL).
+   * \return the hop limit value
+   */
+  uint8_t GetHopLimit (void) const;
+
+  /**
+   * \brief Get Destination Compression type
+   * \returns the kind of address compression
+   */
+  LowPanHc1Addr_e GetDstCompression () const;
+
+  /**
+   * \brief Get the destination interface
+   * \returns the destination interface
+   */
+  const uint8_t* GetDstInterface () const;
+
+  /**
+   * \brief Get the destination prefix
+   * \returns the destination prefix
+   */
+  const uint8_t* GetDstPrefix () const;
+
+  /**
+   * \brief Get the Flow Label value
+   * \returns the Flow Label
+   */
+  uint32_t GetFlowLabel () const;
+
+  /**
+   * \brief Get the Next Header value
+   * \returns the Next Header value
+   */
+  uint8_t GetNextHeader () const;
+
+  /**
+   * \brief Get Source Compression type
+   * \returns the kind of address compression
+   */
+  LowPanHc1Addr_e GetSrcCompression () const;
+
+  /**
+   * \brief Get the source interface
+   * \returns the source interface
+   */
+  const uint8_t* GetSrcInterface () const;
+
+  /**
+   * \brief Get the source prefix
+   * \returns the source prefix
+   */
+  const uint8_t* GetSrcPrefix () const;
+
+  /**
+   * \brief Get the Traffic Class value
+   * \returns the Traffic Class value
+   */
+  uint8_t GetTrafficClass () const;
+
+  /**
+   * \brief Check if the Traffic Class and Flow Labels are compressed
+   * \returns true if TC and FL are compressed
+   */
+  bool IsTcflCompression () const;
+
+  /**
+   * \brief Check if there is a HC2 compressed header
+   * \returns true if next header is HC2 copressed
+   */
+  bool IsHc2HeaderPresent () const;
+
+  /**
+   * \brief Set Destination Compression type
+   * \param dstCompression the kind of address compression
+   */
+  void SetDstCompression (LowPanHc1Addr_e dstCompression);
+
+  /**
+   * \brief Set the destination interface
+   * \param dstInterface the destination interface
+   */
+  void SetDstInterface (const uint8_t* dstInterface);
+
+  /**
+   * \brief Set the destination prefix
+   * \param dstPrefix the destination prefix
+   */
+  void SetDstPrefix (const uint8_t* dstPrefix);
+
+  /**
+   * \brief Set the Flow Label value
+   * \param flowLabel the Flow Label
+   */
+  void SetFlowLabel (uint32_t flowLabel);
+
+  /**
+   * \brief Set the Next Header value
+   * \param nextHeader the Next Header value
+   */
+  void SetNextHeader (uint8_t nextHeader);
+
+  /**
+   * \brief Set Source Compression type
+   * \param srcCompression the kind of address compression
+   */
+  void SetSrcCompression (LowPanHc1Addr_e srcCompression);
+
+  /**
+   * \brief Set the source interface
+   * \param srcInterface the source interface
+   */
+  void SetSrcInterface (const uint8_t* srcInterface);
+
+  /**
+   * \brief Set the source prefix
+   * \param srcPrefix the source prefix
+   */
+  void SetSrcPrefix (const uint8_t* srcPrefix);
+
+  /**
+   * \brief Set the Traffic Class and Flow Labels as compressed
+   * \param tcflCompression true if TC and FL are compressed
+   */
+  void SetTcflCompression (bool tcflCompression);
+
+  /**
+   * \brief Set the next header a HC2 compressed header
+   * \param hc2HeaderPresent true if next header is HC2 compressed
+   */
+  void SetHc2HeaderPresent (bool hc2HeaderPresent);
+
+  /**
+   * \brief Set the Traffic Class value
+   * \param trafficClass the Traffic Class value
+   */
+  void SetTrafficClass (uint8_t trafficClass);
+
+private:
+  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_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
+  bool m_tcflCompression;       //!< is TC and FL compressed
+  LowPanHc1NextHeader_e m_nextHeaderCompression; //!< next header compression
+  bool m_hc2HeaderPresent;      //!< is next header HC2 compressed
+};
+
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param header the HC1 Header
+ * \returns the reference to the output stream
+ */
+std::ostream & operator<< (std::ostream & os, SixLowPanHc1 const &header);
+
+/**
+ * \ingroup sixlowpan
+ * \brief 6LoWPAN FRAG1 header - see RFC 4944
+ */
+class SixLowPanFrag1 : public Header
+{
+public:
+  SixLowPanFrag1 (void);
+
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
+  static TypeId GetTypeId (void);
+
+  /**
+   * \brief Return the instance type identifier.
+   * \return instance type ID
+   */
+  virtual TypeId GetInstanceTypeId (void) const;
+
+  virtual void Print (std::ostream& os) const;
+
+  /**
+   * \brief Get the serialized size of the packet.
+   * \return size
+   */
+  virtual uint32_t GetSerializedSize (void) const;
+
+  /**
+   * \brief Serialize the packet.
+   * \param start Buffer iterator
+   */
+  virtual void Serialize (Buffer::Iterator start) const;
+
+  /**
+   * \brief Deserialize the packet.
+   * \param start Buffer iterator
+   * \return size of the packet
+   */
+  virtual uint32_t Deserialize (Buffer::Iterator start);
+
+  /**
+   * \brief Get the Dispatch type.
+   * \return the Dispatch type
+   */
+  // virtual Dispatch_e GetDispatchType (void) const;
+
+  /**
+   * \brief Set the datagram size
+   * \param datagramSize the datagram size
+   */
+  void SetDatagramSize (uint16_t datagramSize);
+
+  /**
+   * \brief Get the datagram size
+   * \returns the datagram size
+   */
+  uint16_t GetDatagramSize (void) const;
+
+  /**
+   * \brief Set the datagram tag
+   * \param datagramTag the datagram tag
+   */
+  void SetDatagramTag (uint16_t datagramTag);
+
+  /**
+   * \brief Get the datagram tag
+   * \returns the datagram tag
+   */
+  uint16_t GetDatagramTag (void) const;
+
+private:
+  uint16_t m_datagramSize; //!< datagram size
+  uint16_t m_datagramTag;  //!< datagram tag
+
+};
+
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param header the Frag1 Header
+ * \returns the reference to the output stream
+ */
+std::ostream & operator<< (std::ostream & os, SixLowPanFrag1 const & header);
+
+/**
+ * \ingroup sixlowpan
+ * \brief 6LoWPAN FRAGN header - see RFC 4944
+ */
+class SixLowPanFragN : public Header
+{
+public:
+  SixLowPanFragN (void);
+
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
+  static TypeId GetTypeId (void);
+
+  /**
+   * \brief Return the instance type identifier.
+   * \return instance type ID
+   */
+  virtual TypeId GetInstanceTypeId (void) const;
+
+  virtual void Print (std::ostream& os) const;
+
+  /**
+   * \brief Get the serialized size of the packet.
+   * \return size
+   */
+  virtual uint32_t GetSerializedSize (void) const;
+
+  /**
+   * \brief Serialize the packet.
+   * \param start Buffer iterator
+   */
+  virtual void Serialize (Buffer::Iterator start) const;
+
+  /**
+   * \brief Deserialize the packet.
+   * \param start Buffer iterator
+   * \return size of the packet
+   */
+  virtual uint32_t Deserialize (Buffer::Iterator start);
+
+  /**
+   * \brief Get the Dispatch type.
+   * \return the Dispatch type
+   */
+  // virtual Dispatch_e GetDispatchType (void) const;
+
+  /**
+   * \brief Set the datagram size
+   * \param datagramSize the datagram size
+   */
+  void SetDatagramSize (uint16_t datagramSize);
+
+  /**
+   * \brief Get the datagram size
+   * \returns the datagram size
+   */
+  uint16_t GetDatagramSize (void) const;
+
+  /**
+   * \brief Set the datagram tag
+   * \param datagramTag the datagram tag
+   */
+  void SetDatagramTag (uint16_t datagramTag);
+
+  /**
+   * \brief Get the datagram tag
+   * \returns the datagram tag
+   */
+  uint16_t GetDatagramTag (void) const;
+
+  /**
+   * \brief Set the datagram offset
+   * \param datagramOffset the datagram offset
+   */
+  void SetDatagramOffset (uint8_t datagramOffset);
+
+  /**
+   * \brief Get the datagram offset
+   * \returns the datagram offset
+   */
+  uint8_t GetDatagramOffset (void) const;
+
+private:
+  uint16_t m_datagramSize;  //!< datagram size
+  uint16_t m_datagramTag;   //!< datagram tag
+  uint8_t m_datagramOffset; //!< datagram offset
+
+};
+
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param header the FragN Header
+ * \returns the reference to the output stream
+ */
+std::ostream & operator<< (std::ostream & os, SixLowPanFragN const &header);
+
+/**
+* \ingroup sixlowpan
+* \brief   LOWPAN_IPHC base Encoding - see RFC 6282
+  \verbatim
+       0                                       1
+       0   1   2   3   4   5   6   7   8   9   0   1   2   3   4   5
+     +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+     | 0 | 1 | 1 |  TF   |NH | HLIM  |CID|SAC|  SAM  | M |DAC|  DAM  |
+     +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  \endverbatim
+*/
+class SixLowPanIphc : public Header
+{
+public:
+  /**
+   *  \brief TF: Traffic Class, Flow Label
+   *
+   *  00:  ECN + DSCP + 4-bit Pad + Flow Label (4 bytes)
+   *  01:  ECN + 2-bit Pad + Flow Label (3 bytes), DSCP is elided.
+   *  10:  ECN + DSCP (1 byte), Flow Label is elided.
+   *  11:  Traffic Class and Flow Label are elided.
+   *
+   */
+  enum TrafficClassFlowLabel_e
+  {
+    TF_FULL = 0,
+    TF_DSCP_ELIDED,
+    TF_FL_ELIDED,
+    TF_ELIDED
+  };
+
+  /**
+   *  \brief HLIM: Hop Limit
+   *
+   *  00:  The Hop Limit field is carried in-line.
+   *  01:  The Hop Limit field is compressed and the hop limit is 1.
+   *  10:  The Hop Limit field is compressed and the hop limit is 64.
+   *  11:  The Hop Limit field is compressed and the hop limit is 255.
+   */
+  enum Hlim_e
+  {
+    HLIM_INLINE = 0,
+    HLIM_COMPR_1,
+    HLIM_COMPR_64,
+    HLIM_COMPR_255
+  };
+
+  /**
+   *  \brief Source or Destination Address Mode
+   *
+   *  00:  128 bits.
+   *  01:  64 bits (or 48 bits if multicast).
+   *  10:  16 bits (or 32 bits if multicast).
+   *  11:  Fully elided (or 8 bits if multicast).
+   */
+  enum HeaderCompression_e
+  {
+    HC_INLINE = 0,
+    HC_COMPR_64,
+    HC_COMPR_16,
+    HC_COMPR_0
+  };
+
+  SixLowPanIphc (void);
+  /**
+   * \brief Constructor
+   * \param dispatch dispatch value
+   */
+  SixLowPanIphc (uint8_t dispatch);
+
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
+  static TypeId GetTypeId (void);
+
+  /**
+   * \brief Return the instance type identifier.
+   * \return instance type ID
+   */
+  virtual TypeId GetInstanceTypeId (void) const;
+
+  virtual void Print (std::ostream& os) const;
+
+  /**
+   * \brief Get the serialized size of the packet.
+   * \return size
+   */
+  virtual uint32_t GetSerializedSize (void) const;
+
+  /**
+   * \brief Serialize the packet.
+   * \param start Buffer iterator
+   */
+  virtual void Serialize (Buffer::Iterator start) const;
+
+  /**
+   * \brief Deserialize the packet.
+   * \param start Buffer iterator
+   * \return size of the packet
+   */
+  virtual uint32_t Deserialize (Buffer::Iterator start);
+
+  /**
+   * \brief Get the Dispatch type.
+   * \return the Dispatch type
+   */
+  // virtual Dispatch_e GetDispatchType (void) const;
+
+  /**
+   * \brief Set the TF (Traffic Class, Flow Label) compression.
+   * \param tfField ECN, DSCP, Flow Label compression type
+   */
+  void SetTf (TrafficClassFlowLabel_e tfField);
+
+  /**
+   * \brief Get the TF (Traffic Class, Flow Label) compression.
+   * \return the ECN, DSCP, Flow Label compression type
+   */
+  TrafficClassFlowLabel_e GetTf (void) const;
+
+  /**
+   * \brief Set the NH (Next Header) compression.
+   * \param nhField false (Next Header carried in-line), true (compressed NH)
+   */
+  void SetNh (bool nhField);
+
+  /**
+   * \brief Get the NH (Next Header) compression.
+   * \return false (Next Header carried in-line), true (compressed NH)
+   */
+  bool GetNh (void) const;
+
+  /**
+   * \brief Set the HLIM (Hop Limit) compression.
+   * \param hlimField Hop Limit compression type
+   */
+  void SetHlim (Hlim_e hlimField);
+
+  /**
+   * \brief Get the HLIM (Hop Limit) compression.
+   * \return Hop Limit compression type
+   */
+  Hlim_e GetHlim (void) const;
+
+  /**
+   * \brief Set the CID (Context Identifier Extension) compression.
+   * \param cidField false (no CID present), true (CID follows)
+   */
+  void SetCid (bool cidField);
+
+  /**
+   * \brief Get the CID (Context Identifier Extension) compression.
+   * \return false (no CID present), true (CID follows)
+   */
+  bool GetCid (void) const;
+
+  /**
+   * \brief Set the SAC (Source Address Compression) compression.
+   * \param sacField false (stateless), true (stateful)
+   */
+  void SetSac (bool sacField);
+
+  /**
+   * \brief Get the SAC (Source Address Compression) compression.
+   * \return false (stateless), true (stateful)
+   */
+  bool GetSac (void) const;
+
+  /**
+   * \brief Set the SAM (Source Address Mode) compression.
+   * \param samField - depends on the SAC
+   */
+  void SetSam (HeaderCompression_e samField);
+
+  /**
+   * \brief Get the SAM (Source Address Mode) compression.
+   * \return depends on the SAC field
+   */
+  HeaderCompression_e GetSam (void) const;
+
+  /**
+   * \brief Set the M (Multicast) compression.
+   * \param mField true if destination is multicast
+   */
+  void SetM (bool mField);
+
+  /**
+   * \brief Get the M (Multicast) compression.
+   * \return true if destination is multicast
+   */
+  bool GetM (void) const;
+
+  /**
+   * \brief Set the DAC (Destination Address Compression) compression.
+   * \param dacField false (stateless), true (stateful)
+   */
+  void SetDac (bool dacField);
+
+  /**
+   * \brief Get the DAC (Destination Address Compression) compression.
+   * \return false (stateless), true (stateful)
+   */
+  bool GetDac (void) const;
+
+  /**
+   * \brief Set the DAM (Destination Address Mode) compression.
+   * \param damField - depends on the DAC and M fields
+   */
+  void SetDam (HeaderCompression_e damField);
+
+  /**
+   * \brief Get the DAM (Destination Address Mode) compression.
+   * \return depends on the DAC and M fields
+   */
+  HeaderCompression_e GetDam (void) const;
+
+  /**
+   * \brief Set the SrcContextId.
+   * \param srcContextId - valid values are [0:15]
+   */
+  void SetSrcContextId (uint8_t srcContextId);
+
+  /**
+   * \brief Get the SrcContextId.
+   * \return the SrcContextId
+   */
+  uint8_t GetSrcContextId (void) const;
+
+  /**
+   * \brief Set the DstContextId.
+   * \param dstContextId - valid values are [0:15]
+   */
+  void SetDstContextId (uint8_t dstContextId);
+
+  /**
+   * \brief Get the DstContextId.
+   * \return the DstContextId
+   */
+  uint8_t GetDstContextId (void) const;
+
+  /**
+   * \brief Set the ECN (2bits).
+   * \param ecn - valid values are [0:3]
+   */
+  void SetEcn (uint8_t ecn);
+
+  /**
+   * \brief Get the ECN.
+   * \return the ECN
+   */
+  uint8_t GetEcn (void) const;
+
+  /**
+   * \brief Set the DSCP (6bits).
+   * \param dscp - valid values are [0:63]
+   */
+  void SetDscp (uint8_t dscp);
+
+  /**
+   * \brief Get the DSCP.
+   * \return the DSCP
+   */
+  uint8_t GetDscp (void) const;
+
+  /**
+   * \brief Set the Flow Label (20bits).
+   * \param flowLabel - valid values are 20 bits long.
+   */
+  void SetFlowLabel (uint32_t flowLabel);
+
+  /**
+   * \brief Get the Flow Label.
+   * \return the Flow Label
+   */
+  uint32_t GetFlowLabel (void) const;
+
+  /**
+   * \brief Set the Next Header field.
+   * \param nextHeader Next Header field.
+   */
+  void SetNextHeader (uint8_t nextHeader);
+
+  /**
+   * \brief Get the Next Header field.
+   * \return the Next Header field.
+   */
+  uint8_t GetNextHeader (void) const;
+
+  /**
+   * \brief Set the Hop Limit field.
+   * \param hopLimit Hop Limit field.
+   */
+  void SetHopLimit (uint8_t hopLimit);
+
+  /**
+   * \brief Get the Hop Limit field.
+   * \return the Hop Limit field.
+   */
+  uint8_t GetHopLimit (void) const;
+
+  /**
+   * \brief Set the Source Address.
+   * \param srcAddress the Source Address.
+   */
+  void SetSrcAddress (Ipv6Address srcAddress);
+
+  /**
+   * \brief Get the Source Address.
+   * \return the Source Address.
+   */
+  Ipv6Address GetSrcAddress () const;
+
+  /**
+   * \brief Set the Destination Address.
+   * \param dstAddress the Destination Address.
+   */
+  void SetDstAddress (Ipv6Address dstAddress);
+
+  /**
+   * \brief Get the Destination Address.
+   * \return the Destination Address.
+   */
+  Ipv6Address GetDstAddress () const;
+
+private:
+  uint16_t m_baseFormat;      //!< Dispatch + encoding fields
+  uint8_t m_srcdstContextId;  //!< Src and Dst Context ID
+  uint8_t m_ecn : 2;          //!< ECN bits
+  uint8_t m_dscp : 6;         //!< DSCP bits
+  uint32_t m_flowLabel : 20;  //!< Flow Label bits
+  uint8_t m_nextHeader;       //!< Next header
+  uint8_t m_hopLimit;         //!< Hop Limit
+  Ipv6Address m_srcAddress;   //!< Src address
+  Ipv6Address m_dstAddress;   //!< Dst address
+
+  /**
+   * \brief Post-process the Source address stateful compression
+   * \note currently unsupported
+   */
+  void PostProcessSac ();
+  /**
+   * \brief Post-process the Destination address stateful compression
+   * \note currently unsupported
+   */
+  void PostProcessDac ();
+
+};
+
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param header the IPHC Header
+ * \returns the reference to the output stream
+ */
+std::ostream & operator<< (std::ostream & os, SixLowPanIphc const &header);
+
+/**
+* \ingroup sixlowpan
+* \brief   LOWPAN_NHC Extension Header Encoding - see RFC 6282
+  \verbatim
+     0   1   2   3   4   5   6   7
+   +---+---+---+---+---+---+---+---+
+   | 1 | 1 | 1 | 0 |    EID    |NH |
+   +---+---+---+---+---+---+---+---+
+  \endverbatim
+*/
+class SixLowPanNhcExtension : public Header
+{
+public:
+  /**
+   *  \brief EID: IPv6 Extension Header ID
+   *
+   *   EID: IPv6 Extension Header ID:
+   *      0: IPv6 Hop-by-Hop Options Header [RFC2460]
+   *      1: IPv6 Routing Header [RFC2460]
+   *      2: IPv6 Fragment Header [RFC2460]
+   *      3: IPv6 Destination Options Header [RFC2460]
+   *      4: IPv6 Mobility Header [RFC6275]
+   *      5: Reserved
+   *      6: Reserved
+   *      7: IPv6 Header
+   */
+  enum Eid_e
+  {
+    EID_HOPBYHOP_OPTIONS_H = 0,
+    EID_ROUTING_H,
+    EID_FRAGMENTATION_H,
+    EID_DESTINATION_OPTIONS_H,
+    EID_MOBILITY_H,
+    EID_IPv6_H = 7
+  };
+
+  SixLowPanNhcExtension (void);
+
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
+  static TypeId GetTypeId (void);
+
+  /**
+   * \brief Return the instance type identifier.
+   * \return instance type ID
+   */
+  virtual TypeId GetInstanceTypeId (void) const;
+
+  virtual void Print (std::ostream& os) const;
+
+  /**
+   * \brief Get the serialized size of the packet.
+   * \return size
+   */
+  virtual uint32_t GetSerializedSize (void) const;
+
+  /**
+   * \brief Serialize the packet.
+   * \param start Buffer iterator
+   */
+  virtual void Serialize (Buffer::Iterator start) const;
+
+  /**
+   * \brief Deserialize the packet.
+   * \param start Buffer iterator
+   * \return size of the packet
+   */
+  virtual uint32_t Deserialize (Buffer::Iterator start);
+
+  /**
+   * \brief Get the NhcDispatch type.
+   * \return the NhcDispatch type
+   */
+  virtual SixLowPanDispatch::NhcDispatch_e GetNhcDispatchType (void) const;
+
+  /**
+   * \brief Set the Extension Header Type.
+   * \param extensionHeaderType the Extension Header Type
+   */
+  void SetEid (Eid_e extensionHeaderType);
+
+  /**
+   * \brief Get the Extension Header Type.
+   * \return the Extension Header Type
+   */
+  Eid_e GetEid (void) const;
+
+  /**
+   * \brief Set the Next Header field values.
+   * \param nextHeader the Next Header field value
+   */
+  void SetNextHeader (uint8_t nextHeader);
+
+  /**
+   * \brief Get the Next Header field value.
+   * \return the Next Header field value
+   */
+  uint8_t GetNextHeader (void) const;
+
+  /**
+   * \brief Set the NH field values.
+   * \param nhField the NH field value
+   */
+  void SetNh (bool nhField);
+
+  /**
+   * \brief Get the Next Header field value.
+   * \return the NH field value
+   */
+  bool GetNh (void) const;
+
+  /**
+   * \brief Set the option header data blob.
+   * \param blob a buffer holding the blob data
+   * \param size the data blob size
+   */
+  void SetBlob (const uint8_t* blob, uint32_t size);
+
+  /**
+   * \brief Get the option header data blob.
+   * \param blob a buffer to copy the blob data into
+   * \param size the size of the buffer
+   * \return the length of the copied data
+   */
+  uint32_t CopyBlob (uint8_t* blob, uint32_t size) const;
+
+private:
+  uint8_t m_nhcExtensionHeader; //!< NHC extension header type
+  uint8_t m_nhcNextHeader;      //!< Next header
+  uint8_t m_nhcBlobLength;      //!< Length of the NHC compressed header
+  uint8_t m_nhcBlob[256];       //!< NHC compressed header
+};
+
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param header the NHC Extension Header
+ * \returns the reference to the output stream
+ */
+std::ostream & operator<< (std::ostream & os, SixLowPanNhcExtension const &header);
+
+
+/**
+* \ingroup sixlowpan
+* \brief   UDP LOWPAN_NHC Extension Header Encoding - see RFC 6282
+  \verbatim
+     0   1   2   3   4   5   6   7
+   +---+---+---+---+---+---+---+---+
+   | 1 | 1 | 1 | 1 | 0 | C |   P   |
+   +---+---+---+---+---+---+---+---+
+  \endverbatim
+*/
+class SixLowPanUdpNhcExtension : public Header
+{
+public:
+  /**
+   *  \brief Ports:
+   *
+   *  00: 16 bits for both Source Port and Destination Port
+   *  01: 16 bits for Source Port. Last 8 bits for Destination Port
+   *  10: Last 8 bits for Source Port. All 16 bits for Destination Port
+   *  11: Last 4 bits of both Source Port and Destination Port
+   */
+  enum Ports_e
+  {
+    PORTS_INLINE = 0,
+    PORTS_ALL_SRC_LAST_DST,
+    PORTS_LAST_SRC_ALL_DST,
+    PORTS_LAST_SRC_LAST_DST
+  };
+
+  SixLowPanUdpNhcExtension (void);
+
+  /**
+   * \brief Return the instance type identifier.
+   * \return instance type ID
+   */
+  static TypeId GetTypeId (void);
+
+  /**
+   * \brief Return the instance type identifier.
+   * \return instance type ID
+   */
+  virtual TypeId GetInstanceTypeId (void) const;
+
+  virtual void Print (std::ostream& os) const;
+
+  /**
+   * \brief Get the serialized size of the packet.
+   * \return size
+   */
+  virtual uint32_t GetSerializedSize (void) const;
+
+  /**
+   * \brief Serialize the packet.
+   * \param start Buffer iterator
+   */
+  virtual void Serialize (Buffer::Iterator start) const;
+
+  /**
+   * \brief Deserialize the packet.
+   * \param start Buffer iterator
+   * \return size of the packet
+   */
+  virtual uint32_t Deserialize (Buffer::Iterator start);
+
+  /**
+   * \brief Get the NhcDispatch type.
+   * \return the NhcDispatch type
+   */
+  virtual SixLowPanDispatch::NhcDispatch_e GetNhcDispatchType (void) const;
+
+  /**
+   * \brief Set the compressed Src and Dst Ports.
+   * \param port Src and Dst the Ports
+   */
+  void SetPorts (Ports_e port);
+
+  /**
+   * \brief Get the compressed Src and Dst Ports.
+   * \return the Src and Dst Ports
+   */
+  Ports_e GetPorts (void) const;
+
+  /**
+   * \brief Set the Destination Port.
+   * \param port the Destination Port.
+   */
+  void SetSrcPort (uint16_t port);
+
+  /**
+   * \brief Get the Destination Port.
+   * \return the Destination Port.
+   */
+  uint16_t GetSrcPort () const;
+
+  /**
+   * \brief Set the Destination Port.
+   * \param port the Destination Port.
+   */
+  void SetDstPort (uint16_t port);
+
+  /**
+   * \brief Get the Destination Port.
+   * \return the Destination Port.
+   */
+  uint16_t GetDstPort () const;
+
+  /**
+   * \brief Set the C (Checksum).
+   * \param cField false (All checksum carried in-line), true (Checksum elided)
+   */
+  void SetC (bool cField);
+
+  /**
+   * \brief Get the C (Checksum).
+   * \return false (All checksum carried in-line), true (Checksum elided)
+   */
+  bool GetC (void) const;
+
+  /**
+   * \brief Set the Checksum field values.
+   * \param checksum the Checksum field value
+   */
+  void SetChecksum (uint16_t checksum);
+
+  /**
+   * \brief Get the Checksum field value.
+   * \return the Checksum field value
+   */
+  uint16_t GetChecksum (void) const;
+
+private:
+  uint8_t m_baseFormat; //!< Dispatch + encoding fields
+  uint16_t m_checksum;  //!< Checksum
+  uint16_t m_srcPort;   //!< Source port
+  uint16_t m_dstPort;   //!< Destination port
+};
+
+/**
+ * \brief Stream insertion operator.
+ *
+ * \param os the reference to the output stream
+ * \param header the UDP NHC Extension Header
+ * \returns the reference to the output stream
+ */
+std::ostream & operator<< (std::ostream & os, SixLowPanUdpNhcExtension const &header);
+
+}
+
+#endif /* SIXLOWPANHEADER_H_ */
diff -Naur ns-3.18.1/src/sixlowpan/model/sixlowpan-net-device.cc ns-3.19/src/sixlowpan/model/sixlowpan-net-device.cc
--- ns-3.18.1/src/sixlowpan/model/sixlowpan-net-device.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/model/sixlowpan-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,2118 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ *         Michele Muccio <michelemuccio@virgilio.it>
+ */
+
+#include "ns3/node.h"
+#include "ns3/channel.h"
+#include "ns3/packet.h"
+#include "ns3/log.h"
+#include "ns3/boolean.h"
+#include "ns3/abort.h"
+#include "ns3/simulator.h"
+#include "ns3/uinteger.h"
+#include "ns3/icmpv6-header.h"
+#include "ns3/ipv6-header.h"
+#include "ns3/random-variable.h"
+#include "ns3/mac16-address.h"
+#include "ns3/mac48-address.h"
+#include "ns3/mac64-address.h"
+#include "ns3/unused.h"
+#include "ns3/ipv6-l3-protocol.h"
+#include "ns3/ipv6-extension-header.h"
+#include "ns3/udp-header.h"
+#include "ns3/udp-l4-protocol.h"
+#include "sixlowpan-net-device.h"
+#include "sixlowpan-header.h"
+
+NS_LOG_COMPONENT_DEFINE ("SixLowPanNetDevice")
+  ;
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanNetDevice)
+  ;
+
+TypeId SixLowPanNetDevice::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::SixLowPanNetDevice")
+    .SetParent<NetDevice> ()
+    .AddConstructor<SixLowPanNetDevice> ()
+    .AddAttribute ("Rfc6282", "Use RFC6282 (IPHC) if true, RFC4944 (HC1) otherwise.",
+                   BooleanValue (true),
+                   MakeBooleanAccessor (&SixLowPanNetDevice::m_useIphc),
+                   MakeBooleanChecker ())
+    .AddAttribute ("OmitUdpChecksum",
+                   "Omit the UDP checksum in IPHC compression.",
+                   BooleanValue (true),
+                   MakeBooleanAccessor (&SixLowPanNetDevice::m_omitUdpChecksum),
+                   MakeBooleanChecker ())
+    .AddAttribute ("FragmentReassemblyListSize", "The maximum size of the reassembly buffer (in packets). Zero meaning infinite.",
+                   UintegerValue (0),
+                   MakeUintegerAccessor (&SixLowPanNetDevice::m_fragmentReassemblyListSize),
+                   MakeUintegerChecker<uint16_t> ())
+    .AddAttribute ("FragmentExpirationTimeout",
+                   "When this timeout expires, the fragments will be cleared from the buffer.",
+                   TimeValue (Seconds (60)),
+                   MakeTimeAccessor (&SixLowPanNetDevice::m_fragmentExpirationTimeout),
+                   MakeTimeChecker ())
+    .AddAttribute ("ForceEtherType",
+                   "Force a specific EtherType in L2 frames.",
+                   BooleanValue (false),
+                   MakeBooleanAccessor (&SixLowPanNetDevice::m_forceEtherType),
+                   MakeBooleanChecker ())
+    .AddAttribute ("EtherType",
+                   "The specific EtherType to be used in L2 frames.",
+                   UintegerValue (0xFFFF),
+                   MakeUintegerAccessor (&SixLowPanNetDevice::m_etherType),
+                   MakeUintegerChecker<uint16_t> ())
+    .AddTraceSource ("Tx", "Send - packet (including 6LoWPAN header), SixLoWPanNetDevice Ptr, interface index.",
+                     MakeTraceSourceAccessor (&SixLowPanNetDevice::m_txTrace))
+    .AddTraceSource ("Rx", "Receive - packet (including 6LoWPAN header), SixLoWPanNetDevice Ptr, interface index.",
+                     MakeTraceSourceAccessor (&SixLowPanNetDevice::m_rxTrace))
+    .AddTraceSource ("Drop", "Drop - DropReason, packet (including 6LoWPAN header), SixLoWPanNetDevice Ptr, interface index.",
+                     MakeTraceSourceAccessor (&SixLowPanNetDevice::m_dropTrace))
+  ;
+  return tid;
+}
+
+SixLowPanNetDevice::SixLowPanNetDevice ()
+  : m_node (0),
+    m_netDevice (0),
+    m_ifIndex (0)
+{
+  NS_LOG_FUNCTION (this);
+  m_netDevice = 0;
+  m_rng = CreateObject<UniformRandomVariable> ();
+}
+
+Ptr<NetDevice> SixLowPanNetDevice::GetNetDevice () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_netDevice;
+}
+
+void SixLowPanNetDevice::SetNetDevice (Ptr<NetDevice> device)
+{
+  NS_LOG_FUNCTION (this << device);
+  m_netDevice = device;
+
+  NS_LOG_DEBUG ("RegisterProtocolHandler for " << device->GetInstanceTypeId ().GetName ());
+
+  uint16_t protocolType = 0;
+  if ( m_forceEtherType )
+    {
+      protocolType = m_etherType;
+    }
+  m_node->RegisterProtocolHandler (MakeCallback (&SixLowPanNetDevice::ReceiveFromDevice,
+                                                 this),
+                                   protocolType, device, false);
+}
+
+int64_t SixLowPanNetDevice::AssignStreams (int64_t stream)
+{
+  NS_LOG_FUNCTION (this << stream);
+  m_rng->SetStream (stream);
+  return 1;
+}
+
+void SixLowPanNetDevice::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+
+  m_netDevice = 0;
+  m_node = 0;
+
+  for (MapFragmentsTimersI_t iter = m_fragmentsTimers.begin (); iter != m_fragmentsTimers.end (); iter++)
+    {
+      iter->second.Cancel ();
+    }
+  m_fragmentsTimers.clear ();
+
+  for (MapFragmentsI_t iter = m_fragments.begin (); iter != m_fragments.end (); iter++)
+    {
+      iter->second = 0;
+    }
+  m_fragments.clear ();
+
+  NetDevice::DoDispose ();
+}
+
+void SixLowPanNetDevice::ReceiveFromDevice (Ptr<NetDevice> incomingPort,
+                                            Ptr<const Packet> packet,
+                                            uint16_t protocol,
+                                            Address const &src,
+                                            Address const &dst,
+                                            PacketType packetType)
+{
+  NS_LOG_FUNCTION (this << incomingPort << packet << protocol << src << dst);
+  NS_LOG_DEBUG ("UID is " << packet->GetUid ());
+
+  uint8_t dispatchRawVal = 0;
+  SixLowPanDispatch::Dispatch_e dispatchVal;
+  Ptr<Packet> copyPkt = packet->Copy ();
+
+  m_rxTrace (copyPkt, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+
+  copyPkt->CopyData (&dispatchRawVal, sizeof(dispatchRawVal));
+  dispatchVal = SixLowPanDispatch::GetDispatchType (dispatchRawVal);
+  bool isPktDecompressed = false;
+  bool fragmented = false;
+
+  NS_LOG_DEBUG ( "Packet received: " << *copyPkt );
+  NS_LOG_DEBUG ( "Packet length: " << copyPkt->GetSize () );
+  NS_LOG_DEBUG ( "Dispatches: " << int(dispatchRawVal) << " - " << int(dispatchVal) );
+
+  if ( dispatchVal == SixLowPanDispatch::LOWPAN_FRAG1 )
+    {
+      isPktDecompressed = ProcessFragment (copyPkt, src, dst, true);
+      fragmented = true;
+    }
+  else if ( dispatchVal == SixLowPanDispatch::LOWPAN_FRAGN )
+    {
+      isPktDecompressed = ProcessFragment (copyPkt, src, dst, false);
+      fragmented = true;
+    }
+  if ( fragmented )
+    {
+      if ( !isPktDecompressed )
+        {
+          return;
+        }
+      else
+        {
+          copyPkt->CopyData (&dispatchRawVal, sizeof(dispatchRawVal));
+          dispatchVal = SixLowPanDispatch::GetDispatchType (dispatchRawVal);
+        }
+    }
+
+  switch ( dispatchVal )
+    {
+    case SixLowPanDispatch::LOWPAN_MESH:
+      NS_LOG_DEBUG ("Unsupported 6LoWPAN encoding: MESH, dropping.");
+      m_dropTrace (DROP_UNKNOWN_EXTENSION, copyPkt, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+      break;
+    case SixLowPanDispatch::LOWPAN_BC0:
+      NS_LOG_DEBUG ("Unsupported 6LoWPAN encoding: BC0, dropping.");
+      m_dropTrace (DROP_UNKNOWN_EXTENSION, copyPkt, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+      break;
+    case SixLowPanDispatch::LOWPAN_NOTCOMPRESSED:
+      NS_LOG_DEBUG ( "Packet without compression:" << *copyPkt );
+      NS_LOG_DEBUG ( "Packet length:" << copyPkt->GetSize () );
+      m_dropTrace (DROP_UNKNOWN_EXTENSION, copyPkt, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+      break;
+    case SixLowPanDispatch::LOWPAN_HC1:
+      DecompressLowPanHc1 (copyPkt, src, dst);
+      isPktDecompressed = true;
+      break;
+    case SixLowPanDispatch::LOWPAN_IPHC:
+      DecompressLowPanIphc (copyPkt, src, dst);
+      isPktDecompressed = true;
+      break;
+    default:
+      NS_LOG_DEBUG ("Unsupported 6LoWPAN encoding: dropping.");
+      m_dropTrace (DROP_UNKNOWN_EXTENSION, copyPkt, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+      break;
+    }
+
+  if ( !isPktDecompressed )
+    {
+      return;
+    }
+
+  NS_LOG_DEBUG ( "Packet decompressed length: " << copyPkt->GetSize () );
+  NS_LOG_DEBUG ( "Packet decompressed received: " << *copyPkt );
+
+  if (!m_promiscRxCallback.IsNull ())
+    {
+      m_promiscRxCallback (this, copyPkt, Ipv6L3Protocol::PROT_NUMBER, src, dst, packetType);
+    }
+
+  m_rxCallback (this, copyPkt, Ipv6L3Protocol::PROT_NUMBER, src);
+
+  return;
+}
+
+void SixLowPanNetDevice::SetIfIndex (const uint32_t index)
+{
+  NS_LOG_FUNCTION (this << index);
+  // NS_ASSERT_MSG ( m_port != 0, "Sixlowpan: can't find any lower-layer protocol " << m_port );
+  m_ifIndex = index;
+}
+
+uint32_t SixLowPanNetDevice::GetIfIndex (void) const
+{
+  NS_LOG_FUNCTION (this);
+  // NS_ASSERT_MSG ( m_port != 0, "Sixlowpan: can't find any lower-layer protocol " << m_port );
+  return m_netDevice->GetIfIndex ();
+}
+
+Ptr<Channel> SixLowPanNetDevice::GetChannel (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->GetChannel ();
+}
+
+void SixLowPanNetDevice::SetAddress (Address address)
+{
+  NS_LOG_FUNCTION (this << address);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  m_netDevice->SetAddress (address);
+}
+
+Address SixLowPanNetDevice::GetAddress (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->GetAddress ();
+}
+
+bool SixLowPanNetDevice::SetMtu (const uint16_t mtu)
+{
+  NS_LOG_FUNCTION (this << mtu);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->SetMtu (mtu);
+}
+
+uint16_t SixLowPanNetDevice::GetMtu (void) const
+{
+  NS_LOG_FUNCTION (this);
+
+  uint16_t mtu = m_netDevice->GetMtu ();
+
+  // RFC 4944, section 4.
+  if (mtu < 1280)
+    {
+      mtu = 1280;
+    }
+  return mtu;
+}
+
+bool SixLowPanNetDevice::IsLinkUp (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->IsLinkUp ();
+}
+
+void SixLowPanNetDevice::AddLinkChangeCallback (Callback<void> callback)
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->AddLinkChangeCallback (callback);
+}
+
+bool SixLowPanNetDevice::IsBroadcast (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->IsBroadcast ();
+}
+
+Address SixLowPanNetDevice::GetBroadcast (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->GetBroadcast ();
+}
+
+bool SixLowPanNetDevice::IsMulticast (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->IsMulticast ();
+}
+
+Address SixLowPanNetDevice::GetMulticast (Ipv4Address multicastGroup) const
+{
+  NS_LOG_FUNCTION (this << multicastGroup);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->GetMulticast (multicastGroup);
+}
+
+Address SixLowPanNetDevice::GetMulticast (Ipv6Address addr) const
+{
+  NS_LOG_FUNCTION (this << addr);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->GetMulticast (addr);
+}
+
+bool SixLowPanNetDevice::IsPointToPoint (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->IsPointToPoint ();
+}
+
+bool SixLowPanNetDevice::IsBridge (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->IsBridge ();
+}
+
+bool SixLowPanNetDevice::Send (Ptr<Packet> packet,
+                               const Address& dest,
+                               uint16_t protocolNumber)
+{
+  NS_LOG_FUNCTION (this << *packet << dest << protocolNumber);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  uint32_t origHdrSize = 0;
+  uint32_t origPacketSize = packet->GetSize ();
+  bool ret = false;
+
+  if (m_forceEtherType)
+    {
+      protocolNumber = m_etherType;
+    }
+
+  if (m_useIphc)
+    {
+      origHdrSize += CompressLowPanIphc (packet, m_netDevice->GetAddress (), dest);
+    }
+  else
+    {
+      origHdrSize += CompressLowPanHc1 (packet, m_netDevice->GetAddress (), dest);
+    }
+
+  if ( packet->GetSize () > m_netDevice->GetMtu () )
+    {
+      NS_LOG_LOGIC ("Fragmentation: Packet size " << packet->GetSize () << " - Mtu " << m_netDevice->GetMtu () );
+      // fragment
+      std::list<Ptr<Packet> > fragmentList;
+      DoFragmentation (packet, origPacketSize, origHdrSize, fragmentList);
+      std::list<Ptr<Packet> >::iterator it;
+      bool success = true;
+      for ( it = fragmentList.begin (); it != fragmentList.end (); it++ )
+        {
+          NS_LOG_DEBUG ( "SixLowPanNetDevice::Send (Fragment) " << **it );
+          m_txTrace (*it, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+          success &= m_netDevice->Send (*it, dest, protocolNumber);
+        }
+      ret = success;
+    }
+  else
+    {
+      NS_LOG_DEBUG ( "SixLowPanNetDevice::Send " << m_node->GetId () << " " << *packet );
+      m_txTrace (packet, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+      ret = m_netDevice->Send (packet, dest, protocolNumber);
+    }
+
+  return ret;
+}
+
+bool SixLowPanNetDevice::SendFrom (Ptr<Packet> packet,
+                                   const Address& src,
+                                   const Address& dest,
+                                   uint16_t protocolNumber)
+{
+  NS_LOG_FUNCTION (this << packet << src << dest << protocolNumber);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  uint32_t origHdrSize = 0;
+  uint32_t origPacketSize = packet->GetSize ();
+  bool ret = false;
+
+  if (m_forceEtherType)
+    {
+      protocolNumber = m_etherType;
+    }
+
+  if (m_useIphc)
+    {
+      origHdrSize += CompressLowPanIphc (packet, m_netDevice->GetAddress (), dest);
+    }
+  else
+    {
+      origHdrSize += CompressLowPanHc1 (packet, m_netDevice->GetAddress (), dest);
+    }
+
+  if ( packet->GetSize () > m_netDevice->GetMtu () )
+    {
+      // fragment
+      std::list<Ptr<Packet> > fragmentList;
+      DoFragmentation (packet, origPacketSize, origHdrSize, fragmentList);
+      std::list<Ptr<Packet> >::iterator it;
+      bool err = false;
+      for ( it = fragmentList.begin (); it != fragmentList.end (); it++ )
+        {
+          NS_LOG_DEBUG ( "SixLowPanNetDevice::SendFrom (Fragment) " << **it );
+          m_txTrace (*it, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+          err |= !(m_netDevice->SendFrom (*it, src, dest, protocolNumber));
+        }
+      ret = !err;
+    }
+  else
+    {
+      NS_LOG_DEBUG ( "SixLowPanNetDevice::SendFrom " << *packet );
+      m_txTrace (packet, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+      ret = m_netDevice->SendFrom (packet, src, dest, protocolNumber);
+    }
+
+  return ret;
+}
+
+Ptr<Node> SixLowPanNetDevice::GetNode (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_node;
+}
+
+void SixLowPanNetDevice::SetNode (Ptr<Node> node)
+{
+  NS_LOG_FUNCTION (this << node);
+  m_node = node;
+}
+
+bool SixLowPanNetDevice::NeedsArp (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG ( m_netDevice != 0, "Sixlowpan: can't find any lower-layer protocol " << m_netDevice );
+
+  return m_netDevice->NeedsArp ();
+}
+
+void SixLowPanNetDevice::SetReceiveCallback (NetDevice::ReceiveCallback cb)
+{
+  NS_LOG_FUNCTION (this << &cb);
+  m_rxCallback = cb;
+}
+
+void SixLowPanNetDevice::SetPromiscReceiveCallback (NetDevice::PromiscReceiveCallback cb)
+{
+  NS_LOG_FUNCTION (this << &cb);
+  m_promiscRxCallback = cb;
+}
+
+bool SixLowPanNetDevice::SupportsSendFrom () const
+{
+  NS_LOG_FUNCTION (this);
+  return true;
+}
+
+uint32_t
+SixLowPanNetDevice::CompressLowPanHc1 (Ptr<Packet> packet, Address const &src, Address const &dst)
+{
+  NS_LOG_FUNCTION (this << *packet << src << dst);
+
+  Ipv6Header ipHeader;
+  SixLowPanHc1 hc1Header;
+  uint32_t size = 0;
+
+  if ( packet->PeekHeader (ipHeader) != 0 )
+    {
+      packet->RemoveHeader (ipHeader);
+      size += ipHeader.GetSerializedSize ();
+
+      hc1Header.SetHopLimit (ipHeader.GetHopLimit ());
+
+      uint8_t bufOne[16];
+      uint8_t bufTwo[16];
+      Ipv6Address srcAddr = ipHeader.GetSourceAddress ();
+      srcAddr.GetBytes (bufOne);
+      Ipv6Address mySrcAddr = MakeLinkLocalAddressFromMac (src);
+
+      NS_LOG_LOGIC ("Checking source compression: " << mySrcAddr << " - " << srcAddr );
+
+      mySrcAddr.GetBytes (bufTwo);
+      bool isSrcSrc = (memcmp (bufOne + 8, bufTwo + 8, 8) == 0);
+
+      if (srcAddr.IsLinkLocal () && isSrcSrc )
+        {
+          hc1Header.SetSrcCompression (SixLowPanHc1::HC1_PCIC);
+        }
+      else if (srcAddr.IsLinkLocal () )
+        {
+          hc1Header.SetSrcCompression (SixLowPanHc1::HC1_PCII);
+          hc1Header.SetSrcInterface (bufOne + 8);
+        }
+      else if ( isSrcSrc )
+        {
+          hc1Header.SetSrcCompression (SixLowPanHc1::HC1_PIIC);
+          hc1Header.SetSrcPrefix (bufOne);
+        }
+      else
+        {
+          hc1Header.SetSrcCompression (SixLowPanHc1::HC1_PIII);
+          hc1Header.SetSrcInterface (bufOne + 8);
+          hc1Header.SetSrcPrefix (bufOne);
+        }
+
+      Ipv6Address dstAddr = ipHeader.GetDestinationAddress ();
+      dstAddr.GetBytes (bufOne);
+      Ipv6Address myDstAddr = MakeLinkLocalAddressFromMac (dst);
+
+      NS_LOG_LOGIC ("Checking destination compression: " << myDstAddr << " - " << dstAddr );
+
+      myDstAddr.GetBytes (bufTwo);
+      bool isDstDst = (memcmp (bufOne + 8, bufTwo + 8, 8) == 0);
+
+      if (dstAddr.IsLinkLocal () && isDstDst )
+        {
+          hc1Header.SetDstCompression (SixLowPanHc1::HC1_PCIC);
+        }
+      else if (dstAddr.IsLinkLocal () )
+        {
+          hc1Header.SetDstCompression (SixLowPanHc1::HC1_PCII);
+          hc1Header.SetDstInterface (bufOne + 8);
+        }
+      else if ( isDstDst )
+        {
+          hc1Header.SetDstCompression (SixLowPanHc1::HC1_PIIC);
+          hc1Header.SetDstPrefix (bufOne);
+        }
+      else
+        {
+          hc1Header.SetDstCompression (SixLowPanHc1::HC1_PIII);
+          hc1Header.SetDstInterface (bufOne + 8);
+          hc1Header.SetDstPrefix (bufOne);
+        }
+
+      if ( (ipHeader.GetFlowLabel () == 0) && (ipHeader.GetTrafficClass () == 0) )
+        {
+          hc1Header.SetTcflCompression (true);
+        }
+      else
+        {
+          hc1Header.SetTcflCompression (false);
+          hc1Header.SetTrafficClass (ipHeader.GetTrafficClass ());
+          hc1Header.SetFlowLabel (ipHeader.GetFlowLabel ());
+        }
+
+      uint8_t nextHeader = ipHeader.GetNextHeader ();
+      hc1Header.SetNextHeader (nextHeader);
+
+      // \todo implement HC2 compression
+      hc1Header.SetHc2HeaderPresent (false);
+
+      NS_LOG_DEBUG ("HC1 Compression - HC1 header size = " << hc1Header.GetSerializedSize () );
+      NS_LOG_DEBUG ("HC1 Compression - packet size = " << packet->GetSize () );
+
+      packet->AddHeader (hc1Header);
+
+      return size;
+    }
+
+  return 0;
+}
+
+void
+SixLowPanNetDevice::DecompressLowPanHc1 (Ptr<Packet> packet, Address const &src, Address const &dst)
+{
+  NS_LOG_FUNCTION (this << *packet << src << dst);
+
+  Ipv6Header ipHeader;
+  SixLowPanHc1 encoding;
+
+  uint32_t ret = packet->RemoveHeader (encoding);
+  NS_LOG_DEBUG ("removed " << ret << " bytes - pkt is " << *packet);
+  NS_UNUSED (ret);
+
+  ipHeader.SetHopLimit (encoding.GetHopLimit ());
+
+  switch (encoding.GetSrcCompression ())
+    {
+      const uint8_t* interface;
+      const uint8_t* prefix;
+      uint8_t address[16];
+
+    case SixLowPanHc1::HC1_PIII:
+      prefix = encoding.GetSrcPrefix ();
+      interface = encoding.GetSrcInterface ();
+      for (int j = 0; j < 8; j++)
+        {
+          address[j + 8] = interface[j];
+          address[j] = prefix[j];
+        }
+      ipHeader.SetSourceAddress ( Ipv6Address (address) );
+      break;
+    case SixLowPanHc1::HC1_PIIC:
+      prefix = encoding.GetSrcPrefix ();
+      for (int j = 0; j < 8; j++)
+        {
+          address[j + 8] = 0;
+          address[j] = prefix[j];
+        }
+      ipHeader.SetSourceAddress ( MakeGlobalAddressFromMac (src, Ipv6Address (address)));
+      break;
+    case SixLowPanHc1::HC1_PCII:
+      interface = encoding.GetSrcInterface ();
+      address[0] = 0xfe;
+      address[1] = 0x80;
+      for (int j = 0; j < 8; j++)
+        {
+          address[j + 8] = interface[j];
+        }
+      ipHeader.SetSourceAddress ( Ipv6Address (address) );
+      break;
+    case SixLowPanHc1::HC1_PCIC:
+      ipHeader.SetSourceAddress (MakeLinkLocalAddressFromMac (src));
+      break;
+    }
+
+  switch (encoding.GetDstCompression ())
+    {
+      const uint8_t* interface;
+      const uint8_t* prefix;
+      uint8_t address[16];
+
+    case SixLowPanHc1::HC1_PIII:
+      prefix = encoding.GetDstPrefix ();
+      interface = encoding.GetDstInterface ();
+      for (int j = 0; j < 8; j++)
+        {
+          address[j + 8] = interface[j];
+          address[j] = prefix[j];
+        }
+      ipHeader.SetDestinationAddress ( Ipv6Address (address) );
+      break;
+    case SixLowPanHc1::HC1_PIIC:
+      prefix = encoding.GetDstPrefix ();
+      for (int j = 0; j < 8; j++)
+        {
+          address[j + 8] = 0;
+          address[j] = prefix[j];
+        }
+      ipHeader.SetDestinationAddress ( MakeGlobalAddressFromMac (dst, Ipv6Address (address)));
+      break;
+    case SixLowPanHc1::HC1_PCII:
+      interface = encoding.GetDstInterface ();
+      address[0] = 0xfe;
+      address[1] = 0x80;
+      for (int j = 0; j < 8; j++)
+        {
+          address[j + 8] = interface[j];
+        }
+      ipHeader.SetDestinationAddress ( Ipv6Address (address) );
+      break;
+    case SixLowPanHc1::HC1_PCIC:
+      ipHeader.SetDestinationAddress (MakeLinkLocalAddressFromMac (dst));
+      break;
+    }
+
+  if ( !encoding.IsTcflCompression () )
+    {
+      ipHeader.SetFlowLabel (encoding.GetFlowLabel ());
+      ipHeader.SetTrafficClass (encoding.GetTrafficClass ());
+    }
+  else
+    {
+      ipHeader.SetFlowLabel (0);
+      ipHeader.SetTrafficClass (0);
+    }
+
+  ipHeader.SetNextHeader (encoding.GetNextHeader ());
+
+  ipHeader.SetPayloadLength (packet->GetSize ());
+
+  NS_ASSERT_MSG (encoding.IsHc2HeaderPresent () == false,
+                 "6LoWPAN: error in decompressing HC1 encoding, unsupported L4 compressed header present.");
+
+  packet->AddHeader (ipHeader);
+
+  NS_LOG_DEBUG ( "Rebuilt packet: " << *packet << " Size " << packet->GetSize () );
+}
+
+uint32_t
+SixLowPanNetDevice::CompressLowPanIphc (Ptr<Packet> packet, Address const &src, Address const &dst)
+{
+  NS_LOG_FUNCTION (this << *packet << src << dst);
+
+  Ipv6Header ipHeader;
+  SixLowPanIphc iphcHeader;
+  uint32_t size = 0;
+
+
+  if ( packet->PeekHeader (ipHeader) != 0 )
+    {
+      packet->RemoveHeader (ipHeader);
+      size += ipHeader.GetSerializedSize ();
+
+      // Set the TF field
+      if ( (ipHeader.GetFlowLabel () == 0) && (ipHeader.GetTrafficClass () == 0) )
+        {
+          iphcHeader.SetTf (SixLowPanIphc::TF_ELIDED);
+        }
+      else if ( (ipHeader.GetFlowLabel () != 0) && (ipHeader.GetTrafficClass () != 0) )
+        {
+          iphcHeader.SetTf (SixLowPanIphc::TF_FULL);
+          iphcHeader.SetEcn ( (ipHeader.GetTrafficClass () & 0xC0) >> 6);
+          iphcHeader.SetDscp ( ipHeader.GetTrafficClass () & 0x3F );
+          iphcHeader.SetFlowLabel (ipHeader.GetFlowLabel ());
+        }
+      else if ( (ipHeader.GetFlowLabel () == 0) && (ipHeader.GetTrafficClass () != 0) )
+        {
+          iphcHeader.SetTf (SixLowPanIphc::TF_FL_ELIDED);
+          iphcHeader.SetEcn ( (ipHeader.GetTrafficClass () & 0xC0) >> 6);
+          iphcHeader.SetDscp ( ipHeader.GetTrafficClass () & 0x3F );
+        }
+      else
+        {
+          iphcHeader.SetTf (SixLowPanIphc::TF_DSCP_ELIDED);
+          iphcHeader.SetEcn ( (ipHeader.GetTrafficClass () & 0xC0) >> 6);
+          iphcHeader.SetFlowLabel (ipHeader.GetFlowLabel ());
+        }
+
+      // Set the NH field and NextHeader
+
+      uint8_t nextHeader = ipHeader.GetNextHeader ();
+      if (CanCompressLowPanNhc (nextHeader))
+        {
+          if (nextHeader == Ipv6Header::IPV6_UDP)
+            {
+              iphcHeader.SetNh (true);
+              size += CompressLowPanUdpNhc (packet, m_omitUdpChecksum);
+            }
+          else if (nextHeader == Ipv6Header::IPV6_IPV6)
+            {
+              iphcHeader.SetNh (true);
+              size += CompressLowPanIphc (packet, src, dst);
+            }
+          else
+            {
+              uint32_t sizeNhc = CompressLowPanNhc (packet, nextHeader, src, dst);
+              // the compression might fail due to Extension header size.
+              if (sizeNhc)
+                {
+                  iphcHeader.SetNh (true);
+                  size += sizeNhc;
+                }
+              else
+                {
+                  iphcHeader.SetNh (false);
+                  iphcHeader.SetNextHeader (nextHeader);
+                }
+            }
+        }
+      else
+        {
+          iphcHeader.SetNh (false);
+          iphcHeader.SetNextHeader (nextHeader);
+        }
+
+
+      // Set the HLIM field
+      if (ipHeader.GetHopLimit () == 1)
+        {
+          iphcHeader.SetHlim (SixLowPanIphc::HLIM_COMPR_1);
+        }
+      else if (ipHeader.GetHopLimit () == 0x40)
+        {
+          iphcHeader.SetHlim (SixLowPanIphc::HLIM_COMPR_64);
+        }
+      else if (ipHeader.GetHopLimit () == 0xFF)
+        {
+          iphcHeader.SetHlim (SixLowPanIphc::HLIM_COMPR_255);
+        }
+      else
+        {
+          iphcHeader.SetHlim (SixLowPanIphc::HLIM_INLINE);
+          // Set the HopLimit
+          iphcHeader.SetHopLimit (ipHeader.GetHopLimit ());
+        }
+
+      // \todo Add the check of CID if there is context-based compression
+      // Set the CID field
+      iphcHeader.SetCid (false);
+
+      // \todo Add the check of SAC if there is context-based compression
+      // Set the SAC field
+      iphcHeader.SetSac (false);
+
+      uint8_t addressBuf[16];
+      uint8_t unicastAddrCheckerBuf[16];
+      Ipv6Address srcAddr = ipHeader.GetSourceAddress ();
+      srcAddr.GetBytes (addressBuf);
+
+      Ipv6Address checker = Ipv6Address ("fe80:0000:0000:0000:0000:00ff:fe00:1");
+      checker.GetBytes (unicastAddrCheckerBuf);
+
+      // \todo Add the check of SAC if there is context-based compression
+      // Set the Source Address
+      iphcHeader.SetSrcAddress (srcAddr);
+
+      Ipv6Address mySrcAddr = MakeLinkLocalAddressFromMac (src);
+      NS_LOG_LOGIC ("Checking source compression: " << mySrcAddr << " - " << srcAddr );
+
+      if ( mySrcAddr == srcAddr )
+        {
+          iphcHeader.SetSam (SixLowPanIphc::HC_COMPR_0);
+        }
+      else if (memcmp (addressBuf, unicastAddrCheckerBuf, 14) == 0)
+        {
+          iphcHeader.SetSam (SixLowPanIphc::HC_COMPR_16);
+        }
+      else if ( srcAddr.IsLinkLocal () )
+        {
+          iphcHeader.SetSam (SixLowPanIphc::HC_COMPR_64);
+        }
+      else
+        {
+          iphcHeader.SetSam (SixLowPanIphc::HC_INLINE);
+        }
+
+      // Set the M field
+      if (ipHeader.GetDestinationAddress ().IsMulticast ())
+        {
+          iphcHeader.SetM (true);
+        }
+      else
+        {
+          iphcHeader.SetM (false);
+        }
+
+      // \todo Add the check of DAC if there is context-based compression
+      // Set the DAC field
+      iphcHeader.SetDac (false);
+
+      Ipv6Address dstAddr = ipHeader.GetDestinationAddress ();
+      dstAddr.GetBytes (addressBuf);
+
+      // \todo Add the check of DAC if there is context-based compression
+      // Set the Destination Address
+      iphcHeader.SetDstAddress (dstAddr);
+
+      Ipv6Address myDstAddr = MakeLinkLocalAddressFromMac (dst);
+      NS_LOG_LOGIC ("Checking destination compression: " << myDstAddr << " - " << dstAddr );
+
+      if ( !iphcHeader.GetM () )
+      // Unicast address
+        {
+          if ( myDstAddr == dstAddr )
+            {
+              iphcHeader.SetDam (SixLowPanIphc::HC_COMPR_0);
+            }
+          else if (memcmp (addressBuf, unicastAddrCheckerBuf, 14) == 0)
+            {
+              iphcHeader.SetDam (SixLowPanIphc::HC_COMPR_16);
+            }
+          else if ( dstAddr.IsLinkLocal () )
+            {
+              iphcHeader.SetDam (SixLowPanIphc::HC_COMPR_64);
+            }
+          else
+            {
+              iphcHeader.SetDam (SixLowPanIphc::HC_INLINE);
+            }
+        }
+      else
+        {
+          // Multicast address
+          uint8_t multicastAddrCheckerBuf[16];
+          Ipv6Address multicastCheckAddress = Ipv6Address ("ff02::1");
+          multicastCheckAddress.GetBytes (multicastAddrCheckerBuf);
+
+          // The address takes the form ff02::00XX.
+          if ( memcmp (addressBuf, multicastAddrCheckerBuf, 15) == 0 )
+            {
+              iphcHeader.SetDam (SixLowPanIphc::HC_COMPR_0);
+            }
+          // The address takes the form ffXX::00XX:XXXX.
+          //                            ffXX:0000:0000:0000:0000:0000:00XX:XXXX.
+          else if ( (addressBuf[0] == multicastAddrCheckerBuf[0])
+                    && (memcmp (addressBuf + 2, multicastAddrCheckerBuf + 2, 11) ) )
+            {
+              iphcHeader.SetDam (SixLowPanIphc::HC_COMPR_16);
+            }
+          // The address takes the form ffXX::00XX:XXXX:XXXX.
+          //                            ffXX:0000:0000:0000:0000:00XX:XXXX:XXXX.
+          else if ( (addressBuf[0] == multicastAddrCheckerBuf[0])
+                    && (memcmp (addressBuf + 2, multicastAddrCheckerBuf + 2, 9) ) )
+            {
+              iphcHeader.SetDam (SixLowPanIphc::HC_COMPR_64);
+            }
+          else
+            {
+              iphcHeader.SetDam (SixLowPanIphc::HC_INLINE);
+            }
+        }
+
+      NS_LOG_DEBUG ("IPHC Compression - IPHC header size = " << iphcHeader.GetSerializedSize () );
+      NS_LOG_DEBUG ("IPHC Compression - packet size = " << packet->GetSize () );
+
+      packet->AddHeader (iphcHeader);
+
+      NS_LOG_DEBUG ("Packet after IPHC compression: " << *packet);
+
+      return size;
+    }
+
+  return 0;
+}
+
+bool
+SixLowPanNetDevice::CanCompressLowPanNhc (uint8_t nextHeader)
+{
+  bool ret = false;
+
+  switch (nextHeader)
+    {
+    case Ipv6Header::IPV6_UDP:
+    case Ipv6Header::IPV6_EXT_HOP_BY_HOP:
+    case Ipv6Header::IPV6_EXT_ROUTING:
+    case Ipv6Header::IPV6_EXT_FRAGMENTATION:
+    case Ipv6Header::IPV6_IPV6:
+      ret = true;
+      break;
+    case Ipv6Header::IPV6_EXT_MOBILITY:
+    default:
+      ret = false;
+    }
+  return ret;
+}
+
+void
+SixLowPanNetDevice::DecompressLowPanIphc (Ptr<Packet> packet, Address const &src, Address const &dst)
+{
+  NS_LOG_FUNCTION (this << *packet << src << dst);
+
+  Ipv6Header ipHeader;
+  SixLowPanIphc encoding;
+
+  uint32_t ret = packet->RemoveHeader (encoding);
+  NS_LOG_DEBUG ("removed " << ret << " bytes - pkt is " << *packet);
+  NS_UNUSED (ret);
+
+  // Hop Limit
+  ipHeader.SetHopLimit (encoding.GetHopLimit ());
+
+  // Source address
+  if ( encoding.GetSac () )
+    {
+      if ( encoding.GetSam () == SixLowPanIphc::HC_INLINE )
+        {
+          ipHeader.SetSourceAddress ( Ipv6Address::GetAny () );
+        }
+      else
+        {
+          NS_ABORT_MSG ("SAC option not yet implemented");
+        }
+    }
+  else
+    {
+      if ( encoding.GetSam () == SixLowPanIphc::HC_COMPR_0 )
+        {
+          ipHeader.SetSourceAddress (MakeLinkLocalAddressFromMac (src));
+        }
+      else
+        {
+          ipHeader.SetSourceAddress ( encoding.GetSrcAddress () );
+        }
+    }
+  // Destination address
+  if ( encoding.GetDac () )
+    {
+      if ((encoding.GetDam () == SixLowPanIphc::HC_INLINE  && !encoding.GetM ())
+          || (encoding.GetDam () == SixLowPanIphc::HC_COMPR_64  && encoding.GetM ())
+          || (encoding.GetDam () == SixLowPanIphc::HC_COMPR_16  && encoding.GetM ())
+          || (encoding.GetDam () == SixLowPanIphc::HC_COMPR_0  && encoding.GetM ()) )
+        {
+          NS_ABORT_MSG ("Reserved code found");
+        }
+      else
+        {
+          NS_ABORT_MSG ("DAC option not yet implemented");
+        }
+    }
+  else
+    {
+      if ( !encoding.GetM () && encoding.GetDam () == SixLowPanIphc::HC_COMPR_0 )
+        {
+          ipHeader.SetDestinationAddress (MakeLinkLocalAddressFromMac (dst));
+        }
+      else
+        {
+          ipHeader.SetDestinationAddress ( encoding.GetDstAddress () );
+        }
+    }
+
+  // Traffic class and Flow Label
+  uint8_t traf = 0x00;
+  switch (encoding.GetTf ())
+    {
+    case SixLowPanIphc::TF_FULL:
+      traf |= encoding.GetEcn ();
+      traf = ( traf << 6 ) | encoding.GetDscp ();
+      ipHeader.SetTrafficClass (traf);
+      ipHeader.SetFlowLabel ( encoding.GetFlowLabel () & 0xfff ); //Add 4-bit pad
+      break;
+    case SixLowPanIphc::TF_DSCP_ELIDED:
+      traf |= encoding.GetEcn ();
+      traf <<= 2;   // Add 2-bit pad
+      ipHeader.SetTrafficClass (traf);
+      ipHeader.SetFlowLabel (encoding.GetFlowLabel ());
+      break;
+    case SixLowPanIphc::TF_FL_ELIDED:
+      traf |= encoding.GetEcn ();
+      traf = ( traf << 6 ) | encoding.GetDscp ();
+      ipHeader.SetTrafficClass (traf);
+      ipHeader.SetFlowLabel (0);
+      break;
+    case SixLowPanIphc::TF_ELIDED:
+      ipHeader.SetFlowLabel (0);
+      ipHeader.SetTrafficClass (0);
+      break;
+    }
+
+  if ( encoding.GetNh () )
+    {
+      // Next Header
+      uint8_t dispatchRawVal = 0;
+      SixLowPanDispatch::NhcDispatch_e dispatchVal;
+
+      packet->CopyData (&dispatchRawVal, sizeof(dispatchRawVal));
+      dispatchVal = SixLowPanDispatch::GetNhcDispatchType (dispatchRawVal);
+
+      if (dispatchVal == SixLowPanDispatch::LOWPAN_UDPNHC)
+        {
+          ipHeader.SetNextHeader (Ipv6Header::IPV6_UDP);
+          DecompressLowPanUdpNhc (packet, ipHeader.GetSourceAddress (), ipHeader.GetDestinationAddress ());
+        }
+      else
+        {
+          ipHeader.SetNextHeader (DecompressLowPanNhc (packet, src, dst, ipHeader.GetSourceAddress (), ipHeader.GetDestinationAddress ()));
+        }
+    }
+  else
+    {
+      ipHeader.SetNextHeader (encoding.GetNextHeader ());
+    }
+
+  ipHeader.SetPayloadLength (packet->GetSize ());
+
+  packet->AddHeader (ipHeader);
+
+  NS_LOG_DEBUG ( "Rebuilt packet: " << *packet << " Size " << packet->GetSize () );
+
+}
+
+uint32_t
+SixLowPanNetDevice::CompressLowPanNhc (Ptr<Packet> packet, uint8_t headerType, Address const &src, Address const &dst)
+{
+  NS_LOG_FUNCTION (this << *packet << int(headerType));
+
+  SixLowPanNhcExtension nhcHeader;
+  uint32_t size = 0;
+  Buffer blob;
+
+  if (headerType == Ipv6Header::IPV6_EXT_HOP_BY_HOP)
+    {
+      Ipv6ExtensionHopByHopHeader hopHeader;
+      packet->PeekHeader (hopHeader);
+      if (hopHeader.GetLength () >= 0xff)
+        {
+          NS_LOG_DEBUG ("LOWPAN_NHC MUST NOT be used to encode IPv6 Extension Headers "
+                        "that have more than 255 octets following the Length field after compression. "
+                        "Packet uncompressed.");
+          return 0;
+        }
+
+      size += packet->RemoveHeader (hopHeader);
+      nhcHeader.SetEid (SixLowPanNhcExtension::EID_HOPBYHOP_OPTIONS_H);
+
+      // recursively compress other headers
+      uint8_t nextHeader = hopHeader.GetNextHeader ();
+      if (CanCompressLowPanNhc (nextHeader))
+        {
+          if (nextHeader == Ipv6Header::IPV6_UDP)
+            {
+              nhcHeader.SetNh (true);
+              size += CompressLowPanUdpNhc (packet, m_omitUdpChecksum);
+            }
+          else if (nextHeader == Ipv6Header::IPV6_IPV6)
+            {
+              nhcHeader.SetNh (true);
+              size += CompressLowPanIphc (packet, src, dst);
+            }
+          else
+            {
+              uint32_t sizeNhc = CompressLowPanNhc (packet, nextHeader, src, dst);
+              // the compression might fail due to Extension header size.
+              if (sizeNhc)
+                {
+                  nhcHeader.SetNh (true);
+                  size += sizeNhc;
+                }
+              else
+                {
+                  nhcHeader.SetNh (false);
+                  nhcHeader.SetNextHeader (nextHeader);
+                }
+            }
+        }
+      else
+        {
+          nhcHeader.SetNh (false);
+          nhcHeader.SetNextHeader (nextHeader);
+        }
+
+      uint32_t blobSize = hopHeader.GetSerializedSize ();
+      blob.AddAtStart (blobSize);
+      hopHeader.Serialize (blob.Begin ());
+      blob.RemoveAtStart (2);
+      blobSize = blob.GetSize ();
+      nhcHeader.SetBlob (blob.PeekData (), blobSize);
+    }
+  else if (headerType == Ipv6Header::IPV6_EXT_ROUTING)
+    {
+      Ipv6ExtensionRoutingHeader routingHeader;
+      packet->PeekHeader (routingHeader);
+      if (routingHeader.GetLength () >= 0xff)
+        {
+          NS_LOG_DEBUG ("LOWPAN_NHC MUST NOT be used to encode IPv6 Extension Headers "
+                        "that have more than 255 octets following the Length field after compression. "
+                        "Packet uncompressed.");
+          return 0;
+        }
+
+      size += packet->RemoveHeader (routingHeader);
+      nhcHeader.SetEid (SixLowPanNhcExtension::EID_ROUTING_H);
+
+      // recursively compress other headers
+      uint8_t nextHeader = routingHeader.GetNextHeader ();
+      if (CanCompressLowPanNhc (nextHeader))
+        {
+          if (nextHeader == Ipv6Header::IPV6_UDP)
+            {
+              nhcHeader.SetNh (true);
+              size += CompressLowPanUdpNhc (packet, m_omitUdpChecksum);
+            }
+          else if (nextHeader == Ipv6Header::IPV6_IPV6)
+            {
+              nhcHeader.SetNh (true);
+              size += CompressLowPanIphc (packet, src, dst);
+            }
+          else
+            {
+              uint32_t sizeNhc = CompressLowPanNhc (packet, nextHeader, src, dst);
+              // the compression might fail due to Extension header size.
+              if (sizeNhc)
+                {
+                  nhcHeader.SetNh (true);
+                  size += sizeNhc;
+                }
+              else
+                {
+                  nhcHeader.SetNh (false);
+                  nhcHeader.SetNextHeader (nextHeader);
+                }
+            }
+        }
+      else
+        {
+          nhcHeader.SetNh (false);
+          nhcHeader.SetNextHeader (nextHeader);
+        }
+
+      uint32_t blobSize = routingHeader.GetSerializedSize ();
+      blob.AddAtStart (blobSize);
+      routingHeader.Serialize (blob.Begin ());
+      blob.RemoveAtStart (2);
+      blobSize = blob.GetSize ();
+      nhcHeader.SetBlob (blob.PeekData (), blobSize);
+    }
+  else if (headerType == Ipv6Header::IPV6_EXT_FRAGMENTATION)
+    {
+      Ipv6ExtensionFragmentHeader fragHeader;
+      packet->PeekHeader (fragHeader);
+      if (fragHeader.GetLength () >= 0xff)
+        {
+          NS_LOG_DEBUG ("LOWPAN_NHC MUST NOT be used to encode IPv6 Extension Headers "
+                        "that have more than 255 octets following the Length field after compression. "
+                        "Packet uncompressed.");
+          return 0;
+        }
+      size += packet->RemoveHeader (fragHeader);
+      nhcHeader.SetEid (SixLowPanNhcExtension::EID_FRAGMENTATION_H);
+
+      // recursively compress other headers
+      uint8_t nextHeader = fragHeader.GetNextHeader ();
+      if (CanCompressLowPanNhc (nextHeader))
+        {
+          if (nextHeader == Ipv6Header::IPV6_UDP)
+            {
+              nhcHeader.SetNh (true);
+              size += CompressLowPanUdpNhc (packet, m_omitUdpChecksum);
+            }
+          else if (nextHeader == Ipv6Header::IPV6_IPV6)
+            {
+              nhcHeader.SetNh (true);
+              size += CompressLowPanIphc (packet, src, dst);
+            }
+          else
+            {
+              uint32_t sizeNhc = CompressLowPanNhc (packet, nextHeader, src, dst);
+              // the compression might fail due to Extension header size.
+              if (sizeNhc)
+                {
+                  nhcHeader.SetNh (true);
+                  size += sizeNhc;
+                }
+              else
+                {
+                  nhcHeader.SetNh (false);
+                  nhcHeader.SetNextHeader (nextHeader);
+                }
+            }
+        }
+      else
+        {
+          nhcHeader.SetNh (false);
+          nhcHeader.SetNextHeader (nextHeader);
+        }
+
+      uint32_t blobSize = fragHeader.GetSerializedSize ();
+      blob.AddAtStart (blobSize);
+      fragHeader.Serialize (blob.Begin ());
+      blob.RemoveAtStart (2);
+      blobSize = blob.GetSize ();
+      nhcHeader.SetBlob (blob.PeekData (), blobSize);
+    }
+  else if (headerType == Ipv6Header::IPV6_EXT_DESTINATION)
+    {
+      Ipv6ExtensionDestinationHeader destHeader;
+      packet->PeekHeader (destHeader);
+      if (destHeader.GetLength () >= 0xff)
+        {
+          NS_LOG_DEBUG ("LOWPAN_NHC MUST NOT be used to encode IPv6 Extension Headers "
+                        "that have more than 255 octets following the Length field after compression. "
+                        "Packet uncompressed.");
+          return 0;
+        }
+      size += packet->RemoveHeader (destHeader);
+      nhcHeader.SetEid (SixLowPanNhcExtension::EID_DESTINATION_OPTIONS_H);
+
+      // recursively compress other headers
+      uint8_t nextHeader = destHeader.GetNextHeader ();
+      if (CanCompressLowPanNhc (nextHeader))
+        {
+          if (nextHeader == Ipv6Header::IPV6_UDP)
+            {
+              nhcHeader.SetNh (true);
+              size += CompressLowPanUdpNhc (packet, m_omitUdpChecksum);
+            }
+          else if (nextHeader == Ipv6Header::IPV6_IPV6)
+            {
+              nhcHeader.SetNh (true);
+              size += CompressLowPanIphc (packet, src, dst);
+            }
+          else
+            {
+              uint32_t sizeNhc = CompressLowPanNhc (packet, nextHeader, src, dst);
+              // the compression might fail due to Extension header size.
+              if (sizeNhc)
+                {
+                  nhcHeader.SetNh (true);
+                  size += sizeNhc;
+                }
+              else
+                {
+                  nhcHeader.SetNh (false);
+                  nhcHeader.SetNextHeader (nextHeader);
+                }
+            }
+        }
+      else
+        {
+          nhcHeader.SetNh (false);
+          nhcHeader.SetNextHeader (nextHeader);
+        }
+
+      uint32_t blobSize = destHeader.GetSerializedSize ();
+      blob.AddAtStart (blobSize);
+      destHeader.Serialize (blob.Begin ());
+      blob.RemoveAtStart (2);
+      blobSize = blob.GetSize ();
+      nhcHeader.SetBlob (blob.PeekData (), blobSize);
+    }
+  else if (headerType == Ipv6Header::IPV6_EXT_MOBILITY)
+    {
+      // \todo: IPv6 Mobility Header is not supported in ns-3
+      NS_ABORT_MSG ("IPv6 Mobility Header is not supported in ns-3 yet");
+      return 0;
+    }
+  else
+    {
+      NS_ABORT_MSG ("Unexpected Extension Header");
+    }
+
+  NS_LOG_DEBUG ("NHC Compression - NHC header size = " << nhcHeader.GetSerializedSize () );
+  NS_LOG_DEBUG ("NHC Compression - packet size = " << packet->GetSize () );
+
+  packet->AddHeader (nhcHeader);
+
+  NS_LOG_DEBUG ("Packet after NHC compression: " << *packet);
+  return size;
+}
+
+uint8_t
+SixLowPanNetDevice::DecompressLowPanNhc (Ptr<Packet> packet, Address const &src, Address const &dst, Ipv6Address srcAddress, Ipv6Address dstAddress)
+{
+  NS_LOG_FUNCTION (this << *packet);
+
+  SixLowPanNhcExtension encoding;
+
+  uint32_t ret = packet->RemoveHeader (encoding);
+  NS_LOG_DEBUG ("removed " << ret << " bytes - pkt is " << *packet);
+  NS_UNUSED (ret);
+
+  Ipv6ExtensionHopByHopHeader hopHeader;
+  Ipv6ExtensionRoutingHeader routingHeader;
+  Ipv6ExtensionFragmentHeader fragHeader;
+  Ipv6ExtensionDestinationHeader destHeader;
+
+  uint32_t blobSize;
+  uint8_t blobData[260];
+  blobSize = encoding.CopyBlob (blobData + 2, 260);
+  uint8_t paddingSize = 0;
+
+  uint8_t actualEncodedHeaderType = encoding.GetEid ();
+  uint8_t actualHeaderType;
+  Buffer blob;
+
+  switch (actualEncodedHeaderType)
+    {
+    case SixLowPanNhcExtension::EID_HOPBYHOP_OPTIONS_H:
+      actualHeaderType = Ipv6Header::IPV6_EXT_HOP_BY_HOP;
+      if ( encoding.GetNh () )
+        {
+          // Next Header
+          uint8_t dispatchRawVal = 0;
+          SixLowPanDispatch::NhcDispatch_e dispatchVal;
+
+          packet->CopyData (&dispatchRawVal, sizeof(dispatchRawVal));
+          dispatchVal = SixLowPanDispatch::GetNhcDispatchType (dispatchRawVal);
+
+          if (dispatchVal == SixLowPanDispatch::LOWPAN_UDPNHC)
+            {
+              blobData [0] = Ipv6Header::IPV6_UDP;
+              DecompressLowPanUdpNhc (packet, srcAddress, dstAddress);
+            }
+          else
+            {
+              blobData [0] = DecompressLowPanNhc (packet, src, dst, srcAddress, dstAddress);
+            }
+        }
+      else
+        {
+          blobData [0] = encoding.GetNextHeader ();
+        }
+
+      // manually add some padding if needed
+      if ((blobSize + 2) % 8 > 0)
+        {
+          paddingSize = 8 - (blobSize + 2) % 8;
+        }
+      if (paddingSize == 1)
+        {
+          blobData[blobSize + 2] = 0;
+        }
+      else if (paddingSize > 1)
+        {
+          blobData[blobSize + 2] = 1;
+          blobData[blobSize + 2 + 1] = paddingSize - 2;
+          for (uint8_t i = 0; i < paddingSize - 2; i++)
+            {
+              blobData[blobSize + 2 + 2 + i] = 0;
+            }
+        }
+      blobData [1] = ((blobSize + 2 + paddingSize) >> 3) - 1;
+      blob.AddAtStart (blobSize + 2 + paddingSize);
+      blob.Begin ().Write (blobData, blobSize + 2 + paddingSize);
+      hopHeader.Deserialize (blob.Begin ());
+
+      packet->AddHeader (hopHeader);
+      break;
+
+    case SixLowPanNhcExtension::EID_ROUTING_H:
+      actualHeaderType = Ipv6Header::IPV6_EXT_ROUTING;
+      if ( encoding.GetNh () )
+        {
+          // Next Header
+          uint8_t dispatchRawVal = 0;
+          SixLowPanDispatch::NhcDispatch_e dispatchVal;
+
+          packet->CopyData (&dispatchRawVal, sizeof(dispatchRawVal));
+          dispatchVal = SixLowPanDispatch::GetNhcDispatchType (dispatchRawVal);
+
+          if (dispatchVal == SixLowPanDispatch::LOWPAN_UDPNHC)
+            {
+              blobData [0] = Ipv6Header::IPV6_UDP;
+              DecompressLowPanUdpNhc (packet, srcAddress, dstAddress);
+            }
+          else
+            {
+              blobData [0] = DecompressLowPanNhc (packet, src, dst, srcAddress, dstAddress);
+            }
+        }
+      else
+        {
+          blobData [0] = encoding.GetNextHeader ();
+        }
+      blobData [1] = ((blobSize + 2) >> 3) - 1;
+      blob.AddAtStart (blobSize + 2);
+      blob.Begin ().Write (blobData, blobSize + 2);
+      routingHeader.Deserialize (blob.Begin ());
+      packet->AddHeader (routingHeader);
+      break;
+
+    case SixLowPanNhcExtension::EID_FRAGMENTATION_H:
+      actualHeaderType = Ipv6Header::IPV6_EXT_FRAGMENTATION;
+      if ( encoding.GetNh () )
+        {
+          // Next Header
+          uint8_t dispatchRawVal = 0;
+          SixLowPanDispatch::NhcDispatch_e dispatchVal;
+
+          packet->CopyData (&dispatchRawVal, sizeof(dispatchRawVal));
+          dispatchVal = SixLowPanDispatch::GetNhcDispatchType (dispatchRawVal);
+
+          if (dispatchVal == SixLowPanDispatch::LOWPAN_UDPNHC)
+            {
+              blobData [0] = Ipv6Header::IPV6_UDP;
+              DecompressLowPanUdpNhc (packet, srcAddress, dstAddress);
+            }
+          else
+            {
+              blobData [0] = DecompressLowPanNhc (packet, src, dst, srcAddress, dstAddress);
+            }
+        }
+      else
+        {
+          blobData [0] = encoding.GetNextHeader ();
+        }
+      blobData [1] = 0;
+      fragHeader.Deserialize (blob.Begin ());
+      packet->AddHeader (fragHeader);
+      break;
+
+    case SixLowPanNhcExtension::EID_DESTINATION_OPTIONS_H:
+      actualHeaderType = Ipv6Header::IPV6_EXT_DESTINATION;
+      if ( encoding.GetNh () )
+        {
+          // Next Header
+          uint8_t dispatchRawVal = 0;
+          SixLowPanDispatch::NhcDispatch_e dispatchVal;
+
+          packet->CopyData (&dispatchRawVal, sizeof(dispatchRawVal));
+          dispatchVal = SixLowPanDispatch::GetNhcDispatchType (dispatchRawVal);
+
+          if (dispatchVal == SixLowPanDispatch::LOWPAN_UDPNHC)
+            {
+              blobData [0] = Ipv6Header::IPV6_UDP;
+              DecompressLowPanUdpNhc (packet, srcAddress, dstAddress);
+            }
+          else
+            {
+              blobData [0] = DecompressLowPanNhc (packet, src, dst, srcAddress, dstAddress);
+            }
+        }
+      else
+        {
+          blobData [0] = encoding.GetNextHeader ();
+        }
+
+      // manually add some padding if needed
+      if ((blobSize + 2) % 8 > 0)
+        {
+          paddingSize = 8 - (blobSize + 2) % 8;
+        }
+      if (paddingSize == 1)
+        {
+          blobData[blobSize + 2] = 0;
+        }
+      else if (paddingSize > 1)
+        {
+          blobData[blobSize + 2] = 1;
+          blobData[blobSize + 2 + 1] = paddingSize - 2;
+          for (uint8_t i = 0; i < paddingSize - 2; i++)
+            {
+              blobData[blobSize + 2 + 2 + i] = 0;
+            }
+        }
+      blobData [1] = ((blobSize + 2 + paddingSize) >> 3) - 1;
+      blob.AddAtStart (blobSize + 2 + paddingSize);
+      blob.Begin ().Write (blobData, blobSize + 2 + paddingSize);
+      destHeader.Deserialize (blob.Begin ());
+
+      packet->AddHeader (destHeader);
+      break;
+    case SixLowPanNhcExtension::EID_MOBILITY_H:
+      // \todo: IPv6 Mobility Header is not supported in ns-3
+      NS_ABORT_MSG ("IPv6 Mobility Header is not supported in ns-3 yet");
+      break;
+    case SixLowPanNhcExtension::EID_IPv6_H:
+      actualHeaderType = Ipv6Header::IPV6_IPV6;
+      DecompressLowPanIphc (packet, src, dst);
+      break;
+    default:
+      NS_ABORT_MSG ("Trying to decode unknown Extension Header");
+      break;
+    }
+
+  NS_LOG_DEBUG ( "Rebuilt packet: " << *packet << " Size " << packet->GetSize () );
+  return actualHeaderType;
+}
+
+uint32_t
+SixLowPanNetDevice::CompressLowPanUdpNhc (Ptr<Packet> packet, bool omitChecksum)
+{
+  NS_LOG_FUNCTION (this << *packet << int(omitChecksum));
+
+  UdpHeader udpHeader;
+  SixLowPanUdpNhcExtension udpNhcHeader;
+  uint32_t size = 0;
+
+  NS_ASSERT_MSG (packet->PeekHeader (udpHeader) != 0, "UDP header not found, abort");
+
+  size += packet->RemoveHeader (udpHeader);
+
+  // Set the C field and checksum
+  udpNhcHeader.SetC (false);
+  uint16_t checksum = udpHeader.GetChecksum ();
+  udpNhcHeader.SetChecksum (checksum);
+
+  if (omitChecksum && udpHeader.IsChecksumOk ())
+    {
+      udpNhcHeader.SetC (true);
+    }
+
+  // Set the value of the ports
+  udpNhcHeader.SetSrcPort (udpHeader.GetSourcePort ());
+  udpNhcHeader.SetDstPort (udpHeader.GetDestinationPort ());
+
+  //Set the P field
+  if ( (udpHeader.GetSourcePort () >> 4 ) == 0xf0b && (udpHeader.GetDestinationPort () >> 4 ) == 0xf0b )
+    {
+      udpNhcHeader.SetPorts (SixLowPanUdpNhcExtension::PORTS_LAST_SRC_LAST_DST);
+    }
+  else if ( (udpHeader.GetSourcePort () >> 8 ) == 0xf0 && (udpHeader.GetDestinationPort () >> 8 ) != 0xf0 )
+    {
+      udpNhcHeader.SetPorts (SixLowPanUdpNhcExtension::PORTS_LAST_SRC_ALL_DST);
+    }
+  else if ( (udpHeader.GetSourcePort () >> 8 ) != 0xf0 && (udpHeader.GetDestinationPort () >> 8 ) == 0xf0 )
+    {
+      udpNhcHeader.SetPorts (SixLowPanUdpNhcExtension::PORTS_ALL_SRC_LAST_DST);
+    }
+  else
+    {
+      udpNhcHeader.SetPorts (SixLowPanUdpNhcExtension::PORTS_INLINE);
+    }
+
+  NS_LOG_DEBUG ("UDP_NHC Compression - UDP_NHC header size = " << udpNhcHeader.GetSerializedSize () );
+  NS_LOG_DEBUG ("UDP_NHC Compression - packet size = " << packet->GetSize () );
+
+  packet->AddHeader (udpNhcHeader);
+
+  NS_LOG_DEBUG ("Packet after UDP_NHC compression: " << *packet);
+
+  return size;
+}
+
+void
+SixLowPanNetDevice::DecompressLowPanUdpNhc (Ptr<Packet> packet, Ipv6Address saddr, Ipv6Address daddr)
+{
+  NS_LOG_FUNCTION (this << *packet);
+
+  UdpHeader udpHeader;
+  SixLowPanUdpNhcExtension encoding;
+
+  uint32_t ret = packet->RemoveHeader (encoding);
+  NS_LOG_DEBUG ("removed " << ret << " bytes - pkt is " << *packet);
+  NS_UNUSED (ret);
+
+  // Set the value of the ports
+  switch ( encoding.GetPorts () )
+    {
+      uint16_t temp;
+    case SixLowPanUdpNhcExtension::PORTS_INLINE:
+      udpHeader.SetSourcePort (encoding.GetSrcPort ());
+      udpHeader.SetDestinationPort (encoding.GetDstPort ());
+      break;
+    case SixLowPanUdpNhcExtension::PORTS_ALL_SRC_LAST_DST:
+      udpHeader.SetSourcePort (encoding.GetSrcPort ());
+      temp = 0xf0;
+      temp |= (temp << 8) | encoding.GetDstPort ();
+      udpHeader.SetDestinationPort (temp);
+      break;
+    case SixLowPanUdpNhcExtension::PORTS_LAST_SRC_ALL_DST:
+      temp = 0xf0;
+      temp |= (temp << 8) | encoding.GetSrcPort ();
+      udpHeader.SetSourcePort (temp);
+      udpHeader.SetDestinationPort (encoding.GetDstPort ());
+      break;
+    case SixLowPanUdpNhcExtension::PORTS_LAST_SRC_LAST_DST:
+      temp = 0xf0b;
+      temp |= (temp << 4) | encoding.GetSrcPort ();
+      udpHeader.SetSourcePort (temp);
+      temp = 0xf0b;
+      temp |= (temp << 4) | encoding.GetDstPort ();
+      udpHeader.SetDestinationPort (temp);
+      break;
+    }
+
+  // Get the C field and checksum
+  if (Node::ChecksumEnabled ())
+    {
+      if ( encoding.GetC () )
+        {
+          NS_LOG_LOGIC ("Recalculating UDP Checksum");
+          udpHeader.EnableChecksums ();
+          udpHeader.InitializeChecksum (saddr,
+                                        daddr,
+                                        UdpL4Protocol::PROT_NUMBER);
+          packet->AddHeader (udpHeader);
+        }
+      else
+        {
+          NS_LOG_LOGIC ("Forcing UDP Checksum to " << encoding.GetChecksum ());
+          udpHeader.ForceChecksum (encoding.GetChecksum ());
+          packet->AddHeader (udpHeader);
+          NS_LOG_LOGIC ("UDP checksum is ok ? " << udpHeader.IsChecksumOk ());
+        }
+    }
+  else
+    {
+      packet->AddHeader (udpHeader);
+    }
+
+  NS_LOG_DEBUG ( "Rebuilt packet: " << *packet << " Size " << packet->GetSize () );
+}
+
+void SixLowPanNetDevice::DoFragmentation (Ptr<Packet> packet,
+                                          uint32_t origPacketSize,
+                                          uint32_t origHdrSize,
+                                          std::list<Ptr<Packet> >& listFragments)
+{
+  NS_LOG_FUNCTION (this << *packet);
+
+  Ptr<Packet> p = packet->Copy ();
+
+  uint16_t offsetData = 0;
+  uint16_t offset = 0;
+  uint16_t l2Mtu = m_netDevice->GetMtu ();
+  uint32_t packetSize = packet->GetSize ();
+  uint32_t compressedHeaderSize = packetSize - (origPacketSize - origHdrSize);
+
+  uint16_t tag = uint16_t (m_rng->GetValue (0, 65535));
+  NS_LOG_LOGIC ("random tag " << tag << " - test " << packetSize );
+
+  // first fragment
+  SixLowPanFrag1 frag1Hdr;
+  frag1Hdr.SetDatagramTag (tag);
+
+  uint32_t size;
+  NS_ASSERT_MSG ( l2Mtu > frag1Hdr.GetSerializedSize (),
+                  "6LoWPAN: can not fragment, 6LoWPAN headers are bigger than MTU");
+
+  size = l2Mtu - frag1Hdr.GetSerializedSize () - compressedHeaderSize;
+  size -= size % 8;
+  size += compressedHeaderSize;
+
+  frag1Hdr.SetDatagramSize (origPacketSize);
+
+  Ptr<Packet> fragment1 = p->CreateFragment (offsetData, size);
+  offset += size + origHdrSize - compressedHeaderSize;
+  offsetData += size;
+
+  fragment1->AddHeader (frag1Hdr);
+  listFragments.push_back (fragment1);
+
+  bool moreFrag = true;
+  do
+    {
+      SixLowPanFragN fragNHdr;
+      fragNHdr.SetDatagramTag (tag);
+      fragNHdr.SetDatagramSize (origPacketSize);
+      fragNHdr.SetDatagramOffset ((offset) >> 3);
+
+      size = l2Mtu - fragNHdr.GetSerializedSize ();
+      size -= size % 8;
+
+      if ( (offsetData + size) > packetSize )
+        {
+          size = packetSize - offsetData;
+          moreFrag = false;
+        }
+
+      NS_LOG_LOGIC ("Fragment creation - " << offset << ", " << offset );
+      Ptr<Packet> fragment = p->CreateFragment (offsetData, size);
+      NS_LOG_LOGIC ("Fragment created - " << offset << ", " << fragment->GetSize () );
+
+      offset += size;
+      offsetData += size;
+
+      fragment->AddHeader (fragNHdr);
+      listFragments.push_back (fragment);
+
+    }
+  while (moreFrag);
+
+  return;
+}
+
+bool SixLowPanNetDevice::ProcessFragment (Ptr<Packet>& packet, Address const &src, Address const &dst, bool isFirst)
+{
+  NS_LOG_FUNCTION ( this << *packet );
+  SixLowPanFrag1 frag1Header;
+  SixLowPanFragN fragNHeader;
+  FragmentKey key;
+  uint16_t packetSize;
+  key.first = std::pair<Address, Address> (src, dst);
+
+  Ptr<Packet> p = packet->Copy ();
+  uint16_t offset = 0;
+
+  /* Implementation note:
+   *
+   * The fragment offset is relative to the *uncompressed* packet.
+   * On the other hand, the packet can not be uncompressed correctly without all
+   * its fragments, as the UDP checksum can not be computed otherwise.
+   *
+   * As a consequence we must uncompress the packet twice, and save its first
+   * fragment for the final one.
+   */
+
+  if ( isFirst )
+    {
+      uint8_t dispatchRawValFrag1 = 0;
+      SixLowPanDispatch::Dispatch_e dispatchValFrag1;
+
+      p->RemoveHeader (frag1Header);
+      packetSize = frag1Header.GetDatagramSize ();
+      p->CopyData (&dispatchRawValFrag1, sizeof(dispatchRawValFrag1));
+      dispatchValFrag1 = SixLowPanDispatch::GetDispatchType (dispatchRawValFrag1);
+      NS_LOG_DEBUG ( "Dispatches: " << int(dispatchRawValFrag1) << " - " << int(dispatchValFrag1) );
+      NS_LOG_DEBUG ( "Packet: " << *p );
+
+      switch ( dispatchValFrag1 )
+        {
+        case SixLowPanDispatch::LOWPAN_NOTCOMPRESSED:
+          NS_LOG_DEBUG ( "Packet without compression:" << *p );
+          NS_LOG_DEBUG ( "Packet length:" << p->GetSize () );
+          break;
+        case SixLowPanDispatch::LOWPAN_HC1:
+          DecompressLowPanHc1 (p, src, dst);
+          break;
+        case SixLowPanDispatch::LOWPAN_IPHC:
+          DecompressLowPanIphc (p, src, dst);
+          break;
+        default:
+          NS_FATAL_ERROR ("Unsupported 6LoWPAN encoding, exiting.");
+          break;
+        }
+
+      key.second = std::pair<uint16_t, uint16_t> (frag1Header.GetDatagramSize (), frag1Header.GetDatagramTag ());
+    }
+  else
+    {
+      p->RemoveHeader (fragNHeader);
+      packetSize = fragNHeader.GetDatagramSize ();
+      offset = fragNHeader.GetDatagramOffset () << 3;
+      key.second = std::pair<uint16_t, uint16_t> (fragNHeader.GetDatagramSize (), fragNHeader.GetDatagramTag ());
+    }
+
+  Ptr<Fragments> fragments;
+
+  MapFragments_t::iterator it = m_fragments.find (key);
+  if (it == m_fragments.end ())
+    {
+      // erase the oldest packet.
+      if ( m_fragmentReassemblyListSize && (m_fragments.size () >= m_fragmentReassemblyListSize) )
+        {
+          MapFragmentsTimers_t::iterator iter;
+          MapFragmentsTimers_t::iterator iterFound = m_fragmentsTimers.begin ();
+          for ( iter = m_fragmentsTimers.begin (); iter != m_fragmentsTimers.end (); iter++)
+            {
+              if ( iter->second.GetTs () < iterFound->second.GetTs () )
+                {
+                  iterFound = iter;
+                }
+            }
+          FragmentKey oldestKey = iterFound->first;
+
+          std::list< Ptr<Packet> > storedFragments = m_fragments[oldestKey]->GetFraments ();
+          for (std::list< Ptr<Packet> >::iterator fragIter = storedFragments.begin ();
+               fragIter != storedFragments.end (); fragIter++)
+            {
+              m_dropTrace (DROP_FRAGMENT_BUFFER_FULL, *fragIter, m_node->GetObject<SixLowPanNetDevice> (), GetIfIndex ());
+            }
+
+          m_fragmentsTimers[oldestKey].Cancel ();
+          m_fragmentsTimers.erase (oldestKey);
+          m_fragments[oldestKey] = 0;
+          m_fragments.erase (oldestKey);
+
+        }
+      fragments = Create<Fragments> ();
+      fragments->SetPacketSize (packetSize);
+      m_fragments.insert (std::make_pair (key, fragments));
+      uint32_t ifIndex = GetIfIndex ();
+      m_fragmentsTimers[key] = Simulator::Schedule (m_fragmentExpirationTimeout,
+                                                    &SixLowPanNetDevice::HandleFragmentsTimeout, this,
+                                                    key, ifIndex);
+    }
+  else
+    {
+      fragments = it->second;
+    }
+
+  fragments->AddFragment (p, offset);
+
+  // add the very first fragment so we can correctly decode the packet once is rebuilt.
+  // this is needed because otherwise the UDP header length and checksum can not be calculated.
+  if ( isFirst )
+    {
+      fragments->AddFirstFragment (packet);
+    }
+
+  if ( fragments->IsEntire () )
+    {
+      packet = fragments->GetPacket ();
+      NS_LOG_LOGIC ("Reconstructed packet: " << *packet);
+
+      SixLowPanFrag1 frag1Header;
+      packet->RemoveHeader (frag1Header);
+
+      NS_LOG_LOGIC ("Rebuilt packet. Size " << packet->GetSize () << " - " << *packet);
+      fragments = 0;
+      m_fragments.erase (key);
+      if (m_fragmentsTimers[key].IsRunning ())
+        {
+          NS_LOG_LOGIC ("Stopping 6LoWPAN WaitFragmentsTimer at " << Simulator::Now ().GetSeconds () << " due to complete packet");
+          m_fragmentsTimers[key].Cancel ();
+        }
+      m_fragmentsTimers.erase (key);
+      return true;
+    }
+
+  return false;
+}
+
+SixLowPanNetDevice::Fragments::Fragments ()
+{
+  NS_LOG_FUNCTION (this);
+  m_packetSize = 0;
+}
+
+SixLowPanNetDevice::Fragments::~Fragments ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void SixLowPanNetDevice::Fragments::AddFragment (Ptr<Packet> fragment, uint16_t fragmentOffset)
+{
+  NS_LOG_FUNCTION (this << fragmentOffset << *fragment);
+
+  std::list<std::pair<Ptr<Packet>, uint16_t> >::iterator it;
+  bool duplicate = false;
+
+  for (it = m_fragments.begin (); it != m_fragments.end (); it++)
+    {
+      if (it->second > fragmentOffset)
+        {
+          break;
+        }
+      if (it->second == fragmentOffset)
+        {
+          duplicate = true;
+          NS_ASSERT_MSG (fragment->GetSize () == it->first->GetSize (), "Duplicate fragment size differs. Aborting.");
+          break;
+        }
+    }
+  if (!duplicate)
+    {
+      m_fragments.insert (it, std::make_pair (fragment, fragmentOffset));
+    }
+}
+
+void SixLowPanNetDevice::Fragments::AddFirstFragment (Ptr<Packet> fragment)
+{
+  NS_LOG_FUNCTION (this << *fragment);
+
+  m_firstFragment = fragment;
+}
+
+bool SixLowPanNetDevice::Fragments::IsEntire () const
+{
+  NS_LOG_FUNCTION (this);
+
+  bool ret = m_fragments.size () > 0;
+  uint16_t lastEndOffset = 0;
+
+  if (ret)
+    {
+      for (std::list<std::pair<Ptr<Packet>, uint16_t> >::const_iterator it = m_fragments.begin (); it != m_fragments.end (); it++)
+        {
+          // overlapping fragments should not exist
+          NS_LOG_LOGIC ("Checking overlaps " << lastEndOffset << " - " << it->second );
+
+          if (lastEndOffset < it->second)
+            {
+              ret = false;
+              break;
+            }
+          // fragments might overlap in strange ways
+          uint16_t fragmentEnd = it->first->GetSize () + it->second;
+          lastEndOffset = std::max ( lastEndOffset, fragmentEnd );
+        }
+    }
+
+  if ( ret && (lastEndOffset == m_packetSize))
+    {
+      return true;
+    }
+  return false;
+}
+
+Ptr<Packet> SixLowPanNetDevice::Fragments::GetPacket () const
+{
+  NS_LOG_FUNCTION (this);
+
+  std::list<std::pair<Ptr<Packet>, uint16_t> >::const_iterator it = m_fragments.begin ();
+
+  Ptr<Packet> p = Create<Packet> ();
+  uint16_t lastEndOffset = 0;
+
+  p->AddAtEnd (m_firstFragment);
+  it = m_fragments.begin ();
+  lastEndOffset = it->first->GetSize ();
+
+  for ( it++; it != m_fragments.end (); it++)
+    {
+      if ( lastEndOffset > it->second )
+        {
+          NS_ABORT_MSG ("Overlapping fragments found, forbidden condition");
+        }
+      else
+        {
+          NS_LOG_LOGIC ("Adding: " << *(it->first) );
+          p->AddAtEnd (it->first);
+        }
+      lastEndOffset += it->first->GetSize ();
+    }
+
+  return p;
+}
+
+void SixLowPanNetDevice::Fragments::SetPacketSize (uint32_t packetSize)
+{
+  NS_LOG_FUNCTION (this << packetSize);
+  m_packetSize = packetSize;
+}
+
+std::list< Ptr<Packet> > SixLowPanNetDevice::Fragments::GetFraments () const
+{
+  std::list< Ptr<Packet> > fragments;
+  std::list<std::pair<Ptr<Packet>, uint16_t> >::const_iterator iter;
+  for ( iter = m_fragments.begin (); iter != m_fragments.end (); iter ++)
+    {
+      fragments.push_back (iter->first);
+    }
+  return fragments;
+}
+
+void SixLowPanNetDevice::HandleFragmentsTimeout (FragmentKey key, uint32_t iif)
+{
+  NS_LOG_FUNCTION (this);
+
+  MapFragments_t::iterator it = m_fragments.find (key);
+  std::list< Ptr<Packet> > storedFragments = it->second->GetFraments ();
+  for (std::list< Ptr<Packet> >::iterator fragIter = storedFragments.begin ();
+       fragIter != storedFragments.end (); fragIter++)
+    {
+      m_dropTrace (DROP_FRAGMENT_TIMEOUT, *fragIter, m_node->GetObject<SixLowPanNetDevice> (), iif);
+    }
+  // clear the buffers
+  it->second = 0;
+
+  m_fragments.erase (key);
+  m_fragmentsTimers.erase (key);
+}
+
+Ipv6Address SixLowPanNetDevice::MakeLinkLocalAddressFromMac (Address const &addr)
+{
+  Ipv6Address ipv6Addr = Ipv6Address::GetAny ();
+
+  if (m_forceEtherType && Mac48Address::IsMatchingType (addr))
+    {
+      ipv6Addr = Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac48Address::ConvertFrom (addr));
+    }
+  else
+    {
+      if (Mac64Address::IsMatchingType (addr))
+        {
+          ipv6Addr = Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac64Address::ConvertFrom (addr));
+        }
+      else if (Mac16Address::IsMatchingType (addr))
+        {
+          ipv6Addr = Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac16Address::ConvertFrom (addr));
+        }
+    }
+  if (ipv6Addr.IsAny ())
+    {
+      NS_ABORT_MSG ("Unknown address type");
+    }
+  return ipv6Addr;
+}
+
+Ipv6Address SixLowPanNetDevice::MakeGlobalAddressFromMac (Address const &addr, Ipv6Address prefix)
+{
+  Ipv6Address ipv6Addr = Ipv6Address::GetAny ();
+
+  if (m_forceEtherType && Mac48Address::IsMatchingType (addr))
+    {
+      ipv6Addr = Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), Ipv6Address (prefix) );
+    }
+  else
+    {
+      if (Mac64Address::IsMatchingType (addr))
+        {
+          ipv6Addr = Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), Ipv6Address (prefix));
+        }
+      else if (Mac16Address::IsMatchingType (addr))
+        {
+          ipv6Addr = Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), Ipv6Address (prefix) );
+        }
+    }
+  if (ipv6Addr.IsAny ())
+    {
+      NS_ABORT_MSG ("Unknown address type");
+    }
+  return ipv6Addr;
+}
+
+}
+
+// namespace ns3
diff -Naur ns-3.18.1/src/sixlowpan/model/sixlowpan-net-device.h ns-3.19/src/sixlowpan/model/sixlowpan-net-device.h
--- ns-3.18.1/src/sixlowpan/model/sixlowpan-net-device.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/model/sixlowpan-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,468 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ *         Michele Muccio <michelemuccio@virgilio.it>
+ */
+
+#ifndef SIXLOWPAN_NET_DEVICE_H
+#define SIXLOWPAN_NET_DEVICE_H
+
+#include <stdint.h>
+#include <string>
+#include <map>
+#include "ns3/traced-callback.h"
+#include "ns3/event-id.h"
+#include "ns3/nstime.h"
+#include "ns3/net-device.h"
+#include "ns3/packet.h"
+#include "sixlowpan-header.h"
+#include "ns3/random-variable-stream.h"
+
+namespace ns3 {
+
+class Node;
+
+/**
+ * \defgroup sixlowpan 6LoWPAN
+ * \brief Performs 6LoWPAN compression of IPv6 packets as specified by RFC 4944 and RFC 6282
+ *
+ * This module acts as a shim between IPv6 and a generic NetDevice.
+ *
+ * The module implements RFCs 4944 and 6282, with the following exceptions:
+ * <ul>
+ * <li> MESH and LOWPAN_BC0 dispatch types are not supported </li>
+ * <li> HC2 encoding is not supported </li>
+ * <li> IPHC's SAC and DAC are not supported </li>
+ *</ul>
+ */
+
+/**
+ * \ingroup sixlowpan
+ *
+ * \brief Shim performing 6LoWPAN compression, decompression and fragmentation.
+ *
+ * This class implements the shim between IPv6 and a generic NetDevice,
+ * performing packet compression, decompression and fragmentation in a transparent way.
+ * To this end, the class pretend to be a normal NetDevice, masquerading some functions
+ * of the underlying NetDevice.
+ */
+class SixLowPanNetDevice : public NetDevice
+{
+public:
+  /**
+   * Enumeration of the dropping reasons in SixLoWPAN.
+   */
+  enum DropReason
+  {
+    DROP_FRAGMENT_TIMEOUT = 1, /**< Fragment timeout exceeded */
+    DROP_FRAGMENT_BUFFER_FULL, /**< Fragment buffer size exceeded */
+    DROP_UNKNOWN_EXTENSION /**< Unsupported compression kind */
+  };
+
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
+  static TypeId GetTypeId (void);
+
+  /**
+   * Constructor for the SixLowPanNetDevice.
+   */
+  SixLowPanNetDevice ();
+
+  // inherited from NetDevice base class
+  virtual void SetIfIndex (const uint32_t index);
+  virtual uint32_t GetIfIndex (void) const;
+  virtual Ptr<Channel> GetChannel (void) const;
+  virtual void SetAddress (Address address);
+  virtual Address GetAddress (void) const;
+  virtual bool SetMtu (const uint16_t mtu);
+
+  /**
+   * \brief Returns the link-layer MTU for this interface.
+   * If the link-layer MTU is smaller than IPv6's minimum MTU (RFC 4944),
+   * 1280 will be returned.
+   *
+   * \return the link-level MTU in bytes for this interface.
+   */
+  virtual uint16_t GetMtu (void) const;
+  virtual bool IsLinkUp (void) const;
+  virtual void AddLinkChangeCallback (Callback<void> callback);
+  virtual bool IsBroadcast (void) const;
+  virtual Address GetBroadcast (void) const;
+  virtual bool IsMulticast (void) const;
+  virtual Address GetMulticast (Ipv4Address multicastGroup) const;
+  virtual bool IsPointToPoint (void) const;
+  virtual bool IsBridge (void) const;
+  virtual bool Send (Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);
+  virtual bool SendFrom (Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber);
+  virtual Ptr<Node> GetNode (void) const;
+  virtual void SetNode (Ptr<Node> node);
+  virtual bool NeedsArp (void) const;
+  virtual void SetReceiveCallback (NetDevice::ReceiveCallback cb);
+  virtual void SetPromiscReceiveCallback (NetDevice::PromiscReceiveCallback cb);
+  virtual bool SupportsSendFrom () const;
+  virtual Address GetMulticast (Ipv6Address addr) const;
+
+  /**
+   * \brief Returns a smart pointer to the underlying NetDevice.
+   *
+   * \return a smart pointer to the underlying NetDevice.
+   */
+  Ptr<NetDevice> GetNetDevice () const;
+
+  /**
+   * \brief Setup SixLowPan to be a proxy for the specified NetDevice.
+   * All the packets incoming and outgoing from the NetDevice will be
+   * processed by SixLowPanNetDevice.
+   *
+   * \param device a smart pointer to the NetDevice to be proxied.
+   */
+  void SetNetDevice (Ptr<NetDevice> device);
+
+  /**
+   * Assign a fixed random variable stream number to the random variables
+   * used by this model.  Return the number of streams (possibly zero) that
+   * have been assigned.
+   *
+   * \param stream first stream index to use
+   * \return the number of stream indices assigned by this model
+   */
+  int64_t AssignStreams (int64_t stream);
+
+protected:
+  virtual void DoDispose (void);
+
+private:
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   */
+  SixLowPanNetDevice (SixLowPanNetDevice const &);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   * \returns
+   */
+  SixLowPanNetDevice& operator= (SixLowPanNetDevice const &);
+  /**
+   * \brief receives all the packets from a NetDevice for further processing.
+   * \param device the NetDevice the packet ws received from
+   * \param packet the received packet
+   * \param protocol the protocol (if known)
+   * \param source the source address
+   * \param destination the destination address
+   * \param packetType the packet kind (e.g., HOST, BROADCAST, etc.)
+   * \return the IPv6 link-local address
+   */
+  void ReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,
+                          Address const &source, Address const &destination, PacketType packetType);
+
+  /**
+   * The callback used to notify higher layers that a packet has been received.
+   */
+  NetDevice::ReceiveCallback m_rxCallback;
+
+  /**
+   * The callback used to notify higher layers that a packet has been received in promiscuous mode.
+   */
+  NetDevice::PromiscReceiveCallback m_promiscRxCallback;
+
+  /**
+   * \brief Callback to trace TX (transmission) packets.
+   *
+   * Data passed:
+   * \li Packet received (including 6LoWPAN header)
+   * \li Ptr to SixLowPanNetDevice
+   * \li interface index
+   */
+  TracedCallback<Ptr<const Packet>, Ptr<SixLowPanNetDevice>, uint32_t> m_txTrace;
+
+  /**
+   * \brief Callback to trace RX (reception) packets.
+   *
+   * Data passed:
+   * \li Packet received (including 6LoWPAN header)
+   * \li Ptr to SixLowPanNetDevice
+   * \li interface index
+   */
+  TracedCallback<Ptr<const Packet>, Ptr<SixLowPanNetDevice>, uint32_t> m_rxTrace;
+
+  /**
+   * \brief Callback to trace drop packets.
+   *
+   * Data passed:
+   * \li DropReason
+   * \li Packet dropped (including 6LoWPAN header)
+   * \li Ptr to SixLowPanNetDevice
+   * \li interface index
+   */
+  TracedCallback<DropReason, Ptr<const Packet>, Ptr<SixLowPanNetDevice>, uint32_t> m_dropTrace;
+
+  /**
+   * \brief make a link-local address from a MAC address.
+   * \param addr the MAC address
+   * \return the IPv6 link-local address
+   */
+  Ipv6Address MakeLinkLocalAddressFromMac (Address const &addr);
+
+  /**
+   * \brief make a global address from a MAC address.
+   * \param addr the MAC address
+   * \param prefix the address prefix
+   * \return the IPv6 address
+   */
+  Ipv6Address MakeGlobalAddressFromMac (Address const &addr, Ipv6Address prefix);
+
+  /**
+   * \brief Compress the headers according to HC1 compression.
+   * \param packet the packet to be compressed
+   * \param src the MAC source address
+   * \param dst the MAC destination address
+   * \return the size of the removed headers
+   */
+  uint32_t CompressLowPanHc1 (Ptr<Packet> packet, Address const &src, Address const &dst);
+
+  /**
+   * \brief Decompress the headers according to HC1 compression.
+   * \param packet the packet to be compressed
+   * \param src the MAC source address
+   * \param dst the MAC destination address
+   */
+  void DecompressLowPanHc1 (Ptr<Packet> packet, Address const &src, Address const &dst);
+
+  /**
+   * \brief Compress the headers according to IPHC compression.
+   * \param packet the packet to be compressed
+   * \param src the MAC source address
+   * \param dst the MAC destination address
+   * \return the size of the removed headers
+   */
+  uint32_t CompressLowPanIphc (Ptr<Packet> packet, Address const &src, Address const &dst);
+
+  /**
+   * \brief Checks if the next header can be compressed using NHC.
+   * \param headerType the header kind to be compressed
+   * \return true if the header can be compressed
+   */
+  bool CanCompressLowPanNhc (uint8_t headerType);
+
+  /**
+   * \brief Decompress the headers according to IPHC compression.
+   * \param packet the packet to be compressed
+   * \param src the MAC source address
+   * \param dst the MAC destination address
+   */
+  void DecompressLowPanIphc (Ptr<Packet> packet, Address const &src, Address const &dst);
+
+  /**
+   * \brief Compress the headers according to NHC compression.
+   * \param packet the packet to be compressed
+   * \param headerType the header type
+   * \param src the MAC source address
+   * \param dst the MAC destination address
+   * \return the size of the removed headers
+   */
+  uint32_t CompressLowPanNhc (Ptr<Packet> packet, uint8_t headerType, Address const &src, Address const &dst);
+
+  /**
+   * \brief Decompress the headers according to NHC compression.
+   * \param packet the packet to be compressed
+   * \param src the MAC source address
+   * \param dst the MAC destination address
+   * \param srcAddress the IPv6 source address
+   * \param dstAddress the IPv6 destination address
+   * \return the decompressed header type
+   */
+  uint8_t DecompressLowPanNhc (Ptr<Packet> packet, Address const &src, Address const &dst, Ipv6Address srcAddress, Ipv6Address dstAddress);
+
+  /**
+   * \brief Compress the headers according to NHC compression.
+   * \param packet the packet to be compressed
+   * \param omitChecksum omit UDP checksum (if true)
+   * \return the size of the removed headers
+   */
+  uint32_t CompressLowPanUdpNhc (Ptr<Packet> packet, bool omitChecksum);
+
+  /**
+   * \brief Decompress the headers according to NHC compression.
+   * \param packet the packet to be compressed
+   * \param saddr the IPv6 source address
+   * \param daddr the IPv6 destination address
+   */
+  void DecompressLowPanUdpNhc (Ptr<Packet> packet, Ipv6Address saddr, Ipv6Address daddr);
+
+  /**
+   * Fragment identifier type: src/dst address src/dst port
+   */
+  typedef std::pair< std::pair<Address, Address>, std::pair<uint16_t, uint16_t> > FragmentKey;
+
+  /**
+   * \class Fragments
+   * \brief A Set of Fragment
+   */
+  class Fragments : public SimpleRefCount<Fragments>
+  {
+public:
+    /**
+     * \brief Constructor.
+     */
+    Fragments ();
+
+    /**
+     * \brief Destructor.
+     */
+    ~Fragments ();
+
+    /**
+     * \brief Add a fragment to the pool.
+     * \param fragment the fragment
+     * \param fragmentOffset the offset of the fragment
+     */
+    void AddFragment (Ptr<Packet> fragment, uint16_t fragmentOffset);
+
+    /**
+     * \brief Add the first packet fragment. The first fragment is needed to
+     * allow the post-defragmentation decompression.
+     * \param fragment the fragment
+     */
+    void AddFirstFragment (Ptr<Packet> fragment);
+
+    /**
+     * \brief If all fragments have been added.
+     * \returns true if the packet is entire
+     */
+    bool IsEntire () const;
+
+    /**
+     * \brief Get the entire packet.
+     * \return the entire packet
+     */
+    Ptr<Packet> GetPacket () const;
+
+    /**
+     * \brief Set the packet-to-be-defragmented size.
+     * \param packetSize the packet size (bytes)
+     */
+    void SetPacketSize (uint32_t packetSize);
+
+    /**
+     * \brief Get a list of the current stored fragments.
+     */
+    std::list< Ptr<Packet> > GetFraments () const;
+
+private:
+    /**
+     * \brief The size of the reconstructed packet (bytes).
+     */
+    uint32_t m_packetSize;
+
+    /**
+     * \brief The current fragments.
+     */
+    std::list<std::pair<Ptr<Packet>, uint16_t> > m_fragments;
+
+    /**
+     * \brief The very first fragment
+     */
+    Ptr<Packet> m_firstFragment;
+
+  };
+
+  /**
+   * \brief Return the instance type identifier.
+   * \param packet the packet to be fragmented (with headers already compressed with 6LoWPAN)
+   * \param origPacketSize the size of the IP packet before the 6LoWPAN header compression, including the IP/L4 headers
+   * \param origHdrSize the size of the IP header before the 6LoWPAN header compression
+   * \param listFragments a reference to the list of the resulting packets, all with the proper headers in place
+   */
+  void DoFragmentation (Ptr<Packet> packet, uint32_t origPacketSize, uint32_t origHdrSize,
+                        std::list<Ptr<Packet> >& listFragments);
+
+  /**
+   * \brief Process a packet fragment
+   * \param packet the packet
+   * \param src the source MAC address
+   * \param dst the destination MAC address
+   * \param isFirst true if it is the first fragment, false otherwise
+   * \return true is the fragment completed the packet
+   */
+  bool ProcessFragment (Ptr<Packet>& packet, Address const &src, Address const &dst, bool isFirst);
+
+  /**
+   * \brief Process the timeout for packet fragments
+   * \param key representing the packet fragments
+   * \param iif Input Interface
+   */
+  void HandleFragmentsTimeout ( FragmentKey key, uint32_t iif);
+
+  /**
+   * \brief Drops the oldest fragment set
+   */
+  void DropOldestFragmentSet ();
+
+  /**
+   * Container for fragment key -> fragments
+   */
+  typedef std::map< FragmentKey, Ptr<Fragments> > MapFragments_t;
+  /**
+   * Container Iterator for fragment key -> fragments
+   */
+  typedef std::map< FragmentKey, Ptr<Fragments> >::iterator MapFragmentsI_t;
+  /**
+   * Container for fragment key -> exiration event
+   */
+  typedef std::map< FragmentKey, EventId > MapFragmentsTimers_t;
+  /**
+   * Container Iterator for fragment key -> exiration event
+   */
+  typedef std::map< FragmentKey, EventId >::iterator MapFragmentsTimersI_t;
+
+  MapFragments_t       m_fragments; /**< Fragments hold to be rebuilt */
+  MapFragmentsTimers_t m_fragmentsTimers; /**< Timers related to fragment rebuilding */
+  Time                 m_fragmentExpirationTimeout; /**< Time limit for fragment rebuilding */
+
+  /**
+   * \brief How many packets can be rebuilt at the same time.
+   * Some real implementation do limit this. Zero means no limit.
+   */
+  uint16_t             m_fragmentReassemblyListSize;
+
+  bool m_useIphc; /**< Use IPHC or HC1 */
+
+  Ptr<Node> m_node; /**< Smart pointer to the Node */
+  Ptr<NetDevice> m_netDevice; /**< Smart pointer to the underlying NetDevice */
+  uint32_t m_ifIndex; /**< Interface index */
+
+  /**
+   * \brief Force the EtherType number.
+   * Also implying that the underlying NetDevice is using 48-bit Addresses, e.g., Ethernet, WiFi, etc.
+   */
+  bool m_forceEtherType;
+
+  uint16_t m_etherType; /**< EtherType number (used only if m_forceEtherType is true) */
+  bool m_omitUdpChecksum; /**< Omit UDP checksum in NC1 encoding */
+
+  Ptr<UniformRandomVariable> m_rng; //!< Rng for the fragments tag.
+};
+
+} // namespace ns3
+
+#endif /* SIXLOWPAN_NET_DEVICE_H */
diff -Naur ns-3.18.1/src/sixlowpan/test/error-channel-sixlow.cc ns-3.19/src/sixlowpan/test/error-channel-sixlow.cc
--- ns-3.18.1/src/sixlowpan/test/error-channel-sixlow.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/test/error-channel-sixlow.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,196 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+#include "error-channel-sixlow.h"
+#include "ns3/simple-net-device.h"
+#include "ns3/simulator.h"
+#include "ns3/packet.h"
+#include "ns3/node.h"
+#include "ns3/log.h"
+
+NS_LOG_COMPONENT_DEFINE ("ErrorChannelSixlow")
+  ;
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (ErrorChannelSixlow)
+  ;
+
+TypeId
+ErrorChannelSixlow::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::ErrorChannelSixlow")
+    .SetParent<Channel> ()
+    .AddConstructor<ErrorChannelSixlow> ()
+  ;
+  return tid;
+}
+
+ErrorChannelSixlow::ErrorChannelSixlow ()
+{
+  m_jumpingTime = Seconds (0.5);
+  m_jumping = false;
+  m_jumpingState = 0;
+  m_duplicateTime = Seconds (0.1);
+  m_duplicate = false;
+}
+
+void
+ErrorChannelSixlow::SetJumpingTime (Time delay)
+{
+  m_jumpingTime = delay;
+}
+
+void
+ErrorChannelSixlow::SetJumpingMode (bool mode)
+{
+  m_jumping = mode;
+  m_jumpingState = 0;
+}
+
+void
+ErrorChannelSixlow::SetDuplicateTime (Time delay)
+{
+  m_duplicateTime = delay;
+}
+
+void
+ErrorChannelSixlow::SetDuplicateMode (bool mode)
+{
+  m_duplicate = mode;
+  m_duplicateState = 0;
+}
+
+
+void
+ErrorChannelSixlow::Send (Ptr<Packet> p, uint16_t protocol,
+                          Mac48Address to, Mac48Address from,
+                          Ptr<SimpleNetDevice> sender)
+{
+  NS_LOG_FUNCTION (p << protocol << to << from << sender);
+  for (std::vector<Ptr<SimpleNetDevice> >::const_iterator i = m_devices.begin (); i != m_devices.end (); ++i)
+    {
+      Ptr<SimpleNetDevice> tmp = *i;
+      if (tmp == sender)
+        {
+          continue;
+        }
+      if (m_jumping)
+        {
+          if (m_jumpingState % 2)
+            {
+              Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), Seconds (0),
+                                              &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
+            }
+          else
+            {
+              Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), m_jumpingTime,
+                                              &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
+            }
+          m_jumpingState++;
+        }
+      else if (m_duplicate)
+        {
+          if (m_duplicateState % 2)
+            {
+              Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), Seconds (0),
+                                              &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
+            }
+          else
+            {
+              Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), Seconds (0),
+                                              &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
+              Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), m_duplicateTime,
+                                              &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
+            }
+          m_duplicateState++;
+        }
+      else
+        {
+          Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), Seconds (0),
+                                          &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
+        }
+    }
+}
+
+void
+ErrorChannelSixlow::Add (Ptr<SimpleNetDevice> device)
+{
+  m_devices.push_back (device);
+}
+
+uint32_t
+ErrorChannelSixlow::GetNDevices (void) const
+{
+  return m_devices.size ();
+}
+Ptr<NetDevice>
+ErrorChannelSixlow::GetDevice (uint32_t i) const
+{
+  return m_devices[i];
+}
+
+NS_OBJECT_ENSURE_REGISTERED (BinaryErrorSixlowModel)
+  ;
+
+TypeId BinaryErrorSixlowModel::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::BinaryErrorSixlowModel")
+    .SetParent<ErrorModel> ()
+    .AddConstructor<BinaryErrorSixlowModel> ()
+  ;
+  return tid;
+}
+
+BinaryErrorSixlowModel::BinaryErrorSixlowModel ()
+{
+  m_counter = 0;
+}
+
+BinaryErrorSixlowModel::~BinaryErrorSixlowModel ()
+{
+}
+
+
+bool
+BinaryErrorSixlowModel::DoCorrupt (Ptr<Packet> p)
+{
+  if (!IsEnabled ())
+    {
+      return false;
+    }
+  bool ret = m_counter % 2;
+  m_counter++;
+  return ret;
+}
+
+void
+BinaryErrorSixlowModel::Reset (void)
+{
+  DoReset ();
+}
+
+void
+BinaryErrorSixlowModel::DoReset (void)
+{
+  m_counter = 0;
+}
+
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/sixlowpan/test/error-channel-sixlow.h ns-3.19/src/sixlowpan/test/error-channel-sixlow.h
--- ns-3.18.1/src/sixlowpan/test/error-channel-sixlow.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/test/error-channel-sixlow.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,107 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+#ifndef ERROR_CHANNEL_SIXLOW_H
+#define ERROR_CHANNEL_SIXLOW_H
+
+#include "ns3/channel.h"
+#include "ns3/simple-channel.h"
+#include "ns3/error-model.h"
+#include "ns3/mac48-address.h"
+#include "ns3/nstime.h"
+#include <vector>
+
+namespace ns3 {
+
+class SimpleNetDevice;
+class Packet;
+
+/**
+ * \ingroup channel
+ * \brief A Error channel, introducing deterministic delays on even/odd packets. Used for testing
+ */
+class ErrorChannelSixlow : public SimpleChannel
+{
+public:
+  static TypeId GetTypeId (void);
+  ErrorChannelSixlow ();
+
+  virtual void Send (Ptr<Packet> p, uint16_t protocol, Mac48Address to, Mac48Address from,
+                     Ptr<SimpleNetDevice> sender);
+
+  virtual void Add (Ptr<SimpleNetDevice> device);
+
+  // inherited from ns3::Channel
+  virtual uint32_t GetNDevices (void) const;
+  virtual Ptr<NetDevice> GetDevice (uint32_t i) const;
+
+  /**
+   * \brief Set the delay for the odd packets (even ones are not delayed)
+   * \param delay Delay for the odd packets.
+   */
+  void SetJumpingTime (Time delay);
+
+  /**
+   * \brief Set if the odd packets are delayed (even ones are not delayed ever)
+   * \param mode true if the odd packets should be delayed.
+   */
+  void SetJumpingMode (bool mode);
+
+  /**
+   * \brief Set the delay for the odd duplicate packets (even ones are not duplicated)
+   * \param delay Delay for the odd packets.
+   */
+  void SetDuplicateTime (Time delay);
+
+  /**
+   * \brief Set if the odd packets are duplicated (even ones are not duplicated ever)
+   * \param mode true if the odd packets should be duplicated.
+   */
+  void SetDuplicateMode (bool mode);
+
+private:
+  std::vector<Ptr<SimpleNetDevice> > m_devices;
+  Time m_jumpingTime;
+  uint8_t m_jumpingState;
+  bool m_jumping;
+  Time m_duplicateTime;
+  bool m_duplicate;
+  uint8_t m_duplicateState;
+};
+
+class BinaryErrorSixlowModel : public ErrorModel
+{
+public:
+  static TypeId GetTypeId (void);
+
+  BinaryErrorSixlowModel ();
+  virtual ~BinaryErrorSixlowModel ();
+  void Reset (void);
+
+private:
+  virtual bool DoCorrupt (Ptr<Packet> p);
+  virtual void DoReset (void);
+
+  uint8_t m_counter;
+
+};
+
+} // namespace ns3
+
+#endif /* ERROR_CHANNEL_SIXLOW_H */
diff -Naur ns-3.18.1/src/sixlowpan/test/sixlowpan-fragmentation-test.cc ns-3.19/src/sixlowpan/test/sixlowpan-fragmentation-test.cc
--- ns-3.18.1/src/sixlowpan/test/sixlowpan-fragmentation-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/test/sixlowpan-fragmentation-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,463 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+#define NS3_LOG_ENABLE 1
+
+#include "ns3/test.h"
+#include "ns3/config.h"
+#include "ns3/uinteger.h"
+#include "ns3/socket-factory.h"
+#include "ns3/ipv6-raw-socket-factory.h"
+#include "ns3/udp-socket-factory.h"
+#include "ns3/simulator.h"
+#include "error-channel-sixlow.h"
+#include "ns3/simple-net-device.h"
+#include "ns3/drop-tail-queue.h"
+#include "ns3/socket.h"
+#include "ns3/udp-socket.h"
+
+#include "ns3/log.h"
+#include "ns3/node.h"
+#include "ns3/inet-socket-address.h"
+#include "ns3/boolean.h"
+
+#include "ns3/ipv6-static-routing.h"
+#include "ns3/ipv6-list-routing.h"
+#include "ns3/inet6-socket-address.h"
+#include "ns3/sixlowpan-net-device.h"
+
+#include "ns3/udp-l4-protocol.h"
+
+#include "ns3/ipv6-l3-protocol.h"
+#include "ns3/icmpv6-l4-protocol.h"
+
+#include <string>
+#include <limits>
+#include <netinet/in.h>
+
+using namespace ns3;
+
+class UdpSocketImpl;
+
+static void
+AddInternetStack (Ptr<Node> node)
+{
+  //IPV6
+  Ptr<Ipv6L3Protocol> ipv6 = CreateObject<Ipv6L3Protocol> ();
+
+  //Routing for Ipv6
+  Ptr<Ipv6ListRouting> ipv6Routing = CreateObject<Ipv6ListRouting> ();
+  ipv6->SetRoutingProtocol (ipv6Routing);
+  Ptr<Ipv6StaticRouting> ipv6staticRouting = CreateObject<Ipv6StaticRouting> ();
+  ipv6Routing->AddRoutingProtocol (ipv6staticRouting, 0);
+  node->AggregateObject (ipv6);
+
+  //ICMPv6
+  Ptr<Icmpv6L4Protocol> icmp6 = CreateObject<Icmpv6L4Protocol> ();
+  node->AggregateObject (icmp6);
+
+  //Ipv6 Extensions
+  ipv6->RegisterExtensions ();
+  ipv6->RegisterOptions ();
+
+  //UDP
+  Ptr<UdpL4Protocol> udp = CreateObject<UdpL4Protocol> ();
+  node->AggregateObject (udp);
+}
+
+
+class SixlowpanFragmentationTest : public TestCase
+{
+  Ptr<Packet> m_sentPacketClient;
+  Ptr<Packet> m_receivedPacketClient;
+  Ptr<Packet> m_receivedPacketServer;
+
+
+  Ptr<Socket> m_socketServer;
+  Ptr<Socket> m_socketClient;
+  uint32_t m_dataSize;
+  uint8_t *m_data;
+  uint32_t m_size;
+  uint8_t m_icmpType;
+  uint8_t m_icmpCode;
+
+public:
+  virtual void DoRun (void);
+  SixlowpanFragmentationTest ();
+  ~SixlowpanFragmentationTest ();
+
+  // server part
+  void StartServer (Ptr<Node> ServerNode);
+  void HandleReadServer (Ptr<Socket> socket);
+
+  // client part
+  void StartClient (Ptr<Node> ClientNode);
+  void HandleReadClient (Ptr<Socket> socket);
+  void HandleReadIcmpClient (Ipv6Address icmpSource, uint8_t icmpTtl, uint8_t icmpType,
+                             uint8_t icmpCode,uint32_t icmpInfo);
+
+  void SetFill (uint8_t *fill, uint32_t fillSize, uint32_t dataSize);
+  Ptr<Packet> SendClient (void);
+
+};
+
+
+SixlowpanFragmentationTest::SixlowpanFragmentationTest ()
+  : TestCase ("Verify the 6LoWPAN protocol fragmentation and reassembly")
+{
+  m_socketServer = 0;
+  m_data = 0;
+  m_dataSize = 0;
+}
+
+SixlowpanFragmentationTest::~SixlowpanFragmentationTest ()
+{
+  if ( m_data )
+    {
+      delete[] m_data;
+    }
+  m_data = 0;
+  m_dataSize = 0;
+}
+
+
+void
+SixlowpanFragmentationTest::StartServer (Ptr<Node> ServerNode)
+{
+
+  if (m_socketServer == 0)
+    {
+      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");
+      m_socketServer = Socket::CreateSocket (ServerNode, tid);
+      Inet6SocketAddress local = Inet6SocketAddress (Ipv6Address ("2001:0100::1"), 9);
+      m_socketServer->Bind (local);
+      Ptr<UdpSocket> udpSocket = DynamicCast<UdpSocket> (m_socketServer);
+    }
+
+  m_socketServer->SetRecvCallback (MakeCallback (&SixlowpanFragmentationTest::HandleReadServer, this));
+}
+
+void
+SixlowpanFragmentationTest::HandleReadServer (Ptr<Socket> socket)
+{
+  Ptr<Packet> packet;
+  Address from;
+  while ((packet = socket->RecvFrom (from)))
+    {
+      if (Inet6SocketAddress::IsMatchingType (from))
+        {
+          packet->RemoveAllPacketTags ();
+          packet->RemoveAllByteTags ();
+
+          m_receivedPacketServer = packet->Copy ();
+        }
+    }
+}
+
+void
+SixlowpanFragmentationTest::StartClient (Ptr<Node> ClientNode)
+{
+
+  if (m_socketClient == 0)
+    {
+      TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");
+      m_socketClient = Socket::CreateSocket (ClientNode, tid);
+      m_socketClient->Bind (Inet6SocketAddress (Ipv6Address::GetAny (), 9));
+      m_socketClient->Connect (Inet6SocketAddress (Ipv6Address ("2001:0100::1"), 9));
+      CallbackValue cbValue = MakeCallback (&SixlowpanFragmentationTest::HandleReadIcmpClient, this);
+      m_socketClient->SetAttribute ("IcmpCallback6", cbValue);
+    }
+
+  m_socketClient->SetRecvCallback (MakeCallback (&SixlowpanFragmentationTest::HandleReadClient, this));
+}
+
+void
+SixlowpanFragmentationTest::HandleReadClient (Ptr<Socket> socket)
+{
+  Ptr<Packet> packet;
+  Address from;
+  while ((packet = socket->RecvFrom (from)))
+    {
+      if (Inet6SocketAddress::IsMatchingType (from))
+        {
+          m_receivedPacketClient = packet->Copy ();
+        }
+    }
+}
+
+void
+SixlowpanFragmentationTest::HandleReadIcmpClient (Ipv6Address icmpSource,
+                                                  uint8_t icmpTtl, uint8_t icmpType,
+                                                  uint8_t icmpCode, uint32_t icmpInfo)
+{
+  m_icmpType = icmpType;
+  m_icmpCode = icmpCode;
+}
+
+void
+SixlowpanFragmentationTest::SetFill (uint8_t *fill, uint32_t fillSize, uint32_t dataSize)
+{
+  if (dataSize != m_dataSize)
+    {
+      delete [] m_data;
+      m_data = new uint8_t [dataSize];
+      m_dataSize = dataSize;
+    }
+
+  if (fillSize >= dataSize)
+    {
+      memcpy (m_data, fill, dataSize);
+      return;
+    }
+
+  uint32_t filled = 0;
+  while (filled + fillSize < dataSize)
+    {
+      memcpy (&m_data[filled], fill, fillSize);
+      filled += fillSize;
+    }
+
+  memcpy (&m_data[filled], fill, dataSize - filled);
+
+  m_size = dataSize;
+}
+
+Ptr<Packet> SixlowpanFragmentationTest::SendClient (void)
+{
+  Ptr<Packet> p;
+  if (m_dataSize)
+    {
+      p = Create<Packet> (m_data, m_dataSize);
+    }
+  else
+    {
+      p = Create<Packet> (m_size);
+    }
+  m_socketClient->Send (p);
+
+  return p;
+}
+
+void
+SixlowpanFragmentationTest::DoRun (void)
+{
+  // Create topology
+
+  // Receiver Node
+  Ptr<Node> serverNode = CreateObject<Node> ();
+  AddInternetStack (serverNode);
+  Ptr<SimpleNetDevice> serverDev;
+  Ptr<BinaryErrorSixlowModel> serverDevErrorModel = CreateObject<BinaryErrorSixlowModel> ();
+  {
+    serverDev = CreateObject<SimpleNetDevice> ();
+    serverDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    serverDev->SetMtu (1500);
+    serverDev->SetReceiveErrorModel (serverDevErrorModel);
+    serverDevErrorModel->Disable ();
+    serverNode->AddDevice (serverDev);
+
+    Ptr<SixLowPanNetDevice> serverSix = CreateObject<SixLowPanNetDevice> ();
+    serverSix->SetAttribute ("ForceEtherType", BooleanValue (true) );
+    serverNode->AddDevice (serverSix);
+    serverSix->SetNetDevice (serverDev);
+
+    Ptr<Ipv6> ipv6 = serverNode->GetObject<Ipv6> ();
+    ipv6->AddInterface (serverDev);
+    uint32_t netdev_idx = ipv6->AddInterface (serverSix);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:0100::1"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+
+    Ptr<Icmpv6L4Protocol> icmpv6l4 = serverNode->GetObject<Icmpv6L4Protocol> ();
+    icmpv6l4->SetAttribute ("DAD", BooleanValue (false));
+  }
+  StartServer (serverNode);
+
+  // Sender Node
+  Ptr<Node> clientNode = CreateObject<Node> ();
+  AddInternetStack (clientNode);
+  Ptr<SimpleNetDevice> clientDev;
+  Ptr<BinaryErrorSixlowModel> clientDevErrorModel = CreateObject<BinaryErrorSixlowModel> ();
+  {
+    clientDev = CreateObject<SimpleNetDevice> ();
+    clientDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    clientDev->SetMtu (150);
+    clientDev->SetReceiveErrorModel (clientDevErrorModel);
+    clientDevErrorModel->Disable ();
+    clientNode->AddDevice (clientDev);
+
+    Ptr<SixLowPanNetDevice> clientSix = CreateObject<SixLowPanNetDevice> ();
+    clientSix->SetAttribute ("ForceEtherType", BooleanValue (true) );
+    serverNode->AddDevice (clientSix);
+    clientSix->SetNetDevice (clientDev);
+
+    Ptr<Ipv6> ipv6 = clientNode->GetObject<Ipv6> ();
+    ipv6->AddInterface (clientDev);
+    uint32_t netdev_idx = ipv6->AddInterface (clientSix);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:0100::2"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+
+    Ptr<Icmpv6L4Protocol> icmpv6l4 = clientNode->GetObject<Icmpv6L4Protocol> ();
+    icmpv6l4->SetAttribute ("DAD", BooleanValue (false));
+  }
+  StartClient (clientNode);
+
+  // link the two nodes
+  Ptr<ErrorChannelSixlow> channel = CreateObject<ErrorChannelSixlow> ();
+  serverDev->SetChannel (channel);
+  clientDev->SetChannel (channel);
+
+
+  // some small packets, some rather big ones
+  uint32_t packetSizes[5] = {200, 300, 400, 500, 600};
+
+  // using the alphabet
+  uint8_t fillData[78];
+  for ( uint32_t k = 48; k <= 125; k++ )
+    {
+      fillData[k - 48] = k;
+    }
+
+  // First test: normal channel, no errors, no delays
+  for ( int i = 0; i < 5; i++)
+    {
+      uint32_t packetSize = packetSizes[i];
+
+      SetFill (fillData, 78, packetSize);
+
+      m_receivedPacketServer = Create<Packet> ();
+      Simulator::ScheduleWithContext (m_socketClient->GetNode ()->GetId (), Seconds (0),
+                                      &SixlowpanFragmentationTest::SendClient, this);
+      Simulator::Run ();
+
+      uint8_t recvBuffer[65000];
+
+      uint16_t recvSize = m_receivedPacketServer->GetSize ();
+
+      NS_TEST_EXPECT_MSG_EQ (recvSize, packetSizes[i],
+                             "Packet size not correct: recvSize: " << recvSize << " packetSizes[" << i << "]: " << packetSizes[i] );
+
+      m_receivedPacketServer->CopyData (recvBuffer, 65000);
+      NS_TEST_EXPECT_MSG_EQ (memcmp (m_data, recvBuffer, m_receivedPacketServer->GetSize ()),
+                             0, "Packet content differs");
+    }
+
+  // Second test: normal channel, no errors, delays each 2 packets.
+  // Each other fragment will arrive out-of-order.
+  // The packets should be received correctly since reassembly will reorder the fragments.
+  channel->SetJumpingMode (true);
+  for ( int i = 0; i < 5; i++)
+    {
+      uint32_t packetSize = packetSizes[i];
+
+      SetFill (fillData, 78, packetSize);
+
+      m_receivedPacketServer = Create<Packet> ();
+      Simulator::ScheduleWithContext (m_socketClient->GetNode ()->GetId (), Seconds (0),
+                                      &SixlowpanFragmentationTest::SendClient, this);
+      Simulator::Run ();
+
+      uint8_t recvBuffer[65000];
+
+      uint16_t recvSize = m_receivedPacketServer->GetSize ();
+
+      NS_TEST_EXPECT_MSG_EQ (recvSize, packetSizes[i],
+                             "Packet size not correct: recvSize: " << recvSize << " packetSizes[" << i << "]: " << packetSizes[i] );
+
+      m_receivedPacketServer->CopyData (recvBuffer, 65000);
+      NS_TEST_EXPECT_MSG_EQ (memcmp (m_data, recvBuffer, m_receivedPacketServer->GetSize ()),
+                             0, "Packet content differs");
+    }
+  channel->SetJumpingMode (false);
+
+
+  // Third test: normal channel, some packets are duplicate.
+  // The duplicate fragments should be discarded, so no error should be fired.
+  channel->SetDuplicateMode (true);
+  for ( int i = 1; i < 5; i++)
+    {
+      uint32_t packetSize = packetSizes[i];
+
+      SetFill (fillData, 78, packetSize);
+
+      // reset the model, we want to receive the very first fragment.
+      serverDevErrorModel->Reset ();
+
+      m_receivedPacketServer = Create<Packet> ();
+      m_icmpType = 0;
+      m_icmpCode = 0;
+      Simulator::ScheduleWithContext (m_socketClient->GetNode ()->GetId (), Seconds (0),
+                                      &SixlowpanFragmentationTest::SendClient, this);
+      Simulator::Run ();
+
+      uint8_t recvBuffer[65000];
+
+      uint16_t recvSize = m_receivedPacketServer->GetSize ();
+
+      NS_TEST_EXPECT_MSG_EQ (recvSize, packetSizes[i],
+                             "Packet size not correct: recvSize: " << recvSize << " packetSizes[" << i << "]: " << packetSizes[i] );
+
+      m_receivedPacketServer->CopyData (recvBuffer, 65000);
+      NS_TEST_EXPECT_MSG_EQ (memcmp (m_data, recvBuffer, m_receivedPacketServer->GetSize ()),
+                             0, "Packet content differs");
+    }
+  channel->SetDuplicateMode (false);
+
+  // Fourth test: normal channel, some errors, no delays.
+  // The reassembly procedure does NOT fire any ICMP, so we do not expect any reply from the server.
+  // Client -> Server : errors enabled
+  // Server -> Client : errors disabled
+  clientDevErrorModel->Disable ();
+  serverDevErrorModel->Enable ();
+  for ( int i = 1; i < 5; i++)
+    {
+      uint32_t packetSize = packetSizes[i];
+
+      SetFill (fillData, 78, packetSize);
+
+      // reset the model, we want to receive the very first fragment.
+      serverDevErrorModel->Reset ();
+
+      m_receivedPacketServer = Create<Packet> ();
+      m_icmpType = 0;
+      m_icmpCode = 0;
+      Simulator::ScheduleWithContext (m_socketClient->GetNode ()->GetId (), Seconds (0),
+                                      &SixlowpanFragmentationTest::SendClient, this);
+      Simulator::Run ();
+
+      uint16_t recvSize = m_receivedPacketServer->GetSize ();
+
+      NS_TEST_EXPECT_MSG_EQ ((recvSize == 0), true, "Server got a packet, something wrong");
+      // Note that a 6LoWPAN fragment timeout does NOT send any ICMPv6.
+    }
+
+
+
+  Simulator::Destroy ();
+}
+//-----------------------------------------------------------------------------
+class SixlowpanFragmentationTestSuite : public TestSuite
+{
+public:
+  SixlowpanFragmentationTestSuite () : TestSuite ("sixlowpan-fragmentation", UNIT)
+  {
+    AddTestCase (new SixlowpanFragmentationTest, TestCase::QUICK);
+  }
+} g_sixlowpanFragmentationTestSuite;
diff -Naur ns-3.18.1/src/sixlowpan/test/sixlowpan-hc1-test.cc ns-3.19/src/sixlowpan/test/sixlowpan-hc1-test.cc
--- ns-3.18.1/src/sixlowpan/test/sixlowpan-hc1-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/test/sixlowpan-hc1-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,216 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#include "ns3/test.h"
+#include "ns3/socket-factory.h"
+#include "ns3/udp-socket-factory.h"
+#include "ns3/simulator.h"
+#include "ns3/simple-channel.h"
+#include "ns3/simple-net-device.h"
+#include "ns3/drop-tail-queue.h"
+#include "ns3/socket.h"
+#include "ns3/boolean.h"
+
+#include "ns3/log.h"
+#include "ns3/node.h"
+#include "ns3/inet6-socket-address.h"
+
+#include "ns3/ipv6-l3-protocol.h"
+#include "ns3/icmpv6-l4-protocol.h"
+#include "ns3/udp-l4-protocol.h"
+#include "ns3/ipv6-list-routing.h"
+#include "ns3/ipv6-static-routing.h"
+
+#include "ns3/sixlowpan-net-device.h"
+
+#include <string>
+#include <limits>
+
+using namespace ns3;
+
+static void
+AddInternetStack6 (Ptr<Node> node)
+{
+  //IPV6
+  Ptr<Ipv6L3Protocol> ipv6 = CreateObject<Ipv6L3Protocol> ();
+  //Routing for Ipv6
+  Ptr<Ipv6ListRouting> ipv6Routing = CreateObject<Ipv6ListRouting> ();
+  ipv6->SetRoutingProtocol (ipv6Routing);
+  Ptr<Ipv6StaticRouting> ipv6staticRouting = CreateObject<Ipv6StaticRouting> ();
+  ipv6Routing->AddRoutingProtocol (ipv6staticRouting, 0);
+  node->AggregateObject (ipv6);
+  //ICMP
+  Ptr<Icmpv6L4Protocol> icmp = CreateObject<Icmpv6L4Protocol> ();
+  node->AggregateObject (icmp);
+  //Ipv6 Extensions
+  ipv6->RegisterExtensions ();
+  ipv6->RegisterOptions ();
+  //UDP
+  Ptr<UdpL4Protocol> udp = CreateObject<UdpL4Protocol> ();
+  node->AggregateObject (udp);
+}
+
+
+class SixlowpanHc1ImplTest : public TestCase
+{
+  Ptr<Packet> m_receivedPacket;
+  void DoSendData (Ptr<Socket> socket, std::string to);
+  void SendData (Ptr<Socket> socket, std::string to);
+
+public:
+  virtual void DoRun (void);
+  SixlowpanHc1ImplTest ();
+
+  void ReceivePacket (Ptr<Socket> socket, Ptr<Packet> packet, const Address &from);
+  void ReceivePkt (Ptr<Socket> socket);
+};
+
+SixlowpanHc1ImplTest::SixlowpanHc1ImplTest ()
+  : TestCase ("Sixlowpan implementation")
+{
+}
+
+void SixlowpanHc1ImplTest::ReceivePacket (Ptr<Socket> socket, Ptr<Packet> packet, const Address &from)
+{
+  m_receivedPacket = packet;
+}
+
+void SixlowpanHc1ImplTest::ReceivePkt (Ptr<Socket> socket)
+{
+  uint32_t availableData;
+  availableData = socket->GetRxAvailable ();
+  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
+  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
+  //cast availableData to void, to suppress 'availableData' set but not used
+  //compiler warning
+  (void) availableData;
+}
+
+void
+SixlowpanHc1ImplTest::DoSendData (Ptr<Socket> socket, std::string to)
+{
+  Address realTo = Inet6SocketAddress (Ipv6Address (to.c_str ()), 1234);
+  uint8_t buffer [] = "\"Can you tell me where my country lies?\" \\ said the unifaun to his true love's eyes. \\ \"It lies with me!\" cried the Queen of Maybe \\ - for her merchandise, he traded in his prize.";
+
+  Ptr<Packet> packet = Create<Packet> (buffer, 180);
+  NS_TEST_EXPECT_MSG_EQ (socket->SendTo (packet, 0, realTo),
+                         180, "200");
+}
+
+void
+SixlowpanHc1ImplTest::SendData (Ptr<Socket> socket, std::string to)
+{
+  m_receivedPacket = Create<Packet> ();
+  Simulator::ScheduleWithContext (socket->GetNode ()->GetId (), Seconds (0),
+                                  &SixlowpanHc1ImplTest::DoSendData, this, socket, to);
+  Simulator::Run ();
+}
+
+void
+SixlowpanHc1ImplTest::DoRun (void)
+{
+  // Create topology
+
+  // Receiver Node
+  Ptr<Node> rxNode = CreateObject<Node> ();
+  AddInternetStack6 (rxNode);
+  Ptr<SimpleNetDevice> rxDev;
+  { // first interface
+    rxDev = CreateObject<SimpleNetDevice> ();
+    rxDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    rxNode->AddDevice (rxDev);
+
+    Ptr<SixLowPanNetDevice> rxSix = CreateObject<SixLowPanNetDevice> ();
+    rxSix->SetAttribute ("ForceEtherType", BooleanValue (true) );
+    rxSix->SetAttribute ("Rfc6282", BooleanValue (false) );
+    rxNode->AddDevice (rxSix);
+    rxSix->SetNetDevice (rxDev);
+
+    Ptr<Ipv6> ipv6 = rxNode->GetObject<Ipv6> ();
+    ipv6->AddInterface (rxDev);
+    uint32_t netdev_idx = ipv6->AddInterface (rxSix);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:0100::1"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+  }
+
+  // Sender Node
+  Ptr<Node> txNode = CreateObject<Node> ();
+  AddInternetStack6 (txNode);
+  Ptr<SimpleNetDevice> txDev;
+  {
+    txDev = CreateObject<SimpleNetDevice> ();
+    txDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    txNode->AddDevice (txDev);
+
+    Ptr<SixLowPanNetDevice> txSix = CreateObject<SixLowPanNetDevice> ();
+    txSix->SetAttribute ("ForceEtherType", BooleanValue (true) );
+    txSix->SetAttribute ("Rfc6282", BooleanValue (false) );
+    txNode->AddDevice (txSix);
+    txSix->SetNetDevice (txDev);
+
+    Ptr<Ipv6> ipv6 = txNode->GetObject<Ipv6> ();
+    ipv6->AddInterface (txDev);
+    uint32_t netdev_idx = ipv6->AddInterface (txSix);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:0100::2"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+  }
+
+  // link the two nodes
+  Ptr<SimpleChannel> channel1 = CreateObject<SimpleChannel> ();
+  rxDev->SetChannel (channel1);
+  txDev->SetChannel (channel1);
+
+  // Create the UDP sockets
+  Ptr<SocketFactory> rxSocketFactory = rxNode->GetObject<UdpSocketFactory> ();
+  Ptr<Socket> rxSocket = rxSocketFactory->CreateSocket ();
+  NS_TEST_EXPECT_MSG_EQ (rxSocket->Bind (Inet6SocketAddress (Ipv6Address ("2001:0100::1"), 1234)), 0, "trivial");
+  rxSocket->SetRecvCallback (MakeCallback (&SixlowpanHc1ImplTest::ReceivePkt, this));
+
+  Ptr<SocketFactory> txSocketFactory = txNode->GetObject<UdpSocketFactory> ();
+  Ptr<Socket> txSocket = txSocketFactory->CreateSocket ();
+  txSocket->SetAllowBroadcast (true);
+  // ------ Now the tests ------------
+
+  // Unicast test
+  SendData (txSocket, "2001:0100::1");
+  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 180, "trivial");
+  uint8_t rxBuffer [180];
+  uint8_t txBuffer [180] = "\"Can you tell me where my country lies?\" \\ said the unifaun to his true love's eyes. \\ \"It lies with me!\" cried the Queen of Maybe \\ - for her merchandise, he traded in his prize.";
+  m_receivedPacket->CopyData (rxBuffer, 180);
+  NS_TEST_EXPECT_MSG_EQ (memcmp (rxBuffer, txBuffer, 180), 0, "trivial");
+
+  m_receivedPacket->RemoveAllByteTags ();
+
+  Simulator::Destroy ();
+
+}
+
+
+//-----------------------------------------------------------------------------
+class SixlowpanHc1TestSuite : public TestSuite
+{
+public:
+  SixlowpanHc1TestSuite () : TestSuite ("sixlowpan-hc1", UNIT)
+  {
+    AddTestCase (new SixlowpanHc1ImplTest, TestCase::QUICK);
+  }
+} g_sixlowpanHc1TestSuite;
diff -Naur ns-3.18.1/src/sixlowpan/test/sixlowpan-iphc-test.cc ns-3.19/src/sixlowpan/test/sixlowpan-iphc-test.cc
--- ns-3.18.1/src/sixlowpan/test/sixlowpan-iphc-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/test/sixlowpan-iphc-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,214 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#include "ns3/test.h"
+#include "ns3/socket-factory.h"
+#include "ns3/udp-socket-factory.h"
+#include "ns3/simulator.h"
+#include "ns3/simple-channel.h"
+#include "ns3/simple-net-device.h"
+#include "ns3/drop-tail-queue.h"
+#include "ns3/socket.h"
+#include "ns3/boolean.h"
+
+#include "ns3/log.h"
+#include "ns3/node.h"
+#include "ns3/inet6-socket-address.h"
+
+#include "ns3/ipv6-l3-protocol.h"
+#include "ns3/icmpv6-l4-protocol.h"
+#include "ns3/udp-l4-protocol.h"
+#include "ns3/ipv6-list-routing.h"
+#include "ns3/ipv6-static-routing.h"
+
+#include "ns3/sixlowpan-net-device.h"
+
+#include <string>
+#include <limits>
+
+using namespace ns3;
+
+static void
+AddInternetStack6 (Ptr<Node> node)
+{
+  //IPV6
+  Ptr<Ipv6L3Protocol> ipv6 = CreateObject<Ipv6L3Protocol> ();
+  //Routing for Ipv6
+  Ptr<Ipv6ListRouting> ipv6Routing = CreateObject<Ipv6ListRouting> ();
+  ipv6->SetRoutingProtocol (ipv6Routing);
+  Ptr<Ipv6StaticRouting> ipv6staticRouting = CreateObject<Ipv6StaticRouting> ();
+  ipv6Routing->AddRoutingProtocol (ipv6staticRouting, 0);
+  node->AggregateObject (ipv6);
+  //ICMP
+  Ptr<Icmpv6L4Protocol> icmp = CreateObject<Icmpv6L4Protocol> ();
+  node->AggregateObject (icmp);
+  //Ipv6 Extensions
+  ipv6->RegisterExtensions ();
+  ipv6->RegisterOptions ();
+  //UDP
+  Ptr<UdpL4Protocol> udp = CreateObject<UdpL4Protocol> ();
+  node->AggregateObject (udp);
+}
+
+
+class SixlowpanIphcImplTest : public TestCase
+{
+  Ptr<Packet> m_receivedPacket;
+  void DoSendData (Ptr<Socket> socket, std::string to);
+  void SendData (Ptr<Socket> socket, std::string to);
+
+public:
+  virtual void DoRun (void);
+  SixlowpanIphcImplTest ();
+
+  void ReceivePacket (Ptr<Socket> socket, Ptr<Packet> packet, const Address &from);
+  void ReceivePkt (Ptr<Socket> socket);
+};
+
+SixlowpanIphcImplTest::SixlowpanIphcImplTest ()
+  : TestCase ("Sixlowpan implementation")
+{
+}
+
+void SixlowpanIphcImplTest::ReceivePacket (Ptr<Socket> socket, Ptr<Packet> packet, const Address &from)
+{
+  m_receivedPacket = packet;
+}
+
+void SixlowpanIphcImplTest::ReceivePkt (Ptr<Socket> socket)
+{
+  uint32_t availableData;
+  availableData = socket->GetRxAvailable ();
+  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
+  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
+  //cast availableData to void, to suppress 'availableData' set but not used
+  //compiler warning
+  (void) availableData;
+}
+
+void
+SixlowpanIphcImplTest::DoSendData (Ptr<Socket> socket, std::string to)
+{
+  Address realTo = Inet6SocketAddress (Ipv6Address (to.c_str ()), 1234);
+  uint8_t buffer [] = "\"Can you tell me where my country lies?\" \\ said the unifaun to his true love's eyes. \\ \"It lies with me!\" cried the Queen of Maybe \\ - for her merchandise, he traded in his prize.";
+
+  Ptr<Packet> packet = Create<Packet> (buffer, 180);
+  NS_TEST_EXPECT_MSG_EQ (socket->SendTo (packet, 0, realTo),
+                         180, "200");
+}
+
+void
+SixlowpanIphcImplTest::SendData (Ptr<Socket> socket, std::string to)
+{
+  m_receivedPacket = Create<Packet> ();
+  Simulator::ScheduleWithContext (socket->GetNode ()->GetId (), Seconds (0),
+                                  &SixlowpanIphcImplTest::DoSendData, this, socket, to);
+  Simulator::Run ();
+}
+
+void
+SixlowpanIphcImplTest::DoRun (void)
+{
+  // Create topology
+
+  // Receiver Node
+  Ptr<Node> rxNode = CreateObject<Node> ();
+  AddInternetStack6 (rxNode);
+  Ptr<SimpleNetDevice> rxDev;
+  { // first interface
+    rxDev = CreateObject<SimpleNetDevice> ();
+    rxDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    rxNode->AddDevice (rxDev);
+
+    Ptr<SixLowPanNetDevice> rxSix = CreateObject<SixLowPanNetDevice> ();
+    rxSix->SetAttribute ("ForceEtherType", BooleanValue (true) );
+    rxNode->AddDevice (rxSix);
+    rxSix->SetNetDevice (rxDev);
+
+    Ptr<Ipv6> ipv6 = rxNode->GetObject<Ipv6> ();
+    ipv6->AddInterface (rxDev);
+    uint32_t netdev_idx = ipv6->AddInterface (rxSix);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:0100::1"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+  }
+
+  // Sender Node
+  Ptr<Node> txNode = CreateObject<Node> ();
+  AddInternetStack6 (txNode);
+  Ptr<SimpleNetDevice> txDev;
+  {
+    txDev = CreateObject<SimpleNetDevice> ();
+    txDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    txNode->AddDevice (txDev);
+
+    Ptr<SixLowPanNetDevice> txSix = CreateObject<SixLowPanNetDevice> ();
+    txSix->SetAttribute ("ForceEtherType", BooleanValue (true) );
+    txNode->AddDevice (txSix);
+    txSix->SetNetDevice (txDev);
+
+    Ptr<Ipv6> ipv6 = txNode->GetObject<Ipv6> ();
+    ipv6->AddInterface (txDev);
+    uint32_t netdev_idx = ipv6->AddInterface (txSix);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:0100::2"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+  }
+
+  // link the two nodes
+  Ptr<SimpleChannel> channel1 = CreateObject<SimpleChannel> ();
+  rxDev->SetChannel (channel1);
+  txDev->SetChannel (channel1);
+
+  // Create the UDP sockets
+  Ptr<SocketFactory> rxSocketFactory = rxNode->GetObject<UdpSocketFactory> ();
+  Ptr<Socket> rxSocket = rxSocketFactory->CreateSocket ();
+  NS_TEST_EXPECT_MSG_EQ (rxSocket->Bind (Inet6SocketAddress (Ipv6Address ("2001:0100::1"), 1234)), 0, "trivial");
+  rxSocket->SetRecvCallback (MakeCallback (&SixlowpanIphcImplTest::ReceivePkt, this));
+
+  Ptr<SocketFactory> txSocketFactory = txNode->GetObject<UdpSocketFactory> ();
+  Ptr<Socket> txSocket = txSocketFactory->CreateSocket ();
+  txSocket->SetAllowBroadcast (true);
+  // ------ Now the tests ------------
+
+  // Unicast test
+  SendData (txSocket, "2001:0100::1");
+  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 180, "trivial");
+  uint8_t rxBuffer [180];
+  uint8_t txBuffer [180] = "\"Can you tell me where my country lies?\" \\ said the unifaun to his true love's eyes. \\ \"It lies with me!\" cried the Queen of Maybe \\ - for her merchandise, he traded in his prize.";
+  m_receivedPacket->CopyData (rxBuffer, 180);
+  NS_TEST_EXPECT_MSG_EQ (memcmp (rxBuffer, txBuffer, 180), 0, "trivial");
+
+  m_receivedPacket->RemoveAllByteTags ();
+
+  Simulator::Destroy ();
+
+}
+
+
+//-----------------------------------------------------------------------------
+class SixlowpanIphcTestSuite : public TestSuite
+{
+public:
+  SixlowpanIphcTestSuite () : TestSuite ("sixlowpan-iphc", UNIT)
+  {
+    AddTestCase (new SixlowpanIphcImplTest, TestCase::QUICK);
+  }
+} g_sixlowpanIphcTestSuite;
diff -Naur ns-3.18.1/src/sixlowpan/wscript ns-3.19/src/sixlowpan/wscript
--- ns-3.18.1/src/sixlowpan/wscript	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/sixlowpan/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,33 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+    module = bld.create_ns3_module('sixlowpan', ['internet', 'network', 'core'])
+    module.includes = '.'
+    module.source = [
+        'model/sixlowpan-net-device.cc',
+        'model/sixlowpan-header.cc',
+        'helper/sixlowpan-helper.cc',
+        ]
+
+    module_test = bld.create_ns3_module_test_library('sixlowpan')
+    module_test.source = [
+        'test/sixlowpan-hc1-test.cc',
+        'test/sixlowpan-iphc-test.cc',
+        'test/error-channel-sixlow.cc',
+        'test/sixlowpan-fragmentation-test.cc',
+        
+        ]
+
+    headers = bld(features=['ns3header'])
+    headers.module = 'sixlowpan'
+    headers.source = [
+        'model/sixlowpan-net-device.h',
+        'model/sixlowpan-header.h',
+        'helper/sixlowpan-helper.h',
+        ]
+
+
+    if (bld.env['ENABLE_EXAMPLES']):
+        bld.recurse('examples')
+   
+    bld.ns3_python_bindings()
\ No newline at end of file
diff -Naur ns-3.18.1/src/spectrum/bindings/modulegen__gcc_ILP32.py ns-3.19/src/spectrum/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/spectrum/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -221,7 +221,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1584,10 +1584,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3606,6 +3607,11 @@
                    'void', 
                    [param('ns3::SpectrumValue const &', 'sinr'), param('ns3::Time', 'duration')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## spectrum-error-model.h (module 'spectrum'): static ns3::TypeId ns3::SpectrumErrorModel::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
     ## spectrum-error-model.h (module 'spectrum'): bool ns3::SpectrumErrorModel::IsRxCorrect() [member function]
     cls.add_method('IsRxCorrect', 
                    'bool', 
@@ -3934,6 +3940,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3944,6 +3955,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3959,6 +3975,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3984,6 +4005,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/spectrum/bindings/modulegen__gcc_LP64.py ns-3.19/src/spectrum/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/spectrum/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -221,7 +221,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1584,10 +1584,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3606,6 +3607,11 @@
                    'void', 
                    [param('ns3::SpectrumValue const &', 'sinr'), param('ns3::Time', 'duration')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## spectrum-error-model.h (module 'spectrum'): static ns3::TypeId ns3::SpectrumErrorModel::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
     ## spectrum-error-model.h (module 'spectrum'): bool ns3::SpectrumErrorModel::IsRxCorrect() [member function]
     cls.add_method('IsRxCorrect', 
                    'bool', 
@@ -3934,6 +3940,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3944,6 +3955,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3959,6 +3975,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3984,6 +4005,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/spectrum/doc/spectrum.rst ns-3.19/src/spectrum/doc/spectrum.rst
--- ns-3.18.1/src/spectrum/doc/spectrum.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/doc/spectrum.rst	2013-12-20 09:44:50.000000000 -0800
@@ -9,6 +9,6 @@
 
 The model is described in [Baldo2009]_. 
 
-.. [Baldo2009] N. Baldo and M. Miozzo, "Spectrum-aware Channel and PHY layer modeling for ns3", 
-   Proceedings of ICST NSTools 2009, Pisa, Italy. 
+..
+  Reference Baldo2009 is defined in lte/doc/lte-references.rst
 
diff -Naur ns-3.18.1/src/spectrum/model/aloha-noack-mac-header.cc ns-3.19/src/spectrum/model/aloha-noack-mac-header.cc
--- ns-3.18.1/src/spectrum/model/aloha-noack-mac-header.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/aloha-noack-mac-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader);
+NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader)
+  ;
 
 TypeId
 AlohaNoackMacHeader::GetTypeId (void)
diff -Naur ns-3.18.1/src/spectrum/model/aloha-noack-net-device.cc ns-3.19/src/spectrum/model/aloha-noack-net-device.cc
--- ns-3.18.1/src/spectrum/model/aloha-noack-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/aloha-noack-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -55,7 +55,8 @@
 }
 
 
-NS_OBJECT_ENSURE_REGISTERED (AlohaNoackNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (AlohaNoackNetDevice)
+  ;
 
 TypeId
 AlohaNoackNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/spectrum/model/constant-spectrum-propagation-loss.cc ns-3.19/src/spectrum/model/constant-spectrum-propagation-loss.cc
--- ns-3.18.1/src/spectrum/model/constant-spectrum-propagation-loss.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/constant-spectrum-propagation-loss.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (ConstantSpectrumPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (ConstantSpectrumPropagationLossModel)
+  ;
 
 ConstantSpectrumPropagationLossModel::ConstantSpectrumPropagationLossModel ()
 {
diff -Naur ns-3.18.1/src/spectrum/model/friis-spectrum-propagation-loss.cc ns-3.19/src/spectrum/model/friis-spectrum-propagation-loss.cc
--- ns-3.18.1/src/spectrum/model/friis-spectrum-propagation-loss.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/friis-spectrum-propagation-loss.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (FriisSpectrumPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (FriisSpectrumPropagationLossModel)
+  ;
 
 
 FriisSpectrumPropagationLossModel::FriisSpectrumPropagationLossModel ()
diff -Naur ns-3.18.1/src/spectrum/model/half-duplex-ideal-phy.cc ns-3.19/src/spectrum/model/half-duplex-ideal-phy.cc
--- ns-3.18.1/src/spectrum/model/half-duplex-ideal-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/half-duplex-ideal-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (HalfDuplexIdealPhy);
+NS_OBJECT_ENSURE_REGISTERED (HalfDuplexIdealPhy)
+  ;
 
 HalfDuplexIdealPhy::HalfDuplexIdealPhy ()
   : m_mobility (0),
diff -Naur ns-3.18.1/src/spectrum/model/multi-model-spectrum-channel.cc ns-3.19/src/spectrum/model/multi-model-spectrum-channel.cc
--- ns-3.18.1/src/spectrum/model/multi-model-spectrum-channel.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/multi-model-spectrum-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -45,7 +45,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (MultiModelSpectrumChannel);
+NS_OBJECT_ENSURE_REGISTERED (MultiModelSpectrumChannel)
+  ;
 
 
 std::ostream& operator<< (std::ostream& lhs, TxSpectrumModelInfoMap_t& rhs)
diff -Naur ns-3.18.1/src/spectrum/model/non-communicating-net-device.cc ns-3.19/src/spectrum/model/non-communicating-net-device.cc
--- ns-3.18.1/src/spectrum/model/non-communicating-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/non-communicating-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (NonCommunicatingNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (NonCommunicatingNetDevice)
+  ;
 
 TypeId
 NonCommunicatingNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/spectrum/model/single-model-spectrum-channel.cc ns-3.19/src/spectrum/model/single-model-spectrum-channel.cc
--- ns-3.18.1/src/spectrum/model/single-model-spectrum-channel.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/single-model-spectrum-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -44,7 +44,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (SingleModelSpectrumChannel);
+NS_OBJECT_ENSURE_REGISTERED (SingleModelSpectrumChannel)
+  ;
 
 SingleModelSpectrumChannel::SingleModelSpectrumChannel ()
 {
diff -Naur ns-3.18.1/src/spectrum/model/spectrum-analyzer.cc ns-3.19/src/spectrum/model/spectrum-analyzer.cc
--- ns-3.18.1/src/spectrum/model/spectrum-analyzer.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/spectrum-analyzer.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SpectrumAnalyzer);
+NS_OBJECT_ENSURE_REGISTERED (SpectrumAnalyzer)
+  ;
 
 SpectrumAnalyzer::SpectrumAnalyzer ()
   : m_mobility (0),
diff -Naur ns-3.18.1/src/spectrum/model/spectrum-channel.cc ns-3.19/src/spectrum/model/spectrum-channel.cc
--- ns-3.18.1/src/spectrum/model/spectrum-channel.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/spectrum-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 namespace ns3 {
 
 
-NS_OBJECT_ENSURE_REGISTERED (SpectrumChannel);
+NS_OBJECT_ENSURE_REGISTERED (SpectrumChannel)
+  ;
 
 TypeId
 SpectrumChannel::GetTypeId (void)
diff -Naur ns-3.18.1/src/spectrum/model/spectrum-error-model.cc ns-3.19/src/spectrum/model/spectrum-error-model.cc
--- ns-3.18.1/src/spectrum/model/spectrum-error-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/spectrum-error-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,6 +27,17 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (SpectrumErrorModel);
+
+TypeId
+SpectrumErrorModel::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::SpectrumErrorModel")
+    .SetParent<Object> ()
+    ;
+  return tid;
+}
+
 SpectrumErrorModel::~SpectrumErrorModel ()
 {
 }
diff -Naur ns-3.18.1/src/spectrum/model/spectrum-error-model.h ns-3.19/src/spectrum/model/spectrum-error-model.h
--- ns-3.18.1/src/spectrum/model/spectrum-error-model.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/spectrum-error-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -39,6 +39,8 @@
 class SpectrumErrorModel :  public Object
 {
 public:
+
+  static TypeId GetTypeId ();
   virtual ~SpectrumErrorModel ();
   virtual void StartRx (Ptr<const Packet> p) = 0;
   virtual void EvaluateChunk (const SpectrumValue& sinr, Time duration) = 0;
@@ -72,31 +74,6 @@
 };
 
 
-// class EffectiveSnrSpectrumErrorModel
-// {
-// public:
-
-//   enum ModulationAndCoding {
-//     BPSK_1_2,
-//     BPSK_1_3,
-//     QPSK_1_2,
-//     QPSK_1_3,
-//     QAM16_1_2,
-//     QAM64_1_2
-//   };
-
-//   void StartRx (uint32_t bytes);
-//   void EvaluateChunk (const SpectrumValue& sinr, Time duration);
-//   bool IsRxCorrect ();
-
-// protected:
-//   uint32_t m_bytes;
-//   uint32_t m_deliverableBytes;
-
-// };
-
-
-
 } // namespace ns3
 
 
diff -Naur ns-3.18.1/src/spectrum/model/spectrum-phy.cc ns-3.19/src/spectrum/model/spectrum-phy.cc
--- ns-3.18.1/src/spectrum/model/spectrum-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/spectrum-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SpectrumPhy);
+NS_OBJECT_ENSURE_REGISTERED (SpectrumPhy)
+  ;
 
 
 TypeId
diff -Naur ns-3.18.1/src/spectrum/model/spectrum-propagation-loss-model.cc ns-3.19/src/spectrum/model/spectrum-propagation-loss-model.cc
--- ns-3.18.1/src/spectrum/model/spectrum-propagation-loss-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/spectrum-propagation-loss-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SpectrumPropagationLossModel);
+NS_OBJECT_ENSURE_REGISTERED (SpectrumPropagationLossModel)
+  ;
 
 SpectrumPropagationLossModel::SpectrumPropagationLossModel ()
   : m_next (0)
diff -Naur ns-3.18.1/src/spectrum/model/waveform-generator.cc ns-3.19/src/spectrum/model/waveform-generator.cc
--- ns-3.18.1/src/spectrum/model/waveform-generator.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/spectrum/model/waveform-generator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WaveformGenerator);
+NS_OBJECT_ENSURE_REGISTERED (WaveformGenerator)
+  ;
 
 WaveformGenerator::WaveformGenerator ()
   : m_mobility (0),
diff -Naur ns-3.18.1/src/stats/bindings/modulegen__gcc_ILP32.py ns-3.19/src/stats/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/stats/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -109,7 +109,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1749,6 +1749,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -1759,6 +1764,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -1774,6 +1784,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -1799,6 +1814,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/stats/bindings/modulegen__gcc_LP64.py ns-3.19/src/stats/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/stats/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -109,7 +109,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1749,6 +1749,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -1759,6 +1764,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -1774,6 +1784,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -1799,6 +1814,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/stats/doc/aggregator.rst ns-3.19/src/stats/doc/aggregator.rst
--- ns-3.18.1/src/stats/doc/aggregator.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/doc/aggregator.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 .. heading hierarchy:
    ************* Section (#.#)
diff -Naur ns-3.18.1/src/stats/doc/data-collection-helpers.rst ns-3.19/src/stats/doc/data-collection-helpers.rst
--- ns-3.18.1/src/stats/doc/data-collection-helpers.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/doc/data-collection-helpers.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 .. heading hierarchy:
    ************* Section (#.#)
@@ -162,26 +163,26 @@
 
 It has the following arguments:
 
-+--------------------------------+------------------------------+
-| Argument                       | Description                  |
-+================================+==============================+
-| outputFileNameWithoutExtension | Name of gnuplot related files|
-|                                | to write with no extension.  |
-+--------------------------------+------------------------------+
-| title                          | Plot title string to use for |
-|                                | this plot.                   |
-+--------------------------------+------------------------------+
-| xLegend                        | The legend for the x         |
-|                                | horizontal axis.             |
-+--------------------------------+------------------------------+
-| yLegend                        | The legend for the y         |
-|                                | vertical axis.               |
-+--------------------------------+------------------------------+
-| terminalType                   | Terminal type setting string |
-|                                | for output.  The default     |
-|                                | terminal type is "png".      |
-+--------------------------------+------------------------------+
-
+  +--------------------------------+------------------------------+
+  | Argument                       | Description                  |
+  +================================+==============================+
+  | outputFileNameWithoutExtension | Name of gnuplot related files|
+  |                                | to write with no extension.  |
+  +--------------------------------+------------------------------+
+  | title                          | Plot title string to use for |
+  |                                | this plot.                   |
+  +--------------------------------+------------------------------+
+  | xLegend                        | The legend for the x         |
+  |                                | horizontal axis.             |
+  +--------------------------------+------------------------------+
+  | yLegend                        | The legend for the y         |
+  |                                | vertical axis.               |
+  +--------------------------------+------------------------------+
+  | terminalType                   | Terminal type setting string |
+  |                                | for output.  The default     |
+  |                                | terminal type is "png".      |
+  +--------------------------------+------------------------------+
+  
 The GnuplotHelper's ``ConfigurePlot()`` function configures plot 
 related parameters for this gnuplot helper so
 that it will create a space separated gnuplot data file named
@@ -219,26 +220,26 @@
 
 It has the following arguments:
 
-+------------------+------------------------------+
-| Argument         | Description                  |
-+==================+==============================+
-| typeId           | The type ID for the probe    |
-|                  | used when it is created.     |
-+------------------+------------------------------+
-| path             | Config path to access the    |
-|                  | probe.                       |
-+------------------+------------------------------+
-| probeTraceSource | The probe trace source to    |
-|                  | access.                      |
-+------------------+------------------------------+
-| title            | The title to be associated   |
-|                  | to this dataset              |
-+------------------+------------------------------+
-| keyLocation      | The location of the key in   |
-|                  | the plot.  The default       |
-|                  | location is inside.          |
-+------------------+------------------------------+
-
+  +------------------+------------------------------+
+  | Argument         | Description                  |
+  +==================+==============================+
+  | typeId           | The type ID for the probe    |
+  |                  | used when it is created.     |
+  +------------------+------------------------------+
+  | path             | Config path to access the    |
+  |                  | probe.                       |
+  +------------------+------------------------------+
+  | probeTraceSource | The probe trace source to    |
+  |                  | access.                      |
+  +------------------+------------------------------+
+  | title            | The title to be associated   |
+  |                  | to this dataset              |
+  +------------------+------------------------------+
+  | keyLocation      | The location of the key in   |
+  |                  | the plot.  The default       |
+  |                  | location is inside.          |
+  +------------------+------------------------------+
+  
 The GnuplotHelper's ``PlotProbe()`` function 
 plots a dataset generated by hooking the |ns3| trace source with a
 probe, and then plotting the values from the probeTraceSource. 
@@ -365,7 +366,7 @@
 code that was added to the original |ns3| Tutorial example's code.  
 Only the first 10 lines of this file are shown here for brevity.
 
-::
+.. sourcecode:: text
 
   Time (Seconds) = 1.000e+00	Packet Byte Count = 40
   Time (Seconds) = 1.004e+00	Packet Byte Count = 40
@@ -386,7 +387,7 @@
 |ns3| Tutorial example's code.  Only the first 10 lines of this 
 file are shown here for brevity.
 
-::
+.. sourcecode:: text
 
   Time (Seconds) = 1.002e+00	Packet Byte Count = 40
   Time (Seconds) = 1.007e+00	Packet Byte Count = 40
@@ -445,17 +446,17 @@
 
 It has the following arguments:
 
-+--------------------------------+------------------------------+
-| Argument                       | Description                  |
-+================================+==============================+
-| outputFileNameWithoutExtension | Name of output file to write |
-|                                | with no extension.           |
-+--------------------------------+------------------------------+
-| fileType                       | Type of file to write.  The  | 
-|                                | default type of file is space| 
-|                                | separated.                   |
-+--------------------------------+------------------------------+
-
+  +--------------------------------+------------------------------+
+  | Argument                       | Description                  |
+  +================================+==============================+
+  | outputFileNameWithoutExtension | Name of output file to write |
+  |                                | with no extension.           |
+  +--------------------------------+------------------------------+
+  | fileType                       | Type of file to write.  The  | 
+  |                                | default type of file is space| 
+  |                                | separated.                   |
+  +--------------------------------+------------------------------+
+  
 The FileHelper's ``ConfigureFile()`` function configures text file 
 related parameters for the file helper so that
 it will create a file named outputFileNameWithoutExtension plus
@@ -487,19 +488,19 @@
 
 It has the following arguments:
 
-+------------------+------------------------------+
-| Argument         | Description                  |
-+==================+==============================+
-| typeId           | The type ID for the probe    |
-|                  | used when it is created.     |
-+------------------+------------------------------+
-| path             | Config path to access the    |
-|                  | probe.                       |
-+------------------+------------------------------+
-| probeTraceSource | The probe trace source to    |
-|                  | access.                      |
-+------------------+------------------------------+
-
+  +------------------+------------------------------+
+  | Argument         | Description                  |
+  +==================+==============================+
+  | typeId           | The type ID for the probe    |
+  |                  | used when it is created.     |
+  +------------------+------------------------------+
+  | path             | Config path to access the    |
+  |                  | probe.                       |
+  +------------------+------------------------------+
+  | probeTraceSource | The probe trace source to    |
+  |                  | access.                      |
+  +------------------+------------------------------+
+  
 The FileHelper's ``WriteProbe()`` function
 creates output text files generated by hooking the ns-3 trace source
 with a probe, and then writing the values from the
@@ -544,7 +545,7 @@
 ``file-helper-example.txt`` was created using the example.  
 Only the first 10 lines of this file are shown here for brevity.
 
-::
+.. sourcecode:: text
 
   Time (Seconds) = 4.995e-01	Count = 1
   Time (Seconds) = 1.463e+00	Count = 2
diff -Naur ns-3.18.1/src/stats/doc/data-collection.rst ns-3.19/src/stats/doc/data-collection.rst
--- ns-3.18.1/src/stats/doc/data-collection.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/doc/data-collection.rst	2013-12-20 09:44:50.000000000 -0800
@@ -32,5 +32,6 @@
    collector.rst
    aggregator.rst
    adaptor.rst
+   statistics.rst
    scope-and-limitations.rst
 
diff -Naur ns-3.18.1/src/stats/doc/probe.rst ns-3.19/src/stats/doc/probe.rst
--- ns-3.18.1/src/stats/doc/probe.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/doc/probe.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 .. heading hierarchy:
    ************* Section (#.#)
@@ -46,13 +47,17 @@
 * Probes register a name in the ns3::Config namespace (using
   ``Names::Add ()``) so that other objects may refer to them.
 * Probes provide a static method that allows one to manipulate a Probe
-  by name, such as what is done in ns2measure [Cic06]_ ::
+  by name, such as what is done in ns2measure [Cic06]_
 
-   Stat::put ("my_metric", ID, sample);
+  ::
 
-  The ns-3 equivalent of the above ns2measure code is, e.g.::
+    Stat::put ("my_metric", ID, sample);
 
-  DoubleProbe::SetValueByPath ("/path/to/probe", sample);
+  The ns-3 equivalent of the above ns2measure code is, e.g.
+
+  ::
+
+    DoubleProbe::SetValueByPath ("/path/to/probe", sample);
 
 Creation
 ########
@@ -245,23 +250,23 @@
 
 1. through a traced variable hooked to one Probe: 
 
-::
+   ::
   
-    TracedValue<double> m_counter;  // normally this would be integer type
+     TracedValue<double> m_counter;  // normally this would be integer type
   
 2. through a counter whose value is posted to a second Probe, referenced by its name in the Config system:
 
-::
+  ::
 
-  void
-  Emitter::Count (void)
-  {
-    NS_LOG_FUNCTION (this);
-    NS_LOG_DEBUG ("Counting at " << Simulator::Now ().GetSeconds ());
-    m_counter += 1.0;
-    DoubleProbe::SetValueByPath ("/Names/StaticallyAccessedProbe", m_counter);
-    Simulator::Schedule (Seconds (m_var->GetValue ()), &Emitter::Count, this);
-  }
+    void
+    Emitter::Count (void)
+    {
+      NS_LOG_FUNCTION (this);
+      NS_LOG_DEBUG ("Counting at " << Simulator::Now ().GetSeconds ());
+      m_counter += 1.0;
+      DoubleProbe::SetValueByPath ("/Names/StaticallyAccessedProbe", m_counter);
+      Simulator::Schedule (Seconds (m_var->GetValue ()), &Emitter::Count, this);
+    }
 
 Let's look at the Probe more carefully.  Probes can receive their values
 in a multiple ways:
@@ -303,7 +308,7 @@
 
 Case 0):
 
-::
+  ::
 
     // The below shows typical functionality without a probe
     // (connect a sink function to a trace source)
@@ -314,7 +319,7 @@
 
 case 1):
 
-::
+  ::
 
     // 
     // Probe1 will be hooked directly to the Emitter trace source object
@@ -331,7 +336,7 @@
 
 case 2):
 
-::
+  ::
 
     // 
     // Probe2 will be hooked to the Emitter trace source object by 
@@ -347,7 +352,7 @@
   
 case 4) (case 3 is not shown in this example):
 
-::
+  ::
 
     // 
     // Probe3 will be called by the emitter directly through the 
@@ -361,12 +366,14 @@
 And finally, the example shows how the probes can be hooked to
 generate output:
 
-::
+  ::
 
     // The probe itself should generate output.  The context that we provide
     // to this probe (in this case, the probe name) will help to disambiguate
     // the source of the trace
-    connected = probe3->TraceConnect ("Output", "/Names/Probes/StaticallyAccessedProbe/Output", MakeCallback (&NotifyViaProbe));
+    connected = probe3->TraceConnect ("Output",
+                                      "/Names/Probes/StaticallyAccessedProbe/Output",
+                                      MakeCallback (&NotifyViaProbe));
     NS_ASSERT_MSG (connected, "Trace source not .. connected to probe3 Output");
   
 The following callback is hooked to the Probe in this example for 
@@ -390,21 +397,18 @@
 Tutorial.  It can be found in 
 ``src/stats/examples/ipv4-packet-plot-example.cc``.
 
-::
-
-    // ===========================================================================
-    //
-    //         node 0                 node 1
-    //   +----------------+    +----------------+
-    //   |    ns-3 TCP    |    |    ns-3 TCP    |
-    //   +----------------+    +----------------+
-    //   |    10.1.1.1    |    |    10.1.1.2    |
-    //   +----------------+    +----------------+
-    //   | point-to-point |    | point-to-point |
-    //   +----------------+    +----------------+
-    //           |                     |
-    //           +---------------------+
+.. sourcecode:: text
 
+          node 0                 node 1
+    +----------------+    +----------------+
+    |    ns-3 TCP    |    |    ns-3 TCP    |
+    +----------------+    +----------------+
+    |    10.1.1.1    |    |    10.1.1.2    |
+    +----------------+    +----------------+
+    | point-to-point |    | point-to-point |
+    +----------------+    +----------------+
+            |                     |
+            +---------------------+
 
 
 We'll just look at the Probe, as it illustrates that Probes may also
diff -Naur ns-3.18.1/src/stats/doc/statistics.rst ns-3.19/src/stats/doc/statistics.rst
--- ns-3.18.1/src/stats/doc/statistics.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/doc/statistics.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Statistical Framework
 ---------------------
@@ -35,8 +36,8 @@
 
 * The core framework and two basic data collectors: A counter, and a min/max/avg/total observer.
 * Extensions of those to easily work with times and packets.
-* Plaintext output formatted for omnetpp.
-* Database output using sqlite3, a standalone, lightweight, high performance SQL engine.
+* Plaintext output formatted for `OMNet++`_.
+* Database output using SQLite_, a standalone, lightweight, high performance SQL engine.
 * Mandatory and open ended metadata for describing and working with runs.
 * An example based on the notional experiment of examining the properties of NS-3's default ad hoc WiFi performance.  It incorporates the following:
 
@@ -47,6 +48,9 @@
   * An example of using packet tags to track end-to-end delay.
   * A simple control script which runs a number of trials of the experiment at varying distances and queries the resulting database to produce a graph using GNUPlot.
 
+.. _OMNet++: http://www.omnetpp.org
+.. _SQLite:  http://www.sqlite.org
+
 To-Do
 *****
 
@@ -98,17 +102,18 @@
 
   ::
 
+    double distance = 50.0;
+    string format ("OMNet++");
+    string experiment ("wifi-distance-test");
+    string strategy ("wifi-default");
+    string runID;
+
     CommandLine cmd;
-    cmd.AddValue("distance", "Distance apart to place nodes (in meters).",
-                 distance);
-    cmd.AddValue("format", "Format to use for data output.",
-                 format);
-    cmd.AddValue("experiment", "Identifier for experiment.",
-                 experiment);
-    cmd.AddValue("strategy", "Identifier for strategy.",
-                 strategy);
-    cmd.AddValue("run", "Identifier for run.",
-                 runID);
+    cmd.AddValue("distance",   "Distance apart to place nodes (in meters).", distance);
+    cmd.AddValue("format",     "Format to use for data output.",             format);
+    cmd.AddValue("experiment", "Identifier for experiment.",                 experiment);
+    cmd.AddValue("strategy",   "Identifier for strategy.",                   strategy);
+    cmd.AddValue("run",        "Identifier for run.",                        runID);
     cmd.Parse (argc, argv);
 
 * Creating nodes and network stacks using ``ns3::NodeContainer``, ``ns3::WiFiHelper``, and ``ns3::InternetStackHelper``.
@@ -170,30 +175,24 @@
   ::
 
     DataCollector data;
-    data.DescribeRun(experiment,
-                     strategy,
-                     input,
-                     runID);
+    data.DescribeRun(experiment, strategy, input, runID);
     data.AddMetadata("author", "tjkopena");
 
   Actual observation and calculating is done by ``ns3::DataCalculator`` objects, of which several different types exist.  These are created by the simulation program, attached to reporting or sampling code, and then registered with the ``ns3::DataCollector`` so they will be queried later for their output.  One easy observation mechanism is to use existing trace sources, for example to instrument objects in the ns-3 core without changing their code.  Here a counter is attached directly to a trace signal in the WiFi MAC layer on the target node.
 
   ::
 
-    Ptr<PacketCounterCalculator> totalRx =
-      CreateObject<PacketCounterCalculator>();
+    Ptr<PacketCounterCalculator> totalRx = CreateObject<PacketCounterCalculator>();
     totalRx->SetKey("wifi-rx-frames");
     Config::Connect("/NodeList/1/DeviceList/*/$ns3::WifiNetDevice/Rx",
-                    MakeCallback(&PacketCounterCalculator::FrameUpdate,
-                                      totalRx));
+                    MakeCallback(&PacketCounterCalculator::FrameUpdate, totalRx));
     data.AddDataCalculator(totalRx);
 
   Calculators may also be manipulated directly.  In this example, a counter is created and passed to the traffic sink application to be updated when packets are received.
 
   ::
 
-    Ptr<CounterCalculator<> > appRx =
-      CreateObject<CounterCalculator<> >();
+    Ptr<CounterCalculator<> > appRx = CreateObject<CounterCalculator<> >();
     appRx->SetKey("receiver-rx-packets");
     receiver->SetCounter(appRx);
     data.AddDataCalculator(appRx);
@@ -212,23 +211,24 @@
 
     Simulator::Run();    
 
-* Generating either omnetpp or sqlite output, depending on the command line arguments.  To do this a ``ns3::DataOutputInterface`` object is created and configured.  The specific type of this will determine the output format.  This object is then given the ``ns3::DataCollector`` object which it interrogates to produce the output.
+* Generating either `OMNet++`_ or SQLite_ output, depending on the command line arguments.  To do this a ``ns3::DataOutputInterface`` object is created and configured.  The specific type of this will determine the output format.  This object is then given the ``ns3::DataCollector`` object which it interrogates to produce the output.
 
-  ::
+  .. sourcecode:: cpp
 
     Ptr<DataOutputInterface> output;
-    if (format == "omnet") {
-      NS_LOG_INFO("Creating omnet formatted data output.");
+    if (format == "OMNet++") {
+      NS_LOG_INFO("Creating OMNet++ formatted data output.");
       output = CreateObject<OmnetDataOutput>();
     } else {
-      #ifdef STAT_USE_DB
-        NS_LOG_INFO("Creating sqlite formatted data output.");
+    #   ifdef STAT_USE_DB
+        NS_LOG_INFO("Creating SQLite formatted data output.");
         output = CreateObject<SqliteDataOutput>();
-      #endif
+    #   endif
     }
 
     output->Output(data);
 
+
 * Freeing any memory used by the simulation.  This should come at the end of the main function for the example.
 
   ::
@@ -240,18 +240,18 @@
 
 To see what the example program, applications, and stat framework are doing in detail, set the ``NS_LOG`` variable appropriately.  The following will provide copious output from all three.
   
-::
+.. sourcecode:: bash
 
-  export NS_LOG=StatFramework:WiFiDistanceExperiment:WiFiDistanceApps
+  $ export NS_LOG=WiFiDistanceExperiment:WiFiDistanceApps
 
 Note that this slows down the simulation extraordinarily.
 
 Sample Output
 =============
 
-Compiling and simply running the test program will append omnet++ formatted output such as the following to ``data.sca``.
+Compiling and simply running the test program will append `OMNet++`_ formatted output such as the following to ``data.sca``.
 
-::
+.. sourcecode:: text
  
   run run-1212239121
   
@@ -280,9 +280,11 @@
 Control Script
 ++++++++++++++
 
-In order to automate data collection at a variety of inputs (distances), a simple Bash script is used to execute a series of simulations.  It can be found at ``examples/stats/wifi-example-db.sh``.  The script runs through a set of distances, collecting the results into an sqlite3 database.  At each distance five trials are conducted to give a better picture of expected performance.  The entire experiment takes only a few dozen seconds to run on a low end machine as there is no output during the simulation and little traffic is generated.
+In order to automate data collection at a variety of inputs (distances), a simple Bash script is used to execute a series of simulations.  It can be found at ``examples/stats/wifi-example-db.sh``.  The script is meant to be run from the ``examples/stats/`` directory.
+
+The script runs through a set of distances, collecting the results into an SQLite_ database.  At each distance five trials are conducted to give a better picture of expected performance.  The entire experiment takes only a few dozen seconds to run on a low end machine as there is no output during the simulation and little traffic is generated.
   
-::
+.. sourcecode:: bash
 
   #!/bin/sh
   
@@ -314,9 +316,9 @@
 Analysis and Conclusion
 +++++++++++++++++++++++
 
-Once all trials have been conducted, the script executes a simple SQL query over the database using the sqlite3 command line program.  The query computes average packet loss in each set of trials associated with each distance.  It does not take into account different strategies, but the information is present in the database to make some simple extensions and do so.  The collected data is then passed to GNUPlot for graphing.
+Once all trials have been conducted, the script executes a simple SQL query over the database using the SQLite_ command line program.  The query computes average packet loss in each set of trials associated with each distance.  It does not take into account different strategies, but the information is present in the database to make some simple extensions and do so.  The collected data is then passed to GNUPlot for graphing.
   
-::
+.. sourcecode:: sql
 
   CMD="select exp.input,avg(100-((rx.value*100)/tx.value)) \
       from Singletons rx, Singletons tx, Experiments exp \
@@ -333,7 +335,7 @@
 
 The GNUPlot script found at ``examples/stats/wifi-example.gnuplot`` simply defines the output format and some basic formatting for the graph.
   
-::
+.. sourcecode:: bash
 
   set terminal postscript portrait enhanced lw 2 "Helvetica" 14
   
diff -Naur ns-3.18.1/src/stats/examples/double-probe-example.cc ns-3.19/src/stats/examples/double-probe-example.cc
--- ns-3.18.1/src/stats/examples/double-probe-example.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/examples/double-probe-example.cc	2013-12-20 09:44:50.000000000 -0800
@@ -50,7 +50,8 @@
 
 };
 
-NS_OBJECT_ENSURE_REGISTERED (Emitter);
+NS_OBJECT_ENSURE_REGISTERED (Emitter)
+  ;
 
 TypeId
 Emitter::GetTypeId (void)
diff -Naur ns-3.18.1/src/stats/examples/file-helper-example.cc ns-3.19/src/stats/examples/file-helper-example.cc
--- ns-3.18.1/src/stats/examples/file-helper-example.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/examples/file-helper-example.cc	2013-12-20 09:44:50.000000000 -0800
@@ -53,7 +53,8 @@
 
 };
 
-NS_OBJECT_ENSURE_REGISTERED (Emitter);
+NS_OBJECT_ENSURE_REGISTERED (Emitter)
+  ;
 
 TypeId
 Emitter::GetTypeId (void)
diff -Naur ns-3.18.1/src/stats/examples/gnuplot-helper-example.cc ns-3.19/src/stats/examples/gnuplot-helper-example.cc
--- ns-3.18.1/src/stats/examples/gnuplot-helper-example.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/examples/gnuplot-helper-example.cc	2013-12-20 09:44:50.000000000 -0800
@@ -53,7 +53,8 @@
 
 };
 
-NS_OBJECT_ENSURE_REGISTERED (Emitter);
+NS_OBJECT_ENSURE_REGISTERED (Emitter)
+  ;
 
 TypeId
 Emitter::GetTypeId (void)
diff -Naur ns-3.18.1/src/stats/helper/file-helper.cc ns-3.19/src/stats/helper/file-helper.cc
--- ns-3.18.1/src/stats/helper/file-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/helper/file-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("FileHelper");
+NS_LOG_COMPONENT_DEFINE ("FileHelper")
+  ;
 
 FileHelper::FileHelper ()
   : m_aggregator                     (0),
diff -Naur ns-3.18.1/src/stats/helper/file-helper.h ns-3.19/src/stats/helper/file-helper.h
--- ns-3.18.1/src/stats/helper/file-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/helper/file-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,7 @@
 namespace ns3 {
 
 /**
+ * \ingroup stats
  * \brief Helper class used to put data values into a file.
  **/
 class FileHelper
@@ -133,12 +134,13 @@
 
   /**
    * \param probeName the probe's name.
-   *
+   * \return Ptr to the probe
    * \brief Gets the specified probe.
    */
   Ptr<Probe> GetProbe (std::string probeName) const;
 
   /**
+   * \return Ptr to a FileAggregator object
    * \brief Gets the single aggregator that is always constructed.
    *
    * This function is non-const because an aggregator may be lazily
@@ -149,7 +151,7 @@
   /**
    * \param aggregatorName name for aggregator.
    * \param outputFileName name of output file to write.
-   *
+   * \return Ptr to a FileAggregator object
    * \brief Gets one of the multiple aggregators from the map.
    *
    * This function is non-const because an aggregator may be lazily
@@ -303,17 +305,16 @@
   /// Heading line for the outputfile.
   std::string m_heading;
 
-  /// Format strings for C-style sprintf() function.
-  std::string m_1dFormat;
-  std::string m_2dFormat;
-  std::string m_3dFormat;
-  std::string m_4dFormat;
-  std::string m_5dFormat;
-  std::string m_6dFormat;
-  std::string m_7dFormat;
-  std::string m_8dFormat;
-  std::string m_9dFormat;
-  std::string m_10dFormat;
+  std::string m_1dFormat;  //!< Format string for 1D format C-style sprintf() function.
+  std::string m_2dFormat;  //!< Format string for 2D format C-style sprintf() function.
+  std::string m_3dFormat;  //!< Format string for 3D format C-style sprintf() function.
+  std::string m_4dFormat;  //!< Format string for 4D format C-style sprintf() function.
+  std::string m_5dFormat;  //!< Format string for 5D format C-style sprintf() function.
+  std::string m_6dFormat;  //!< Format string for 6D format C-style sprintf() function.
+  std::string m_7dFormat;  //!< Format string for 7D format C-style sprintf() function.
+  std::string m_8dFormat;  //!< Format string for 8D format C-style sprintf() function.
+  std::string m_9dFormat;  //!< Format string for 9D format C-style sprintf() function.
+  std::string m_10dFormat; //!< Format string for 10D format C-style sprintf() function.
 
 }; // class FileHelper
 
diff -Naur ns-3.18.1/src/stats/helper/gnuplot-helper.cc ns-3.19/src/stats/helper/gnuplot-helper.cc
--- ns-3.18.1/src/stats/helper/gnuplot-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/helper/gnuplot-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("GnuplotHelper");
+NS_LOG_COMPONENT_DEFINE ("GnuplotHelper")
+  ;
 
 GnuplotHelper::GnuplotHelper ()
   : m_aggregator                     (0),
diff -Naur ns-3.18.1/src/stats/helper/gnuplot-helper.h ns-3.19/src/stats/helper/gnuplot-helper.h
--- ns-3.18.1/src/stats/helper/gnuplot-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/helper/gnuplot-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -33,6 +33,7 @@
 namespace ns3 {
 
 /**
+ * \ingroup gnuplot
  * \brief Helper class used to make gnuplot plots.
  **/
 class GnuplotHelper
@@ -139,12 +140,13 @@
 
   /**
    * \param probeName the probe's name.
-   *
+   * \return Ptr to probe
    * \brief Gets the specified probe.
    */
   Ptr<Probe> GetProbe (std::string probeName) const;
 
   /**
+   * \return Ptr to GnuplotAggregator object
    * \brief Gets the aggregator.
    *
    * This function is non-const because an aggregator may be lazily
diff -Naur ns-3.18.1/src/stats/model/average.h ns-3.19/src/stats/model/average.h
--- ns-3.18.1/src/stats/model/average.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/average.h	2013-12-20 09:44:50.000000000 -0800
@@ -30,12 +30,7 @@
 namespace ns3 {
 
 /**
- * \defgroup tools Tools
- *
- */
-
-/**
- * \ingroup tools
+ * \ingroup stats
  *
  * Simple average, min, max and std. deviation calculator
  *
@@ -106,9 +101,10 @@
   //\}
 
 private:
-  uint32_t m_size;
-  T      m_min, m_max;
-  MinMaxAvgTotalCalculator<double> m_varianceCalculator;
+  uint32_t m_size; //!< Number of sampled data.
+  T m_min; //!< Minimum value observed.
+  T m_max; //!< Maximum value observed.
+  MinMaxAvgTotalCalculator<double> m_varianceCalculator; //!< Variance calculator.
 };
 
 /// Print avg (err) [min, max]
diff -Naur ns-3.18.1/src/stats/model/basic-data-calculators.h ns-3.19/src/stats/model/basic-data-calculators.h
--- ns-3.18.1/src/stats/model/basic-data-calculators.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/basic-data-calculators.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,10 +27,11 @@
 namespace ns3 {
 
 /**
- * \defgroup stats Statistics
+ * \ingroup stats
+ * \class MinMaxAvgTotalCalculator
+ * \brief Template class MinMaxAvgTotalCalculator
  *
  */
-
 //------------------------------------------------------------
 //--------------------------------------------
 template <typename T  = uint32_t>
@@ -40,36 +41,75 @@
   MinMaxAvgTotalCalculator();
   virtual ~MinMaxAvgTotalCalculator();
 
+  /**
+   * Updates all variables of MinMaxAvgTotalCalculator
+   * \param i value of type T to use for updating the calculator
+   */
   void Update (const T i);
+  /**
+   * Reinitializes all variables of MinMaxAvgTotalCalculator
+   */
   void Reset ();
 
   virtual void Output (DataOutputCallback &callback) const;
 
+  /**
+   * Returns the count
+   * \return Count
+   */
   long getCount () const { return m_count; }
+  /**
+   * Returns the sum
+   * \return Total
+   */
   double getSum () const { return m_total; }
+  /**
+   * Returns the minimum value
+   * \return Min
+   */
   double getMin () const { return m_min; }
+  /**
+   * Returns the maximum value
+   * \return Max
+   */
   double getMax () const { return m_max; }
+  /**
+   * Returns the mean value
+   * \return Mean
+   */
   double getMean () const { return m_meanCurr; }
+  /**
+   * Returns the standard deviation
+   * \return Standard deviation
+   */
   double getStddev () const { return std::sqrt (m_varianceCurr); }
+  /**
+   * Returns the current variance
+   * \return Variance
+   */
   double getVariance () const { return m_varianceCurr; }
+  /**
+   * Returns the sum of squares
+   * \return Sum of squares
+   */
   double getSqrSum () const { return m_squareTotal; }
 
 protected:
   virtual void DoDispose (void);
 
-  uint32_t m_count;
+  uint32_t m_count;      //!< Count value of MinMaxAvgTotalCalculator
 
-  T m_total;
-  T m_squareTotal;
-  T m_min;
-  T m_max;
-
-  double m_meanCurr;
-  double m_sCurr;
-  double m_varianceCurr;
+  T m_total;             //!< Total value of MinMaxAvgTotalCalculator
+  T m_squareTotal;       //!< Sum of squares value of MinMaxAvgTotalCalculator
+  T m_min;               //!< Minimum value of MinMaxAvgTotalCalculator
+  T m_max;               //!< Maximum value of MinMaxAvgTotalCalculator
+
+  double m_meanCurr;     //!< Current mean of MinMaxAvgTotalCalculator
+  double m_sCurr;        //!< Current s of MinMaxAvgTotalCalculator
+  double m_varianceCurr; //!< Current variance of MinMaxAvgTotalCalculator
 
-  double m_meanPrev;
-  double m_sPrev;
+  double m_meanPrev;     //!< Previous mean of MinMaxAvgTotalCalculator
+  double m_sPrev;        //!< Previous s of MinMaxAvgTotalCalculator
 
   // end MinMaxAvgTotalCalculator
 };
@@ -197,6 +237,8 @@
 
 /**
  * \ingroup stats
+ * \class CounterCalculator
+ * \brief Template class CounterCalculator
  *
  */
 //------------------------------------------------------------
@@ -207,17 +249,32 @@
   CounterCalculator();
   virtual ~CounterCalculator();
 
+  /**
+   * Increments count by 1
+   */
   void Update ();
+  /**
+   * Increments count by i
+   * \param i value of type T to increment count
+   */
   void Update (const T i);
 
+  /**
+   * Returns the count of the CounterCalculator
+   * \return Count as a value of type T
+   */
   T GetCount () const;
 
+  /**
+   * Outputs the data based on the provided callback
+   * \param callback
+   */
   virtual void Output (DataOutputCallback &callback) const;
 
 protected:
   virtual void DoDispose (void);
 
-  T m_count;
+  T m_count; //!< Count value of CounterCalculator
 
   // end CounterCalculator
 };
diff -Naur ns-3.18.1/src/stats/model/boolean-probe.cc ns-3.19/src/stats/model/boolean-probe.cc
--- ns-3.18.1/src/stats/model/boolean-probe.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/boolean-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BooleanProbe);
+NS_OBJECT_ENSURE_REGISTERED (BooleanProbe)
+  ;
 
 TypeId
 BooleanProbe::GetTypeId ()
diff -Naur ns-3.18.1/src/stats/model/boolean-probe.h ns-3.19/src/stats/model/boolean-probe.h
--- ns-3.18.1/src/stats/model/boolean-probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/boolean-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,6 +34,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup probes
+ *
  * This class is designed to probe an underlying ns3 TraceSource exporting
  * a bool.  This probe exports a trace source "Output" of type bool.
  * The Output trace source emits a value when either the trace source
@@ -45,6 +47,10 @@
 class BooleanProbe : public Probe
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   BooleanProbe ();
   virtual ~BooleanProbe ();
@@ -97,7 +103,7 @@
    */
   void TraceSink (bool oldData, bool newData);
 
-  TracedValue<bool> m_output;
+  TracedValue<bool> m_output; //!< Output trace source.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/stats/model/data-calculator.h ns-3.19/src/stats/model/data-calculator.h
--- ns-3.18.1/src/stats/model/data-calculator.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/data-calculator.h	2013-12-20 09:44:50.000000000 -0800
@@ -26,11 +26,23 @@
 #include "ns3/simulator.h"
 
 namespace ns3 {
-extern const double NaN;
+extern const double NaN; //!< Stored representation of NaN
+
+/**
+ * \brief true if x is NaN
+ * \param x
+ * \return whether x is NaN
+ */
 inline bool isNaN (double x) { return x != x; }
 
 class DataOutputCallback;
 
+/**
+ * \ingroup stats
+ * \class StatisticalSummary
+ * \brief Abstract class for calculating statistical data 
+ *
+ */
 class StatisticalSummary {
 public:
   /**
@@ -40,81 +52,130 @@
   {
   }
   /**
-   * Returns the number of the observations.
+   * Returns the number of observations.
+   * \return Number of observations
    */
   virtual long getCount () const = 0;
 
   /**
-   * Returns the sum of the values.
+   * \return Sum of values
    * @see getWeightedSum()
    */
   virtual double getSum () const = 0;
 
   /**
-   * Returns the sum of the squared values.
+   * \return Sum of squared values
    * @see getWeightedSqrSum()
    */
   virtual double getSqrSum () const = 0;
 
   /**
    * Returns the minimum of the values.
+   * \return Minimum of values
    */
   virtual double getMin () const = 0;
 
   /**
    * Returns the maximum of the values.
+   * \return Maximum of values
    */
   virtual double getMax () const = 0;
 
   /**
    * Returns the mean of the (weighted) observations.
+   * \return Mean of (weighted) observations
    */
   virtual double getMean () const = 0;
 
   /**
    * Returns the standard deviation of the (weighted) observations.
+   * \return Standard deviation of (weighted) observations
    */
   virtual double getStddev () const = 0;
 
   /**
    * Returns the variance of the (weighted) observations.
+   * \return Variance of (weighted) observations
    */
   virtual double getVariance () const = 0;
 };
 
 //------------------------------------------------------------
 //--------------------------------------------
+/**
+ * \ingroup stats
+ * \class DataCalculator
+ * \brief Calculates data during a simulation
+ *
+ */
 class DataCalculator : public Object {
 public:
   DataCalculator();
   virtual ~DataCalculator();
 
+  /**
+   * Returns whether the DataCalculator is enabled
+   * \return true if DataCalculator is enabled
+   */
   bool GetEnabled () const;
+  /**
+   * Enables DataCalculator when simulation starts
+   */
   void Enable ();
+  /**
+   * Disables DataCalculator when simulation stops
+   */
   void Disable ();
-
+  /**
+   * Sets the DataCalculator key to the provided key
+   * \param key Key value as a string
+   */
   void SetKey (const std::string key);
+  /**
+   * Gets the DataCalculator key
+   * \return Key value as a string
+   */
   std::string GetKey () const;
 
+  /**
+   * Sets the DataCalculator context to the provided context
+   * \param context Context value as a string
+   */
   void SetContext (const std::string context);
+  /**
+   * Gets the DataCalculator context
+   * \return Context value as a string
+   */
   std::string GetContext () const;
 
+  /**
+   * Starts DataCalculator at a given time in the simulation
+   * \param startTime
+   */
   virtual void Start (const Time& startTime);
+  /**
+   * Stops DataCalculator at a given time in the simulation
+   * \param stopTime
+   */
   virtual void Stop (const Time& stopTime);
 
+  /**
+   * Outputs data based on the provided callback
+   * \param callback
+   */
   virtual void Output (DataOutputCallback &callback) const = 0;
 
 protected:
-  bool m_enabled;    // Descendant classes *must* check & respect m_enabled!
+  bool m_enabled;    //!< Descendant classes *must* check & respect m_enabled!
 
-  std::string m_key;
-  std::string m_context;
+  std::string m_key;      //!< Key value
+  std::string m_context;  //!< Context value
 
   virtual void DoDispose (void);
 
 private:
-  EventId m_startEvent;
-  EventId m_stopEvent;
+  EventId m_startEvent; //!< Start event
+  EventId m_stopEvent;  //!< Stop event
 
   // end class DataCalculator
 };
diff -Naur ns-3.18.1/src/stats/model/data-collection-object.cc ns-3.19/src/stats/model/data-collection-object.cc
--- ns-3.18.1/src/stats/model/data-collection-object.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/data-collection-object.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (DataCollectionObject);
+NS_OBJECT_ENSURE_REGISTERED (DataCollectionObject)
+  ;
 
 TypeId
 DataCollectionObject::GetTypeId (void)
diff -Naur ns-3.18.1/src/stats/model/data-collection-object.h ns-3.19/src/stats/model/data-collection-object.h
--- ns-3.18.1/src/stats/model/data-collection-object.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/data-collection-object.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,6 +27,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup aggregator
+ *
  * Base class for data collection framework objects.
  *
  * All data collection objects have 1) a string name, and 2) enabled
@@ -35,6 +37,10 @@
 class DataCollectionObject : public Object
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
 
   DataCollectionObject ();
@@ -42,6 +48,7 @@
 
   /// Set the status of an individual object.
   void Enable (void);
+  /// Unset the status of an individual object.
   void Disable (void);
 
   /// Check the status of an individual object.
diff -Naur ns-3.18.1/src/stats/model/data-collector.h ns-3.19/src/stats/model/data-collector.h
--- ns-3.18.1/src/stats/model/data-collector.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/data-collector.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,60 +28,126 @@
 
 namespace ns3 {
 
-/**
- * \ingroup stats
- *
- */
 class DataCalculator;
 
 //------------------------------------------------------------
 //--------------------------------------------
+/**
+ * List of Ptrs to DataCalculator objects
+ */
 typedef std::list<Ptr<DataCalculator> > DataCalculatorList;
+/**
+ * List of pairs of strings representing metadata
+ */
 typedef std::list<std::pair<std::string, std::string> > MetadataList;
 
 /**
- * \ingroup stats
- *
+ * \ingroup dataoutput
+ * \class DataCollector
+ * \brief Collects data 
  */
 class DataCollector : public Object {
 public:
   DataCollector();
   virtual ~DataCollector();
 
+  /**
+   * Provide specific parameters to the DataCollector
+   * \param experiment Label for the experiment
+   * \param strategy Label for the strategy
+   * \param input Label for the input
+   * \param runID Label for the runID
+   * \param description Description
+   */
   void DescribeRun (std::string experiment,
                     std::string strategy,
                     std::string input,
                     std::string runID,
                     std::string description = "");
 
+  /**
+   * Return the experiment label
+   * \return Experiment label
+   */
   std::string GetExperimentLabel () const { return m_experimentLabel; }
+  /**
+   * Return the strategy label
+   * \return Strategy label
+   */
   std::string GetStrategyLabel () const { return m_strategyLabel; }
+  /**
+   * Return the input label
+   * \return Input label
+   */
   std::string GetInputLabel () const { return m_inputLabel; }
+  /**
+   * Return the runID label
+   * \return Run label
+   */
   std::string GetRunLabel () const { return m_runLabel; }
+  /**
+   * Return the description label
+   * \return Description label
+   */
   std::string GetDescription () const { return m_description; }
 
+  /**
+   * Add the key and the value as a pair of strings to the metadata list
+   * \param key Key value to include
+   * \param value Value to include of type string
+   */
   void AddMetadata (std::string key, std::string value);
+  /**
+   * Add the key and the value as a pair of strings to the metadata list
+   * \param key Key value to include
+   * \param value Value to include of type double
+   */
   void AddMetadata (std::string key, double value);
+  /**
+   * Add the key and the value as a pair of strings to the metadata list
+   * \param key Key value to include
+   * \param value Value to include of type uint32_t
+   */
   void AddMetadata (std::string key, uint32_t value);
+  /**
+   * Returns an iterator to the beginning of the metadata list
+   * \return Iterator pointing to the first value of the metadata list
+   */
   MetadataList::iterator MetadataBegin ();
+  /**
+   * Returns an iterator to the past-the-end of the metadata list
+   * \return Iterator pointing to the past-the-end element of the metadata list
+   */
   MetadataList::iterator MetadataEnd ();
 
+  /**
+   * Add a DataCalculator object to the DataCollector
+   * \param datac DataCalculator object to be added
+   */
   void AddDataCalculator (Ptr<DataCalculator> datac);
+  /**
+   * Returns an iterator to the beginning of the DataCalculator list
+   * \return Iterator pointing to the first value of the DataCalculator list
+   */
   DataCalculatorList::iterator DataCalculatorBegin ();
+  /**
+   * Returns an iterator to the past-the-end of the DataCalculator list
+   * \return Iterator pointing to the past-the-end element of the DataCalculator list
+   */
   DataCalculatorList::iterator DataCalculatorEnd ();
 
 protected:
   virtual void DoDispose ();
 
 private:
-  std::string m_experimentLabel;
-  std::string m_strategyLabel;
-  std::string m_inputLabel;
-  std::string m_runLabel;
-  std::string m_description;
+  std::string m_experimentLabel; //!< Experiment label
+  std::string m_strategyLabel;   //!< Strategy label
+  std::string m_inputLabel;      //!< Input label
+  std::string m_runLabel;        //!< Run label
+  std::string m_description;     //!< Description label
 
-  MetadataList m_metadata;
-  DataCalculatorList m_calcList;
+  MetadataList m_metadata;       //!< List of experiment metadata
+  DataCalculatorList m_calcList; //!< List of data calculators
 
   // end class DataCollector
 };
diff -Naur ns-3.18.1/src/stats/model/data-output-interface.h ns-3.19/src/stats/model/data-output-interface.h
--- ns-3.18.1/src/stats/model/data-output-interface.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/data-output-interface.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,55 +32,109 @@
 //------------------------------------------------------------
 //--------------------------------------------
 /**
- * \ingroup stats
+ * \ingroup dataoutput
  *
- */
+ * \brief Abstract Data Output Interface class
+s */
 class DataOutputInterface : public Object {
 public:
   DataOutputInterface();
   virtual ~DataOutputInterface();
 
+  /**
+   * Outputs information from the provided DataCollector
+   * \param dc DataCollector object
+   */
   virtual void Output (DataCollector &dc) = 0;
 
+  /**
+   * Sets the DataOutputInterface prefix to the provided prefix
+   * \param prefix prefix as a string
+   */
   void SetFilePrefix (const std::string prefix);
+  /**
+   * Gets the file prefix of the DataOutputInterface
+   * \return File prefix as a string
+   */
   std::string GetFilePrefix () const;
 
 protected:
   virtual void DoDispose ();
 
-  std::string m_filePrefix;
+  std::string m_filePrefix; //!< File prefix for the DataOutputInterface
 
   // end class DataOutputInterface
 };
 
 /**
- * \ingroup stats
+ * \ingroup dataoutput
+ *
+ * \brief Callback class for the DataOutput classes
  *
  */
 class DataOutputCallback {
 public:
+  /**
+   * Destructor
+   */
   virtual ~DataOutputCallback() {}
 
+  /**
+   * Outputs the data from the specified StatisticalSummary
+   * \param key Key value of a DataCalculator
+   * \param variable Name of the variable for which statistics are being provided
+   * \param statSum Pointer to a StatisticalSummary object
+   */
   virtual void OutputStatistic (std::string key,
                                 std::string variable,
                                 const StatisticalSummary *statSum) = 0;
 
+  /**
+   * Associates the integer value with the variable name for a specific output format
+   * \param key Key value of a DataCalculator
+   * \param variable Name of the variable for which statistics are being provided
+   * \param val Value to be stored
+   */
   virtual void OutputSingleton (std::string key,
                                 std::string variable,
                                 int val) = 0;
 
+  /**
+   * Associates the uint32_t value with the variable name for a specific output format
+   * \param key Key value of a DataCalculator
+   * \param variable Name of the variable for which statistics are being provided
+   * \param val Value to be stored
+   */
   virtual void OutputSingleton (std::string key,
                                 std::string variable,
                                 uint32_t val) = 0;
 
+  /**
+   * Associates the double value with the variable name for a specific output format
+   * \param key Key value of a DataCalculator
+   * \param variable Name of the variable for which statistics are being provided
+   * \param val Value to be stored
+   */
   virtual void OutputSingleton (std::string key,
                                 std::string variable,
                                 double val) = 0;
 
+  /**
+   * Associates the string value with the variable name for a specific output format
+   * \param key Key value of a DataCalculator
+   * \param variable Name of the variable for which statistics are being provided
+   * \param val Value to be stored
+   */
   virtual void OutputSingleton (std::string key,
                                 std::string variable,
                                 std::string val) = 0;
 
+  /**
+   * Associates the Time value with the variable name for a specific output format
+   * \param key Key value of a DataCalculator
+   * \param variable Name of the variable for which statistics are being provided
+   * \param val Value to be stored
+   */
   virtual void OutputSingleton (std::string key,
                                 std::string variable,
                                 Time val) = 0;
diff -Naur ns-3.18.1/src/stats/model/double-probe.cc ns-3.19/src/stats/model/double-probe.cc
--- ns-3.18.1/src/stats/model/double-probe.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/double-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (DoubleProbe);
+NS_OBJECT_ENSURE_REGISTERED (DoubleProbe)
+  ;
 
 TypeId
 DoubleProbe::GetTypeId ()
diff -Naur ns-3.18.1/src/stats/model/double-probe.h ns-3.19/src/stats/model/double-probe.h
--- ns-3.18.1/src/stats/model/double-probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/double-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,6 +34,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup probes
+ *
  * This class is designed to probe an underlying ns3 TraceSource exporting
  * a double.  This probe exports a trace source "Output" of type double.
  * The Output trace source emits a value when either the trace source
@@ -45,6 +47,10 @@
 class DoubleProbe : public Probe
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   DoubleProbe ();
   virtual ~DoubleProbe ();
@@ -92,12 +98,10 @@
    *
    * \param oldData previous value of the double
    * \param newData new value of the double
-   *
-   * \internal
    */
   void TraceSink (double oldData, double newData);
 
-  TracedValue<double> m_output;
+  TracedValue<double> m_output; //!< Output trace source.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/stats/model/file-aggregator.cc ns-3.19/src/stats/model/file-aggregator.cc
--- ns-3.18.1/src/stats/model/file-aggregator.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/file-aggregator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,9 +28,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("FileAggregator");
+NS_LOG_COMPONENT_DEFINE ("FileAggregator")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (FileAggregator);
+NS_OBJECT_ENSURE_REGISTERED (FileAggregator)
+  ;
 
 TypeId
 FileAggregator::GetTypeId ()
diff -Naur ns-3.18.1/src/stats/model/file-aggregator.h ns-3.19/src/stats/model/file-aggregator.h
--- ns-3.18.1/src/stats/model/file-aggregator.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/file-aggregator.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup aggregator
+ *
  * This aggregator sends values it receives to a file.
  **/
 class FileAggregator : public DataCollectionObject
@@ -46,6 +48,10 @@
     TAB_SEPARATED
   };
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
 
   /**
@@ -364,17 +370,16 @@
   /// Heading line for the outputfile.
   std::string m_heading;
 
-  /// Format strings for C-style sprintf() function.
-  std::string m_1dFormat;
-  std::string m_2dFormat;
-  std::string m_3dFormat;
-  std::string m_4dFormat;
-  std::string m_5dFormat;
-  std::string m_6dFormat;
-  std::string m_7dFormat;
-  std::string m_8dFormat;
-  std::string m_9dFormat;
-  std::string m_10dFormat;
+  std::string m_1dFormat;  //!< Format string for 1D C-style sprintf() function.
+  std::string m_2dFormat;  //!< Format string for 2D C-style sprintf() function.
+  std::string m_3dFormat;  //!< Format string for 3D C-style sprintf() function.
+  std::string m_4dFormat;  //!< Format string for 4D C-style sprintf() function.
+  std::string m_5dFormat;  //!< Format string for 5D C-style sprintf() function.
+  std::string m_6dFormat;  //!< Format string for 6D C-style sprintf() function.
+  std::string m_7dFormat;  //!< Format string for 7D C-style sprintf() function.
+  std::string m_8dFormat;  //!< Format string for 8D C-style sprintf() function.
+  std::string m_9dFormat;  //!< Format string for 9D C-style sprintf() function.
+  std::string m_10dFormat; //!< Format string for 10D C-style sprintf() function.
 
 }; // class FileAggregator
 
diff -Naur ns-3.18.1/src/stats/model/get-wildcard-matches.h ns-3.19/src/stats/model/get-wildcard-matches.h
--- ns-3.18.1/src/stats/model/get-wildcard-matches.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/get-wildcard-matches.h	2013-12-20 09:44:50.000000000 -0800
@@ -30,6 +30,7 @@
  * \param matchedPath the path that matched the Config path.
  * \param wildcardSeparator the text to put betwen the wildcard
  * matches.  By default, a space is used.
+ * \return String value of text matches
  *
  * \brief Returns the text matches from the matched path for each of
  * the wildcards in the Config path, separated by the wild card
diff -Naur ns-3.18.1/src/stats/model/gnuplot-aggregator.cc ns-3.19/src/stats/model/gnuplot-aggregator.cc
--- ns-3.18.1/src/stats/model/gnuplot-aggregator.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/gnuplot-aggregator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,8 +28,10 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator");
-NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator);
+NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator")
+  ;
+NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator)
+  ;
 
 TypeId
 GnuplotAggregator::GetTypeId ()
diff -Naur ns-3.18.1/src/stats/model/gnuplot-aggregator.h ns-3.19/src/stats/model/gnuplot-aggregator.h
--- ns-3.18.1/src/stats/model/gnuplot-aggregator.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/gnuplot-aggregator.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,7 @@
 namespace ns3 {
 
 /**
+ * \ingroup aggregator
  * This aggregator produces output used to make gnuplot plots.
  **/
 class GnuplotAggregator : public DataCollectionObject
@@ -46,6 +47,10 @@
     KEY_BELOW
   };
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
 
   /**
diff -Naur ns-3.18.1/src/stats/model/gnuplot.cc ns-3.19/src/stats/model/gnuplot.cc
--- ns-3.18.1/src/stats/model/gnuplot.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/gnuplot.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,17 +27,24 @@
 
 // --- GnuplotDataset::Data ------------------------------------------------ //
 
+/**
+ * \ingroup gnuplot
+ *
+ * Structure storing the data to plot.
+ * Derived classes subclass this struct and add their own data fields.
+ */
 struct GnuplotDataset::Data
 {
   // *** Data Variables ***
 
-  unsigned int m_references;
+  unsigned int m_references; //!< ref/unref counter for garbage collection
 
-  std::string m_title;
-  std::string m_extra;
+  std::string m_title; //!< Dataset title
+  std::string m_extra; //!< Extra parameters for the plot
 
   /**
    * Initializes the reference counter to 1 and sets m_title and m_extra.
+   * \param title Dataset title
    */
   Data(const std::string& title);
 
@@ -45,7 +52,8 @@
   virtual ~Data();
 
   /**
-   * Returns "plot" or "splot".
+   * \brief Returns the plot type ("plot" or "splot").
+   * \returns the plot type ("plot" or "splot").
    */
   virtual std::string GetCommand () const = 0;
 
@@ -57,6 +65,11 @@
    * If more than one output file is being generated, i.e. separate
    * data and control files, then the index for the current dataset
    * and the name for the data file are also included.
+   *
+   * \param os Output stream
+   * \param generateOneOutputFile If true, generate only one output file.
+   * \param dataFileDatasetIndex Dataset Index
+   * \param dataFileName Dataset file name
    */
   virtual void PrintExpression (std::ostream &os,
                                 bool generateOneOutputFile,
@@ -66,6 +79,9 @@
   /**
    * Print the inline data file contents trailing the plot command. Empty for
    * functions.
+   *
+   * \param os Output stream
+   * \param generateOneOutputFile If true, generate only one output file.
    */
   virtual void PrintDataFile (std::ostream &os, bool generateOneOutputFile) const = 0;
 
@@ -140,17 +156,23 @@
 
 // --- Gnuplot2dDataset::Data2d -------------------------------------------- //
 
+/**
+ * \ingroup gnuplot
+ *
+ * Structure storing the data to for a 2D plot.
+ */
 struct Gnuplot2dDataset::Data2d : public GnuplotDataset::Data
 {
   // *** Data Variables ***
 
-  enum Style  m_style;
-  enum ErrorBars m_errorBars;
+  enum Style  m_style; //!< The plotting style to use for this dataset.
+  enum ErrorBars m_errorBars; //!< Whether errorbars should be used for this dataset.
 
-  PointSet    m_pointset;
+  PointSet    m_pointset; //!< The set of points in this data set
 
   /**
    * Initializes with the values from m_defaultStyle and m_defaultErrorBars.
+   * \param title Dataset title
    */
   Data2d(const std::string& title);
 
@@ -386,14 +408,22 @@
 
 // --- Gnuplot2dFunction::Function2d --------------------------------------- //
 
+/**
+ * \ingroup gnuplot
+ *
+ * Structure storing the function to be used for a 2D plot.
+ */
 struct Gnuplot2dFunction::Function2d : public GnuplotDataset::Data
 {
   // *** Data Variables ***
 
-  std::string m_function;
+  std::string m_function; //!< Function to use
 
   /**
    * Initializes with the function and title.
+   *
+   * \param title Title of the plot
+   * \param function Function to plot
    */
   Function2d(const std::string& title, const std::string& function);
 
@@ -459,16 +489,22 @@
 
 // --- Gnuplot3dDataset::Data3d -------------------------------------------- //
 
+/**
+ * \ingroup gnuplot
+ *
+ * Structure storing the data for a 3D plot.
+ */
 struct Gnuplot3dDataset::Data3d : public GnuplotDataset::Data
 {
   // *** Data Variables ***
 
-  std::string   m_style;
+  std::string   m_style; //!< The plotting style to use for this dataset.
 
-  PointSet      m_pointset;
+  PointSet      m_pointset; //!< The set of points in this data set
 
   /**
    * Initializes with value from m_defaultStyle.
+   * \param title Dataset title
    */
   Data3d(const std::string& title);
 
@@ -574,14 +610,22 @@
 
 // --- Gnuplot3dFunction::Function3d --------------------------------------- //
 
+/**
+ * \ingroup gnuplot
+ *
+ * Structure storing the function to be used for a 3D plot.
+ */
 struct Gnuplot3dFunction::Function3d : public GnuplotDataset::Data
 {
   // *** Data Variables ***
 
-  std::string m_function;
+  std::string m_function; //!< Function to use
 
   /**
    * Initializes with the function and title.
+   *
+   * \param title Title of the plot
+   * \param function Function to plot
    */
   Function3d(const std::string& title, const std::string& function);
 
diff -Naur ns-3.18.1/src/stats/model/gnuplot.h ns-3.19/src/stats/model/gnuplot.h
--- ns-3.18.1/src/stats/model/gnuplot.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/gnuplot.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,7 @@
 namespace ns3 {
 
 /**
- * \ingroup tools
+ * \ingroup gnuplot
  *
  * \brief Abstract class to store a plot line to be used by ns3::Gnuplot.
  *
@@ -41,6 +41,7 @@
 
   /**
    * Reference-counting copy constructor.
+   * \param original Original GnuPlotDataset
    */
   GnuplotDataset (const GnuplotDataset& original);
 
@@ -51,6 +52,8 @@
 
   /**
    * Reference-counting assignment operator.
+   * \param original Right-hand side of assignment operator
+   * \return Copy of original GnuplotDataset
    */
   GnuplotDataset& operator= (const GnuplotDataset& original);
 
@@ -101,6 +104,9 @@
 };
 
 /**
+ * \ingroup gnuplot
+ *
+ * \class Gnuplot2dDataset
  * \brief Class to represent a 2D points plot. Set the line or points style
  * using SetStyle() and set points using Add().
  */
@@ -201,24 +207,30 @@
 
 private:
 
+  /**
+   * A point in a 2D plot
+   */
   struct Point {
-    bool empty;
-    double x;
-    double y;
-    double dx;
-    double dy;
+    bool empty; //!< the point is empty
+    double x; //!< X coordinate
+    double y; //!< Y coordinate
+    double dx; //!< X error delta
+    double dy; //!< Y error delta
   };
 
+  /// The set of points in the dataset
   typedef std::vector<struct Point> PointSet;
 
-  static enum Style m_defaultStyle;
-  static enum ErrorBars m_defaultErrorBars;
+  static enum Style m_defaultStyle; //!< default plot style
+  static enum ErrorBars m_defaultErrorBars;  //!< default error bars type
 
   /// Forward declaration of the internal data class.
   struct Data2d;
 };
 
 /**
+ * \ingroup gnuplot
+ *
  * \brief Class to represent a 2D function expression plot.
  *
  * Since the function expression is not escaped, styles and extras could just
@@ -248,6 +260,8 @@
 };
 
 /**
+ * \ingroup gnuplot
+ *
  * \brief Class to represent a 3D points plot. Set the line or points style
  * using SetStyle() and set points using Add().
  */
@@ -290,20 +304,28 @@
 
 private:
 
+  /**
+   * A point in a 3D plot
+   */
   struct Point {
-    bool empty;
-    double x, y, z;
+    bool empty; //!< the point is empty
+    double x; //!< X coordinate
+    double y; //!< Y coordinate
+    double z; //!< Z coordinate
   };
 
+  /// The set of points in the dataset
   typedef std::vector<struct Point> PointSet;
 
-  static std::string m_defaultStyle;
+  static std::string m_defaultStyle; //!< default plot style
 
   /// Forward declaration of the internal data class.
   struct Data3d;
 };
 
 /**
+ * \ingroup gnuplot
+ *
  * \brief Class to represent a 3D function expression plot.
  *
  * Since the function expression is not escaped, styles and extras could just as
@@ -334,6 +356,8 @@
 };
 
 /**
+ * \ingroup gnuplot
+ *
  * \brief a simple class to generate gnuplot-ready plotting commands
  *        from a set of datasets.
  *
@@ -361,7 +385,8 @@
   /**
    * Crude attempt to auto-detect the correct terminal setting by inspecting
    * the filename's extension.
-   * \param filename output file name
+   * \param filename output filename
+   * \return File extension of the provided filename
    */
   static std::string DetectTerminal (const std::string& filename);
 
@@ -431,24 +456,27 @@
   void SetDataFileDatasetIndex (unsigned int index);
 
 private:
+  /// Type for Datasets to be used in plots
   typedef std::vector<GnuplotDataset> Datasets;
 
-  std::string m_outputFilename;
-  std::string m_terminal;
+  std::string m_outputFilename; //!< Output file name
+  std::string m_terminal; //!< Gnuplot "terminal" to use
 
-  Datasets m_datasets;
+  Datasets m_datasets; //!< Data sets
 
-  std::string m_title;
-  std::string m_xLegend;
-  std::string m_yLegend;
-  std::string m_extra;
+  std::string m_title; //!< Plot title
+  std::string m_xLegend; //!< X axis legend
+  std::string m_yLegend; //!< Y axis legend
+  std::string m_extra; //!< extra parameters for the plot
 
-  bool m_generateOneOutputFile;
+  bool m_generateOneOutputFile; //!< true if only one plot will be generated
 
-  unsigned int m_dataFileDatasetIndex;
+  unsigned int m_dataFileDatasetIndex; //!< Data set index to plot
 };
 
 /**
+ * \ingroup gnuplot
+ *
  * \brief a simple class to group together multiple gnuplots into one file,
  * e.g. for PDF multi-page output terminals.
  */
@@ -500,12 +528,13 @@
                        std::string dataFileName);
 
 private:
+  /// Type of the Gnuplot collection
   typedef std::vector<Gnuplot> Plots;
 
-  std::string m_outputFilename;
-  std::string m_terminal;
+  std::string m_outputFilename; //!< Output file name
+  std::string m_terminal; //!< Gnuplot "terminal" to use
 
-  Plots       m_plots;
+  Plots       m_plots; //!< Plots in the collection
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/stats/model/omnet-data-output.h ns-3.19/src/stats/model/omnet-data-output.h
--- ns-3.18.1/src/stats/model/omnet-data-output.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/omnet-data-output.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,9 @@
 //------------------------------------------------------------
 //--------------------------------------------
 /**
- * \ingroup stats
+ * \ingroup dataoutput
+ * \class OmnetDataOutput
+ * \brief Outputs data in a format compatible with OMNeT library and framework
  *
  */
 class OmnetDataOutput : public DataOutputInterface {
@@ -45,36 +47,81 @@
   virtual void DoDispose ();
 
 private:
+  /**
+   * \ingroup dataoutput
+   *
+   * \brief Class to generate OMNeT output
+   */
   class OmnetOutputCallback : public DataOutputCallback {
 public:
+    /**
+     * Constructor
+     * \param scalar the output stream
+     */
     OmnetOutputCallback(std::ostream *scalar);
 
+    /**
+     * \brief Generates data statistics
+     * \param context the output context
+     * \param name the output name
+     * \param statSum the stats to print
+     */
     void OutputStatistic (std::string context,
                           std::string name,
                           const StatisticalSummary *statSum);
 
+    /**
+     * \brief Generates a single data output
+     * \param context the output context
+     * \param name the output name
+     * \param val the value
+     */
     void OutputSingleton (std::string context,
                           std::string name,
                           int val);
 
+    /**
+     * \brief Generates a single data output
+     * \param context the output context
+     * \param name the output name
+     * \param val the value
+     */
     void OutputSingleton (std::string context,
                           std::string name,
                           uint32_t val);
 
+    /**
+     * \brief Generates a single data output
+     * \param context the output context
+     * \param name the output name
+     * \param val the value
+     */
     void OutputSingleton (std::string context,
                           std::string name,
                           double val);
 
+    /**
+     * \brief Generates a single data output
+     * \param context the output context
+     * \param name the output name
+     * \param val the value
+     */
     void OutputSingleton (std::string context,
                           std::string name,
                           std::string val);
 
+    /**
+     * \brief Generates a single data output
+     * \param context the output context
+     * \param name the output name
+     * \param val the value
+     */
     void OutputSingleton (std::string context,
                           std::string name,
                           Time val);
 
 private:
-    std::ostream *m_scalar;
+    std::ostream *m_scalar; //!< output stream
     // end class OmnetOutputCallback
   };
 
diff -Naur ns-3.18.1/src/stats/model/probe.cc ns-3.19/src/stats/model/probe.cc
--- ns-3.18.1/src/stats/model/probe.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Probe);
+NS_OBJECT_ENSURE_REGISTERED (Probe)
+  ;
 
 TypeId
 Probe::GetTypeId ()
diff -Naur ns-3.18.1/src/stats/model/probe.h ns-3.19/src/stats/model/probe.h
--- ns-3.18.1/src/stats/model/probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,6 +28,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup probes
+ *
  * Base class for probes.
  *
  * This class provides general functionality to control each
@@ -37,6 +39,10 @@
 class Probe : public DataCollectionObject
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   Probe ();
   virtual ~Probe ();
diff -Naur ns-3.18.1/src/stats/model/sqlite-data-output.h ns-3.19/src/stats/model/sqlite-data-output.h
--- ns-3.18.1/src/stats/model/sqlite-data-output.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/sqlite-data-output.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,8 +34,9 @@
 //------------------------------------------------------------
 //--------------------------------------------
 /**
- * \ingroup stats
- *
+ * \ingroup dataoutput
+ * \class SqliteDataOutput
+ * \brief Outputs data in a format compatible with SQLite
  */
 class SqliteDataOutput : public DataOutputInterface {
 public:
@@ -48,43 +49,95 @@
   virtual void DoDispose ();
 
 private:
+  /**
+   * \ingroup dataoutput
+   *
+   * \brief Class to generate OMNeT output
+   */
   class SqliteOutputCallback : public DataOutputCallback {
 public:
+    /**
+     * Constructor
+     * \param owner pointer to the instance this object belongs to
+     * \param run experiment descriptor
+     */
     SqliteOutputCallback(Ptr<SqliteDataOutput> owner, std::string run);
 
+    /**
+     * \brief Generates data statistics
+     * \param key the SQL key to use
+     * \param variable the variable name
+     * \param statSum the stats to print
+     */
     void OutputStatistic (std::string key,
                           std::string variable,
                           const StatisticalSummary *statSum);
 
+    /**
+     * \brief Generates a single data output
+     * \param key the SQL key to use
+     * \param variable the variable name
+     * \param val the value
+     */
     void OutputSingleton (std::string key,
                           std::string variable,
                           int val);
 
+    /**
+     * \brief Generates a single data output
+     * \param key the SQL key to use
+     * \param variable the variable name
+     * \param val the value
+     */
     void OutputSingleton (std::string key,
                           std::string variable,
                           uint32_t val);
 
+    /**
+     * \brief Generates a single data output
+     * \param key the SQL key to use
+     * \param variable the variable name
+     * \param val the value
+     */
     void OutputSingleton (std::string key,
                           std::string variable,
                           double val);
 
+    /**
+     * \brief Generates a single data output
+     * \param key the SQL key to use
+     * \param variable the variable name
+     * \param val the value
+     */
     void OutputSingleton (std::string key,
                           std::string variable,
                           std::string val);
 
+    /**
+     * \brief Generates a single data output
+     * \param key the SQL key to use
+     * \param variable the variable name
+     * \param val the value
+     */
     void OutputSingleton (std::string key,
                           std::string variable,
                           Time val);
 
 private:
-    Ptr<SqliteDataOutput> m_owner;
-    std::string m_runLabel;
+    Ptr<SqliteDataOutput> m_owner; //!< the instance this object belongs to
+    std::string m_runLabel; //!< Run label
 
     // end class SqliteOutputCallback
   };
 
 
-  sqlite3 *m_db;
+  sqlite3 *m_db; //!< pointer to the SQL database
+
+  /**
+   * \brief Execute a sqlite3 query
+   * \param exe the query to execute
+   * \return sqlite return code.
+   */
   int Exec (std::string exe);
 
   // end class SqliteDataOutput
diff -Naur ns-3.18.1/src/stats/model/stats.h ns-3.19/src/stats/model/stats.h
--- ns-3.18.1/src/stats/model/stats.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/stats/model/stats.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,78 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze
+ *
+ * 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: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#ifndef STATS_H
+#define STATS_H
+
+// Header file used only to define the stats group in Doxygen
+
+/**
+ * \defgroup stats Statistics
+ *
+ * The statistics module includes some useful features to ease data collection from experiments.
+ * In particular the following features are included:
+ * <ul>
+ * <li> The core framework and two basic data collectors: A counter, and a min/max/avg/total observer.</li>
+ * <li> Extensions of those to easily work with times and packets.</li>
+ * <li> Plaintext output formatted for OMNet++.</li>
+ * <li> Database output using SQLite, a standalone, lightweight, high performance SQL engine.</li>
+ * <li> Mandatory and open ended metadata for describing and working with runs.</li>
+ * </ul>
+ *
+ * See the manual for a complete documentation.
+ */
+
+/**
+ * \ingroup stats
+ * \defgroup aggregator Data Aggregators
+ *
+ * Data aggregators are classes used to collect data and produce output
+ * specialized for various purpose, e.g., Gnuplot, file output, etc.
+ */
+
+/**
+ * \ingroup stats
+ * \defgroup probes Probes
+ *
+ * Probes are used to probe an underlying ns3 TraceSource exporting
+ * its value.  This probe usually exports a trace source "Output".
+ * The Output trace source emits a value when either the trace source
+ * emits a new value, or when SetValue () is called.
+ *
+ * Probes are a special kind of Trace Source.
+ */
+
+/**
+ * \ingroup stats
+ * \defgroup gnuplot Gnuplot
+ *
+ * Classes in Gnuplot group are used to collect and prepare and output data
+ * for subsequent processing by Gnuplot.
+ */
+
+/**
+ * \ingroup stats
+ * \defgroup dataoutput Data Output
+ *
+ * Classes in Data Output group are used to collect and prepare and output data
+ * for subsequent ouput in a specific format, e.g., Omnet++, SQLite, etc.
+ */
+
+#endif /* STATS_H */
diff -Naur ns-3.18.1/src/stats/model/time-data-calculators.h ns-3.19/src/stats/model/time-data-calculators.h
--- ns-3.18.1/src/stats/model/time-data-calculators.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/time-data-calculators.h	2013-12-20 09:44:50.000000000 -0800
@@ -44,15 +44,25 @@
   TimeMinMaxAvgTotalCalculator();
   virtual ~TimeMinMaxAvgTotalCalculator();
 
+  /**
+   * Updates all variables of TimeMinMaxAvgTotalCalculator
+   * \param i value of type Time to use for updating the calculator
+   */
   void Update (const Time i);
 
+  /**
+   * Outputs data based on the provided callback
+   * \param callback
+   */
   virtual void Output (DataOutputCallback &callback) const;
 
 protected:
   virtual void DoDispose (void);
 
-  uint32_t m_count;
-  Time m_total, m_min, m_max;
+  uint32_t m_count; //!< Count value of TimeMinMaxAvgTotalCalculator
+  Time m_total;     //!< Total value of TimeMinMaxAvgTotalCalculator
+  Time m_min;       //!< Minimum value of TimeMinMaxAvgTotalCalculator
+  Time m_max;       //!< Maximum value of TimeMinMaxAvgTotalCalculator
 
   // end class TimeMinMaxAvgTotalCalculator
 };
diff -Naur ns-3.18.1/src/stats/model/time-series-adaptor.cc ns-3.19/src/stats/model/time-series-adaptor.cc
--- ns-3.18.1/src/stats/model/time-series-adaptor.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/time-series-adaptor.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (TimeSeriesAdaptor);
+NS_OBJECT_ENSURE_REGISTERED (TimeSeriesAdaptor)
+  ;
 
 TypeId
 TimeSeriesAdaptor::GetTypeId (void)
diff -Naur ns-3.18.1/src/stats/model/time-series-adaptor.h ns-3.19/src/stats/model/time-series-adaptor.h
--- ns-3.18.1/src/stats/model/time-series-adaptor.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/time-series-adaptor.h	2013-12-20 09:44:50.000000000 -0800
@@ -29,6 +29,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup aggregator
+ *
  * \brief Takes probed values of different types and outputs the
  * current time plus the value with both converted to doubles.
  *
@@ -46,6 +48,10 @@
 class TimeSeriesAdaptor : public DataCollectionObject
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   TimeSeriesAdaptor ();
@@ -107,7 +113,7 @@
   void TraceSinkUinteger32 (uint32_t oldData, uint32_t newData);
 
 private:
-  TracedCallback<double, double> m_output;
+  TracedCallback<double, double> m_output; //!< output trace
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/stats/model/uinteger-16-probe.cc ns-3.19/src/stats/model/uinteger-16-probe.cc
--- ns-3.18.1/src/stats/model/uinteger-16-probe.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/uinteger-16-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Uinteger16Probe);
+NS_OBJECT_ENSURE_REGISTERED (Uinteger16Probe)
+  ;
 
 TypeId
 Uinteger16Probe::GetTypeId ()
diff -Naur ns-3.18.1/src/stats/model/uinteger-16-probe.h ns-3.19/src/stats/model/uinteger-16-probe.h
--- ns-3.18.1/src/stats/model/uinteger-16-probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/uinteger-16-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,6 +31,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup probes
+ *
  * This class is designed to probe an underlying ns3 TraceSource exporting
  * an uint16_t.  This probe exports a trace source "Output" of type uint16_t.
  * The Output trace source emits a value when either the trace source
@@ -41,6 +43,10 @@
 class Uinteger16Probe : public Probe
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   Uinteger16Probe ();
   virtual ~Uinteger16Probe ();
@@ -88,12 +94,10 @@
    *
    * \param oldData previous value of the uint16_t
    * \param newData new value of the uint16_t
-   *
-   * \internal
    */
   void TraceSink (uint16_t oldData, uint16_t newData);
 
-  TracedValue<uint16_t> m_output;
+  TracedValue<uint16_t> m_output; //!< Output trace source.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/stats/model/uinteger-32-probe.cc ns-3.19/src/stats/model/uinteger-32-probe.cc
--- ns-3.18.1/src/stats/model/uinteger-32-probe.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/uinteger-32-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Uinteger32Probe);
+NS_OBJECT_ENSURE_REGISTERED (Uinteger32Probe)
+  ;
 
 TypeId
 Uinteger32Probe::GetTypeId ()
diff -Naur ns-3.18.1/src/stats/model/uinteger-32-probe.h ns-3.19/src/stats/model/uinteger-32-probe.h
--- ns-3.18.1/src/stats/model/uinteger-32-probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/uinteger-32-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,6 +31,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup probes
+ *
  * This class is designed to probe an underlying ns3 TraceSource exporting
  * an uint32_t.  This probe exports a trace source "Output" of type uint32_t.
  * The Output trace source emits a value when either the trace source
@@ -41,6 +43,10 @@
 class Uinteger32Probe : public Probe
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   Uinteger32Probe ();
   virtual ~Uinteger32Probe ();
@@ -88,12 +94,10 @@
    *
    * \param oldData previous value of the uint32_t
    * \param newData new value of the uint32_t
-   *
-   * \internal
    */
   void TraceSink (uint32_t oldData, uint32_t newData);
 
-  TracedValue<uint32_t> m_output;
+  TracedValue<uint32_t> m_output; //!< Output trace source.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/stats/model/uinteger-8-probe.cc ns-3.19/src/stats/model/uinteger-8-probe.cc
--- ns-3.18.1/src/stats/model/uinteger-8-probe.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/uinteger-8-probe.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Uinteger8Probe);
+NS_OBJECT_ENSURE_REGISTERED (Uinteger8Probe)
+  ;
 
 TypeId
 Uinteger8Probe::GetTypeId ()
diff -Naur ns-3.18.1/src/stats/model/uinteger-8-probe.h ns-3.19/src/stats/model/uinteger-8-probe.h
--- ns-3.18.1/src/stats/model/uinteger-8-probe.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/stats/model/uinteger-8-probe.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,6 +31,8 @@
 namespace ns3 {
 
 /**
+ * \ingroup probes
+ *
  * This class is designed to probe an underlying ns3 TraceSource exporting
  * an uint8_t.  This probe exports a trace source "Output" of type uint8_t.
  * The Output trace source emits a value when either the trace source
@@ -41,6 +43,10 @@
 class Uinteger8Probe : public Probe
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId ();
   Uinteger8Probe ();
   virtual ~Uinteger8Probe ();
@@ -88,12 +94,10 @@
    *
    * \param oldData previous value of the uint8_t
    * \param newData new value of the uint8_t
-   *
-   * \internal
    */
   void TraceSink (uint8_t oldData, uint8_t newData);
 
-  TracedValue<uint8_t> m_output;
+  TracedValue<uint8_t> m_output; //!< Output trace source.
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/tap-bridge/bindings/callbacks_list.py ns-3.19/src/tap-bridge/bindings/callbacks_list.py
--- ns-3.18.1/src/tap-bridge/bindings/callbacks_list.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/tap-bridge/bindings/callbacks_list.py	2013-12-20 09:44:50.000000000 -0800
@@ -1,7 +1,7 @@
 callback_classes = [
+    ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', '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::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'unsigned char*', 'long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', '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'],
 ]
diff -Naur ns-3.18.1/src/tap-bridge/bindings/modulegen__gcc_ILP32.py ns-3.19/src/tap-bridge/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/tap-bridge/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/tap-bridge/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -147,7 +147,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1228,10 +1228,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -2577,6 +2578,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2587,6 +2593,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2602,6 +2613,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2627,6 +2643,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/tap-bridge/bindings/modulegen__gcc_LP64.py ns-3.19/src/tap-bridge/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/tap-bridge/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/tap-bridge/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -147,7 +147,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1228,10 +1228,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -2577,6 +2578,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -2587,6 +2593,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -2602,6 +2613,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -2627,6 +2643,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/tap-bridge/doc/tap.h ns-3.19/src/tap-bridge/doc/tap.h
--- ns-3.18.1/src/tap-bridge/doc/tap.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/tap-bridge/doc/tap.h	2013-12-20 09:44:50.000000000 -0800
@@ -1,5 +1,5 @@
 /**
- * \defgroup tap-bridge Tap Bridge Device
+ * \defgroup tap-bridge Tap Bridge Network Device
  *
  * This section documents the API of the ns-3 tap-bridge module. For a
  * generic functional description, please refer to the ns-3 manual.
diff -Naur ns-3.18.1/src/tap-bridge/doc/tap.rst ns-3.19/src/tap-bridge/doc/tap.rst
--- ns-3.18.1/src/tap-bridge/doc/tap.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/tap-bridge/doc/tap.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: text
 
 Tap NetDevice
 -------------
@@ -49,6 +50,7 @@
 
 This is illustrated below: ::
 
+
     +--------+
     |  Linux |
     |  host  |                    +----------+
@@ -99,7 +101,9 @@
 going to "Use" an existing tap device previously created and configured
 by the user.  This mode is particularly useful when a virtualization 
 scheme automatically creates tap devices and ns-3 is used to provide 
-simulated networks for those devices. ::
+simulated networks for those devices.
+
+::
 
     +--------+
     |  Linux |
@@ -139,11 +143,13 @@
 incompatible with UseLocal mode.
 
 In UseLocal mode, the user is expected to create and configure a tap device
-completely outside the scope of the ns-3 simulation using something like: ::
+completely outside the scope of the ns-3 simulation using something like:
+
+.. sourcecode:: bash
 
-  sudo tunctl -t tap0
-  sudo ifconfig tap0 hw ether 08:00:2e:00:00:01
-  sudo ifconfig tap0 10.1.1.1 netmask 255.255.255.0 up
+  $ sudo tunctl -t tap0
+  $ sudo ifconfig tap0 hw ether 08:00:2e:00:00:01
+  $ sudo ifconfig tap0 10.1.1.1 netmask 255.255.255.0 up
 
 To tell the TapBridge what is going on, the user will set either directly
 into the TapBridge or via the TapBridgeHelper, the "DeviceName" attribute.
@@ -163,7 +169,9 @@
 an existing configuration.  In this case, the TapBridge is going to logically
 extend a Linux bridge into ns-3.  
 
-This is illustrated below: ::
+This is illustrated below:
+
+::
 
     +---------+
     |  Linux  |                             +----------+
@@ -203,15 +211,17 @@
 for use in UseBridge mode.
 
 It is expected that the user will do something like the following to
-configure the bridge and tap completely outside ns-3: ::
+configure the bridge and tap completely outside ns-3:
+
+.. sourcecode:: bash
 
-  sudo brctl addbr mybridge
-  sudo tunctl -t mytap
-  sudo ifconfig mytap hw ether 00:00:00:00:00:01
-  sudo ifconfig mytap 0.0.0.0 up
-  sudo brctl addif mybridge mytap
-  sudo brctl addif mybridge ...
-  sudo ifconfig mybridge 10.1.1.1 netmask 255.255.255.0 up
+  $ sudo brctl addbr mybridge
+  $ sudo tunctl -t mytap
+  $ sudo ifconfig mytap hw ether 00:00:00:00:00:01
+  $ sudo ifconfig mytap 0.0.0.0 up
+  $ sudo brctl addif mybridge mytap
+  $ sudo brctl addif mybridge ...
+  $ sudo ifconfig mybridge 10.1.1.1 netmask 255.255.255.0 up
 
 To tell the TapBridge what is going on, the user will set either directly
 into the TapBridge or via the TapBridgeHelper, the "DeviceName" attribute.
diff -Naur ns-3.18.1/src/tap-bridge/model/tap-bridge.cc ns-3.19/src/tap-bridge/model/tap-bridge.cc
--- ns-3.18.1/src/tap-bridge/model/tap-bridge.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/tap-bridge/model/tap-bridge.cc	2013-12-20 09:44:50.000000000 -0800
@@ -39,29 +39,13 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
 #include <cerrno>
 #include <limits>
 #include <cstdlib>
 #include <unistd.h>
 
-//
-// Sometimes having a tap-creator is actually more trouble than solution.  In 
-// these cases you can uncomment the define of TAP_CREATOR below and the 
-// simulation will just use a device you have preconfigured.  This is useful
-// if you are running in an environment where you have got to run as root,
-// such as ORBIT or CORE.
-//
-
-
-// #define NO_CREATOR
-
-#ifdef NO_CREATOR
-#include <fcntl.h>
-#include <net/if.h>
-#include <linux/if_tun.h>
-#include <sys/ioctl.h>
-#endif
-
 NS_LOG_COMPONENT_DEFINE ("TapBridge");
 
 namespace ns3 {
@@ -89,7 +73,8 @@
 
 #define TAP_MAGIC 95549
 
-NS_OBJECT_ENSURE_REGISTERED (TapBridge);
+NS_OBJECT_ENSURE_REGISTERED (TapBridge)
+  ;
 
 TypeId
 TapBridge::GetTypeId (void)
@@ -236,6 +221,9 @@
   //
   CreateTap ();
 
+  // Declare the link up
+  NotifyLinkUp ();
+
   //
   // Now spin up a read thread to read packets from the tap device.
   //
@@ -630,7 +618,7 @@
                   int *rawSocket = (int*)CMSG_DATA (cmsg);
                   NS_LOG_INFO ("Got the socket from the socket creator = " << *rawSocket);
                   m_sock = *rawSocket;
-                  return;
+                  break;
                 }
               else
                 {
@@ -638,8 +626,40 @@
                 }
             }
         }
-      NS_FATAL_ERROR ("Did not get the raw socket from the socket creator");
+      if (cmsg == NULL)
+        {
+          NS_FATAL_ERROR ("Did not get the raw socket from the socket creator");
+        }
+
+      if (m_mode == USE_LOCAL || m_mode == USE_BRIDGE)
+        {
+          //
+          // Set the ns-3 device's mac address to the overlying container's
+          // mac address
+          //
+          struct ifreq s;
+          strncpy (s.ifr_name, m_tapDeviceName.c_str (), sizeof (s.ifr_name));
+
+          NS_LOG_INFO ("Trying to get MacAddr of " << m_tapDeviceName);
+          int ioctlResult = ioctl (sock, SIOCGIFHWADDR, &s);
+          if (ioctlResult == 0)
+            {
+              Mac48Address learnedMac;
+              learnedMac.CopyFrom ((uint8_t *)s.ifr_hwaddr.sa_data);
+              NS_LOG_INFO ("Learned Tap device MacAddr is " << learnedMac << ": setting ns-3 device to use this address");
+              m_bridgedDevice->SetAddress (learnedMac);
+              m_ns3AddressRewritten = true;
+            }
+
+          if (!m_ns3AddressRewritten)
+            {
+              NS_LOG_INFO ("Cannot get MacAddr of Tap device: " << m_tapDeviceName << " while in USE_LOCAL/USE_BRIDGE mode: " << std::strerror (errno));
+              NS_LOG_INFO ("Underlying ns-3 device will continue to use default address, what can lead to connectivity errors");
+            }
+        }
     }
+
+  close (sock);
 }
 
 void
@@ -1039,18 +1059,29 @@
   return m_mtu;
 }
 
+void
+TapBridge::NotifyLinkUp (void)
+{
+  NS_LOG_FUNCTION_NOARGS ();
+  if (!m_linkUp)
+    {
+      m_linkUp = true;
+      m_linkChangeCallbacks ();
+    }
+}
 
 bool 
 TapBridge::IsLinkUp (void) const
 {
   NS_LOG_FUNCTION_NOARGS ();
-  return true;
+  return m_linkUp;
 }
 
 void 
 TapBridge::AddLinkChangeCallback (Callback<void> callback)
 {
   NS_LOG_FUNCTION_NOARGS ();
+  m_linkChangeCallbacks.ConnectWithoutContext (callback);
 }
 
 bool 
diff -Naur ns-3.18.1/src/tap-bridge/model/tap-bridge.h ns-3.19/src/tap-bridge/model/tap-bridge.h
--- ns-3.18.1/src/tap-bridge/model/tap-bridge.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/tap-bridge/model/tap-bridge.h	2013-12-20 09:44:50.000000000 -0800
@@ -291,6 +291,8 @@
    */
   Ptr<Packet> Filter (Ptr<Packet> packet, Address *src, Address *dst, uint16_t *type);
 
+  void NotifyLinkUp (void);
+
   /**
    * \internal
    *
@@ -448,7 +450,7 @@
    * \internal
    *
    * Whether the MAC address of the underlying ns-3 device has already been
-   * rewritten is stored in this variable (for UseLocal mode only).
+   * rewritten is stored in this variable (for UseLocal/UseBridge mode only).
    */
   bool m_ns3AddressRewritten;
 
@@ -463,6 +465,22 @@
    * multithreaded apps is not a good thing.
    */
   uint32_t m_nodeId;
+
+  /**
+   * \internal
+   *
+   * Flag indicating whether or not the link is up.  In this case,
+   * whether or not ns-3 is connected to the underlying TAP device
+   * with a file descriptor.
+   */
+  bool m_linkUp;
+
+  /**
+   * \internal
+   *
+   * Callbacks to fire if the link changes state (up or down).
+   */
+  TracedCallback<> m_linkChangeCallbacks;
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/test/ns3tcp/ns3tcp.h ns-3.19/src/test/ns3tcp/ns3tcp.h
--- ns-3.18.1/src/test/ns3tcp/ns3tcp.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/test/ns3tcp/ns3tcp.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,9 +0,0 @@
-/**
- * \ingroup tests
- * \defgroup Ns3TcpTests ns-3 TCP Implementation Tests
- *
- * \section Ns3TcpTestsOverview ns-3 Tcp Implementation Tests Overview
- *
- * Includes tests of ns-3 TCP as well as tests involving the mix
- * of ns-3 and Network Simulation Cradle (nsc) TCP models.
- */
diff -Naur ns-3.18.1/src/test/ns3wifi/ns3wifi.h ns-3.19/src/test/ns3wifi/ns3wifi.h
--- ns-3.18.1/src/test/ns3wifi/ns3wifi.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/test/ns3wifi/ns3wifi.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,8 +0,0 @@
-/**
- * \ingroup tests
- * \defgroup Ns3WifiTests ns-3 Wifi Implementation Tests
- *
- * \section Ns3WifiTestsOverview ns-3 Wifi Implementation Tests Overview
- *
- * ns-3 has a Wifi implementation and we test it a little.
- */
diff -Naur ns-3.18.1/src/topology-read/bindings/modulegen__gcc_ILP32.py ns-3.19/src/topology-read/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/topology-read/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -87,7 +87,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## topology-reader.h (module 'topology-read'): ns3::TopologyReader [class]
@@ -694,10 +694,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -1577,6 +1578,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -1587,6 +1593,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -1602,6 +1613,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -1627,6 +1643,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/topology-read/bindings/modulegen__gcc_LP64.py ns-3.19/src/topology-read/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/topology-read/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -87,7 +87,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## topology-reader.h (module 'topology-read'): ns3::TopologyReader [class]
@@ -694,10 +694,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -1577,6 +1578,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -1587,6 +1593,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -1602,6 +1613,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -1627,6 +1643,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/topology-read/helper/topology-reader-helper.cc ns-3.19/src/topology-read/helper/topology-reader-helper.cc
--- ns-3.18.1/src/topology-read/helper/topology-reader-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/helper/topology-reader-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,11 +28,12 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper");
+NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper")
+  ;
 
 TopologyReaderHelper::TopologyReaderHelper ()
 {
-  m_inFile = 0;
+  m_inputModel = 0;
 }
 
 void
@@ -51,7 +52,7 @@
 Ptr<TopologyReader>
 TopologyReaderHelper::GetTopologyReader ()
 {
-  if (!m_inFile)
+  if (!m_inputModel)
     {
       NS_ASSERT_MSG (!m_fileType.empty (), "Missing File Type");
       NS_ASSERT_MSG (!m_fileName.empty (), "Missing File Name");
@@ -59,26 +60,26 @@
       if (m_fileType == "Orbis")
         {
           NS_LOG_INFO ("Creating Orbis formatted data input.");
-          m_inFile = CreateObject<OrbisTopologyReader> ();
+          m_inputModel = CreateObject<OrbisTopologyReader> ();
         }
       else if (m_fileType == "Inet")
         {
           NS_LOG_INFO ("Creating Inet formatted data input.");
-          m_inFile = CreateObject<InetTopologyReader> ();
+          m_inputModel = CreateObject<InetTopologyReader> ();
         }
       else if (m_fileType == "Rocketfuel")
         {
           NS_LOG_INFO ("Creating Rocketfuel formatted data input.");
-          m_inFile = CreateObject<RocketfuelTopologyReader> ();
+          m_inputModel = CreateObject<RocketfuelTopologyReader> ();
         }
       else
         {
           NS_ASSERT_MSG (false, "Wrong (unknown) File Type");
         }
 
-      m_inFile->SetFileName (m_fileName);
+      m_inputModel->SetFileName (m_fileName);
     }
-  return m_inFile;
+  return m_inputModel;
 }
 
 
diff -Naur ns-3.18.1/src/topology-read/helper/topology-reader-helper.h ns-3.19/src/topology-read/helper/topology-reader-helper.h
--- ns-3.18.1/src/topology-read/helper/topology-reader-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/helper/topology-reader-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -56,9 +56,9 @@
   Ptr<TopologyReader> GetTopologyReader ();
 
 private:
-  Ptr<TopologyReader> m_inFile;
-  std::string m_fileName;
-  std::string m_fileType;
+  Ptr<TopologyReader> m_inputModel;  //!< Smart pointer to the actual topology model
+  std::string m_fileName;  //!< Name of the input file
+  std::string m_fileType;  //!< Type of the input file (e.g., "Inet", "Orbis", etc.).
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/topology-read/model/inet-topology-reader.cc ns-3.19/src/topology-read/model/inet-topology-reader.cc
--- ns-3.18.1/src/topology-read/model/inet-topology-reader.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/model/inet-topology-reader.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,9 +30,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("InetTopologyReader");
+NS_LOG_COMPONENT_DEFINE ("InetTopologyReader")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader);
+NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader)
+  ;
 
 TypeId InetTopologyReader::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/topology-read/model/inet-topology-reader.h ns-3.19/src/topology-read/model/inet-topology-reader.h
--- ns-3.18.1/src/topology-read/model/inet-topology-reader.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/model/inet-topology-reader.h	2013-12-20 09:44:50.000000000 -0800
@@ -47,6 +47,10 @@
 class InetTopologyReader : public TopologyReader
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   InetTopologyReader ();
@@ -67,7 +71,18 @@
   virtual NodeContainer Read (void);
 
 private:
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   */
   InetTopologyReader (const InetTopologyReader&);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   * \returns
+   */
   InetTopologyReader& operator= (const InetTopologyReader&);
 
   // end class InetTopologyReader
diff -Naur ns-3.18.1/src/topology-read/model/orbis-topology-reader.cc ns-3.19/src/topology-read/model/orbis-topology-reader.cc
--- ns-3.18.1/src/topology-read/model/orbis-topology-reader.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/model/orbis-topology-reader.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,9 +30,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader");
+NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader);
+NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader)
+  ;
 
 TypeId OrbisTopologyReader::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/topology-read/model/orbis-topology-reader.h ns-3.19/src/topology-read/model/orbis-topology-reader.h
--- ns-3.18.1/src/topology-read/model/orbis-topology-reader.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/model/orbis-topology-reader.h	2013-12-20 09:44:50.000000000 -0800
@@ -44,6 +44,10 @@
 class OrbisTopologyReader : public TopologyReader
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   OrbisTopologyReader ();
@@ -62,7 +66,19 @@
   virtual NodeContainer Read (void);
 
 private:
+private:
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   */
   OrbisTopologyReader (const OrbisTopologyReader&);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   * \returns
+   */
   OrbisTopologyReader& operator= (const OrbisTopologyReader&);
 
   // end class OrbisTopologyReader
diff -Naur ns-3.18.1/src/topology-read/model/rocketfuel-topology-reader.cc ns-3.19/src/topology-read/model/rocketfuel-topology-reader.cc
--- ns-3.18.1/src/topology-read/model/rocketfuel-topology-reader.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/model/rocketfuel-topology-reader.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,9 +30,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader");
+NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader);
+NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader)
+  ;
 
 TypeId RocketfuelTopologyReader::GetTypeId (void)
 {
@@ -44,6 +46,8 @@
 
 RocketfuelTopologyReader::RocketfuelTopologyReader ()
 {
+  m_linksNumber = 0;
+  m_nodesNumber = 0;
   NS_LOG_FUNCTION (this);
 }
 
@@ -54,6 +58,7 @@
 
 /* uid @loc [+] [bb] (num_neigh) [&ext] -> <nuid-1> <nuid-2> ... {-euid} ... =name[!] rn */
 
+
 #define REGMATCH_MAX 16
 
 #define START "^"
@@ -73,10 +78,16 @@
 #define ROCKETFUEL_WEIGHTS_LINE \
   START "([^ \t]+)" SPACE "([^ \t]+)" SPACE "([0-9.]+)" MAYSPACE END
 
-int linksNumber = 0;
-int nodesNumber = 0;
-std::map<std::string, Ptr<Node> > nodeMap;
-
+/**
+ * \brief Print node info
+ * \param uid node ID
+ * \param loc node location
+ * \param dns is a DNS node ?
+ * \param bb is a BB node ?
+ * \param neighListSize size of neighbor list
+ * \param name node name
+ * \param radius node radius
+ */
 static inline void
 PrintNodeInfo (std::string & uid, std::string & loc, bool dns, bool bb,
                std::vector <std::string>::size_type neighListSize,
@@ -148,7 +159,7 @@
   /* externs */
   if (argv[7])
     {
-      //      euid = argv[7];
+      // euid = argv[7];
     }
 
   /* name */
@@ -168,12 +179,12 @@
   // Create node and link
   if (!uid.empty ())
     {
-      if (nodeMap[uid] == 0)
+      if (m_nodeMap[uid] == 0)
         {
           Ptr<Node> tmpNode = CreateObject<Node> ();
-          nodeMap[uid] = tmpNode;
+          m_nodeMap[uid] = tmpNode;
           nodes.Add (tmpNode);
-          nodesNumber++;
+          m_nodesNumber++;
         }
 
       for (uint32_t i = 0; i < neigh_list.size (); ++i)
@@ -185,19 +196,22 @@
               return nodes;
             }
 
-          if (nodeMap[nuid] == 0)
+          if (m_nodeMap[nuid] == 0)
             {
               Ptr<Node> tmpNode = CreateObject<Node> ();
-              nodeMap[nuid] = tmpNode;
+              m_nodeMap[nuid] = tmpNode;
               nodes.Add (tmpNode);
-              nodesNumber++;
+              m_nodesNumber++;
             }
-          NS_LOG_INFO (linksNumber << ":" << nodesNumber << " From: " << uid << " to: " << nuid);
-          Link link (nodeMap[uid], uid, nodeMap[nuid], nuid);
+          NS_LOG_INFO (m_linksNumber << ":" << m_nodesNumber << " From: " << uid << " to: " << nuid);
+          Link link (m_nodeMap[uid], uid, m_nodeMap[nuid], nuid);
           AddLink (link);
-          linksNumber++;
+          m_linksNumber++;
         }
     }
+
+  NS_LOG_INFO ("Rocketfuel topology created with " << m_nodesNumber << " nodes and " << m_linksNumber << " links");
+
   return nodes;
 }
 
@@ -223,28 +237,28 @@
   // Create node and link
   if (!sname.empty () && !tname.empty ())
     {
-      if (nodeMap[sname] == 0)
+      if (m_nodeMap[sname] == 0)
         {
           Ptr<Node> tmpNode = CreateObject<Node> ();
-          nodeMap[sname] = tmpNode;
+          m_nodeMap[sname] = tmpNode;
           nodes.Add (tmpNode);
-          nodesNumber++;
+          m_nodesNumber++;
         }
 
-      if (nodeMap[tname] == 0)
+      if (m_nodeMap[tname] == 0)
         {
           Ptr<Node> tmpNode = CreateObject<Node> ();
-          nodeMap[tname] = tmpNode;
+          m_nodeMap[tname] = tmpNode;
           nodes.Add (tmpNode);
-          nodesNumber++;
+          m_nodesNumber++;
         }
-      NS_LOG_INFO (linksNumber << ":" << nodesNumber << " From: " << sname << " to: " << tname);
+      NS_LOG_INFO (m_linksNumber << ":" << m_nodesNumber << " From: " << sname << " to: " << tname);
       TopologyReader::ConstLinksIterator iter;
       bool found = false;
       for (iter = LinksBegin (); iter != LinksEnd (); iter++)
         {
-          if ((iter->GetFromNode () == nodeMap[tname])
-              && (iter->GetToNode () == nodeMap[sname]))
+          if ((iter->GetFromNode () == m_nodeMap[tname])
+              && (iter->GetToNode () == m_nodeMap[sname]))
             {
               found = true;
               break;
@@ -253,11 +267,14 @@
 
       if (!found)
         {
-          Link link (nodeMap[sname], sname, nodeMap[tname], tname);
+          Link link (m_nodeMap[sname], sname, m_nodeMap[tname], tname);
           AddLink (link);
-          linksNumber++;
+          m_linksNumber++;
         }
     }
+
+  NS_LOG_INFO ("Rocketfuel topology created with " << m_nodesNumber << " nodes and " << m_linksNumber << " links");
+
   return nodes;
 }
 
@@ -423,7 +440,6 @@
 
   topgen.close ();
 
-  NS_LOG_INFO ("Rocketfuel topology created with " << nodesNumber << " nodes and " << linksNumber << " links");
   return nodes;
 }
 
diff -Naur ns-3.18.1/src/topology-read/model/rocketfuel-topology-reader.h ns-3.19/src/topology-read/model/rocketfuel-topology-reader.h
--- ns-3.18.1/src/topology-read/model/rocketfuel-topology-reader.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/model/rocketfuel-topology-reader.h	2013-12-20 09:44:50.000000000 -0800
@@ -43,6 +43,10 @@
 class RocketfuelTopologyReader : public TopologyReader
 {
 public:
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   RocketfuelTopologyReader ();
@@ -61,23 +65,68 @@
   virtual NodeContainer Read (void);
 
 private:
-  RocketfuelTopologyReader (const RocketfuelTopologyReader&);
-  RocketfuelTopologyReader& operator= (const RocketfuelTopologyReader&);
-  // Parser for the *.cch file available at:
-  // http://www.cs.washington.edu/research/networking/rocketfuel/maps/rocketfuel_maps_cch.tar.gz
+  /**
+   * \brief Topology read function from a file containing the nodes map.
+   *
+   * Parser for the *.cch file available at:
+   * http://www.cs.washington.edu/research/networking/rocketfuel/maps/rocketfuel_maps_cch.tar.gz
+   *
+   * \param argc argument counter
+   * \param argv argument vector
+   * \return the container of the nodes created (or empty container if there was an error)
+   */
   NodeContainer GenerateFromMapsFile (int argc, char *argv[]);
-  // Parser for the weights.* file available at:
-  // http://www.cs.washington.edu/research/networking/rocketfuel/maps/weights-dist.tar.gz
+
+  /**
+   * \brief Topology read function from a file containing the nodes weights.
+   *
+   * Parser for the weights.* file available at:
+   * http://www.cs.washington.edu/research/networking/rocketfuel/maps/weights-dist.tar.gz
+   *
+   * \param argc argument counter
+   * \param argv argument vector
+   * \return the container of the nodes created (or empty container if there was an error)
+   */
   NodeContainer GenerateFromWeightsFile (int argc, char *argv[]);
 
+  /**
+   * \brief Enum of the possible file types.
+   */
   enum RF_FileType
   {
     RF_MAPS,
     RF_WEIGHTS,
     RF_UNKNOWN
   };
+
+
+  /**
+   * \brief Classifies the file type according to its content.
+   *
+   * \return the file type (RF_MAPS, RF_WEIGHTS, or RF_UNKNOWN)
+   */
   enum RF_FileType GetFileType (const char *);
 
+  int m_linksNumber; //!< number of links
+  int m_nodesNumber; //!< number of nodes
+  std::map<std::string, Ptr<Node> > m_nodeMap; //!< map of the nodes (name, node)
+
+private:
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   */
+  RocketfuelTopologyReader (const RocketfuelTopologyReader&);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   * \returns
+   */
+  RocketfuelTopologyReader& operator= (const RocketfuelTopologyReader&);
+
+
   // end class RocketfuelTopologyReader
 };
 
diff -Naur ns-3.18.1/src/topology-read/model/topology-reader.cc ns-3.19/src/topology-read/model/topology-reader.cc
--- ns-3.18.1/src/topology-read/model/topology-reader.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/model/topology-reader.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,9 +26,11 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("TopologyReader");
+NS_LOG_COMPONENT_DEFINE ("TopologyReader")
+  ;
 
-NS_OBJECT_ENSURE_REGISTERED (TopologyReader);
+NS_OBJECT_ENSURE_REGISTERED (TopologyReader)
+  ;
 
 TypeId TopologyReader::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/topology-read/model/topology-reader.h ns-3.19/src/topology-read/model/topology-reader.h
--- ns-3.18.1/src/topology-read/model/topology-reader.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/topology-read/model/topology-reader.h	2013-12-20 09:44:50.000000000 -0800
@@ -54,9 +54,9 @@
   class Link
   {
 public:
-  /**
-   * \brief Constant iterator to scan the map of link attributes.
-   */
+    /**
+     * \brief Constant iterator to scan the map of link attributes.
+     */
     typedef std::map<std::string, std::string>::const_iterator ConstAttributesIterator;
 
     /**
@@ -123,11 +123,11 @@
 
 private:
     Link ();
-    std::string m_fromName;
-    Ptr< Node > m_fromPtr;
-    std::string m_toName;
-    Ptr< Node > m_toPtr;
-    std::map<std::string, std::string> m_linkAttr;
+    std::string m_fromName; //!< Name of the node the links originates from
+    Ptr< Node > m_fromPtr;  //!< The node the links originates from
+    std::string m_toName;   //!< Name of the node the links is directed to
+    Ptr< Node > m_toPtr;    //!< The node the links is directed to
+    std::map<std::string, std::string> m_linkAttr;  ///< Container of the link attributes (if any)
   };
 
   /**
@@ -135,6 +135,10 @@
    */
   typedef std::list< Link >::const_iterator ConstLinksIterator;
 
+  /**
+   * \brief Get the type ID.
+   * \return the object TypeId
+   */
   static TypeId GetTypeId (void);
 
   TopologyReader ();
@@ -196,10 +200,29 @@
   void AddLink (Link link);
 
 private:
+
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   */
   TopologyReader (const TopologyReader&);
+  /**
+   * \brief Copy constructor
+   *
+   * Defined and unimplemented to avoid misuse
+   * \returns
+   */
   TopologyReader& operator= (const TopologyReader&);
 
+  /**
+   * the name of the input file
+   */
   std::string m_fileName;
+
+  /**
+   * the container of the links between the nodes
+   */
   std::list<Link> m_linksList;
 
   // end class TopologyReader
diff -Naur ns-3.18.1/src/uan/bindings/modulegen__gcc_ILP32.py ns-3.19/src/uan/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/uan/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -179,7 +179,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1569,10 +1569,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3497,6 +3498,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3507,6 +3513,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3522,6 +3533,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3547,6 +3563,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -4748,11 +4769,6 @@
                    'double', 
                    [param('double', 'db')], 
                    is_const=True)
-    ## uan-phy.h (module 'uan'): void ns3::UanPhyCalcSinr::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhyCalcSinr::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -4763,6 +4779,11 @@
                    'double', 
                    [param('double', 'kp')], 
                    is_const=True)
+    ## uan-phy.h (module 'uan'): void ns3::UanPhyCalcSinr::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
     return
 
 def register_Ns3UanPhyCalcSinrDefault_methods(root_module, cls):
@@ -5135,14 +5156,14 @@
                    'void', 
                    [param('double', 'txpwr')], 
                    is_virtual=True)
-    ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetTxPowerDbPhy1(double arg0) [member function]
+    ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetTxPowerDbPhy1(double txpwr) [member function]
     cls.add_method('SetTxPowerDbPhy1', 
                    'void', 
-                   [param('double', 'arg0')])
-    ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetTxPowerDbPhy2(double arg0) [member function]
+                   [param('double', 'txpwr')])
+    ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetTxPowerDbPhy2(double txpwr) [member function]
     cls.add_method('SetTxPowerDbPhy2', 
                    'void', 
-                   [param('double', 'arg0')])
+                   [param('double', 'txpwr')])
     ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::StartRxPacket(ns3::Ptr<ns3::Packet> pkt, double rxPowerDb, ns3::UanTxMode txMode, ns3::UanPdp pdp) [member function]
     cls.add_method('StartRxPacket', 
                    'void', 
@@ -5372,16 +5393,16 @@
                    'void', 
                    [], 
                    is_virtual=True)
-    ## uan-phy.h (module 'uan'): void ns3::UanPhyPer::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhyPer::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
+    ## uan-phy.h (module 'uan'): void ns3::UanPhyPer::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
     return
 
 def register_Ns3UanPhyPerGenDefault_methods(root_module, cls):
diff -Naur ns-3.18.1/src/uan/bindings/modulegen__gcc_LP64.py ns-3.19/src/uan/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/uan/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -179,7 +179,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -1569,10 +1569,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3497,6 +3498,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -3507,6 +3513,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -3522,6 +3533,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -3547,6 +3563,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -4748,11 +4769,6 @@
                    'double', 
                    [param('double', 'db')], 
                    is_const=True)
-    ## uan-phy.h (module 'uan'): void ns3::UanPhyCalcSinr::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhyCalcSinr::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -4763,6 +4779,11 @@
                    'double', 
                    [param('double', 'kp')], 
                    is_const=True)
+    ## uan-phy.h (module 'uan'): void ns3::UanPhyCalcSinr::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
     return
 
 def register_Ns3UanPhyCalcSinrDefault_methods(root_module, cls):
@@ -5135,14 +5156,14 @@
                    'void', 
                    [param('double', 'txpwr')], 
                    is_virtual=True)
-    ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetTxPowerDbPhy1(double arg0) [member function]
+    ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetTxPowerDbPhy1(double txpwr) [member function]
     cls.add_method('SetTxPowerDbPhy1', 
                    'void', 
-                   [param('double', 'arg0')])
-    ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetTxPowerDbPhy2(double arg0) [member function]
+                   [param('double', 'txpwr')])
+    ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetTxPowerDbPhy2(double txpwr) [member function]
     cls.add_method('SetTxPowerDbPhy2', 
                    'void', 
-                   [param('double', 'arg0')])
+                   [param('double', 'txpwr')])
     ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::StartRxPacket(ns3::Ptr<ns3::Packet> pkt, double rxPowerDb, ns3::UanTxMode txMode, ns3::UanPdp pdp) [member function]
     cls.add_method('StartRxPacket', 
                    'void', 
@@ -5372,16 +5393,16 @@
                    'void', 
                    [], 
                    is_virtual=True)
-    ## uan-phy.h (module 'uan'): void ns3::UanPhyPer::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhyPer::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
+    ## uan-phy.h (module 'uan'): void ns3::UanPhyPer::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
     return
 
 def register_Ns3UanPhyPerGenDefault_methods(root_module, cls):
diff -Naur ns-3.18.1/src/uan/examples/uan-cw-example.cc ns-3.19/src/uan/examples/uan-cw-example.cc
--- ns-3.18.1/src/uan/examples/uan-cw-example.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/examples/uan-cw-example.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,17 +23,23 @@
  * \file uan-cw-example.cc
  * \ingroup uan
  * 
- * This example showcases the "CW-MAC" described in System Design Considerations for Undersea Networks
- * article in the IEEE Journal on Selected Areas of Communications 2008 by Nathan Parrish, Leonard Tracy
- * and Sumit Roy.  The MAC protocol is implemented in the class UanMacCw.  CW-MAC is similar in nature
- * to the IEEE 802.11 DCF with a constant backoff window.  It requires two parameters to be set,
- * the slot time and the contention window size.  The contention window size is the backoff window
- * size in slots, and the slot time is the duration of each slot.  These parameters should be set
- * according to the overall network size, internode spacing and the number of nodes in the network.
+ * This example showcases the "CW-MAC" described in System Design Considerations
+ * for Undersea Networks article in the IEEE Journal on Selected Areas of
+ * Communications 2008 by Nathan Parrish, Leonard Tracy and Sumit Roy.
+ * The MAC protocol is implemented in the class UanMacCw.  CW-MAC is similar
+ * in nature to the IEEE 802.11 DCF with a constant backoff window.
+ * It requires two parameters to be set, the slot time and
+ * the contention window size.  The contention window size is
+ * the backoff window size in slots, and the slot time is
+ * the duration of each slot.  These parameters should be set
+ * according to the overall network size, internode spacing and
+ * the number of nodes in the network.
  * 
- * This example deploys nodes randomly (according to RNG seed of course) in a finite square region with
- * the X and Y coordinates of the nodes distributed uniformly.  The CW parameter is varied throughout
- * the simulation in order to show the variation in throughput with respect to changes in CW.
+ * This example deploys nodes randomly (according to RNG seed of course)
+ * in a finite square region with the X and Y coordinates of the nodes
+ * distributed uniformly.  The CW parameter is varied throughout
+ * the simulation in order to show the variation in throughput
+ * with respect to changes in CW.
  */
 
 #include "uan-cw-example.h"
@@ -47,7 +53,8 @@
 
 using namespace ns3;
 
-NS_LOG_COMPONENT_DEFINE ("UanCwExample");
+NS_LOG_COMPONENT_DEFINE ("UanCwExample")
+  ;
 
 Experiment::Experiment () 
   : m_numNodes (15),
diff -Naur ns-3.18.1/src/uan/examples/uan-cw-example.h ns-3.19/src/uan/examples/uan-cw-example.h
--- ns-3.18.1/src/uan/examples/uan-cw-example.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/examples/uan-cw-example.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,39 +28,67 @@
 using namespace ns3;
 
 /**
- * \class Experiment
- * \brief Helper class for UAN CW MAC example
+ * \ingroup uan
+ * \brief Helper class for UAN CW MAC example.
  *
+ * An experiment measures the average throughput for a series of CW values.
+ *
+ * \see uan-cw-example.cc
  */
 class Experiment
 {
 public:
+  /**
+   * Run an experiment across a range of congestion window values.
+   *
+   * \param uan The Uan stack helper to configure nodes in the model.
+   * \return The data set of CW values and measured throughput
+   */
   Gnuplot2dDataset Run (UanHelper &uan);
+  /**
+   * Receive all available packets from a socket.
+   *
+   * \param socket The receive socket.
+   */
   void ReceivePacket (Ptr<Socket> socket);
+  /**
+   * Assign new random positions to a set of nodes.  New positions
+   * are randomly assigned within the bounding box.
+   *
+   * \param nodes The nodes to reposition.
+   */
   void UpdatePositions (NodeContainer &nodes);
+  /** Save the throughput from a single run. */
   void ResetData ();
+  /**
+   * Compute average throughput for a set of runs, then increment CW.
+   *
+   * \param cw CW value for completed runs.
+   */
   void IncrementCw (uint32_t cw);
-  uint32_t m_numNodes;
-  uint32_t m_dataRate;
-  double m_depth;
-  double m_boundary;
-  uint32_t m_packetSize;
-  uint32_t m_bytesTotal;
-  uint32_t m_cwMin;
-  uint32_t m_cwMax;
-  uint32_t m_cwStep;
-  uint32_t m_avgs;
-
-  Time m_slotTime;
-  Time m_simTime;
-
-  std::string m_gnudatfile;
-  std::string m_asciitracefile;
-  std::string m_bhCfgFile;
+  
+  uint32_t m_numNodes;                //!< Number of transmitting nodes.
+  uint32_t m_dataRate;                //!< DataRate in bps.
+  double m_depth;                     //!< Depth of transmitting and sink nodes.
+  double m_boundary;                  //!< Size of boundary in meters.
+  uint32_t m_packetSize;              //!< Generated packet size in bytes.
+  uint32_t m_bytesTotal;              //!< Total bytes received.
+  uint32_t m_cwMin;                   //!< Min CW to simulate.
+  uint32_t m_cwMax;                   //!< Max CW to simulate.
+  uint32_t m_cwStep;                  //!< CW step size, default 10.
+  uint32_t m_avgs;                    //!< Number of topologies to test for each cw point.
+                                 
+  Time m_slotTime;                    //!< Slot time duration.
+  Time m_simTime;                     //!< Simulation run time, default 1000 s.
+
+  std::string m_gnudatfile;           //!< Name for GNU Plot output, default uan-cw-example.gpl.
+  std::string m_asciitracefile;       //!< Name for ascii trace file, default uan-cw-example.asc.
+  std::string m_bhCfgFile;            //!< (Unused)
 
-  Gnuplot2dDataset m_data;
-  std::vector<double> m_throughputs;
+  Gnuplot2dDataset m_data;            //!< Container for the simulation data.
+  std::vector<double> m_throughputs;  //!< Throughput for each run.
 
+  /** Default constructor. */
   Experiment ();
 };
 
diff -Naur ns-3.18.1/src/uan/examples/uan-rc-example.cc ns-3.19/src/uan/examples/uan-rc-example.cc
--- ns-3.18.1/src/uan/examples/uan-rc-example.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/examples/uan-rc-example.cc	2013-12-20 09:44:50.000000000 -0800
@@ -65,7 +65,8 @@
 
 using namespace ns3;
 
-NS_LOG_COMPONENT_DEFINE ("UanRcExample");
+NS_LOG_COMPONENT_DEFINE ("UanRcExample")
+  ;
 
 
 Experiment::Experiment () 
@@ -262,7 +263,7 @@
   cmd.AddValue ("MaxRange", "Maximum range between gateway and acoustic node", exp.m_maxRange);
   cmd.AddValue ("SimMin", "Minimum parameter to test (nodes if DoNode=1, \"a\" param otherwise)", exp.m_simMin);
   cmd.AddValue ("SimMax", "Maximum parameter to test (nodes if DoNode=1, \"a\" param otherwise)", exp.m_simMax);
-  cmd.AddValue ("SimStep", "Ammount to increment param per trial", exp.m_simStep);
+  cmd.AddValue ("SimStep", "Amount to increment param per trial", exp.m_simStep);
   cmd.AddValue ("DataFile", "Filename for GnuPlot", exp.m_gnuplotfile);
   cmd.AddValue ("NumberNodes", "Number of nodes (invalid for doNode=1)", exp.m_numNodes);
   cmd.AddValue ("SIFS", "SIFS time duration", exp.m_sifs);
diff -Naur ns-3.18.1/src/uan/examples/uan-rc-example.h ns-3.19/src/uan/examples/uan-rc-example.h
--- ns-3.18.1/src/uan/examples/uan-rc-example.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/examples/uan-rc-example.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,36 +27,89 @@
 
 using namespace ns3;
 
+/**
+ * \ingroup uan
+ *
+ * Container for the parameters describing a single experiment.
+ *
+ * An experiment samples a range of parameter values.  The parameter
+ * controls the number of nodes (if m_doNode is true), or the
+ * UanMacRcGw MaxReservations attribute.
+ *
+ * \see uan-rc-example.cc
+ *
+ */
 class Experiment
 {
 public:
-  uint32_t m_simMin;
-  uint32_t m_simMax;
-  uint32_t m_simStep;
-  uint32_t m_numRates;
-  uint32_t m_totalRate;
-  uint32_t m_maxRange;
-  uint32_t m_numNodes;
-  uint32_t m_pktSize;
-  bool m_doNode;
-  Time m_sifs;
-  Time m_simTime;
-
-  std::string m_gnuplotfile;
-
-  uint32_t m_bytesTotal;
-
-  UanModesList m_dataModes;
-  UanModesList m_controlModes;
-
+  uint32_t m_simMin;     //!< Minimum parameter to test.
+  uint32_t m_simMax;     //!< Maximum parameter to test.
+  uint32_t m_simStep;    //!< Amount to increment param per trial
+  uint32_t m_numRates;   //!< Number of divided rates ( (NumberRates+1)%TotalRate should be 0).
+  uint32_t m_totalRate;  //!< Total channel capacity.
+  uint32_t m_maxRange;   //!< Maximum range between gateway and acoustic node.
+  uint32_t m_numNodes;   //!< Number of nodes (invalid for m_doNode true).
+  uint32_t m_pktSize;    //!< Packet size in bytes.
+  bool m_doNode;         //!< 1 for do max nodes simulation (invalidates AMin and AMax values).
+  Time m_sifs;           //!< SIFS time duration.
+  Time m_simTime;        //!< Simulation time per trial
+
+  std::string m_gnuplotfile;    //!< Filename for GnuPlot.
+
+  uint32_t m_bytesTotal; //!< Total number of bytes received in a simulation run.
+
+  UanModesList m_dataModes;     //!< List of UanTxModes used for data channels.
+  UanModesList m_controlModes;  //!< List of UanTxModes used for control channels.
+
+  /**
+   * Callback to receive a packet.
+   *
+   * \param socket The socket receiving packets.
+   */
   void ReceivePacket (Ptr<Socket> socket);
+  /**
+   * Create a UanTxMode.
+   *
+   * The mode physical rate is set equal to m_totalRate.
+   * The data rate and bandwidth are set to
+   *
+   * \f[{\rm{rate, bandwidth}} = {\rm{kass}}\frac{{{\rm{m\_totalRate}}}}{{{\rm{m\_numRates}} + 1}}\f]
+   *
+   * The center frequency is set to
+   *
+   * \f[{f_{center}} = {\rm{fc}} + \frac{{ \pm {\rm{m\_totalRate}} \mp {\rm{rate}}}}{2}\f]
+   *
+   * where the upper sign is taken if upperblock is true.
+   *
+   * \param kass Fraction of total bandwidth assigned to mode.
+   * \param fc Mode center frequency offset.
+   * \param upperblock Sign choise in setting the center frequency.
+   * \param name Mode name.
+   * \return The new mode.
+   */
   UanTxMode CreateMode (uint32_t kass,
                         uint32_t fc,
                         bool upperblock,
                         std::string name);
+  /**
+   * Create m_numRates matching control and data modes.
+   *
+   * \param fc Mode center frequency offset.
+   */
   void CreateDualModes (uint32_t fc);
+  /**
+   * Run a parametrized experiment.
+   *
+   * The parameter sets either the number of nodes (if m_doNode is true)
+   * or the \"a\" parameter, which controls the UanMacRcGw MaxReservations
+   * attribute.
+   *
+   * \param param The parameter value.
+   * \return The total number of bytes delivered.
+   */
   uint32_t Run (uint32_t param);
 
+  /** Default constructor. */
   Experiment();
 
 };
diff -Naur ns-3.18.1/src/uan/helper/acoustic-modem-energy-model-helper.h ns-3.19/src/uan/helper/acoustic-modem-energy-model-helper.h
--- ns-3.18.1/src/uan/helper/acoustic-modem-energy-model-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/helper/acoustic-modem-energy-model-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,35 +27,38 @@
 namespace ns3 {
 
 /**
- * \brief Assign AcousticModemEnergyModel to uan devices.
+ * \ingroup uan
  *
- * This installer installs AcousticModemEnergyModel for only UanNetDevice objects.
+ * Assign AcousticModemEnergyModel to uan devices.
+ *
+ * This installer installs AcousticModemEnergyModel for only
+ * UanNetDevice objects.
  */
 class AcousticModemEnergyModelHelper : public DeviceEnergyModelHelper
 {
 public:
-  /**
-   * Construct a helper which is used to add a radio energy model to a node
+  /** 
+   * Construct a helper which is used to add a radio energy model to a node.
    */
   AcousticModemEnergyModelHelper ();
 
   /**
-   * Destroy an AcousticModemEnergy Helper
+   * Destroy an AcousticModemEnergy Helper.
    */
   ~AcousticModemEnergyModelHelper ();
 
   /**
-   * \param name the name of the attribute to set
-   * \param v the value of the attribute
-   *
    * Sets an attribute of the underlying energy model object.
+   *
+   * \param name The name of the attribute to set.
+   * \param v The value of the attribute.
    */
   void Set (std::string name, const AttributeValue &v);
 
   /**
-   * \param callback Callback function for energy depletion handling.
-   *
    * Sets the callback to be invoked when energy is depleted.
+   *
+   * \param callback Callback function for energy depletion handling.
    */
   void SetDepletionCallback (
     AcousticModemEnergyModel::AcousticModemEnergyDepletionCallback callback);
@@ -63,16 +66,20 @@
 
 private:
   /**
+   * Implements DeviceEnergyModel::Install.
+   *
    * \param device Pointer to the NetDevice to install DeviceEnergyModel.
    * \param source Pointer to EnergySource installed on node.
-   *
-   * Implements DeviceEnergyModel::Install.
+   * \return The energy model.
    */
   virtual Ptr<DeviceEnergyModel> DoInstall (Ptr<NetDevice> device,
                                             Ptr<EnergySource> source) const;
 
 private:
+  /** Energy model factory. */
   ObjectFactory m_modemEnergy;
+
+  /** Callback for energy depletion. */
   AcousticModemEnergyModel::AcousticModemEnergyDepletionCallback m_depletionCallback;
 
 };
diff -Naur ns-3.18.1/src/uan/helper/uan-helper.cc ns-3.19/src/uan/helper/uan-helper.cc
--- ns-3.18.1/src/uan/helper/uan-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/helper/uan-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,12 +43,30 @@
 NS_LOG_COMPONENT_DEFINE ("UanHelper");
 namespace ns3 {
 
+/**
+ * Ascii trace callback on Phy transmit events.
+ *
+ * \param os The output stream.
+ * \param context The node and device ids.
+ * \param packet The transmitted packet.
+ * \param txPowerDb The transmission power.
+ * \param mode The transmission mode.
+ */
 static void AsciiPhyTxEvent (std::ostream *os, std::string context,
                              Ptr<const Packet> packet, double txPowerDb, UanTxMode mode)
 {
   *os << "+ " << Simulator::Now ().GetSeconds () << " " << context << " " << *packet << std::endl;
 }
 
+/**
+ * Ascii trace callback on successful packet reception.
+ *
+ * \param os The output stream.
+ * \param context The node and device ids.
+ * \param packet The received packet.
+ * \param snr The received signal to noise ratio.
+ * \param mode The channel transmission mode.
+ */
 static void AsciiPhyRxOkEvent (std::ostream *os, std::string context,
                                Ptr<const Packet> packet, double snr, UanTxMode mode)
 {
diff -Naur ns-3.18.1/src/uan/helper/uan-helper.h ns-3.19/src/uan/helper/uan-helper.h
--- ns-3.18.1/src/uan/helper/uan-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/helper/uan-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,30 +31,37 @@
 
 class UanChannel;
 
+/**
+ * \ingroup uan
+ *
+ * UAN configuration helper.
+ */
 class UanHelper
 {
 public:
-  UanHelper ();
-  virtual ~UanHelper ();
+  UanHelper ();           //!< Defalt constructor.
+  virtual ~UanHelper ();  //!< Destructor.
 
   /**
-   * \param type the type of ns3::UanMac to create.
-   * \param n0 the name of the attribute to set
-   * \param v0 the value of the attribute to set
-   * \param n1 the name of the attribute to set
-   * \param v1 the value of the attribute to set
-   * \param n2 the name of the attribute to set
-   * \param v2 the value of the attribute to set
-   * \param n3 the name of the attribute to set
-   * \param v3 the value of the attribute to set
-   * \param n4 the name of the attribute to set
-   * \param v4 the value of the attribute to set
-   * \param n5 the name of the attribute to set
-   * \param v5 the value of the attribute to set
-   * \param n6 the name of the attribute to set
-   * \param v6 the value of the attribute to set
-   * \param n7 the name of the attribute to set
-   * \param v7 the value of the attribute to set
+   * Set MAC attributes.
+   *
+   * \param type The type of ns3::UanMac to create.
+   * \param n0 The name of the attribute to set.
+   * \param v0 The value of the attribute to set.
+   * \param n1 The name of the attribute to set.
+   * \param v1 The value of the attribute to set.
+   * \param n2 The name of the attribute to set.
+   * \param v2 The value of the attribute to set.
+   * \param n3 The name of the attribute to set.
+   * \param v3 The value of the attribute to set.
+   * \param n4 The name of the attribute to set.
+   * \param v4 The value of the attribute to set.
+   * \param n5 The name of the attribute to set.
+   * \param v5 The value of the attribute to set.
+   * \param n6 The name of the attribute to set.
+   * \param v6 The value of the attribute to set.
+   * \param n7 The name of the attribute to set.
+   * \param v7 The value of the attribute to set.
    *
    * All the attributes specified in this method should exist
    * in the requested mac.
@@ -71,26 +78,28 @@
 
 
   /**
-   * \param phyType the type of ns3::UanPhy to create.
-   * \param n0 the name of the attribute to set
-   * \param v0 the value of the attribute to set
-   * \param n1 the name of the attribute to set
-   * \param v1 the value of the attribute to set
-   * \param n2 the name of the attribute to set
-   * \param v2 the value of the attribute to set
-   * \param n3 the name of the attribute to set
-   * \param v3 the value of the attribute to set
-   * \param n4 the name of the attribute to set
-   * \param v4 the value of the attribute to set
-   * \param n5 the name of the attribute to set
-   * \param v5 the value of the attribute to set
-   * \param n6 the name of the attribute to set
-   * \param v6 the value of the attribute to set
-   * \param n7 the name of the attribute to set
-   * \param v7 the value of the attribute to set
+   * Set PHY attributes.
+   *
+   * \param phyType The type of ns3::UanPhy to create.
+   * \param n0 The name of the attribute to set.
+   * \param v0 The value of the attribute to set.
+   * \param n1 The name of the attribute to set.
+   * \param v1 The value of the attribute to set.
+   * \param n2 The name of the attribute to set.
+   * \param v2 The value of the attribute to set.
+   * \param n3 The name of the attribute to set.
+   * \param v3 The value of the attribute to set.
+   * \param n4 The name of the attribute to set.
+   * \param v4 The value of the attribute to set.
+   * \param n5 The name of the attribute to set.
+   * \param v5 The value of the attribute to set.
+   * \param n6 The name of the attribute to set.
+   * \param v6 The value of the attribute to set.
+   * \param n7 The name of the attribute to set.
+   * \param v7 The value of the attribute to set.
    *
    * All the attributes specified in this method should exist
-   * in the requested phy.
+   * in the requested Phy.
    */
   void SetPhy (std::string phyType,
                std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
@@ -104,23 +113,25 @@
 
 
   /**
-   * \param type the type of ns3::Transducer to create
-   * \param n0 the name of the attribute to set
-   * \param v0 the value of the attribute to set
-   * \param n1 the name of the attribute to set
-   * \param v1 the value of the attribute to set
-   * \param n2 the name of the attribute to set
-   * \param v2 the value of the attribute to set
-   * \param n3 the name of the attribute to set
-   * \param v3 the value of the attribute to set
-   * \param n4 the name of the attribute to set
-   * \param v4 the value of the attribute to set
-   * \param n5 the name of the attribute to set
-   * \param v5 the value of the attribute to set
-   * \param n6 the name of the attribute to set
-   * \param v6 the value of the attribute to set
-   * \param n7 the name of the attribute to set
-   * \param v7 the value of the attribute to set
+   * Set the transducer attributes.
+   *
+   * \param type The type of ns3::Transducer to create.
+   * \param n0 The name of the attribute to set.
+   * \param v0 The value of the attribute to set.
+   * \param n1 The name of the attribute to set.
+   * \param v1 The value of the attribute to set.
+   * \param n2 The name of the attribute to set.
+   * \param v2 The value of the attribute to set.
+   * \param n3 The name of the attribute to set.
+   * \param v3 The value of the attribute to set.
+   * \param n4 The name of the attribute to set.
+   * \param v4 The value of the attribute to set.
+   * \param n5 The name of the attribute to set.
+   * \param v5 The value of the attribute to set.
+   * \param n6 The name of the attribute to set.
+   * \param v6 The value of the attribute to set.
+   * \param n7 The name of the attribute to set.
+   * \param v7 The value of the attribute to set.
    *
    * All the attributes specified in this method should exist
    * in the requested transducer.
@@ -135,47 +146,45 @@
                       std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
                       std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
   /**
-   * \param os output stream
-   * \param nodeid the id of the node to generate ascii output for.
-   * \param deviceid the id of the device to generate ascii output for.
-   *
    * Enable ascii output on the specified deviceid within the
    * specified nodeid if it is of type ns3::UanNetDevice and dump
    * that to the specified stdc++ output stream.
+   *
+   * \param os Output stream.
+   * \param nodeid The id of the node to generate ascii output for.
+   * \param deviceid The id of the device to generate ascii output for.
    */
   static void EnableAscii (std::ostream &os, uint32_t nodeid, uint32_t deviceid);
   /**
-   * \param os output stream
-   * \param d device container
-   *
    * Enable ascii output on each device which is of the
    * ns3::UanNetDevice type and which is located in the input
    * device container and dump that to the specified
    * stdc++ output stream.
+   *
+   * \param os Output stream.
+   * \param d Device container.
    */
   static void EnableAscii (std::ostream &os, NetDeviceContainer d);
   /**
-   * \param os output stream
-   * \param n node container
-   *
    * Enable ascii output on each device which is of the
    * ns3::UanNetDevice type and which is located in one
    * of the input node and dump that to the specified
    * stdc++ output stream.
+   *
+   * \param os Output stream.
+   * \param n Node container.
    */
   static void EnableAscii (std::ostream &os, NodeContainer n);
   /**
-   * \param os output stream
-   *
    * Enable ascii output on each device which is of the
    * ns3::UanNetDevice type and dump that to the specified
    * stdc++ output stream.
+   *
+   * \param os Output stream.
    */
   static void EnableAsciiAll (std::ostream &os);
 
   /**
-   * \param c a set of nodes
-   *
    * This method creates a simple ns3::UanChannel (with a default
    * ns3::UanNoiseModelDefault and ns3::UanPropModelIdeal) and
    * creates, for each of the input nodes, a new ns3::UanNetDevice
@@ -184,34 +193,41 @@
    * ns3::UanPhy, all of which are created based on the user-specified
    * attributes specified in UanHelper::SetTransducer,
    * UanHelper::SetMac, and, UanHelper::SetPhy.
+   *
+   * \param c A set of nodes.
+   * \return The installed netdevices.
    */
-
   NetDeviceContainer Install (NodeContainer c) const;
+  
   /**
-   * \param c a set of nodes
-   * \param channel a channel to use
-   *
    * For each of the input nodes, a new ns3::UanNetDevice is attached
    * to the shared input channel. Each ns3::UanNetDevice is also
    * configured with an ns3::UanTransducerHd, a ns3::UanMac, and ns3::UanPhy,
    * all of which are created based on the user-specified attributes
    * specified in UanHelper::SetTransducer, UanHelper::SetMac, and
    * UanHelper::SetPhy.
+   *
+   * \param c A set of nodes.
+   * \param channel A channel to use.
+   * \return The installed netdevices.
    */
   NetDeviceContainer Install (NodeContainer c, Ptr<UanChannel> channel) const;
 
   /**
-   * \param node a node where to install the uan components
-   * \param channel a channel to use
+   * Create a default an stack.
    *
-   * Create a default uan stack with:
-   * - default channel, ideal propagation and default noise model
-   * - default physical layer, with UanPhyGen
-   * - default transducer, half duplex acoustic modem with UanTransducerHd
-   * - default MAC layer, with UanMacAloha
+   * The stack includes:
+   * - default channel, ideal propagation and default noise model.
+   * - default physical layer, with UanPhyGen.
+   * - default transducer, half duplex acoustic modem with UanTransducerHd.
+   * - default MAC layer, with UanMacAloha.
    *
    * Channel, physical layer, transducer and mac layer are added to the
    * UanNetDevice and then added to the node.
+   *
+   * \param node A node where to install the uan components.
+   * \param channel A channel to use.
+   * \return The installed UanNetDevice.
    */
   Ptr<UanNetDevice> Install (Ptr<Node> node, Ptr<UanChannel> channel) const;
 
@@ -222,17 +238,17 @@
   * called by the user.
   *
   * \param c NetDeviceContainer of the set of net devices for which the 
-  *          UanNetDevice should be modified to use a fixed stream
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this helper
+  *          UanNetDevice should be modified to use a fixed stream.
+  * \param stream First stream index to use.
+  * \return The number of stream indices assigned by this helper.
   */
   int64_t AssignStreams (NetDeviceContainer c, int64_t stream);
 
 private:
-  ObjectFactory m_device;
-  ObjectFactory m_mac;
-  ObjectFactory m_phy;
-  ObjectFactory m_transducer;
+  ObjectFactory m_device;      //!< The device.
+  ObjectFactory m_mac;         //!< The MAC layer.
+  ObjectFactory m_phy;         //!< The PHY layer.
+  ObjectFactory m_transducer;  //!< The transducer.
 
 };
 
diff -Naur ns-3.18.1/src/uan/model/acoustic-modem-energy-model.cc ns-3.19/src/uan/model/acoustic-modem-energy-model.cc
--- ns-3.18.1/src/uan/model/acoustic-modem-energy-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/acoustic-modem-energy-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (AcousticModemEnergyModel);
+NS_OBJECT_ENSURE_REGISTERED (AcousticModemEnergyModel)
+  ;
 
 TypeId
 AcousticModemEnergyModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/uan/model/acoustic-modem-energy-model.h ns-3.19/src/uan/model/acoustic-modem-energy-model.h
--- ns-3.18.1/src/uan/model/acoustic-modem-energy-model.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/acoustic-modem-energy-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,9 @@
 namespace ns3 {
 
 /**
- * \brief WHOI micro-modem energy model
+ * \ingroup uan
+ *
+ * WHOI micro-modem energy model.
  *
  * Basing on the Device Energy Model interface, has been implemented a specific
  * energy model for the WHOI micro modem. The class follows pretty closely the
@@ -45,110 +47,105 @@
  * Sleep         5.8 mW
  *
  * References:
- * [1] Freitag et al., The whoi micro-modem: an acoustic communications and navigation system for multiple platforms,
+ * [1] Freitag et al., The whoi micro-modem: an acoustic communications
+ *     and navigation system for multiple platforms,
  *     in In Proc. IEEE OCEANS05 Conf, 2005.
  *     URL: http://ieeexplore.ieee.org/iel5/10918/34367/01639901.pdf
  */
 class AcousticModemEnergyModel : public DeviceEnergyModel
 {
 public:
-  /**
-   * Callback type for energy depletion handling.
-   */
+  /** Callback type for energy depletion handling. */
   typedef Callback<void> AcousticModemEnergyDepletionCallback;
 
-public:
+public:  
+  /**
+   * Register this type.
+   * \return The object TypeId.
+   */
   static TypeId GetTypeId (void);
+  /** Constructor. */
   AcousticModemEnergyModel ();
+  /** Dummy destructor, see DoDispose */
   virtual ~AcousticModemEnergyModel ();
 
   /**
-   * \brief Sets pointer to node.
+   * Sets pointer to node.
    *
    * \param node Pointer to node.
-   *
-   * Implements DeviceEnergyModel::SetNode.
    */
   virtual void SetNode (Ptr<Node> node);
 
   /**
-   * \brief Gets pointer to node.
+   * Gets pointer to node.
    *
    * \return Pointer to node.
-   *
-   * Implements DeviceEnergyModel::GetNode.
    */
   virtual Ptr<Node> GetNode (void) const;
 
-  /**
-   * \brief Sets pointer to EnergySouce installed on node.
-   *
-   * \param source Pointer to EnergySource installed on node.
-   *
-   * Implements DeviceEnergyModel::SetEnergySource.
-   */
+  // Inherited methods.
   virtual void SetEnergySource (Ptr<EnergySource> source);
-
-  /**
-   * \return Total energy consumption of the modem
-   *
-   * Implements DeviceEnergyModel::GetTotalEnergyConsumption.
-   */
   virtual double GetTotalEnergyConsumption (void) const;
 
   /**
+   * Get the transmission power of the modem.
    *
-   * \return The transmission power of the modem in Watts
+   * \return The transmission power in Watts.
    */
   double GetTxPowerW (void) const;
 
   /**
-   * Set the transmission power of the modem
+   * Set the transmission power of the modem.
    *
-   * \param txPowerW Transmission power of the modem in watts
+   * \param txPowerW Transmission power in watts.
    */
   void SetTxPowerW (double txPowerW);
 
   /**
+   * Get the recieving power.
    *
-   * \return The receiving power of the modem in Watts
+   * \return The receiving power in Watts
    */
   double GetRxPowerW (void) const;
 
   /**
-   * Set the receiving power of the modem
+   * Set the receiving power of the modem.
    *
-   * \param rxPowerW Receiving power of the modem in watts
+   * \param rxPowerW Receiving power in watts
    */
   void SetRxPowerW (double rxPowerW);
 
   /**
+   *Get the idle power of the modem.
    *
-   * \return The idle power of the modem in Watts
+   * \return The idle power in Watts
    */
   double GetIdlePowerW (void) const;
 
   /**
-   * Set the idle power of the modem
+   * Set the idle state power of the modem.
    *
-   * \param idlePowerW Idle power of the modem in watts
+   * \param idlePowerW Idle power of the modem in watts.
    */
   void SetIdlePowerW (double idlePowerW);
 
   /**
+   * Get the sleep state power of the modem.
    *
-   * \return The sleep power of the modem in Watts
+   * \return Sleep power of the modem in Watts
    */
   double GetSleepPowerW (void) const;
 
   /**
-   * Set the sleep power of the modem
+   * Set the sleep power of the modem.
    *
-   * \param sleepPowerW Sleep power of the modem in watts
+   * \param sleepPowerW Sleep power of the modem in watts.
    */
   void SetSleepPowerW (double sleepPowerW);
 
   /**
+   * Get the current state of the modem.
+   *
    * \return Current state.
    */
   int GetCurrentState (void) const;
@@ -161,18 +158,14 @@
   void SetEnergyDepletionCallback (AcousticModemEnergyDepletionCallback callback);
 
   /**
-   * \brief Changes state of the AcousticModemEnergyModel.
+   * Changes state of the AcousticModemEnergyModel..
    *
    * \param newState New state the modem is in.
-   *
-   * Implements DeviceEnergyModel::ChangeState.
    */
   virtual void ChangeState (int newState);
 
   /**
-   * \brief Handles energy depletion.
-   *
-   * Implements DeviceEnergyModel::HandleEnergyDepletion
+   * Handles energy depletion.
    */
   virtual void HandleEnergyDepletion (void);
 
@@ -181,9 +174,7 @@
   void DoDispose (void);
 
   /**
-   * \returns Current draw of device, at current state.
-   *
-   * Implements DeviceEnergyModel::GetCurrentA.
+   * \return Current draw of device, at current state.
    */
   virtual double DoGetCurrentA (void) const;
 
@@ -204,25 +195,26 @@
   void SetMicroModemState (const int state);
 
 private:
-  Ptr<Node> m_node;
-  Ptr<EnergySource> m_source;
+  Ptr<Node> m_node;            //!< The node hosting this transducer.
+  Ptr<EnergySource> m_source;  //!< The energy source.
 
   // Member variables for power consumption in different modem states.
-  double m_txPowerW;
-  double m_rxPowerW;
-  double m_idlePowerW;
-  double m_sleepPowerW;
+  double m_txPowerW;           //!< The transmitter power, in watts.
+  double m_rxPowerW;           //!< The receiver power, in watts.
+  double m_idlePowerW;         //!< The idle power, in watts.
+  double m_sleepPowerW;        //!< The sleep power, in watts.
 
-  // This variable keeps track of the total energy consumed by this model.
+  /** The total energy consumed by this model. */
   TracedValue<double> m_totalEnergyConsumption;
 
   // State variables.
-  int m_currentState;  // current state the modem is in
-  Time m_lastUpdateTime;          // time stamp of previous energy update
+  int m_currentState;          //!< Current modem state.
+  Time m_lastUpdateTime;       //!< Time stamp of previous energy update.
 
-  // energy depletion callback
+  /** Energy depletion callback. */
   AcousticModemEnergyDepletionCallback m_energyDepletionCallback;
-};
+
+};  // class AcousticModemEnergyModel
 
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/uan/model/uan-address.cc ns-3.19/src/uan/model/uan-address.cc
--- ns-3.18.1/src/uan/model/uan-address.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-address.cc	2013-12-20 09:44:50.000000000 -0800
@@ -108,6 +108,12 @@
 }
 
 bool
+operator < (const UanAddress &a, const UanAddress &b)
+{
+  return a.m_address < b.m_address;
+}
+
+bool
 operator == (const UanAddress &a, const UanAddress &b)
 {
   return a.m_address == b.m_address;
diff -Naur ns-3.18.1/src/uan/model/uan-address.h ns-3.19/src/uan/model/uan-address.h
--- ns-3.18.1/src/uan/model/uan-address.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-address.h	2013-12-20 09:44:50.000000000 -0800
@@ -27,100 +27,159 @@
 namespace ns3 {
 
 /**
- * \class UanAddress
+ * \ingroup uan
  *
- * A class used for addressing UAN MAC's.  This implementation uses a simple 8 bit
- * flat addressing scheme.  It is unlikely that perceived underwater networks will
- * soon exceed 200 nodes (or the overlapping of two underwater networks - the ocean is big),
- * so this should provide adequate addressing for most applications.
+ * A class used for addressing UAN MAC's.
+ *
+ * This implementation uses a simple 8 bit flat addressing scheme.
+ * It is unlikely that perceived underwater networks will soon
+ * exceed 200 nodes (or the overlapping of two underwater networks
+ * - the ocean is big), so this should provide adequate addressing
+ * for most applications.
  */
 class UanAddress
 {
 public:
+  /** Constructor */
   UanAddress ();
   /**
-   * \param addr byte address to assign to this address
-   * \brief Create UanAddress object with address addr
+   * Create UanAddress object with address addr.
+   *
+   * \param addr Byte address to assign to this address.
    */
   UanAddress (uint8_t addr);
+  /** Destructor */
   virtual ~UanAddress ();
 
   /**
-   * \param address  Address to convert to UAN address
-   * \returns UanAddress from Address
+   * Convert a generic address to a UanAddress.
+   *
+   * \param address  Address to convert to UAN address.
+   * \return UanAddress from Address.
    */
   static UanAddress ConvertFrom (const Address &address);
 
   /**
-   * \param address  Address to test
-   * \returns True if address given is consistant with UanAddress
+   * Check that a generic Address is compatible with UanAddress.
+   *
+   * \param address  Address to test.
+   * \return True if address given is consistant with UanAddress.
    */
   static bool IsMatchingType  (const Address &address);
 
   /**
-   * \brief Create UanAddress object with broadcast address
+   * Create a generic Address.
+   *
+   * \return The Address.
    */
   operator Address () const;
 
   /**
-   * \param pBuffer Buffer to extract address from
-   * \brief Sets address to address stored in parameter
+   * Sets address to address stored in parameter.
+   *
+   * \param pBuffer Buffer to extract address from.
    */
   void CopyFrom (const uint8_t *pBuffer);
 
   /**
+   * Writes address to buffer parameter.
+   *
    * \param pBuffer
-   * \brief Writes address to buffer parameter
    */
   void CopyTo (uint8_t *pBuffer);
 
   /**
-   * \returns 8 bit integer version of address
+   * Convert to integer.
+   *
+   * \return 8 bit integer version of address.
    */
   uint8_t GetAsInt (void) const;
 
   /**
-   * \returns Broadcast address: 255
+   * Get the broadcast address (255).
+   *
+   * \return Broadcast address.
    */
   static UanAddress GetBroadcast (void);
 
   /**
-   * \brief Allocates UanAddress from 0-254 (will wrap back to 0 if more than 255 are allocated)
+   * Allocates UanAddress from 0-254
+   *
+   * Will wrap back to 0 if more than 254 are allocated.
+   * Excludes the broadcast address.
+   *
+   * \return The next sequential UanAddress.
    */
   static UanAddress Allocate ();
 
 
 private:
-  uint8_t m_address;
+  uint8_t m_address;  //!< The address.
 
+  /**
+   * Get the UanAddress type.
+   *
+   * \return The type value.
+   */
   static uint8_t GetType (void);
+  /**
+   * Convert to a generic Address.
+   *
+   * \return The Address value.
+   */
   Address ConvertTo (void) const;
 
+  friend bool operator <  (const UanAddress &a, const UanAddress &b);
   friend bool operator == (const UanAddress &a, const UanAddress &b);
   friend bool operator != (const UanAddress &a, const UanAddress &b);
   friend std::ostream& operator<< (std::ostream& os, const UanAddress & address);
   friend std::istream& operator>> (std::istream& is, UanAddress & address);
 
-};
+};  // class UanAddress
 
 
 /**
- * \brief Returns true if byte address a is equal to byte address b
+ * Address comparison, less than.
+ *
+ * \param a First address to compare.
+ * \param b Second address to compare.
+ * \return True if a < b.
+ */
+bool operator < (const UanAddress &a, const UanAddress &b);
+
+/**
+ * Address comparison, equalit.
+ *
+ * \param a First address to compare.
+ * \param b Second address to compare.
+ * \return True if a == b.
  */
 bool operator == (const UanAddress &a, const UanAddress &b);
 
 /**
- * \brief Returns true if byte address a is unequal to byte address b
+ * Address comparison, unequal.
+ *
+ * \param a First address to compare.
+ * \param b Second address to compare.
+ * \return True if a != b.
  */
 bool operator != (const UanAddress &a, const UanAddress &b);
 
 /**
- * \brief Writes param address to stream os as 8 bit integer
+ * Write \pname{address} to stream \pname{os} as 8 bit integer.
+ *
+ * \param os The output stream.
+ * \param address The address
+ * \return The output stream.
  */
 std::ostream& operator<< (std::ostream& os, const UanAddress & address);
 
 /**
- * \brief Inputs param address from stream is as 8 bit integer
+ * Read \pname{address} from stream \pname{is} as 8 bit integer.
+ *
+ * \param is The input stream.
+ * \param address The address variable to set.
+ * \return The input stream.
  */
 std::istream& operator>> (std::istream& is, UanAddress & address);
 
diff -Naur ns-3.18.1/src/uan/model/uan-channel.cc ns-3.19/src/uan/model/uan-channel.cc
--- ns-3.18.1/src/uan/model/uan-channel.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,8 @@
 NS_LOG_COMPONENT_DEFINE ("UanChannel");
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanChannel);
+NS_OBJECT_ENSURE_REGISTERED (UanChannel)
+  ;
 
 TypeId
 UanChannel::GetTypeId ()
diff -Naur ns-3.18.1/src/uan/model/uan-channel.h ns-3.19/src/uan/model/uan-channel.h
--- ns-3.18.1/src/uan/model/uan-channel.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-channel.h	2013-12-20 09:44:50.000000000 -0800
@@ -38,78 +38,102 @@
 class UanTxMode;
 
 /**
- * \class UanChannel
- * \brief Channel class used by UAN devices
+ * \ingroup uan
+ *
+ * Channel class used by UAN devices.
  */
 class UanChannel : public Channel
 {
 public:
   /**
-   * \brief UanDeviceList is a standard template vector of pairs (UanNetDevice, UanTransducer)
+   * UanDeviceList is a standard template vector of pairs
+   * (UanNetDevice, UanTransducer)
    */
   typedef std::vector<std::pair<Ptr<UanNetDevice>, Ptr<UanTransducer> > > UanDeviceList;
 
+  UanChannel ();           //!< Constructor
+  virtual ~UanChannel ();  //!< Dummy destructor, see DoDispose.
 
-  UanChannel ();
-  virtual ~UanChannel ();
-
-  static TypeId GetTypeId ();
+  /**
+   * Register this type.
+   * \return The object TypeId.
+   */
+  static TypeId GetTypeId (void);
 
-  // Methods inherrited from base class
+  // Inherited methods
   virtual uint32_t GetNDevices (void) const;
   virtual Ptr<NetDevice> GetDevice (uint32_t i) const;
 
   /**
-   * \param src Transducer transmitting packet
-   * \param packet Packet to be transmitted
-   * \param txPowerDb Transmission power in dB
-   * \param txmode UanTxMode defining modulation of transmitted packet
-   * Send a packet out on the channel
+   * Send a packet out on the channel.
+   *
+   * \param src Transducer transmitting packet.
+   * \param packet Packet to be transmitted.
+   * \param txPowerDb Transmission power in dB.
+   * \param txmode UanTxMode defining modulation of transmitted packet.
    */
   void TxPacket  (Ptr<UanTransducer> src, Ptr<Packet> packet, double txPowerDb,
                   UanTxMode txmode);
 
   /**
-   * \param dev Net Device of node
-   * \param trans Transducer of net device attached to this channel
+   * Adds device to receiver list for this channel.
    *
-   * Adds device to receiver list for this channel
+   * \param dev Net Device of node.
+   * \param trans Transducer of net device attached to this channel.
    */
   void AddDevice (Ptr<UanNetDevice> dev, Ptr<UanTransducer> trans);
 
   /**
-   * \param prop Propagation model this channel will use for path loss/propagation delay
+   * Set the propagation model this channel will use
+   * for path loss/propagation delay.
+   *
+   * \param prop The propagation model.
    */
   void SetPropagationModel (Ptr<UanPropModel> prop);
 
   /**
-   * \param noise Noise model this channel will use to determine ambient channel noise.
+   * Set the noise model this channel will use
+   * to determine ambient channel noise.
    *
+   * \param noise The noise model.
    */
   void SetNoiseModel  (Ptr<UanNoiseModel> noise);
 
   /**
-   * \param fKhz Frequency in kHz
-   * \returns Ambient noise in dB/Hz on channel at a frequency
+   * Get the noise level on the channel.
+   *
+   * \param fKhz Frequency in kHz.
+   * \return Ambient noise in dB/Hz on channel at a frequency.
    */
   double GetNoiseDbHz (double fKhz);
 
   /**
-   * Clears all pointer references
-   */
+   * Clear all pointer references. */
   void Clear (void);
 
 private:
-  UanDeviceList m_devList;
-  Ptr<UanPropModel> m_prop;
-  Ptr<UanNoiseModel> m_noise;
-  bool m_cleared;
+  UanDeviceList m_devList;     //!< The list of devices on this channel.
+  Ptr<UanPropModel> m_prop;    //!< The propagation model.
+  Ptr<UanNoiseModel> m_noise;  //!< The noise model.
+  /** Has Clear ever been called on the channel. */
+  bool m_cleared;              
 
+  /**
+   * Send a packet up to the receiving UanTransducer.
+   *
+   * \param i Device number.
+   * \param packet The received packet.
+   * \param rxPowerDb Signal power in dB of arriving packet.
+   * \param txMode Mode arriving packet is using.
+   * \param pdp PDP of arriving signal.
+   */
   void SendUp (uint32_t i, Ptr<Packet> packet, double rxPowerDb, UanTxMode txMode, UanPdp pdp);
+  
 protected:
-  virtual void DoDispose ();
-};
+  virtual void DoDispose (void);
+
+};  // class UanChannel
 
-}
+} // namespace ns3
 
 #endif /* UAN_CHANNEL_H */
diff -Naur ns-3.18.1/src/uan/model/uan-header-common.cc ns-3.19/src/uan/model/uan-header-common.cc
--- ns-3.18.1/src/uan/model/uan-header-common.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-header-common.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon);
+NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon)
+  ;
 
 UanHeaderCommon::UanHeaderCommon ()
 {
diff -Naur ns-3.18.1/src/uan/model/uan-header-common.h ns-3.19/src/uan/model/uan-header-common.h
--- ns-3.18.1/src/uan/model/uan-header-common.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-header-common.h	2013-12-20 09:44:50.000000000 -0800
@@ -29,68 +29,91 @@
 namespace ns3 {
 
 /**
- * \class UanHeaderCommon
+ * \ingroup uan
  *
- * Header includes 1 byte src address, 1 byte dest address,
+ * Common packet header fields.
+ *
+ * Includes 1 byte src address, 1 byte dest address,
  * and a 1 byte type field.
+ *
+ * The type field is protocol specific; see the relevant MAC protocol.
  */
 class UanHeaderCommon : public Header
 {
 public:
+  /** Default constructor */
   UanHeaderCommon ();
   /**
-   * \brief Create UanHeaderCommon object with given source and destination address and header type
-   * \param src Source address defined in header
-   * \param dest Destination address defined in header
-   * \param type Header type
+   * Create UanHeaderCommon object with given source and destination
+   * address and header type
+   *
+   * \param src Source address defined in header.
+   * \param dest Destination address defined in header.
+   * \param type Header type.
    */
   UanHeaderCommon (const UanAddress src, const UanAddress dest, uint8_t type);
+  /** Destructor */
   virtual ~UanHeaderCommon ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * \param dest Address of destination node
+   * Set the destination address.
+   *
+   * \param dest Address of destination node.
    */
   void SetDest (UanAddress dest);
   /**
-   * \param src Address of packet source node
+   * Set the source address.
+   *
+   * \param src Address of packet source node.
    */
   void SetSrc (UanAddress src);
   /**
-   * \param type Value to set 1 byte type field to.  Value has protocol specific meaning
+   * Set the header type.
+   *
+   * Use of this value is protocol specific.
+   * \param type The type value.
    */
   void SetType (uint8_t type);
 
   /**
-   * \returns UanAddress in destination field
+   * Get the destination address.
+   *
+   * \return UanAddress in destination field.
    */
   UanAddress GetDest (void) const;
   /**
-   * \returns UanAddress in source field
+   * Get the source address
+   *
+   * \return UanAddress in source field.
    */
   UanAddress GetSrc (void) const;
   /**
-   * \returns value of type field
+   * Get the header type value.
+   *
+   * \return value of type field.
    */
   uint8_t GetType (void) const;
 
 
-
-  // Inherrited methods
+  // Inherited methods
   virtual uint32_t GetSerializedSize (void) const;
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
   virtual void Print (std::ostream &os) const;
   virtual TypeId GetInstanceTypeId (void) const;
 private:
-  UanAddress m_dest;
-  UanAddress m_src;
-  uint8_t m_type;
-
+  UanAddress m_dest;  //!< The destination address.
+  UanAddress m_src;   //!< The source address.
+  uint8_t m_type;     //!< The type field.
 
-};
+};  // class UanHeaderCommon
 
-}
+} // namespace ns3
 
 #endif /* UAN_HEADER_COMMON_H */
diff -Naur ns-3.18.1/src/uan/model/uan-header-rc.cc ns-3.19/src/uan/model/uan-header-rc.cc
--- ns-3.18.1/src/uan/model/uan-header-rc.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-header-rc.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,11 +25,16 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcData);
-NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcRts);
-NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCtsGlobal);
-NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCts);
-NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcAck);
+NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcData)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcRts)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCtsGlobal)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCts)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcAck)
+  ;
 
 UanHeaderRcData::UanHeaderRcData ()
   : Header (),
diff -Naur ns-3.18.1/src/uan/model/uan-header-rc.h ns-3.19/src/uan/model/uan-header-rc.h
--- ns-3.18.1/src/uan/model/uan-header-rc.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-header-rc.h	2013-12-20 09:44:50.000000000 -0800
@@ -31,42 +31,58 @@
 namespace ns3 {
 
 /**
- * \class UanHeaderRcData
+ * \ingroup uan
  *
- * \brief Extra data header information
+ * Extra data header information.
  *
- * Adds prop. delay measure, and frame number info to
- * transmitted data packet
+ * Adds propagation delay measure, and frame number info to
+ * transmitted data packet.
  */
 class UanHeaderRcData : public Header
 {
 public:
+  /** Default constructor */
   UanHeaderRcData ();
   /**
-   * \param frameNum Data frame # of reservation being transmitted
-   * \param propDelay  Measured propagation delay found in handshaking
-   * \note Prop. delay is transmitted with 16 bits and ms accuracy
+   * Constructor.
+   *
+   * \param frameNum Data frame # of reservation being transmitted.
+   * \param propDelay  Measured propagation delay found in handshaking.
+   * \note Prop. delay is transmitted with 16 bits and ms accuracy.
    */
   UanHeaderRcData (uint8_t frameNum, Time propDelay);
+  /** Destructor */
   virtual ~UanHeaderRcData ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * \param frameNum Data frame # of reservation being transmitted
+   * Set the frame number of the reservation being transmitted.
+   *
+   * \param frameNum The data frame number.
    */
   void SetFrameNo (uint8_t frameNum);
   /**
-   * \param propDelay Measured propagation delay found in handshaking
-   * \note Prop. delay is transmitted with 16 bits and ms accuracy
+   * Set the propagation delay as found in handshaking.
+   *
+   * \param propDelay The measured propagation delay.
+   * \note Prop. delay is transmitted with 16 bits and ms accuracy.
    */
   void SetPropDelay (Time propDelay);
   /**
-   * \returns Data frame # of reservation being transmitted
+   * Get the frame number of the reservation being transmitted.
+   * 
+   * \return The data frame number.
    */
   uint8_t GetFrameNo (void) const;
   /**
-   * \returns Measured propagation delay found in handshaking
+   * Get the propagation delay found in handshaking.
+   * 
+   * \return The measured propagation delay.
    * \note Prop. delay is transmitted with 16 bits and ms accuracy
    */
   Time GetPropDelay (void) const;
@@ -79,75 +95,106 @@
   virtual TypeId GetInstanceTypeId (void) const;
 
 private:
-  uint8_t m_frameNo;
-  Time m_propDelay;
-};
+  uint8_t m_frameNo;  //!< Data frame number.
+  Time m_propDelay;   //!< Propagation delay.
+
+};  // class UanHeaderRcData
 
 /**
- * \class UanHeaderRcRts
+ * \ingroup uan
  *
- * \brief RTS header
+ * RTS header.
  *
- * Contains frame #, retry #, # frames, length, and timestamp
+ * Contains frame number, retry number, number of frames, length, and timestamp.
  */
 class UanHeaderRcRts : public Header
 {
 public:
+  /** Default constructor */
   UanHeaderRcRts ();
   /**
-   * \param frameNo Reservation frame #
-   * \param retryNo Retry # of RTS packet
-   * \param noFrames # of data frames in reservation
-   * \param length # of bytes (including headers) in data
-   * \param ts RTS TX timestamp
-   * \note Timestamp is serialized into 32 bits with ms accuracy
+   * Constructor.
+   *
+   * \param frameNo Reservation frame number.
+   * \param retryNo Retry number of RTS packet.
+   * \param noFrames Number of data frames in reservation.
+   * \param length Number of bytes (including headers) in data.
+   * \param ts RTS TX timestamp.
+   * \note Timestamp is serialized into 32 bits with ms accuracy.
    */
   UanHeaderRcRts (uint8_t frameNo, uint8_t retryNo, uint8_t noFrames, uint16_t length, Time ts);
+  /** Destructor */
   virtual ~UanHeaderRcRts ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * \param fno TX frame #
+   * Set the frame number.
+   *
+   * \param fno TX frame number
    */
   void SetFrameNo (uint8_t fno);
   /**
-   * \param no Number of data frames included in this reservation request
+   * Set the number of data frames included in this reservation request.
+   *
+   * \param no Number of frames.
    */
   void SetNoFrames (uint8_t no);
   /**
-   * \param timeStamp RTS transmission time
+   * Set RTS transmission time.
+   *
+   * \param timeStamp The RTS transmission time.
    */
   void SetTimeStamp (Time timeStamp);
   /**
-   * \param length Total number of data bytes in reservation (including headers)
-   * \note Timestamp is serialized with 32 bits in ms precision
+   * Set the number of data bytes in the reservation.
+   *
+   * \param length Total number of data bytes in reservation (including headers).
+   * \note Timestamp is serialized with 32 bits in ms precision.
    */
   void SetLength (uint16_t length);
   /**
-   * \param no Retry number of this RTS (Used to match timestamp to correctly received RTS)
+   * Set the retry number of this RTS packet.
+   *
+   * This is used to match timestamp to correctly received RTS.
+   *
+   * \param no Retry number.
    */
   void SetRetryNo (uint8_t no);
 
   /**
-   * \returns Frame #
+   * Get the frame number.
+   *
+   * \return The frame number.
    */
   uint8_t GetFrameNo (void) const;
   /**
-   * \returns # of data frames in reservation
+   * Get the number of data frames in the reservation.
+   *
+   * \return The number of data frames.
    */
   uint8_t GetNoFrames (void) const;
   /**
-   * \returns TX time of the RTS packet
-   * \note Timestamp is serialized with 32 bits in ms precision
+   * Get the transmit timestamp of this RTS packet.
+   *
+   * \return The TX time.
+   * \note Timestamp is serialized with 32 bits in ms precision.
    */
   Time GetTimeStamp (void) const;
   /**
-   * \returns Total # of bytes in data packets for reservation (including headers)
+   * Get the total number of bytes in the reservation, including headers.
+   *
+   * \return Total number of bytes in data packets for reservation.
    */
   uint16_t GetLength (void) const;
   /**
-   * \returns Retry number of this RTS packet
+   * Get the retry number of this RTS packet.
+   *
+   * \return The retry number.
    */
   uint8_t GetRetryNo (void) const;
 
@@ -159,71 +206,92 @@
   virtual TypeId GetInstanceTypeId (void) const;
 
 private:
-  uint8_t m_frameNo;
-  uint8_t m_noFrames;
-  uint16_t m_length;
-  Time m_timeStamp;
-  uint8_t m_retryNo;
-};
+  uint8_t m_frameNo;   //!< Reservation frame number.
+  uint8_t m_noFrames;  //!< Number of data frames in reservation.
+  uint16_t m_length;   //!< Number of bytes (including headers) in data.
+  Time m_timeStamp;    //!< RTS TX timestamp.
+  uint8_t m_retryNo;   //!< Retry number of RTS packet.
+
+};  // class UanHeaderRcRts
 
 /**
- * \class UanHeaderRcCtsGlobal
+ * \ingroup uan
+ *
+ * Cycle broadcast information.
  *
- * \brief Cycle broadcast information for
+ * This includes the rate number, retry rate and window time.
  */
-
-
 class UanHeaderRcCtsGlobal : public Header
 {
 public:
-  /**
-   * \brief Create UanHeaderRcCtsGlobal with fields zeroed out
-   */
+  /** Default constructor */
   UanHeaderRcCtsGlobal ();
   /**
-   * \brief Create object with given window time, time stamp, rate, and retry rate.
-   * \param wt Window time
-   * \param ts Timestamp
-   * \param rate Rate number
-   * \param retryRate  Retry rate value
+   * Constructor
+   *
+   * \param wt Window time.
+   * \param ts Timestamp.
+   * \param rate Rate number.
+   * \param retryRate  Retry rate value.
    */
   UanHeaderRcCtsGlobal (Time wt, Time ts, uint16_t rate, uint16_t retryRate);
+  /** Destructor */
   ~UanHeaderRcCtsGlobal ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * \param rate Rate number corresponding to data rate of current cycle
+   * Set the rate number corresponding to data rate of current cycle.
+   * \param rate The rate number.
    */
   void SetRateNum (uint16_t rate);
   /**
-   * \param rate Retry rate number for current cycle
+   * Set the retry rate number for the current cycle.
+   * \param rate The retry rate number
    */
   void SetRetryRate (uint16_t rate);
   /**
-   * \param t Time duration following blocking time to allow RTS transmissions
+   * Set the window time (time duration following blocking time
+   * to allow RTS transmissions).
+   *
+   * \param t The window time.
    */
   void SetWindowTime (Time t);
 
   /**
-   * \param timeStamp Time of CTS transmission
+   * Set the CTS timestamp.
+   *
+   * \param timeStamp The time of CTS transmission.
    */
   void SetTxTimeStamp (Time timeStamp);
 
   /**
-   * \returns Rate # corresponding to data rate of current cycle
+   * Get the data rate number.
+   *
+   * \return The rate number.
    */
   uint16_t GetRateNum (void) const;
   /**
-   * \returns retry rate # of retry rate for current cycle
+   * Get the retry rate number.
+   *
+   * \return The retry rate number.
    */
   uint16_t GetRetryRate (void) const;
   /**
-   * \returns Time duration after blocking time allowed for RTS transmissions
+   * Get the window time (time duration following blocking time
+   * to allow RTS transmissions).
+   *
+   * \return The window time.
    */
   Time GetWindowTime (void) const;
   /**
-   * \returns Timestamp of CTS transmission
+   * Get the CTS transmit timestamp.
+   *
+   * \return The timestamp.
    */
   Time GetTxTimeStamp (void) const;
 
@@ -235,76 +303,106 @@
   virtual TypeId GetInstanceTypeId (void) const;
 
 private:
-  Time m_timeStampTx;
-  Time m_winTime;
-  uint16_t m_retryRate;
-  uint16_t m_rateNum;
-};
+  Time m_timeStampTx;    //!< Timestamp.
+  Time m_winTime;        //!< Window time.
+  uint16_t m_retryRate;  //!< Retry rate.
+  uint16_t m_rateNum;    //!< Rate number.
+
+};  // class UanHeaderRcCtsGlobal
+
 /**
- * \class UanHeaderRcCts
+ * \ingroup uan
  *
- * \brief CTS header
+ * CTS header
  *
  * Includes RTS RX time, CTS TX time, delay until TX, RTS blocking period,
  * RTS tx period, rate #, and retry rate #
  */
-
 class UanHeaderRcCts : public Header
 {
 public:
+  /** Default constructor */
   UanHeaderRcCts ();
   /**
-   * \param frameNo Resrvation frame # being cleared
-   * \param retryNo Retry # of received RTS packet
-   * \param rtsTs RX time of RTS packet at gateway
-   * \param delay Delay until transmission
-   * \param addr Destination of CTS packet
+   * Constructor
+   *
+   * \param frameNo Reservation frame # being cleared.
+   * \param retryNo Retry # of received RTS packet.
+   * \param rtsTs RX time of RTS packet at gateway.
+   * \param delay Delay until transmission.
+   * \param addr Destination of CTS packet.
    * \note Times are serialized, with ms precission, into 32 bit fields.
    */
   UanHeaderRcCts (uint8_t frameNo, uint8_t retryNo, Time rtsTs, Time delay, UanAddress addr);
+  /** Destructor */
   virtual ~UanHeaderRcCts ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * \param frameNo Frame # of RTS being cleared
+   * Set the RTS frame number being cleared.
+   *
+   * \param frameNo The frame number.
    */
   void SetFrameNo (uint8_t frameNo);
   /**
-   * \param timeStamp Time of RTS reception
+   * Set the timestamp for RTS reception.
+   *
+   * \param timeStamp The timestamp.
    */
   void SetRtsTimeStamp (Time timeStamp);
   /**
-   * \param delay Time duration, from CTS TX, before first data frame arrival
+   * Set the time delay from CTS transmission to first data frame arrival.
+   *
+   * \param delay The delay time.
    */
   void SetDelayToTx (Time delay);
   /**
-   * \param no Retry number of RTS frame being cleared
+   * Set the retry number of the RTS frame being cleared.
+   *
+   * \param no The retry number.
    */
   void SetRetryNo (uint8_t no);
   /**
-   * \param addr Destination for scheduling info
+   * Set the destination address, for scheduling info.
+   *
+   * \param addr The destination address.
    */
   void SetAddress (UanAddress addr);
 
   /**
-   * \returns Frame # of RTS being cleared
+   * Get the frame number of the RTS being cleared.
+   *
+   * \return The frame number.
    */
   uint8_t GetFrameNo (void) const;
   /**
-   * \returns RX time of RTS being cleared
+   * Get the receive time of the RTS being cleared.
+   *
+   * \return The RX time.
    */
   Time GetRtsTimeStamp (void) const;
   /**
-   * \returns Delay from TX time of CTS packet until arrival of first data frame
+   * Get the time delay from TX time of CTS packet until
+   * arrival of first data frame.
+   *
+   * \return The delay time. 
    */
   Time GetDelayToTx (void) const;
   /**
-   * \returns Retry # of RTS packet being cleared
+   * Get the retry number of the RTS packet being cleared.
+   *
+   * \return The retry number
    */
   uint8_t GetRetryNo (void) const;
   /**
-   * \returns Destination for scheduling info
+   * Get the destination address, for scheduling info.
+   *
+   * \return The destination address.
    */
   UanAddress GetAddress (void) const;
 
@@ -316,44 +414,62 @@
   virtual TypeId GetInstanceTypeId (void) const;
 
 private:
-  uint8_t m_frameNo;
-  Time m_timeStampRts;
-  uint8_t m_retryNo;
-  Time m_delay;
-  UanAddress m_address;
-};
+  uint8_t m_frameNo;     //!< Reservation frame number being cleared.
+  Time m_timeStampRts;   //!< RX time of RTS packet at gateway.
+  uint8_t m_retryNo;     //!< Retry number of received RTS packet.
+  Time m_delay;          //!< Delay until transmission.
+  UanAddress m_address;  //!< Destination of CTS packet.
+
+};  // class UanHeaderRcCts
 
 /**
- * \class UanHeaderRcAck
- * \brief Header used for ACK packets by protocol ns3::UanMacRc
+ * \ingroup uan
+ *
+ * Header used for ACK packets by protocol UanMacRc
  */
 class UanHeaderRcAck : public Header
 {
 public:
+  /** Default constructor */
   UanHeaderRcAck ();
+  /** Destructor */
   virtual ~UanHeaderRcAck ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * \param frameNo Frame # of reservation being acknowledged
+   * Set the frame number of the reservation being acknowledged.
+   *
+   * \param frameNo The frame number.
    */
   void SetFrameNo (uint8_t frameNo);
   /**
-   * \param frame Data frame # being nacked
+   * NACK a frame.
+   *
+   * \param frame The data frame number being NACKed.
    */
   void AddNackedFrame (uint8_t frame);
 
   /**
-   * \returns Set of nacked frames
+   * Get the set of NACK'ed frames.
+   *
+   * \return The set of NACK'ed frames.
    */
   const std::set<uint8_t> &GetNackedFrames (void) const;
   /**
-   * \returns Reservation frame # being acknowledged.
+   * Get the reservation frame number being ACKed.
+   *
+   * \return The frame number.
    */
   uint8_t GetFrameNo (void) const;
   /**
-   * \returns Number of data frames being NACKED
+   * Get the number of data frames being NACKed.
+   *
+   * \return The number of NACKed frames.
    */
   uint8_t GetNoNacks (void) const;
 
@@ -365,11 +481,11 @@
   virtual TypeId GetInstanceTypeId (void) const;
 
 private:
-  uint8_t m_frameNo;
-  std::set<uint8_t> m_nackedFrames;
+  uint8_t m_frameNo;                 //!< Next frame number.
+  std::set<uint8_t> m_nackedFrames;  //!< Marker for nacked frames.
 
-};
+};  // class UanHeaderRcAck
 
-}
+} // namespace ns3
 
 #endif /* UAN_HEADER_RC_H */
diff -Naur ns-3.18.1/src/uan/model/uan-mac-aloha.cc ns-3.19/src/uan/model/uan-mac-aloha.cc
--- ns-3.18.1/src/uan/model/uan-mac-aloha.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac-aloha.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,7 +32,8 @@
 namespace ns3
 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanMacAloha);
+NS_OBJECT_ENSURE_REGISTERED (UanMacAloha)
+  ;
 
 UanMacAloha::UanMacAloha ()
   : UanMac (),
diff -Naur ns-3.18.1/src/uan/model/uan-mac-aloha.h ns-3.19/src/uan/model/uan-mac-aloha.h
--- ns-3.18.1/src/uan/model/uan-mac-aloha.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac-aloha.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,22 +32,29 @@
 class UanTxMode;
 
 /**
- * \class UanMacAloha
- * \brief ALOHA MAC Protocol
+ * \ingroup uan
  *
- * The simplest MAC protocol for wireless networks.  Packets enqueued
- * are immediately transmitted.  This MAC attaches a UanHeaderCommon
- * to outgoing packets for address information.  (The type field is not used)
+ * ALOHA MAC Protocol, the simplest MAC protocol for wireless networks.
+ *
+ * Packets enqueued are immediately transmitted.  This MAC attaches
+ * a UanHeaderCommon to outgoing packets for address information.
+ * (The type field is not used)
  */
 class UanMacAloha : public UanMac
 {
 public:
+  /** Default constructor */
   UanMacAloha ();
+  /** Dummy destructor, see DoDispose. */
   virtual ~UanMacAloha ();
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
 
-  //Inheritted functions
+  // Inherited methods
   Address GetAddress (void);
   virtual void SetAddress (UanAddress addr);
   virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);
@@ -55,41 +62,39 @@
   virtual void AttachPhy (Ptr<UanPhy> phy);
   virtual Address GetBroadcast (void) const;
   virtual void Clear (void);
-
- /**
-  * Assign a fixed random variable stream number to the random variables
-  * used by this model.  Return the number of streams (possibly zero) that
-  * have been assigned.
-  *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
-  */
   int64_t AssignStreams (int64_t stream);
 
 private:
+  /** The MAC address. */
   UanAddress m_address;
+  /** PHY layer attached to this MAC. */
   Ptr<UanPhy> m_phy;
+  /** Forwarding up callback. */
   Callback<void, Ptr<Packet>, const UanAddress& > m_forUpCb;
+  /** Flag when we've been cleared. */
   bool m_cleared;
 
   /**
-   * \brief Receive packet from lower layer (passed to PHY as callback)
-   * \param pkt Packet being received
-   * \param sinr SINR of received packet
-   * \param txMode Mode of received packet
+   * Receive packet from lower layer (passed to PHY as callback).
+   *
+   * \param pkt Packet being received.
+   * \param sinr SINR of received packet.
+   * \param txMode Mode of received packet.
    */
   void RxPacketGood (Ptr<Packet> pkt, double sinr, UanTxMode txMode);
 
   /**
-   * \brief Packet received at lower layer in error
-   * \param pkt Packet received in error
-   * \param sinr SINR of received packet
+   * Packet received at lower layer in error.
+   *
+   * \param pkt Packet received in error.
+   * \param sinr SINR of received packet.
    */
   void RxPacketError (Ptr<Packet> pkt, double sinr);
 protected:
   virtual void DoDispose ();
-};
 
-}
+};  // class UanMacAloha
+
+} // namespace ns3
 
 #endif /* UAN_MAC_ALOHA_H */
diff -Naur ns-3.18.1/src/uan/model/uan-mac.cc ns-3.19/src/uan/model/uan-mac.cc
--- ns-3.18.1/src/uan/model/uan-mac.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanMac);
+NS_OBJECT_ENSURE_REGISTERED (UanMac)
+  ;
 
 TypeId UanMac::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/uan/model/uan-mac-cw.cc ns-3.19/src/uan/model/uan-mac-cw.cc
--- ns-3.18.1/src/uan/model/uan-mac-cw.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac-cw.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanMacCw);
+NS_OBJECT_ENSURE_REGISTERED (UanMacCw)
+  ;
 
 UanMacCw::UanMacCw ()
   : UanMac (),
@@ -80,23 +81,23 @@
     .SetParent<Object> ()
     .AddConstructor<UanMacCw> ()
     .AddAttribute ("CW",
-                   "The MAC parameter CW",
+                   "The MAC parameter CW.",
                    UintegerValue (10),
                    MakeUintegerAccessor (&UanMacCw::m_cw),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("SlotTime",
-                   "Time slot duration for MAC backoff",
+                   "Time slot duration for MAC backoff.",
                    TimeValue (MilliSeconds (20)),
                    MakeTimeAccessor (&UanMacCw::m_slotTime),
                    MakeTimeChecker ())
     .AddTraceSource ("Enqueue",
-                     "A packet arrived at the MAC for transmission",
+                     "A packet arrived at the MAC for transmission.",
                      MakeTraceSourceAccessor (&UanMacCw::m_enqueueLogger))
     .AddTraceSource ("Dequeue",
-                     "A was passed down to the PHY from the MAC",
+                     "A was passed down to the PHY from the MAC.",
                      MakeTraceSourceAccessor (&UanMacCw::m_dequeueLogger))
     .AddTraceSource ("RX",
-                     "A packet was destined for this MAC and was received",
+                     "A packet was destined for this MAC and was received.",
                      MakeTraceSourceAccessor (&UanMacCw::m_rxLogger))
 
   ;
diff -Naur ns-3.18.1/src/uan/model/uan-mac-cw.h ns-3.19/src/uan/model/uan-mac-cw.h
--- ns-3.18.1/src/uan/model/uan-mac-cw.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac-cw.h	2013-12-20 09:44:50.000000000 -0800
@@ -32,40 +32,57 @@
 namespace ns3 {
 
 /**
- * \class UanMacCw
- * \brief CW-MAC A MAC protocol similar in idea to the 802.11 DCF with constant backoff window
+ * \ingroup uan
+ *
+ * CW-MAC protocol, similar in idea to the 802.11 DCF with
+ * constant backoff window
  *
  * For more information on this MAC protocol, see:
  * Parrish, N.; Tracy, L.; Roy, S.; Arabshahi, P.; Fox, W.,
- * "System Design Considerations for Undersea Networks: Link and Multiple Access Protocols,"
- * Selected Areas in Communications, IEEE Journal on , vol.26, no.9, pp.1720-1730, December 2008
+ * "System Design Considerations for Undersea Networks: Link and
+ * Multiple Access Protocols," Selected Areas in Communications,
+ * IEEE Journal on , vol.26, no.9, pp.1720-1730, December 2008
  */
 class UanMacCw : public UanMac,
                  public UanPhyListener
 {
 public:
+  /** Default constructor */
   UanMacCw ();
+  /** Dummy destructor, DoDispose. */
   virtual ~UanMacCw ();
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * \param cw Contention window size
+   * Set the contention window size.
+   *   
+   * \param cw Contention window size.
    */
   virtual void SetCw (uint32_t cw);
   /**
-   * \param duration Slot time duration
+   * Set the slot time duration.
+   *
+   * \param duration Slot time duration.
    */
   virtual void SetSlotTime (Time duration);
   /**
-   * \returns Contention window size
+   * Get the contention window size.
+   *
+   * \return Contention window size.
    */
   virtual uint32_t GetCw (void);
   /**
-   * \returns slot time duration
+   * Get the slot time duration.
+   *
+   * \return Slot time duration.
    */
   virtual Time GetSlotTime (void);
 
-  // Inherited methods
+  // Inherited methods from UanMac
   virtual Address GetAddress ();
   virtual void SetAddress (UanAddress addr);
   virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);
@@ -73,71 +90,94 @@
   virtual void AttachPhy (Ptr<UanPhy> phy);
   virtual Address GetBroadcast (void) const;
   virtual void Clear (void);
+  int64_t AssignStreams (int64_t stream);
 
-  // PHY listeners
-  /// Function called by UanPhy object to notify of packet reception
+  // Inherited methods from UanPhyListener
   virtual void NotifyRxStart (void);
-  /// Function called by UanPhy object to notify of packet received successfully
   virtual void NotifyRxEndOk (void);
-  /// Function called by UanPhy object to notify of packet received in error
   virtual void NotifyRxEndError (void);
-  /// Function called by UanPhy object to notify of channel sensed busy
   virtual void NotifyCcaStart (void);
-  /// Function called by UanPhy object to notify of channel no longer sensed busy
   virtual void NotifyCcaEnd (void);
-  /// Function called by UanPhy object to notify of outgoing transmission start
   virtual void NotifyTxStart (Time duration);
 
- /**
-  * Assign a fixed random variable stream number to the random variables
-  * used by this model.  Return the number of streams (possibly zero) that
-  * have been assigned.
-  *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
-  */
-  int64_t AssignStreams (int64_t stream);
 
 private:
+  /** Enum defining possible Phy states. */
   typedef enum {
-    IDLE, CCABUSY, RUNNING, TX
+    IDLE,     //!< Idle state.
+    CCABUSY,  //!< Channel busy.
+    RUNNING,  //!< Delay timer running.
+    TX        //!< Transmitting.
   } State;
 
+  /** Forwarding up callback. */
   Callback <void, Ptr<Packet>, const UanAddress& > m_forwardUpCb;
+  /** The MAC address. */
   UanAddress m_address;
+  /** PHY layer attached to this MAC. */
   Ptr<UanPhy> m_phy;
+  /** A packet destined for this MAC was received. */
   TracedCallback<Ptr<const Packet>, UanTxMode > m_rxLogger;
+  /** A packet arrived at the MAC for transmission. */
   TracedCallback<Ptr<const Packet>, uint16_t  > m_enqueueLogger;
+  /** A packet was passed down to the PHY from the MAC. */
   TracedCallback<Ptr<const Packet>, uint16_t  > m_dequeueLogger;
 
   // Mac parameters
-  uint32_t m_cw;
-  Time m_slotTime;
+  uint32_t m_cw;        //!< Contention window size.
+  Time m_slotTime;      //!< Slot time duration.
 
   // State variables
+  /** Time to send next packet. */
   Time m_sendTime;
+  /** Remaining delay until next send. */
   Time m_savedDelayS;
+  /** Next packet to send. */
   Ptr<Packet> m_pktTx;
+  /** Next packet protocol number (usage varies by MAC). */
   uint16_t m_pktTxProt;
+  /** Scheduled SendPacket event. */
   EventId m_sendEvent;
+  /** Scheduled EndTx event. */
   EventId m_txEndEvent;
+  /** Current state. */
   State m_state;
 
+  /** Flag when we've been cleared */
   bool m_cleared;
 
-  /// Provides uniform random variables.
+  /** Provides uniform random variable for contention window. */
   Ptr<UniformRandomVariable> m_rv;
 
+  /**
+   * Receive packet from lower layer (passed to PHY as callback).
+   *
+   * \param packet Packet being received.
+   * \param sinr SINR of received packet.
+   * \param mode Mode of received packet.
+   */
   void PhyRxPacketGood (Ptr<Packet> packet, double sinr, UanTxMode mode);
+  /**
+   * Packet received at lower layer in error.
+   *
+   * \param packet Packet received in error.
+   * \param sinr SINR of received packet.
+   */
   void PhyRxPacketError (Ptr<Packet> packet, double sinr);
+  /** Cancel SendEvent and save remaining delay. */
   void SaveTimer (void);
+  /** Schedule SendPacket after delay. */
   void StartTimer (void);
+  /** Send packet on PHY. */
   void SendPacket (void);
+  /** End TX state. */
   void EndTx (void);
+
 protected:
   virtual void DoDispose ();
-};
 
-}
+};  // class UanMacCw
+
+} // namespace ns3
 
 #endif /* UAN_MAC_CW_H */
diff -Naur ns-3.18.1/src/uan/model/uan-mac.h ns-3.19/src/uan/model/uan-mac.h
--- ns-3.18.1/src/uan/model/uan-mac.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac.h	2013-12-20 09:44:50.000000000 -0800
@@ -40,55 +40,69 @@
 
 
 /**
- * \class UanMac
+ * \ingroup uan
  *
- * \brief Virtual base class for all UAN MAC protocols
+ * Virtual base class for all UAN MAC protocols.
  */
 class UanMac : public Object
 {
 public:
-  static TypeId GetTypeId (void);
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
+   static TypeId GetTypeId (void);
 
   /**
-   * \returns MAC Address
+   * Get the MAC Address.
+   *
+   * \return MAC Address.
    */
   virtual Address GetAddress (void) = 0;
 
   /**
-   * \param addr UanAddress for this MAC
+   * Set the address.
+   *
+   * \param addr UanAddress for this MAC.
    */
   virtual void SetAddress (UanAddress addr) = 0;
 
   /**
-   * Enqueue packet to be transmitted
-   * \param pkt Packet to be transmitted
-   * \param dest Destination address
-   * \param protocolNumber Protocol #.  Usage varies by MAC
+   * Enqueue packet to be transmitted.
+   *
+   * \param pkt Packet to be transmitted.
+   * \param dest Destination address.
+   * \param protocolNumber Protocol number.  Usage varies by MAC.
+   * \return True if packet was successfully enqueued.
    */
   virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber) = 0;
   /**
-   * \param cb  Callback to be called when a packet is forwarded up to higher layer
+   * Set the callback to forward packets up to higher layers.
+   * 
+   * \param cb The callback.
+   * \pname{packet} The packet.
+   * \pname{address} The source address.
    */
   virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress&> cb) = 0;
 
   /**
    * Attach PHY layer to this MAC.
+   *
    * Some MACs may be designed to work with multiple PHY
    * layers.  Others may only work with one.
    *
-   * \param phy Phy layer to attach to this MAC
-   *
+   * \param phy Phy layer to attach to this MAC.
    */
   virtual void AttachPhy (Ptr<UanPhy> phy) = 0;
 
   /**
-   * \returns Broadcast address
+   * Get the broadcast address.
+   *
+   * \return The broadcast address.
    */
   virtual Address GetBroadcast (void) const = 0;
 
-  /**
-   * Clears all pointer references
-   */
+  /** Clears all pointer references. */
   virtual void Clear (void) = 0;
 
  /**
@@ -96,13 +110,13 @@
   * used by this model.  Return the number of streams (possibly zero) that
   * have been assigned.
   *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
+  * \param stream First stream index to use.
+  * \return The number of stream indices assigned by this model.
   */
   virtual int64_t AssignStreams (int64_t stream) = 0;
 
-};
+};  // class UanMac
 
-}
+} // namespace ns3
 
 #endif /* UAN_MAC_H */
diff -Naur ns-3.18.1/src/uan/model/uan-mac-rc.cc ns-3.19/src/uan/model/uan-mac-rc.cc
--- ns-3.18.1/src/uan/model/uan-mac-rc.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac-rc.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,8 @@
 NS_LOG_COMPONENT_DEFINE ("UanMacRc");
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanMacRc);
+NS_OBJECT_ENSURE_REGISTERED (UanMacRc)
+  ;
 
 Reservation::Reservation ()
   : m_length (0),
@@ -210,53 +211,53 @@
     .SetParent<UanMac> ()
     .AddConstructor<UanMacRc> ()
     .AddAttribute ("RetryRate",
-                   "Number of retry attempts per second (of RTS/GWPING)",
+                   "Number of retry attempts per second (of RTS/GWPING).",
                    DoubleValue (1 / 5.0),
                    MakeDoubleAccessor (&UanMacRc::m_retryRate),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("MaxFrames",
-                   "Maximum number of frames to include in a single RTS",
+                   "Maximum number of frames to include in a single RTS.",
                    UintegerValue (1),
                    MakeUintegerAccessor (&UanMacRc::m_maxFrames),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("QueueLimit",
-                   "Maximum packets to queue at MAC",
+                   "Maximum packets to queue at MAC.",
                    UintegerValue (10),
                    MakeUintegerAccessor (&UanMacRc::m_queueLimit),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("SIFS",
-                   "Spacing to give between frames (this should match gateway)",
+                   "Spacing to give between frames (this should match gateway).",
                    TimeValue (Seconds (0.2)),
                    MakeTimeAccessor (&UanMacRc::m_sifs),
                    MakeTimeChecker ())
     .AddAttribute ("NumberOfRates",
-                   "Number of rate divisions supported by each PHY",
+                   "Number of rate divisions supported by each PHY.",
                    UintegerValue (0),
                    MakeUintegerAccessor (&UanMacRc::m_numRates),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("MinRetryRate",
-                   "Smallest allowed RTS retry rate",
+                   "Smallest allowed RTS retry rate.",
                    DoubleValue (0.01),
                    MakeDoubleAccessor (&UanMacRc::m_minRetryRate),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("RetryStep",
-                   "Retry rate increment",
+                   "Retry rate increment.",
                    DoubleValue (0.01),
                    MakeDoubleAccessor (&UanMacRc::m_retryStep),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("MaxPropDelay",
-                   "Maximum possible propagation delay to gateway",
+                   "Maximum possible propagation delay to gateway.",
                    TimeValue (Seconds (2)),
                    MakeTimeAccessor (&UanMacRc::m_learnedProp),
                    MakeTimeChecker ())
     .AddTraceSource ("Enqueue",
-                     "A  (data) packet arrived at MAC for transmission",
+                     "A  (data) packet arrived at MAC for transmission.",
                      MakeTraceSourceAccessor (&UanMacRc::m_enqueueLogger))
     .AddTraceSource ("Dequeue",
-                     "A  (data) packet was passed down to PHY from MAC",
+                     "A  (data) packet was passed down to PHY from MAC.",
                      MakeTraceSourceAccessor (&UanMacRc::m_dequeueLogger))
     .AddTraceSource ("RX",
-                     "A packet was destined for and received at this MAC layer",
+                     "A packet was destined for and received at this MAC layer.",
                      MakeTraceSourceAccessor (&UanMacRc::m_rxLogger))
   ;
   return tid;
diff -Naur ns-3.18.1/src/uan/model/uan-mac-rc-gw.cc ns-3.19/src/uan/model/uan-mac-rc-gw.cc
--- ns-3.18.1/src/uan/model/uan-mac-rc-gw.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac-rc-gw.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,14 +43,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanMacRcGw);
-
-bool
-operator < (UanAddress &a, UanAddress &b)
-{
-  return a.GetAsInt () < b.GetAsInt ();
-}
-
+NS_OBJECT_ENSURE_REGISTERED (UanMacRcGw)
+  ;
 
 UanMacRcGw::UanMacRcGw ()
   : UanMac (),
@@ -113,60 +107,60 @@
     .SetParent<UanMac> ()
     .AddConstructor<UanMacRcGw> ()
     .AddAttribute ("MaxReservations",
-                   "Maximum number of reservations to accept per cycle",
+                   "Maximum number of reservations to accept per cycle.",
                    UintegerValue (10),
                    MakeUintegerAccessor (&UanMacRcGw::m_maxRes),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("NumberOfRates",
-                   "Number of rates per Phy layer",
+                   "Number of rates per Phy layer.",
                    UintegerValue (1023),
                    MakeUintegerAccessor (&UanMacRcGw::m_numRates),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("MaxPropDelay",
-                   "Maximum propagation delay between gateway and non-gateway nodes",
+                   "Maximum propagation delay between gateway and non-gateway nodes.",
                    TimeValue (Seconds (2)),
                    MakeTimeAccessor (&UanMacRcGw::m_maxDelta),
                    MakeTimeChecker ())
     .AddAttribute ("SIFS",
-                   "Spacing between frames to account for timing error and processing delay",
+                   "Spacing between frames to account for timing error and processing delay.",
                    TimeValue (Seconds (0.2)),
                    MakeTimeAccessor (&UanMacRcGw::m_sifs),
                    MakeTimeChecker ())
     .AddAttribute ("NumberOfNodes",
-                   "Number of non-gateway nodes in this gateway's neighborhood",
+                   "Number of non-gateway nodes in this gateway's neighborhood.",
                    UintegerValue (10),
                    MakeUintegerAccessor (&UanMacRcGw::m_numNodes),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("MinRetryRate",
-                   "Smallest allowed RTS retry rate",
+                   "Smallest allowed RTS retry rate.",
                    DoubleValue (0.01),
                    MakeDoubleAccessor (&UanMacRcGw::m_minRetryRate),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("RetryStep",
-                   "Retry rate increment",
+                   "Retry rate increment.",
                    DoubleValue (0.01),
                    MakeDoubleAccessor (&UanMacRcGw::m_retryStep),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("TotalRate",
-                   "Total available channel rate in bps (for a single channel, without splitting reservation channel)",
+                   "Total available channel rate in bps (for a single channel, without splitting reservation channel).",
                    UintegerValue (4096),
                    MakeUintegerAccessor (&UanMacRcGw::m_totalRate),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("RateStep",
-                   "Increments available for rate assignment in bps",
+                   "Increments available for rate assignment in bps.",
                    UintegerValue (4),
                    MakeUintegerAccessor (&UanMacRcGw::m_rateStep),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("FrameSize",
-                   "Size of data frames in bytes",
+                   "Size of data frames in bytes.",
                    UintegerValue (1000),
                    MakeUintegerAccessor (&UanMacRcGw::m_frameSize),
                    MakeUintegerChecker<uint32_t> ())
     .AddTraceSource ("RX",
-                     "A packet was destined for and received at this MAC layer",
+                     "A packet was destined for and received at this MAC layer.",
                      MakeTraceSourceAccessor (&UanMacRcGw::m_rxLogger))
     .AddTraceSource ("Cycle",
-                     "Trace cycle statistics",
+                     "Trace cycle statistics.",
                      MakeTraceSourceAccessor (&UanMacRcGw::m_cycleLogger))
 
   ;
diff -Naur ns-3.18.1/src/uan/model/uan-mac-rc-gw.h ns-3.19/src/uan/model/uan-mac-rc-gw.h
--- ns-3.18.1/src/uan/model/uan-mac-rc-gw.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac-rc-gw.h	2013-12-20 09:44:50.000000000 -0800
@@ -38,11 +38,9 @@
 class UanTxMode;
 
 /**
- * \class UanMacRcGw
- *
- * \brief Gateway side of RC-MAC
- *
+ * \ingroup uan
  *
+ * Gateway side of RC-MAC.
  *
  * This MAC protocol assumes a network topology where all traffic
  * is destined for a set of GW nodes which are connected via
@@ -56,16 +54,19 @@
  * lentracy@u.washington.edu
  * (This work is, as of yet, unpublished)
  */
-
 class UanMacRcGw : public UanMac
 {
 public:
-  UanMacRcGw ();
-  virtual ~UanMacRcGw ();
+  UanMacRcGw ();           //!< Constructor
+  virtual ~UanMacRcGw ();  //!< Dummy destructor, see DoDispose.
 
+  /**
+   * Register this type.
+   * \return The type ID.
+   */
   static TypeId GetTypeId (void);
 
-  // Inherited virtual functions
+  // Inherited methods
   virtual Address GetAddress (void);
   virtual void SetAddress (UanAddress addr);
   virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);
@@ -73,103 +74,206 @@
   virtual void AttachPhy (Ptr<UanPhy> phy);
   virtual Address GetBroadcast (void) const;
   virtual void Clear (void);
-
- /**
-  * Assign a fixed random variable stream number to the random variables
-  * used by this model.  Return the number of streams (possibly zero) that
-  * have been assigned.
-  *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
-  */
   int64_t AssignStreams (int64_t stream);
 
 private:
+  /** Gateway state. */
   enum State {
-    IDLE, INCYCLE, CTSING
+    IDLE,     //!< Initial idle state.
+    INCYCLE,  //!< Cycling through nodes.
+    CTSING    //!< Sending CTS.
   };
-  State m_state;
+  State m_state;  //!< Gateway processing state.
 
+  /**
+   * \ingroup uan
+   * Reservation request.
+   */
   struct Request
   {
-    uint8_t numFrames;
-    uint8_t frameNo;
-    uint8_t retryNo;
-    uint16_t length;
-    Time rxTime;
+    uint8_t numFrames;  //!< Number of frames.
+    uint8_t frameNo;    //!< Current frame number.
+    uint8_t retryNo;    //!< Retry number.
+    uint16_t length;    //!< Request header length.
+    Time rxTime;        //!< Time request received.
   };
 
+  /**
+   * \ingroup uan
+   * Packet ACK data.
+   */
   struct AckData
   {
-    uint8_t frameNo;
-    std::set<uint8_t> rxFrames;
-    uint8_t expFrames;
+    uint8_t frameNo;    //!< Frame number being ACK'ed.
+    std::set<uint8_t> rxFrames;  //!< Received frames.
+    uint8_t expFrames;  //!< Expected number of frames.
   };
+  /** Forwarding up callback. */
   Callback<void, Ptr<Packet>, const UanAddress& > m_forwardUpCb;
-  Ptr<UanPhy> m_phy;
-  UanAddress m_address;
-  Time m_maxDelta;
-  Time m_sifs;
-  uint32_t m_maxRes;
-  uint32_t m_numRates;
-  uint32_t m_rtsSize;
-  uint32_t m_ctsSizeN;
-  uint32_t m_ctsSizeG;
-  uint32_t m_ackSize;
-  uint16_t m_currentRetryRate;
-  uint32_t m_currentRateNum;
-  uint32_t m_numNodes;
-  uint32_t m_totalRate;
-  uint32_t m_rateStep;
-  uint32_t m_frameSize;
+  
+  Ptr<UanPhy> m_phy;            //!< PHY layer attached to this MAC.
+  UanAddress m_address;         //!< The MAC address.
+  Time m_maxDelta;              //!< Maximum propagation delay between gateway and non-gateway nodes .
+  Time m_sifs;                  //!< Spacing between frames to account for timing error and processing delay.
+  uint32_t m_maxRes;            //!< Maximum number of reservations to accept per cycle.
+  uint32_t m_numRates;          //!< Number of rates per Phy layer.
+  uint32_t m_rtsSize;           //!< Size of UanHeaderCommon and UanHeaderRcRts.
+  uint32_t m_ctsSizeN;          //!< Size of UanHeaderRcCts.
+  uint32_t m_ctsSizeG;          //!< Size of UanHeaderCommon and UanHeaderRcCtsGlobal.
+  uint32_t m_ackSize;           //!< Size of UanHeaderCommon and UanHeaderRcAck.
+  uint16_t m_currentRetryRate;  //!< Retry rate number for current cycle.
+  uint32_t m_currentRateNum;    //!< Rate number corresponding to data rate of current cycle.
+  uint32_t m_numNodes;          //!< Number of non-gateway nodes in this gateway's neighborhood.
+  uint32_t m_totalRate;         //!< Total available channel rate in bps (for a single channel, without splitting reservation channel).
+  uint32_t m_rateStep;          //!< Increments available for rate assignment in bps.
+  uint32_t m_frameSize;         //!< Size of data frames in bytes.
 
-  double m_minRetryRate;
-  double m_retryStep;
+  double m_minRetryRate;        //!< Smallest allowed RTS retry rate.
+  double m_retryStep;           //!< Retry rate increment.
 
+  /** Propagation delay to each node. */
   std::map<UanAddress, Time> m_propDelay;
 
+  /** AckData for each node. */
   std::map<UanAddress, AckData> m_ackData;
 
-
+  /** Request for each node. */
   std::map<UanAddress, Request> m_requests;
+  /** Queued request times. */
   std::set<std::pair<Time, UanAddress> > m_sortedRes;
 
+  /** Flag when we've been cleared. */
   bool m_cleared;
 
+  /** A packet was destined for and received at this MAC layer. */
   TracedCallback<Ptr<const Packet>, UanTxMode > m_rxLogger;
 
-  // Start time, min p-delay, reservations, frames, bytes, window size, ctl rate, retry rate
+  /**
+   * A packet was destined for and received at this MAC layer.
+   *
+   * \pname{Start time}
+   * \pname{min propagation delay}
+   * \pname{reservations}
+   * \pname{frames}
+   * \pname{bytes}
+   * \pname{window size}
+   * \pname{CTS rate}
+   * \pname{retry rate}
+   */
   TracedCallback<Time, Time, uint32_t, uint32_t, double, uint32_t, double> m_cycleLogger;
 
+  /**
+   * PHY recieve ok callback.
+   *
+   * \param pkt The Packet to receive
+   * \param sinr The SINR on the channel
+   * \param mode The transmission mode
+   */
   void ReceivePacket (Ptr<Packet> pkt, double sinr, UanTxMode mode);
+
+  /** Cycle through pending requests. */
   void StartCycle (void);
+  /** End cycle by scheduling pending ACKs. */
   void EndCycle (void);
+  /**
+   * Send packet on PHY.
+   *
+   * \param pkt The Packet.
+   * \param rate The UanTxMode number, m_currentRateNum.
+   */
   void SendPacket (Ptr<Packet> pkt, uint32_t rate);
+  /** Set state to INCYCLE. */
   void CycleStarted (void);
+  /**
+   * PHY receive error callback.
+   *
+   * \param pkt The failed packet.
+   * \param sinr The SINR value on the channel.
+   */
   void ReceiveError (Ptr<Packet> pkt, double sinr);
 
   // Stuff for computing exp throughput
-  double ComputeAlpha (uint32_t totalFrames, uint32_t totalBytes, uint32_t n, uint32_t a, double deltaK);
+  /**
+   * Compute alpha parameter.
+   *
+   * \param totalFrames Total number of frames in m_requests.
+   * \param totalBytes Total number of bytes in m_requests.
+   * \param n Number of nodes.
+   * \param a m_maxRes, or optimal A value.
+   * \param deltaK Propagation delay.
+   * \return Alpha parameter.
+   */
+   double ComputeAlpha (uint32_t totalFrames, uint32_t totalBytes, uint32_t n, uint32_t a, double deltaK);
+  /**
+   * Get the expected propagation delay to each node.
+   *
+   * \return Vector of expected propagation delays.
+   */
   std::vector<double>  GetExpPdk (void);
+  /**
+   * Throughput for \pname{a} reservations with framesize \pname{ld},
+   * given expected delays exppdk.
+   *
+   * \param a Number of reservations.
+   * \param ld Frame size.
+   * \param exppdk Expected delays, given by GetExpPdk.
+   * \return Expected throughput.
+   */
   double ComputeExpS (uint32_t a, uint32_t ld, std::vector<double> exppdk);
+  /**
+   * Throughput for \pname{a} reservations with framesize \pname{ld}.
+   *
+   * \param a Number of reservations.
+   * \param ld Frame size.
+   * \return Expected throughput.
+   */
   double ComputeExpS (uint32_t a, uint32_t ld);
+  /**
+   * Index to the k'th expected delay among n nodes.
+   *
+   * \param n Number of nodes.
+   * \param k Target index.
+   * \return The expected index.
+   */
   uint32_t CompExpMinIndex (uint32_t n, uint32_t k);
+  /**
+   * Numeric function.
+   *
+   * \param a Number of reservations.
+   * \param n number of nodes.
+   * \param k K'th node.
+   * \return Value.
+   */
   double ComputePiK (uint32_t a, uint32_t n, uint32_t k);
+  /**
+   * Numeric function.
+   *
+   * \param n Number of nodes.
+   * \param a Number of reservations.
+   * \param ldlh Sum of common header length and frame size.
+   * \param deltaK Result of GetExpPdk
+   * \return value.
+   */
   double ComputeExpBOverA (uint32_t n, uint32_t a, uint32_t ldlh, std::vector<double> deltaK);
+  /**
+   * Binomial coefficient.
+   *
+   * \param n Pool size.
+   * \param k Selection size.
+   * \return Binomial coefficient n choose k.
+   */
   uint64_t NchooseK (uint32_t n, uint32_t k);
+  /**
+   * Compute the optimum maximum number of reservations to accept per cycle.
+   *
+   * \return Optimum number.
+   */
   uint32_t FindOptA (void);
 protected:
   virtual void DoDispose ();
 
-};
-
-/**
- * \brief Defined for use in UanMacRcGw
- * \param a Address to compare
- * \param b Address to compare
- */
-bool operator < (UanAddress &a, UanAddress &b);
+};  // class UanMacRcGw
 
-}
+} // namespace ns3
 
 #endif /* UAN_MAC_RC_GW_H */
diff -Naur ns-3.18.1/src/uan/model/uan-mac-rc.h ns-3.19/src/uan/model/uan-mac-rc.h
--- ns-3.18.1/src/uan/model/uan-mac-rc.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-mac-rc.h	2013-12-20 09:44:50.000000000 -0800
@@ -46,84 +46,110 @@
 
 
 /**
- * \class Reservation
- * \brief Stores reservation info for use in scheduling data channel by reservation channel MAC
+ * Stores reservation info for use in scheduling data channel
+ * by reservation channel MAC.
  */
 class Reservation
 {
 public:
-  /**
-   * \brief Create empty object with default values
-   */
+  /** Default constructor. */
   Reservation ();
   /**
-   * \brief Create Reservation object with given packet list, frame number and max packets
-   * \param list List of packets for assigned to reservation
-   * \param frameNo Frame number of reservation transmission
-   * \param maxPkts Maximum number of packets to assign to reservation from packet list (0 = no maximum)
+   * Create Reservation object with given packet list,
+   * frame number and max packets.
+   * 
+   * \param list List of packets for assigned to reservation.
+   * \param frameNo Frame number of reservation transmission.
+   * \param maxPkts Maximum number of packets to assign to reservation
+   *   from packet list (0 = no maximum).
    */
   Reservation (std::list<std::pair <Ptr<Packet>, UanAddress > > &list, uint8_t frameNo, uint32_t maxPkts = 0);
+  /** Destructor */
   ~Reservation ();
   /**
-   * \returns number of frames in reservation
+   * Get the number of frames in this Reservation.
+   *
+   * \return Number of frames.
    */
   uint32_t GetNoFrames () const;
   /**
-   * \returns total byte length of reservation (sum of all packets with headers)
+   * Get the total length of the Reservation.
+   *
+   * This is the sum of packets with headers.
+   *
+   * \return Total length, in bytes.
    */
   uint32_t GetLength () const;
   /**
-   * \returns reference to list of packets in this reservation
+   * Get the list of packets.
+   *
+   * \return The list of packets.
    */
   const std::list<std::pair <Ptr<Packet>, UanAddress > > &GetPktList (void) const;
   /**
-   * \returns Frame number of reservation
+   * Get the frame number.
+   * 
+   * \return The frame number.
    */
   uint8_t GetFrameNo () const;
   /**
-   * \returns Retry number of reservation
+   * Get the retry number.
+   *
+   * \return The retry number.
    */
   uint8_t GetRetryNo () const;
   /**
-   * \returns Timestamp nth RTS send for this reservation
-   * \param n Timestamp for retry number n to return
+   * Get the timestamp for the n'th RTS.
+   *
+   * \param n Which retry number.
+   * \return N'th timestamp.
    */
   Time GetTimestamp (uint8_t n) const;
-  /**
-   * \returns True if reservation packets have been transmitted
-   */
+
+  /** \return True if reservation packets have been transmitted. */
   bool IsTransmitted () const;
   /**
-   * \param fn Frame number to set reservation to
+   * Set the frame number.
+   *
+   * \param fn The frame number.
    */
   void SetFrameNo (uint8_t fn);
   /**
-   * \param t Time of latest RTS send
+   * Set the time of the latest RTS sent.
+   *
+   * \param t RTS timestamp.
    */
   void AddTimestamp (Time t);
-  /**
-   * \brief Increments retry count by 1
-   */
+  /** Increment the retry count. */
   void IncrementRetry ();
   /**
-   * \param t True if resevation has been transmitted
-   * \brief Sets reservation transmitted state
+   * Set the reservation transmitted state.
+   * 
+   * \param t True if resevation has been transmitted.
    */
   void SetTransmitted (bool t = true);
+
 private:
+  /** Queued packets for each address. */
   std::list<std::pair <Ptr<Packet>, UanAddress > > m_pktList;
+  /** Total length of queued packets. */
   uint32_t m_length;
+  /** Frame number. */
   uint8_t m_frameNo;
+  /** Timestamps for each retry. */
   std::vector<Time> m_timestamp;
+  /** Number of retries. */
   uint8_t m_retryNo;
+  /** Has this reservation been transmitted. */
   bool m_transmitted;
 
-};
+};  // class Reservation
 
 
 /**
- * \class UanMacRc
- * \brief Non-gateway node MAC for reservation channel MAC protocol
+ * \ingroup uan
+ *
+ * Non-gateway node MAC for reservation channel MAC protocol.
  *
  * This MAC protocol assumes a network topology where all traffic
  * is destined for a set of GW nodes which are connected via
@@ -137,15 +163,26 @@
 class UanMacRc : public UanMac
 {
 public:
+  /** Packet types. */
   enum {
-    TYPE_DATA, TYPE_GWPING, TYPE_RTS, TYPE_CTS, TYPE_ACK
+    TYPE_DATA,    //!< Data.
+    TYPE_GWPING,  //!< Gateway ping.
+    TYPE_RTS,     //!< RTS.
+    TYPE_CTS,     //!< CTS.
+    TYPE_ACK      //!< ACK.
   };
+  /** Default constructor */
   UanMacRc ();
+  /** Dummy destructor, DoDispose. */
   virtual ~UanMacRc ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
-  // Inherited virtual functions
+  // Inherited methods
   virtual Address GetAddress (void);
   virtual void SetAddress (UanAddress addr);
   virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);
@@ -153,78 +190,127 @@
   virtual void AttachPhy (Ptr<UanPhy> phy);
   virtual Address GetBroadcast (void) const;
   virtual void Clear (void);
-
- /**
-  * Assign a fixed random variable stream number to the random variables
-  * used by this model.  Return the number of streams (possibly zero) that
-  * have been assigned.
-  *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
-  */
   int64_t AssignStreams (int64_t stream);
 
 private:
+  /** MAC state. */
   enum State {
-    UNASSOCIATED, GWPSENT, IDLE, RTSSENT, DATATX
+    UNASSOCIATED,  //!< Initial state.
+    GWPSENT,       //!< Associated with gateway.
+    IDLE,          //!< Finished scheduling packet sends.
+    RTSSENT,       //!< RTS just sent.
+    DATATX         //!< (Unused).
   };
 
-  State m_state;
-  bool m_rtsBlocked;
+  State m_state;           //!< MAC state.
+  bool m_rtsBlocked;       //!< RTS blocked while processing ACK.
 
-  EventId m_startAgain;
-  UanAddress m_address;
-  double m_retryRate;
-  UanAddress m_assocAddr;
-  Ptr<UanPhy> m_phy;
-  uint32_t m_numRates;
-  uint32_t m_currentRate;
-  uint32_t m_maxFrames;
-  uint32_t m_queueLimit;
-  uint8_t m_frameNo;
-  Time m_sifs;
-  Time m_learnedProp;
-
-  double m_minRetryRate;
-  double m_retryStep;
+  EventId m_startAgain;    //!< (Unused).
+  UanAddress m_address;    //!< My addrese.s
+  double m_retryRate;      //!< Number of retry attempts per second (of RTS/GWPING.
+  UanAddress m_assocAddr;  //!< Next hop address.
+  Ptr<UanPhy> m_phy;       //!< PHY layer attached to this MAC.
+  uint32_t m_numRates;     //!< Number of rates per Phy layer.
+  uint32_t m_currentRate;  //!< Rate number corresponding to data rate of current cycle.
+  uint32_t m_maxFrames;    //!< Maximum number of frames to include in a single RTS.
+  uint32_t m_queueLimit;   //!< Maximum packets to queue at MAC.
+  uint8_t m_frameNo;       //!< Current frame number.
+  Time m_sifs;             //!< Spacing between frames to account for timing error and processing delay.
+  Time m_learnedProp;      //!< Propagation delay to gateway.
+
+  double m_minRetryRate;   //!< Smallest allowed RTS retry rate.
+  double m_retryStep;      //!< Retry rate increment.
 
-  uint32_t m_ctsSizeN;
-  uint32_t m_ctsSizeG;
+  uint32_t m_ctsSizeN;     //!< Size of UanHeaderRcCts.
+  uint32_t m_ctsSizeG;     //!< Size of UanHeaderCommon and UanHeaderRcCtsGlobal.
 
-  bool m_cleared;
+  bool m_cleared;          //!< Flag when we've been cleared.
 
+  /** Pending packets. */
   std::list<std::pair <Ptr<Packet>, UanAddress > > m_pktQueue;
+  /** List of scheduled reservations. */
   std::list<Reservation> m_resList;
 
+  /** The callback to forward a packet up to higher layer. */
   Callback<void, Ptr<Packet>, const UanAddress& > m_forwardUpCb;
 
+  /** A packet was destined for and received at this MAC layer. */
   TracedCallback<Ptr<const Packet>, UanTxMode > m_rxLogger;
+  /** A packet arrived at the MAC for transmission. */
   TracedCallback<Ptr<const Packet>, uint16_t > m_enqueueLogger;
+  /** A was passed down to the PHY from the MAC. */
   TracedCallback<Ptr<const Packet>, uint16_t > m_dequeueLogger;
 
+  /** The RTS event. */
   EventId m_rtsEvent;
-  void ReceiveOkFromPhy (Ptr<Packet>, double sinr, UanTxMode mode);
-
+  /**
+   * PHY receive ok Callback.
+   *
+   * \param pkt The received packet.
+   * \param sinr (Unused).
+   * \param mode Modulation mode.
+   */
+  void ReceiveOkFromPhy (Ptr<Packet> pkt, double sinr, UanTxMode mode);
+  /** Associate with a gateway by sending the first GWPING. */
   void Associate (void);
+  /** Periodically retry association. */
   void AssociateTimeout (void);
+  /** Send RTS packet. */
   void SendRts (void);
+  /** Retry RTS. */
   void RtsTimeout (void);
+  /**
+   * Create the RTS header from a Reservation.
+   *
+   * \param res The Reservation.
+   * \return A RTS header.
+   */
   UanHeaderRcRts CreateRtsHeader (const Reservation &res);
+  /**
+   * Schedule Packet sends.
+   *
+   * \param ctsh The CTS header identifying the frame number and delay.
+   * \param ctsg The CTS global header giving the transmit time stamp base.
+   * \param ctsBytes Number of bytes total in CTS packet.
+   */
   void ScheduleData (const UanHeaderRcCts &ctsh, const UanHeaderRcCtsGlobal &ctsg, uint32_t ctsBytes);
+  /**
+   * Process a received ACK.
+   *
+   * \param ack The ACK packet.
+   */
   void ProcessAck (Ptr<Packet> ack);
+  /**
+   * Send on packet on the PHY.
+   *
+   * \param pkt The packet.
+   * \param rate The transmission rate.
+   */
   void SendPacket (Ptr<Packet> pkt, uint32_t rate);
+  /**
+   * Check that PHY is ok:
+   *   not CTS or ACK
+   *   not to my address
+   * \return True if PHY is ok.
+   */
   bool IsPhy1Ok (void);
+  /** Callback to block RST. */
   void BlockRtsing (void);
 
+  /**
+   * Global count of calls to Associate, AssociateTimeout,
+   * SendRts, and RtsTimeout.
+   */
   static uint32_t m_cntrlSends;
 
-  /// Provides exponential random variables.
+  /** Provides exponential random variables. */
   Ptr<ExponentialRandomVariable> m_ev;
 
 protected:
   void DoDispose ();
-};
 
-}
+};  // class UanMacRc
+
+} // namespace ns3
 
 #endif /* UAN_MAC_RC_H */
diff -Naur ns-3.18.1/src/uan/model/uan-net-device.cc ns-3.19/src/uan/model/uan-net-device.cc
--- ns-3.18.1/src/uan/model/uan-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (UanNetDevice)
+  ;
 
 UanNetDevice::UanNetDevice ()
   : NetDevice (),
@@ -92,7 +93,7 @@
 
   static TypeId tid = TypeId ("ns3::UanNetDevice")
     .SetParent<NetDevice> ()
-    .AddAttribute ("Channel", "The channel attached to this device",
+    .AddAttribute ("Channel", "The channel attached to this device.",
                    PointerValue (),
                    MakePointerAccessor (&UanNetDevice::DoGetChannel, &UanNetDevice::SetChannel),
                    MakePointerChecker<UanChannel> ())
diff -Naur ns-3.18.1/src/uan/model/uan-net-device.h ns-3.19/src/uan/model/uan-net-device.h
--- ns-3.18.1/src/uan/model/uan-net-device.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -41,69 +41,87 @@
 
 /**
  * \ingroup uan
- * \class UanNetDevice
  *
- * \brief Net device for UAN models
+ * Net device for UAN models.
  */
 class UanNetDevice : public NetDevice
 {
 public:
-  /**
-   * \brief UanPhyList is defined as a standard template lib list of UanPhy objects
-   */
+  /** List of UanPhy objects. */
   typedef std::list<Ptr<UanPhy> > UanPhyList;
-  /**
-   * \brief UanTransducerList is a standard template lib list of UanTransducer objects
-   */
+  /** List of UanTransducer objects. */
   typedef std::list<Ptr<UanTransducer> > UanTransducerList;
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
+  /** Default constructor */
   UanNetDevice ();
+  /** Dummy destructor, DoDispose. */
   virtual ~UanNetDevice ();
 
   /**
-   * \param mac Set MAC layer for this device
+   * Set the MAC layer for this device.
+   * 
+   * \param mac The MAC layer.
    */
   void SetMac (Ptr<UanMac> mac);
 
   /**
-   * \param phy Set PHY layer for this device
+   * Set the Phy layer for this device.
+   *   
+   * \param phy The PHY layer.
    */
   void SetPhy (Ptr<UanPhy> phy);
 
   /**
-   * \param channel The channel this device is attached to
+   * Attach a channel.
+   *
+   * \param channel The channel.
    */
   void SetChannel (Ptr<UanChannel> channel);
 
   /**
-   * \returns MAC this device is using
+   * Get the MAC used by this device.
+   *
+   * \return The MAC.
    */
   Ptr<UanMac> GetMac (void) const;
 
   /**
-   * \returns PHY this device is using
+   * Get the Phy used by this device.
+   *
+   * \return The Phy.
    */
   Ptr<UanPhy> GetPhy (void) const;
 
   /**
-   * \returns Transducer in net device
+   * Get the transducer associated with this device.
+   *
+   * \return The transducer.
    */
   Ptr<UanTransducer> GetTransducer (void) const;
   /**
-   * \param trans Transducer to use in this net device
+   * Set the transdcuer used by this device.
+   *
+   * \param trans The transducer.
    */
   void SetTransducer (Ptr<UanTransducer> trans);
 
-  /**
-   * Clears all pointer references
-   */
+  /** Clear all pointer references. */
   void Clear (void);
 
+  /**
+   * Set the Phy SLEEP mode.
+   *
+   * \param sleep SLEEP on or off.
+   */
   void SetSleepMode (bool sleep);
 
-  // Purely virtual functions from base class
+  // Inherited methods
   virtual void SetIfIndex (const uint32_t index);
   virtual uint32_t GetIfIndex (void) const;
   virtual Ptr<Channel> GetChannel (void) const;
@@ -128,31 +146,44 @@
   virtual bool SupportsSendFrom (void) const;
   virtual void AddLinkChangeCallback (Callback<void> callback);
   virtual void SetAddress (Address address);
+
 private:
+  /**
+   * Forward the packet to a higher level, set with SetReceiveCallback.
+   *
+   * \param pkt The packet.
+   * \param src The source address.
+   */
   virtual void ForwardUp (Ptr<Packet> pkt, const UanAddress &src);
+  
+  /** \return The channel attached to this device. */
   Ptr<UanChannel> DoGetChannel (void) const;
 
-  Ptr<UanTransducer> m_trans;
-  Ptr<Node> m_node;
-  Ptr<UanChannel> m_channel;
-  Ptr<UanMac> m_mac;
-  Ptr<UanPhy> m_phy;
-
-  std::string m_name;
-  uint32_t m_ifIndex;
-  uint16_t m_mtu;
-  bool m_linkup;
-  TracedCallback<> m_linkChanges;
-  ReceiveCallback m_forwardUp;
+  Ptr<UanTransducer> m_trans;      //!< The Transducer attached to this device.
+  Ptr<Node> m_node;                //!< The node hosting this device.
+  Ptr<UanChannel> m_channel;       //!< The channel attached to this device.
+  Ptr<UanMac> m_mac;               //!< The MAC layer attached to this device.
+  Ptr<UanPhy> m_phy;               //!< The PHY layer attached to this device.
+
+  //unused: std::string m_name;
+  uint32_t m_ifIndex;              //!< The interface index of this device.
+  uint16_t m_mtu;                  //!< The device MTU value, in bytes.
+  bool m_linkup;                   //!< The link state, true if up.
+  TracedCallback<> m_linkChanges;  //!< Callback to invoke when the link state changes to UP.
+  ReceiveCallback m_forwardUp;     //!< The receive callback.
 
+  /** Trace source triggered when forwarding up received payload from the MAC layer. */
   TracedCallback<Ptr<const Packet>, UanAddress> m_rxLogger;
+  /** Trace source triggered when sending to the MAC layer */
   TracedCallback<Ptr<const Packet>, UanAddress> m_txLogger;
 
+  /** Flag when we've been cleared. */
   bool m_cleared;
 
 protected:
   virtual void DoDispose ();
-};
+
+};  // class UanNetDevice
 
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/uan/model/uan-noise-model.cc ns-3.19/src/uan/model/uan-noise-model.cc
--- ns-3.18.1/src/uan/model/uan-noise-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-noise-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanNoiseModel);
+NS_OBJECT_ENSURE_REGISTERED (UanNoiseModel)
+  ;
 
 TypeId UanNoiseModel::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/uan/model/uan-noise-model-default.cc ns-3.19/src/uan/model/uan-noise-model-default.cc
--- ns-3.18.1/src/uan/model/uan-noise-model-default.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-noise-model-default.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanNoiseModelDefault);
+NS_OBJECT_ENSURE_REGISTERED (UanNoiseModelDefault)
+  ;
 
 UanNoiseModelDefault::UanNoiseModelDefault ()
 {
@@ -42,11 +43,11 @@
   static TypeId tid = TypeId ("ns3::UanNoiseModelDefault")
     .SetParent<Object> ()
     .AddConstructor<UanNoiseModelDefault> ()
-    .AddAttribute ("Wind", "Wind speed in m/s",
+    .AddAttribute ("Wind", "Wind speed in m/s.",
                    DoubleValue (1),
                    MakeDoubleAccessor (&UanNoiseModelDefault::m_wind),
                    MakeDoubleChecker<double> (0))
-    .AddAttribute ("Shipping", "Shipping contribution to noise between 0 and 1",
+    .AddAttribute ("Shipping", "Shipping contribution to noise between 0 and 1.",
                    DoubleValue (0),
                    MakeDoubleAccessor (&UanNoiseModelDefault::m_shipping),
                    MakeDoubleChecker<double> (0,1))
diff -Naur ns-3.18.1/src/uan/model/uan-noise-model-default.h ns-3.19/src/uan/model/uan-noise-model-default.h
--- ns-3.18.1/src/uan/model/uan-noise-model-default.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-noise-model-default.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,16 +28,19 @@
 namespace ns3 {
 
 /**
- * \class UanNoiseModelDefault
+ * \ingroup uan
  *
- * Standard ambient acoustic noise model.  See attributes for parameters
+ * Standard ambient acoustic noise model.
+ *
+ * See attributes for parameters
  *
  * This class returns ambient noise by following the algorithm given in
- * Harris, A. F. and Zorzi, M. 2007. Modeling the underwater acoustic channel in ns2.
- * In Proceedings of the 2nd international Conference on Performance Evaluation
- * Methodologies and Tools (Nantes, France, October 22 - 27, 2007). ValueTools,
- * vol. 321. ICST (Institute for Computer Sciences Social-Informatics and
- * Telecommunications Engineering), ICST, Brussels, Belgium, 1-8.
+ * Harris, A. F. and Zorzi, M. 2007. Modeling the underwater acoustic
+ * channel in ns2. In Proceedings of the 2nd international Conference
+ * on Performance Evaluation Methodologies and Tools (Nantes, France,
+ * October 22 - 27, 2007). ValueTools, vol. 321. ICST (Institute for
+ * Computer Sciences Social-Informatics and Telecommunications Engineering),
+ * ICST, Brussels, Belgium, 1-8.
  *
  * Which uses the noise model also given in the book
  * "Principles of Underwater Sound" by Urick
@@ -45,22 +48,24 @@
 class UanNoiseModelDefault : public UanNoiseModel
 {
 public:
-  UanNoiseModelDefault ();
-  virtual ~UanNoiseModelDefault ();
+  UanNoiseModelDefault ();           //!< Default constructor.
+  virtual ~UanNoiseModelDefault ();  //!< Dummy destructor, DoDispose.
 
-  static TypeId GetTypeId (void);
   /**
-   * \returns Noise power in dB re 1uPa/Hz
-   * \param fKhz Frequency in kHz
+   * Register this type.
+   * \return The TypeId.
    */
+  static TypeId GetTypeId (void);
+
+  // Inherited methods
   virtual double GetNoiseDbHz (double fKhz) const;
 
 private:
-  double m_wind;
-  double m_shipping;
+  double m_wind;      //!< Wind speed in m/s.
+  double m_shipping;  //!< Shipping contribution to noise between 0 and 1.
 
-};
+};  // class UanNoiseModelDefault
 
-}
+} // namespace ns3
 
 #endif /* UAN_NOISE_MODEL_DEFAULT_H */
diff -Naur ns-3.18.1/src/uan/model/uan-noise-model.h ns-3.19/src/uan/model/uan-noise-model.h
--- ns-3.18.1/src/uan/model/uan-noise-model.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-noise-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -25,24 +25,34 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup uan
+ *
+ * UAN Noise Model base class.
+ */
 class UanNoiseModel : public Object
 {
 public:
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * \param fKhz Frequency in kHz
-   * \returns Noise power in dB re 1uPa/Hz
+   * Compute the noise power at a given frequency.
+   *
+   * \param fKhz Frequency in kHz.
+   * \return Noise power in dB re 1uPa/Hz.
    */
   virtual double GetNoiseDbHz (double fKhz) const = 0;
 
-  /**
-   * Clears all pointer references
-   */
+  /** Clear all pointer references. */
   virtual void Clear (void);
 
   virtual void DoDispose (void);
-};
+
+};  // class UanNoiseModel
 
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/uan/model/uan-phy.cc ns-3.19/src/uan/model/uan-phy.cc
--- ns-3.18.1/src/uan/model/uan-phy.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinr);
+NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinr)
+  ;
 
 TypeId UanPhyCalcSinr::GetTypeId (void)
 {
@@ -43,7 +44,8 @@
   Object::DoDispose ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (UanPhyPer);
+NS_OBJECT_ENSURE_REGISTERED (UanPhyPer)
+  ;
 
 TypeId UanPhyPer::GetTypeId (void)
 {
@@ -64,29 +66,30 @@
   Object::DoDispose ();
 }
 
-NS_OBJECT_ENSURE_REGISTERED (UanPhy);
+NS_OBJECT_ENSURE_REGISTERED (UanPhy)
+  ;
 
 TypeId UanPhy::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::UanPhy")
     .SetParent<Object> ()
     .AddTraceSource ("PhyTxBegin",
-                     "Trace source indicating a packet has begun transmitting over the channel medium",
+                     "Trace source indicating a packet has begun transmitting over the channel medium.",
                      MakeTraceSourceAccessor (&UanPhy::m_phyTxBeginTrace))
     .AddTraceSource ("PhyTxEnd",
                      "Trace source indicating a packet has been completely transmitted over the channel.",
                    MakeTraceSourceAccessor (&UanPhy::m_phyTxEndTrace))
     .AddTraceSource ("PhyTxDrop",
-                     "Trace source indicating a packet has been dropped by the device during transmission",
+                     "Trace source indicating a packet has been dropped by the device during transmission.",
                      MakeTraceSourceAccessor (&UanPhy::m_phyTxDropTrace))
     .AddTraceSource ("PhyRxBegin",
-                     "Trace source indicating a packet has begun being received from the channel medium by the device",
+                     "Trace source indicating a packet has begun being received from the channel medium by the device.",
                      MakeTraceSourceAccessor (&UanPhy::m_phyRxBeginTrace))
     .AddTraceSource ("PhyRxEnd",
-                     "Trace source indicating a packet has been completely received from the channel medium by the device",
+                     "Trace source indicating a packet has been completely received from the channel medium by the device.",
                      MakeTraceSourceAccessor (&UanPhy::m_phyRxEndTrace))
     .AddTraceSource ("PhyRxDrop",
-                     "Trace source indicating a packet has been dropped by the device during reception",
+                     "Trace source indicating a packet has been dropped by the device during reception.",
                      MakeTraceSourceAccessor (&UanPhy::m_phyRxDropTrace))
   ;
   return tid;
diff -Naur ns-3.18.1/src/uan/model/uan-phy-dual.cc ns-3.19/src/uan/model/uan-phy-dual.cc
--- ns-3.18.1/src/uan/model/uan-phy-dual.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-phy-dual.cc	2013-12-20 09:44:50.000000000 -0800
@@ -41,8 +41,10 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanPhyDual);
-NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDual);
+NS_OBJECT_ENSURE_REGISTERED (UanPhyDual)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDual)
+  ;
 
 UanPhyCalcSinrDual::UanPhyCalcSinrDual ()
 {
@@ -160,73 +162,73 @@
     .SetParent<UanPhy> ()
     .AddConstructor<UanPhyDual> ()
     .AddAttribute  ("CcaThresholdPhy1",
-                    "Aggregate energy of incoming signals to move to CCA Busy state dB of Phy1",
+                    "Aggregate energy of incoming signals to move to CCA Busy state dB of Phy1.",
                     DoubleValue (10),
                     MakeDoubleAccessor (&UanPhyDual::GetCcaThresholdPhy1, &UanPhyDual::SetCcaThresholdPhy1),
                     MakeDoubleChecker<double> ())
     .AddAttribute ("CcaThresholdPhy2",
-                   "Aggregate energy of incoming signals to move to CCA Busy state dB of Phy2",
+                   "Aggregate energy of incoming signals to move to CCA Busy state dB of Phy2.",
                    DoubleValue (10),
                    MakeDoubleAccessor (&UanPhyDual::GetCcaThresholdPhy2, &UanPhyDual::SetCcaThresholdPhy2),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("TxPowerPhy1",
-                   "Transmission output power in dB of Phy1",
+                   "Transmission output power in dB of Phy1.",
                    DoubleValue (190),
                    MakeDoubleAccessor (&UanPhyDual::GetTxPowerDbPhy1, &UanPhyDual::SetTxPowerDbPhy1),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("TxPowerPhy2",
-                   "Transmission output power in dB of Phy2",
+                   "Transmission output power in dB of Phy2.",
                    DoubleValue (190),
                    MakeDoubleAccessor (&UanPhyDual::GetTxPowerDbPhy2, &UanPhyDual::SetTxPowerDbPhy2),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("RxGainPhy1",
-                   "Gain added to incoming signal at receiver of Phy1",
+                   "Gain added to incoming signal at receiver of Phy1.",
                    DoubleValue (0),
                    MakeDoubleAccessor (&UanPhyDual::GetRxGainDbPhy1, &UanPhyDual::SetRxGainDbPhy1),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("RxGainPhy2",
-                   "Gain added to incoming signal at receiver of Phy2",
+                   "Gain added to incoming signal at receiver of Phy2.",
                    DoubleValue (0),
                    MakeDoubleAccessor (&UanPhyDual::GetRxGainDbPhy2, &UanPhyDual::SetRxGainDbPhy2),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("SupportedModesPhy1",
-                   "List of modes supported by Phy1",
+                   "List of modes supported by Phy1.",
                    UanModesListValue (UanPhyGen::GetDefaultModes ()),
                    MakeUanModesListAccessor (&UanPhyDual::GetModesPhy1, &UanPhyDual::SetModesPhy1),
                    MakeUanModesListChecker () )
     .AddAttribute ("SupportedModesPhy2",
-                   "List of modes supported by Phy2",
+                   "List of modes supported by Phy2.",
                    UanModesListValue (UanPhyGen::GetDefaultModes ()),
                    MakeUanModesListAccessor (&UanPhyDual::GetModesPhy2, &UanPhyDual::SetModesPhy2),
                    MakeUanModesListChecker () )
     .AddAttribute ("PerModelPhy1",
-                   "Functor to calculate PER based on SINR and TxMode for Phy1",
+                   "Functor to calculate PER based on SINR and TxMode for Phy1.",
                    PointerValue (CreateObject<UanPhyPerGenDefault> ()),
                    MakePointerAccessor (&UanPhyDual::GetPerModelPhy1, &UanPhyDual::SetPerModelPhy1),
                    MakePointerChecker<UanPhyPer> ())
     .AddAttribute ("PerModelPhy2",
-                   "Functor to calculate PER based on SINR and TxMode for Phy2",
+                   "Functor to calculate PER based on SINR and TxMode for Phy2.",
                    PointerValue (CreateObject<UanPhyPerGenDefault> ()),
                    MakePointerAccessor (&UanPhyDual::GetPerModelPhy2, &UanPhyDual::SetPerModelPhy2),
                    MakePointerChecker<UanPhyPer> ())
     .AddAttribute ("SinrModelPhy1",
-                   "Functor to calculate SINR based on pkt arrivals and modes for Phy1",
+                   "Functor to calculate SINR based on pkt arrivals and modes for Phy1.",
                    PointerValue (CreateObject<UanPhyCalcSinrDual> ()),
                    MakePointerAccessor (&UanPhyDual::GetSinrModelPhy1, &UanPhyDual::SetSinrModelPhy1),
                    MakePointerChecker<UanPhyCalcSinr> ())
     .AddAttribute ("SinrModelPhy2",
-                   "Functor to calculate SINR based on pkt arrivals and modes for Phy2",
+                   "Functor to calculate SINR based on pkt arrivals and modes for Phy2.",
                    PointerValue (CreateObject<UanPhyCalcSinrDual> ()),
                    MakePointerAccessor (&UanPhyDual::GetSinrModelPhy2, &UanPhyDual::SetSinrModelPhy2),
                    MakePointerChecker<UanPhyCalcSinr> ())
     .AddTraceSource ("RxOk",
-                     "A packet was received successfully",
+                     "A packet was received successfully.",
                      MakeTraceSourceAccessor (&UanPhyDual::m_rxOkLogger))
     .AddTraceSource ("RxError",
-                     "A packet was received unsuccessfully",
+                     "A packet was received unsuccessfully.",
                      MakeTraceSourceAccessor (&UanPhyDual::m_rxErrLogger))
     .AddTraceSource ("Tx",
-                     "Packet transmission beginning",
+                     "Packet transmission beginning.",
                      MakeTraceSourceAccessor (&UanPhyDual::m_txLogger))
 
   ;
diff -Naur ns-3.18.1/src/uan/model/uan-phy-dual.h ns-3.19/src/uan/model/uan-phy-dual.h
--- ns-3.18.1/src/uan/model/uan-phy-dual.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-phy-dual.h	2013-12-20 09:44:50.000000000 -0800
@@ -33,8 +33,7 @@
 
 
 /**
- * \class UanPhyCalcSinrDual
- * \brief Default SINR model for UanPhyDual
+ * Default SINR model for UanPhyDual
  *
  * Considers interfering packet power as additional ambient noise only
  * if there is overlap in frequency band as found from supplied UanTxMode.
@@ -43,9 +42,17 @@
 class UanPhyCalcSinrDual : public UanPhyCalcSinr
 {
 public:
+  /** Constructor */
   UanPhyCalcSinrDual ();
+  /** Destructor */
   virtual ~UanPhyCalcSinrDual ();
+  
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
+
   virtual double CalcSinrDb (Ptr<Packet> pkt,
                              Time arrTime,
                              double rxPowerDb,
@@ -54,10 +61,13 @@
                              UanPdp pdp,
                              const UanTransducer::ArrivalList &arrivalList
                              ) const;
-};
+
+};  // class UanPhyCalcSinrDual
 
 /**
- * \class UanPhyDual
+ * \ingroup uan
+ *
+ * Two channel Phy.
  *
  * A class that wraps two generic UAN Phy layers (UanPhyGen) into a single PHY.
  * This is used to simulate two receivers (and transmitters) that use
@@ -72,20 +82,28 @@
 class UanPhyDual : public UanPhy
 {
 public:
+  /** Constructor */
   UanPhyDual ();
+  /** Dummy destructor \see DoDispose */
   virtual ~UanPhyDual ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId ();
 
+  // Inherited methods:
   virtual void SetEnergyModelCallback (DeviceEnergyModel::ChangeStateCallback callback);
   virtual void EnergyDepletionHandler (void);
   virtual void SendPacket (Ptr<Packet> pkt, uint32_t modeNum);
 
   /**
-   * \brief Register a class to receive phy state change notifications
-   * \param listener Class derived from UanPhyListener to receive notifications
+   * Register a UanPhyListener to be notified of common UanPhy events.
+   *
+   * \param listener New listener to register.
    *
-   * Note that, from UanPhyDual, you may receive duplicate
+   * \note You may receive duplicate
    * messages as underneath there are two generic phys here.
    * Each will notify of state changes independently.
    */
@@ -95,7 +113,6 @@
   virtual void SetReceiveErrorCallback (RxErrCallback cb);
   virtual void SetRxGainDb (double gain);
   virtual void SetTxPowerDb (double txpwr);
-  /** \deprecated Look at PER Functor attribute */
   virtual void SetRxThresholdDb (double thresh) NS_DEPRECATED;
   virtual void SetCcaThresholdDb (double thresh);
   virtual double GetRxGainDb (void);
@@ -120,179 +137,155 @@
   virtual uint32_t GetNModes (void);
   virtual UanTxMode GetMode (uint32_t n);
   virtual void Clear (void);
+  virtual void SetSleepMode (bool sleep)
+  {
+    /// \todo This method has to be implemented
+  }
+  int64_t AssignStreams (int64_t stream);
+  Ptr<Packet> GetPacketRx (void) const;
+  
 
-  /**
-   * /returns True if Phy1 is Idle
-   */
+  /** \copydoc UanPhy::IsStateIdle */
   bool IsPhy1Idle (void);
-  /**
-   * /returns True if Phy2 is Idle
-   */
+  /** \copydoc UanPhy::IsStateIdle */
   bool IsPhy2Idle (void);
-  /**
-   * /returns True if Phy1 is currently in RX mode
-   */
+  /** \copydoc UanPhy::IsStateRx */
   bool IsPhy1Rx (void);
-  /**
-   * /returns True if Phy2 is currently in RX mode
-   */
+  /** \copydoc UanPhy::IsStateRx */
   bool IsPhy2Rx (void);
-  /**
-   * /returns True if Phy1 is in TX mode
-   */
+  /** \copydoc UanPhy::IsStateTx */
   bool IsPhy1Tx (void);
-  /**
-   * /returns True if Phy2 is in TX mode
-   */
+  /** \copydoc UanPhy::IsStateTx */
   bool IsPhy2Tx (void);
 
   // Attribute getters and setters
-  /**
-   * \returns Clear channel assessment threshold of Phy1
-   */
+  /** \copydoc ns3::UanPhy::GetCcaThresholdDb() */
   double GetCcaThresholdPhy1 (void) const;
-  /**
-   * \returns Clear channel assessment threshold of Phy2
-   */
+  /** \copydoc UanPhy::GetCcaThresholdDb() */
   double GetCcaThresholdPhy2 (void) const;
-  /**
-   * \param thresh Signal power threshold in dB to set Phy1 to
-   */
+  /** \copydoc UanPhy::SetCcaThresholdDb */
   void SetCcaThresholdPhy1 (double thresh);
-  /**
-   * \param thresh Signal power threshold in dB to set Phy2 to
-   */
+  /** \copydoc UanPhy::SetCcaThresholdDb */
   void SetCcaThresholdPhy2 (double thresh);
 
-  /**
-   * \returns Current TX power setting of Phy 1 in dB
-   */
+  /** \copydoc UanPhy::GetTxPowerDb */
   double GetTxPowerDbPhy1 (void) const;
-  /**
-   * \returns Current TX power setting of Phy 2 in dB
-   */
+  /** \copydoc UanPhy::GetTxPowerDb */
   double GetTxPowerDbPhy2 (void) const;
-  /**
-   * \returns TX power setting of Phy1 in dB
-   */
-  void SetTxPowerDbPhy1 (double);
-  /**
-   * \returns TX power setting of Phy2 in dB
-   */
-  void SetTxPowerDbPhy2 (double);
+  /** \copydoc UanPhy::SetTxPowerDb */
+  void SetTxPowerDbPhy1 (double txpwr);
+  /** \copydoc UanPhy::SetTxPowerDb */
+  void SetTxPowerDbPhy2 (double txpwr);
 
-  /**
-   * \returns RX gain of Phy1 in dB
-   */
+  /** \copydoc UanPhy::GetRxGainDb */
   double GetRxGainDbPhy1 (void) const;
-  /**
-   * \returns RX gain of Phy2 in dB
-   */
+  /** \copydoc UanPhy::GetRxGainDb */
   double GetRxGainDbPhy2 (void) const;
-  /**
-   * \param gain value in dB to apply to RX gain of Phy1
-   */
+  /** \copydoc UanPhy::SetRxGainDb */
   void SetRxGainDbPhy1 (double gain);
-  /**
-   * \param gain value in dB to apply to RX gain of Phy2
-   */
+  /** \copydoc UanPhy::SetRxGainDb */
   void SetRxGainDbPhy2 (double gain);
 
   /**
-   * \returns List of available modes on Phy1
+   * Get the list of available modes.
+   *
+   * \return The mode list.
    */
   UanModesList GetModesPhy1 (void) const;
-  /**
-   * \returns List of available modes on Phy2
-   */
+  /** \copydoc GetModesPhy1 */
   UanModesList GetModesPhy2 (void) const;
+
   /**
-   * \param modes List of modes to use on Phy1 (index corresponds to mode #)
+   * Set the available modes.
+   * 
+   * \param modes List of modes.
    */
   void SetModesPhy1 (UanModesList modes);
-  /**
-   * \param modes List of modes to use on Phy2 (index corresponds to mode #)
-   */
+  /** \copydoc SetModesPhy1 */
   void SetModesPhy2 (UanModesList modes);
 
   /**
-   * \returns Ptr to PER model for Phy1
+   * Get the error probability model.
+   *
+   * \return The error model.
    */
   Ptr<UanPhyPer> GetPerModelPhy1 (void) const;
-  /**
-   * \returns Ptr to PER model for Phy2
-   */
+  /** \copydoc GetPerModelPhy1() */
   Ptr<UanPhyPer> GetPerModelPhy2 (void) const;
+
   /**
-   * \param per Ptr to PER model to use on Phy1
+   * Set the error probability model.
+   *
+   * \param per The error model.
    */
   void SetPerModelPhy1 (Ptr<UanPhyPer> per);
-  /**
-   * \param per Ptr to PER model to use on Phy2
-   */
+  /** \copydoc SetPerModelPhy1 */
   void SetPerModelPhy2 (Ptr<UanPhyPer> per);
 
   /**
-   * \returns Ptr to SINR model for Phy1
+   * Get the SINR calculator.
+   *
+   * \return The SINR calculator.
    */
   Ptr<UanPhyCalcSinr> GetSinrModelPhy1 (void) const;
-  /**
-   * \returns Ptr to SINR model for Phy2
-   */
+  /** \copydoc GetSinrModelPhy1 */
   Ptr<UanPhyCalcSinr> GetSinrModelPhy2 (void) const;
+  
   /**
-   * \param calcSinr Ptr to SINR model to use on Phy1
+   * Set the SINR calculator.
+   *
+   * \param calcSinr The SINR calculator.
    */
   void SetSinrModelPhy1 (Ptr<UanPhyCalcSinr> calcSinr);
-  /**
-   * \param calcSinr Ptr to SINR model to use on Phy2
-   */
+  /** \copydoc SetSinrModelPhy1 */
   void SetSinrModelPhy2 (Ptr<UanPhyCalcSinr> calcSinr);
 
-  virtual void SetSleepMode (bool sleep)
-  {
-    /// \todo This method has to be implemented
-  }
-
-  /**
-   * \returns Packet currently being received on Phy1 (Null Ptr if none)
-   */
+  
+  /** \copydoc UanPhy::GetPacketRx */
   Ptr<Packet> GetPhy1PacketRx (void) const;
-  /**
-   * \returns Packet currently being received on Phy2 (Null Ptr if none)
-   */
+  /** \copydoc UanPhy::GetPacketRx */
   Ptr<Packet> GetPhy2PacketRx (void) const;
-  /**
-   * \returns Packet currenty being received on Phy1 (Null Ptr if none)
-   */
-  Ptr<Packet> GetPacketRx (void) const;
 
- /**
-  * Assign a fixed random variable stream number to the random variables
-  * used by this model.  Return the number of streams (possibly zero) that
-  * have been assigned.
-  *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
-  */
-  int64_t AssignStreams (int64_t stream);
 
 private:
+  /** First Phy layer. */
   Ptr<UanPhy> m_phy1;
+  /** Second Phy layer. */
   Ptr<UanPhy> m_phy2;
+
+  /** A packet was received successfully. */
   TracedCallback<Ptr<const Packet>, double, UanTxMode > m_rxOkLogger;
+  /** A packet was received unsuccessfully. */
   TracedCallback<Ptr<const Packet>, double, UanTxMode > m_rxErrLogger;
+  /** A packet was sent from this Phy. */
   TracedCallback<Ptr<const Packet>, double, UanTxMode > m_txLogger;
+  /** Callback when packet received without errors. */
   RxOkCallback m_recOkCb;
+  /** Callback when packet received with errors. */
   RxErrCallback m_recErrCb;
 
 
+  /**
+   * Handle callback and logger for packets received without error.
+   *
+   * \param pkt The packet.
+   * \param sinr The SINR.
+   * \param mode The channel mode.
+   */
   void RxOkFromSubPhy (Ptr<Packet> pkt, double sinr, UanTxMode mode);
+  /**
+   * Handle callback and logger for packets received with error.
+   *
+   * \param pkt The packet.
+   * \param sinr The SINR.
+   */
   void RxErrFromSubPhy (Ptr<Packet> pkt, double sinr);
+  
 protected:
   virtual void DoDispose ();
-};
 
-}
+};  // class UanPhyDual
+
+} // namespace ns3
 
 #endif /* UAN_PHY_DUAL_H */
diff -Naur ns-3.18.1/src/uan/model/uan-phy-gen.cc ns-3.19/src/uan/model/uan-phy-gen.cc
--- ns-3.18.1/src/uan/model/uan-phy-gen.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-phy-gen.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,11 +40,16 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanPhyGen);
-NS_OBJECT_ENSURE_REGISTERED (UanPhyPerGenDefault);
-NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDefault);
-NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrFhFsk);
-NS_OBJECT_ENSURE_REGISTERED (UanPhyPerUmodem);
+NS_OBJECT_ENSURE_REGISTERED (UanPhyGen)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhyPerGenDefault)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDefault)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrFhFsk)
+  ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhyPerUmodem)
+  ;
 
 
 /*************** UanPhyCalcSinrDefault definition *****************/
@@ -111,7 +116,7 @@
     .SetParent<Object> ()
     .AddConstructor<UanPhyCalcSinrFhFsk> ()
     .AddAttribute ("NumberOfHops",
-                   "Number of frequencies in hopping pattern",
+                   "Number of frequencies in hopping pattern.",
                    UintegerValue (13),
                    MakeUintegerAccessor (&UanPhyCalcSinrFhFsk::m_hops),
                    MakeUintegerChecker<uint32_t> ())
@@ -216,7 +221,7 @@
   static TypeId tid = TypeId ("ns3::UanPhyPerGenDefault")
     .SetParent<Object> ()
     .AddConstructor<UanPhyPerGenDefault> ()
-    .AddAttribute ("Threshold", "SINR cutoff for good packet reception",
+    .AddAttribute ("Threshold", "SINR cutoff for good packet reception.",
                    DoubleValue (8),
                    MakeDoubleAccessor (&UanPhyPerGenDefault::m_thresh),
                    MakeDoubleChecker<double> ());
@@ -432,48 +437,48 @@
     .SetParent<UanPhy> ()
     .AddConstructor<UanPhyGen> ()
     .AddAttribute ("CcaThreshold",
-                   "Aggregate energy of incoming signals to move to CCA Busy state dB",
+                   "Aggregate energy of incoming signals to move to CCA Busy state dB.",
                    DoubleValue (10),
                    MakeDoubleAccessor (&UanPhyGen::m_ccaThreshDb),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("RxThreshold",
-                   "Required SNR for signal acquisition in dB",
+                   "Required SNR for signal acquisition in dB.",
                    DoubleValue (10),
                    MakeDoubleAccessor (&UanPhyGen::m_rxThreshDb),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("TxPower",
-                   "Transmission output power in dB",
+                   "Transmission output power in dB.",
                    DoubleValue (190),
                    MakeDoubleAccessor (&UanPhyGen::m_txPwrDb),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("RxGain",
-                   "Gain added to incoming signal at receiver",
+                   "Gain added to incoming signal at receiver.",
                    DoubleValue (0),
                    MakeDoubleAccessor (&UanPhyGen::m_rxGainDb),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("SupportedModes",
-                   "List of modes supported by this PHY",
+                   "List of modes supported by this PHY.",
                    UanModesListValue (UanPhyGen::GetDefaultModes ()),
                    MakeUanModesListAccessor (&UanPhyGen::m_modes),
                    MakeUanModesListChecker () )
     .AddAttribute ("PerModel",
-                   "Functor to calculate PER based on SINR and TxMode",
+                   "Functor to calculate PER based on SINR and TxMode.",
                    PointerValue (CreateObject<UanPhyPerGenDefault> ()),
                    MakePointerAccessor (&UanPhyGen::m_per),
                    MakePointerChecker<UanPhyPer> ())
     .AddAttribute ("SinrModel",
-                   "Functor to calculate SINR based on pkt arrivals and modes",
+                   "Functor to calculate SINR based on pkt arrivals and modes.",
                    PointerValue (CreateObject<UanPhyCalcSinrDefault> ()),
                    MakePointerAccessor (&UanPhyGen::m_sinr),
                    MakePointerChecker<UanPhyCalcSinr> ())
     .AddTraceSource ("RxOk",
-                     "A packet was received successfully",
+                     "A packet was received successfully.",
                      MakeTraceSourceAccessor (&UanPhyGen::m_rxOkLogger))
     .AddTraceSource ("RxError",
-                     "A packet was received unsuccessfully",
+                     "A packet was received unsuccessfully.",
                      MakeTraceSourceAccessor (&UanPhyGen::m_rxErrLogger))
     .AddTraceSource ("Tx",
-                     "Packet transmission beginning",
+                     "Packet transmission beginning.",
                      MakeTraceSourceAccessor (&UanPhyGen::m_txLogger))
   ;
   return tid;
diff -Naur ns-3.18.1/src/uan/model/uan-phy-gen.h ns-3.19/src/uan/model/uan-phy-gen.h
--- ns-3.18.1/src/uan/model/uan-phy-gen.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-phy-gen.h	2013-12-20 09:44:50.000000000 -0800
@@ -33,59 +33,93 @@
 namespace ns3 {
 
 /**
- * \class UanPhyPerGenDefault
- * \brief Default Packet Error Rate calculator for UanPhyGen
+ * \ingroup uan
+ *
+ * Default Packet Error Rate calculator for UanPhyGen
+ *
  * Considers no error if SINR is > user defined threshold
  * (configured by an attribute).
  */
 class UanPhyPerGenDefault : public UanPhyPer
 {
 public:
+  /** Constructor */
   UanPhyPerGenDefault ();
+  /** Destructor */
   virtual ~UanPhyPerGenDefault ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
+  
   virtual double CalcPer (Ptr<Packet> pkt, double sinrDb, UanTxMode mode);
 private:
-  double m_thresh;
+  
+  double m_thresh;  //!< SINR threshold.
 
-};
+};  // class UanPhyPerGenDefault
 
+  
 /**
- * \class UanPhyPerUmodem
- * \brief Packet error rate calculation assuming WHOI Micromodem like PHY
- * Calculates PER assuming rate 1/2 convolutional code with constraint length 9
- * with soft decision viterbi decoding and a CRC capable of correcting 1 bit error
+ * \ingroup uan
+ *
+ * Packet error rate calculation assuming WHOI Micromodem-like PHY.
+ *
+ * Calculates PER assuming rate 1/2 convolutional code with
+ * constraint length 9 with soft decision viterbi decoding and
+ * a CRC capable of correcting 1 bit error.
  */
 class UanPhyPerUmodem : public UanPhyPer
 {
 public:
+  /** Constructor */
   UanPhyPerUmodem ();
+  /** Destructor */
   virtual ~UanPhyPerUmodem ();
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
+   * Calculate the packet error probability based on
+   * SINR at the receiver and a tx mode.
    *
    * This implementation uses calculations
    * for binary FSK modulation coded by a rate 1/2 convolutional code
    * with constraint length = 9 and a viterbi decoder and finally a CRC capable
    * of correcting one bit error.  These equations can be found in
-   * the book, Digital Communications, by Proakis (Any version I think)
+   * the book, Digital Communications, by Proakis (any version I think).
    *
-   * \param pkt Packet which is under consideration
-   * \param sinrDb SINR at receiver
-   * \param mode TX mode used to transmit packet
-   * \returns Probability of packet error
+   * \param pkt Packet which is under consideration.
+   * \param sinrDb SINR at receiver.
+   * \param mode TX mode used to transmit packet.
+   * \return Probability of packet error.
    */
   virtual double CalcPer (Ptr<Packet> pkt, double sinrDb, UanTxMode mode);
+
 private:
+  /**
+   * Binomial coefficient
+   *
+   * \param n Pool size.
+   * \param k Number of draws.
+   * \return Binomial coefficient n choose k.
+   */
   double NChooseK (uint32_t n, uint32_t k);
 
-};
+};  // class UanPhyPerUmodem
+
+
 /**
- * \class UanPhyCalcSinrDefault
- * \brief Default SINR calculator for UanPhyGen
+ * \ingroup uan
+ *
+ * Default SINR calculator for UanPhyGen.
+ *
  * The default ignores mode data and assumes that all rxpower transmitted is
  * captured by the receiver, and that all signal power associated with
  * interfering packets affects SINR identically to additional ambient noise.
@@ -94,21 +128,31 @@
 {
 
 public:
+  /** Constructor */
   UanPhyCalcSinrDefault ();
+  /** Destructor */
   virtual ~UanPhyCalcSinrDefault ();
+  
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
+  
   /**
+   * Calculate the SINR value for a packet.
+   *
    * This implementation simply adds all arriving signal power
    * and assumes it acts identically to additional noise.
    *
-   * \param pkt Packet which is under consideration
-   * \param arrTime Arrival time of packet pkt
-   * \param rxPowerDb Received signal power at receiver
-   * \param ambNoiseDb Ambient channel noise in dB re 1 uPa
-   * \param mode TX mode used to transmit packet
-   * \param pdp Power delay profile of arriving packet pkt
-   * \param arrivalList List of other, simultaneously arriving packets
-   * \returns Probability of packet error
+   * \param pkt Packet to calculate SINR for.
+   * \param arrTime Arrival time of pkt.
+   * \param rxPowerDb The received signal strength of the packet in dB re 1 uPa.
+   * \param ambNoiseDb Ambient channel noise in dB re 1 uPa.
+   * \param mode TX Mode of pkt.
+   * \param pdp  Power delay profile of pkt.
+   * \param arrivalList  List of interfering arrivals given from Transducer.
+   * \return The SINR in dB re 1 uPa.
    */
   virtual double CalcSinrDb (Ptr<Packet> pkt,
                              Time arrTime,
@@ -118,11 +162,14 @@
                              UanPdp pdp,
                              const UanTransducer::ArrivalList &arrivalList
                              ) const;
-};
+
+};  // class UanPhyCalcSinrDefault
+
 
 /**
- * \class UanPhyCalcSinrFhFsk
- * \brief WHOI Micromodem like FH-FSK model
+ * \ingroup uan
+ *
+ * WHOI Micromodem like FH-FSK model.
  *
  * Model of interference calculation for FH-FSK wherein all nodes
  * use an identical hopping pattern.  In this case, there is an (M-1)*SymbolTime
@@ -134,9 +181,17 @@
 {
 
 public:
+  /** Constructor */
   UanPhyCalcSinrFhFsk ();
+  /** Destructor */
   virtual ~UanPhyCalcSinrFhFsk ();
+  
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
+
   virtual double CalcSinrDb (Ptr<Packet> pkt,
                              Time arrTime,
                              double rxPowerDb,
@@ -146,12 +201,15 @@
                              const UanTransducer::ArrivalList &arrivalList
                              ) const;
 private:
-  uint32_t m_hops;
-};
+  uint32_t m_hops;  //!< Number of hops.
+
+};  // class UanPhyCalcSinrFhFsk
+
 
 /**
- * \class UanPhyGen
- * \brief Generic PHY model
+ * \ingroup uan
+ *
+ * Generic PHY model.
  *
  * This is a generic PHY class.  SINR and PER information
  * are controlled via attributes.  By adapting the SINR
@@ -161,14 +219,25 @@
 class UanPhyGen : public UanPhy
 {
 public:
+  /** Constructor */
   UanPhyGen ();
+  /** Dummy destructor, see DoDispose */
   virtual ~UanPhyGen ();
   /**
-   * \returns Default TX modes of UanPhyGen
+   * Get the default transmission modes.
+   *
+   * \return The default mode list.
    */
   static UanModesList GetDefaultModes (void);
 
+  
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
   static TypeId GetTypeId (void);
+
+  // Inherited methods
   virtual void SetEnergyModelCallback (DeviceEnergyModel::ChangeStateCallback cb);
   virtual void EnergyDepletionHandler (void);
   virtual void SendPacket (Ptr<Packet> pkt, uint32_t modeNum);
@@ -203,76 +272,134 @@
   virtual UanTxMode GetMode (uint32_t n);
   virtual Ptr<Packet> GetPacketRx (void) const;
   virtual void Clear (void);
-
   virtual void SetSleepMode (bool sleep);
-
- /**
-  * Assign a fixed random variable stream number to the random variables
-  * used by this model.  Return the number of streams (possibly zero) that
-  * have been assigned.
-  *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
-  */
   int64_t AssignStreams (int64_t stream);
 
 private:
+  /** List of Phy Listeners. */
   typedef std::list<UanPhyListener *> ListenerList;
 
-  UanModesList m_modes;
+  UanModesList m_modes;             //!< List of modes supported by this PHY.
 
-  State m_state;
-  ListenerList m_listeners;
-  RxOkCallback m_recOkCb;
-  RxErrCallback m_recErrCb;
-  Ptr<UanChannel> m_channel;
-  Ptr<UanTransducer> m_transducer;
-  Ptr<UanNetDevice> m_device;
-  Ptr<UanMac> m_mac;
-  Ptr<UanPhyPer> m_per;
-  Ptr<UanPhyCalcSinr> m_sinr;
-
-  double m_rxGainDb;
-  double m_txPwrDb;
-  double m_rxThreshDb;
-  double m_ccaThreshDb;
-
-  Ptr<Packet> m_pktRx;
-  double m_minRxSinrDb;
-  double m_rxRecvPwrDb;
-  Time m_pktRxArrTime;
-  UanPdp m_pktRxPdp;
-  UanTxMode m_pktRxMode;
+  State m_state;                    //!< Phy state.
+  ListenerList m_listeners;         //!< List of listeners.
+  RxOkCallback m_recOkCb;           //!< Callback for packets received without error.
+  RxErrCallback m_recErrCb;         //!< Callback for packets received with errors.
+  Ptr<UanChannel> m_channel;        //!< Attached channel.
+  Ptr<UanTransducer> m_transducer;  //!< Associated transducer.
+  Ptr<UanNetDevice> m_device;       //!< Device hosting this Phy.
+  Ptr<UanMac> m_mac;                //!< MAC layer.
+  Ptr<UanPhyPer> m_per;             //!< Error model.
+  Ptr<UanPhyCalcSinr> m_sinr;       //!< SINR calculator.
+
+  double m_rxGainDb;                //!< Receive gain.
+  double m_txPwrDb;                 //!< Transmit power.
+  double m_rxThreshDb;              //!< Receive SINR threshold.
+  double m_ccaThreshDb;             //!< CCA busy threshold.
+
+  Ptr<Packet> m_pktRx;              //!< Received packet.
+  double m_minRxSinrDb;             //!< Minimum receive SINR during packet reception.
+  double m_rxRecvPwrDb;             //!< Receiver power.
+  Time m_pktRxArrTime;              //!< Packet arrival time.
+  UanPdp m_pktRxPdp;                //!< Power delay profile of pakket.
+  UanTxMode m_pktRxMode;            //!< Packet transmission mode at receiver.
 
-  bool m_cleared;
-  bool m_disabled;
+  bool m_cleared;                   //!< Flag when we've been cleared.
+  bool m_disabled;                  //!< Energy depleted. 
 
-  /// Provides uniform random variables.
+  /** Provides uniform random variables. */
   Ptr<UniformRandomVariable> m_pg;
 
+  /** Energy model callback. */
   DeviceEnergyModel::ChangeStateCallback m_energyCallback;
+  /** A packet destined for this Phy was received without error. */
   TracedCallback<Ptr<const Packet>, double, UanTxMode > m_rxOkLogger;
+  /** A packet destined for this Phy was received with error. */
   TracedCallback<Ptr<const Packet>, double, UanTxMode > m_rxErrLogger;
+  /** A packet was sent from this Phy. */
   TracedCallback<Ptr<const Packet>, double, UanTxMode > m_txLogger;
 
-  double CalculateSinrDb (Ptr<Packet> pkt, Time arrTime, double rxPowerDb, UanTxMode mode, UanPdp pdp);
+  /**
+   * Calculate the SINR value for a packet.
+   *
+   * \param pkt Packet to calculate SINR for.
+   * \param arrTime Arrival time of pkt.
+   * \param rxPowerDb The received signal strength of the packet in dB re 1 uPa.
+   * \param mode TX Mode of pkt.
+   * \param pdp  Power delay profile of pkt.
+   * \return The SINR in dB re 1 uPa.
+   */
+  double CalculateSinrDb (Ptr<Packet> pkt, Time arrTime, double rxPowerDb,
+                          UanTxMode mode, UanPdp pdp);
+
+  /**
+   * Calculate interference power from overlapping packet arrivals, in dB.
+   *
+   * The "signal" packet power is excluded.  Use
+   * GetInterferenceDb ( (Ptr<Packet>) 0) to treat all signals as
+   * interference, for instance in calculating the CCA busy.
+   *
+   * \param pkt The arriving (signal) packet.
+   * \return The total interference power, in dB.
+   */
   double GetInterferenceDb (Ptr<Packet> pkt);
+  /**
+   * Convert dB to kilopascals.
+   *
+   *   \f[{\rm{kPa}} = {10^{\frac{{{\rm{dB}}}}{{10}}}}\f]
+   *
+   * \param db Signal level in dB.
+   * \return Sound pressure in kPa.
+   */
   double DbToKp (double db);
+  /**
+   * Convert kilopascals to dB.
+   *
+   *   \f[{\rm{dB}} = 10{\log _{10}}{\rm{kPa}}\f]
+   *
+   * \param kp Sound pressure in kPa.
+   * \return Signal level in dB.
+   */
   double KpToDb (double kp);
+  /**
+   * Event to process end of packet reception.
+   *
+   * \param pkt The packet.
+   * \param rxPowerDb Received signal power.
+   * \param txMode Transmission mode.
+   */
   void RxEndEvent (Ptr<Packet> pkt, double rxPowerDb, UanTxMode txMode);
+  /** Event to process end of packet transmission. */
   void TxEndEvent ();
+  /**
+   * Update energy source with new state.
+   *
+   * \param state The new Phy state.
+   */
   void UpdatePowerConsumption (const State state);
 
-  void NotifyListenersRxStart (void);
+
+  /** Call UanListener::NotifyRxStart on all listeners. */
+  void NotifyListenersRxStart (void);  
+  /** Call UanListener::NotifyRxEndOk on all listeners. */
   void NotifyListenersRxGood (void);
+  /** Call UanListener::NotifyRxEndError on all listeners. */
   void NotifyListenersRxBad (void);
+  /** Call UanListener::NotifyCcaStart on all listeners. */
   void NotifyListenersCcaStart (void);
+  /** Call UanListener::NotifyCcaEnd on all listeners. */
   void NotifyListenersCcaEnd (void);
+  /**
+   * Call UanListener::NotifyTxStart on all listeners.
+   *
+   * \param duration Duration of transmission.
+   */
   void NotifyListenersTxStart (Time duration);
+
 protected:
   virtual void DoDispose ();
 
-};
+};  // class UanPhyGen
 
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/uan/model/uan-phy.h ns-3.19/src/uan/model/uan-phy.h
--- ns-3.18.1/src/uan/model/uan-phy.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-phy.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,26 +34,27 @@
 
 
 /**
- * \class UanPhyCalcSinr
+ * \ingroup uan
  *
  * Class used for calculating SINR of packet in UanPhy.
+ *
  * Can be set to any derived class using attributes of UanPhy
  * to implement different models.
  */
 class UanPhyCalcSinr : public Object
 {
-
 public:
-  static TypeId GetTypeId (void);
-
   /**
-   * \param pkt Packet to calculate SINR for
-   * \param arrTime Arrival time of pkt
-   * \param rxPowerDb The received signal strength of the packet in dB re 1 uPa
-   * \param ambNoiseDb Ambient channel noise in dB re 1 uPa
-   * \param mode TX Mode of pkt
-   * \param pdp  Power delay profile of pkt
+   * Calculate the SINR value for a packet.
+   *
+   * \param pkt Packet to calculate SINR for.
+   * \param arrTime Arrival time of pkt.
+   * \param rxPowerDb The received signal strength of the packet in dB re 1 uPa.
+   * \param ambNoiseDb Ambient channel noise in dB re 1 uPa.
+   * \param mode TX Mode of pkt.
+   * \param pdp  Power delay profile of pkt.
    * \param arrivalList  List of interfering arrivals given from Transducer.
+   * \return The SINR in dB re 1 uPa.
    */
   virtual double CalcSinrDb (Ptr<Packet> pkt,
                              Time arrTime,
@@ -64,358 +65,421 @@
                              const UanTransducer::ArrivalList &arrivalList
                              ) const = 0;
   /**
-   * Clears all pointer references
+   * Register this type.
+   * \return The object TypeId.
    */
-  virtual void Clear (void);
+  static TypeId GetTypeId (void);
 
-  virtual void DoDispose (void);
+  /** Clear all pointer references. */
+  virtual void Clear (void);
 
   /**
-   * \param db dB value
-   * \returns kilopascals
-   * \brief Converts dB re 1 uPa to kilopascals
+   * Convert dB re 1 uPa to kilopascals.
+   *
+   * \param db dB value.
+   * \return Value in kilopascals.
    */
   inline double DbToKp (double db) const
   {
     return std::pow (10, db / 10.0);
   }
   /**
-   * \param kp value in kilopascals
-   * \returns dB re 1 uPa
-   * \brief Converts kilopascals to dB re 1 uPa
+   * Convert kilopascals to dB re 1 uPa.
+   *
+   * \param kp Value in kilopascals.
+   * \return Valeu in dB re 1 uPa
    */
   inline double KpToDb (double kp) const
   {
     return 10 * std::log10 (kp);
   }
-};
+
+protected:
+  virtual void DoDispose (void);
+  
+};  // class UanPhyCalcSinr
 
 /**
- * \class UanPhyPer
- * Used in UanPhy for determining probability of packet error based on received SINR and
- * modulation (mode).  Can be set in UanPhy via attributes
+ * \ingroup uan
+ *
+ * Calculate packet error probability, based on received SINR
+ * and modulation (mode).
+ *
+ * Can be set in UanPhy via attributes.
  */
 class UanPhyPer : public Object
 {
 public:
-  static TypeId GetTypeId (void);
-
   /**
-   * Calculates the prob. of packet error based on
+   * Calculate the packet error probability based on
    * SINR at the receiver and a tx mode.
-   * \param pkt Packet which is under consideration
-   * \param sinrDb SINR at receiver
-   * \param mode TX mode used to transmit packet
-   * \returns Probability of packet error
+   *
+   * \param pkt Packet which is under consideration.
+   * \param sinrDb SINR at receiver.
+   * \param mode TX mode used to transmit packet.
+   * \return Probability of packet error.
    */
   virtual double CalcPer (Ptr<Packet> pkt, double sinrDb, UanTxMode mode) = 0;
+
   /**
-   * Clears all pointer references
+   * Register this type.
+   * \return The TypeId.
    */
+  static TypeId GetTypeId (void);
+  /** Clear all pointer references. */
   virtual void Clear (void);
 
+protected:
   virtual void DoDispose (void);
-};
+
+};  // class UanPhyPer
 
 
 /**
- * \class UanPhyListener
+ * \ingroup uan
+ *
+ * Interface for PHY event listener.
  *
- * \brief Interface for PHY event listener
  * A class which implements this interface may register with Phy object
  * to receive notification of TX/RX/CCA events
  */
 class UanPhyListener
 {
 public:
-  virtual ~UanPhyListener ()
-  {
-  }
-  /**
-   * \brief Function called when Phy object begins receiving packet
-   */
+  /** Default destructor */
+  virtual ~UanPhyListener () { }
+  /** Called when UanPhy begins receiving packet. */
   virtual void NotifyRxStart (void) = 0;
-  /**
-   * \brief Function called when Phy object finishes receiving packet without error
-   */
+  /** Called when UanPhy finishes receiving packet without error. */
   virtual void NotifyRxEndOk (void) = 0;
-  /**
-   * \brief Function called when Phy object finishes receiving packet in error
-   */
+  /** Called when UanPhy finishes receiving packet in error. */
   virtual void NotifyRxEndError (void) = 0;
-  /**
-   * \brief Function called when Phy object begins sensing channel is busy
-   */
+  /** Called when UanPhy begins sensing channel is busy. */
   virtual void NotifyCcaStart (void) = 0;
-  /**
-   * \brief Function called when Phy object stops sensing channel is busy
-   */
+  /** Called when UanPhy stops sensing channel is busy. */
   virtual void NotifyCcaEnd (void) = 0;
   /**
-   * \param duration Duration of transmission
-   * \brief Function called when transmission starts from Phy object
+   * Called when transmission starts from Phy object.
+   *
+   * \param duration Duration of transmission.
    */
   virtual void NotifyTxStart (Time duration) = 0;
-};
+
+};  // class UanPhyListener
 
 /**
- * \class UanPhy
+ * \ingroup uan
  *
- * \brief Base class for UAN Phy models
+ * Base class for UAN Phy models.
  */
 class UanPhy : public Object
 {
 public:
-  static TypeId GetTypeId (void);
-
-  /// Enum defining possible Phy states
+  /// Enum defining possible Phy states.
   enum State
   {
-    IDLE, CCABUSY, RX, TX, SLEEP
+    IDLE,     //!< Idle state.
+    CCABUSY,  //!< Channel busy.
+    RX,       //!< Receiving.
+    TX,       //!< Transmitting.
+    SLEEP     //!< Sleeping.
   };
 
   /**
-   * arg1: packet received successfully
-   * arg2: snr of packet
-   * arg3: mode of packet
+   * Packet received successfully callback function type.
+   *
+   * \pname{arg1} Packet received successfully.
+   * \pname{arg2} SNIR of packet.
+   * \pname{arg3} Mode of packet.
    */
   typedef Callback<void, Ptr<Packet>, double, UanTxMode> RxOkCallback;
 
   /**
-   * arg1: packet received successfully
-   * arg2: snr of packet
+   * Packet receive error callback function type.
+   *
+   * \pname{arg1} Packet received successfully.
+   * \pname{arg2} SNIR of packet.
    */
   typedef Callback<void, Ptr<Packet>, double > RxErrCallback;
 
   /**
-   * \param callback DeviceEnergyModel change state callback.
-   *
-   * This function sets the DeviceEnergyModel callback for UanPhy device. Must
-   * be implemented by UanPhy child classes.
+   * Set the DeviceEnergyModel callback for UanPhy device. 
+   * 
+   * \param callback The DeviceEnergyModel change state callback.
    */
   virtual void SetEnergyModelCallback (DeviceEnergyModel::ChangeStateCallback callback) = 0;
   /**
-   * This function handles the energy depletion event. Must
-   * be implemented by UanPhy child classes.
+   * Handle the energy depletion event.
    */
   virtual void EnergyDepletionHandler (void) = 0;
   /**
-   * \param pkt  Packet to transmit
-   * \param modeNum  Index of mode in SupportedModes list to use for transmission
+   * Send a packet using a specific transmission mode.
+   *
+   * \param pkt  Packet to transmit.
+   * \param modeNum  Index of mode in SupportedModes list to use for transmission.
    */
   virtual void SendPacket (Ptr<Packet> pkt, uint32_t modeNum) = 0;
 
   /**
-   * \param listener New listener to register
+   * Register a UanPhyListener to be notified of common UanPhy events.
    *
-   * Register an object to be notified of common Phy events
+   * \param listener New listener to register.
    */
   virtual void RegisterListener (UanPhyListener *listener) = 0;
 
   /**
-   * \brief Packet arriving from channel:  i.e.  leading bit of packet has arrived.
-   * \param pkt Packet which is arriving
-   * \param rxPowerDb Signal power of incoming packet in dB
-   * \param txMode Transmission mode defining modulation of incoming packet
-   * \param pdp Power delay profile of incoming packet
+   * Packet arriving from channel:  i.e.  leading bit of packet has arrived.
+   *
+   * \param pkt Packet which is arriving.
+   * \param rxPowerDb Signal power of incoming packet in dB re 1 uPa.
+   * \param txMode Transmission mode defining modulation of incoming packet.
+   * \param pdp Power delay profile of incoming packet.
    */
   virtual void StartRxPacket (Ptr<Packet> pkt, double rxPowerDb, UanTxMode txMode, UanPdp pdp) = 0;
 
   /**
-   * \param cb Callback to be enabled when packet is received without error
+   * Set the callback to be used when a packet is received without error.
+   *
+   * \param cb The callback.
    */
   virtual void SetReceiveOkCallback (RxOkCallback cb) = 0;
 
   /**
-   * \param cb Callback to be enabled when a packet is received with errors
+   * Set the callback to be used when a packet is received with errors.
+   *
+   * \param cb The callback.
    */
   virtual void SetReceiveErrorCallback (RxErrCallback cb) = 0;
 
   /**
-   * \param gain Gain added at receiver
+   * Set the receiver gain.
+   *
+   * \param gain Gain added at receiver, in dB.
    */
-
   virtual void SetRxGainDb (double gain) = 0;
 
   /**
-   * \param txpwr Final output transmission power in dB
+   * Set the transmit power.
+   *
+   * \param txpwr Final output transmission power, in dB.
    */
   virtual void SetTxPowerDb (double txpwr) = 0;
 
   /**
-   * \param thresh Threshold SINR for propper reception in dB
+   * Set the minimum SINR threshold to receive a packet without errors.
+   *
+   * \deprecated See UanPhyPer.
+   *
+   * \param thresh Threshold SINR for propper reception in dB re 1 uPa.
    */
   virtual void SetRxThresholdDb (double thresh) = 0;
 
   /**
-   * \param thresh Signal power at receiver required for CCA busy state
+   * Set the threshold for detecting channel busy.
    *
+   * \param thresh Signal power threshold at receiver.
    */
   virtual void SetCcaThresholdDb (double thresh) = 0;
 
   /**
-   * \returns Gain added to signal at receiver in dB
+   * Get the receiver gain added to signal at receiver in dB.
+   *
+   * \return The gain.
    */
   virtual double GetRxGainDb (void) = 0;
 
   /**
-   * \returns Current TX power output
+   * Get the current transmit power, in dB.
+   *
+   * \return The transmit power.
    */
   virtual double GetTxPowerDb (void) = 0;
 
   /**
-   * \returns Required signal strength, in dB, to begin receiving packet
+   * Get the minimum received signal strength required
+   * to receive a packet without errors.
+   *
+   * \return The minimum required signal strength, in dB.
    */
   virtual double GetRxThresholdDb (void) = 0;
 
   /**
-   * \returns Threshold signal strength in dB to enter CCA busy mode
-   */
-  virtual double GetCcaThresholdDb (void) = 0;
-  /**
+   * Get the CCA threshold signal strength required to detect channel busy.
    *
-   * \returns True if Phy is SLEEP
+   * \return The CCA threshold signal strength in dB.
    */
+  virtual double GetCcaThresholdDb (void) = 0;
+  /** \return True if Phy is in SLEEP state. */
   virtual bool IsStateSleep (void) = 0;
-  /**
-   *
-   * \returns True if Phy is IDLE
-   */
+  /** \return True if Phy is in IDLE state. */
   virtual bool IsStateIdle (void) = 0;
-  /**
-   *
-   * \returns True if Phy is not IDLE
-   */
+  /** \return True if Phy is neither IDLE nor SLEEP. */
   virtual bool IsStateBusy (void) = 0;
-  /**
-   *
-   * \returns True if Phy is currently in receive mode
-   */
+  /** \return True if Phy is currently in receive mode. */
   virtual bool IsStateRx (void) = 0;
-  /**
-   *
-   * \returns True if Phy is busy transmitting
-   */
+  /** \return True if Phy is busy transmitting. */
   virtual bool IsStateTx (void) = 0;
-  /**
-   *
-   * \returns True if Phy is not TX or RX but the channel is sensed busy
-   */
+  /** \return True if Phy is in CCABUSY state. */
   virtual bool IsStateCcaBusy (void) = 0;
 
   /**
-   * \returns Channel this phy is attached to
+   * Get the attached channel.
+   *
+   * \return The channel.
    */
   virtual Ptr<UanChannel> GetChannel (void) const = 0;
 
   /**
-   * \returns the Net Device that this Phy is a part of
+   * Get the device hosting this Phy.
+   *
+   * \return The net device.
    */
   virtual Ptr<UanNetDevice> GetDevice (void) = 0;
 
   /**
-   * \param channel The channel this Phy is attached to
+   * Attach to a channel.
+   *
+   * \param channel The channel to attach to.
    */
   virtual void SetChannel (Ptr<UanChannel> channel) = 0;
 
   /**
-   * \param device The Net Device this Phy is a part of
+   * Set the device hosting this Phy.
+   *
+   * \param device The device.
    */
   virtual void SetDevice (Ptr<UanNetDevice> device) = 0;
 
   /**
-   * \param mac The MAC forwarding messages to this Phy
+   * Set the MAC forwarding messages to this Phy.
+   *
+   * \param mac The MAC.
    */
   virtual void SetMac (Ptr<UanMac> mac) = 0;
 
   /**
-   * \param packet Packet that is beginning transmission
-   * \param txPowerDb Transmit power of packet
-   * \param txMode  Transmission mode of packet
+   * Called when a transmission is beginning
+   * on the attched transducer.
    *
-   * Notification that there is a transmission beginning
-   * on the transducer that this Phy is attached to.
+   * \param packet Packet that is beginning transmission.
+   * \param txPowerDb Transmit power of packet.
+   * \param txMode  Transmission mode of packet.
    */
-
   virtual void NotifyTransStartTx (Ptr<Packet> packet, double txPowerDb, UanTxMode txMode) = 0;
 
   /**
-   *
-   * Function called when there has been a change in the
+   * Called when there has been a change in the
    * ammount of interference this node is experiencing
-   * from other transmissions
+   * from other transmissions.
    */
   virtual void NotifyIntChange (void) = 0;
 
   /**
+   * Attach a transducer to this Phy.
    *
-   * \param trans Transducer this Phy outputs to / receives from
+   * \param trans The transducer.
    */
   virtual void SetTransducer (Ptr<UanTransducer> trans) = 0;
 
   /**
-   * \returns Transducer this Phy outputs to / receives from
+   * Get the attached transducer.
+   *
+   * \return The transducer.
    */
   virtual Ptr<UanTransducer> GetTransducer (void) = 0;
 
   /**
-   * \returns Number of TX modes supported by this PHY
+   * Get the number of transmission modes supported by this Phy.
+   *
+   * \return The number modes.
    */
   virtual uint32_t GetNModes (void) = 0;
 
   /**
-   * \param n Mode number of mode to return (place in Modeslist)
-   * \returns Mode n
+   * Get a specific transmission mode.
+   *
+   * \param n The mode number.
+   * \return The mode.
    */
   virtual UanTxMode GetMode (uint32_t n) = 0;
 
   /**
-   * \warning Returns non-valid pointer if IsStateRx == false
-   * \returns Packet currently being received in PHY
+   * Get the packet currently being received.
+   *
+   * \warning Returns non-valid pointer if IsStateRx == false.
+   * \return The packet.
    */
   virtual Ptr<Packet> GetPacketRx (void) const = 0;
 
-  /**
-   * Clears all pointer references
-   */
+  /** Clear all pointer references. */
   virtual void Clear (void) = 0;
 
+  /**
+   * Set the Phy SLEEP mode.
+   *
+   * \param sleep SLEEP on or off.
+   */
   virtual void SetSleepMode (bool sleep) = 0;
 
 
   /**
-   * Public method used to fire a PhyTxBegin trace.  Implemented for encapsulation
+   * Called when the transducer begins transmitting a packet.
+   *
+   * This fires a PhyTxBegin trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet The packet.
    */
   void NotifyTxBegin (Ptr<const Packet> packet);
 
   /**
-   * Public method used to fire a PhyTxEnd trace.  Implemented for encapsulation
+   * Called when the transducer finishes transmitting a packet.
+   *
+   * This fires a PhyTxEnd trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet The packet.
    */
   void NotifyTxEnd (Ptr<const Packet> packet);
 
   /**
-   * Public method used to fire a PhyTxDrop trace.  Implemented for encapsulation
+   * Called when the transducer attempts to transmit a new packet while
+   * already transmitting a prior packet.
+   *
+   * This fires a PhyTxDrop trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet The packet.
    */
   void NotifyTxDrop (Ptr<const Packet> packet);
 
   /**
-   * Public method used to fire a PhyRxBegin trace.  Implemented for encapsulation
+   * Called when the Phy begins to receive a packet.
+   *
+   * This fires a PhyRxBegin trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet The packet.
    */
   void NotifyRxBegin (Ptr<const Packet> packet);
 
   /**
-   * Public method used to fire a PhyRxEnd trace.  Implemented for encapsulation
+   * Called when a packet is received without error.
+   *
+   * This fires a PhyRxEnd trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet The packet.
    */
   void NotifyRxEnd (Ptr<const Packet> packet);
 
   /**
-   * Public method used to fire a PhyRxDrop trace.  Implemented for encapsulation
+   * Called when the Phy drops a packet.
+   *
+   * This fires a PhyRxDrop trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet The packet.
    */
   void NotifyRxDrop (Ptr<const Packet> packet);
 
@@ -424,60 +488,68 @@
   * used by this model.  Return the number of streams (possibly zero) that
   * have been assigned.
   *
-  * \param stream first stream index to use
-  * \return the number of stream indices assigned by this model
+  * \param stream First stream index to use.
+  * \return The number of stream indices assigned by this model.
   */
   virtual int64_t AssignStreams (int64_t stream) = 0;
 
+  /**
+   * Register this type.
+   * \return The TypeId.
+   */
+  static TypeId GetTypeId (void);
+
 private:
   /**
-   * The trace source fired when a packet begins the transmission process on
-   * the medium.
+   * Trace source indicating a packet has begun transmitting
+   * over the channel medium.
    *
    * \see class CallBackTraceSource
    */
   TracedCallback<Ptr<const Packet> > m_phyTxBeginTrace;
 
   /**
-   * The trace source fired when a packet ends the transmission process on
-   * the medium.
+   * Trace source indicating a packet has been completely transmitted
+   * over the channel.
    *
    * \see class CallBackTraceSource
    */
   TracedCallback<Ptr<const Packet> > m_phyTxEndTrace;
 
   /**
-   * The trace source fired when the phy layer drops a packet as it tries
-   * to transmit it.
+   * Trace source indicating a packet has been dropped by the device
+   * during transmission.
    *
    * \see class CallBackTraceSource
    */
   TracedCallback<Ptr<const Packet> > m_phyTxDropTrace;
 
   /**
-   * The trace source fired when a packet begins the reception process from
-   * the medium.
+   * Trace source indicating a packet has begun being received
+   * from the channel medium by the device.
    *
    * \see class CallBackTraceSource
    */
   TracedCallback<Ptr<const Packet> > m_phyRxBeginTrace;
 
   /**
-   * The trace source fired when a packet ends the reception process from
-   * the medium.
+   * Trace source indicating a packet has been completely received
+   * from the channel medium by the device.
    *
    * \see class CallBackTraceSource
    */
   TracedCallback<Ptr<const Packet> > m_phyRxEndTrace;
 
   /**
-   * The trace source fired when the phy layer drops a packet it has received.
+   * Trace source indicating a packet has been dropped by the device
+   * during reception.
    *
    * \see class CallBackTraceSource
    */
   TracedCallback<Ptr<const Packet> > m_phyRxDropTrace;
-};
 
-}
+};  // class UanPhy
+
+} // namespace ns3
 
 #endif /* UAN_PHY_H */
diff -Naur ns-3.18.1/src/uan/model/uan-prop-model.cc ns-3.19/src/uan/model/uan-prop-model.cc
--- ns-3.18.1/src/uan/model/uan-prop-model.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-prop-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,7 @@
 namespace ns3 {
 
 std::ostream &
-operator<< (std::ostream &os, UanPdp &pdp)
+operator<< (std::ostream &os, const UanPdp &pdp)
 {
   os << pdp.GetNTaps () << '|';
   os << pdp.GetResolution ().GetSeconds () << '|';
@@ -336,7 +336,8 @@
   return pdp;
 }
 
-NS_OBJECT_ENSURE_REGISTERED (UanPropModel);
+NS_OBJECT_ENSURE_REGISTERED (UanPropModel)
+  ;
 
 TypeId UanPropModel::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/uan/model/uan-prop-model.h ns-3.19/src/uan/model/uan-prop-model.h
--- ns-3.18.1/src/uan/model/uan-prop-model.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-prop-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -35,8 +35,9 @@
 class UanTxMode;
 
 /**
- * \class Tap
- * \brief Holds PDP Tap information (amplitude and delay)
+ * \ingroup uan
+ *
+ * Holds PDP Tap information (amplitude and delay)
  */
 class Tap
 {
@@ -46,26 +47,35 @@
    */
   Tap ();
   /**
+   * Constructor
+   *
    * \param delay Time delay (usually from first arrival) of signal
    * \param amp Complex amplitude of arrival
    */
   Tap (Time delay, std::complex<double> amp);
   /**
-   * \returns Complex amplitude of arrival
+   * Get the complex amplitude of arrival.
+   *
+   * \return The amplitude.
    */
   std::complex<double> GetAmp (void) const;
   /**
-   * \returns Time delay (usually from first arrival) of signal
+   * Get the delay time, usually from first arrival of signal.
+   * \return The time delay.
    */
   Time GetDelay (void) const;
 
 private:
-  std::complex<double> m_amplitude;
-  Time m_delay;
-};
+  std::complex<double> m_amplitude;  //!< The amplitude.
+  Time m_delay;                      //!< The time delay.
 
+};  // class Tap
+
+  
 /**
- * \class UanPdp
+ * \ingroup uan
+ *
+ * The power delay profile returned by propagation models.
  *
  * Container class to describe power delay profile returned
  * from UAN propagation models using tapped delay line model.
@@ -77,180 +87,242 @@
  * power on any interval (t1, t2) can then be found from
  * summing the taps on the interval and multiplying by
  * the total received power at the receiver.
- *
- *
  */
 class UanPdp
 {
 public:
   /**
-   * \brief Iterator is a standard template library constant interator
+   * Convenience iterator typedef.
    */
   typedef std::vector<Tap>::const_iterator Iterator;
   /**
-   * \brief Create empty PDP object
+   * Create empty PDP object.
    */
   UanPdp ();
   /**
-   * \brief Create PDP object from a vector of Tap objects
-   * \param taps Taps to include in this PDP
-   * \param resolution Resolution of PDP object
+   * Create PDP object from a vector of Tap objects.
+   *
+   * \param taps Taps to include in this PDP.
+   * \param resolution Resolution of PDP object.
    */
   UanPdp (std::vector<Tap> taps, Time resolution);
   /**
-   * \brief Create PDP object from vector of arrival amplitudes
-   * \param arrivals  Vector of complex amplitude arrivals
-   * \param resolution Time duration between arrivals in vector
+   * Create PDP object from vector of arrival amplitudes.
+   *
+   * \param arrivals  Vector of complex amplitude arrivals.
+   * \param resolution Time duration between arrivals in vector.
    */
   UanPdp (std::vector<std::complex<double > > arrivals, Time resolution);
   /**
-   * \brief Create PDP object from real valued arrival amplitudes
-   * \param arrivals vector of real valued arrivals
-   * \param resolution Time duration between arrivals in vector
+   * Create PDP object from real valued arrival amplitudes.
+   *
+   * \param arrivals Vector of real valued arrivals.
+   * \param resolution Time duration between arrivals in vector.
    */
   UanPdp (std::vector<double> arrivals, Time resolution);
+  /** Dummy destructor, see DoDispose. */
   ~UanPdp ();
 
   /**
-   * \param arrival complex arrival value
-   * \param index index of arrival
+   * Set the arrival value for a tap.
+   *
+   * The delay time is the index multiplied by the resolution.
+   * The tap vector will be expanded to accomadate the requested
+   * index.
+   *
+   * \param arrival Complex arrival value.
+   * \param index Index of arrival.
    */
   void SetTap (std::complex<double> arrival, uint32_t index);
   /**
-   * \param nTaps number of taps in this PDP
+   * Resize the tap vector.
+   *
+   * \param nTaps Number of taps in this PDP
    */
   void SetNTaps (uint32_t nTaps);
   /**
-   * \param resolution Resolution of PDP (time between arrivals)
+   * Set the time duration (resolution) between arrivals.
+   *
+   * \param resolution The resolution.
    */
   void SetResolution (Time resolution);
   /**
-   * \returns Iterator positioned at first arrival
+   * Get the beginning of the tap vector.
+   *
+   * \return Iterator positioned at first arrival.
    */
   Iterator GetBegin (void) const;
   /**
-   * \returns Iterator positioned after last arrival
+   * Get the end of the tap list (one beyond the last entry).
+   *
+   * \return Iterator positioned after last arrival
    */
   Iterator GetEnd (void) const;
   /**
-   * \returns Number of taps in PDP
+   * Get the number of taps.
+   *
+   * \return Number of taps in PDP.
    */
   uint32_t GetNTaps (void) const;
   /**
-   * \returns Tap object at index i
-   * \param i Index number of tap to return (0 based)
+   * Get the Tap at the specified delay index.
+   *
+   * \param i Index number of tap to return (0 based).
+   * \return Tap object at index i.
    */
   const Tap &GetTap (uint32_t i) const;
   /**
-   * \returns Resolution of PDP (time duration between arrivals)
+   * Get the delay time resolution (time duration between arrivals).
+   * 
+   * \return Resolution of PDP.
    */
   Time GetResolution (void) const;
   /**
-   * \param begin Time value to begin summing arrivals
-   * \param end Time value to end summing arrivals
-   * \returns Returns Non-coherent sum of arrivals between two time values
+   * Compute the non-coherent sum of tap amplitudes
+   * between a start and end time.
    *
    * Assuming that Tap at index 0 arrives at time 0,
    * this function sums non-coherently (sums amplitude of arrivals
    * ignoring phase difference) all arrivals between a start
    * and end time.
+   *
+   * \param begin Time value to begin summing arrivals.
+   * \param end Time value to end summing arrivals.
+   * \return Non-coherent sum of arrivals between two time values.
    */
   double SumTapsNc (Time begin, Time end) const;
   /**
-   * \param begin Time value to begin summing arrivals
-   * \param end Time value to end summing arrivals
-   * \returns Returns coherent sum of arrivals between two time values
+   * Compute the coherent sum of tap amplitudes
+   * between a start and end time.
    *
    * Assuming that Tap at index 0 arrives at time 0,
    * this function sums coherently (sums amplitude of arrivals
    * considering phase difference) all arrivals between a start
    * and end time.
+   *
+   * \param begin Time value to begin summing arrivals.
+   * \param end Time value to end summing arrivals.
+   * \return Coherent sum of arrivals between two time values.
    */
   std::complex<double> SumTapsC (Time begin, Time end) const;
   /**
-   * \param delay Time duratation after max to begin summing arrivals
-   * \param duration Time duration to sum arrivals for
-   * \returns non-coherent sum of arrivals after max in given window
+   * Compute the non-coherent sum of tap amplitudes
+   * starting after a delay from the maximum amplitude
+   * for a total time duration.
    *
-   * this function sums non-coherently (sums amplitude of arrivals
+   * This function sums non-coherently (sums amplitude of arrivals
    * ignoring phase difference) all arrivals in a given duration
-   * starting the given time after the maximum amplitude arrival received
+   * starting the given time after the maximum amplitude arrival received.
+   *
+   * \param delay Time duratation after max to begin summing arrivals.
+   * \param duration Time duration to sum arrivals for.
+   * \return Non-coherent sum of arrivals after max in given window.
    */
   double SumTapsFromMaxNc (Time delay, Time duration) const;
   /**
-   * \param delay Time duratation after max to begin summing arrivals
-   * \param duration Time duration to sum arrivals for
-   * \returns coherent sum of arrivals after max in given window
+   * Compute the coherent sum of tap amplitudes
+   * starting after a delay from the maximum amplitude
+   * for a total duration.
    *
    * this function sums coherently (sums amplitude of arrivals
    * considering phase difference) all arrivals in a given duration
    * starting the given time after the maximum amplitude arrival received
+   *
+   * \param delay Time duratation after max to begin summing arrivals.
+   * \param duration Time duration to sum arrivals for.
+   * \return Coherent sum of arrivals after max in given window.
    */
   std::complex<double> SumTapsFromMaxC (Time delay, Time duration) const;
 
   /**
-   * \returns A PDP with a singlue unit impulse arrival at time 0
+   * Get a unit impulse PDP at time 0.
+   *
+   * \return The unit impulse.
    */ 
   static UanPdp CreateImpulsePdp (void);
+  
 private:
-  friend std::ostream &operator<< (std::ostream &os, UanPdp &pdp);
+  friend std::ostream &operator<< (std::ostream &os, const UanPdp &pdp);
   friend std::istream &operator>> (std::istream &is, UanPdp &pdp);
-  std::vector<Tap> m_taps;
-  Time m_resolution;
+  
+  std::vector<Tap> m_taps;  //!< The vector of Taps.
+  Time m_resolution;        //!< The time resolution.
+
+};  // class UanPdp
+
 
-};
 /**
- * \brief Writes PDP to stream as list of arrivals
+ * \ingroup uan
+ *
+ * Writes PDP to stream as list of arrivals
+ *
+ * \param os The output stream.
+ * \param pdp The PDP.
+ * \return The output stream.
  */
-std::ostream &operator<< (std::ostream &os, UanPdp &pdp);
+std::ostream &operator<< (std::ostream &os, const UanPdp &pdp);
 /**
- * \brief Reads in list of arrivals from stream is
+ * \ingroup uan
+ *
+ * Reads in list of arrivals from stream is
+ *
+ * \param is The input stream.
+ * \param pdp The PDP variable to set.
+ * \return The input stream.
  */
-std::istream &operator>> (std::ostream &is, UanPdp &pdp);
+std::istream &operator>> (std::istream &is, UanPdp &pdp);  
 
+  
 /**
- * \class UanPropModel
+ * \ingroup uan
  *
  * Base class for implemented underwater propagation models
  */
 class UanPropModel : public Object
 {
 public:
+  /**
+   * Register this type.
+   * \return The object TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
    * Computes pathloss between nodes a and b.
-   * \returns Pathloss in dB re 1 uPa
+   *
    * \param a Ptr to mobility model of node a
    * \param b Ptr to mobility model of node b
    * \param txMode TX mode of transmission between a and b
+   * \return Pathloss in dB re 1 uPa
    */
   virtual double GetPathLossDb (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode txMode) = 0;
 
   /**
-   * \returns PDP for link between nodes a and b
-   * \param a Ptr to mobility model of node a
-   * \param b Ptr to mobility model of node b
-   * \param mode TX mode of transmission from a to b
+   * Get the PDP for the path between two nodes.
+   *
+   * \param a Ptr to mobility model of node a.
+   * \param b Ptr to mobility model of node b.
+   * \param mode TX mode of transmission from a to b.
+   * \return PDP for link between nodes a and b.
    */
   virtual UanPdp GetPdp (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode mode) = 0;
   /**
-   * Finds propagation delay between nodes a and b
-   * \param a Ptr to mobility model of node a
-   * \param b Ptr to mobility model of node b
-   * \param mode TX mode of transmission
-   * \returns Propagation delay
+   * Finds propagation delay between nodes a and b.
+   *
+   * \param a Ptr to mobility model of node a.
+   * \param b Ptr to mobility model of node b.
+   * \param mode TX mode of transmission.
+   * \return Propagation delay.
    */
   virtual Time GetDelay (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode mode) = 0;
 
-  /**
-   * Clears all pointer references
-   */
+  /** Clear all pointer references. */
   virtual void Clear (void);
 
   virtual void DoDispose (void);
-};
 
-}
+};  // class UanPropModel
+
+} // namespace ns3
 
 #endif /* UAN_PROP_MODEL_H */
diff -Naur ns-3.18.1/src/uan/model/uan-prop-model-ideal.cc ns-3.19/src/uan/model/uan-prop-model-ideal.cc
--- ns-3.18.1/src/uan/model/uan-prop-model-ideal.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-prop-model-ideal.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanPropModelIdeal);
+NS_OBJECT_ENSURE_REGISTERED (UanPropModelIdeal)
+  ;
 
 UanPropModelIdeal::UanPropModelIdeal ()
 {
diff -Naur ns-3.18.1/src/uan/model/uan-prop-model-ideal.h ns-3.19/src/uan/model/uan-prop-model-ideal.h
--- ns-3.18.1/src/uan/model/uan-prop-model-ideal.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-prop-model-ideal.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,24 +28,31 @@
 namespace ns3 {
 
 /**
- * \class UanPropModelIdeal
+ * \ingroup uan
  *
- * \brief Ideal propagation model (no pathloss, impulse PDP)
+ * Ideal propagation model (no pathloss, impulse PDP).
  */
 class UanPropModelIdeal : public UanPropModel
 {
 public:
+  /** Default constructor. */
   UanPropModelIdeal ();
+  /** Destructor */
   virtual ~UanPropModelIdeal ();
 
+  /**
+   * Register this type.
+   * \return The object TypeId.
+   */
   static TypeId GetTypeId (void);
 
   // Inherited methods
   virtual double GetPathLossDb (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode mode);
   virtual UanPdp GetPdp (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode mode);
   virtual Time GetDelay (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode mode);
-};
 
-}
+};  // class UanPropModelIdeal
+
+} // namespace ns3
 
 #endif /* UAN_PROP_MODEL_IDEAL_H */
diff -Naur ns-3.18.1/src/uan/model/uan-prop-model-thorp.cc ns-3.19/src/uan/model/uan-prop-model-thorp.cc
--- ns-3.18.1/src/uan/model/uan-prop-model-thorp.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-prop-model-thorp.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanPropModelThorp);
+NS_OBJECT_ENSURE_REGISTERED (UanPropModelThorp)
+  ;
 
 UanPropModelThorp::UanPropModelThorp ()
 {
@@ -43,7 +44,7 @@
     .SetParent<Object> ()
     .AddConstructor<UanPropModelThorp> ()
     .AddAttribute ("SpreadCoef",
-                   "Spreading coefficient used in calculation of Thorp's approximation",
+                   "Spreading coefficient used in calculation of Thorp's approximation.",
                    DoubleValue (1.5),
                    MakeDoubleAccessor (&UanPropModelThorp::m_SpreadCoef),
                    MakeDoubleChecker<double> ())
diff -Naur ns-3.18.1/src/uan/model/uan-prop-model-thorp.h ns-3.19/src/uan/model/uan-prop-model-thorp.h
--- ns-3.18.1/src/uan/model/uan-prop-model-thorp.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-prop-model-thorp.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,28 +28,47 @@
 class UanTxMode;
 
 /**
- * \class UanPropModelThorp
- * \brief Uses Thorp's approximation to compute pathloss.  Assumes implulse PDP.
+ * \ingroup uan
+ *
+ * Uses Thorp's approximation to compute pathloss.  Assumes implulse PDP.
  */
 class UanPropModelThorp : public UanPropModel
 {
 public:
+  /** Default constructor. */
   UanPropModelThorp ();
+  /** Destructor */
   virtual ~UanPropModelThorp ();
 
+  /**
+   * Register this type.
+   * \return The object TypeId.
+   */
   static TypeId GetTypeId (void);
 
+  // Inherited methods
   virtual double GetPathLossDb (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode mode);
   virtual UanPdp GetPdp (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode mode);
   virtual Time GetDelay (Ptr<MobilityModel> a, Ptr<MobilityModel> b, UanTxMode mode);
 
 private:
+  /**
+   * Get the attenuation in dB / 1000 yards..
+   * \param freqKhz The channel center frequency, in kHz.
+   * \return The attenuation, in dB / 1000 yards..
+   */
   double GetAttenDbKyd (double freqKhz);
+  /**
+   * Get the attenuation in dB / km.
+   * \param freqKhz The channel center frequency, in kHz.
+   * \return The attenuation, in dB/km.
+   */
   double GetAttenDbKm (double freqKhz);
 
-  double m_SpreadCoef;
-};
+  double m_SpreadCoef;  //!< Spreading coefficient used in calculation of Thorp's approximation.
 
-}
+};  // class UanPropModelThorp
+
+} // namespace ns3
 
 #endif /* UAN_PROP_MODEL_THORP_H */
diff -Naur ns-3.18.1/src/uan/model/uan-transducer.cc ns-3.19/src/uan/model/uan-transducer.cc
--- ns-3.18.1/src/uan/model/uan-transducer.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-transducer.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanTransducer);
+NS_OBJECT_ENSURE_REGISTERED (UanTransducer)
+  ;
 
 TypeId UanTransducer::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/uan/model/uan-transducer.h ns-3.19/src/uan/model/uan-transducer.h
--- ns-3.18.1/src/uan/model/uan-transducer.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-transducer.h	2013-12-20 09:44:50.000000000 -0800
@@ -35,25 +35,27 @@
 
 
 /**
- * \class UanPacketArrival
+ * \ingroup uan
  *
- * \brief Class consisting of packet arrival information (Time, RxPower, mode, PDP)
+ * Class consisting of packet arrival information (Time, RxPower, mode, PDP).
  */
 class UanPacketArrival
 {
 public:
 
-  /* default constructor so python scan works */
-  UanPacketArrival ()
+  /** Default constructor. */
+  UanPacketArrival () 
   {
   }
 
   /**
-   * \param packet Packet arriving
-   * \param rxPowerDb RX signal power in dB of arriving packet
-   * \param txMode TX mode of arriving packet
-   * \param pdp Power delay profile of arriving packet
-   * \param arrTime Arrival time of packet
+   * Constructor.
+   *
+   * \param packet Packet arriving.
+   * \param rxPowerDb RX signal power in dB of arriving packet.
+   * \param txMode TX mode of arriving packet.
+   * \param pdp Power delay profile of arriving packet.
+   * \param arrTime Arrival time of packet.
    */
   UanPacketArrival (Ptr<Packet> packet, double rxPowerDb, UanTxMode txMode, UanPdp pdp, Time arrTime)
     : m_packet (packet),
@@ -64,57 +66,70 @@
   {
   }
 
+  /** Destructor */
   ~UanPacketArrival()
   {
     m_packet = 0;
   }
 
   /**
-   * \returns Pointer to packet that arrived
+   * Get the arriving packet.
+   *
+   * \return Pointer to packet.
    */
   inline Ptr<Packet> GetPacket (void) const
   {
     return m_packet;
   }
   /**
-   * \returns Received signal strength in dB re 1uPa
+   * Get the received signal strength.
+   *
+   * \return Received signal strength in dB re 1uPa
    */
   inline double GetRxPowerDb (void) const
   {
     return m_rxPowerDb;
   }
   /**
-   * \returns UanTxMode used to transmit packet
+   * Get the transmission mode of the packet.
+   *
+   * \return UanTxMode.
    */
   inline const UanTxMode &GetTxMode (void) const
   {
     return m_txMode;
   }
   /**
-   * \returns Arrival time of packet
+   * Get the packet arrival time.
+   *
+   * \return Arrival time.
    */
   inline Time GetArrivalTime (void) const
   {
     return m_arrTime;
   }
   /**
-   * \returns PDP of arriving signal
+   * Get the propagation delay profile.
+   *
+   * \return PDP of arriving signal.
    */
   inline UanPdp GetPdp (void) const
   {
     return m_pdp;
   }
 private:
-  Ptr<Packet> m_packet;
-  double m_rxPowerDb;
-  UanTxMode m_txMode;
-  UanPdp m_pdp;
-  Time m_arrTime;
-};
+  Ptr<Packet> m_packet;  //!< The arrived packet.
+  double m_rxPowerDb;    //!< The received power, in dB.
+  UanTxMode m_txMode;    //!< The transmission mode.
+  UanPdp m_pdp;          //!< The propagation delay profile.
+  Time m_arrTime;        //!< The arrival time.
+
+};  // class UanPacketArrival
 
 /**
- * \class UanTransducer
- * \brief Virtual base for Transducer objects
+ * \ingroup uan
+ *
+ * Virtual base for Transducer objects.
  *
  * The Transducer was added to support classes such as UanPhyDual.
  * In a generic Phy setting, this class functions to hold information about all
@@ -123,79 +138,99 @@
 class UanTransducer : public Object
 {
 public:
-  static TypeId GetTypeId (void);
-
   /**
-   * \brief Transducer state (receiving or transmitting)
+   * Register this type.
+   * \return The object TypeId.
    */
+  static TypeId GetTypeId (void);
+
+  /** Transducer state. */
   enum State {
-    TX, RX
+    TX,  //!< Transmitting.
+    RX   //!< Receiving.
   };
 
-  /**
-   * \brief Arrival list is a standard template library list of UanPacketArrivals objects
-   */
+  /** List of arriving packets overlapping in time. */
   typedef std::list<UanPacketArrival> ArrivalList;
-  /**
-   * \brief UanPhyList is a standard template library list of UanPhy objects
-   */
+  /** List of UanPhy objects. */
   typedef std::list<Ptr<UanPhy> > UanPhyList;
 
   /**
-   * \returns State (TX or RX) of this transducer
+   * Get the transducer state.
+   *
+   * \return State (TX or RX) of this transducer.
    */
   virtual State GetState (void) const = 0;
 
   /**
-   * \returns True if this transducer is available for receiving an incoming packet.
+   * Is the state receiving (or available for reception)?
+   *
+   * \return True if this transducer is available for receiving
+   *   an incoming packet.
    */
   virtual bool IsRx (void) const = 0;
   /**
-   * \returns True if there is a packet being transmitted from this transducer.
+   * Is the state transmitting?
+   * 
+   * \return True if there is a packet being transmitted from this transducer.
    */
   virtual bool IsTx (void) const = 0;
   /**
-   * \returns List of all packets currently crossing this node in the water.
+   * Get the list of overlapped (in time) packets at this transducer.
+   *
+   * \return List of all packets currently crossing this node in the water.
    */
   virtual const ArrivalList &GetArrivalList (void) const = 0;
   /**
-   * \brief Receive Notify this object that a new packet has arrived at this nodes location
-   * \param packet Packet arriving
-   * \param rxPowerDb Signal power in dB of arriving packet
-   * \param txMode Mode arriving packet is using
-   * \param pdp PDP of arriving signal
+   * Notify this object that a new packet has arrived at this nodes location
+   *
+   * \param packet Packet arriving.
+   * \param rxPowerDb Signal power in dB of arriving packet.
+   * \param txMode Mode arriving packet is using.
+   * \param pdp PDP of arriving signal.
    */
   virtual void Receive (Ptr<Packet> packet, double rxPowerDb, UanTxMode txMode, UanPdp pdp) = 0;
   /**
-   * \brief Transmit a packet from this transducer
-   * \param src Source PHY
-   * \param packet Packet to transmit
-   * \param txPowerDb Outgoing Tx power of packet
+   * Transmit a packet from this transducer.
+   *
+   * \param src Source PHY.
+   * \param packet Packet to transmit.
+   * \param txPowerDb Outgoing Tx power of packet.
    * \param txMode Mode to transmit packet with.
    */
   virtual void Transmit (Ptr<UanPhy> src, Ptr<Packet> packet, double txPowerDb, UanTxMode txMode) = 0;
   /**
-   * \param chan Channel this transducer is attached to
+   * Attach this transducer to a channel.
+   * 
+   * \param chan The channel
    */
   virtual void SetChannel (Ptr<UanChannel> chan) = 0;
   /**
-   * \returns Channel this transducer is attached to
+   * Get the attached channel.
+   *
+   * \return The channel.
    */
   virtual Ptr<UanChannel> GetChannel (void) const = 0;
   /**
-   * \param phy Add phy above this transducer (may connect > 1 Phy to a transducer)
+   * Attach a physical network layer above this transducer.
+   *
+   * More than one physical layer may be attached.
+   *
+   * \param phy The physical layer.
    */
   virtual void AddPhy (Ptr<UanPhy> phy) = 0;
   /**
-   * \returns List of all Phy's this transducer sends packets to.
+   * Get the list of physical layer above this transducer.
+   *
+   * \return List of attached physical layers.
    */
   virtual const UanPhyList &GetPhyList (void) const = 0;
   /**
-   * Clears all pointer references
+   * Clears all pointer references.
    */
   virtual void Clear (void) = 0;
 
-};
+};  // class UanTransducer
 
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/uan/model/uan-transducer-hd.cc ns-3.19/src/uan/model/uan-transducer-hd.cc
--- ns-3.18.1/src/uan/model/uan-transducer-hd.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-transducer-hd.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,9 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UanTransducerHd);
+NS_OBJECT_ENSURE_REGISTERED (UanTransducerHd)
+  ;
+  
 UanTransducerHd::UanTransducerHd ()
   : UanTransducer (),
     m_state (RX),
@@ -153,8 +155,6 @@
                            double txPowerDb,
                            UanTxMode txMode)
 {
-
-  Time endTxTime;
   if (m_state == TX)
     {
       Simulator::Remove (m_endTxEvent);
diff -Naur ns-3.18.1/src/uan/model/uan-transducer-hd.h ns-3.19/src/uan/model/uan-transducer-hd.h
--- ns-3.18.1/src/uan/model/uan-transducer-hd.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-transducer-hd.h	2013-12-20 09:44:50.000000000 -0800
@@ -26,17 +26,25 @@
 namespace ns3 {
 
 /**
- * \class UanTransducerHd
- * \brief Half duplex implementation of transducer object
+ * \ingroup uan
  *
- * This class will only allow attached Phy's to receive packets if not in TX mode
+ * Half duplex implementation of transducer object
+ *
+ * This class will only allow attached Phy's to receive packets
+ * if not in TX mode.
  */
 class UanTransducerHd : public UanTransducer
 {
 public:
+  /** Constructor */
   UanTransducerHd ();
+  /** Dummy destructor, see DoDispose */
   virtual ~UanTransducerHd ();
 
+  /**
+   * Register this type.
+   * \return The object TypeId.
+   */
   static TypeId GetTypeId (void);
 
   // inherited methods
@@ -53,20 +61,27 @@
   virtual void Clear (void);
 
 private:
-  State m_state;
-  ArrivalList m_arrivalList;
-  UanPhyList m_phyList;
-  Ptr<UanChannel> m_channel;
-  EventId m_endTxEvent;
-  Time m_endTxTime;
-  bool m_cleared;
-
+  State m_state;              //!< Transducer state.
+  ArrivalList m_arrivalList;  //!< List of arriving packets which overlap in time.
+  UanPhyList m_phyList;       //!< List of physical layers attached above this tranducer.
+  Ptr<UanChannel> m_channel;  //!< The attached channel.
+  EventId m_endTxEvent;       //!< Event scheduled for end of transmission.
+  Time m_endTxTime;           //!< Time at which transmission will be completed.
+  bool m_cleared;             //!< Flab when we've been cleared.
+
+  /**
+   * Remove an entry from the arrival list.
+   *
+   * \param arrival The packet arrival to remove.
+   */
   void RemoveArrival (UanPacketArrival arrival);
+  /** Handle end of transmission event. */
   void EndTx (void);
 protected:
   virtual void DoDispose ();
-};
 
-}
+};  // class UanTransducerHd
+
+} // namespace ns3
 
 #endif /* UAN_TRANSDUCER_HD_H */
diff -Naur ns-3.18.1/src/uan/model/uan-tx-mode.cc ns-3.19/src/uan/model/uan-tx-mode.cc
--- ns-3.18.1/src/uan/model/uan-tx-mode.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-tx-mode.cc	2013-12-20 09:44:50.000000000 -0800
@@ -300,6 +300,7 @@
   return is;
 }
 
-ATTRIBUTE_HELPER_CPP (UanModesList);
+ATTRIBUTE_HELPER_CPP (UanModesList)
+  ;
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/uan/model/uan-tx-mode.h ns-3.19/src/uan/model/uan-tx-mode.h
--- ns-3.18.1/src/uan/model/uan-tx-mode.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/model/uan-tx-mode.h	2013-12-20 09:44:50.000000000 -0800
@@ -30,51 +30,75 @@
 class UanTxMode;
 
 /**
- * \class UanTxMode
- * \brief Abstraction of packet modulation information
+ * \ingroup uan
+ *
+ * Abstraction of packet modulation information.
+ *
+ * This contains a lightweight globally unique id for the mode.
+ * Mode details are held in the UanTxModeFactory.  Attributes
+ * are set in by the UanTxModeFactory constructor.
  */
 class UanTxMode
 {
 public:
-  UanTxMode ();
-  ~UanTxMode ();
+  UanTxMode ();   //!< Constructor.
+  ~UanTxMode ();  //!< Destructor.
 
   /**
-   * Modulation type
+   * Modulation type.
    */
   typedef enum {
-    PSK, QAM, FSK, OTHER
+    PSK,   //!< Phase shift keying.
+    QAM,   //!< Quadrature amplitude modulation.
+    FSK,   //!< Frequency shift keying.
+    OTHER  //!< Unspecified/undefined.
   } ModulationType;
   /**
-   * \returns The modulation type of the mode
+   * Get the modulation type of the mode.
+   *
+   * \return The modulation type.
    */
   ModulationType GetModType (void) const;
   /**
-   * \returns Data rate of the TX mode in bits per second
+   * Get the data rate of the transmit mode.
+   *
+   * \return Data rate of the TX mode, in bits per second.
    */
   uint32_t GetDataRateBps (void) const;
   /**
-   * \returns PHY rate in symbols per second
+   * Get the physical signaling rate.
+   *
+   * \return PHY rate in symbols per second.
    */
   uint32_t GetPhyRateSps (void) const;
   /**
-   * \returns Center frequency of transmitted signal in Hz
+   * Get the transmission center frequency.
+   *
+   * \return Center frequency, in Hz.
    */
   uint32_t GetCenterFreqHz (void) const;
   /**
-   * \returns Bandwidth of transmitted signal in Hz
+   * Get the transmission signal bandwidth.
+   *
+   * \return Bandwidth in Hz.
    */
   uint32_t GetBandwidthHz (void) const;
   /**
-   * \returns Number of constellation points in modulation
+   * Get the number of constellation points in the modulation scheme.
+   *
+   * \return Number of constellation points.
    */
   uint32_t GetConstellationSize (void) const;
   /**
-   * \returns Name
+   * Get the mode name.
+   *
+   * \return Name
    */
   std::string GetName (void) const;
   /**
-   * \returns Unique ID
+   * Get a unique id for the mode.
+   *
+   * \return Unique ID.
    */
   uint32_t GetUid (void) const;
 
@@ -84,33 +108,50 @@
   friend std::istream &operator>> (std::istream & is, UanTxMode &mode);
 
 
-  uint32_t m_uid;
+  uint32_t m_uid;  //!< Mode id
+
+};  // class UanTxMode
 
-};
+  
 /**
- * \brief Writes tx mode entry to stream os
+ * Writes tx mode entry to stream os.
+ *
+ * \param os The output stream.
+ * \param mode The mode.
+ * \return The stream.
  */
 std::ostream & operator << (std::ostream & os, const UanTxMode &mode);
 /**
- * \brief Reads tx mode entry from stream is
+ * Reads tx mode entry from stream is
+ *
+ * \param is The input stream.
+ * \param mode The mode.
+ * \return The stream.
  */
-std::istream & operator >> (std::istream & is, const UanTxMode &mode);
+std::istream & operator >> (std::istream & is, UanTxMode &mode);
 
+/**
+ * \ingroup uan
+ *
+ * Global database of UanTxMode objects, retrievable by id or name.
+ */
 class UanTxModeFactory
 {
 public:
-  UanTxModeFactory ();
-  ~UanTxModeFactory ();
+  UanTxModeFactory ();   //!< Constructor.
+  ~UanTxModeFactory ();  //!< Destructor.
 
   /**
    *
-   * \param type modulation type
-   * \param dataRateBps Data rate in BPS
-   * \param phyRateSps  Symbol rate in symbols per second
-   * \param cfHz Center frequency in Hz
-   * \param bwHz Bandwidth in Hz
-   * \param constSize Modulation constellation size (2 for BPSK, 4 for QPSK)
-   * \param name Unique string name for this transmission mode
+   * \param type Modulation type.
+   * \param dataRateBps Data rate in BPS.
+   * \param phyRateSps  Symbol rate in symbols per second.
+   * \param cfHz Center frequency in Hz.
+   * \param bwHz Bandwidth in Hz.
+   * \param constSize Modulation constellation size (2 for BPSK, 4 for QPSK).
+   * \param name Unique string name for this transmission mode.
+   *
+   * \return the transmit mode object
    */
   static UanTxMode CreateMode (UanTxMode::ModulationType type,
                                uint32_t dataRateBps,
@@ -121,87 +162,160 @@
                                std::string name);
 
   /**
-   * \param name String name of mode
-   * \returns Mode with given name
+   * Get a mode by name.
+   *
+   * \param name String name of mode.
+   * \return Mode with given name.
    */
   static UanTxMode GetMode (std::string name);
   /**
-   * \param uid Unique ID of mode
-   * \returns The mode with given uid
+   * Get a mode by id.
+   *
+   * \param uid Unique ID of mode.
+   * \return The mode with given uid.
    */
   static UanTxMode GetMode (uint32_t uid);
+
 private:
   friend class UanTxMode;
-  uint32_t m_nextUid;
+  uint32_t m_nextUid;                  //!< next id number
 
+  /**
+   * \ingroup uan
+   * Container for the UanTxMode properties.
+   */
   struct UanTxModeItem
   {
-    UanTxMode::ModulationType m_type;
-    uint32_t m_cfHz;
-    uint32_t m_bwHz;
-    uint32_t m_dataRateBps;
-    uint32_t m_phyRateSps;
-    uint32_t m_constSize;
-    uint32_t m_uid;
-    std::string m_name;
+    UanTxMode::ModulationType m_type;  //!< Modulation type.
+    uint32_t m_cfHz;                   //!< Center frequency in Hz.
+    uint32_t m_bwHz;                   //!< Bandwidth in Hz.
+    uint32_t m_dataRateBps;            //!< Data rate in BPS.
+    uint32_t m_phyRateSps;             //!< Symbol rate in symbols per second.
+    uint32_t m_constSize;              //!< Modulation constellation size (2 for BPSK, 4 for QPSK).
+    uint32_t m_uid;                    //!< Unique id.
+    std::string m_name;                //!< Unique string name for this transmission mode.
   };
 
+  /**
+   * Container for modes
+   *
+   * \internal
+   *   Accessed internally by uid and name, so a multimap might be more
+   *   appropriate.  If name accesses are predominant, perhaps a map
+   *   indexed by name, with a find for uid.  If accesses by uid dominate
+   *   then vector (since uid's are sequential), and find by name.
+   */
   std::map<uint32_t, UanTxModeItem> m_modes;
+
+  /**
+   * Check if the mode \pname{name} already exists.
+   *
+   * \param name The mode name to test.
+   * \return True if \pname{name} exists.
+   */
   bool NameUsed (std::string name);
+
+  /**
+   * Construct and get the static global factory instance.
+   *
+   * \return The global instance.
+   */
   static UanTxModeFactory &GetFactory (void);
+
+  /**
+   * Get a mode by id.
+   *
+   * \param uid The unique id to find.
+   * \return The corresponding mode.
+   */
   UanTxModeItem &GetModeItem (uint32_t uid);
+
+  /**
+   * Get a mode by name.
+   * \param name The mode name to find.
+   * \return The corresponding mode.
+   */
   UanTxModeItem &GetModeItem (std::string name);
+
+  /**
+   * Create a public UanTxMode from an internal UanTxModeItem.
+   *
+   * \param item The UanTxModeItem to reference.
+   * \return A public UanTxMode.
+   */
   UanTxMode MakeModeFromItem (const UanTxModeItem &item);
 
-};
+};  // class UanTxModeFactory
 
 /**
- * \class UanModesList
- * \brief Container for UanTxModes
+ * \ingroup uan
+ *
+ * Container for UanTxModes.
  */
-class UanModesList 
+class UanModesList
 {
 public:
-  UanModesList ();
-  virtual ~UanModesList ();
+  UanModesList ();           //!< Constructor
+  virtual ~UanModesList ();  //!< Destructor
 
   /**
-   * \param mode Add mode to list
+   * Add mode to this list.
+   * \param mode The mode to add.
    */
   void AppendMode (UanTxMode mode);
   /**
-   * \brief delete mode at given index
-   * \param num Index of mode to delete
+   * Delete the mode at given index.
+   * \param num Index of mode to delete.
    */
   void DeleteMode (uint32_t num);
   /**
-   * \param index Mode index
-   * \returns mode at given index
+   * Retrieve a mode by index.
+   *
+   * \param index Mode index.
+   * \return Mode at given index.
    */
   UanTxMode operator[] (uint32_t index) const;
   /**
-   * \returns Number of modes in list
+   * Get the number of modes in this list.
+   *
+   * \return Number of modes.
    */
   uint32_t GetNModes (void) const;
 
 
 private:
+  /** The vector of modes in this list. */
   std::vector<UanTxMode> m_modes;
+  
   friend std::ostream &operator << (std::ostream &os, const UanModesList &ml);
   friend std::istream &operator >> (std::istream &is, UanModesList &ml);
-};
+
+};  // class UanModesList
 
 /**
- * \brief Write UanModesList to stream os
+ * Write UanModesList to stream os
+ *
+ * \param os The output stream.
+ * \param ml The mode list.
+ * \return The stream.
  */
 std::ostream &operator << (std::ostream &os, const UanModesList &ml);
 /**
- * \brief Read UanModesList from stream is
+ * Read UanModesList from stream is.
+ *
+ * \param is The input stream.
+ * \param ml The mode list to fill.
+ * \return The stream.
  */
 std::istream &operator >> (std::istream &is, UanModesList &ml);
 
-/// UanModesList is attribute value
-ATTRIBUTE_HELPER_HEADER (UanModesList);
+/**
+ * \ingroup uan
+ * \class ns3::UanModesListValue
+ * \brief Attribute Value class for UanTxModes.
+ */
+ATTRIBUTE_HELPER_HEADER (UanModesList)
+  ;
 
 } // namespace ns3
 
diff -Naur ns-3.18.1/src/uan/test/uan-energy-model-test.cc ns-3.19/src/uan/test/uan-energy-model-test.cc
--- ns-3.18.1/src/uan/test/uan-energy-model-test.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/uan/test/uan-energy-model-test.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UanEnergyModelTestSuite");
+NS_LOG_COMPONENT_DEFINE ("UanEnergyModelTestSuite")
+  ;
 
 class AcousticModemEnergyTestCase : public TestCase
 {
diff -Naur ns-3.18.1/src/virtual-net-device/bindings/modulegen__gcc_ILP32.py ns-3.19/src/virtual-net-device/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/virtual-net-device/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/virtual-net-device/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -1081,10 +1081,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
diff -Naur ns-3.18.1/src/virtual-net-device/bindings/modulegen__gcc_LP64.py ns-3.19/src/virtual-net-device/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/virtual-net-device/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/virtual-net-device/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -1081,10 +1081,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
diff -Naur ns-3.18.1/src/virtual-net-device/model/virtual-net-device.cc ns-3.19/src/virtual-net-device/model/virtual-net-device.cc
--- ns-3.18.1/src/virtual-net-device/model/virtual-net-device.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/virtual-net-device/model/virtual-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (VirtualNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (VirtualNetDevice)
+  ;
 
 TypeId
 VirtualNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/virtual-net-device/model/virtual-net-device.h ns-3.19/src/virtual-net-device/model/virtual-net-device.h
--- ns-3.18.1/src/virtual-net-device/model/virtual-net-device.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/virtual-net-device/model/virtual-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -33,12 +33,12 @@
 
 
 /**
- * \defgroup virtualdevice Virtual Device
+ * \defgroup virtual-net-device Virtual Device
  *
  */
 
 /**
- * \ingroup virtualdevice
+ * \ingroup virtual-net-device
  *
  * \class VirtualNetDevice
  * \brief A virtual device, similar to Linux TUN/TAP interfaces.
diff -Naur ns-3.18.1/src/visualizer/model/visual-simulator-impl.cc ns-3.19/src/visualizer/model/visual-simulator-impl.cc
--- ns-3.18.1/src/visualizer/model/visual-simulator-impl.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/visualizer/model/visual-simulator-impl.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (VisualSimulatorImpl);
+NS_OBJECT_ENSURE_REGISTERED (VisualSimulatorImpl)
+  ;
 
 namespace
 {
diff -Naur ns-3.18.1/src/wave/bindings/callbacks_list.py ns-3.19/src/wave/bindings/callbacks_list.py
--- ns-3.18.1/src/wave/bindings/callbacks_list.py	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/bindings/callbacks_list.py	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,9 @@
+callback_classes = [
+    ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::WifiMacHeader const*', '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::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Mac48Address', 'unsigned char', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Mac48Address', 'unsigned char', 'bool', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+]
diff -Naur ns-3.18.1/src/wave/bindings/modulegen__gcc_ILP32.py ns-3.19/src/wave/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/wave/bindings/modulegen__gcc_ILP32.py	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,9928 @@
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
+
+
+import pybindgen.settings
+import warnings
+
+class ErrorHandler(pybindgen.settings.ErrorHandler):
+    def handle_error(self, wrapper, exception, traceback_):
+        warnings.warn("exception %r in wrapper %s" % (exception, wrapper))
+        return True
+pybindgen.settings.error_handler = ErrorHandler()
+
+
+import sys
+
+def module_init():
+    root_module = Module('ns.wave', cpp_namespace='::ns3')
+    return root_module
+
+def register_types(module):
+    root_module = module.get_root()
+    
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration]
+    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
+    ## wifi-preamble.h (module 'wifi'): ns3::WifiPreamble [enumeration]
+    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT', 'WIFI_PREAMBLE_HT_MF', 'WIFI_PREAMBLE_HT_GF'], import_from_module='ns.wifi')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
+    module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')
+    ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
+    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
+    ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
+    module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'], import_from_module='ns.wifi')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
+    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
+    ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration]
+    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'], import_from_module='ns.wifi')
+    ## ctrl-headers.h (module 'wifi'): ns3::BlockAckType [enumeration]
+    module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'], import_from_module='ns.wifi')
+    ## address.h (module 'network'): ns3::Address [class]
+    module.add_class('Address', import_from_module='ns.network')
+    ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
+    module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelper [class]
+    module.add_class('AsciiTraceHelper', import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelperForDevice [class]
+    module.add_class('AsciiTraceHelperForDevice', allow_subclassing=True, import_from_module='ns.network')
+    ## 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]
+    module.add_class('Item', import_from_module='ns.core', outer_class=root_module['ns3::AttributeConstructionList'])
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar [struct]
+    module.add_class('Bar', import_from_module='ns.wifi')
+    ## block-ack-agreement.h (module 'wifi'): ns3::BlockAckAgreement [class]
+    module.add_class('BlockAckAgreement', import_from_module='ns.wifi')
+    ## block-ack-cache.h (module 'wifi'): ns3::BlockAckCache [class]
+    module.add_class('BlockAckCache', import_from_module='ns.wifi')
+    ## block-ack-manager.h (module 'wifi'): ns3::BlockAckManager [class]
+    module.add_class('BlockAckManager', import_from_module='ns.wifi')
+    ## buffer.h (module 'network'): ns3::Buffer [class]
+    module.add_class('Buffer', import_from_module='ns.network')
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator [class]
+    module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::Buffer'])
+    ## packet.h (module 'network'): ns3::ByteTagIterator [class]
+    module.add_class('ByteTagIterator', import_from_module='ns.network')
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item [class]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagIterator'])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList [class]
+    module.add_class('ByteTagList', import_from_module='ns.network')
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator [class]
+    module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList'])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item [struct]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList::Iterator'])
+    ## callback.h (module 'core'): ns3::CallbackBase [class]
+    module.add_class('CallbackBase', import_from_module='ns.core')
+    ## capability-information.h (module 'wifi'): ns3::CapabilityInformation [class]
+    module.add_class('CapabilityInformation', import_from_module='ns.wifi')
+    ## event-id.h (module 'core'): ns3::EventId [class]
+    module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
+    module.add_class('Ipv4Address', import_from_module='ns.network')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
+    root_module['ns3::Ipv4Address'].implicitly_converts_to(root_module['ns3::Address'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask [class]
+    module.add_class('Ipv4Mask', import_from_module='ns.network')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address [class]
+    module.add_class('Ipv6Address', import_from_module='ns.network')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address [class]
+    root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix [class]
+    module.add_class('Ipv6Prefix', import_from_module='ns.network')
+    ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
+    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::MacLowDcfListener [class]
+    module.add_class('MacLowDcfListener', allow_subclassing=True, import_from_module='ns.wifi')
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener [class]
+    module.add_class('MacLowTransmissionListener', allow_subclassing=True, import_from_module='ns.wifi')
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionParameters [class]
+    module.add_class('MacLowTransmissionParameters', import_from_module='ns.wifi')
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer [class]
+    module.add_class('NetDeviceContainer', import_from_module='ns.network')
+    ## node-container.h (module 'network'): ns3::NodeContainer [class]
+    module.add_class('NodeContainer', import_from_module='ns.network')
+    ## object-base.h (module 'core'): ns3::ObjectBase [class]
+    module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core')
+    ## object.h (module 'core'): ns3::ObjectDeleter [struct]
+    module.add_class('ObjectDeleter', import_from_module='ns.core')
+    ## object-factory.h (module 'core'): ns3::ObjectFactory [class]
+    module.add_class('ObjectFactory', import_from_module='ns.core')
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier [class]
+    module.add_class('OrganizationIdentifier')
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifierType [enumeration]
+    module.add_enum('OrganizationIdentifierType', ['OUI24', 'OUI36', 'Unknown'], outer_class=root_module['ns3::OrganizationIdentifier'])
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement [class]
+    module.add_class('OriginatorBlockAckAgreement', import_from_module='ns.wifi', parent=root_module['ns3::BlockAckAgreement'])
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement::State [enumeration]
+    module.add_enum('State', ['PENDING', 'ESTABLISHED', 'INACTIVE', 'UNSUCCESSFUL'], outer_class=root_module['ns3::OriginatorBlockAckAgreement'], import_from_module='ns.wifi')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class]
+    module.add_class('PacketMetadata', import_from_module='ns.network')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata'])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [enumeration]
+    module.add_enum('', ['PAYLOAD', 'HEADER', 'TRAILER'], outer_class=root_module['ns3::PacketMetadata::Item'], import_from_module='ns.network')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator [class]
+    module.add_class('ItemIterator', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata'])
+    ## packet.h (module 'network'): ns3::PacketTagIterator [class]
+    module.add_class('PacketTagIterator', import_from_module='ns.network')
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item [class]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagIterator'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList [class]
+    module.add_class('PacketTagList', import_from_module='ns.network')
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
+    module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
+    ## pcap-file.h (module 'network'): ns3::PcapFile [class]
+    module.add_class('PcapFile', import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
+    module.add_class('PcapHelper', import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::PcapHelper [enumeration]
+    module.add_enum('', ['DLT_NULL', 'DLT_EN10MB', 'DLT_PPP', 'DLT_RAW', 'DLT_IEEE802_11', 'DLT_PRISM_HEADER', 'DLT_IEEE802_11_RADIO'], outer_class=root_module['ns3::PcapHelper'], import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::PcapHelperForDevice [class]
+    module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network')
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simulator.h (module 'core'): ns3::Simulator [class]
+    module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core')
+    ## status-code.h (module 'wifi'): ns3::StatusCode [class]
+    module.add_class('StatusCode', import_from_module='ns.wifi')
+    ## tag.h (module 'network'): ns3::Tag [class]
+    module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer [class]
+    module.add_class('TagBuffer', import_from_module='ns.network')
+    ## type-id.h (module 'core'): ns3::TypeId [class]
+    module.add_class('TypeId', import_from_module='ns.core')
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]
+    module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation [struct]
+    module.add_class('AttributeInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]
+    module.add_class('TraceSourceInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificContentManager [class]
+    module.add_class('VendorSpecificContentManager')
+    ## wifi-helper.h (module 'wifi'): ns3::WifiHelper [class]
+    module.add_class('WifiHelper', allow_subclassing=True, import_from_module='ns.wifi')
+    ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper [class]
+    module.add_class('WifiMacHelper', allow_subclassing=True, import_from_module='ns.wifi')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode [class]
+    module.add_class('WifiMode', import_from_module='ns.wifi')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeFactory [class]
+    module.add_class('WifiModeFactory', import_from_module='ns.wifi')
+    ## wifi-helper.h (module 'wifi'): ns3::WifiPhyHelper [class]
+    module.add_class('WifiPhyHelper', allow_subclassing=True, import_from_module='ns.wifi')
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhyListener [class]
+    module.add_class('WifiPhyListener', allow_subclassing=True, import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation [struct]
+    module.add_class('WifiRemoteStation', import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo [class]
+    module.add_class('WifiRemoteStationInfo', import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState [struct]
+    module.add_class('WifiRemoteStationState', import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState [enumeration]
+    module.add_enum('', ['BRAND_NEW', 'DISASSOC', 'WAIT_ASSOC_TX_OK', 'GOT_ASSOC_TX_OK'], outer_class=root_module['ns3::WifiRemoteStationState'], import_from_module='ns.wifi')
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector [class]
+    module.add_class('WifiTxVector', import_from_module='ns.wifi')
+    ## empty.h (module 'core'): ns3::empty [class]
+    module.add_class('empty', import_from_module='ns.core')
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t [class]
+    module.add_class('int64x64_t', import_from_module='ns.core')
+    ## chunk.h (module 'network'): ns3::Chunk [class]
+    module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
+    ## header.h (module 'network'): ns3::Header [class]
+    module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
+    ## higher-tx-tag.h (module 'wave'): ns3::HigherDataTxVectorTag [class]
+    module.add_class('HigherDataTxVectorTag', parent=root_module['ns3::Tag'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaRequestHeader [class]
+    module.add_class('MgtAddBaRequestHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaResponseHeader [class]
+    module.add_class('MgtAddBaResponseHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocRequestHeader [class]
+    module.add_class('MgtAssocRequestHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocResponseHeader [class]
+    module.add_class('MgtAssocResponseHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtDelBaHeader [class]
+    module.add_class('MgtDelBaHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeRequestHeader [class]
+    module.add_class('MgtProbeRequestHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeResponseHeader [class]
+    module.add_class('MgtProbeResponseHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::NqosWifiMacHelper [class]
+    module.add_class('NqosWifiMacHelper', import_from_module='ns.wifi', parent=root_module['ns3::WifiMacHelper'])
+    ## object.h (module 'core'): ns3::Object [class]
+    module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator [class]
+    module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object'])
+    ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper [class]
+    module.add_class('PcapFileWrapper', import_from_module='ns.network', parent=root_module['ns3::Object'])
+    ## qos-wifi-mac-helper.h (module 'wifi'): ns3::QosWifiMacHelper [class]
+    module.add_class('QosWifiMacHelper', import_from_module='ns.wifi', parent=root_module['ns3::WifiMacHelper'])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeChecker', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeChecker>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::OutputStreamWrapper', 'ns3::empty', 'ns3::DefaultDeleter<ns3::OutputStreamWrapper>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Packet>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::WifiInformationElement', 'ns3::empty', 'ns3::DefaultDeleter<ns3::WifiInformationElement>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## nstime.h (module 'core'): ns3::Time [class]
+    module.add_class('Time', import_from_module='ns.core')
+    ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    ## nstime.h (module 'core'): ns3::Time [class]
+    root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
+    module.add_class('TraceSourceAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
+    ## trailer.h (module 'network'): ns3::Trailer [class]
+    module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificActionHeader [class]
+    module.add_class('VendorSpecificActionHeader', parent=root_module['ns3::Header'])
+    ## wifi-80211p-helper.h (module 'wave'): ns3::Wifi80211pHelper [class]
+    module.add_class('Wifi80211pHelper', parent=root_module['ns3::WifiHelper'])
+    ## 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')
+    ## 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]
+    module.add_class('ActionValue', import_from_module='ns.wifi', outer_class=root_module['ns3::WifiActionHeader'])
+    ## wifi-information-element.h (module 'wifi'): ns3::WifiInformationElement [class]
+    module.add_class('WifiInformationElement', import_from_module='ns.wifi', parent=root_module['ns3::SimpleRefCount< ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >'])
+    ## wifi-mac.h (module 'wifi'): ns3::WifiMac [class]
+    module.add_class('WifiMac', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader [class]
+    module.add_class('WifiMacHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::QosAckPolicy [enumeration]
+    module.add_enum('QosAckPolicy', ['NORMAL_ACK', 'NO_ACK', 'NO_EXPLICIT_ACK', 'BLOCK_ACK'], outer_class=root_module['ns3::WifiMacHeader'], import_from_module='ns.wifi')
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::AddressType [enumeration]
+    module.add_enum('AddressType', ['ADDR1', 'ADDR2', 'ADDR3', 'ADDR4'], outer_class=root_module['ns3::WifiMacHeader'], import_from_module='ns.wifi')
+    ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue [class]
+    module.add_class('WifiMacQueue', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhy [class]
+    module.add_class('WifiPhy', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhy::State [enumeration]
+    module.add_enum('State', ['IDLE', 'CCA_BUSY', 'TX', 'RX', 'SWITCHING'], outer_class=root_module['ns3::WifiPhy'], import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationManager [class]
+    module.add_class('WifiRemoteStationManager', import_from_module='ns.wifi', 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]
+    module.add_class('AttributeChecker', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
+    ## attribute.h (module 'core'): ns3::AttributeValue [class]
+    module.add_class('AttributeValue', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
+    ## callback.h (module 'core'): ns3::CallbackChecker [class]
+    module.add_class('CallbackChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## callback.h (module 'core'): ns3::CallbackImplBase [class]
+    module.add_class('CallbackImplBase', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    ## callback.h (module 'core'): ns3::CallbackValue [class]
+    module.add_class('CallbackValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckRequestHeader [class]
+    module.add_class('CtrlBAckRequestHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckResponseHeader [class]
+    module.add_class('CtrlBAckResponseHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## dcf.h (module 'wifi'): ns3::Dcf [class]
+    module.add_class('Dcf', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## edca-txop-n.h (module 'wifi'): ns3::EdcaTxopN [class]
+    module.add_class('EdcaTxopN', import_from_module='ns.wifi', parent=root_module['ns3::Dcf'])
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
+    module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## event-impl.h (module 'core'): ns3::EventImpl [class]
+    module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    ## supported-rates.h (module 'wifi'): ns3::ExtendedSupportedRatesIE [class]
+    module.add_class('ExtendedSupportedRatesIE', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities [class]
+    module.add_class('HtCapabilities', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker [class]
+    module.add_class('HtCapabilitiesChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue [class]
+    module.add_class('HtCapabilitiesValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class]
+    module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class]
+    module.add_class('Ipv4AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker [class]
+    module.add_class('Ipv4MaskChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue [class]
+    module.add_class('Ipv4MaskValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker [class]
+    module.add_class('Ipv6AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue [class]
+    module.add_class('Ipv6AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker [class]
+    module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class]
+    module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class]
+    module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class]
+    module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## mac-low.h (module 'wifi'): ns3::MacLow [class]
+    module.add_class('MacLow', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtBeaconHeader [class]
+    module.add_class('MgtBeaconHeader', import_from_module='ns.wifi', parent=root_module['ns3::MgtProbeResponseHeader'])
+    ## 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]
+    module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network')
+    ## nix-vector.h (module 'network'): ns3::NixVector [class]
+    module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    ## node.h (module 'network'): ns3::Node [class]
+    module.add_class('Node', import_from_module='ns.network', parent=root_module['ns3::Object'])
+    ## wave-mac-helper.h (module 'wave'): ns3::NqosWaveMacHelper [class]
+    module.add_class('NqosWaveMacHelper', parent=root_module['ns3::NqosWifiMacHelper'])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class]
+    module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class]
+    module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierChecker [class]
+    module.add_class('OrganizationIdentifierChecker', parent=root_module['ns3::AttributeChecker'])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierValue [class]
+    module.add_class('OrganizationIdentifierValue', parent=root_module['ns3::AttributeValue'])
+    ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper [class]
+    module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
+    ## packet.h (module 'network'): ns3::Packet [class]
+    module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
+    ## pointer.h (module 'core'): ns3::PointerChecker [class]
+    module.add_class('PointerChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## pointer.h (module 'core'): ns3::PointerValue [class]
+    module.add_class('PointerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## wave-mac-helper.h (module 'wave'): ns3::QosWaveMacHelper [class]
+    module.add_class('QosWaveMacHelper', parent=root_module['ns3::QosWifiMacHelper'])
+    ## regular-wifi-mac.h (module 'wifi'): ns3::RegularWifiMac [class]
+    module.add_class('RegularWifiMac', import_from_module='ns.wifi', parent=root_module['ns3::WifiMac'])
+    ## ssid.h (module 'wifi'): ns3::Ssid [class]
+    module.add_class('Ssid', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## ssid.h (module 'wifi'): ns3::SsidChecker [class]
+    module.add_class('SsidChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker'])
+    ## ssid.h (module 'wifi'): ns3::SsidValue [class]
+    module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
+    ## supported-rates.h (module 'wifi'): ns3::SupportedRates [class]
+    module.add_class('SupportedRates', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## nstime.h (module 'core'): ns3::TimeValue [class]
+    module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
+    module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## type-id.h (module 'core'): ns3::TypeIdValue [class]
+    module.add_class('TypeIdValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## uinteger.h (module 'core'): ns3::UintegerValue [class]
+    module.add_class('UintegerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## wave-mac-low.h (module 'wave'): ns3::WaveMacLow [class]
+    module.add_class('WaveMacLow', parent=root_module['ns3::MacLow'])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeChecker [class]
+    module.add_class('WifiModeChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker'])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeValue [class]
+    module.add_class('WifiModeValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
+    ## address.h (module 'network'): ns3::AddressChecker [class]
+    module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## address.h (module 'network'): ns3::AddressValue [class]
+    module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## dca-txop.h (module 'wifi'): ns3::DcaTxop [class]
+    module.add_class('DcaTxop', import_from_module='ns.wifi', parent=root_module['ns3::Dcf'])
+    ## ocb-wifi-mac.h (module 'wave'): ns3::OcbWifiMac [class]
+    module.add_class('OcbWifiMac', parent=root_module['ns3::RegularWifiMac'])
+    module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector')
+    module.add_container('ns3::WifiMcsList', 'unsigned char', container_type='vector')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >', 'ns3::WifiMcsList')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >*', 'ns3::WifiMcsList*')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >&', 'ns3::WifiMcsList&')
+    typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId')
+    typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*')
+    typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&')
+    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::VscCallback')
+    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::VscCallback*')
+    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::VscCallback&')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&')
+    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList')
+    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*')
+    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >', 'ns3::WifiMcsListIterator')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >*', 'ns3::WifiMcsListIterator*')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >&', 'ns3::WifiMcsListIterator&')
+    
+    ## Register a nested module for the namespace FatalImpl
+    
+    nested_module = module.add_cpp_namespace('FatalImpl')
+    register_types_ns3_FatalImpl(nested_module)
+    
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
+    ## Register a nested module for the namespace internal
+    
+    nested_module = module.add_cpp_namespace('internal')
+    register_types_ns3_internal(nested_module)
+    
+
+def register_types_ns3_FatalImpl(module):
+    root_module = module.get_root()
+    
+
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
+def register_types_ns3_internal(module):
+    root_module = module.get_root()
+    
+
+def register_methods(root_module):
+    register_Ns3Address_methods(root_module, root_module['ns3::Address'])
+    register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
+    register_Ns3AsciiTraceHelperForDevice_methods(root_module, root_module['ns3::AsciiTraceHelperForDevice'])
+    register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
+    register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
+    register_Ns3Bar_methods(root_module, root_module['ns3::Bar'])
+    register_Ns3BlockAckAgreement_methods(root_module, root_module['ns3::BlockAckAgreement'])
+    register_Ns3BlockAckCache_methods(root_module, root_module['ns3::BlockAckCache'])
+    register_Ns3BlockAckManager_methods(root_module, root_module['ns3::BlockAckManager'])
+    register_Ns3Buffer_methods(root_module, root_module['ns3::Buffer'])
+    register_Ns3BufferIterator_methods(root_module, root_module['ns3::Buffer::Iterator'])
+    register_Ns3ByteTagIterator_methods(root_module, root_module['ns3::ByteTagIterator'])
+    register_Ns3ByteTagIteratorItem_methods(root_module, root_module['ns3::ByteTagIterator::Item'])
+    register_Ns3ByteTagList_methods(root_module, root_module['ns3::ByteTagList'])
+    register_Ns3ByteTagListIterator_methods(root_module, root_module['ns3::ByteTagList::Iterator'])
+    register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
+    register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
+    register_Ns3CapabilityInformation_methods(root_module, root_module['ns3::CapabilityInformation'])
+    register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    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'])
+    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_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'])
+    register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])
+    register_Ns3NodeContainer_methods(root_module, root_module['ns3::NodeContainer'])
+    register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
+    register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
+    register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
+    register_Ns3OrganizationIdentifier_methods(root_module, root_module['ns3::OrganizationIdentifier'])
+    register_Ns3OriginatorBlockAckAgreement_methods(root_module, root_module['ns3::OriginatorBlockAckAgreement'])
+    register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata'])
+    register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item'])
+    register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator'])
+    register_Ns3PacketTagIterator_methods(root_module, root_module['ns3::PacketTagIterator'])
+    register_Ns3PacketTagIteratorItem_methods(root_module, root_module['ns3::PacketTagIterator::Item'])
+    register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList'])
+    register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData'])
+    register_Ns3PcapFile_methods(root_module, root_module['ns3::PcapFile'])
+    register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper'])
+    register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice'])
+    register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
+    register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator'])
+    register_Ns3StatusCode_methods(root_module, root_module['ns3::StatusCode'])
+    register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
+    register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
+    register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
+    register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation'])
+    register_Ns3TypeIdTraceSourceInformation_methods(root_module, root_module['ns3::TypeId::TraceSourceInformation'])
+    register_Ns3VendorSpecificContentManager_methods(root_module, root_module['ns3::VendorSpecificContentManager'])
+    register_Ns3WifiHelper_methods(root_module, root_module['ns3::WifiHelper'])
+    register_Ns3WifiMacHelper_methods(root_module, root_module['ns3::WifiMacHelper'])
+    register_Ns3WifiMode_methods(root_module, root_module['ns3::WifiMode'])
+    register_Ns3WifiModeFactory_methods(root_module, root_module['ns3::WifiModeFactory'])
+    register_Ns3WifiPhyHelper_methods(root_module, root_module['ns3::WifiPhyHelper'])
+    register_Ns3WifiPhyListener_methods(root_module, root_module['ns3::WifiPhyListener'])
+    register_Ns3WifiRemoteStation_methods(root_module, root_module['ns3::WifiRemoteStation'])
+    register_Ns3WifiRemoteStationInfo_methods(root_module, root_module['ns3::WifiRemoteStationInfo'])
+    register_Ns3WifiRemoteStationState_methods(root_module, root_module['ns3::WifiRemoteStationState'])
+    register_Ns3WifiTxVector_methods(root_module, root_module['ns3::WifiTxVector'])
+    register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
+    register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t'])
+    register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
+    register_Ns3Header_methods(root_module, root_module['ns3::Header'])
+    register_Ns3HigherDataTxVectorTag_methods(root_module, root_module['ns3::HigherDataTxVectorTag'])
+    register_Ns3MgtAddBaRequestHeader_methods(root_module, root_module['ns3::MgtAddBaRequestHeader'])
+    register_Ns3MgtAddBaResponseHeader_methods(root_module, root_module['ns3::MgtAddBaResponseHeader'])
+    register_Ns3MgtAssocRequestHeader_methods(root_module, root_module['ns3::MgtAssocRequestHeader'])
+    register_Ns3MgtAssocResponseHeader_methods(root_module, root_module['ns3::MgtAssocResponseHeader'])
+    register_Ns3MgtDelBaHeader_methods(root_module, root_module['ns3::MgtDelBaHeader'])
+    register_Ns3MgtProbeRequestHeader_methods(root_module, root_module['ns3::MgtProbeRequestHeader'])
+    register_Ns3MgtProbeResponseHeader_methods(root_module, root_module['ns3::MgtProbeResponseHeader'])
+    register_Ns3NqosWifiMacHelper_methods(root_module, root_module['ns3::NqosWifiMacHelper'])
+    register_Ns3Object_methods(root_module, root_module['ns3::Object'])
+    register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator'])
+    register_Ns3PcapFileWrapper_methods(root_module, root_module['ns3::PcapFileWrapper'])
+    register_Ns3QosWifiMacHelper_methods(root_module, root_module['ns3::QosWifiMacHelper'])
+    register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
+    register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
+    register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
+    register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
+    register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
+    register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
+    register_Ns3SimpleRefCount__Ns3WifiInformationElement_Ns3Empty_Ns3DefaultDeleter__lt__ns3WifiInformationElement__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >'])
+    register_Ns3Time_methods(root_module, root_module['ns3::Time'])
+    register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
+    register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
+    register_Ns3VendorSpecificActionHeader_methods(root_module, root_module['ns3::VendorSpecificActionHeader'])
+    register_Ns3Wifi80211pHelper_methods(root_module, root_module['ns3::Wifi80211pHelper'])
+    register_Ns3WifiActionHeader_methods(root_module, root_module['ns3::WifiActionHeader'])
+    register_Ns3WifiActionHeaderActionValue_methods(root_module, root_module['ns3::WifiActionHeader::ActionValue'])
+    register_Ns3WifiInformationElement_methods(root_module, root_module['ns3::WifiInformationElement'])
+    register_Ns3WifiMac_methods(root_module, root_module['ns3::WifiMac'])
+    register_Ns3WifiMacHeader_methods(root_module, root_module['ns3::WifiMacHeader'])
+    register_Ns3WifiMacQueue_methods(root_module, root_module['ns3::WifiMacQueue'])
+    register_Ns3WifiPhy_methods(root_module, root_module['ns3::WifiPhy'])
+    register_Ns3WifiRemoteStationManager_methods(root_module, root_module['ns3::WifiRemoteStationManager'])
+    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'])
+    register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
+    register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
+    register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
+    register_Ns3CtrlBAckRequestHeader_methods(root_module, root_module['ns3::CtrlBAckRequestHeader'])
+    register_Ns3CtrlBAckResponseHeader_methods(root_module, root_module['ns3::CtrlBAckResponseHeader'])
+    register_Ns3Dcf_methods(root_module, root_module['ns3::Dcf'])
+    register_Ns3EdcaTxopN_methods(root_module, root_module['ns3::EdcaTxopN'])
+    register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
+    register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
+    register_Ns3ExtendedSupportedRatesIE_methods(root_module, root_module['ns3::ExtendedSupportedRatesIE'])
+    register_Ns3HtCapabilities_methods(root_module, root_module['ns3::HtCapabilities'])
+    register_Ns3HtCapabilitiesChecker_methods(root_module, root_module['ns3::HtCapabilitiesChecker'])
+    register_Ns3HtCapabilitiesValue_methods(root_module, root_module['ns3::HtCapabilitiesValue'])
+    register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
+    register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue'])
+    register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker'])
+    register_Ns3Ipv4MaskValue_methods(root_module, root_module['ns3::Ipv4MaskValue'])
+    register_Ns3Ipv6AddressChecker_methods(root_module, root_module['ns3::Ipv6AddressChecker'])
+    register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue'])
+    register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker'])
+    register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
+    register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker'])
+    register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue'])
+    register_Ns3MacLow_methods(root_module, root_module['ns3::MacLow'])
+    register_Ns3MgtBeaconHeader_methods(root_module, root_module['ns3::MgtBeaconHeader'])
+    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'])
+    register_Ns3NqosWaveMacHelper_methods(root_module, root_module['ns3::NqosWaveMacHelper'])
+    register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
+    register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
+    register_Ns3OrganizationIdentifierChecker_methods(root_module, root_module['ns3::OrganizationIdentifierChecker'])
+    register_Ns3OrganizationIdentifierValue_methods(root_module, root_module['ns3::OrganizationIdentifierValue'])
+    register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
+    register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
+    register_Ns3PointerChecker_methods(root_module, root_module['ns3::PointerChecker'])
+    register_Ns3PointerValue_methods(root_module, root_module['ns3::PointerValue'])
+    register_Ns3QosWaveMacHelper_methods(root_module, root_module['ns3::QosWaveMacHelper'])
+    register_Ns3RegularWifiMac_methods(root_module, root_module['ns3::RegularWifiMac'])
+    register_Ns3Ssid_methods(root_module, root_module['ns3::Ssid'])
+    register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker'])
+    register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue'])
+    register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates'])
+    register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
+    register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
+    register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
+    register_Ns3UintegerValue_methods(root_module, root_module['ns3::UintegerValue'])
+    register_Ns3WaveMacLow_methods(root_module, root_module['ns3::WaveMacLow'])
+    register_Ns3WifiModeChecker_methods(root_module, root_module['ns3::WifiModeChecker'])
+    register_Ns3WifiModeValue_methods(root_module, root_module['ns3::WifiModeValue'])
+    register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
+    register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3DcaTxop_methods(root_module, root_module['ns3::DcaTxop'])
+    register_Ns3OcbWifiMac_methods(root_module, root_module['ns3::OcbWifiMac'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
+    return
+
+def register_Ns3Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## address.h (module 'network'): ns3::Address::Address() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor]
+    cls.add_constructor([param('uint8_t', 'type'), param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): ns3::Address::Address(ns3::Address const & address) [copy constructor]
+    cls.add_constructor([param('ns3::Address const &', 'address')])
+    ## address.h (module 'network'): bool ns3::Address::CheckCompatible(uint8_t type, uint8_t len) const [member function]
+    cls.add_method('CheckCompatible', 
+                   'bool', 
+                   [param('uint8_t', 'type'), param('uint8_t', 'len')], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyAllFrom(uint8_t const * buffer, uint8_t len) [member function]
+    cls.add_method('CopyAllFrom', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyAllTo(uint8_t * buffer, uint8_t len) const [member function]
+    cls.add_method('CopyAllTo', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint8_t', 'len')], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyFrom(uint8_t const * buffer, uint8_t len) [member function]
+    cls.add_method('CopyFrom', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyTo(uint8_t * buffer) const [member function]
+    cls.add_method('CopyTo', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer')], 
+                   is_const=True)
+    ## address.h (module 'network'): void ns3::Address::Deserialize(ns3::TagBuffer buffer) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'buffer')])
+    ## address.h (module 'network'): uint8_t ns3::Address::GetLength() const [member function]
+    cls.add_method('GetLength', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): bool ns3::Address::IsInvalid() const [member function]
+    cls.add_method('IsInvalid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): bool ns3::Address::IsMatchingType(uint8_t type) const [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('uint8_t', 'type')], 
+                   is_const=True)
+    ## address.h (module 'network'): static uint8_t ns3::Address::Register() [member function]
+    cls.add_method('Register', 
+                   'uint8_t', 
+                   [], 
+                   is_static=True)
+    ## address.h (module 'network'): void ns3::Address::Serialize(ns3::TagBuffer buffer) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'buffer')], 
+                   is_const=True)
+    return
+
+def register_Ns3AsciiTraceHelper_methods(root_module, cls):
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelper::AsciiTraceHelper(ns3::AsciiTraceHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AsciiTraceHelper const &', 'arg0')])
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelper::AsciiTraceHelper() [constructor]
+    cls.add_constructor([])
+    ## trace-helper.h (module 'network'): ns3::Ptr<ns3::OutputStreamWrapper> ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::_Ios_Openmode filemode=std::ios_base::out) [member function]
+    cls.add_method('CreateFileStream', 
+                   'ns3::Ptr< ns3::OutputStreamWrapper >', 
+                   [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode', default_value='std::ios_base::out')])
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultDequeueSinkWithContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultDequeueSinkWithoutContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultDropSinkWithContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultDropSinkWithoutContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultEnqueueSinkWithContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultEnqueueSinkWithoutContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultReceiveSinkWithContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultReceiveSinkWithoutContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): std::string ns3::AsciiTraceHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
+    cls.add_method('GetFilenameFromDevice', 
+                   'std::string', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'useObjectNames', default_value='true')])
+    ## trace-helper.h (module 'network'): std::string ns3::AsciiTraceHelper::GetFilenameFromInterfacePair(std::string prefix, ns3::Ptr<ns3::Object> object, uint32_t interface, bool useObjectNames=true) [member function]
+    cls.add_method('GetFilenameFromInterfacePair', 
+                   'std::string', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Object >', 'object'), param('uint32_t', 'interface'), param('bool', 'useObjectNames', default_value='true')])
+    return
+
+def register_Ns3AsciiTraceHelperForDevice_methods(root_module, cls):
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelperForDevice::AsciiTraceHelperForDevice(ns3::AsciiTraceHelperForDevice const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AsciiTraceHelperForDevice const &', 'arg0')])
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelperForDevice::AsciiTraceHelperForDevice() [constructor]
+    cls.add_constructor([])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool explicitFilename=false) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'explicitFilename', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, ns3::Ptr<ns3::NetDevice> nd) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, std::string ndName, bool explicitFilename=false) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('std::string', 'ndName'), param('bool', 'explicitFilename', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, std::string ndName) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'ndName')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::NetDeviceContainer d) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, ns3::NetDeviceContainer d) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NetDeviceContainer', 'd')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::NodeContainer n) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, ns3::NodeContainer n) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NodeContainer', 'n')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, uint32_t nodeid, uint32_t deviceid, bool explicitFilename) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid'), param('bool', 'explicitFilename')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, uint32_t nodeid, uint32_t deviceid) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(std::string prefix) [member function]
+    cls.add_method('EnableAsciiAll', 
+                   'void', 
+                   [param('std::string', 'prefix')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(ns3::Ptr<ns3::OutputStreamWrapper> stream) [member function]
+    cls.add_method('EnableAsciiAll', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAsciiInternal(ns3::Ptr<ns3::OutputStreamWrapper> stream, std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool explicitFilename) [member function]
+    cls.add_method('EnableAsciiInternal', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'explicitFilename')], 
+                   is_pure_virtual=True, is_virtual=True)
+    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')])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::AttributeConstructionList() [constructor]
+    cls.add_constructor([])
+    ## attribute-construction-list.h (module 'core'): void ns3::AttributeConstructionList::Add(std::string name, ns3::Ptr<ns3::AttributeChecker const> checker, ns3::Ptr<ns3::AttributeValue> value) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker'), param('ns3::Ptr< ns3::AttributeValue >', 'value')])
+    ## attribute-construction-list.h (module 'core'): std::_List_const_iterator<ns3::AttributeConstructionList::Item> ns3::AttributeConstructionList::Begin() const [member function]
+    cls.add_method('Begin', 
+                   'std::_List_const_iterator< ns3::AttributeConstructionList::Item >', 
+                   [], 
+                   is_const=True)
+    ## attribute-construction-list.h (module 'core'): std::_List_const_iterator<ns3::AttributeConstructionList::Item> ns3::AttributeConstructionList::End() const [member function]
+    cls.add_method('End', 
+                   'std::_List_const_iterator< ns3::AttributeConstructionList::Item >', 
+                   [], 
+                   is_const=True)
+    ## attribute-construction-list.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeConstructionList::Find(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('Find', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True)
+    return
+
+def register_Ns3AttributeConstructionListItem_methods(root_module, cls):
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::Item() [constructor]
+    cls.add_constructor([])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::Item(ns3::AttributeConstructionList::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeConstructionList::Item const &', 'arg0')])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::checker [variable]
+    cls.add_instance_attribute('checker', 'ns3::Ptr< ns3::AttributeChecker const >', is_const=False)
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::value [variable]
+    cls.add_instance_attribute('value', 'ns3::Ptr< ns3::AttributeValue >', is_const=False)
+    return
+
+def register_Ns3Bar_methods(root_module, cls):
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::Bar(ns3::Bar const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Bar const &', 'arg0')])
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::Bar() [constructor]
+    cls.add_constructor([])
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::Bar(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address recipient, uint8_t tid, bool immediate) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('bool', 'immediate')])
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::bar [variable]
+    cls.add_instance_attribute('bar', 'ns3::Ptr< ns3::Packet const >', is_const=False)
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::immediate [variable]
+    cls.add_instance_attribute('immediate', 'bool', is_const=False)
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::recipient [variable]
+    cls.add_instance_attribute('recipient', 'ns3::Mac48Address', is_const=False)
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::tid [variable]
+    cls.add_instance_attribute('tid', 'uint8_t', is_const=False)
+    return
+
+def register_Ns3BlockAckAgreement_methods(root_module, cls):
+    ## block-ack-agreement.h (module 'wifi'): ns3::BlockAckAgreement::BlockAckAgreement(ns3::BlockAckAgreement const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::BlockAckAgreement const &', 'arg0')])
+    ## block-ack-agreement.h (module 'wifi'): ns3::BlockAckAgreement::BlockAckAgreement() [constructor]
+    cls.add_constructor([])
+    ## block-ack-agreement.h (module 'wifi'): ns3::BlockAckAgreement::BlockAckAgreement(ns3::Mac48Address peer, uint8_t tid) [constructor]
+    cls.add_constructor([param('ns3::Mac48Address', 'peer'), param('uint8_t', 'tid')])
+    ## block-ack-agreement.h (module 'wifi'): uint16_t ns3::BlockAckAgreement::GetBufferSize() const [member function]
+    cls.add_method('GetBufferSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): ns3::Mac48Address ns3::BlockAckAgreement::GetPeer() const [member function]
+    cls.add_method('GetPeer', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): uint16_t ns3::BlockAckAgreement::GetStartingSequence() const [member function]
+    cls.add_method('GetStartingSequence', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): uint16_t ns3::BlockAckAgreement::GetStartingSequenceControl() const [member function]
+    cls.add_method('GetStartingSequenceControl', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): uint8_t ns3::BlockAckAgreement::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): uint16_t ns3::BlockAckAgreement::GetTimeout() const [member function]
+    cls.add_method('GetTimeout', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): bool ns3::BlockAckAgreement::IsAmsduSupported() const [member function]
+    cls.add_method('IsAmsduSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): bool ns3::BlockAckAgreement::IsImmediateBlockAck() const [member function]
+    cls.add_method('IsImmediateBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetAmsduSupport(bool supported) [member function]
+    cls.add_method('SetAmsduSupport', 
+                   'void', 
+                   [param('bool', 'supported')])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetBufferSize(uint16_t bufferSize) [member function]
+    cls.add_method('SetBufferSize', 
+                   'void', 
+                   [param('uint16_t', 'bufferSize')])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetDelayedBlockAck() [member function]
+    cls.add_method('SetDelayedBlockAck', 
+                   'void', 
+                   [])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetImmediateBlockAck() [member function]
+    cls.add_method('SetImmediateBlockAck', 
+                   'void', 
+                   [])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetStartingSequence(uint16_t seq) [member function]
+    cls.add_method('SetStartingSequence', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetTimeout(uint16_t timeout) [member function]
+    cls.add_method('SetTimeout', 
+                   'void', 
+                   [param('uint16_t', 'timeout')])
+    return
+
+def register_Ns3BlockAckCache_methods(root_module, cls):
+    ## block-ack-cache.h (module 'wifi'): ns3::BlockAckCache::BlockAckCache() [constructor]
+    cls.add_constructor([])
+    ## block-ack-cache.h (module 'wifi'): ns3::BlockAckCache::BlockAckCache(ns3::BlockAckCache const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::BlockAckCache const &', 'arg0')])
+    ## block-ack-cache.h (module 'wifi'): void ns3::BlockAckCache::FillBlockAckBitmap(ns3::CtrlBAckResponseHeader * blockAckHeader) [member function]
+    cls.add_method('FillBlockAckBitmap', 
+                   'void', 
+                   [param('ns3::CtrlBAckResponseHeader *', 'blockAckHeader')])
+    ## block-ack-cache.h (module 'wifi'): void ns3::BlockAckCache::Init(uint16_t winStart, uint16_t winSize) [member function]
+    cls.add_method('Init', 
+                   'void', 
+                   [param('uint16_t', 'winStart'), param('uint16_t', 'winSize')])
+    ## block-ack-cache.h (module 'wifi'): void ns3::BlockAckCache::UpdateWithBlockAckReq(uint16_t startingSeq) [member function]
+    cls.add_method('UpdateWithBlockAckReq', 
+                   'void', 
+                   [param('uint16_t', 'startingSeq')])
+    ## block-ack-cache.h (module 'wifi'): void ns3::BlockAckCache::UpdateWithMpdu(ns3::WifiMacHeader const * hdr) [member function]
+    cls.add_method('UpdateWithMpdu', 
+                   'void', 
+                   [param('ns3::WifiMacHeader const *', 'hdr')])
+    return
+
+def register_Ns3BlockAckManager_methods(root_module, cls):
+    ## block-ack-manager.h (module 'wifi'): ns3::BlockAckManager::BlockAckManager() [constructor]
+    cls.add_constructor([])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::CreateAgreement(ns3::MgtAddBaRequestHeader const * reqHdr, ns3::Mac48Address recipient) [member function]
+    cls.add_method('CreateAgreement', 
+                   'void', 
+                   [param('ns3::MgtAddBaRequestHeader const *', 'reqHdr'), param('ns3::Mac48Address', 'recipient')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::DestroyAgreement(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    cls.add_method('DestroyAgreement', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')])
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::ExistsAgreement(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    cls.add_method('ExistsAgreement', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::ExistsAgreementInState(ns3::Mac48Address recipient, uint8_t tid, ns3::OriginatorBlockAckAgreement::State state) const [member function]
+    cls.add_method('ExistsAgreementInState', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::OriginatorBlockAckAgreement::State', 'state')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): uint32_t ns3::BlockAckManager::GetNBufferedPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    cls.add_method('GetNBufferedPackets', 
+                   'uint32_t', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): uint32_t ns3::BlockAckManager::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)
+    ## block-ack-manager.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::BlockAckManager::GetNextPacket(ns3::WifiMacHeader & hdr) [member function]
+    cls.add_method('GetNextPacket', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader &', 'hdr')])
+    ## block-ack-manager.h (module 'wifi'): uint32_t ns3::BlockAckManager::GetNextPacketSize() const [member function]
+    cls.add_method('GetNextPacketSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): uint16_t ns3::BlockAckManager::GetSeqNumOfNextRetryPacket(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    cls.add_method('GetSeqNumOfNextRetryPacket', 
+                   'uint16_t', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::HasBar(ns3::Bar & bar) [member function]
+    cls.add_method('HasBar', 
+                   'bool', 
+                   [param('ns3::Bar &', 'bar')])
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::HasOtherFragments(uint16_t sequenceNumber) const [member function]
+    cls.add_method('HasOtherFragments', 
+                   'bool', 
+                   [param('uint16_t', 'sequenceNumber')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::HasPackets() const [member function]
+    cls.add_method('HasPackets', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::NotifyAgreementEstablished(ns3::Mac48Address recipient, uint8_t tid, uint16_t startingSeq) [member function]
+    cls.add_method('NotifyAgreementEstablished', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('uint16_t', 'startingSeq')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::NotifyAgreementUnsuccessful(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    cls.add_method('NotifyAgreementUnsuccessful', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::NotifyGotBlockAck(ns3::CtrlBAckResponseHeader const * blockAck, ns3::Mac48Address recipient) [member function]
+    cls.add_method('NotifyGotBlockAck', 
+                   'void', 
+                   [param('ns3::CtrlBAckResponseHeader const *', 'blockAck'), param('ns3::Mac48Address', 'recipient')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::NotifyMpduTransmission(ns3::Mac48Address recipient, uint8_t tid, uint16_t nextSeqNumber) [member function]
+    cls.add_method('NotifyMpduTransmission', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('uint16_t', 'nextSeqNumber')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetBlockAckInactivityCallback(ns3::Callback<void, ns3::Mac48Address, unsigned char, bool, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetBlockAckInactivityCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Mac48Address, unsigned char, bool, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetBlockAckThreshold(uint8_t nPackets) [member function]
+    cls.add_method('SetBlockAckThreshold', 
+                   'void', 
+                   [param('uint8_t', 'nPackets')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetBlockAckType(ns3::BlockAckType bAckType) [member function]
+    cls.add_method('SetBlockAckType', 
+                   'void', 
+                   [param('ns3::BlockAckType', 'bAckType')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetBlockDestinationCallback(ns3::Callback<void, ns3::Mac48Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetBlockDestinationCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Mac48Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetMaxPacketDelay(ns3::Time maxDelay) [member function]
+    cls.add_method('SetMaxPacketDelay', 
+                   'void', 
+                   [param('ns3::Time', 'maxDelay')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetQueue(ns3::Ptr<ns3::WifiMacQueue> queue) [member function]
+    cls.add_method('SetQueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiMacQueue >', 'queue')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetTxMiddle(ns3::MacTxMiddle * txMiddle) [member function]
+    cls.add_method('SetTxMiddle', 
+                   'void', 
+                   [param('ns3::MacTxMiddle *', 'txMiddle')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetUnblockDestinationCallback(ns3::Callback<void, ns3::Mac48Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetUnblockDestinationCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Mac48Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::StorePacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr, ns3::Time tStamp) [member function]
+    cls.add_method('StorePacket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr'), param('ns3::Time', 'tStamp')])
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::SwitchToBlockAckIfNeeded(ns3::Mac48Address recipient, uint8_t tid, uint16_t startingSeq) [member function]
+    cls.add_method('SwitchToBlockAckIfNeeded', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('uint16_t', 'startingSeq')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::TearDownBlockAck(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    cls.add_method('TearDownBlockAck', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::UpdateAgreement(ns3::MgtAddBaResponseHeader const * respHdr, ns3::Mac48Address recipient) [member function]
+    cls.add_method('UpdateAgreement', 
+                   'void', 
+                   [param('ns3::MgtAddBaResponseHeader const *', 'respHdr'), param('ns3::Mac48Address', 'recipient')])
+    return
+
+def register_Ns3Buffer_methods(root_module, cls):
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer() [constructor]
+    cls.add_constructor([])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize) [constructor]
+    cls.add_constructor([param('uint32_t', 'dataSize')])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize, bool initialize) [constructor]
+    cls.add_constructor([param('uint32_t', 'dataSize'), param('bool', 'initialize')])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(ns3::Buffer const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Buffer const &', 'o')])
+    ## buffer.h (module 'network'): bool ns3::Buffer::AddAtEnd(uint32_t end) [member function]
+    cls.add_method('AddAtEnd', 
+                   'bool', 
+                   [param('uint32_t', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::AddAtEnd(ns3::Buffer const & o) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::Buffer const &', 'o')])
+    ## buffer.h (module 'network'): bool ns3::Buffer::AddAtStart(uint32_t start) [member function]
+    cls.add_method('AddAtStart', 
+                   'bool', 
+                   [param('uint32_t', 'start')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   'ns3::Buffer::Iterator', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::CopyData(std::ostream * os, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'void', 
+                   [param('std::ostream *', 'os'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::CopyData(uint8_t * buffer, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFragment(uint32_t start, uint32_t length) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::Buffer', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFullCopy() const [member function]
+    cls.add_method('CreateFullCopy', 
+                   'ns3::Buffer', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::End() const [member function]
+    cls.add_method('End', 
+                   'ns3::Buffer::Iterator', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentEndOffset() const [member function]
+    cls.add_method('GetCurrentEndOffset', 
+                   'int32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentStartOffset() const [member function]
+    cls.add_method('GetCurrentStartOffset', 
+                   'int32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint8_t const * ns3::Buffer::PeekData() const [member function]
+    cls.add_method('PeekData', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtEnd(uint32_t end) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtStart(uint32_t start) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'start')])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3BufferIterator_methods(root_module, cls):
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator(ns3::Buffer::Iterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Buffer::Iterator const &', 'arg0')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator() [constructor]
+    cls.add_constructor([])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size) [member function]
+    cls.add_method('CalculateIpChecksum', 
+                   'uint16_t', 
+                   [param('uint16_t', 'size')])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size, uint32_t initialChecksum) [member function]
+    cls.add_method('CalculateIpChecksum', 
+                   'uint16_t', 
+                   [param('uint16_t', 'size'), param('uint32_t', 'initialChecksum')])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetDistanceFrom(ns3::Buffer::Iterator const & o) const [member function]
+    cls.add_method('GetDistanceFrom', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator const &', 'o')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsEnd() const [member function]
+    cls.add_method('IsEnd', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsStart() const [member function]
+    cls.add_method('IsStart', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next() [member function]
+    cls.add_method('Next', 
+                   'void', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next(uint32_t delta) [member function]
+    cls.add_method('Next', 
+                   'void', 
+                   [param('uint32_t', 'delta')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev() [member function]
+    cls.add_method('Prev', 
+                   'void', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev(uint32_t delta) [member function]
+    cls.add_method('Prev', 
+                   'void', 
+                   [param('uint32_t', 'delta')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Read(uint8_t * buffer, uint32_t size) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadLsbtohU16() [member function]
+    cls.add_method('ReadLsbtohU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadLsbtohU32() [member function]
+    cls.add_method('ReadLsbtohU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadLsbtohU64() [member function]
+    cls.add_method('ReadLsbtohU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadNtohU16() [member function]
+    cls.add_method('ReadNtohU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadNtohU32() [member function]
+    cls.add_method('ReadNtohU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadNtohU64() [member function]
+    cls.add_method('ReadNtohU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadU16() [member function]
+    cls.add_method('ReadU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadU32() [member function]
+    cls.add_method('ReadU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadU64() [member function]
+    cls.add_method('ReadU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint8_t ns3::Buffer::Iterator::ReadU8() [member function]
+    cls.add_method('ReadU8', 
+                   'uint8_t', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(ns3::Buffer::Iterator start, ns3::Buffer::Iterator end) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('ns3::Buffer::Iterator', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU16(uint16_t data) [member function]
+    cls.add_method('WriteHtolsbU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU32(uint32_t data) [member function]
+    cls.add_method('WriteHtolsbU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU64(uint64_t data) [member function]
+    cls.add_method('WriteHtolsbU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU16(uint16_t data) [member function]
+    cls.add_method('WriteHtonU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU32(uint32_t data) [member function]
+    cls.add_method('WriteHtonU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU64(uint64_t data) [member function]
+    cls.add_method('WriteHtonU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU16(uint16_t data) [member function]
+    cls.add_method('WriteU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU32(uint32_t data) [member function]
+    cls.add_method('WriteU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU64(uint64_t data) [member function]
+    cls.add_method('WriteU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data, uint32_t len) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'data'), param('uint32_t', 'len')])
+    return
+
+def register_Ns3ByteTagIterator_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::ByteTagIterator::ByteTagIterator(ns3::ByteTagIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagIterator const &', 'arg0')])
+    ## packet.h (module 'network'): bool ns3::ByteTagIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item ns3::ByteTagIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::ByteTagIterator::Item', 
+                   [])
+    return
+
+def register_Ns3ByteTagIteratorItem_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item::Item(ns3::ByteTagIterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagIterator::Item const &', 'arg0')])
+    ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetEnd() const [member function]
+    cls.add_method('GetEnd', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetStart() const [member function]
+    cls.add_method('GetStart', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::ByteTagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
+    cls.add_method('GetTag', 
+                   'void', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::TypeId ns3::ByteTagIterator::Item::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3ByteTagList_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList() [constructor]
+    cls.add_constructor([])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList(ns3::ByteTagList const & o) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList const &', 'o')])
+    ## byte-tag-list.h (module 'network'): ns3::TagBuffer ns3::ByteTagList::Add(ns3::TypeId tid, uint32_t bufferSize, int32_t start, int32_t end) [member function]
+    cls.add_method('Add', 
+                   'ns3::TagBuffer', 
+                   [param('ns3::TypeId', 'tid'), param('uint32_t', 'bufferSize'), param('int32_t', 'start'), param('int32_t', 'end')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::Add(ns3::ByteTagList const & o) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::ByteTagList const &', 'o')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtEnd(int32_t adjustment, int32_t appendOffset) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('int32_t', 'adjustment'), param('int32_t', 'appendOffset')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtStart(int32_t adjustment, int32_t prependOffset) [member function]
+    cls.add_method('AddAtStart', 
+                   'void', 
+                   [param('int32_t', 'adjustment'), param('int32_t', 'prependOffset')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator ns3::ByteTagList::Begin(int32_t offsetStart, int32_t offsetEnd) const [member function]
+    cls.add_method('Begin', 
+                   'ns3::ByteTagList::Iterator', 
+                   [param('int32_t', 'offsetStart'), param('int32_t', 'offsetEnd')], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::RemoveAll() [member function]
+    cls.add_method('RemoveAll', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3ByteTagListIterator_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Iterator(ns3::ByteTagList::Iterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList::Iterator const &', 'arg0')])
+    ## byte-tag-list.h (module 'network'): uint32_t ns3::ByteTagList::Iterator::GetOffsetStart() const [member function]
+    cls.add_method('GetOffsetStart', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): bool ns3::ByteTagList::Iterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item ns3::ByteTagList::Iterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::ByteTagList::Iterator::Item', 
+                   [])
+    return
+
+def register_Ns3ByteTagListIteratorItem_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::ByteTagList::Iterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList::Iterator::Item const &', 'arg0')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::TagBuffer buf) [constructor]
+    cls.add_constructor([param('ns3::TagBuffer', 'buf')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::buf [variable]
+    cls.add_instance_attribute('buf', 'ns3::TagBuffer', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::end [variable]
+    cls.add_instance_attribute('end', 'int32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::size [variable]
+    cls.add_instance_attribute('size', 'uint32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::start [variable]
+    cls.add_instance_attribute('start', 'int32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3CallbackBase_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::CallbackBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackBase const &', 'arg0')])
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::Ptr<ns3::CallbackImplBase> ns3::CallbackBase::GetImpl() const [member function]
+    cls.add_method('GetImpl', 
+                   'ns3::Ptr< ns3::CallbackImplBase >', 
+                   [], 
+                   is_const=True)
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::Ptr<ns3::CallbackImplBase> impl) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::CallbackImplBase >', 'impl')], 
+                        visibility='protected')
+    ## callback.h (module 'core'): static std::string ns3::CallbackBase::Demangle(std::string const & mangled) [member function]
+    cls.add_method('Demangle', 
+                   'std::string', 
+                   [param('std::string const &', 'mangled')], 
+                   is_static=True, visibility='protected')
+    return
+
+def register_Ns3CapabilityInformation_methods(root_module, cls):
+    ## capability-information.h (module 'wifi'): ns3::CapabilityInformation::CapabilityInformation(ns3::CapabilityInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CapabilityInformation const &', 'arg0')])
+    ## capability-information.h (module 'wifi'): ns3::CapabilityInformation::CapabilityInformation() [constructor]
+    cls.add_constructor([])
+    ## capability-information.h (module 'wifi'): ns3::Buffer::Iterator ns3::CapabilityInformation::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')])
+    ## capability-information.h (module 'wifi'): uint32_t ns3::CapabilityInformation::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## capability-information.h (module 'wifi'): bool ns3::CapabilityInformation::IsEss() const [member function]
+    cls.add_method('IsEss', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## capability-information.h (module 'wifi'): bool ns3::CapabilityInformation::IsIbss() const [member function]
+    cls.add_method('IsIbss', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## capability-information.h (module 'wifi'): ns3::Buffer::Iterator ns3::CapabilityInformation::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## capability-information.h (module 'wifi'): void ns3::CapabilityInformation::SetEss() [member function]
+    cls.add_method('SetEss', 
+                   'void', 
+                   [])
+    ## capability-information.h (module 'wifi'): void ns3::CapabilityInformation::SetIbss() [member function]
+    cls.add_method('SetIbss', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3EventId_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('==')
+    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::EventId const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventId const &', 'arg0')])
+    ## event-id.h (module 'core'): ns3::EventId::EventId() [constructor]
+    cls.add_constructor([])
+    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::Ptr<ns3::EventImpl> const & impl, uint64_t ts, uint32_t context, uint32_t uid) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::EventImpl > const &', 'impl'), param('uint64_t', 'ts'), param('uint32_t', 'context'), param('uint32_t', 'uid')])
+    ## event-id.h (module 'core'): void ns3::EventId::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetContext() const [member function]
+    cls.add_method('GetContext', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): uint64_t ns3::EventId::GetTs() const [member function]
+    cls.add_method('GetTs', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): bool ns3::EventId::IsExpired() const [member function]
+    cls.add_method('IsExpired', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): bool ns3::EventId::IsRunning() const [member function]
+    cls.add_method('IsRunning', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): ns3::EventImpl * ns3::EventId::PeekEventImpl() const [member function]
+    cls.add_method('PeekEventImpl', 
+                   'ns3::EventImpl *', 
+                   [], 
+                   is_const=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')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
+def register_Ns3Ipv4Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(uint32_t address) [constructor]
+    cls.add_constructor([param('uint32_t', 'address')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(char const * address) [constructor]
+    cls.add_constructor([param('char const *', 'address')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4Address::CombineMask(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('CombineMask', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::Deserialize(uint8_t const * buf) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Ipv4Address', 
+                   [param('uint8_t const *', 'buf')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Address::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetAny() [member function]
+    cls.add_method('GetAny', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetBroadcast() [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4Address::GetSubnetDirectedBroadcast(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('GetSubnetDirectedBroadcast', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsEqual(ns3::Ipv4Address const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv4Address const &', 'other')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsLocalMulticast() const [member function]
+    cls.add_method('IsLocalMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static bool ns3::Ipv4Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsSubnetDirectedBroadcast(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('IsSubnetDirectedBroadcast', 
+                   'bool', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Serialize(uint8_t * buf) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Set(uint32_t address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint32_t', 'address')])
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Set(char const * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('char const *', 'address')])
+    return
+
+def register_Ns3Ipv4Mask_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(ns3::Ipv4Mask const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4Mask const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(uint32_t mask) [constructor]
+    cls.add_constructor([param('uint32_t', 'mask')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(char const * mask) [constructor]
+    cls.add_constructor([param('char const *', 'mask')])
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Mask::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Mask::GetInverse() const [member function]
+    cls.add_method('GetInverse', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): uint16_t ns3::Ipv4Mask::GetPrefixLength() const [member function]
+    cls.add_method('GetPrefixLength', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Mask::IsEqual(ns3::Ipv4Mask other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv4Mask', 'other')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Mask::IsMatch(ns3::Ipv4Address a, ns3::Ipv4Address b) const [member function]
+    cls.add_method('IsMatch', 
+                   'bool', 
+                   [param('ns3::Ipv4Address', 'a'), param('ns3::Ipv4Address', 'b')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Mask::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Mask::Set(uint32_t mask) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint32_t', 'mask')])
+    return
+
+def register_Ns3Ipv6Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(char const * address) [constructor]
+    cls.add_constructor([param('char const *', 'address')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(uint8_t * address) [constructor]
+    cls.add_constructor([param('uint8_t *', 'address')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const & addr) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const &', 'addr')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const * addr) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const *', 'addr')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address ns3::Ipv6Address::CombinePrefix(ns3::Ipv6Prefix const & prefix) [member function]
+    cls.add_method('CombinePrefix', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Prefix const &', 'prefix')])
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::Deserialize(uint8_t const * buf) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Ipv6Address', 
+                   [param('uint8_t const *', 'buf')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllHostsMulticast() [member function]
+    cls.add_method('GetAllHostsMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllNodesMulticast() [member function]
+    cls.add_method('GetAllNodesMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllRoutersMulticast() [member function]
+    cls.add_method('GetAllRoutersMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAny() [member function]
+    cls.add_method('GetAny', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::GetBytes(uint8_t * buf) const [member function]
+    cls.add_method('GetBytes', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv6Address::GetIpv4MappedAddress() const [member function]
+    cls.add_method('GetIpv4MappedAddress', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllHostsMulticast() const [member function]
+    cls.add_method('IsAllHostsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function]
+    cls.add_method('IsAllNodesMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllRoutersMulticast() const [member function]
+    cls.add_method('IsAllRoutersMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAny() const [member function]
+    cls.add_method('IsAny', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv6Address const &', 'other')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
+    cls.add_method('IsIpv4MappedAddress', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
+    cls.add_method('IsLinkLocal', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocalMulticast() const [member function]
+    cls.add_method('IsLinkLocalMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLocalhost() const [member function]
+    cls.add_method('IsLocalhost', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static bool ns3::Ipv6Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsSolicitedMulticast() const [member function]
+    cls.add_method('IsSolicitedMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac48Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
+    cls.add_method('MakeIpv4MappedAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv4Address', 'addr')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeSolicitedAddress(ns3::Ipv6Address addr) [member function]
+    cls.add_method('MakeSolicitedAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Serialize(uint8_t * buf) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Set(char const * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('char const *', 'address')])
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Set(uint8_t * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint8_t *', 'address')])
+    return
+
+def register_Ns3Ipv6Prefix_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(uint8_t * prefix) [constructor]
+    cls.add_constructor([param('uint8_t *', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(char const * prefix) [constructor]
+    cls.add_constructor([param('char const *', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(uint8_t prefix) [constructor]
+    cls.add_constructor([param('uint8_t', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const & prefix) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const &', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const * prefix) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const *', 'prefix')])
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Prefix::GetBytes(uint8_t * buf) const [member function]
+    cls.add_method('GetBytes', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): uint8_t ns3::Ipv6Prefix::GetPrefixLength() const [member function]
+    cls.add_method('GetPrefixLength', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Prefix::IsEqual(ns3::Ipv6Prefix const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv6Prefix const &', 'other')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Prefix::IsMatch(ns3::Ipv6Address a, ns3::Ipv6Address b) const [member function]
+    cls.add_method('IsMatch', 
+                   'bool', 
+                   [param('ns3::Ipv6Address', 'a'), param('ns3::Ipv6Address', 'b')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Prefix::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    return
+
+def register_Ns3Mac48Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')])
+    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address() [constructor]
+    cls.add_constructor([])
+    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(char const * str) [constructor]
+    cls.add_constructor([param('char const *', 'str')])
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::Allocate() [member function]
+    cls.add_method('Allocate', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): void ns3::Mac48Address::CopyFrom(uint8_t const * buffer) [member function]
+    cls.add_method('CopyFrom', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer')])
+    ## mac48-address.h (module 'network'): void ns3::Mac48Address::CopyTo(uint8_t * buffer) const [member function]
+    cls.add_method('CopyTo', 
+                   'void', 
+                   [param('uint8_t *', 'buffer')], 
+                   is_const=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetBroadcast() [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv4Address address) [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::Ipv4Address', 'address')], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv6Address address) [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::Ipv6Address', 'address')], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast6Prefix() [member function]
+    cls.add_method('GetMulticast6Prefix', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticastPrefix() [member function]
+    cls.add_method('GetMulticastPrefix', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): bool ns3::Mac48Address::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac48-address.h (module 'network'): bool ns3::Mac48Address::IsGroup() const [member function]
+    cls.add_method('IsGroup', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac48-address.h (module 'network'): static bool ns3::Mac48Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   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]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::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)
+    return
+
+def register_Ns3MacLowDcfListener_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener::MacLowDcfListener(ns3::MacLowDcfListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowDcfListener const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener::MacLowDcfListener() [constructor]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::AckTimeoutReset() [member function]
+    cls.add_method('AckTimeoutReset', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::AckTimeoutStart(ns3::Time duration) [member function]
+    cls.add_method('AckTimeoutStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::CtsTimeoutReset() [member function]
+    cls.add_method('CtsTimeoutReset', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::CtsTimeoutStart(ns3::Time duration) [member function]
+    cls.add_method('CtsTimeoutStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::NavReset(ns3::Time duration) [member function]
+    cls.add_method('NavReset', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::NavStart(ns3::Time duration) [member function]
+    cls.add_method('NavStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3MacLowTransmissionListener_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener::MacLowTransmissionListener(ns3::MacLowTransmissionListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowTransmissionListener const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener::MacLowTransmissionListener() [constructor]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::EndTxNoAck() [member function]
+    cls.add_method('EndTxNoAck', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::GotAck(double snr, ns3::WifiMode txMode) [member function]
+    cls.add_method('GotAck', 
+                   'void', 
+                   [param('double', 'snr'), param('ns3::WifiMode', 'txMode')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::GotBlockAck(ns3::CtrlBAckResponseHeader const * blockAck, ns3::Mac48Address source) [member function]
+    cls.add_method('GotBlockAck', 
+                   'void', 
+                   [param('ns3::CtrlBAckResponseHeader const *', 'blockAck'), param('ns3::Mac48Address', 'source')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::GotCts(double snr, ns3::WifiMode txMode) [member function]
+    cls.add_method('GotCts', 
+                   'void', 
+                   [param('double', 'snr'), param('ns3::WifiMode', 'txMode')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::MissedAck() [member function]
+    cls.add_method('MissedAck', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::MissedBlockAck() [member function]
+    cls.add_method('MissedBlockAck', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::MissedCts() [member function]
+    cls.add_method('MissedCts', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::StartNext() [member function]
+    cls.add_method('StartNext', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3MacLowTransmissionParameters_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionParameters::MacLowTransmissionParameters(ns3::MacLowTransmissionParameters const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowTransmissionParameters const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionParameters::MacLowTransmissionParameters() [constructor]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::DisableAck() [member function]
+    cls.add_method('DisableAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::DisableNextData() [member function]
+    cls.add_method('DisableNextData', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::DisableOverrideDurationId() [member function]
+    cls.add_method('DisableOverrideDurationId', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::DisableRts() [member function]
+    cls.add_method('DisableRts', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableAck() [member function]
+    cls.add_method('EnableAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableBasicBlockAck() [member function]
+    cls.add_method('EnableBasicBlockAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableCompressedBlockAck() [member function]
+    cls.add_method('EnableCompressedBlockAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableFastAck() [member function]
+    cls.add_method('EnableFastAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableMultiTidBlockAck() [member function]
+    cls.add_method('EnableMultiTidBlockAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableNextData(uint32_t size) [member function]
+    cls.add_method('EnableNextData', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableOverrideDurationId(ns3::Time durationId) [member function]
+    cls.add_method('EnableOverrideDurationId', 
+                   'void', 
+                   [param('ns3::Time', 'durationId')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableRts() [member function]
+    cls.add_method('EnableRts', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableSuperFastAck() [member function]
+    cls.add_method('EnableSuperFastAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLowTransmissionParameters::GetDurationId() const [member function]
+    cls.add_method('GetDurationId', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowTransmissionParameters::GetNextPacketSize() const [member function]
+    cls.add_method('GetNextPacketSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::HasDurationId() const [member function]
+    cls.add_method('HasDurationId', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::HasNextPacket() const [member function]
+    cls.add_method('HasNextPacket', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustSendRts() const [member function]
+    cls.add_method('MustSendRts', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitAck() const [member function]
+    cls.add_method('MustWaitAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitBasicBlockAck() const [member function]
+    cls.add_method('MustWaitBasicBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitCompressedBlockAck() const [member function]
+    cls.add_method('MustWaitCompressedBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitFastAck() const [member function]
+    cls.add_method('MustWaitFastAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitMultiTidBlockAck() const [member function]
+    cls.add_method('MustWaitMultiTidBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitNormalAck() const [member function]
+    cls.add_method('MustWaitNormalAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitSuperFastAck() const [member function]
+    cls.add_method('MustWaitSuperFastAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3NetDeviceContainer_methods(root_module, cls):
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NetDeviceContainer const &', 'arg0')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer() [constructor]
+    cls.add_constructor([])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::Ptr<ns3::NetDevice> dev) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(std::string devName) [constructor]
+    cls.add_constructor([param('std::string', 'devName')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & a, ns3::NetDeviceContainer const & b) [constructor]
+    cls.add_constructor([param('ns3::NetDeviceContainer const &', 'a'), param('ns3::NetDeviceContainer const &', 'b')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(ns3::NetDeviceContainer other) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::NetDeviceContainer', 'other')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(ns3::Ptr<ns3::NetDevice> device) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(std::string deviceName) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'deviceName')])
+    ## net-device-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::NetDevice > const, std::vector< ns3::Ptr< ns3::NetDevice > > >', 
+                   [], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::End() const [member function]
+    cls.add_method('End', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::NetDevice > const, std::vector< ns3::Ptr< ns3::NetDevice > > >', 
+                   [], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::NetDeviceContainer::Get(uint32_t i) const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): uint32_t ns3::NetDeviceContainer::GetN() const [member function]
+    cls.add_method('GetN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3NodeContainer_methods(root_module, cls):
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'arg0')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer() [constructor]
+    cls.add_constructor([])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::Ptr<ns3::Node> node) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(std::string nodeName) [constructor]
+    cls.add_constructor([param('std::string', 'nodeName')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b) [constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c) [constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d) [constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c'), param('ns3::NodeContainer const &', 'd')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d, ns3::NodeContainer const & e) [constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c'), param('ns3::NodeContainer const &', 'd'), param('ns3::NodeContainer const &', 'e')])
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Add(ns3::NodeContainer other) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::NodeContainer', 'other')])
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Add(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')])
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Add(std::string nodeName) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'nodeName')])
+    ## node-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Node>*,std::vector<ns3::Ptr<ns3::Node>, std::allocator<ns3::Ptr<ns3::Node> > > > ns3::NodeContainer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Node > const, std::vector< ns3::Ptr< ns3::Node > > >', 
+                   [], 
+                   is_const=True)
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Create(uint32_t n) [member function]
+    cls.add_method('Create', 
+                   'void', 
+                   [param('uint32_t', 'n')])
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Create(uint32_t n, uint32_t systemId) [member function]
+    cls.add_method('Create', 
+                   'void', 
+                   [param('uint32_t', 'n'), param('uint32_t', 'systemId')])
+    ## node-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Node>*,std::vector<ns3::Ptr<ns3::Node>, std::allocator<ns3::Ptr<ns3::Node> > > > ns3::NodeContainer::End() const [member function]
+    cls.add_method('End', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Node > const, std::vector< ns3::Ptr< ns3::Node > > >', 
+                   [], 
+                   is_const=True)
+    ## node-container.h (module 'network'): ns3::Ptr<ns3::Node> ns3::NodeContainer::Get(uint32_t i) const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## node-container.h (module 'network'): static ns3::NodeContainer ns3::NodeContainer::GetGlobal() [member function]
+    cls.add_method('GetGlobal', 
+                   'ns3::NodeContainer', 
+                   [], 
+                   is_static=True)
+    ## node-container.h (module 'network'): uint32_t ns3::NodeContainer::GetN() const [member function]
+    cls.add_method('GetN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3ObjectBase_methods(root_module, cls):
+    ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase() [constructor]
+    cls.add_constructor([])
+    ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectBase const &', 'arg0')])
+    ## object-base.h (module 'core'): void ns3::ObjectBase::GetAttribute(std::string name, ns3::AttributeValue & value) const [member function]
+    cls.add_method('GetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue &', 'value')], 
+                   is_const=True)
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::GetAttributeFailSafe(std::string name, ns3::AttributeValue & attribute) const [member function]
+    cls.add_method('GetAttributeFailSafe', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue &', 'attribute')], 
+                   is_const=True)
+    ## object-base.h (module 'core'): ns3::TypeId ns3::ObjectBase::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## object-base.h (module 'core'): static ns3::TypeId ns3::ObjectBase::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## object-base.h (module 'core'): void ns3::ObjectBase::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::SetAttributeFailSafe(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttributeFailSafe', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceConnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceConnect', 
+                   'bool', 
+                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceConnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceConnectWithoutContext', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceDisconnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceDisconnect', 
+                   'bool', 
+                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceDisconnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceDisconnectWithoutContext', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): void ns3::ObjectBase::ConstructSelf(ns3::AttributeConstructionList const & attributes) [member function]
+    cls.add_method('ConstructSelf', 
+                   'void', 
+                   [param('ns3::AttributeConstructionList const &', 'attributes')], 
+                   visibility='protected')
+    ## object-base.h (module 'core'): void ns3::ObjectBase::NotifyConstructionCompleted() [member function]
+    cls.add_method('NotifyConstructionCompleted', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ObjectDeleter_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::ObjectDeleter::ObjectDeleter() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): ns3::ObjectDeleter::ObjectDeleter(ns3::ObjectDeleter const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectDeleter const &', 'arg0')])
+    ## object.h (module 'core'): static void ns3::ObjectDeleter::Delete(ns3::Object * object) [member function]
+    cls.add_method('Delete', 
+                   'void', 
+                   [param('ns3::Object *', 'object')], 
+                   is_static=True)
+    return
+
+def register_Ns3ObjectFactory_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')])
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(std::string typeId) [constructor]
+    cls.add_constructor([param('std::string', 'typeId')])
+    ## object-factory.h (module 'core'): ns3::Ptr<ns3::Object> ns3::ObjectFactory::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::Object >', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('ns3::TypeId', 'tid')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('char const *', 'tid')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('std::string', 'tid')])
+    return
+
+def register_Ns3OrganizationIdentifier_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifier(ns3::OrganizationIdentifier const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OrganizationIdentifier const &', 'arg0')])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifier() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifier(uint8_t const * str, uint32_t length) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'str'), param('uint32_t', 'length')])
+    ## vendor-specific-action.h (module 'wave'): uint32_t ns3::OrganizationIdentifier::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')])
+    ## vendor-specific-action.h (module 'wave'): uint8_t ns3::OrganizationIdentifier::GetManagementId() const [member function]
+    cls.add_method('GetManagementId', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): uint32_t ns3::OrganizationIdentifier::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifierType ns3::OrganizationIdentifier::GetType() const [member function]
+    cls.add_method('GetType', 
+                   'ns3::OrganizationIdentifier::OrganizationIdentifierType', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): bool ns3::OrganizationIdentifier::IsNull() const [member function]
+    cls.add_method('IsNull', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::OrganizationIdentifier::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::OrganizationIdentifier::SetType(ns3::OrganizationIdentifier::OrganizationIdentifierType type) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier::OrganizationIdentifierType', 'type')])
+    return
+
+def register_Ns3OriginatorBlockAckAgreement_methods(root_module, cls):
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement::OriginatorBlockAckAgreement(ns3::OriginatorBlockAckAgreement const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OriginatorBlockAckAgreement const &', 'arg0')])
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement::OriginatorBlockAckAgreement() [constructor]
+    cls.add_constructor([])
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement::OriginatorBlockAckAgreement(ns3::Mac48Address recipient, uint8_t tid) [constructor]
+    cls.add_constructor([param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')])
+    ## originator-block-ack-agreement.h (module 'wifi'): void ns3::OriginatorBlockAckAgreement::CompleteExchange() [member function]
+    cls.add_method('CompleteExchange', 
+                   'void', 
+                   [])
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsBlockAckRequestNeeded() const [member function]
+    cls.add_method('IsBlockAckRequestNeeded', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsEstablished() const [member function]
+    cls.add_method('IsEstablished', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsInactive() const [member function]
+    cls.add_method('IsInactive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsPending() const [member function]
+    cls.add_method('IsPending', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsUnsuccessful() const [member function]
+    cls.add_method('IsUnsuccessful', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): void ns3::OriginatorBlockAckAgreement::NotifyMpduTransmission(uint16_t nextSeqNumber) [member function]
+    cls.add_method('NotifyMpduTransmission', 
+                   'void', 
+                   [param('uint16_t', 'nextSeqNumber')])
+    ## originator-block-ack-agreement.h (module 'wifi'): void ns3::OriginatorBlockAckAgreement::SetState(ns3::OriginatorBlockAckAgreement::State state) [member function]
+    cls.add_method('SetState', 
+                   'void', 
+                   [param('ns3::OriginatorBlockAckAgreement::State', 'state')])
+    return
+
+def register_Ns3PacketMetadata_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor]
+    cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(ns3::PacketMetadata const & o) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata const &', 'o')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddAtEnd(ns3::PacketMetadata const & o) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::PacketMetadata const &', 'o')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddHeader(ns3::Header const & header, uint32_t size) [member function]
+    cls.add_method('AddHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddPaddingAtEnd(uint32_t end) [member function]
+    cls.add_method('AddPaddingAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddTrailer(ns3::Trailer const & trailer, uint32_t size) [member function]
+    cls.add_method('AddTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::PacketMetadata::BeginItem(ns3::Buffer buffer) const [member function]
+    cls.add_method('BeginItem', 
+                   'ns3::PacketMetadata::ItemIterator', 
+                   [param('ns3::Buffer', 'buffer')], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata ns3::PacketMetadata::CreateFragment(uint32_t start, uint32_t end) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::PacketMetadata', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'end')], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::Enable() [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::EnableChecking() [member function]
+    cls.add_method('EnableChecking', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): uint64_t ns3::PacketMetadata::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtEnd(uint32_t end) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtStart(uint32_t start) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'start')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveHeader(ns3::Header const & header, uint32_t size) [member function]
+    cls.add_method('RemoveHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveTrailer(ns3::Trailer const & trailer, uint32_t size) [member function]
+    cls.add_method('RemoveTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3PacketMetadataItem_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item() [constructor]
+    cls.add_constructor([])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item(ns3::PacketMetadata::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata::Item const &', 'arg0')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::current [variable]
+    cls.add_instance_attribute('current', 'ns3::Buffer::Iterator', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentSize [variable]
+    cls.add_instance_attribute('currentSize', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromEnd [variable]
+    cls.add_instance_attribute('currentTrimedFromEnd', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromStart [variable]
+    cls.add_instance_attribute('currentTrimedFromStart', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::isFragment [variable]
+    cls.add_instance_attribute('isFragment', 'bool', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3PacketMetadataItemIterator_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata::ItemIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata::ItemIterator const &', 'arg0')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata const * metadata, ns3::Buffer buffer) [constructor]
+    cls.add_constructor([param('ns3::PacketMetadata const *', 'metadata'), param('ns3::Buffer', 'buffer')])
+    ## packet-metadata.h (module 'network'): bool ns3::PacketMetadata::ItemIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item ns3::PacketMetadata::ItemIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::PacketMetadata::Item', 
+                   [])
+    return
+
+def register_Ns3PacketTagIterator_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::PacketTagIterator::PacketTagIterator(ns3::PacketTagIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagIterator const &', 'arg0')])
+    ## packet.h (module 'network'): bool ns3::PacketTagIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item ns3::PacketTagIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::PacketTagIterator::Item', 
+                   [])
+    return
+
+def register_Ns3PacketTagIteratorItem_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item::Item(ns3::PacketTagIterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagIterator::Item const &', 'arg0')])
+    ## packet.h (module 'network'): void ns3::PacketTagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
+    cls.add_method('GetTag', 
+                   'void', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::TypeId ns3::PacketTagIterator::Item::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3PacketTagList_methods(root_module, cls):
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList() [constructor]
+    cls.add_constructor([])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList(ns3::PacketTagList const & o) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagList const &', 'o')])
+    ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::Add(ns3::Tag const & tag) const [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData const * ns3::PacketTagList::Head() const [member function]
+    cls.add_method('Head', 
+                   'ns3::PacketTagList::TagData const *', 
+                   [], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Peek(ns3::Tag & tag) const [member function]
+    cls.add_method('Peek', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Remove(ns3::Tag & tag) [member function]
+    cls.add_method('Remove', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::RemoveAll() [member function]
+    cls.add_method('RemoveAll', 
+                   'void', 
+                   [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    return
+
+def register_Ns3PacketTagListTagData_methods(root_module, cls):
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData() [constructor]
+    cls.add_constructor([])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData(ns3::PacketTagList::TagData const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagList::TagData const &', 'arg0')])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::count [variable]
+    cls.add_instance_attribute('count', 'uint32_t', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::data [variable]
+    cls.add_instance_attribute('data', 'uint8_t [ 20 ]', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::next [variable]
+    cls.add_instance_attribute('next', 'ns3::PacketTagList::TagData *', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3PcapFile_methods(root_module, cls):
+    ## pcap-file.h (module 'network'): ns3::PcapFile::PcapFile() [constructor]
+    cls.add_constructor([])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Clear() [member function]
+    cls.add_method('Clear', 
+                   'void', 
+                   [])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Close() [member function]
+    cls.add_method('Close', 
+                   'void', 
+                   [])
+    ## pcap-file.h (module 'network'): static bool ns3::PcapFile::Diff(std::string const & f1, std::string const & f2, uint32_t & sec, uint32_t & usec, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT) [member function]
+    cls.add_method('Diff', 
+                   'bool', 
+                   [param('std::string const &', 'f1'), param('std::string const &', 'f2'), param('uint32_t &', 'sec'), param('uint32_t &', 'usec'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT')], 
+                   is_static=True)
+    ## pcap-file.h (module 'network'): bool ns3::PcapFile::Eof() const [member function]
+    cls.add_method('Eof', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## pcap-file.h (module 'network'): bool ns3::PcapFile::Fail() const [member function]
+    cls.add_method('Fail', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## pcap-file.h (module 'network'): uint32_t ns3::PcapFile::GetDataLinkType() [member function]
+    cls.add_method('GetDataLinkType', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint32_t ns3::PcapFile::GetMagic() [member function]
+    cls.add_method('GetMagic', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint32_t ns3::PcapFile::GetSigFigs() [member function]
+    cls.add_method('GetSigFigs', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint32_t ns3::PcapFile::GetSnapLen() [member function]
+    cls.add_method('GetSnapLen', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): bool ns3::PcapFile::GetSwapMode() [member function]
+    cls.add_method('GetSwapMode', 
+                   'bool', 
+                   [])
+    ## pcap-file.h (module 'network'): int32_t ns3::PcapFile::GetTimeZoneOffset() [member function]
+    cls.add_method('GetTimeZoneOffset', 
+                   'int32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint16_t ns3::PcapFile::GetVersionMajor() [member function]
+    cls.add_method('GetVersionMajor', 
+                   'uint16_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint16_t ns3::PcapFile::GetVersionMinor() [member function]
+    cls.add_method('GetVersionMinor', 
+                   'uint16_t', 
+                   [])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Init(uint32_t dataLinkType, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT, int32_t timeZoneCorrection=ns3::PcapFile::ZONE_DEFAULT, bool swapMode=false) [member function]
+    cls.add_method('Init', 
+                   'void', 
+                   [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT'), param('int32_t', 'timeZoneCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT'), param('bool', 'swapMode', default_value='false')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Open(std::string const & filename, std::_Ios_Openmode mode) [member function]
+    cls.add_method('Open', 
+                   'void', 
+                   [param('std::string const &', 'filename'), param('std::_Ios_Openmode', 'mode')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Read(uint8_t * const data, uint32_t maxBytes, uint32_t & tsSec, uint32_t & tsUsec, uint32_t & inclLen, uint32_t & origLen, uint32_t & readLen) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t * const', 'data'), param('uint32_t', 'maxBytes'), param('uint32_t &', 'tsSec'), param('uint32_t &', 'tsUsec'), param('uint32_t &', 'inclLen'), param('uint32_t &', 'origLen'), param('uint32_t &', 'readLen')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, uint8_t const * const data, uint32_t totalLen) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('uint8_t const * const', 'data'), param('uint32_t', 'totalLen')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Ptr< ns3::Packet const >', 'p')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
+    ## pcap-file.h (module 'network'): ns3::PcapFile::SNAPLEN_DEFAULT [variable]
+    cls.add_static_attribute('SNAPLEN_DEFAULT', 'uint32_t const', is_const=True)
+    ## pcap-file.h (module 'network'): ns3::PcapFile::ZONE_DEFAULT [variable]
+    cls.add_static_attribute('ZONE_DEFAULT', 'int32_t const', is_const=True)
+    return
+
+def register_Ns3PcapHelper_methods(root_module, cls):
+    ## trace-helper.h (module 'network'): ns3::PcapHelper::PcapHelper(ns3::PcapHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PcapHelper const &', 'arg0')])
+    ## trace-helper.h (module 'network'): ns3::PcapHelper::PcapHelper() [constructor]
+    cls.add_constructor([])
+    ## trace-helper.h (module 'network'): ns3::Ptr<ns3::PcapFileWrapper> ns3::PcapHelper::CreateFile(std::string filename, std::_Ios_Openmode filemode, uint32_t dataLinkType, uint32_t snapLen=65535, int32_t tzCorrection=0) [member function]
+    cls.add_method('CreateFile', 
+                   'ns3::Ptr< ns3::PcapFileWrapper >', 
+                   [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='65535'), param('int32_t', 'tzCorrection', default_value='0')])
+    ## trace-helper.h (module 'network'): std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
+    cls.add_method('GetFilenameFromDevice', 
+                   'std::string', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'useObjectNames', default_value='true')])
+    ## trace-helper.h (module 'network'): std::string ns3::PcapHelper::GetFilenameFromInterfacePair(std::string prefix, ns3::Ptr<ns3::Object> object, uint32_t interface, bool useObjectNames=true) [member function]
+    cls.add_method('GetFilenameFromInterfacePair', 
+                   'std::string', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Object >', 'object'), param('uint32_t', 'interface'), param('bool', 'useObjectNames', default_value='true')])
+    return
+
+def register_Ns3PcapHelperForDevice_methods(root_module, cls):
+    ## trace-helper.h (module 'network'): ns3::PcapHelperForDevice::PcapHelperForDevice(ns3::PcapHelperForDevice const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PcapHelperForDevice const &', 'arg0')])
+    ## trace-helper.h (module 'network'): ns3::PcapHelperForDevice::PcapHelperForDevice() [constructor]
+    cls.add_constructor([])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false, bool explicitFilename=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false'), param('bool', 'explicitFilename', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, std::string ndName, bool promiscuous=false, bool explicitFilename=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('std::string', 'ndName'), param('bool', 'promiscuous', default_value='false'), param('bool', 'explicitFilename', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, ns3::NetDeviceContainer d, bool promiscuous=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd'), param('bool', 'promiscuous', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, ns3::NodeContainer n, bool promiscuous=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n'), param('bool', 'promiscuous', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, uint32_t nodeid, uint32_t deviceid, bool promiscuous=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid'), param('bool', 'promiscuous', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcapAll(std::string prefix, bool promiscuous=false) [member function]
+    cls.add_method('EnablePcapAll', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('bool', 'promiscuous', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous, bool explicitFilename) [member function]
+    cls.add_method('EnablePcapInternal', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous'), param('bool', 'explicitFilename')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount(ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3Simulator_methods(root_module, cls):
+    ## simulator.h (module 'core'): ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Simulator const &', 'arg0')])
+    ## simulator.h (module 'core'): static void ns3::Simulator::Cancel(ns3::EventId const & id) [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [param('ns3::EventId const &', 'id')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::Destroy() [member function]
+    cls.add_method('Destroy', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetContext() [member function]
+    cls.add_method('GetContext', 
+                   'uint32_t', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetDelayLeft(ns3::EventId const & id) [member function]
+    cls.add_method('GetDelayLeft', 
+                   'ns3::Time', 
+                   [param('ns3::EventId const &', 'id')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static ns3::Ptr<ns3::SimulatorImpl> ns3::Simulator::GetImplementation() [member function]
+    cls.add_method('GetImplementation', 
+                   'ns3::Ptr< ns3::SimulatorImpl >', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetMaximumSimulationTime() [member function]
+    cls.add_method('GetMaximumSimulationTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetSystemId() [member function]
+    cls.add_method('GetSystemId', 
+                   'uint32_t', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static bool ns3::Simulator::IsExpired(ns3::EventId const & id) [member function]
+    cls.add_method('IsExpired', 
+                   'bool', 
+                   [param('ns3::EventId const &', 'id')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static bool ns3::Simulator::IsFinished() [member function]
+    cls.add_method('IsFinished', 
+                   'bool', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function]
+    cls.add_method('Now', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::Remove(ns3::EventId const & id) [member function]
+    cls.add_method('Remove', 
+                   'void', 
+                   [param('ns3::EventId const &', 'id')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr<ns3::SimulatorImpl> impl) [member function]
+    cls.add_method('SetImplementation', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function]
+    cls.add_method('SetScheduler', 
+                   'void', 
+                   [param('ns3::ObjectFactory', 'schedulerFactory')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::Stop() [member function]
+    cls.add_method('Stop', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::Stop(ns3::Time const & time) [member function]
+    cls.add_method('Stop', 
+                   'void', 
+                   [param('ns3::Time const &', 'time')], 
+                   is_static=True)
+    return
+
+def register_Ns3StatusCode_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## status-code.h (module 'wifi'): ns3::StatusCode::StatusCode(ns3::StatusCode const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::StatusCode const &', 'arg0')])
+    ## status-code.h (module 'wifi'): ns3::StatusCode::StatusCode() [constructor]
+    cls.add_constructor([])
+    ## status-code.h (module 'wifi'): ns3::Buffer::Iterator ns3::StatusCode::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')])
+    ## status-code.h (module 'wifi'): uint32_t ns3::StatusCode::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## status-code.h (module 'wifi'): bool ns3::StatusCode::IsSuccess() const [member function]
+    cls.add_method('IsSuccess', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## status-code.h (module 'wifi'): ns3::Buffer::Iterator ns3::StatusCode::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## status-code.h (module 'wifi'): void ns3::StatusCode::SetFailure() [member function]
+    cls.add_method('SetFailure', 
+                   'void', 
+                   [])
+    ## status-code.h (module 'wifi'): void ns3::StatusCode::SetSuccess() [member function]
+    cls.add_method('SetSuccess', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3Tag_methods(root_module, cls):
+    ## tag.h (module 'network'): ns3::Tag::Tag() [constructor]
+    cls.add_constructor([])
+    ## tag.h (module 'network'): ns3::Tag::Tag(ns3::Tag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Tag const &', 'arg0')])
+    ## tag.h (module 'network'): void ns3::Tag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## tag.h (module 'network'): uint32_t ns3::Tag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## tag.h (module 'network'): static ns3::TypeId ns3::Tag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## tag.h (module 'network'): void ns3::Tag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## tag.h (module 'network'): void ns3::Tag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3TagBuffer_methods(root_module, cls):
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(ns3::TagBuffer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TagBuffer const &', 'arg0')])
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(uint8_t * start, uint8_t * end) [constructor]
+    cls.add_constructor([param('uint8_t *', 'start'), param('uint8_t *', 'end')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::CopyFrom(ns3::TagBuffer o) [member function]
+    cls.add_method('CopyFrom', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'o')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::Read(uint8_t * buffer, uint32_t size) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+    ## tag-buffer.h (module 'network'): double ns3::TagBuffer::ReadDouble() [member function]
+    cls.add_method('ReadDouble', 
+                   'double', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint16_t ns3::TagBuffer::ReadU16() [member function]
+    cls.add_method('ReadU16', 
+                   'uint16_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint32_t ns3::TagBuffer::ReadU32() [member function]
+    cls.add_method('ReadU32', 
+                   'uint32_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint64_t ns3::TagBuffer::ReadU64() [member function]
+    cls.add_method('ReadU64', 
+                   'uint64_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint8_t ns3::TagBuffer::ReadU8() [member function]
+    cls.add_method('ReadU8', 
+                   'uint8_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::TrimAtEnd(uint32_t trim) [member function]
+    cls.add_method('TrimAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'trim')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::Write(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteDouble(double v) [member function]
+    cls.add_method('WriteDouble', 
+                   'void', 
+                   [param('double', 'v')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU16(uint16_t data) [member function]
+    cls.add_method('WriteU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU32(uint32_t data) [member function]
+    cls.add_method('WriteU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU64(uint64_t v) [member function]
+    cls.add_method('WriteU64', 
+                   'void', 
+                   [param('uint64_t', 'v')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU8(uint8_t v) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'v')])
+    return
+
+def register_Ns3TypeId_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor]
+    cls.add_constructor([param('char const *', 'name')])
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId(ns3::TypeId const & o) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId const &', 'o')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('AddAttribute', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('AddAttribute', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]
+    cls.add_method('AddTraceSource', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation ns3::TypeId::GetAttribute(uint32_t i) const [member function]
+    cls.add_method('GetAttribute', 
+                   'ns3::TypeId::AttributeInformation', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetAttributeFullName(uint32_t i) const [member function]
+    cls.add_method('GetAttributeFullName', 
+                   'std::string', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetAttributeN() const [member function]
+    cls.add_method('GetAttributeN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::Callback<ns3::ObjectBase*,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::TypeId::GetConstructor() const [member function]
+    cls.add_method('GetConstructor', 
+                   'ns3::Callback< ns3::ObjectBase *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetGroupName() const [member function]
+    cls.add_method('GetGroupName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::GetParent() const [member function]
+    cls.add_method('GetParent', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::GetRegistered(uint32_t i) [member function]
+    cls.add_method('GetRegistered', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'i')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static uint32_t ns3::TypeId::GetRegisteredN() [member function]
+    cls.add_method('GetRegisteredN', 
+                   'uint32_t', 
+                   [], 
+                   is_static=True)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation ns3::TypeId::GetTraceSource(uint32_t i) const [member function]
+    cls.add_method('GetTraceSource', 
+                   'ns3::TypeId::TraceSourceInformation', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetTraceSourceN() const [member function]
+    cls.add_method('GetTraceSourceN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint16_t ns3::TypeId::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::HasConstructor() const [member function]
+    cls.add_method('HasConstructor', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::HasParent() const [member function]
+    cls.add_method('HasParent', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::HideFromDocumentation() [member function]
+    cls.add_method('HideFromDocumentation', 
+                   'ns3::TypeId', 
+                   [])
+    ## type-id.h (module 'core'): bool ns3::TypeId::IsChildOf(ns3::TypeId other) const [member function]
+    cls.add_method('IsChildOf', 
+                   'bool', 
+                   [param('ns3::TypeId', 'other')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::LookupAttributeByName(std::string name, ns3::TypeId::AttributeInformation * info) const [member function]
+    cls.add_method('LookupAttributeByName', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
+                   is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
+    cls.add_method('LookupByName', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): ns3::Ptr<ns3::TraceSourceAccessor const> ns3::TypeId::LookupTraceSourceByName(std::string name) const [member function]
+    cls.add_method('LookupTraceSourceByName', 
+                   'ns3::Ptr< ns3::TraceSourceAccessor const >', 
+                   [param('std::string', 'name')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::MustHideFromDocumentation() const [member function]
+    cls.add_method('MustHideFromDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::SetAttributeInitialValue(uint32_t i, ns3::Ptr<ns3::AttributeValue const> initialValue) [member function]
+    cls.add_method('SetAttributeInitialValue', 
+                   'bool', 
+                   [param('uint32_t', 'i'), param('ns3::Ptr< ns3::AttributeValue const >', 'initialValue')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetGroupName(std::string groupName) [member function]
+    cls.add_method('SetGroupName', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'groupName')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetParent(ns3::TypeId tid) [member function]
+    cls.add_method('SetParent', 
+                   'ns3::TypeId', 
+                   [param('ns3::TypeId', 'tid')])
+    ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t tid) [member function]
+    cls.add_method('SetUid', 
+                   'void', 
+                   [param('uint16_t', 'tid')])
+    return
+
+def register_Ns3TypeIdAttributeInformation_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::AttributeInformation() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::AttributeInformation(ns3::TypeId::AttributeInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId::AttributeInformation const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::accessor [variable]
+    cls.add_instance_attribute('accessor', 'ns3::Ptr< ns3::AttributeAccessor const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::checker [variable]
+    cls.add_instance_attribute('checker', 'ns3::Ptr< ns3::AttributeChecker const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::flags [variable]
+    cls.add_instance_attribute('flags', 'uint32_t', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::help [variable]
+    cls.add_instance_attribute('help', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::initialValue [variable]
+    cls.add_instance_attribute('initialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::originalInitialValue [variable]
+    cls.add_instance_attribute('originalInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)
+    return
+
+def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::TraceSourceInformation() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::TraceSourceInformation(ns3::TypeId::TraceSourceInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId::TraceSourceInformation const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::accessor [variable]
+    cls.add_instance_attribute('accessor', 'ns3::Ptr< ns3::TraceSourceAccessor const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::help [variable]
+    cls.add_instance_attribute('help', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    return
+
+def register_Ns3VendorSpecificContentManager_methods(root_module, cls):
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificContentManager::VendorSpecificContentManager(ns3::VendorSpecificContentManager const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::VendorSpecificContentManager const &', 'arg0')])
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificContentManager::VendorSpecificContentManager() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificContentManager::DeregisterVscCallback(ns3::OrganizationIdentifier & oi) [member function]
+    cls.add_method('DeregisterVscCallback', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier &', 'oi')])
+    ## vendor-specific-action.h (module 'wave'): ns3::VscCallback ns3::VendorSpecificContentManager::FindVscCallback(ns3::OrganizationIdentifier & oi) [member function]
+    cls.add_method('FindVscCallback', 
+                   'ns3::VscCallback', 
+                   [param('ns3::OrganizationIdentifier &', 'oi')])
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificContentManager::RegisterVscCallback(ns3::OrganizationIdentifier oi, ns3::VscCallback cb) [member function]
+    cls.add_method('RegisterVscCallback', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier', 'oi'), param('ns3::VscCallback', 'cb')])
+    return
+
+def register_Ns3WifiHelper_methods(root_module, cls):
+    ## wifi-helper.h (module 'wifi'): ns3::WifiHelper::WifiHelper(ns3::WifiHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiHelper const &', 'arg0')])
+    ## wifi-helper.h (module 'wifi'): ns3::WifiHelper::WifiHelper() [constructor]
+    cls.add_constructor([])
+    ## wifi-helper.h (module 'wifi'): int64_t ns3::WifiHelper::AssignStreams(ns3::NetDeviceContainer c, int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('ns3::NetDeviceContainer', 'c'), param('int64_t', 'stream')])
+    ## wifi-helper.h (module 'wifi'): static ns3::WifiHelper ns3::WifiHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::WifiHelper', 
+                   [], 
+                   is_static=True)
+    ## wifi-helper.h (module 'wifi'): static void ns3::WifiHelper::EnableLogComponents() [member function]
+    cls.add_method('EnableLogComponents', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::NodeContainer c) const [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::NodeContainer', 'c')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::Ptr<ns3::Node> node) const [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, std::string nodeName) const [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('std::string', 'nodeName')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetRemoteStationManager(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetRemoteStationManager', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')])
+    ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('SetStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_virtual=True)
+    return
+
+def register_Ns3WifiMacHelper_methods(root_module, cls):
+    ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper::WifiMacHelper() [constructor]
+    cls.add_constructor([])
+    ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper::WifiMacHelper(ns3::WifiMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMacHelper const &', 'arg0')])
+    ## wifi-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::WifiMacHelper::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::WifiMac >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3WifiMode_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode::WifiMode(ns3::WifiMode const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMode const &', 'arg0')])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode::WifiMode() [constructor]
+    cls.add_constructor([])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode::WifiMode(std::string name) [constructor]
+    cls.add_constructor([param('std::string', 'name')])
+    ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetBandwidth() const [member function]
+    cls.add_method('GetBandwidth', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate ns3::WifiMode::GetCodeRate() const [member function]
+    cls.add_method('GetCodeRate', 
+                   'ns3::WifiCodeRate', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): uint8_t ns3::WifiMode::GetConstellationSize() const [member function]
+    cls.add_method('GetConstellationSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate() const [member function]
+    cls.add_method('GetDataRate', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass ns3::WifiMode::GetModulationClass() const [member function]
+    cls.add_method('GetModulationClass', 
+                   'ns3::WifiModulationClass', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate() const [member function]
+    cls.add_method('GetPhyRate', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): std::string ns3::WifiMode::GetUniqueName() const [member function]
+    cls.add_method('GetUniqueName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): bool ns3::WifiMode::IsMandatory() const [member function]
+    cls.add_method('IsMandatory', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3WifiModeFactory_methods(root_module, cls):
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeFactory::WifiModeFactory(ns3::WifiModeFactory const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiModeFactory const &', 'arg0')])
+    ## wifi-mode.h (module 'wifi'): static ns3::WifiMode ns3::WifiModeFactory::CreateWifiMode(std::string uniqueName, ns3::WifiModulationClass modClass, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, ns3::WifiCodeRate codingRate, uint8_t constellationSize) [member function]
+    cls.add_method('CreateWifiMode', 
+                   'ns3::WifiMode', 
+                   [param('std::string', 'uniqueName'), param('ns3::WifiModulationClass', 'modClass'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('ns3::WifiCodeRate', 'codingRate'), param('uint8_t', 'constellationSize')], 
+                   is_static=True)
+    return
+
+def register_Ns3WifiPhyHelper_methods(root_module, cls):
+    ## wifi-helper.h (module 'wifi'): ns3::WifiPhyHelper::WifiPhyHelper() [constructor]
+    cls.add_constructor([])
+    ## wifi-helper.h (module 'wifi'): ns3::WifiPhyHelper::WifiPhyHelper(ns3::WifiPhyHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiPhyHelper const &', 'arg0')])
+    ## wifi-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiPhy> ns3::WifiPhyHelper::Create(ns3::Ptr<ns3::Node> node, ns3::Ptr<ns3::WifiNetDevice> device) const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::WifiPhy >', 
+                   [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::WifiNetDevice >', 'device')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3WifiPhyListener_methods(root_module, cls):
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhyListener::WifiPhyListener() [constructor]
+    cls.add_constructor([])
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhyListener::WifiPhyListener(ns3::WifiPhyListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiPhyListener const &', 'arg0')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyMaybeCcaBusyStart(ns3::Time duration) [member function]
+    cls.add_method('NotifyMaybeCcaBusyStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyRxEndError() [member function]
+    cls.add_method('NotifyRxEndError', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyRxEndOk() [member function]
+    cls.add_method('NotifyRxEndOk', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyRxStart(ns3::Time duration) [member function]
+    cls.add_method('NotifyRxStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifySwitchingStart(ns3::Time duration) [member function]
+    cls.add_method('NotifySwitchingStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyTxStart(ns3::Time duration) [member function]
+    cls.add_method('NotifyTxStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3WifiRemoteStation_methods(root_module, cls):
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::WifiRemoteStation() [constructor]
+    cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::WifiRemoteStation(ns3::WifiRemoteStation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiRemoteStation const &', 'arg0')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::m_slrc [variable]
+    cls.add_instance_attribute('m_slrc', 'uint32_t', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::m_ssrc [variable]
+    cls.add_instance_attribute('m_ssrc', 'uint32_t', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::m_state [variable]
+    cls.add_instance_attribute('m_state', 'ns3::WifiRemoteStationState *', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::m_tid [variable]
+    cls.add_instance_attribute('m_tid', 'uint8_t', is_const=False)
+    return
+
+def register_Ns3WifiRemoteStationInfo_methods(root_module, cls):
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo::WifiRemoteStationInfo(ns3::WifiRemoteStationInfo const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiRemoteStationInfo const &', 'arg0')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo::WifiRemoteStationInfo() [constructor]
+    cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): double ns3::WifiRemoteStationInfo::GetFrameErrorRate() const [member function]
+    cls.add_method('GetFrameErrorRate', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationInfo::NotifyTxFailed() [member function]
+    cls.add_method('NotifyTxFailed', 
+                   'void', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationInfo::NotifyTxSuccess(uint32_t retryCounter) [member function]
+    cls.add_method('NotifyTxSuccess', 
+                   'void', 
+                   [param('uint32_t', 'retryCounter')])
+    return
+
+def register_Ns3WifiRemoteStationState_methods(root_module, cls):
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::WifiRemoteStationState() [constructor]
+    cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::WifiRemoteStationState(ns3::WifiRemoteStationState const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiRemoteStationState const &', 'arg0')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_address [variable]
+    cls.add_instance_attribute('m_address', 'ns3::Mac48Address', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_greenfield [variable]
+    cls.add_instance_attribute('m_greenfield', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_info [variable]
+    cls.add_instance_attribute('m_info', 'ns3::WifiRemoteStationInfo', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_operationalMcsSet [variable]
+    cls.add_instance_attribute('m_operationalMcsSet', 'ns3::WifiMcsList', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_operationalRateSet [variable]
+    cls.add_instance_attribute('m_operationalRateSet', 'ns3::WifiModeList', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_rx [variable]
+    cls.add_instance_attribute('m_rx', 'uint32_t', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_shortGuardInterval [variable]
+    cls.add_instance_attribute('m_shortGuardInterval', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_stbc [variable]
+    cls.add_instance_attribute('m_stbc', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_tx [variable]
+    cls.add_instance_attribute('m_tx', 'uint32_t', is_const=False)
+    return
+
+def register_Ns3WifiTxVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiTxVector const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
+    cls.add_constructor([])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNess() const [member function]
+    cls.add_method('GetNess', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNss() const [member function]
+    cls.add_method('GetNss', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetRetries() const [member function]
+    cls.add_method('GetRetries', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetTxPowerLevel() const [member function]
+    cls.add_method('GetTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsShortGuardInterval() const [member function]
+    cls.add_method('IsShortGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsStbc() const [member function]
+    cls.add_method('IsStbc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetMode(ns3::WifiMode mode) [member function]
+    cls.add_method('SetMode', 
+                   'void', 
+                   [param('ns3::WifiMode', 'mode')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNess(uint8_t ness) [member function]
+    cls.add_method('SetNess', 
+                   'void', 
+                   [param('uint8_t', 'ness')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNss(uint8_t nss) [member function]
+    cls.add_method('SetNss', 
+                   'void', 
+                   [param('uint8_t', 'nss')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetRetries(uint8_t retries) [member function]
+    cls.add_method('SetRetries', 
+                   'void', 
+                   [param('uint8_t', 'retries')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetShortGuardInterval(bool guardinterval) [member function]
+    cls.add_method('SetShortGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardinterval')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
+    cls.add_method('SetTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'powerlevel')])
+    return
+
+def register_Ns3Empty_methods(root_module, cls):
+    ## empty.h (module 'core'): ns3::empty::empty() [constructor]
+    cls.add_constructor([])
+    ## empty.h (module 'core'): ns3::empty::empty(ns3::empty const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::empty const &', 'arg0')])
+    return
+
+def register_Ns3Int64x64_t_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<=')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_unary_numeric_operator('-')
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('>')
+    cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    cls.add_binary_comparison_operator('>=')
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
+    cls.add_constructor([])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(double v) [constructor]
+    cls.add_constructor([param('double', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long int v) [constructor]
+    cls.add_constructor([param('long int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long long int v) [constructor]
+    cls.add_constructor([param('long long int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(unsigned int v) [constructor]
+    cls.add_constructor([param('unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long unsigned int v) [constructor]
+    cls.add_constructor([param('long unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long long unsigned int v) [constructor]
+    cls.add_constructor([param('long long unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(int64_t hi, uint64_t lo) [constructor]
+    cls.add_constructor([param('int64_t', 'hi'), param('uint64_t', 'lo')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(ns3::int64x64_t const & o) [copy constructor]
+    cls.add_constructor([param('ns3::int64x64_t const &', 'o')])
+    ## int64x64-double.h (module 'core'): double ns3::int64x64_t::GetDouble() const [member function]
+    cls.add_method('GetDouble', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): int64_t ns3::int64x64_t::GetHigh() const [member function]
+    cls.add_method('GetHigh', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): uint64_t ns3::int64x64_t::GetLow() const [member function]
+    cls.add_method('GetLow', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): static ns3::int64x64_t ns3::int64x64_t::Invert(uint64_t v) [member function]
+    cls.add_method('Invert', 
+                   'ns3::int64x64_t', 
+                   [param('uint64_t', 'v')], 
+                   is_static=True)
+    ## int64x64-double.h (module 'core'): void ns3::int64x64_t::MulByInvert(ns3::int64x64_t const & o) [member function]
+    cls.add_method('MulByInvert', 
+                   'void', 
+                   [param('ns3::int64x64_t const &', 'o')])
+    return
+
+def register_Ns3Chunk_methods(root_module, cls):
+    ## chunk.h (module 'network'): ns3::Chunk::Chunk() [constructor]
+    cls.add_constructor([])
+    ## chunk.h (module 'network'): ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Chunk const &', 'arg0')])
+    ## chunk.h (module 'network'): uint32_t ns3::Chunk::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## chunk.h (module 'network'): static ns3::TypeId ns3::Chunk::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## chunk.h (module 'network'): void ns3::Chunk::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Header_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## header.h (module 'network'): ns3::Header::Header() [constructor]
+    cls.add_constructor([])
+    ## header.h (module 'network'): ns3::Header::Header(ns3::Header const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Header const &', 'arg0')])
+    ## header.h (module 'network'): uint32_t ns3::Header::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## header.h (module 'network'): uint32_t ns3::Header::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## header.h (module 'network'): static ns3::TypeId ns3::Header::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## header.h (module 'network'): void ns3::Header::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## header.h (module 'network'): void ns3::Header::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3HigherDataTxVectorTag_methods(root_module, cls):
+    ## higher-tx-tag.h (module 'wave'): ns3::HigherDataTxVectorTag::HigherDataTxVectorTag(ns3::HigherDataTxVectorTag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HigherDataTxVectorTag const &', 'arg0')])
+    ## higher-tx-tag.h (module 'wave'): ns3::HigherDataTxVectorTag::HigherDataTxVectorTag() [constructor]
+    cls.add_constructor([])
+    ## higher-tx-tag.h (module 'wave'): ns3::HigherDataTxVectorTag::HigherDataTxVectorTag(ns3::WifiTxVector dataTxVector, bool adapter) [constructor]
+    cls.add_constructor([param('ns3::WifiTxVector', 'dataTxVector'), param('bool', 'adapter')])
+    ## higher-tx-tag.h (module 'wave'): void ns3::HigherDataTxVectorTag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_virtual=True)
+    ## higher-tx-tag.h (module 'wave'): ns3::WifiTxVector ns3::HigherDataTxVectorTag::GetDataTxVector() const [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [], 
+                   is_const=True)
+    ## higher-tx-tag.h (module 'wave'): ns3::TypeId ns3::HigherDataTxVectorTag::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## higher-tx-tag.h (module 'wave'): uint32_t ns3::HigherDataTxVectorTag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## higher-tx-tag.h (module 'wave'): static ns3::TypeId ns3::HigherDataTxVectorTag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## higher-tx-tag.h (module 'wave'): bool ns3::HigherDataTxVectorTag::IsAdapter() const [member function]
+    cls.add_method('IsAdapter', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## higher-tx-tag.h (module 'wave'): void ns3::HigherDataTxVectorTag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## higher-tx-tag.h (module 'wave'): void ns3::HigherDataTxVectorTag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_const=True, is_virtual=True)
+    return
+
+def register_Ns3MgtAddBaRequestHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaRequestHeader::MgtAddBaRequestHeader(ns3::MgtAddBaRequestHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtAddBaRequestHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaRequestHeader::MgtAddBaRequestHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAddBaRequestHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaRequestHeader::GetBufferSize() const [member function]
+    cls.add_method('GetBufferSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtAddBaRequestHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAddBaRequestHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaRequestHeader::GetStartingSequence() const [member function]
+    cls.add_method('GetStartingSequence', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint8_t ns3::MgtAddBaRequestHeader::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaRequestHeader::GetTimeout() const [member function]
+    cls.add_method('GetTimeout', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtAddBaRequestHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtAddBaRequestHeader::IsAmsduSupported() const [member function]
+    cls.add_method('IsAmsduSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtAddBaRequestHeader::IsImmediateBlockAck() const [member function]
+    cls.add_method('IsImmediateBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetAmsduSupport(bool supported) [member function]
+    cls.add_method('SetAmsduSupport', 
+                   'void', 
+                   [param('bool', 'supported')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetBufferSize(uint16_t size) [member function]
+    cls.add_method('SetBufferSize', 
+                   'void', 
+                   [param('uint16_t', 'size')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetDelayedBlockAck() [member function]
+    cls.add_method('SetDelayedBlockAck', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetImmediateBlockAck() [member function]
+    cls.add_method('SetImmediateBlockAck', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetStartingSequence(uint16_t seq) [member function]
+    cls.add_method('SetStartingSequence', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetTid(uint8_t tid) [member function]
+    cls.add_method('SetTid', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetTimeout(uint16_t timeout) [member function]
+    cls.add_method('SetTimeout', 
+                   'void', 
+                   [param('uint16_t', 'timeout')])
+    return
+
+def register_Ns3MgtAddBaResponseHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaResponseHeader::MgtAddBaResponseHeader(ns3::MgtAddBaResponseHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtAddBaResponseHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaResponseHeader::MgtAddBaResponseHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAddBaResponseHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaResponseHeader::GetBufferSize() const [member function]
+    cls.add_method('GetBufferSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtAddBaResponseHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAddBaResponseHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::StatusCode ns3::MgtAddBaResponseHeader::GetStatusCode() const [member function]
+    cls.add_method('GetStatusCode', 
+                   'ns3::StatusCode', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint8_t ns3::MgtAddBaResponseHeader::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaResponseHeader::GetTimeout() const [member function]
+    cls.add_method('GetTimeout', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtAddBaResponseHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtAddBaResponseHeader::IsAmsduSupported() const [member function]
+    cls.add_method('IsAmsduSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtAddBaResponseHeader::IsImmediateBlockAck() const [member function]
+    cls.add_method('IsImmediateBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetAmsduSupport(bool supported) [member function]
+    cls.add_method('SetAmsduSupport', 
+                   'void', 
+                   [param('bool', 'supported')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetBufferSize(uint16_t size) [member function]
+    cls.add_method('SetBufferSize', 
+                   'void', 
+                   [param('uint16_t', 'size')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetDelayedBlockAck() [member function]
+    cls.add_method('SetDelayedBlockAck', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetImmediateBlockAck() [member function]
+    cls.add_method('SetImmediateBlockAck', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetStatusCode(ns3::StatusCode code) [member function]
+    cls.add_method('SetStatusCode', 
+                   'void', 
+                   [param('ns3::StatusCode', 'code')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetTid(uint8_t tid) [member function]
+    cls.add_method('SetTid', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetTimeout(uint16_t timeout) [member function]
+    cls.add_method('SetTimeout', 
+                   'void', 
+                   [param('uint16_t', 'timeout')])
+    return
+
+def register_Ns3MgtAssocRequestHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocRequestHeader::MgtAssocRequestHeader(ns3::MgtAssocRequestHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtAssocRequestHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocRequestHeader::MgtAssocRequestHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAssocRequestHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::HtCapabilities ns3::MgtAssocRequestHeader::GetHtCapabilities() const [member function]
+    cls.add_method('GetHtCapabilities', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtAssocRequestHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAssocRequestHeader::GetListenInterval() const [member function]
+    cls.add_method('GetListenInterval', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAssocRequestHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::Ssid ns3::MgtAssocRequestHeader::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::SupportedRates ns3::MgtAssocRequestHeader::GetSupportedRates() const [member function]
+    cls.add_method('GetSupportedRates', 
+                   'ns3::SupportedRates', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtAssocRequestHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::SetHtCapabilities(ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('SetHtCapabilities', 
+                   'void', 
+                   [param('ns3::HtCapabilities', 'htcapabilities')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::SetListenInterval(uint16_t interval) [member function]
+    cls.add_method('SetListenInterval', 
+                   'void', 
+                   [param('uint16_t', 'interval')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::SetSupportedRates(ns3::SupportedRates rates) [member function]
+    cls.add_method('SetSupportedRates', 
+                   'void', 
+                   [param('ns3::SupportedRates', 'rates')])
+    return
+
+def register_Ns3MgtAssocResponseHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocResponseHeader::MgtAssocResponseHeader(ns3::MgtAssocResponseHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtAssocResponseHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocResponseHeader::MgtAssocResponseHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAssocResponseHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::HtCapabilities ns3::MgtAssocResponseHeader::GetHtCapabilities() const [member function]
+    cls.add_method('GetHtCapabilities', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtAssocResponseHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAssocResponseHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::StatusCode ns3::MgtAssocResponseHeader::GetStatusCode() [member function]
+    cls.add_method('GetStatusCode', 
+                   'ns3::StatusCode', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): ns3::SupportedRates ns3::MgtAssocResponseHeader::GetSupportedRates() [member function]
+    cls.add_method('GetSupportedRates', 
+                   'ns3::SupportedRates', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtAssocResponseHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::SetHtCapabilities(ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('SetHtCapabilities', 
+                   'void', 
+                   [param('ns3::HtCapabilities', 'htcapabilities')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::SetStatusCode(ns3::StatusCode code) [member function]
+    cls.add_method('SetStatusCode', 
+                   'void', 
+                   [param('ns3::StatusCode', 'code')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::SetSupportedRates(ns3::SupportedRates rates) [member function]
+    cls.add_method('SetSupportedRates', 
+                   'void', 
+                   [param('ns3::SupportedRates', 'rates')])
+    return
+
+def register_Ns3MgtDelBaHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtDelBaHeader::MgtDelBaHeader(ns3::MgtDelBaHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtDelBaHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtDelBaHeader::MgtDelBaHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtDelBaHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtDelBaHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtDelBaHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint8_t ns3::MgtDelBaHeader::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtDelBaHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtDelBaHeader::IsByOriginator() const [member function]
+    cls.add_method('IsByOriginator', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::SetByOriginator() [member function]
+    cls.add_method('SetByOriginator', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::SetByRecipient() [member function]
+    cls.add_method('SetByRecipient', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::SetTid(uint8_t arg0) [member function]
+    cls.add_method('SetTid', 
+                   'void', 
+                   [param('uint8_t', 'arg0')])
+    return
+
+def register_Ns3MgtProbeRequestHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeRequestHeader::MgtProbeRequestHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeRequestHeader::MgtProbeRequestHeader(ns3::MgtProbeRequestHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtProbeRequestHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtProbeRequestHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::HtCapabilities ns3::MgtProbeRequestHeader::GetHtCapabilities() const [member function]
+    cls.add_method('GetHtCapabilities', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtProbeRequestHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtProbeRequestHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::Ssid ns3::MgtProbeRequestHeader::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::SupportedRates ns3::MgtProbeRequestHeader::GetSupportedRates() const [member function]
+    cls.add_method('GetSupportedRates', 
+                   'ns3::SupportedRates', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtProbeRequestHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::SetHtCapabilities(ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('SetHtCapabilities', 
+                   'void', 
+                   [param('ns3::HtCapabilities', 'htcapabilities')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::SetSupportedRates(ns3::SupportedRates rates) [member function]
+    cls.add_method('SetSupportedRates', 
+                   'void', 
+                   [param('ns3::SupportedRates', 'rates')])
+    return
+
+def register_Ns3MgtProbeResponseHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeResponseHeader::MgtProbeResponseHeader(ns3::MgtProbeResponseHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtProbeResponseHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeResponseHeader::MgtProbeResponseHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtProbeResponseHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint64_t ns3::MgtProbeResponseHeader::GetBeaconIntervalUs() const [member function]
+    cls.add_method('GetBeaconIntervalUs', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::HtCapabilities ns3::MgtProbeResponseHeader::GetHtCapabilities() const [member function]
+    cls.add_method('GetHtCapabilities', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtProbeResponseHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtProbeResponseHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::Ssid ns3::MgtProbeResponseHeader::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::SupportedRates ns3::MgtProbeResponseHeader::GetSupportedRates() const [member function]
+    cls.add_method('GetSupportedRates', 
+                   'ns3::SupportedRates', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint64_t ns3::MgtProbeResponseHeader::GetTimestamp() [member function]
+    cls.add_method('GetTimestamp', 
+                   'uint64_t', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtProbeResponseHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::SetBeaconIntervalUs(uint64_t us) [member function]
+    cls.add_method('SetBeaconIntervalUs', 
+                   'void', 
+                   [param('uint64_t', 'us')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::SetHtCapabilities(ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('SetHtCapabilities', 
+                   'void', 
+                   [param('ns3::HtCapabilities', 'htcapabilities')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::SetSupportedRates(ns3::SupportedRates rates) [member function]
+    cls.add_method('SetSupportedRates', 
+                   'void', 
+                   [param('ns3::SupportedRates', 'rates')])
+    return
+
+def register_Ns3NqosWifiMacHelper_methods(root_module, cls):
+    ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::NqosWifiMacHelper::NqosWifiMacHelper(ns3::NqosWifiMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NqosWifiMacHelper const &', 'arg0')])
+    ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::NqosWifiMacHelper::NqosWifiMacHelper() [constructor]
+    cls.add_constructor([])
+    ## nqos-wifi-mac-helper.h (module 'wifi'): static ns3::NqosWifiMacHelper ns3::NqosWifiMacHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::NqosWifiMacHelper', 
+                   [], 
+                   is_static=True)
+    ## nqos-wifi-mac-helper.h (module 'wifi'): void ns3::NqosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
+    ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::NqosWifiMacHelper::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::WifiMac >', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3Object_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::Object::Object() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): void ns3::Object::AggregateObject(ns3::Ptr<ns3::Object> other) [member function]
+    cls.add_method('AggregateObject', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'other')])
+    ## object.h (module 'core'): void ns3::Object::Dispose() [member function]
+    cls.add_method('Dispose', 
+                   'void', 
+                   [])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator ns3::Object::GetAggregateIterator() const [member function]
+    cls.add_method('GetAggregateIterator', 
+                   'ns3::Object::AggregateIterator', 
+                   [], 
+                   is_const=True)
+    ## object.h (module 'core'): ns3::TypeId ns3::Object::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## object.h (module 'core'): static ns3::TypeId ns3::Object::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## object.h (module 'core'): void ns3::Object::Initialize() [member function]
+    cls.add_method('Initialize', 
+                   'void', 
+                   [])
+    ## object.h (module 'core'): ns3::Object::Object(ns3::Object const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Object const &', 'o')], 
+                        visibility='protected')
+    ## object.h (module 'core'): void ns3::Object::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## object.h (module 'core'): void ns3::Object::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## object.h (module 'core'): void ns3::Object::NotifyNewAggregate() [member function]
+    cls.add_method('NotifyNewAggregate', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::Object::AggregateIterator::AggregateIterator(ns3::Object::AggregateIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Object::AggregateIterator const &', 'arg0')])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator::AggregateIterator() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): bool ns3::Object::AggregateIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## object.h (module 'core'): ns3::Ptr<ns3::Object const> ns3::Object::AggregateIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::Ptr< ns3::Object const >', 
+                   [])
+    return
+
+def register_Ns3PcapFileWrapper_methods(root_module, cls):
+    ## pcap-file-wrapper.h (module 'network'): static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
+    cls.add_constructor([])
+    ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
+    cls.add_method('Fail', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Eof() const [member function]
+    cls.add_method('Eof', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Clear() [member function]
+    cls.add_method('Clear', 
+                   'void', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Open(std::string const & filename, std::_Ios_Openmode mode) [member function]
+    cls.add_method('Open', 
+                   'void', 
+                   [param('std::string const &', 'filename'), param('std::_Ios_Openmode', 'mode')])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Close() [member function]
+    cls.add_method('Close', 
+                   'void', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Init(uint32_t dataLinkType, uint32_t snapLen=std::numeric_limits<unsigned int>::max(), int32_t tzCorrection=ns3::PcapFile::ZONE_DEFAULT) [member function]
+    cls.add_method('Init', 
+                   'void', 
+                   [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits<unsigned int>::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, uint8_t const * buffer, uint32_t length) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Time', 't'), param('uint8_t const *', 'buffer'), param('uint32_t', 'length')])
+    ## pcap-file-wrapper.h (module 'network'): uint32_t ns3::PcapFileWrapper::GetMagic() [member function]
+    cls.add_method('GetMagic', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint16_t ns3::PcapFileWrapper::GetVersionMajor() [member function]
+    cls.add_method('GetVersionMajor', 
+                   'uint16_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint16_t ns3::PcapFileWrapper::GetVersionMinor() [member function]
+    cls.add_method('GetVersionMinor', 
+                   'uint16_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): int32_t ns3::PcapFileWrapper::GetTimeZoneOffset() [member function]
+    cls.add_method('GetTimeZoneOffset', 
+                   'int32_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint32_t ns3::PcapFileWrapper::GetSigFigs() [member function]
+    cls.add_method('GetSigFigs', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint32_t ns3::PcapFileWrapper::GetSnapLen() [member function]
+    cls.add_method('GetSnapLen', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint32_t ns3::PcapFileWrapper::GetDataLinkType() [member function]
+    cls.add_method('GetDataLinkType', 
+                   'uint32_t', 
+                   [])
+    return
+
+def register_Ns3QosWifiMacHelper_methods(root_module, cls):
+    ## qos-wifi-mac-helper.h (module 'wifi'): ns3::QosWifiMacHelper::QosWifiMacHelper(ns3::QosWifiMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::QosWifiMacHelper const &', 'arg0')])
+    ## qos-wifi-mac-helper.h (module 'wifi'): ns3::QosWifiMacHelper::QosWifiMacHelper() [constructor]
+    cls.add_constructor([])
+    ## qos-wifi-mac-helper.h (module 'wifi'): static ns3::QosWifiMacHelper ns3::QosWifiMacHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::QosWifiMacHelper', 
+                   [], 
+                   is_static=True)
+    ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetBlockAckInactivityTimeoutForAc(ns3::AcIndex ac, uint16_t timeout) [member function]
+    cls.add_method('SetBlockAckInactivityTimeoutForAc', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac'), param('uint16_t', 'timeout')])
+    ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetBlockAckThresholdForAc(ns3::AcIndex ac, uint8_t threshold) [member function]
+    cls.add_method('SetBlockAckThresholdForAc', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac'), param('uint8_t', 'threshold')])
+    ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetMsduAggregatorForAc(ns3::AcIndex ac, std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetMsduAggregatorForAc', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac'), param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()')])
+    ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
+    ## qos-wifi-mac-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::QosWifiMacHelper::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::WifiMac >', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter< ns3::AttributeAccessor > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter< ns3::AttributeChecker > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter< ns3::AttributeValue > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::SimpleRefCount(ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter< ns3::CallbackImplBase > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount(ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter< ns3::EventImpl > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount(ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter< ns3::NixVector > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >::SimpleRefCount(ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter< ns3::OutputStreamWrapper > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter< ns3::Packet > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount(ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter< ns3::TraceSourceAccessor > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3WifiInformationElement_Ns3Empty_Ns3DefaultDeleter__lt__ns3WifiInformationElement__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >::SimpleRefCount(ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter< ns3::WifiInformationElement > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3Time_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<=')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('>')
+    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    cls.add_binary_comparison_operator('>=')
+    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
+    cls.add_constructor([])
+    ## nstime.h (module 'core'): ns3::Time::Time(ns3::Time const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Time const &', 'o')])
+    ## nstime.h (module 'core'): ns3::Time::Time(double v) [constructor]
+    cls.add_constructor([param('double', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long int v) [constructor]
+    cls.add_constructor([param('long int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long long int v) [constructor]
+    cls.add_constructor([param('long long int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(unsigned int v) [constructor]
+    cls.add_constructor([param('unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long unsigned int v) [constructor]
+    cls.add_constructor([param('long unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long long unsigned int v) [constructor]
+    cls.add_constructor([param('long long unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(std::string const & s) [constructor]
+    cls.add_constructor([param('std::string const &', 's')])
+    ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & value) [constructor]
+    cls.add_constructor([param('ns3::int64x64_t const &', 'value')])
+    ## nstime.h (module 'core'): int ns3::Time::Compare(ns3::Time const & o) const [member function]
+    cls.add_method('Compare', 
+                   'int', 
+                   [param('ns3::Time const &', 'o')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & from, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('From', 
+                   'ns3::Time', 
+                   [param('ns3::int64x64_t const &', 'from'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value) [member function]
+    cls.add_method('From', 
+                   'ns3::Time', 
+                   [param('ns3::int64x64_t const &', 'value')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('FromDouble', 
+                   'ns3::Time', 
+                   [param('double', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('FromInteger', 
+                   'ns3::Time', 
+                   [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
+    cls.add_method('GetDouble', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetFemtoSeconds() const [member function]
+    cls.add_method('GetFemtoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
+    cls.add_method('GetInteger', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetMicroSeconds() const [member function]
+    cls.add_method('GetMicroSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetMilliSeconds() const [member function]
+    cls.add_method('GetMilliSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
+    cls.add_method('GetNanoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetPicoSeconds() const [member function]
+    cls.add_method('GetPicoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time::Unit ns3::Time::GetResolution() [member function]
+    cls.add_method('GetResolution', 
+                   'ns3::Time::Unit', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetSeconds() const [member function]
+    cls.add_method('GetSeconds', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetTimeStep() const [member function]
+    cls.add_method('GetTimeStep', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
+    cls.add_method('IsNegative', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsPositive() const [member function]
+    cls.add_method('IsPositive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyNegative() const [member function]
+    cls.add_method('IsStrictlyNegative', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyPositive() const [member function]
+    cls.add_method('IsStrictlyPositive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsZero() const [member function]
+    cls.add_method('IsZero', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
+    cls.add_method('SetResolution', 
+                   'void', 
+                   [param('ns3::Time::Unit', 'resolution')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('To', 
+                   'ns3::int64x64_t', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('ToDouble', 
+                   'double', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('ToInteger', 
+                   'int64_t', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    return
+
+def register_Ns3TraceSourceAccessor_methods(root_module, cls):
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor::TraceSourceAccessor(ns3::TraceSourceAccessor const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TraceSourceAccessor const &', 'arg0')])
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor::TraceSourceAccessor() [constructor]
+    cls.add_constructor([])
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::Connect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('Connect', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::ConnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('ConnectWithoutContext', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::Disconnect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('Disconnect', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::DisconnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('DisconnectWithoutContext', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Trailer_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## trailer.h (module 'network'): ns3::Trailer::Trailer() [constructor]
+    cls.add_constructor([])
+    ## trailer.h (module 'network'): ns3::Trailer::Trailer(ns3::Trailer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Trailer const &', 'arg0')])
+    ## trailer.h (module 'network'): uint32_t ns3::Trailer::Deserialize(ns3::Buffer::Iterator end) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'end')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## trailer.h (module 'network'): uint32_t ns3::Trailer::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trailer.h (module 'network'): static ns3::TypeId ns3::Trailer::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## trailer.h (module 'network'): void ns3::Trailer::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trailer.h (module 'network'): void ns3::Trailer::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3VendorSpecificActionHeader_methods(root_module, cls):
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificActionHeader::VendorSpecificActionHeader(ns3::VendorSpecificActionHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::VendorSpecificActionHeader const &', 'arg0')])
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificActionHeader::VendorSpecificActionHeader() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): uint32_t ns3::VendorSpecificActionHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): uint8_t ns3::VendorSpecificActionHeader::GetCategory() const [member function]
+    cls.add_method('GetCategory', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): ns3::TypeId ns3::VendorSpecificActionHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier ns3::VendorSpecificActionHeader::GetOrganizationIdentifier() const [member function]
+    cls.add_method('GetOrganizationIdentifier', 
+                   'ns3::OrganizationIdentifier', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): uint32_t ns3::VendorSpecificActionHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): static ns3::TypeId ns3::VendorSpecificActionHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificActionHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificActionHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificActionHeader::SetOrganizationIdentifier(ns3::OrganizationIdentifier oi) [member function]
+    cls.add_method('SetOrganizationIdentifier', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier', 'oi')])
+    return
+
+def register_Ns3Wifi80211pHelper_methods(root_module, cls):
+    ## wifi-80211p-helper.h (module 'wave'): ns3::Wifi80211pHelper::Wifi80211pHelper(ns3::Wifi80211pHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Wifi80211pHelper const &', 'arg0')])
+    ## wifi-80211p-helper.h (module 'wave'): ns3::Wifi80211pHelper::Wifi80211pHelper() [constructor]
+    cls.add_constructor([])
+    ## wifi-80211p-helper.h (module 'wave'): static ns3::Wifi80211pHelper ns3::Wifi80211pHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::Wifi80211pHelper', 
+                   [], 
+                   is_static=True)
+    ## wifi-80211p-helper.h (module 'wave'): static void ns3::Wifi80211pHelper::EnableLogComponents() [member function]
+    cls.add_method('EnableLogComponents', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## wifi-80211p-helper.h (module 'wave'): ns3::NetDeviceContainer ns3::Wifi80211pHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & macHelper, ns3::NodeContainer c) const [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'macHelper'), param('ns3::NodeContainer', 'c')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-80211p-helper.h (module 'wave'): void ns3::Wifi80211pHelper::SetStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('SetStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_virtual=True)
+    return
+
+def register_Ns3WifiActionHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::WifiActionHeader(ns3::WifiActionHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiActionHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::WifiActionHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::WifiActionHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue ns3::WifiActionHeader::GetAction() [member function]
+    cls.add_method('GetAction', 
+                   'ns3::WifiActionHeader::ActionValue', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue ns3::WifiActionHeader::GetCategory() [member function]
+    cls.add_method('GetCategory', 
+                   'ns3::WifiActionHeader::CategoryValue', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::WifiActionHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::WifiActionHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::WifiActionHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::WifiActionHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::WifiActionHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::WifiActionHeader::SetAction(ns3::WifiActionHeader::CategoryValue type, ns3::WifiActionHeader::ActionValue action) [member function]
+    cls.add_method('SetAction', 
+                   'void', 
+                   [param('ns3::WifiActionHeader::CategoryValue', 'type'), param('ns3::WifiActionHeader::ActionValue', 'action')])
+    return
+
+def register_Ns3WifiActionHeaderActionValue_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::ActionValue() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::ActionValue(ns3::WifiActionHeader::ActionValue const & arg0) [copy constructor]
+    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)
+    return
+
+def register_Ns3WifiInformationElement_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('==')
+    ## wifi-information-element.h (module 'wifi'): ns3::WifiInformationElement::WifiInformationElement() [constructor]
+    cls.add_constructor([])
+    ## wifi-information-element.h (module 'wifi'): ns3::WifiInformationElement::WifiInformationElement(ns3::WifiInformationElement const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiInformationElement const &', 'arg0')])
+    ## wifi-information-element.h (module 'wifi'): ns3::Buffer::Iterator ns3::WifiInformationElement::Deserialize(ns3::Buffer::Iterator i) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'i')])
+    ## wifi-information-element.h (module 'wifi'): ns3::Buffer::Iterator ns3::WifiInformationElement::DeserializeIfPresent(ns3::Buffer::Iterator i) [member function]
+    cls.add_method('DeserializeIfPresent', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'i')])
+    ## wifi-information-element.h (module 'wifi'): uint8_t ns3::WifiInformationElement::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-information-element.h (module 'wifi'): ns3::WifiInformationElementId ns3::WifiInformationElement::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-information-element.h (module 'wifi'): uint8_t ns3::WifiInformationElement::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-information-element.h (module 'wifi'): uint16_t ns3::WifiInformationElement::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-information-element.h (module 'wifi'): void ns3::WifiInformationElement::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-information-element.h (module 'wifi'): ns3::Buffer::Iterator ns3::WifiInformationElement::Serialize(ns3::Buffer::Iterator i) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'i')], 
+                   is_const=True)
+    ## wifi-information-element.h (module 'wifi'): void ns3::WifiInformationElement::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3WifiMac_methods(root_module, cls):
+    ## wifi-mac.h (module 'wifi'): ns3::WifiMac::WifiMac() [constructor]
+    cls.add_constructor([])
+    ## wifi-mac.h (module 'wifi'): ns3::WifiMac::WifiMac(ns3::WifiMac const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMac const &', 'arg0')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('ConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to, ns3::Mac48Address from) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetAckTimeout() const [member function]
+    cls.add_method('GetAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Mac48Address ns3::WifiMac::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetBasicBlockAckTimeout() const [member function]
+    cls.add_method('GetBasicBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Mac48Address ns3::WifiMac::GetBssid() const [member function]
+    cls.add_method('GetBssid', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetCompressedBlockAckTimeout() const [member function]
+    cls.add_method('GetCompressedBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetCtsTimeout() const [member function]
+    cls.add_method('GetCtsTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetEifsNoDifs() const [member function]
+    cls.add_method('GetEifsNoDifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetMaxPropagationDelay() const [member function]
+    cls.add_method('GetMaxPropagationDelay', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetMsduLifetime() const [member function]
+    cls.add_method('GetMsduLifetime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetPifs() const [member function]
+    cls.add_method('GetPifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetRifs() const [member function]
+    cls.add_method('GetRifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetSifs() const [member function]
+    cls.add_method('GetSifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetSlot() const [member function]
+    cls.add_method('GetSlot', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Ssid ns3::WifiMac::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): static ns3::TypeId ns3::WifiMac::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyPromiscRx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyPromiscRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyRx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyRxDrop(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRxDrop', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyTx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyTxDrop(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTxDrop', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetAckTimeout(ns3::Time ackTimeout) [member function]
+    cls.add_method('SetAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ackTimeout')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetAddress(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetBasicBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetBasicBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')], 
+                   is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetCompressedBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetCompressedBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')], 
+                   is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetCtsTimeout(ns3::Time ctsTimeout) [member function]
+    cls.add_method('SetCtsTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ctsTimeout')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetEifsNoDifs(ns3::Time eifsNoDifs) [member function]
+    cls.add_method('SetEifsNoDifs', 
+                   'void', 
+                   [param('ns3::Time', 'eifsNoDifs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetForwardUpCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, ns3::Mac48Address, ns3::Mac48Address, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> upCallback) [member function]
+    cls.add_method('SetForwardUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::Mac48Address, ns3::Mac48Address, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'upCallback')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetLinkDownCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkDown) [member function]
+    cls.add_method('SetLinkDownCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkDown')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetLinkUpCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkUp) [member function]
+    cls.add_method('SetLinkUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkUp')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetMaxPropagationDelay(ns3::Time delay) [member function]
+    cls.add_method('SetMaxPropagationDelay', 
+                   'void', 
+                   [param('ns3::Time', 'delay')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetPifs(ns3::Time pifs) [member function]
+    cls.add_method('SetPifs', 
+                   'void', 
+                   [param('ns3::Time', 'pifs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetPromisc() [member function]
+    cls.add_method('SetPromisc', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetRifs(ns3::Time rifs) [member function]
+    cls.add_method('SetRifs', 
+                   'void', 
+                   [param('ns3::Time', 'rifs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSifs(ns3::Time sifs) [member function]
+    cls.add_method('SetSifs', 
+                   'void', 
+                   [param('ns3::Time', 'sifs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSlot(ns3::Time slotTime) [member function]
+    cls.add_method('SetSlot', 
+                   'void', 
+                   [param('ns3::Time', 'slotTime')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetWifiPhy(ns3::Ptr<ns3::WifiPhy> phy) [member function]
+    cls.add_method('SetWifiPhy', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiPhy >', 'phy')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> stationManager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'stationManager')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): bool ns3::WifiMac::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
+    cls.add_method('ConfigureDcf', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')], 
+                   visibility='protected')
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('FinishConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3WifiMacHeader_methods(root_module, cls):
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::WifiMacHeader(ns3::WifiMacHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMacHeader const &', 'arg0')])
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::WifiMacHeader() [constructor]
+    cls.add_constructor([])
+    ## wifi-mac-header.h (module 'wifi'): uint32_t ns3::WifiMacHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacHeader::GetAddr1() const [member function]
+    cls.add_method('GetAddr1', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacHeader::GetAddr2() const [member function]
+    cls.add_method('GetAddr2', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacHeader::GetAddr3() const [member function]
+    cls.add_method('GetAddr3', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacHeader::GetAddr4() const [member function]
+    cls.add_method('GetAddr4', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Time ns3::WifiMacHeader::GetDuration() const [member function]
+    cls.add_method('GetDuration', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetFragmentNumber() const [member function]
+    cls.add_method('GetFragmentNumber', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::TypeId ns3::WifiMacHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::QosAckPolicy ns3::WifiMacHeader::GetQosAckPolicy() const [member function]
+    cls.add_method('GetQosAckPolicy', 
+                   'ns3::WifiMacHeader::QosAckPolicy', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint8_t ns3::WifiMacHeader::GetQosTid() const [member function]
+    cls.add_method('GetQosTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint8_t ns3::WifiMacHeader::GetQosTxopLimit() const [member function]
+    cls.add_method('GetQosTxopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetRawDuration() const [member function]
+    cls.add_method('GetRawDuration', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetSequenceControl() const [member function]
+    cls.add_method('GetSequenceControl', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetSequenceNumber() const [member function]
+    cls.add_method('GetSequenceNumber', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint32_t ns3::WifiMacHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): uint32_t ns3::WifiMacHeader::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType ns3::WifiMacHeader::GetType() const [member function]
+    cls.add_method('GetType', 
+                   'ns3::WifiMacType', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): static ns3::TypeId ns3::WifiMacHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-mac-header.h (module 'wifi'): char const * ns3::WifiMacHeader::GetTypeString() const [member function]
+    cls.add_method('GetTypeString', 
+                   'char const *', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAck() const [member function]
+    cls.add_method('IsAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAction() const [member function]
+    cls.add_method('IsAction', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAssocReq() const [member function]
+    cls.add_method('IsAssocReq', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAssocResp() const [member function]
+    cls.add_method('IsAssocResp', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAuthentication() const [member function]
+    cls.add_method('IsAuthentication', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsBeacon() const [member function]
+    cls.add_method('IsBeacon', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsBlockAck() const [member function]
+    cls.add_method('IsBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsBlockAckReq() const [member function]
+    cls.add_method('IsBlockAckReq', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsCfpoll() const [member function]
+    cls.add_method('IsCfpoll', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsCtl() const [member function]
+    cls.add_method('IsCtl', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsCts() const [member function]
+    cls.add_method('IsCts', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsData() const [member function]
+    cls.add_method('IsData', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsDeauthentication() const [member function]
+    cls.add_method('IsDeauthentication', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsDisassociation() const [member function]
+    cls.add_method('IsDisassociation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsFromDs() const [member function]
+    cls.add_method('IsFromDs', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsMgt() const [member function]
+    cls.add_method('IsMgt', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsMoreFragments() const [member function]
+    cls.add_method('IsMoreFragments', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsMultihopAction() const [member function]
+    cls.add_method('IsMultihopAction', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsProbeReq() const [member function]
+    cls.add_method('IsProbeReq', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsProbeResp() const [member function]
+    cls.add_method('IsProbeResp', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosAck() const [member function]
+    cls.add_method('IsQosAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosAmsdu() const [member function]
+    cls.add_method('IsQosAmsdu', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosBlockAck() const [member function]
+    cls.add_method('IsQosBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosData() const [member function]
+    cls.add_method('IsQosData', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosEosp() const [member function]
+    cls.add_method('IsQosEosp', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosNoAck() const [member function]
+    cls.add_method('IsQosNoAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsReassocReq() const [member function]
+    cls.add_method('IsReassocReq', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsReassocResp() const [member function]
+    cls.add_method('IsReassocResp', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsRetry() const [member function]
+    cls.add_method('IsRetry', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsRts() const [member function]
+    cls.add_method('IsRts', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsToDs() const [member function]
+    cls.add_method('IsToDs', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAction() [member function]
+    cls.add_method('SetAction', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAddr1(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddr1', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAddr2(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddr2', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAddr3(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddr3', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAddr4(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddr4', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAssocReq() [member function]
+    cls.add_method('SetAssocReq', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAssocResp() [member function]
+    cls.add_method('SetAssocResp', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetBeacon() [member function]
+    cls.add_method('SetBeacon', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetBlockAck() [member function]
+    cls.add_method('SetBlockAck', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetBlockAckReq() [member function]
+    cls.add_method('SetBlockAckReq', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDsFrom() [member function]
+    cls.add_method('SetDsFrom', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDsNotFrom() [member function]
+    cls.add_method('SetDsNotFrom', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDsNotTo() [member function]
+    cls.add_method('SetDsNotTo', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDsTo() [member function]
+    cls.add_method('SetDsTo', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDuration(ns3::Time duration) [member function]
+    cls.add_method('SetDuration', 
+                   'void', 
+                   [param('ns3::Time', 'duration')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetFragmentNumber(uint8_t frag) [member function]
+    cls.add_method('SetFragmentNumber', 
+                   'void', 
+                   [param('uint8_t', 'frag')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetId(uint16_t id) [member function]
+    cls.add_method('SetId', 
+                   'void', 
+                   [param('uint16_t', 'id')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetMoreFragments() [member function]
+    cls.add_method('SetMoreFragments', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetMultihopAction() [member function]
+    cls.add_method('SetMultihopAction', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoMoreFragments() [member function]
+    cls.add_method('SetNoMoreFragments', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoOrder() [member function]
+    cls.add_method('SetNoOrder', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoRetry() [member function]
+    cls.add_method('SetNoRetry', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetOrder() [member function]
+    cls.add_method('SetOrder', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetProbeReq() [member function]
+    cls.add_method('SetProbeReq', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetProbeResp() [member function]
+    cls.add_method('SetProbeResp', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
+    cls.add_method('SetQosAckPolicy', 
+                   'void', 
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
+    cls.add_method('SetQosAmsdu', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosBlockAck() [member function]
+    cls.add_method('SetQosBlockAck', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosEosp() [member function]
+    cls.add_method('SetQosEosp', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoAck() [member function]
+    cls.add_method('SetQosNoAck', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoAmsdu() [member function]
+    cls.add_method('SetQosNoAmsdu', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoEosp() [member function]
+    cls.add_method('SetQosNoEosp', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNormalAck() [member function]
+    cls.add_method('SetQosNormalAck', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosTid(uint8_t tid) [member function]
+    cls.add_method('SetQosTid', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosTxopLimit(uint8_t txop) [member function]
+    cls.add_method('SetQosTxopLimit', 
+                   'void', 
+                   [param('uint8_t', 'txop')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetRawDuration(uint16_t duration) [member function]
+    cls.add_method('SetRawDuration', 
+                   'void', 
+                   [param('uint16_t', 'duration')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetRetry() [member function]
+    cls.add_method('SetRetry', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetSequenceNumber(uint16_t seq) [member function]
+    cls.add_method('SetSequenceNumber', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetType(ns3::WifiMacType type) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('ns3::WifiMacType', 'type')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetTypeData() [member function]
+    cls.add_method('SetTypeData', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3WifiMacQueue_methods(root_module, cls):
+    ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue::WifiMacQueue(ns3::WifiMacQueue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMacQueue const &', 'arg0')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue::WifiMacQueue() [constructor]
+    cls.add_constructor([])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::Dequeue(ns3::WifiMacHeader * hdr) [member function]
+    cls.add_method('Dequeue', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::DequeueByTidAndAddress(ns3::WifiMacHeader * hdr, uint8_t tid, ns3::WifiMacHeader::AddressType type, ns3::Mac48Address addr) [member function]
+    cls.add_method('DequeueByTidAndAddress', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr'), param('uint8_t', 'tid'), param('ns3::WifiMacHeader::AddressType', 'type'), param('ns3::Mac48Address', 'addr')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::DequeueFirstAvailable(ns3::WifiMacHeader * hdr, ns3::Time & tStamp, ns3::QosBlockedDestinations const * blockedPackets) [member function]
+    cls.add_method('DequeueFirstAvailable', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr'), param('ns3::Time &', 'tStamp'), param('ns3::QosBlockedDestinations const *', 'blockedPackets')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Flush() [member function]
+    cls.add_method('Flush', 
+                   'void', 
+                   [])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Time ns3::WifiMacQueue::GetMaxDelay() const [member function]
+    cls.add_method('GetMaxDelay', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-queue.h (module 'wifi'): uint32_t ns3::WifiMacQueue::GetMaxSize() const [member function]
+    cls.add_method('GetMaxSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-queue.h (module 'wifi'): uint32_t ns3::WifiMacQueue::GetNPacketsByTidAndAddress(uint8_t tid, ns3::WifiMacHeader::AddressType type, ns3::Mac48Address addr) [member function]
+    cls.add_method('GetNPacketsByTidAndAddress', 
+                   'uint32_t', 
+                   [param('uint8_t', 'tid'), param('ns3::WifiMacHeader::AddressType', 'type'), param('ns3::Mac48Address', 'addr')])
+    ## wifi-mac-queue.h (module 'wifi'): uint32_t ns3::WifiMacQueue::GetSize() [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [])
+    ## wifi-mac-queue.h (module 'wifi'): static ns3::TypeId ns3::WifiMacQueue::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::IsEmpty() [member function]
+    cls.add_method('IsEmpty', 
+                   'bool', 
+                   [])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::Peek(ns3::WifiMacHeader * hdr) [member function]
+    cls.add_method('Peek', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::PeekByTidAndAddress(ns3::WifiMacHeader * hdr, uint8_t tid, ns3::WifiMacHeader::AddressType type, ns3::Mac48Address addr) [member function]
+    cls.add_method('PeekByTidAndAddress', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr'), param('uint8_t', 'tid'), param('ns3::WifiMacHeader::AddressType', 'type'), param('ns3::Mac48Address', 'addr')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::PeekFirstAvailable(ns3::WifiMacHeader * hdr, ns3::Time & tStamp, ns3::QosBlockedDestinations const * blockedPackets) [member function]
+    cls.add_method('PeekFirstAvailable', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr'), param('ns3::Time &', 'tStamp'), param('ns3::QosBlockedDestinations const *', 'blockedPackets')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::PushFront(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('PushFront', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::Remove(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('Remove', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::SetMaxDelay(ns3::Time delay) [member function]
+    cls.add_method('SetMaxDelay', 
+                   'void', 
+                   [param('ns3::Time', 'delay')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::SetMaxSize(uint32_t maxSize) [member function]
+    cls.add_method('SetMaxSize', 
+                   'void', 
+                   [param('uint32_t', 'maxSize')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacQueue::GetAddressForPacket(ns3::WifiMacHeader::AddressType type, std::_List_iterator<ns3::WifiMacQueue::Item> it) [member function]
+    cls.add_method('GetAddressForPacket', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader::AddressType', 'type'), param('std::_List_iterator< ns3::WifiMacQueue::Item >', 'it')], 
+                   visibility='protected')
+    return
+
+def register_Ns3WifiPhy_methods(root_module, cls):
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhy::WifiPhy(ns3::WifiPhy const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiPhy const &', 'arg0')])
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhy::WifiPhy() [constructor]
+    cls.add_constructor([])
+    ## wifi-phy.h (module 'wifi'): int64_t ns3::WifiPhy::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
+    cls.add_method('CalculateSnr', 
+                   'double', 
+                   [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculateTxDuration', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('ConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
+    cls.add_method('GetBssMembershipSelector', 
+                   'uint32_t', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::WifiPhy::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::WifiChannel >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetChannelBonding() const [member function]
+    cls.add_method('GetChannelBonding', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetChannelNumber() const [member function]
+    cls.add_method('GetChannelNumber', 
+                   'uint16_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetDelayUntilIdle() [member function]
+    cls.add_method('GetDelayUntilIdle', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetDsssRate11Mbps() [member function]
+    cls.add_method('GetDsssRate11Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetDsssRate1Mbps() [member function]
+    cls.add_method('GetDsssRate1Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetDsssRate2Mbps() [member function]
+    cls.add_method('GetDsssRate2Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetDsssRate5_5Mbps() [member function]
+    cls.add_method('GetDsssRate5_5Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate12Mbps() [member function]
+    cls.add_method('GetErpOfdmRate12Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate18Mbps() [member function]
+    cls.add_method('GetErpOfdmRate18Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate24Mbps() [member function]
+    cls.add_method('GetErpOfdmRate24Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate36Mbps() [member function]
+    cls.add_method('GetErpOfdmRate36Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate48Mbps() [member function]
+    cls.add_method('GetErpOfdmRate48Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate54Mbps() [member function]
+    cls.add_method('GetErpOfdmRate54Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate6Mbps() [member function]
+    cls.add_method('GetErpOfdmRate6Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate9Mbps() [member function]
+    cls.add_method('GetErpOfdmRate9Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGuardInterval() const [member function]
+    cls.add_method('GetGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetLastRxStartTime() const [member function]
+    cls.add_method('GetLastRxStartTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetMFPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetMFPlcpHeaderMode', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetMcs(uint8_t mcs) const [member function]
+    cls.add_method('GetMcs', 
+                   'uint8_t', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::WifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
+    cls.add_method('GetMembershipSelectorModes', 
+                   'ns3::WifiModeList', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::GetMode(uint32_t mode) const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [param('uint32_t', 'mode')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNBssMembershipSelectors() const [member function]
+    cls.add_method('GetNBssMembershipSelectors', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetNMcs() const [member function]
+    cls.add_method('GetNMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNModes() const [member function]
+    cls.add_method('GetNModes', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNTxPower() const [member function]
+    cls.add_method('GetNTxPower', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfReceiveAntennas() const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfTransmitAntennas() const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate108MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate108MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate120MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate120MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate121_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate121_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12Mbps() [member function]
+    cls.add_method('GetOfdmRate12Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate12MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate12MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHzShGi() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate13MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate13_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate13_5MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate14_4MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate14_4MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate150MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate150MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate15MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate15MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate18Mbps() [member function]
+    cls.add_method('GetOfdmRate18Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate18MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate18MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate19_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate19_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate1_5MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate1_5MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate21_7MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate21_7MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate24Mbps() [member function]
+    cls.add_method('GetOfdmRate24Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate24MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate24MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate26MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate26MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate27MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate27MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate28_9MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate28_9MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate2_25MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate2_25MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate30MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate30MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate36Mbps() [member function]
+    cls.add_method('GetOfdmRate36Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate39MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate39MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate3MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate3MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate3MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate3MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate40_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate40_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate43_3MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate43_3MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate45MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate45MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate48Mbps() [member function]
+    cls.add_method('GetOfdmRate48Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate4_5MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate4_5MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate4_5MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate4_5MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate52MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate52MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54Mbps() [member function]
+    cls.add_method('GetOfdmRate54Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate54MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate57_8MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate57_8MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate58_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate58_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate60MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate60MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHzShGi() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6Mbps() [member function]
+    cls.add_method('GetOfdmRate6Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate6MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate6MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate6_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate72_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate72_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate7_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate7_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate81MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate81MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate90MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate90MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9Mbps() [member function]
+    cls.add_method('GetOfdmRate9Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate9MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate9MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static double ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('GetPayloadDurationMicroSeconds', 
+                   'double', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHeaderDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHeaderMode', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtSigHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHtSigHeaderDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtTrainingSymbolDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('GetPlcpHtTrainingSymbolDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpPreambleDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetStateDuration() [member function]
+    cls.add_method('GetStateDuration', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetStbc() const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxPowerEnd() const [member function]
+    cls.add_method('GetTxPowerEnd', 
+                   'double', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxPowerStart() const [member function]
+    cls.add_method('GetTxPowerStart', 
+                   'double', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::TypeId ns3::WifiPhy::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateBusy() [member function]
+    cls.add_method('IsStateBusy', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateCcaBusy() [member function]
+    cls.add_method('IsStateCcaBusy', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateIdle() [member function]
+    cls.add_method('IsStateIdle', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateRx() [member function]
+    cls.add_method('IsStateRx', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateSwitching() [member function]
+    cls.add_method('IsStateSwitching', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateTx() [member function]
+    cls.add_method('IsStateTx', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::McsToWifiMode(uint8_t mcs) [member function]
+    cls.add_method('McsToWifiMode', 
+                   'ns3::WifiMode', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function]
+    cls.add_method('NotifyMonitorSniffRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, uint8_t txPower) [member function]
+    cls.add_method('NotifyMonitorSniffTx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('uint8_t', 'txPower')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRxBegin', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxDrop(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRxDrop', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRxEnd', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyTxBegin(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTxBegin', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyTxDrop(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTxDrop', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyTxEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTxEnd', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::RegisterListener(ns3::WifiPhyListener * listener) [member function]
+    cls.add_method('RegisterListener', 
+                   'void', 
+                   [param('ns3::WifiPhyListener *', 'listener')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('SendPacket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelBonding(bool channelbonding) [member function]
+    cls.add_method('SetChannelBonding', 
+                   'void', 
+                   [param('bool', 'channelbonding')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelNumber(uint16_t id) [member function]
+    cls.add_method('SetChannelNumber', 
+                   'void', 
+                   [param('uint16_t', 'id')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrequency(uint32_t freq) [member function]
+    cls.add_method('SetFrequency', 
+                   'void', 
+                   [param('uint32_t', 'freq')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGreenfield(bool greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('bool', 'greenfield')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
+    cls.add_method('SetGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardInterval')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('bool', 'ldpc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
+    cls.add_method('SetNumberOfReceiveAntennas', 
+                   'void', 
+                   [param('uint32_t', 'rx')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
+    cls.add_method('SetNumberOfTransmitAntennas', 
+                   'void', 
+                   [param('uint32_t', 'tx')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveErrorCallback(ns3::Callback<void,ns3::Ptr<const ns3::Packet>,double,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    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')], 
+                   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]
+    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')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetStbc(bool stbc) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::WifiModeToMcs(ns3::WifiMode mode) [member function]
+    cls.add_method('WifiModeToMcs', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'mode')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3WifiRemoteStationManager_methods(root_module, cls):
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationManager::WifiRemoteStationManager(ns3::WifiRemoteStationManager const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiRemoteStationManager const &', 'arg0')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationManager::WifiRemoteStationManager() [constructor]
+    cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddBasicMcs(uint8_t mcs) [member function]
+    cls.add_method('AddBasicMcs', 
+                   'void', 
+                   [param('uint8_t', 'mcs')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddBasicMode(ns3::WifiMode mode) [member function]
+    cls.add_method('AddBasicMode', 
+                   'void', 
+                   [param('ns3::WifiMode', 'mode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddStationHtCapabilities(ns3::Mac48Address from, ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('AddStationHtCapabilities', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'from'), param('ns3::HtCapabilities', 'htcapabilities')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddSupportedMcs(ns3::Mac48Address address, uint8_t mcs) [member function]
+    cls.add_method('AddSupportedMcs', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('uint8_t', 'mcs')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddSupportedMode(ns3::Mac48Address address, ns3::WifiMode mode) [member function]
+    cls.add_method('AddSupportedMode', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'mode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetCtsToSelfTxVector() [member function]
+    cls.add_method('DoGetCtsToSelfTxVector', 
+                   'ns3::WifiTxVector', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetAckTxVector(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
+    cls.add_method('GetAckTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetBasicMcs(uint32_t i) const [member function]
+    cls.add_method('GetBasicMcs', 
+                   'uint8_t', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetBasicMode(uint32_t i) const [member function]
+    cls.add_method('GetBasicMode', 
+                   'ns3::WifiMode', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetBlockAckTxVector(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
+    cls.add_method('GetBlockAckTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsToSelfTxVector(ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('GetCtsToSelfTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsTxVector(ns3::Mac48Address address, ns3::WifiMode rtsMode) [member function]
+    cls.add_method('GetCtsTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'rtsMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetDataTxVector(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fullPacketSize) [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fullPacketSize')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetDefaultMcs() const [member function]
+    cls.add_method('GetDefaultMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetDefaultMode() const [member function]
+    cls.add_method('GetDefaultMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetDefaultTxPowerLevel() const [member function]
+    cls.add_method('GetDefaultTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetFragmentOffset(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fragmentNumber) [member function]
+    cls.add_method('GetFragmentOffset', 
+                   'uint32_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fragmentNumber')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetFragmentSize(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fragmentNumber) [member function]
+    cls.add_method('GetFragmentSize', 
+                   'uint32_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fragmentNumber')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetFragmentationThreshold() const [member function]
+    cls.add_method('GetFragmentationThreshold', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfieldSupported(ns3::Mac48Address address) const [member function]
+    cls.add_method('GetGreenfieldSupported', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo ns3::WifiRemoteStationManager::GetInfo(ns3::Mac48Address address) [member function]
+    cls.add_method('GetInfo', 
+                   'ns3::WifiRemoteStationInfo', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetMaxSlrc() const [member function]
+    cls.add_method('GetMaxSlrc', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetMaxSsrc() const [member function]
+    cls.add_method('GetMaxSsrc', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNBasicMcs() const [member function]
+    cls.add_method('GetNBasicMcs', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNBasicModes() const [member function]
+    cls.add_method('GetNBasicModes', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetNonUnicastMode() const [member function]
+    cls.add_method('GetNonUnicastMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfTransmitAntennas() [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetRtsCtsThreshold() const [member function]
+    cls.add_method('GetRtsCtsThreshold', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetRtsTxVector(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('GetRtsTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): static ns3::TypeId ns3::WifiRemoteStationManager::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::HasHtSupported() const [member function]
+    cls.add_method('HasHtSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsAssociated(ns3::Mac48Address address) const [member function]
+    cls.add_method('IsAssociated', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsBrandNew(ns3::Mac48Address address) const [member function]
+    cls.add_method('IsBrandNew', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsLastFragment(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fragmentNumber) [member function]
+    cls.add_method('IsLastFragment', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fragmentNumber')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsWaitAssocTxOk(ns3::Mac48Address address) const [member function]
+    cls.add_method('IsWaitAssocTxOk', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedCtsToSelf(ns3::WifiTxVector txVector) [member function]
+    cls.add_method('NeedCtsToSelf', 
+                   'bool', 
+                   [param('ns3::WifiTxVector', 'txVector')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedDataRetransmission(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NeedDataRetransmission', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedFragmentation(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NeedFragmentation', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedRts(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NeedRts', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedRtsRetransmission(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NeedRtsRetransmission', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::PrepareForQueue(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fullPacketSize) [member function]
+    cls.add_method('PrepareForQueue', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fullPacketSize')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::RecordDisassociated(ns3::Mac48Address address) [member function]
+    cls.add_method('RecordDisassociated', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::RecordGotAssocTxFailed(ns3::Mac48Address address) [member function]
+    cls.add_method('RecordGotAssocTxFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::RecordGotAssocTxOk(ns3::Mac48Address address) [member function]
+    cls.add_method('RecordGotAssocTxOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::RecordWaitAssocTxOk(ns3::Mac48Address address) [member function]
+    cls.add_method('RecordWaitAssocTxOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportDataFailed(ns3::Mac48Address address, ns3::WifiMacHeader const * header) [member function]
+    cls.add_method('ReportDataFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportDataOk(ns3::Mac48Address address, ns3::WifiMacHeader const * header, double ackSnr, ns3::WifiMode ackMode, double dataSnr) [member function]
+    cls.add_method('ReportDataOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('double', 'ackSnr'), param('ns3::WifiMode', 'ackMode'), param('double', 'dataSnr')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportFinalDataFailed(ns3::Mac48Address address, ns3::WifiMacHeader const * header) [member function]
+    cls.add_method('ReportFinalDataFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportFinalRtsFailed(ns3::Mac48Address address, ns3::WifiMacHeader const * header) [member function]
+    cls.add_method('ReportFinalRtsFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportRtsFailed(ns3::Mac48Address address, ns3::WifiMacHeader const * header) [member function]
+    cls.add_method('ReportRtsFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportRtsOk(ns3::Mac48Address address, ns3::WifiMacHeader const * header, double ctsSnr, ns3::WifiMode ctsMode, double rtsSnr) [member function]
+    cls.add_method('ReportRtsOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('double', 'ctsSnr'), param('ns3::WifiMode', 'ctsMode'), param('double', 'rtsSnr')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportRxOk(ns3::Mac48Address address, ns3::WifiMacHeader const * header, double rxSnr, ns3::WifiMode txMode) [member function]
+    cls.add_method('ReportRxOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::Reset() [member function]
+    cls.add_method('Reset', 
+                   'void', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::Reset(ns3::Mac48Address address) [member function]
+    cls.add_method('Reset', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetDefaultTxPowerLevel(uint8_t txPower) [member function]
+    cls.add_method('SetDefaultTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'txPower')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetFragmentationThreshold(uint32_t threshold) [member function]
+    cls.add_method('SetFragmentationThreshold', 
+                   'void', 
+                   [param('uint32_t', 'threshold')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetHtSupported(bool enable) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('bool', 'enable')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetMaxSlrc(uint32_t maxSlrc) [member function]
+    cls.add_method('SetMaxSlrc', 
+                   'void', 
+                   [param('uint32_t', 'maxSlrc')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetMaxSsrc(uint32_t maxSsrc) [member function]
+    cls.add_method('SetMaxSsrc', 
+                   'void', 
+                   [param('uint32_t', 'maxSsrc')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetRtsCtsThreshold(uint32_t threshold) [member function]
+    cls.add_method('SetRtsCtsThreshold', 
+                   'void', 
+                   [param('uint32_t', 'threshold')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetupPhy(ns3::Ptr<ns3::WifiPhy> phy) [member function]
+    cls.add_method('SetupPhy', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiPhy >', 'phy')], 
+                   is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfield(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetLongRetryCount(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetLongRetryCount', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetMcsSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function]
+    cls.add_method('GetMcsSupported', 
+                   'uint8_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station'), param('uint32_t', 'i')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNMcsSupported(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNMcsSupported', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNSupported(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNSupported', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfReceiveAntennas(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfTransmitAntennas(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetShortGuardInterval(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetShortGuardInterval', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetShortRetryCount(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetShortRetryCount', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetStbc(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function]
+    cls.add_method('GetSupported', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiRemoteStation const *', 'station'), param('uint32_t', 'i')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation * ns3::WifiRemoteStationManager::DoCreateStation() const [member function]
+    cls.add_method('DoCreateStation', 
+                   'ns3::WifiRemoteStation *', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxNess(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxNss(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetAckTxStbc(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetBlockAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxNess(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxNss(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetBlockAckTxStbc(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetCtsTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxNess(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxNss(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetCtsTxStbc(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetDataTxVector(ns3::WifiRemoteStation * station, uint32_t size) [member function]
+    cls.add_method('DoGetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('uint32_t', 'size')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetRtsTxVector(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoGetRtsTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedDataRetransmission(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
+    cls.add_method('DoNeedDataRetransmission', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedFragmentation(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
+    cls.add_method('DoNeedFragmentation', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedRts(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
+    cls.add_method('DoNeedRts', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedRtsRetransmission(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
+    cls.add_method('DoNeedRtsRetransmission', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportDataFailed(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoReportDataFailed', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportDataOk(ns3::WifiRemoteStation * station, double ackSnr, ns3::WifiMode ackMode, double dataSnr) [member function]
+    cls.add_method('DoReportDataOk', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('double', 'ackSnr'), param('ns3::WifiMode', 'ackMode'), param('double', 'dataSnr')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportFinalDataFailed(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoReportFinalDataFailed', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportFinalRtsFailed(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoReportFinalRtsFailed', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportRtsFailed(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoReportRtsFailed', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportRtsOk(ns3::WifiRemoteStation * station, double ctsSnr, ns3::WifiMode ctsMode, double rtsSnr) [member function]
+    cls.add_method('DoReportRtsOk', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('double', 'ctsSnr'), param('ns3::WifiMode', 'ctsMode'), param('double', 'rtsSnr')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportRxOk(ns3::WifiRemoteStation * station, double rxSnr, ns3::WifiMode txMode) [member function]
+    cls.add_method('DoReportRxOk', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsLowLatency() const [member function]
+    cls.add_method('IsLowLatency', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=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')])
+    ## attribute.h (module 'core'): ns3::AttributeAccessor::AttributeAccessor() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::Get(ns3::ObjectBase const * object, ns3::AttributeValue & attribute) const [member function]
+    cls.add_method('Get', 
+                   'bool', 
+                   [param('ns3::ObjectBase const *', 'object'), param('ns3::AttributeValue &', 'attribute')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::HasGetter() const [member function]
+    cls.add_method('HasGetter', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::HasSetter() const [member function]
+    cls.add_method('HasSetter', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::Set(ns3::ObjectBase * object, ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Set', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False), param('ns3::AttributeValue const &', 'value')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3AttributeChecker_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::AttributeChecker::AttributeChecker(ns3::AttributeChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeChecker const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::AttributeChecker::AttributeChecker() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::Check(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Check', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::Copy(ns3::AttributeValue const & source, ns3::AttributeValue & destination) const [member function]
+    cls.add_method('Copy', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'source'), param('ns3::AttributeValue &', 'destination')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::CreateValidValue(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('CreateValidValue', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_const=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeChecker::GetUnderlyingTypeInformation() const [member function]
+    cls.add_method('GetUnderlyingTypeInformation', 
+                   'std::string', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeChecker::GetValueTypeName() const [member function]
+    cls.add_method('GetValueTypeName', 
+                   'std::string', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::HasUnderlyingTypeInformation() const [member function]
+    cls.add_method('HasUnderlyingTypeInformation', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3AttributeValue_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::AttributeValue::AttributeValue(ns3::AttributeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeValue const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::AttributeValue::AttributeValue() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3CallbackChecker_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker(ns3::CallbackChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackChecker const &', 'arg0')])
+    return
+
+def register_Ns3CallbackImplBase_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackImplBase::CallbackImplBase() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackImplBase::CallbackImplBase(ns3::CallbackImplBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackImplBase const &', 'arg0')])
+    ## callback.h (module 'core'): bool ns3::CallbackImplBase::IsEqual(ns3::Ptr<ns3::CallbackImplBase const> other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::CallbackImplBase const >', 'other')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3CallbackValue_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue(ns3::CallbackValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackValue const &', 'arg0')])
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue(ns3::CallbackBase const & base) [constructor]
+    cls.add_constructor([param('ns3::CallbackBase const &', 'base')])
+    ## callback.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::CallbackValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## callback.h (module 'core'): bool ns3::CallbackValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## callback.h (module 'core'): std::string ns3::CallbackValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## callback.h (module 'core'): void ns3::CallbackValue::Set(ns3::CallbackBase base) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::CallbackBase', 'base')])
+    return
+
+def register_Ns3CtrlBAckRequestHeader_methods(root_module, cls):
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckRequestHeader::CtrlBAckRequestHeader(ns3::CtrlBAckRequestHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CtrlBAckRequestHeader const &', 'arg0')])
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckRequestHeader::CtrlBAckRequestHeader() [constructor]
+    cls.add_constructor([])
+    ## ctrl-headers.h (module 'wifi'): uint32_t ns3::CtrlBAckRequestHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): ns3::TypeId ns3::CtrlBAckRequestHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint32_t ns3::CtrlBAckRequestHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t ns3::CtrlBAckRequestHeader::GetStartingSequence() const [member function]
+    cls.add_method('GetStartingSequence', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t ns3::CtrlBAckRequestHeader::GetStartingSequenceControl() const [member function]
+    cls.add_method('GetStartingSequenceControl', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint8_t ns3::CtrlBAckRequestHeader::GetTidInfo() const [member function]
+    cls.add_method('GetTidInfo', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): static ns3::TypeId ns3::CtrlBAckRequestHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckRequestHeader::IsBasic() const [member function]
+    cls.add_method('IsBasic', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckRequestHeader::IsCompressed() const [member function]
+    cls.add_method('IsCompressed', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckRequestHeader::IsMultiTid() const [member function]
+    cls.add_method('IsMultiTid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckRequestHeader::MustSendHtImmediateAck() const [member function]
+    cls.add_method('MustSendHtImmediateAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::SetHtImmediateAck(bool immediateAck) [member function]
+    cls.add_method('SetHtImmediateAck', 
+                   'void', 
+                   [param('bool', 'immediateAck')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::SetStartingSequence(uint16_t seq) [member function]
+    cls.add_method('SetStartingSequence', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::SetTidInfo(uint8_t tid) [member function]
+    cls.add_method('SetTidInfo', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::SetType(ns3::BlockAckType type) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('ns3::BlockAckType', 'type')])
+    return
+
+def register_Ns3CtrlBAckResponseHeader_methods(root_module, cls):
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckResponseHeader::CtrlBAckResponseHeader(ns3::CtrlBAckResponseHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CtrlBAckResponseHeader const &', 'arg0')])
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckResponseHeader::CtrlBAckResponseHeader() [constructor]
+    cls.add_constructor([])
+    ## ctrl-headers.h (module 'wifi'): uint32_t ns3::CtrlBAckResponseHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t const * ns3::CtrlBAckResponseHeader::GetBitmap() const [member function]
+    cls.add_method('GetBitmap', 
+                   'uint16_t const *', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint64_t ns3::CtrlBAckResponseHeader::GetCompressedBitmap() const [member function]
+    cls.add_method('GetCompressedBitmap', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): ns3::TypeId ns3::CtrlBAckResponseHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint32_t ns3::CtrlBAckResponseHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t ns3::CtrlBAckResponseHeader::GetStartingSequence() const [member function]
+    cls.add_method('GetStartingSequence', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t ns3::CtrlBAckResponseHeader::GetStartingSequenceControl() const [member function]
+    cls.add_method('GetStartingSequenceControl', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint8_t ns3::CtrlBAckResponseHeader::GetTidInfo() const [member function]
+    cls.add_method('GetTidInfo', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): static ns3::TypeId ns3::CtrlBAckResponseHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsBasic() const [member function]
+    cls.add_method('IsBasic', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsCompressed() const [member function]
+    cls.add_method('IsCompressed', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsFragmentReceived(uint16_t seq, uint8_t frag) const [member function]
+    cls.add_method('IsFragmentReceived', 
+                   'bool', 
+                   [param('uint16_t', 'seq'), param('uint8_t', 'frag')], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsMultiTid() const [member function]
+    cls.add_method('IsMultiTid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsPacketReceived(uint16_t seq) const [member function]
+    cls.add_method('IsPacketReceived', 
+                   'bool', 
+                   [param('uint16_t', 'seq')], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::MustSendHtImmediateAck() const [member function]
+    cls.add_method('MustSendHtImmediateAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::ResetBitmap() [member function]
+    cls.add_method('ResetBitmap', 
+                   'void', 
+                   [])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immediateAck) [member function]
+    cls.add_method('SetHtImmediateAck', 
+                   'void', 
+                   [param('bool', 'immediateAck')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedFragment(uint16_t seq, uint8_t frag) [member function]
+    cls.add_method('SetReceivedFragment', 
+                   'void', 
+                   [param('uint16_t', 'seq'), param('uint8_t', 'frag')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedPacket(uint16_t seq) [member function]
+    cls.add_method('SetReceivedPacket', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetStartingSequence(uint16_t seq) [member function]
+    cls.add_method('SetStartingSequence', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetStartingSequenceControl(uint16_t seqControl) [member function]
+    cls.add_method('SetStartingSequenceControl', 
+                   'void', 
+                   [param('uint16_t', 'seqControl')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetTidInfo(uint8_t tid) [member function]
+    cls.add_method('SetTidInfo', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetType(ns3::BlockAckType type) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('ns3::BlockAckType', 'type')])
+    return
+
+def register_Ns3Dcf_methods(root_module, cls):
+    ## dcf.h (module 'wifi'): ns3::Dcf::Dcf() [constructor]
+    cls.add_constructor([])
+    ## dcf.h (module 'wifi'): ns3::Dcf::Dcf(ns3::Dcf const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Dcf const &', 'arg0')])
+    ## dcf.h (module 'wifi'): uint32_t ns3::Dcf::GetAifsn() const [member function]
+    cls.add_method('GetAifsn', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): uint32_t ns3::Dcf::GetMaxCw() const [member function]
+    cls.add_method('GetMaxCw', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): uint32_t ns3::Dcf::GetMinCw() const [member function]
+    cls.add_method('GetMinCw', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): static ns3::TypeId ns3::Dcf::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## dcf.h (module 'wifi'): void ns3::Dcf::SetAifsn(uint32_t aifsn) [member function]
+    cls.add_method('SetAifsn', 
+                   'void', 
+                   [param('uint32_t', 'aifsn')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): void ns3::Dcf::SetMaxCw(uint32_t maxCw) [member function]
+    cls.add_method('SetMaxCw', 
+                   'void', 
+                   [param('uint32_t', 'maxCw')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): void ns3::Dcf::SetMinCw(uint32_t minCw) [member function]
+    cls.add_method('SetMinCw', 
+                   'void', 
+                   [param('uint32_t', 'minCw')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3EdcaTxopN_methods(root_module, cls):
+    ## edca-txop-n.h (module 'wifi'): static ns3::TypeId ns3::EdcaTxopN::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## edca-txop-n.h (module 'wifi'): ns3::EdcaTxopN::EdcaTxopN() [constructor]
+    cls.add_constructor([])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetLow(ns3::Ptr<ns3::MacLow> low) [member function]
+    cls.add_method('SetLow', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MacLow >', 'low')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetTxMiddle(ns3::MacTxMiddle * txMiddle) [member function]
+    cls.add_method('SetTxMiddle', 
+                   'void', 
+                   [param('ns3::MacTxMiddle *', 'txMiddle')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetManager(ns3::DcfManager * manager) [member function]
+    cls.add_method('SetManager', 
+                   'void', 
+                   [param('ns3::DcfManager *', 'manager')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetTxOkCallback(ns3::Callback<void, ns3::WifiMacHeader const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetTxOkCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::WifiMacHeader const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetTxFailedCallback(ns3::Callback<void, ns3::WifiMacHeader const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetTxFailedCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::WifiMacHeader const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> remoteManager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'remoteManager')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetTypeOfStation(ns3::TypeOfStation type) [member function]
+    cls.add_method('SetTypeOfStation', 
+                   'void', 
+                   [param('ns3::TypeOfStation', 'type')])
+    ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation ns3::EdcaTxopN::GetTypeOfStation() const [member function]
+    cls.add_method('GetTypeOfStation', 
+                   'ns3::TypeOfStation', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::EdcaTxopN::GetQueue() const [member function]
+    cls.add_method('GetQueue', 
+                   'ns3::Ptr< ns3::WifiMacQueue >', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetMinCw(uint32_t minCw) [member function]
+    cls.add_method('SetMinCw', 
+                   'void', 
+                   [param('uint32_t', 'minCw')], 
+                   is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetMaxCw(uint32_t maxCw) [member function]
+    cls.add_method('SetMaxCw', 
+                   'void', 
+                   [param('uint32_t', 'maxCw')], 
+                   is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetAifsn(uint32_t aifsn) [member function]
+    cls.add_method('SetAifsn', 
+                   'void', 
+                   [param('uint32_t', 'aifsn')], 
+                   is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetMinCw() const [member function]
+    cls.add_method('GetMinCw', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetMaxCw() const [member function]
+    cls.add_method('GetMaxCw', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetAifsn() const [member function]
+    cls.add_method('GetAifsn', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): ns3::Ptr<ns3::MacLow> ns3::EdcaTxopN::Low() [member function]
+    cls.add_method('Low', 
+                   'ns3::Ptr< ns3::MacLow >', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): ns3::Ptr<ns3::MsduAggregator> ns3::EdcaTxopN::GetMsduAggregator() const [member function]
+    cls.add_method('GetMsduAggregator', 
+                   'ns3::Ptr< ns3::MsduAggregator >', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedsAccess() const [member function]
+    cls.add_method('NeedsAccess', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NotifyAccessGranted() [member function]
+    cls.add_method('NotifyAccessGranted', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NotifyInternalCollision() [member function]
+    cls.add_method('NotifyInternalCollision', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NotifyCollision() [member function]
+    cls.add_method('NotifyCollision', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NotifyChannelSwitching() [member function]
+    cls.add_method('NotifyChannelSwitching', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotCts(double snr, ns3::WifiMode txMode) [member function]
+    cls.add_method('GotCts', 
+                   'void', 
+                   [param('double', 'snr'), param('ns3::WifiMode', 'txMode')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::MissedCts() [member function]
+    cls.add_method('MissedCts', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotAck(double snr, ns3::WifiMode txMode) [member function]
+    cls.add_method('GotAck', 
+                   'void', 
+                   [param('double', 'snr'), param('ns3::WifiMode', 'txMode')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotBlockAck(ns3::CtrlBAckResponseHeader const * blockAck, ns3::Mac48Address recipient) [member function]
+    cls.add_method('GotBlockAck', 
+                   'void', 
+                   [param('ns3::CtrlBAckResponseHeader const *', 'blockAck'), param('ns3::Mac48Address', 'recipient')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::MissedBlockAck() [member function]
+    cls.add_method('MissedBlockAck', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotAddBaResponse(ns3::MgtAddBaResponseHeader const * respHdr, ns3::Mac48Address recipient) [member function]
+    cls.add_method('GotAddBaResponse', 
+                   'void', 
+                   [param('ns3::MgtAddBaResponseHeader const *', 'respHdr'), param('ns3::Mac48Address', 'recipient')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotDelBaFrame(ns3::MgtDelBaHeader const * delBaHdr, ns3::Mac48Address recipient) [member function]
+    cls.add_method('GotDelBaFrame', 
+                   'void', 
+                   [param('ns3::MgtDelBaHeader const *', 'delBaHdr'), param('ns3::Mac48Address', 'recipient')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::MissedAck() [member function]
+    cls.add_method('MissedAck', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::StartNext() [member function]
+    cls.add_method('StartNext', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::EndTxNoAck() [member function]
+    cls.add_method('EndTxNoAck', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::RestartAccessIfNeeded() [member function]
+    cls.add_method('RestartAccessIfNeeded', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::StartAccessIfNeeded() [member function]
+    cls.add_method('StartAccessIfNeeded', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedRts() [member function]
+    cls.add_method('NeedRts', 
+                   'bool', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedRtsRetransmission() [member function]
+    cls.add_method('NeedRtsRetransmission', 
+                   'bool', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedDataRetransmission() [member function]
+    cls.add_method('NeedDataRetransmission', 
+                   'bool', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedFragmentation() const [member function]
+    cls.add_method('NeedFragmentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetNextFragmentSize() [member function]
+    cls.add_method('GetNextFragmentSize', 
+                   'uint32_t', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetFragmentSize() [member function]
+    cls.add_method('GetFragmentSize', 
+                   'uint32_t', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetFragmentOffset() [member function]
+    cls.add_method('GetFragmentOffset', 
+                   'uint32_t', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::IsLastFragment() const [member function]
+    cls.add_method('IsLastFragment', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NextFragment() [member function]
+    cls.add_method('NextFragment', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): ns3::Ptr<ns3::Packet> ns3::EdcaTxopN::GetFragmentPacket(ns3::WifiMacHeader * hdr) [member function]
+    cls.add_method('GetFragmentPacket', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [param('ns3::WifiMacHeader *', 'hdr')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetAccessCategory(ns3::AcIndex ac) [member function]
+    cls.add_method('SetAccessCategory', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::Queue(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('Queue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetMsduAggregator(ns3::Ptr<ns3::MsduAggregator> aggr) [member function]
+    cls.add_method('SetMsduAggregator', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MsduAggregator >', 'aggr')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::PushFront(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('PushFront', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::CompleteConfig() [member function]
+    cls.add_method('CompleteConfig', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetBlockAckThreshold(uint8_t threshold) [member function]
+    cls.add_method('SetBlockAckThreshold', 
+                   'void', 
+                   [param('uint8_t', 'threshold')])
+    ## edca-txop-n.h (module 'wifi'): uint8_t ns3::EdcaTxopN::GetBlockAckThreshold() const [member function]
+    cls.add_method('GetBlockAckThreshold', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetBlockAckInactivityTimeout(uint16_t timeout) [member function]
+    cls.add_method('SetBlockAckInactivityTimeout', 
+                   'void', 
+                   [param('uint16_t', 'timeout')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SendDelbaFrame(ns3::Mac48Address addr, uint8_t tid, bool byOriginator) [member function]
+    cls.add_method('SendDelbaFrame', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'addr'), param('uint8_t', 'tid'), param('bool', 'byOriginator')])
+    ## edca-txop-n.h (module 'wifi'): int64_t ns3::EdcaTxopN::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3EmptyAttributeValue_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EmptyAttributeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::EmptyAttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   visibility='private', is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::EmptyAttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3EventImpl_methods(root_module, cls):
+    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventImpl const &', 'arg0')])
+    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl() [constructor]
+    cls.add_constructor([])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Invoke() [member function]
+    cls.add_method('Invoke', 
+                   'void', 
+                   [])
+    ## event-impl.h (module 'core'): bool ns3::EventImpl::IsCancelled() [member function]
+    cls.add_method('IsCancelled', 
+                   'bool', 
+                   [])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Notify() [member function]
+    cls.add_method('Notify', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ExtendedSupportedRatesIE_methods(root_module, cls):
+    ## supported-rates.h (module 'wifi'): ns3::ExtendedSupportedRatesIE::ExtendedSupportedRatesIE(ns3::ExtendedSupportedRatesIE const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ExtendedSupportedRatesIE const &', 'arg0')])
+    ## supported-rates.h (module 'wifi'): ns3::ExtendedSupportedRatesIE::ExtendedSupportedRatesIE() [constructor]
+    cls.add_constructor([])
+    ## supported-rates.h (module 'wifi'): ns3::ExtendedSupportedRatesIE::ExtendedSupportedRatesIE(ns3::SupportedRates * rates) [constructor]
+    cls.add_constructor([param('ns3::SupportedRates *', 'rates')])
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::ExtendedSupportedRatesIE::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## supported-rates.h (module 'wifi'): ns3::WifiInformationElementId ns3::ExtendedSupportedRatesIE::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::ExtendedSupportedRatesIE::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): uint16_t ns3::ExtendedSupportedRatesIE::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): ns3::Buffer::Iterator ns3::ExtendedSupportedRatesIE::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): void ns3::ExtendedSupportedRatesIE::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    return
+
+def register_Ns3HtCapabilities_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities::HtCapabilities(ns3::HtCapabilities const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilities const &', 'arg0')])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities::HtCapabilities() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): ns3::WifiInformationElementId ns3::HtCapabilities::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetAmpduParameters() const [member function]
+    cls.add_method('GetAmpduParameters', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint16_t ns3::HtCapabilities::GetHtCapabilitiesInfo() const [member function]
+    cls.add_method('GetHtCapabilitiesInfo', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t * ns3::HtCapabilities::GetRxMcsBitmask() [member function]
+    cls.add_method('GetRxMcsBitmask', 
+                   'uint8_t *', 
+                   [])
+    ## ht-capabilities.h (module 'wifi'): uint16_t ns3::HtCapabilities::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetShortGuardInterval20() const [member function]
+    cls.add_method('GetShortGuardInterval20', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetSupportedChannelWidth() const [member function]
+    cls.add_method('GetSupportedChannelWidth', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint64_t ns3::HtCapabilities::GetSupportedMcsSet1() const [member function]
+    cls.add_method('GetSupportedMcsSet1', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint64_t ns3::HtCapabilities::GetSupportedMcsSet2() const [member function]
+    cls.add_method('GetSupportedMcsSet2', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): bool ns3::HtCapabilities::IsSupportedMcs(uint8_t mcs) [member function]
+    cls.add_method('IsSupportedMcs', 
+                   'bool', 
+                   [param('uint8_t', 'mcs')])
+    ## ht-capabilities.h (module 'wifi'): ns3::Buffer::Iterator ns3::HtCapabilities::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetAmpduParameters(uint8_t ctrl) [member function]
+    cls.add_method('SetAmpduParameters', 
+                   'void', 
+                   [param('uint8_t', 'ctrl')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetGreenfield(uint8_t greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('uint8_t', 'greenfield')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetHtCapabilitiesInfo(uint16_t ctrl) [member function]
+    cls.add_method('SetHtCapabilitiesInfo', 
+                   'void', 
+                   [param('uint16_t', 'ctrl')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetHtSupported(uint8_t htsupported) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('uint8_t', 'htsupported')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetLdpc(uint8_t ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('uint8_t', 'ldpc')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetRxMcsBitmask(uint8_t index) [member function]
+    cls.add_method('SetRxMcsBitmask', 
+                   'void', 
+                   [param('uint8_t', 'index')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetShortGuardInterval20(uint8_t shortguardinterval) [member function]
+    cls.add_method('SetShortGuardInterval20', 
+                   'void', 
+                   [param('uint8_t', 'shortguardinterval')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetSupportedChannelWidth(uint8_t supportedchannelwidth) [member function]
+    cls.add_method('SetSupportedChannelWidth', 
+                   'void', 
+                   [param('uint8_t', 'supportedchannelwidth')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetSupportedMcsSet(uint64_t ctrl1, uint64_t ctrl2) [member function]
+    cls.add_method('SetSupportedMcsSet', 
+                   'void', 
+                   [param('uint64_t', 'ctrl1'), param('uint64_t', 'ctrl2')])
+    return
+
+def register_Ns3HtCapabilitiesChecker_methods(root_module, cls):
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker::HtCapabilitiesChecker() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker::HtCapabilitiesChecker(ns3::HtCapabilitiesChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilitiesChecker const &', 'arg0')])
+    return
+
+def register_Ns3HtCapabilitiesValue_methods(root_module, cls):
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue(ns3::HtCapabilitiesValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilitiesValue const &', 'arg0')])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue(ns3::HtCapabilities const & value) [constructor]
+    cls.add_constructor([param('ns3::HtCapabilities const &', 'value')])
+    ## ht-capabilities.h (module 'wifi'): ns3::Ptr<ns3::AttributeValue> ns3::HtCapabilitiesValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): bool ns3::HtCapabilitiesValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities ns3::HtCapabilitiesValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): std::string ns3::HtCapabilitiesValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilitiesValue::Set(ns3::HtCapabilities const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::HtCapabilities const &', 'value')])
+    return
+
+def register_Ns3Ipv4AddressChecker_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker(ns3::Ipv4AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv4AddressValue_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue(ns3::Ipv4AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4AddressValue const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue(ns3::Ipv4Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Address const &', 'value')])
+    ## ipv4-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv4AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): std::string ns3::Ipv4AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4AddressValue::Set(ns3::Ipv4Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv4Address const &', 'value')])
+    return
+
+def register_Ns3Ipv4MaskChecker_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker::Ipv4MaskChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker::Ipv4MaskChecker(ns3::Ipv4MaskChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4MaskChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv4MaskValue_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue(ns3::Ipv4MaskValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4MaskValue const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue(ns3::Ipv4Mask const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Mask const &', 'value')])
+    ## ipv4-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv4MaskValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4MaskValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask ns3::Ipv4MaskValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): std::string ns3::Ipv4MaskValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4MaskValue::Set(ns3::Ipv4Mask const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv4Mask const &', 'value')])
+    return
+
+def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker::Ipv6AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker::Ipv6AddressChecker(ns3::Ipv6AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv6AddressValue_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6AddressValue const &', 'arg0')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const &', 'value')])
+    ## ipv6-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv6AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address ns3::Ipv6AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): std::string ns3::Ipv6AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6AddressValue::Set(ns3::Ipv6Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv6Address const &', 'value')])
+    return
+
+def register_Ns3Ipv6PrefixChecker_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker(ns3::Ipv6PrefixChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PrefixChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv6PrefixValue_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6PrefixValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PrefixValue const &', 'arg0')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6Prefix const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const &', 'value')])
+    ## ipv6-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv6PrefixValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6PrefixValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix ns3::Ipv6PrefixValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): std::string ns3::Ipv6PrefixValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6PrefixValue::Set(ns3::Ipv6Prefix const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv6Prefix const &', 'value')])
+    return
+
+def register_Ns3Mac48AddressChecker_methods(root_module, cls):
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker(ns3::Mac48AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac48AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Mac48AddressValue_methods(root_module, cls):
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue() [constructor]
+    cls.add_constructor([])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue(ns3::Mac48AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac48AddressValue const &', 'arg0')])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue(ns3::Mac48Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Mac48Address const &', 'value')])
+    ## mac48-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Mac48AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac48-address.h (module 'network'): bool ns3::Mac48AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## mac48-address.h (module 'network'): ns3::Mac48Address ns3::Mac48AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## mac48-address.h (module 'network'): std::string ns3::Mac48AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## mac48-address.h (module 'network'): void ns3::Mac48AddressValue::Set(ns3::Mac48Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Mac48Address const &', 'value')])
+    return
+
+def register_Ns3MacLow_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLow::MacLow(ns3::MacLow const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLow const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLow::MacLow() [constructor]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::CalculateTransmissionTime(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr, ns3::MacLowTransmissionParameters const & parameters) const [member function]
+    cls.add_method('CalculateTransmissionTime', 
+                   'ns3::Time', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters const &', 'parameters')], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::CreateBlockAckAgreement(ns3::MgtAddBaResponseHeader const * respHdr, ns3::Mac48Address originator, uint16_t startingSeq) [member function]
+    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::DestroyBlockAckAgreement(ns3::Mac48Address originator, uint8_t tid) [member function]
+    cls.add_method('DestroyBlockAckAgreement', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'originator'), param('uint8_t', 'tid')])
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetAckTimeout() const [member function]
+    cls.add_method('GetAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLow::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetBasicBlockAckTimeout() const [member function]
+    cls.add_method('GetBasicBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLow::GetBssid() const [member function]
+    cls.add_method('GetBssid', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetCompressedBlockAckTimeout() const [member function]
+    cls.add_method('GetCompressedBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetCtsTimeout() const [member function]
+    cls.add_method('GetCtsTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::GetCtsToSelfSupported() const [member function]
+    cls.add_method('GetCtsToSelfSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetPifs() const [member function]
+    cls.add_method('GetPifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetRifs() const [member function]
+    cls.add_method('GetRifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetSifs() const [member function]
+    cls.add_method('GetSifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetSlotTime() const [member function]
+    cls.add_method('GetSlotTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::IsPromisc() const [member function]
+    cls.add_method('IsPromisc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::NotifySwitchingStartNow(ns3::Time duration) [member function]
+    cls.add_method('NotifySwitchingStartNow', 
+                   'void', 
+                   [param('ns3::Time', 'duration')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveError(ns3::Ptr<ns3::Packet const> packet, double rxSnr) [member function]
+    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) [member function]
+    cls.add_method('ReceiveOk', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+    cls.add_method('RegisterBlockAckListenerForAc', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
+    cls.add_method('RegisterDcfListener', 
+                   'void', 
+                   [param('ns3::MacLowDcfListener *', 'listener')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetAckTimeout(ns3::Time ackTimeout) [member function]
+    cls.add_method('SetAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ackTimeout')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetAddress(ns3::Mac48Address ad) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'ad')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetBasicBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetBasicBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetBssid(ns3::Mac48Address ad) [member function]
+    cls.add_method('SetBssid', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'ad')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetCompressedBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetCompressedBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetCtsTimeout(ns3::Time ctsTimeout) [member function]
+    cls.add_method('SetCtsTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ctsTimeout')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetCtsToSelfSupported(bool enable) [member function]
+    cls.add_method('SetCtsToSelfSupported', 
+                   'void', 
+                   [param('bool', 'enable')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetPhy(ns3::Ptr<ns3::WifiPhy> phy) [member function]
+    cls.add_method('SetPhy', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiPhy >', 'phy')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetPifs(ns3::Time pifs) [member function]
+    cls.add_method('SetPifs', 
+                   'void', 
+                   [param('ns3::Time', 'pifs')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetPromisc() [member function]
+    cls.add_method('SetPromisc', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetRifs(ns3::Time rifs) [member function]
+    cls.add_method('SetRifs', 
+                   'void', 
+                   [param('ns3::Time', 'rifs')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetRxCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, ns3::WifiMacHeader const*, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetRxCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::WifiMacHeader const *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetSifs(ns3::Time sifs) [member function]
+    cls.add_method('SetSifs', 
+                   'void', 
+                   [param('ns3::Time', 'sifs')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetSlotTime(ns3::Time slotTime) [member function]
+    cls.add_method('SetSlotTime', 
+                   'void', 
+                   [param('ns3::Time', 'slotTime')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> manager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'manager')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::StartTransmission(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr, ns3::MacLowTransmissionParameters parameters, ns3::MacLowTransmissionListener * listener) [member function]
+    cls.add_method('StartTransmission', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')])
+    ## mac-low.h (module 'wifi'): ns3::WifiTxVector ns3::MacLow::GetDataTxVector(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr) const [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   is_const=True, visibility='protected', is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3MgtBeaconHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtBeaconHeader::MgtBeaconHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtBeaconHeader::MgtBeaconHeader(ns3::MgtBeaconHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtBeaconHeader const &', 'arg0')])
+    return
+
+def register_Ns3NetDevice_methods(root_module, cls):
+    ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
+    cls.add_constructor([])
+    ## net-device.h (module 'network'): ns3::NetDevice::NetDevice(ns3::NetDevice const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NetDevice const &', 'arg0')])
+    ## net-device.h (module 'network'): void ns3::NetDevice::AddLinkChangeCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('AddLinkChangeCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetBroadcast() const [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Ptr<ns3::Channel> ns3::NetDevice::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::Channel >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): uint32_t ns3::NetDevice::GetIfIndex() const [member function]
+    cls.add_method('GetIfIndex', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): uint16_t ns3::NetDevice::GetMtu() const [member function]
+    cls.add_method('GetMtu', 
+                   'uint16_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv4Address multicastGroup) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv4Address', 'multicastGroup')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Ptr<ns3::Node> ns3::NetDevice::GetNode() const [member function]
+    cls.add_method('GetNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): static ns3::TypeId ns3::NetDevice::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsBridge() const [member function]
+    cls.add_method('IsBridge', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsLinkUp() const [member function]
+    cls.add_method('IsLinkUp', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsPointToPoint() const [member function]
+    cls.add_method('IsPointToPoint', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::NeedsArp() const [member function]
+    cls.add_method('NeedsArp', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('Send', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('SendFrom', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetIfIndex(uint32_t const index) [member function]
+    cls.add_method('SetIfIndex', 
+                   'void', 
+                   [param('uint32_t const', 'index')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SetMtu(uint16_t const mtu) [member function]
+    cls.add_method('SetMtu', 
+                   'bool', 
+                   [param('uint16_t const', 'mtu')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetNode(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('SetNode', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetPromiscReceiveCallback(ns3::Callback<bool,ns3::Ptr<ns3::NetDevice>,ns3::Ptr<const ns3::Packet>,short unsigned int,const ns3::Address&,const ns3::Address&,ns3::NetDevice::PacketType,ns3::empty,ns3::empty,ns3::empty> cb) [member function]
+    cls.add_method('SetPromiscReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, short unsigned int, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'cb')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetReceiveCallback(ns3::Callback<bool,ns3::Ptr<ns3::NetDevice>,ns3::Ptr<const ns3::Packet>,short unsigned int,const ns3::Address&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> cb) [member function]
+    cls.add_method('SetReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, short unsigned int, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'cb')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3NixVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## nix-vector.h (module 'network'): ns3::NixVector::NixVector() [constructor]
+    cls.add_constructor([])
+    ## nix-vector.h (module 'network'): ns3::NixVector::NixVector(ns3::NixVector const & o) [copy constructor]
+    cls.add_constructor([param('ns3::NixVector const &', 'o')])
+    ## nix-vector.h (module 'network'): void ns3::NixVector::AddNeighborIndex(uint32_t newBits, uint32_t numberOfBits) [member function]
+    cls.add_method('AddNeighborIndex', 
+                   'void', 
+                   [param('uint32_t', 'newBits'), param('uint32_t', 'numberOfBits')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::BitCount(uint32_t numberOfNeighbors) const [member function]
+    cls.add_method('BitCount', 
+                   'uint32_t', 
+                   [param('uint32_t', 'numberOfNeighbors')], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): ns3::Ptr<ns3::NixVector> ns3::NixVector::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::NixVector >', 
+                   [], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Deserialize(uint32_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint32_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::ExtractNeighborIndex(uint32_t numberOfBits) [member function]
+    cls.add_method('ExtractNeighborIndex', 
+                   'uint32_t', 
+                   [param('uint32_t', 'numberOfBits')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetRemainingBits() [member function]
+    cls.add_method('GetRemainingBits', 
+                   'uint32_t', 
+                   [])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Serialize(uint32_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint32_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3Node_methods(root_module, cls):
+    ## node.h (module 'network'): ns3::Node::Node(ns3::Node const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Node const &', 'arg0')])
+    ## node.h (module 'network'): ns3::Node::Node() [constructor]
+    cls.add_constructor([])
+    ## node.h (module 'network'): ns3::Node::Node(uint32_t systemId) [constructor]
+    cls.add_constructor([param('uint32_t', 'systemId')])
+    ## node.h (module 'network'): uint32_t ns3::Node::AddApplication(ns3::Ptr<ns3::Application> application) [member function]
+    cls.add_method('AddApplication', 
+                   'uint32_t', 
+                   [param('ns3::Ptr< ns3::Application >', 'application')])
+    ## node.h (module 'network'): uint32_t ns3::Node::AddDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
+    cls.add_method('AddDevice', 
+                   'uint32_t', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+    ## node.h (module 'network'): static bool ns3::Node::ChecksumEnabled() [member function]
+    cls.add_method('ChecksumEnabled', 
+                   'bool', 
+                   [], 
+                   is_static=True)
+    ## node.h (module 'network'): ns3::Ptr<ns3::Application> ns3::Node::GetApplication(uint32_t index) const [member function]
+    cls.add_method('GetApplication', 
+                   'ns3::Ptr< ns3::Application >', 
+                   [param('uint32_t', 'index')], 
+                   is_const=True)
+    ## node.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::Node::GetDevice(uint32_t index) const [member function]
+    cls.add_method('GetDevice', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [param('uint32_t', 'index')], 
+                   is_const=True)
+    ## node.h (module 'network'): uint32_t ns3::Node::GetId() const [member function]
+    cls.add_method('GetId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## node.h (module 'network'): uint32_t ns3::Node::GetNApplications() const [member function]
+    cls.add_method('GetNApplications', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## node.h (module 'network'): uint32_t ns3::Node::GetNDevices() const [member function]
+    cls.add_method('GetNDevices', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## node.h (module 'network'): uint32_t ns3::Node::GetSystemId() const [member function]
+    cls.add_method('GetSystemId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## node.h (module 'network'): static ns3::TypeId ns3::Node::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback<void,ns3::Ptr<ns3::NetDevice>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function]
+    cls.add_method('RegisterDeviceAdditionListener', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')])
+    ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback<void, 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> handler, uint16_t protocolType, ns3::Ptr<ns3::NetDevice> device, bool promiscuous=false) [member function]
+    cls.add_method('RegisterProtocolHandler', 
+                   'void', 
+                   [param('ns3::Callback< void, 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 >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')])
+    ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback<void,ns3::Ptr<ns3::NetDevice>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function]
+    cls.add_method('UnregisterDeviceAdditionListener', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')])
+    ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback<void, 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> handler) [member function]
+    cls.add_method('UnregisterProtocolHandler', 
+                   'void', 
+                   [param('ns3::Callback< void, 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 >', 'handler')])
+    ## node.h (module 'network'): void ns3::Node::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## node.h (module 'network'): void ns3::Node::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3NqosWaveMacHelper_methods(root_module, cls):
+    ## wave-mac-helper.h (module 'wave'): ns3::NqosWaveMacHelper::NqosWaveMacHelper(ns3::NqosWaveMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NqosWaveMacHelper const &', 'arg0')])
+    ## wave-mac-helper.h (module 'wave'): ns3::NqosWaveMacHelper::NqosWaveMacHelper() [constructor]
+    cls.add_constructor([])
+    ## wave-mac-helper.h (module 'wave'): static ns3::NqosWaveMacHelper ns3::NqosWaveMacHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::NqosWaveMacHelper', 
+                   [], 
+                   is_static=True)
+    ## wave-mac-helper.h (module 'wave'): void ns3::NqosWaveMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
+    return
+
+def register_Ns3ObjectFactoryChecker_methods(root_module, cls):
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')])
+    return
+
+def register_Ns3ObjectFactoryValue_methods(root_module, cls):
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor]
+    cls.add_constructor([param('ns3::ObjectFactory const &', 'value')])
+    ## object-factory.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::ObjectFactoryValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::ObjectFactory', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::ObjectFactory const &', 'value')])
+    return
+
+def register_Ns3OrganizationIdentifierChecker_methods(root_module, cls):
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierChecker::OrganizationIdentifierChecker() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierChecker::OrganizationIdentifierChecker(ns3::OrganizationIdentifierChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OrganizationIdentifierChecker const &', 'arg0')])
+    return
+
+def register_Ns3OrganizationIdentifierValue_methods(root_module, cls):
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierValue::OrganizationIdentifierValue() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierValue::OrganizationIdentifierValue(ns3::OrganizationIdentifierValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OrganizationIdentifierValue const &', 'arg0')])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierValue::OrganizationIdentifierValue(ns3::OrganizationIdentifier const & value) [constructor]
+    cls.add_constructor([param('ns3::OrganizationIdentifier const &', 'value')])
+    ## vendor-specific-action.h (module 'wave'): ns3::Ptr<ns3::AttributeValue> ns3::OrganizationIdentifierValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): bool ns3::OrganizationIdentifierValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier ns3::OrganizationIdentifierValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::OrganizationIdentifier', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): std::string ns3::OrganizationIdentifierValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::OrganizationIdentifierValue::Set(ns3::OrganizationIdentifier const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier const &', 'value')])
+    return
+
+def register_Ns3OutputStreamWrapper_methods(root_module, cls):
+    ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper::OutputStreamWrapper(ns3::OutputStreamWrapper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OutputStreamWrapper const &', 'arg0')])
+    ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper::OutputStreamWrapper(std::string filename, std::_Ios_Openmode filemode) [constructor]
+    cls.add_constructor([param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode')])
+    ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper::OutputStreamWrapper(std::ostream * os) [constructor]
+    cls.add_constructor([param('std::ostream *', 'os')])
+    ## output-stream-wrapper.h (module 'network'): std::ostream * ns3::OutputStreamWrapper::GetStream() [member function]
+    cls.add_method('GetStream', 
+                   'std::ostream *', 
+                   [])
+    return
+
+def register_Ns3Packet_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## packet.h (module 'network'): ns3::Packet::Packet() [constructor]
+    cls.add_constructor([])
+    ## packet.h (module 'network'): ns3::Packet::Packet(ns3::Packet const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Packet const &', 'o')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint32_t size) [constructor]
+    cls.add_constructor([param('uint32_t', 'size')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size, bool magic) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet.h (module 'network'): void ns3::Packet::AddByteTag(ns3::Tag const & tag) const [member function]
+    cls.add_method('AddByteTag', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::AddHeader(ns3::Header const & header) [member function]
+    cls.add_method('AddHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header')])
+    ## packet.h (module 'network'): void ns3::Packet::AddPacketTag(ns3::Tag const & tag) const [member function]
+    cls.add_method('AddPacketTag', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::AddPaddingAtEnd(uint32_t size) [member function]
+    cls.add_method('AddPaddingAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::AddTrailer(ns3::Trailer const & trailer) [member function]
+    cls.add_method('AddTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer')])
+    ## packet.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::Packet::BeginItem() const [member function]
+    cls.add_method('BeginItem', 
+                   'ns3::PacketMetadata::ItemIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::Packet> ns3::Packet::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::CopyData(uint8_t * buffer, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::CopyData(std::ostream * os, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'void', 
+                   [param('std::ostream *', 'os'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::Packet> ns3::Packet::CreateFragment(uint32_t start, uint32_t length) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
+                   is_const=True)
+    ## packet.h (module 'network'): static void ns3::Packet::EnableChecking() [member function]
+    cls.add_method('EnableChecking', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet.h (module 'network'): static void ns3::Packet::EnablePrinting() [member function]
+    cls.add_method('EnablePrinting', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet.h (module 'network'): bool ns3::Packet::FindFirstMatchingByteTag(ns3::Tag & tag) const [member function]
+    cls.add_method('FindFirstMatchingByteTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::ByteTagIterator ns3::Packet::GetByteTagIterator() const [member function]
+    cls.add_method('GetByteTagIterator', 
+                   'ns3::ByteTagIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::NixVector> ns3::Packet::GetNixVector() const [member function]
+    cls.add_method('GetNixVector', 
+                   'ns3::Ptr< ns3::NixVector >', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::PacketTagIterator ns3::Packet::GetPacketTagIterator() const [member function]
+    cls.add_method('GetPacketTagIterator', 
+                   'ns3::PacketTagIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint64_t ns3::Packet::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint8_t const * ns3::Packet::PeekData() const [member function]
+    cls.add_method('PeekData', 
+                   'uint8_t const *', 
+                   [], 
+                   deprecated=True, is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::PeekHeader(ns3::Header & header) const [member function]
+    cls.add_method('PeekHeader', 
+                   'uint32_t', 
+                   [param('ns3::Header &', 'header')], 
+                   is_const=True)
+    ## packet.h (module 'network'): bool ns3::Packet::PeekPacketTag(ns3::Tag & tag) const [member function]
+    cls.add_method('PeekPacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::PeekTrailer(ns3::Trailer & trailer) [member function]
+    cls.add_method('PeekTrailer', 
+                   'uint32_t', 
+                   [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): void ns3::Packet::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::PrintByteTags(std::ostream & os) const [member function]
+    cls.add_method('PrintByteTags', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::PrintPacketTags(std::ostream & os) const [member function]
+    cls.add_method('PrintPacketTags', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAllByteTags() [member function]
+    cls.add_method('RemoveAllByteTags', 
+                   'void', 
+                   [])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAllPacketTags() [member function]
+    cls.add_method('RemoveAllPacketTags', 
+                   'void', 
+                   [])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAtEnd(uint32_t size) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAtStart(uint32_t size) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveHeader(ns3::Header & header) [member function]
+    cls.add_method('RemoveHeader', 
+                   'uint32_t', 
+                   [param('ns3::Header &', 'header')])
+    ## packet.h (module 'network'): bool ns3::Packet::RemovePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('RemovePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveTrailer(ns3::Trailer & trailer) [member function]
+    cls.add_method('RemoveTrailer', 
+                   'uint32_t', 
+                   [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::SetNixVector(ns3::Ptr<ns3::NixVector> arg0) [member function]
+    cls.add_method('SetNixVector', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
+    return
+
+def register_Ns3PointerChecker_methods(root_module, cls):
+    ## pointer.h (module 'core'): ns3::PointerChecker::PointerChecker() [constructor]
+    cls.add_constructor([])
+    ## pointer.h (module 'core'): ns3::PointerChecker::PointerChecker(ns3::PointerChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointerChecker const &', 'arg0')])
+    ## pointer.h (module 'core'): ns3::TypeId ns3::PointerChecker::GetPointeeTypeId() const [member function]
+    cls.add_method('GetPointeeTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3PointerValue_methods(root_module, cls):
+    ## pointer.h (module 'core'): ns3::PointerValue::PointerValue(ns3::PointerValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointerValue const &', 'arg0')])
+    ## pointer.h (module 'core'): ns3::PointerValue::PointerValue() [constructor]
+    cls.add_constructor([])
+    ## pointer.h (module 'core'): ns3::PointerValue::PointerValue(ns3::Ptr<ns3::Object> object) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Object >', 'object')])
+    ## pointer.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::PointerValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## pointer.h (module 'core'): bool ns3::PointerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## pointer.h (module 'core'): ns3::Ptr<ns3::Object> ns3::PointerValue::GetObject() const [member function]
+    cls.add_method('GetObject', 
+                   'ns3::Ptr< ns3::Object >', 
+                   [], 
+                   is_const=True)
+    ## pointer.h (module 'core'): std::string ns3::PointerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## pointer.h (module 'core'): void ns3::PointerValue::SetObject(ns3::Ptr<ns3::Object> object) [member function]
+    cls.add_method('SetObject', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'object')])
+    return
+
+def register_Ns3QosWaveMacHelper_methods(root_module, cls):
+    ## wave-mac-helper.h (module 'wave'): ns3::QosWaveMacHelper::QosWaveMacHelper(ns3::QosWaveMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::QosWaveMacHelper const &', 'arg0')])
+    ## wave-mac-helper.h (module 'wave'): ns3::QosWaveMacHelper::QosWaveMacHelper() [constructor]
+    cls.add_constructor([])
+    ## wave-mac-helper.h (module 'wave'): static ns3::QosWaveMacHelper ns3::QosWaveMacHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::QosWaveMacHelper', 
+                   [], 
+                   is_static=True)
+    ## wave-mac-helper.h (module 'wave'): void ns3::QosWaveMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
+    return
+
+def register_Ns3RegularWifiMac_methods(root_module, cls):
+    ## regular-wifi-mac.h (module 'wifi'): static ns3::TypeId ns3::RegularWifiMac::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::RegularWifiMac::RegularWifiMac() [constructor]
+    cls.add_constructor([])
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetSlot(ns3::Time slotTime) [member function]
+    cls.add_method('SetSlot', 
+                   'void', 
+                   [param('ns3::Time', 'slotTime')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetSifs(ns3::Time sifs) [member function]
+    cls.add_method('SetSifs', 
+                   'void', 
+                   [param('ns3::Time', 'sifs')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetEifsNoDifs(ns3::Time eifsNoDifs) [member function]
+    cls.add_method('SetEifsNoDifs', 
+                   'void', 
+                   [param('ns3::Time', 'eifsNoDifs')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetPifs(ns3::Time pifs) [member function]
+    cls.add_method('SetPifs', 
+                   'void', 
+                   [param('ns3::Time', 'pifs')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetRifs(ns3::Time rifs) [member function]
+    cls.add_method('SetRifs', 
+                   'void', 
+                   [param('ns3::Time', 'rifs')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetCtsTimeout(ns3::Time ctsTimeout) [member function]
+    cls.add_method('SetCtsTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ctsTimeout')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetAckTimeout(ns3::Time ackTimeout) [member function]
+    cls.add_method('SetAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ackTimeout')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetRifs() const [member function]
+    cls.add_method('GetRifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetPifs() const [member function]
+    cls.add_method('GetPifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetSifs() const [member function]
+    cls.add_method('GetSifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetSlot() const [member function]
+    cls.add_method('GetSlot', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetEifsNoDifs() const [member function]
+    cls.add_method('GetEifsNoDifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetCtsTimeout() const [member function]
+    cls.add_method('GetCtsTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetAckTimeout() const [member function]
+    cls.add_method('GetAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetCtsToSelfSupported(bool enable) [member function]
+    cls.add_method('SetCtsToSelfSupported', 
+                   'void', 
+                   [param('bool', 'enable')])
+    ## regular-wifi-mac.h (module 'wifi'): bool ns3::RegularWifiMac::GetCtsToSelfSupported() const [member function]
+    cls.add_method('GetCtsToSelfSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Mac48Address ns3::RegularWifiMac::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ssid ns3::RegularWifiMac::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetAddress(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetBssid(ns3::Mac48Address bssid) [member function]
+    cls.add_method('SetBssid', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'bssid')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Mac48Address ns3::RegularWifiMac::GetBssid() const [member function]
+    cls.add_method('GetBssid', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetPromisc() [member function]
+    cls.add_method('SetPromisc', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to, ns3::Mac48Address from) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): bool ns3::RegularWifiMac::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetWifiPhy(ns3::Ptr<ns3::WifiPhy> phy) [member function]
+    cls.add_method('SetWifiPhy', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiPhy >', 'phy')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::WifiPhy> ns3::RegularWifiMac::GetWifiPhy() const [member function]
+    cls.add_method('GetWifiPhy', 
+                   'ns3::Ptr< ns3::WifiPhy >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> stationManager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'stationManager')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::WifiRemoteStationManager> ns3::RegularWifiMac::GetWifiRemoteStationManager() const [member function]
+    cls.add_method('GetWifiRemoteStationManager', 
+                   'ns3::Ptr< ns3::WifiRemoteStationManager >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetForwardUpCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, ns3::Mac48Address, ns3::Mac48Address, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> upCallback) [member function]
+    cls.add_method('SetForwardUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::Mac48Address, ns3::Mac48Address, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'upCallback')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetLinkUpCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkUp) [member function]
+    cls.add_method('SetLinkUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkUp')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetLinkDownCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkDown) [member function]
+    cls.add_method('SetLinkDownCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkDown')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetBasicBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetBasicBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetBasicBlockAckTimeout() const [member function]
+    cls.add_method('GetBasicBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetCompressedBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetCompressedBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetCompressedBlockAckTimeout() const [member function]
+    cls.add_method('GetCompressedBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::DcaTxop> ns3::RegularWifiMac::GetDcaTxop() const [member function]
+    cls.add_method('GetDcaTxop', 
+                   'ns3::Ptr< ns3::DcaTxop >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVOQueue() const [member function]
+    cls.add_method('GetVOQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVIQueue() const [member function]
+    cls.add_method('GetVIQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBEQueue() const [member function]
+    cls.add_method('GetBEQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBKQueue() const [member function]
+    cls.add_method('GetBKQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('FinishConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetTypeOfStation(ns3::TypeOfStation type) [member function]
+    cls.add_method('SetTypeOfStation', 
+                   'void', 
+                   [param('ns3::TypeOfStation', 'type')], 
+                   visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::Receive(ns3::Ptr<ns3::Packet> packet, ns3::WifiMacHeader const * hdr) [member function]
+    cls.add_method('Receive', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::TxOk(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('TxOk', 
+                   'void', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::TxFailed(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('TxFailed', 
+                   'void', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::ForwardUp(ns3::Ptr<ns3::Packet> packet, ns3::Mac48Address from, ns3::Mac48Address to) [member function]
+    cls.add_method('ForwardUp', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Mac48Address', 'from'), param('ns3::Mac48Address', 'to')], 
+                   visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::DeaggregateAmsduAndForward(ns3::Ptr<ns3::Packet> aggregatedPacket, ns3::WifiMacHeader const * hdr) [member function]
+    cls.add_method('DeaggregateAmsduAndForward', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SendAddBaResponse(ns3::MgtAddBaRequestHeader const * reqHdr, ns3::Mac48Address originator) [member function]
+    cls.add_method('SendAddBaResponse', 
+                   'void', 
+                   [param('ns3::MgtAddBaRequestHeader const *', 'reqHdr'), param('ns3::Mac48Address', 'originator')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetQosSupported(bool enable) [member function]
+    cls.add_method('SetQosSupported', 
+                   'void', 
+                   [param('bool', 'enable')], 
+                   visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): bool ns3::RegularWifiMac::GetQosSupported() const [member function]
+    cls.add_method('GetQosSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetHtSupported(bool enable) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('bool', 'enable')], 
+                   visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): bool ns3::RegularWifiMac::GetHtSupported() const [member function]
+    cls.add_method('GetHtSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    return
+
+def register_Ns3Ssid_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(ns3::Ssid const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ssid const &', 'arg0')])
+    ## ssid.h (module 'wifi'): ns3::Ssid::Ssid() [constructor]
+    cls.add_constructor([])
+    ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(std::string s) [constructor]
+    cls.add_constructor([param('std::string', 's')])
+    ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(char const * ssid, uint8_t length) [constructor]
+    cls.add_constructor([param('char const *', 'ssid'), param('uint8_t', 'length')])
+    ## ssid.h (module 'wifi'): uint8_t ns3::Ssid::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## ssid.h (module 'wifi'): ns3::WifiInformationElementId ns3::Ssid::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ssid.h (module 'wifi'): uint8_t ns3::Ssid::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ssid.h (module 'wifi'): bool ns3::Ssid::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ssid.h (module 'wifi'): bool ns3::Ssid::IsEqual(ns3::Ssid const & o) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ssid const &', 'o')], 
+                   is_const=True)
+    ## ssid.h (module 'wifi'): char * ns3::Ssid::PeekString() const [member function]
+    cls.add_method('PeekString', 
+                   'char *', 
+                   [], 
+                   is_const=True)
+    ## ssid.h (module 'wifi'): void ns3::Ssid::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    return
+
+def register_Ns3SsidChecker_methods(root_module, cls):
+    ## ssid.h (module 'wifi'): ns3::SsidChecker::SsidChecker() [constructor]
+    cls.add_constructor([])
+    ## ssid.h (module 'wifi'): ns3::SsidChecker::SsidChecker(ns3::SsidChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SsidChecker const &', 'arg0')])
+    return
+
+def register_Ns3SsidValue_methods(root_module, cls):
+    ## ssid.h (module 'wifi'): ns3::SsidValue::SsidValue() [constructor]
+    cls.add_constructor([])
+    ## ssid.h (module 'wifi'): ns3::SsidValue::SsidValue(ns3::SsidValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SsidValue const &', 'arg0')])
+    ## ssid.h (module 'wifi'): ns3::SsidValue::SsidValue(ns3::Ssid const & value) [constructor]
+    cls.add_constructor([param('ns3::Ssid const &', 'value')])
+    ## ssid.h (module 'wifi'): ns3::Ptr<ns3::AttributeValue> ns3::SsidValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ssid.h (module 'wifi'): bool ns3::SsidValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ssid.h (module 'wifi'): ns3::Ssid ns3::SsidValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True)
+    ## ssid.h (module 'wifi'): std::string ns3::SsidValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ssid.h (module 'wifi'): void ns3::SsidValue::Set(ns3::Ssid const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ssid const &', 'value')])
+    return
+
+def register_Ns3SupportedRates_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## supported-rates.h (module 'wifi'): ns3::SupportedRates::SupportedRates(ns3::SupportedRates const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SupportedRates const &', 'arg0')])
+    ## supported-rates.h (module 'wifi'): ns3::SupportedRates::SupportedRates() [constructor]
+    cls.add_constructor([])
+    ## supported-rates.h (module 'wifi'): void ns3::SupportedRates::AddSupportedRate(uint32_t bs) [member function]
+    cls.add_method('AddSupportedRate', 
+                   'void', 
+                   [param('uint32_t', 'bs')])
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::SupportedRates::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## supported-rates.h (module 'wifi'): ns3::WifiInformationElementId ns3::SupportedRates::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::SupportedRates::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::SupportedRates::GetNRates() const [member function]
+    cls.add_method('GetNRates', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): uint32_t ns3::SupportedRates::GetRate(uint8_t i) const [member function]
+    cls.add_method('GetRate', 
+                   'uint32_t', 
+                   [param('uint8_t', 'i')], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): bool ns3::SupportedRates::IsBasicRate(uint32_t bs) const [member function]
+    cls.add_method('IsBasicRate', 
+                   'bool', 
+                   [param('uint32_t', 'bs')], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): bool ns3::SupportedRates::IsSupportedRate(uint32_t bs) const [member function]
+    cls.add_method('IsSupportedRate', 
+                   'bool', 
+                   [param('uint32_t', 'bs')], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): void ns3::SupportedRates::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): void ns3::SupportedRates::SetBasicRate(uint32_t bs) [member function]
+    cls.add_method('SetBasicRate', 
+                   'void', 
+                   [param('uint32_t', 'bs')])
+    ## supported-rates.h (module 'wifi'): ns3::SupportedRates::extended [variable]
+    cls.add_instance_attribute('extended', 'ns3::ExtendedSupportedRatesIE', is_const=False)
+    return
+
+def register_Ns3TimeValue_methods(root_module, cls):
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
+    cls.add_constructor([])
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::TimeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TimeValue const &', 'arg0')])
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::Time const & value) [constructor]
+    cls.add_constructor([param('ns3::Time const &', 'value')])
+    ## nstime.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::TimeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## nstime.h (module 'core'): bool ns3::TimeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## nstime.h (module 'core'): ns3::Time ns3::TimeValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): std::string ns3::TimeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## nstime.h (module 'core'): void ns3::TimeValue::Set(ns3::Time const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Time const &', 'value')])
+    return
+
+def register_Ns3TypeIdChecker_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker(ns3::TypeIdChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeIdChecker const &', 'arg0')])
+    return
+
+def register_Ns3TypeIdValue_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue(ns3::TypeIdValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeIdValue const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue(ns3::TypeId const & value) [constructor]
+    cls.add_constructor([param('ns3::TypeId const &', 'value')])
+    ## type-id.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::TypeIdValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## type-id.h (module 'core'): bool ns3::TypeIdValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeIdValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeIdValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## type-id.h (module 'core'): void ns3::TypeIdValue::Set(ns3::TypeId const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::TypeId const &', 'value')])
+    return
+
+def register_Ns3UintegerValue_methods(root_module, cls):
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue() [constructor]
+    cls.add_constructor([])
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue(ns3::UintegerValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::UintegerValue const &', 'arg0')])
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue(uint64_t const & value) [constructor]
+    cls.add_constructor([param('uint64_t const &', 'value')])
+    ## uinteger.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::UintegerValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## uinteger.h (module 'core'): bool ns3::UintegerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## uinteger.h (module 'core'): uint64_t ns3::UintegerValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## uinteger.h (module 'core'): std::string ns3::UintegerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## uinteger.h (module 'core'): void ns3::UintegerValue::Set(uint64_t const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint64_t const &', 'value')])
+    return
+
+def register_Ns3WaveMacLow_methods(root_module, cls):
+    ## wave-mac-low.h (module 'wave'): ns3::WaveMacLow::WaveMacLow(ns3::WaveMacLow const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WaveMacLow const &', 'arg0')])
+    ## wave-mac-low.h (module 'wave'): ns3::WaveMacLow::WaveMacLow() [constructor]
+    cls.add_constructor([])
+    ## wave-mac-low.h (module 'wave'): static ns3::TypeId ns3::WaveMacLow::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wave-mac-low.h (module 'wave'): ns3::WifiTxVector ns3::WaveMacLow::GetDataTxVector(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr) const [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3WifiModeChecker_methods(root_module, cls):
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeChecker::WifiModeChecker() [constructor]
+    cls.add_constructor([])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeChecker::WifiModeChecker(ns3::WifiModeChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiModeChecker const &', 'arg0')])
+    return
+
+def register_Ns3WifiModeValue_methods(root_module, cls):
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeValue::WifiModeValue() [constructor]
+    cls.add_constructor([])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeValue::WifiModeValue(ns3::WifiModeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiModeValue const &', 'arg0')])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeValue::WifiModeValue(ns3::WifiMode const & value) [constructor]
+    cls.add_constructor([param('ns3::WifiMode const &', 'value')])
+    ## wifi-mode.h (module 'wifi'): ns3::Ptr<ns3::AttributeValue> ns3::WifiModeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mode.h (module 'wifi'): bool ns3::WifiModeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode ns3::WifiModeValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): std::string ns3::WifiModeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mode.h (module 'wifi'): void ns3::WifiModeValue::Set(ns3::WifiMode const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::WifiMode const &', 'value')])
+    return
+
+def register_Ns3AddressChecker_methods(root_module, cls):
+    ## address.h (module 'network'): ns3::AddressChecker::AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::AddressChecker::AddressChecker(ns3::AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3AddressValue_methods(root_module, cls):
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue(ns3::AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AddressValue const &', 'arg0')])
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue(ns3::Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Address const &', 'value')])
+    ## address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## address.h (module 'network'): bool ns3::AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## address.h (module 'network'): ns3::Address ns3::AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Address', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): std::string ns3::AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## address.h (module 'network'): void ns3::AddressValue::Set(ns3::Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Address const &', 'value')])
+    return
+
+def register_Ns3DcaTxop_methods(root_module, cls):
+    ## dca-txop.h (module 'wifi'): static ns3::TypeId ns3::DcaTxop::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## dca-txop.h (module 'wifi'): ns3::DcaTxop::DcaTxop() [constructor]
+    cls.add_constructor([])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetLow(ns3::Ptr<ns3::MacLow> low) [member function]
+    cls.add_method('SetLow', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MacLow >', 'low')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetManager(ns3::DcfManager * manager) [member function]
+    cls.add_method('SetManager', 
+                   'void', 
+                   [param('ns3::DcfManager *', 'manager')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> remoteManager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'remoteManager')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetTxOkCallback(ns3::Callback<void, ns3::WifiMacHeader const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetTxOkCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::WifiMacHeader const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetTxFailedCallback(ns3::Callback<void, ns3::WifiMacHeader const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetTxFailedCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::WifiMacHeader const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## dca-txop.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::DcaTxop::GetQueue() const [member function]
+    cls.add_method('GetQueue', 
+                   'ns3::Ptr< ns3::WifiMacQueue >', 
+                   [], 
+                   is_const=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetMinCw(uint32_t minCw) [member function]
+    cls.add_method('SetMinCw', 
+                   'void', 
+                   [param('uint32_t', 'minCw')], 
+                   is_virtual=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetMaxCw(uint32_t maxCw) [member function]
+    cls.add_method('SetMaxCw', 
+                   'void', 
+                   [param('uint32_t', 'maxCw')], 
+                   is_virtual=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetAifsn(uint32_t aifsn) [member function]
+    cls.add_method('SetAifsn', 
+                   'void', 
+                   [param('uint32_t', 'aifsn')], 
+                   is_virtual=True)
+    ## dca-txop.h (module 'wifi'): uint32_t ns3::DcaTxop::GetMinCw() const [member function]
+    cls.add_method('GetMinCw', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## dca-txop.h (module 'wifi'): uint32_t ns3::DcaTxop::GetMaxCw() const [member function]
+    cls.add_method('GetMaxCw', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## dca-txop.h (module 'wifi'): uint32_t ns3::DcaTxop::GetAifsn() const [member function]
+    cls.add_method('GetAifsn', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::Queue(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('Queue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## dca-txop.h (module 'wifi'): int64_t ns3::DcaTxop::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3OcbWifiMac_methods(root_module, cls):
+    ## ocb-wifi-mac.h (module 'wave'): static ns3::TypeId ns3::OcbWifiMac::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ocb-wifi-mac.h (module 'wave'): ns3::OcbWifiMac::OcbWifiMac() [constructor]
+    cls.add_constructor([])
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SendVsc(ns3::Ptr<ns3::Packet> vsc, ns3::Mac48Address peer, ns3::OrganizationIdentifier oi) [member function]
+    cls.add_method('SendVsc', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'vsc'), param('ns3::Mac48Address', 'peer'), param('ns3::OrganizationIdentifier', 'oi')])
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::AddReceiveVscCallback(ns3::OrganizationIdentifier oi, ns3::VscCallback cb) [member function]
+    cls.add_method('AddReceiveVscCallback', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier', 'oi'), param('ns3::VscCallback', 'cb')])
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::RemoveReceiveVscCallback(ns3::OrganizationIdentifier oi) [member function]
+    cls.add_method('RemoveReceiveVscCallback', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier', 'oi')])
+    ## ocb-wifi-mac.h (module 'wave'): ns3::Ssid ns3::OcbWifiMac::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SetBssid(ns3::Mac48Address bssid) [member function]
+    cls.add_method('SetBssid', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'bssid')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): ns3::Mac48Address ns3::OcbWifiMac::GetBssid() const [member function]
+    cls.add_method('GetBssid', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SetLinkUpCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkUp) [member function]
+    cls.add_method('SetLinkUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkUp')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SetLinkDownCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkDown) [member function]
+    cls.add_method('SetLinkDownCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkDown')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::ConfigureEdca(uint32_t cwmin, uint32_t cwmax, uint32_t aifsn, ns3::AcIndex ac) [member function]
+    cls.add_method('ConfigureEdca', 
+                   'void', 
+                   [param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('uint32_t', 'aifsn'), param('ns3::AcIndex', 'ac')])
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('FinishConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   visibility='protected', is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::Receive(ns3::Ptr<ns3::Packet> packet, ns3::WifiMacHeader const * hdr) [member function]
+    cls.add_method('Receive', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_functions(root_module):
+    module = root_module
+    ## vendor-specific-action.h (module 'wave'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeOrganizationIdentifierChecker() [free function]
+    module.add_function('MakeOrganizationIdentifierChecker', 
+                        'ns3::Ptr< ns3::AttributeChecker const >', 
+                        [])
+    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
+    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
+    return
+
+def register_functions_ns3_FatalImpl(module, root_module):
+    return
+
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
+def register_functions_ns3_internal(module, root_module):
+    return
+
+def main():
+    out = FileCodeSink(sys.stdout)
+    root_module = module_init()
+    register_types(root_module)
+    register_methods(root_module)
+    register_functions(root_module)
+    root_module.generate(out)
+
+if __name__ == '__main__':
+    main()
+
diff -Naur ns-3.18.1/src/wave/bindings/modulegen__gcc_LP64.py ns-3.19/src/wave/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/wave/bindings/modulegen__gcc_LP64.py	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,9928 @@
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
+
+
+import pybindgen.settings
+import warnings
+
+class ErrorHandler(pybindgen.settings.ErrorHandler):
+    def handle_error(self, wrapper, exception, traceback_):
+        warnings.warn("exception %r in wrapper %s" % (exception, wrapper))
+        return True
+pybindgen.settings.error_handler = ErrorHandler()
+
+
+import sys
+
+def module_init():
+    root_module = Module('ns.wave', cpp_namespace='::ns3')
+    return root_module
+
+def register_types(module):
+    root_module = module.get_root()
+    
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration]
+    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
+    ## wifi-preamble.h (module 'wifi'): ns3::WifiPreamble [enumeration]
+    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT', 'WIFI_PREAMBLE_HT_MF', 'WIFI_PREAMBLE_HT_GF'], import_from_module='ns.wifi')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
+    module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')
+    ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
+    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
+    ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
+    module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'], import_from_module='ns.wifi')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
+    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
+    ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration]
+    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'], import_from_module='ns.wifi')
+    ## ctrl-headers.h (module 'wifi'): ns3::BlockAckType [enumeration]
+    module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'], import_from_module='ns.wifi')
+    ## address.h (module 'network'): ns3::Address [class]
+    module.add_class('Address', import_from_module='ns.network')
+    ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
+    module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelper [class]
+    module.add_class('AsciiTraceHelper', import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelperForDevice [class]
+    module.add_class('AsciiTraceHelperForDevice', allow_subclassing=True, import_from_module='ns.network')
+    ## 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]
+    module.add_class('Item', import_from_module='ns.core', outer_class=root_module['ns3::AttributeConstructionList'])
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar [struct]
+    module.add_class('Bar', import_from_module='ns.wifi')
+    ## block-ack-agreement.h (module 'wifi'): ns3::BlockAckAgreement [class]
+    module.add_class('BlockAckAgreement', import_from_module='ns.wifi')
+    ## block-ack-cache.h (module 'wifi'): ns3::BlockAckCache [class]
+    module.add_class('BlockAckCache', import_from_module='ns.wifi')
+    ## block-ack-manager.h (module 'wifi'): ns3::BlockAckManager [class]
+    module.add_class('BlockAckManager', import_from_module='ns.wifi')
+    ## buffer.h (module 'network'): ns3::Buffer [class]
+    module.add_class('Buffer', import_from_module='ns.network')
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator [class]
+    module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::Buffer'])
+    ## packet.h (module 'network'): ns3::ByteTagIterator [class]
+    module.add_class('ByteTagIterator', import_from_module='ns.network')
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item [class]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagIterator'])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList [class]
+    module.add_class('ByteTagList', import_from_module='ns.network')
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator [class]
+    module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList'])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item [struct]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList::Iterator'])
+    ## callback.h (module 'core'): ns3::CallbackBase [class]
+    module.add_class('CallbackBase', import_from_module='ns.core')
+    ## capability-information.h (module 'wifi'): ns3::CapabilityInformation [class]
+    module.add_class('CapabilityInformation', import_from_module='ns.wifi')
+    ## event-id.h (module 'core'): ns3::EventId [class]
+    module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
+    module.add_class('Ipv4Address', import_from_module='ns.network')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
+    root_module['ns3::Ipv4Address'].implicitly_converts_to(root_module['ns3::Address'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask [class]
+    module.add_class('Ipv4Mask', import_from_module='ns.network')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address [class]
+    module.add_class('Ipv6Address', import_from_module='ns.network')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address [class]
+    root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix [class]
+    module.add_class('Ipv6Prefix', import_from_module='ns.network')
+    ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
+    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::MacLowDcfListener [class]
+    module.add_class('MacLowDcfListener', allow_subclassing=True, import_from_module='ns.wifi')
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener [class]
+    module.add_class('MacLowTransmissionListener', allow_subclassing=True, import_from_module='ns.wifi')
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionParameters [class]
+    module.add_class('MacLowTransmissionParameters', import_from_module='ns.wifi')
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer [class]
+    module.add_class('NetDeviceContainer', import_from_module='ns.network')
+    ## node-container.h (module 'network'): ns3::NodeContainer [class]
+    module.add_class('NodeContainer', import_from_module='ns.network')
+    ## object-base.h (module 'core'): ns3::ObjectBase [class]
+    module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core')
+    ## object.h (module 'core'): ns3::ObjectDeleter [struct]
+    module.add_class('ObjectDeleter', import_from_module='ns.core')
+    ## object-factory.h (module 'core'): ns3::ObjectFactory [class]
+    module.add_class('ObjectFactory', import_from_module='ns.core')
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier [class]
+    module.add_class('OrganizationIdentifier')
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifierType [enumeration]
+    module.add_enum('OrganizationIdentifierType', ['OUI24', 'OUI36', 'Unknown'], outer_class=root_module['ns3::OrganizationIdentifier'])
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement [class]
+    module.add_class('OriginatorBlockAckAgreement', import_from_module='ns.wifi', parent=root_module['ns3::BlockAckAgreement'])
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement::State [enumeration]
+    module.add_enum('State', ['PENDING', 'ESTABLISHED', 'INACTIVE', 'UNSUCCESSFUL'], outer_class=root_module['ns3::OriginatorBlockAckAgreement'], import_from_module='ns.wifi')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class]
+    module.add_class('PacketMetadata', import_from_module='ns.network')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata'])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [enumeration]
+    module.add_enum('', ['PAYLOAD', 'HEADER', 'TRAILER'], outer_class=root_module['ns3::PacketMetadata::Item'], import_from_module='ns.network')
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator [class]
+    module.add_class('ItemIterator', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata'])
+    ## packet.h (module 'network'): ns3::PacketTagIterator [class]
+    module.add_class('PacketTagIterator', import_from_module='ns.network')
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item [class]
+    module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagIterator'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList [class]
+    module.add_class('PacketTagList', import_from_module='ns.network')
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
+    module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
+    ## pcap-file.h (module 'network'): ns3::PcapFile [class]
+    module.add_class('PcapFile', import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
+    module.add_class('PcapHelper', import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::PcapHelper [enumeration]
+    module.add_enum('', ['DLT_NULL', 'DLT_EN10MB', 'DLT_PPP', 'DLT_RAW', 'DLT_IEEE802_11', 'DLT_PRISM_HEADER', 'DLT_IEEE802_11_RADIO'], outer_class=root_module['ns3::PcapHelper'], import_from_module='ns.network')
+    ## trace-helper.h (module 'network'): ns3::PcapHelperForDevice [class]
+    module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network')
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simulator.h (module 'core'): ns3::Simulator [class]
+    module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core')
+    ## status-code.h (module 'wifi'): ns3::StatusCode [class]
+    module.add_class('StatusCode', import_from_module='ns.wifi')
+    ## tag.h (module 'network'): ns3::Tag [class]
+    module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer [class]
+    module.add_class('TagBuffer', import_from_module='ns.network')
+    ## type-id.h (module 'core'): ns3::TypeId [class]
+    module.add_class('TypeId', import_from_module='ns.core')
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]
+    module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation [struct]
+    module.add_class('AttributeInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]
+    module.add_class('TraceSourceInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificContentManager [class]
+    module.add_class('VendorSpecificContentManager')
+    ## wifi-helper.h (module 'wifi'): ns3::WifiHelper [class]
+    module.add_class('WifiHelper', allow_subclassing=True, import_from_module='ns.wifi')
+    ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper [class]
+    module.add_class('WifiMacHelper', allow_subclassing=True, import_from_module='ns.wifi')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode [class]
+    module.add_class('WifiMode', import_from_module='ns.wifi')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeFactory [class]
+    module.add_class('WifiModeFactory', import_from_module='ns.wifi')
+    ## wifi-helper.h (module 'wifi'): ns3::WifiPhyHelper [class]
+    module.add_class('WifiPhyHelper', allow_subclassing=True, import_from_module='ns.wifi')
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhyListener [class]
+    module.add_class('WifiPhyListener', allow_subclassing=True, import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation [struct]
+    module.add_class('WifiRemoteStation', import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo [class]
+    module.add_class('WifiRemoteStationInfo', import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState [struct]
+    module.add_class('WifiRemoteStationState', import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState [enumeration]
+    module.add_enum('', ['BRAND_NEW', 'DISASSOC', 'WAIT_ASSOC_TX_OK', 'GOT_ASSOC_TX_OK'], outer_class=root_module['ns3::WifiRemoteStationState'], import_from_module='ns.wifi')
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector [class]
+    module.add_class('WifiTxVector', import_from_module='ns.wifi')
+    ## empty.h (module 'core'): ns3::empty [class]
+    module.add_class('empty', import_from_module='ns.core')
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t [class]
+    module.add_class('int64x64_t', import_from_module='ns.core')
+    ## chunk.h (module 'network'): ns3::Chunk [class]
+    module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
+    ## header.h (module 'network'): ns3::Header [class]
+    module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
+    ## higher-tx-tag.h (module 'wave'): ns3::HigherDataTxVectorTag [class]
+    module.add_class('HigherDataTxVectorTag', parent=root_module['ns3::Tag'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaRequestHeader [class]
+    module.add_class('MgtAddBaRequestHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaResponseHeader [class]
+    module.add_class('MgtAddBaResponseHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocRequestHeader [class]
+    module.add_class('MgtAssocRequestHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocResponseHeader [class]
+    module.add_class('MgtAssocResponseHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtDelBaHeader [class]
+    module.add_class('MgtDelBaHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeRequestHeader [class]
+    module.add_class('MgtProbeRequestHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeResponseHeader [class]
+    module.add_class('MgtProbeResponseHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::NqosWifiMacHelper [class]
+    module.add_class('NqosWifiMacHelper', import_from_module='ns.wifi', parent=root_module['ns3::WifiMacHelper'])
+    ## object.h (module 'core'): ns3::Object [class]
+    module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator [class]
+    module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object'])
+    ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper [class]
+    module.add_class('PcapFileWrapper', import_from_module='ns.network', parent=root_module['ns3::Object'])
+    ## qos-wifi-mac-helper.h (module 'wifi'): ns3::QosWifiMacHelper [class]
+    module.add_class('QosWifiMacHelper', import_from_module='ns.wifi', parent=root_module['ns3::WifiMacHelper'])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeChecker', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeChecker>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::OutputStreamWrapper', 'ns3::empty', 'ns3::DefaultDeleter<ns3::OutputStreamWrapper>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Packet>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::WifiInformationElement', 'ns3::empty', 'ns3::DefaultDeleter<ns3::WifiInformationElement>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## nstime.h (module 'core'): ns3::Time [class]
+    module.add_class('Time', import_from_module='ns.core')
+    ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    ## nstime.h (module 'core'): ns3::Time [class]
+    root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
+    module.add_class('TraceSourceAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
+    ## trailer.h (module 'network'): ns3::Trailer [class]
+    module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificActionHeader [class]
+    module.add_class('VendorSpecificActionHeader', parent=root_module['ns3::Header'])
+    ## wifi-80211p-helper.h (module 'wave'): ns3::Wifi80211pHelper [class]
+    module.add_class('Wifi80211pHelper', parent=root_module['ns3::WifiHelper'])
+    ## 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')
+    ## 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]
+    module.add_class('ActionValue', import_from_module='ns.wifi', outer_class=root_module['ns3::WifiActionHeader'])
+    ## wifi-information-element.h (module 'wifi'): ns3::WifiInformationElement [class]
+    module.add_class('WifiInformationElement', import_from_module='ns.wifi', parent=root_module['ns3::SimpleRefCount< ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >'])
+    ## wifi-mac.h (module 'wifi'): ns3::WifiMac [class]
+    module.add_class('WifiMac', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader [class]
+    module.add_class('WifiMacHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::QosAckPolicy [enumeration]
+    module.add_enum('QosAckPolicy', ['NORMAL_ACK', 'NO_ACK', 'NO_EXPLICIT_ACK', 'BLOCK_ACK'], outer_class=root_module['ns3::WifiMacHeader'], import_from_module='ns.wifi')
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::AddressType [enumeration]
+    module.add_enum('AddressType', ['ADDR1', 'ADDR2', 'ADDR3', 'ADDR4'], outer_class=root_module['ns3::WifiMacHeader'], import_from_module='ns.wifi')
+    ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue [class]
+    module.add_class('WifiMacQueue', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhy [class]
+    module.add_class('WifiPhy', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhy::State [enumeration]
+    module.add_enum('State', ['IDLE', 'CCA_BUSY', 'TX', 'RX', 'SWITCHING'], outer_class=root_module['ns3::WifiPhy'], import_from_module='ns.wifi')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationManager [class]
+    module.add_class('WifiRemoteStationManager', import_from_module='ns.wifi', 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]
+    module.add_class('AttributeChecker', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
+    ## attribute.h (module 'core'): ns3::AttributeValue [class]
+    module.add_class('AttributeValue', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
+    ## callback.h (module 'core'): ns3::CallbackChecker [class]
+    module.add_class('CallbackChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## callback.h (module 'core'): ns3::CallbackImplBase [class]
+    module.add_class('CallbackImplBase', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    ## callback.h (module 'core'): ns3::CallbackValue [class]
+    module.add_class('CallbackValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckRequestHeader [class]
+    module.add_class('CtrlBAckRequestHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckResponseHeader [class]
+    module.add_class('CtrlBAckResponseHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## dcf.h (module 'wifi'): ns3::Dcf [class]
+    module.add_class('Dcf', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## edca-txop-n.h (module 'wifi'): ns3::EdcaTxopN [class]
+    module.add_class('EdcaTxopN', import_from_module='ns.wifi', parent=root_module['ns3::Dcf'])
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
+    module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## event-impl.h (module 'core'): ns3::EventImpl [class]
+    module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    ## supported-rates.h (module 'wifi'): ns3::ExtendedSupportedRatesIE [class]
+    module.add_class('ExtendedSupportedRatesIE', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities [class]
+    module.add_class('HtCapabilities', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker [class]
+    module.add_class('HtCapabilitiesChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue [class]
+    module.add_class('HtCapabilitiesValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class]
+    module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class]
+    module.add_class('Ipv4AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker [class]
+    module.add_class('Ipv4MaskChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue [class]
+    module.add_class('Ipv4MaskValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker [class]
+    module.add_class('Ipv6AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue [class]
+    module.add_class('Ipv6AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker [class]
+    module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class]
+    module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class]
+    module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class]
+    module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## mac-low.h (module 'wifi'): ns3::MacLow [class]
+    module.add_class('MacLow', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtBeaconHeader [class]
+    module.add_class('MgtBeaconHeader', import_from_module='ns.wifi', parent=root_module['ns3::MgtProbeResponseHeader'])
+    ## 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]
+    module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network')
+    ## nix-vector.h (module 'network'): ns3::NixVector [class]
+    module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    ## node.h (module 'network'): ns3::Node [class]
+    module.add_class('Node', import_from_module='ns.network', parent=root_module['ns3::Object'])
+    ## wave-mac-helper.h (module 'wave'): ns3::NqosWaveMacHelper [class]
+    module.add_class('NqosWaveMacHelper', parent=root_module['ns3::NqosWifiMacHelper'])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class]
+    module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class]
+    module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierChecker [class]
+    module.add_class('OrganizationIdentifierChecker', parent=root_module['ns3::AttributeChecker'])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierValue [class]
+    module.add_class('OrganizationIdentifierValue', parent=root_module['ns3::AttributeValue'])
+    ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper [class]
+    module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
+    ## packet.h (module 'network'): ns3::Packet [class]
+    module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
+    ## pointer.h (module 'core'): ns3::PointerChecker [class]
+    module.add_class('PointerChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## pointer.h (module 'core'): ns3::PointerValue [class]
+    module.add_class('PointerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## wave-mac-helper.h (module 'wave'): ns3::QosWaveMacHelper [class]
+    module.add_class('QosWaveMacHelper', parent=root_module['ns3::QosWifiMacHelper'])
+    ## regular-wifi-mac.h (module 'wifi'): ns3::RegularWifiMac [class]
+    module.add_class('RegularWifiMac', import_from_module='ns.wifi', parent=root_module['ns3::WifiMac'])
+    ## ssid.h (module 'wifi'): ns3::Ssid [class]
+    module.add_class('Ssid', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## ssid.h (module 'wifi'): ns3::SsidChecker [class]
+    module.add_class('SsidChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker'])
+    ## ssid.h (module 'wifi'): ns3::SsidValue [class]
+    module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
+    ## supported-rates.h (module 'wifi'): ns3::SupportedRates [class]
+    module.add_class('SupportedRates', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## nstime.h (module 'core'): ns3::TimeValue [class]
+    module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
+    module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## type-id.h (module 'core'): ns3::TypeIdValue [class]
+    module.add_class('TypeIdValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## uinteger.h (module 'core'): ns3::UintegerValue [class]
+    module.add_class('UintegerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## wave-mac-low.h (module 'wave'): ns3::WaveMacLow [class]
+    module.add_class('WaveMacLow', parent=root_module['ns3::MacLow'])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeChecker [class]
+    module.add_class('WifiModeChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker'])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeValue [class]
+    module.add_class('WifiModeValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
+    ## address.h (module 'network'): ns3::AddressChecker [class]
+    module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## address.h (module 'network'): ns3::AddressValue [class]
+    module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## dca-txop.h (module 'wifi'): ns3::DcaTxop [class]
+    module.add_class('DcaTxop', import_from_module='ns.wifi', parent=root_module['ns3::Dcf'])
+    ## ocb-wifi-mac.h (module 'wave'): ns3::OcbWifiMac [class]
+    module.add_class('OcbWifiMac', parent=root_module['ns3::RegularWifiMac'])
+    module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector')
+    module.add_container('ns3::WifiMcsList', 'unsigned char', container_type='vector')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >', 'ns3::WifiMcsList')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >*', 'ns3::WifiMcsList*')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >&', 'ns3::WifiMcsList&')
+    typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId')
+    typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*')
+    typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&')
+    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::VscCallback')
+    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::VscCallback*')
+    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::VscCallback&')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&')
+    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList')
+    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*')
+    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >', 'ns3::WifiMcsListIterator')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >*', 'ns3::WifiMcsListIterator*')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >&', 'ns3::WifiMcsListIterator&')
+    
+    ## Register a nested module for the namespace FatalImpl
+    
+    nested_module = module.add_cpp_namespace('FatalImpl')
+    register_types_ns3_FatalImpl(nested_module)
+    
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
+    ## Register a nested module for the namespace internal
+    
+    nested_module = module.add_cpp_namespace('internal')
+    register_types_ns3_internal(nested_module)
+    
+
+def register_types_ns3_FatalImpl(module):
+    root_module = module.get_root()
+    
+
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
+def register_types_ns3_internal(module):
+    root_module = module.get_root()
+    
+
+def register_methods(root_module):
+    register_Ns3Address_methods(root_module, root_module['ns3::Address'])
+    register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
+    register_Ns3AsciiTraceHelperForDevice_methods(root_module, root_module['ns3::AsciiTraceHelperForDevice'])
+    register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
+    register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
+    register_Ns3Bar_methods(root_module, root_module['ns3::Bar'])
+    register_Ns3BlockAckAgreement_methods(root_module, root_module['ns3::BlockAckAgreement'])
+    register_Ns3BlockAckCache_methods(root_module, root_module['ns3::BlockAckCache'])
+    register_Ns3BlockAckManager_methods(root_module, root_module['ns3::BlockAckManager'])
+    register_Ns3Buffer_methods(root_module, root_module['ns3::Buffer'])
+    register_Ns3BufferIterator_methods(root_module, root_module['ns3::Buffer::Iterator'])
+    register_Ns3ByteTagIterator_methods(root_module, root_module['ns3::ByteTagIterator'])
+    register_Ns3ByteTagIteratorItem_methods(root_module, root_module['ns3::ByteTagIterator::Item'])
+    register_Ns3ByteTagList_methods(root_module, root_module['ns3::ByteTagList'])
+    register_Ns3ByteTagListIterator_methods(root_module, root_module['ns3::ByteTagList::Iterator'])
+    register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
+    register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
+    register_Ns3CapabilityInformation_methods(root_module, root_module['ns3::CapabilityInformation'])
+    register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    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'])
+    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_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'])
+    register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])
+    register_Ns3NodeContainer_methods(root_module, root_module['ns3::NodeContainer'])
+    register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
+    register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
+    register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
+    register_Ns3OrganizationIdentifier_methods(root_module, root_module['ns3::OrganizationIdentifier'])
+    register_Ns3OriginatorBlockAckAgreement_methods(root_module, root_module['ns3::OriginatorBlockAckAgreement'])
+    register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata'])
+    register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item'])
+    register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator'])
+    register_Ns3PacketTagIterator_methods(root_module, root_module['ns3::PacketTagIterator'])
+    register_Ns3PacketTagIteratorItem_methods(root_module, root_module['ns3::PacketTagIterator::Item'])
+    register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList'])
+    register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData'])
+    register_Ns3PcapFile_methods(root_module, root_module['ns3::PcapFile'])
+    register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper'])
+    register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice'])
+    register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
+    register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator'])
+    register_Ns3StatusCode_methods(root_module, root_module['ns3::StatusCode'])
+    register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
+    register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
+    register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
+    register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation'])
+    register_Ns3TypeIdTraceSourceInformation_methods(root_module, root_module['ns3::TypeId::TraceSourceInformation'])
+    register_Ns3VendorSpecificContentManager_methods(root_module, root_module['ns3::VendorSpecificContentManager'])
+    register_Ns3WifiHelper_methods(root_module, root_module['ns3::WifiHelper'])
+    register_Ns3WifiMacHelper_methods(root_module, root_module['ns3::WifiMacHelper'])
+    register_Ns3WifiMode_methods(root_module, root_module['ns3::WifiMode'])
+    register_Ns3WifiModeFactory_methods(root_module, root_module['ns3::WifiModeFactory'])
+    register_Ns3WifiPhyHelper_methods(root_module, root_module['ns3::WifiPhyHelper'])
+    register_Ns3WifiPhyListener_methods(root_module, root_module['ns3::WifiPhyListener'])
+    register_Ns3WifiRemoteStation_methods(root_module, root_module['ns3::WifiRemoteStation'])
+    register_Ns3WifiRemoteStationInfo_methods(root_module, root_module['ns3::WifiRemoteStationInfo'])
+    register_Ns3WifiRemoteStationState_methods(root_module, root_module['ns3::WifiRemoteStationState'])
+    register_Ns3WifiTxVector_methods(root_module, root_module['ns3::WifiTxVector'])
+    register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
+    register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t'])
+    register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
+    register_Ns3Header_methods(root_module, root_module['ns3::Header'])
+    register_Ns3HigherDataTxVectorTag_methods(root_module, root_module['ns3::HigherDataTxVectorTag'])
+    register_Ns3MgtAddBaRequestHeader_methods(root_module, root_module['ns3::MgtAddBaRequestHeader'])
+    register_Ns3MgtAddBaResponseHeader_methods(root_module, root_module['ns3::MgtAddBaResponseHeader'])
+    register_Ns3MgtAssocRequestHeader_methods(root_module, root_module['ns3::MgtAssocRequestHeader'])
+    register_Ns3MgtAssocResponseHeader_methods(root_module, root_module['ns3::MgtAssocResponseHeader'])
+    register_Ns3MgtDelBaHeader_methods(root_module, root_module['ns3::MgtDelBaHeader'])
+    register_Ns3MgtProbeRequestHeader_methods(root_module, root_module['ns3::MgtProbeRequestHeader'])
+    register_Ns3MgtProbeResponseHeader_methods(root_module, root_module['ns3::MgtProbeResponseHeader'])
+    register_Ns3NqosWifiMacHelper_methods(root_module, root_module['ns3::NqosWifiMacHelper'])
+    register_Ns3Object_methods(root_module, root_module['ns3::Object'])
+    register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator'])
+    register_Ns3PcapFileWrapper_methods(root_module, root_module['ns3::PcapFileWrapper'])
+    register_Ns3QosWifiMacHelper_methods(root_module, root_module['ns3::QosWifiMacHelper'])
+    register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
+    register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
+    register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
+    register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
+    register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
+    register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
+    register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
+    register_Ns3SimpleRefCount__Ns3WifiInformationElement_Ns3Empty_Ns3DefaultDeleter__lt__ns3WifiInformationElement__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >'])
+    register_Ns3Time_methods(root_module, root_module['ns3::Time'])
+    register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
+    register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
+    register_Ns3VendorSpecificActionHeader_methods(root_module, root_module['ns3::VendorSpecificActionHeader'])
+    register_Ns3Wifi80211pHelper_methods(root_module, root_module['ns3::Wifi80211pHelper'])
+    register_Ns3WifiActionHeader_methods(root_module, root_module['ns3::WifiActionHeader'])
+    register_Ns3WifiActionHeaderActionValue_methods(root_module, root_module['ns3::WifiActionHeader::ActionValue'])
+    register_Ns3WifiInformationElement_methods(root_module, root_module['ns3::WifiInformationElement'])
+    register_Ns3WifiMac_methods(root_module, root_module['ns3::WifiMac'])
+    register_Ns3WifiMacHeader_methods(root_module, root_module['ns3::WifiMacHeader'])
+    register_Ns3WifiMacQueue_methods(root_module, root_module['ns3::WifiMacQueue'])
+    register_Ns3WifiPhy_methods(root_module, root_module['ns3::WifiPhy'])
+    register_Ns3WifiRemoteStationManager_methods(root_module, root_module['ns3::WifiRemoteStationManager'])
+    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'])
+    register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
+    register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
+    register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
+    register_Ns3CtrlBAckRequestHeader_methods(root_module, root_module['ns3::CtrlBAckRequestHeader'])
+    register_Ns3CtrlBAckResponseHeader_methods(root_module, root_module['ns3::CtrlBAckResponseHeader'])
+    register_Ns3Dcf_methods(root_module, root_module['ns3::Dcf'])
+    register_Ns3EdcaTxopN_methods(root_module, root_module['ns3::EdcaTxopN'])
+    register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
+    register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
+    register_Ns3ExtendedSupportedRatesIE_methods(root_module, root_module['ns3::ExtendedSupportedRatesIE'])
+    register_Ns3HtCapabilities_methods(root_module, root_module['ns3::HtCapabilities'])
+    register_Ns3HtCapabilitiesChecker_methods(root_module, root_module['ns3::HtCapabilitiesChecker'])
+    register_Ns3HtCapabilitiesValue_methods(root_module, root_module['ns3::HtCapabilitiesValue'])
+    register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
+    register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue'])
+    register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker'])
+    register_Ns3Ipv4MaskValue_methods(root_module, root_module['ns3::Ipv4MaskValue'])
+    register_Ns3Ipv6AddressChecker_methods(root_module, root_module['ns3::Ipv6AddressChecker'])
+    register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue'])
+    register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker'])
+    register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
+    register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker'])
+    register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue'])
+    register_Ns3MacLow_methods(root_module, root_module['ns3::MacLow'])
+    register_Ns3MgtBeaconHeader_methods(root_module, root_module['ns3::MgtBeaconHeader'])
+    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'])
+    register_Ns3NqosWaveMacHelper_methods(root_module, root_module['ns3::NqosWaveMacHelper'])
+    register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
+    register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
+    register_Ns3OrganizationIdentifierChecker_methods(root_module, root_module['ns3::OrganizationIdentifierChecker'])
+    register_Ns3OrganizationIdentifierValue_methods(root_module, root_module['ns3::OrganizationIdentifierValue'])
+    register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
+    register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
+    register_Ns3PointerChecker_methods(root_module, root_module['ns3::PointerChecker'])
+    register_Ns3PointerValue_methods(root_module, root_module['ns3::PointerValue'])
+    register_Ns3QosWaveMacHelper_methods(root_module, root_module['ns3::QosWaveMacHelper'])
+    register_Ns3RegularWifiMac_methods(root_module, root_module['ns3::RegularWifiMac'])
+    register_Ns3Ssid_methods(root_module, root_module['ns3::Ssid'])
+    register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker'])
+    register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue'])
+    register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates'])
+    register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
+    register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
+    register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
+    register_Ns3UintegerValue_methods(root_module, root_module['ns3::UintegerValue'])
+    register_Ns3WaveMacLow_methods(root_module, root_module['ns3::WaveMacLow'])
+    register_Ns3WifiModeChecker_methods(root_module, root_module['ns3::WifiModeChecker'])
+    register_Ns3WifiModeValue_methods(root_module, root_module['ns3::WifiModeValue'])
+    register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
+    register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3DcaTxop_methods(root_module, root_module['ns3::DcaTxop'])
+    register_Ns3OcbWifiMac_methods(root_module, root_module['ns3::OcbWifiMac'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
+    return
+
+def register_Ns3Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## address.h (module 'network'): ns3::Address::Address() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor]
+    cls.add_constructor([param('uint8_t', 'type'), param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): ns3::Address::Address(ns3::Address const & address) [copy constructor]
+    cls.add_constructor([param('ns3::Address const &', 'address')])
+    ## address.h (module 'network'): bool ns3::Address::CheckCompatible(uint8_t type, uint8_t len) const [member function]
+    cls.add_method('CheckCompatible', 
+                   'bool', 
+                   [param('uint8_t', 'type'), param('uint8_t', 'len')], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyAllFrom(uint8_t const * buffer, uint8_t len) [member function]
+    cls.add_method('CopyAllFrom', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyAllTo(uint8_t * buffer, uint8_t len) const [member function]
+    cls.add_method('CopyAllTo', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint8_t', 'len')], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyFrom(uint8_t const * buffer, uint8_t len) [member function]
+    cls.add_method('CopyFrom', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint8_t', 'len')])
+    ## address.h (module 'network'): uint32_t ns3::Address::CopyTo(uint8_t * buffer) const [member function]
+    cls.add_method('CopyTo', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer')], 
+                   is_const=True)
+    ## address.h (module 'network'): void ns3::Address::Deserialize(ns3::TagBuffer buffer) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'buffer')])
+    ## address.h (module 'network'): uint8_t ns3::Address::GetLength() const [member function]
+    cls.add_method('GetLength', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): uint32_t ns3::Address::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): bool ns3::Address::IsInvalid() const [member function]
+    cls.add_method('IsInvalid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): bool ns3::Address::IsMatchingType(uint8_t type) const [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('uint8_t', 'type')], 
+                   is_const=True)
+    ## address.h (module 'network'): static uint8_t ns3::Address::Register() [member function]
+    cls.add_method('Register', 
+                   'uint8_t', 
+                   [], 
+                   is_static=True)
+    ## address.h (module 'network'): void ns3::Address::Serialize(ns3::TagBuffer buffer) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'buffer')], 
+                   is_const=True)
+    return
+
+def register_Ns3AsciiTraceHelper_methods(root_module, cls):
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelper::AsciiTraceHelper(ns3::AsciiTraceHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AsciiTraceHelper const &', 'arg0')])
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelper::AsciiTraceHelper() [constructor]
+    cls.add_constructor([])
+    ## trace-helper.h (module 'network'): ns3::Ptr<ns3::OutputStreamWrapper> ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::_Ios_Openmode filemode=std::ios_base::out) [member function]
+    cls.add_method('CreateFileStream', 
+                   'ns3::Ptr< ns3::OutputStreamWrapper >', 
+                   [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode', default_value='std::ios_base::out')])
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultDequeueSinkWithContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultDequeueSinkWithoutContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultDropSinkWithContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultDropSinkWithoutContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultEnqueueSinkWithContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultEnqueueSinkWithoutContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultReceiveSinkWithContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('DefaultReceiveSinkWithoutContext', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
+                   is_static=True)
+    ## trace-helper.h (module 'network'): std::string ns3::AsciiTraceHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
+    cls.add_method('GetFilenameFromDevice', 
+                   'std::string', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'useObjectNames', default_value='true')])
+    ## trace-helper.h (module 'network'): std::string ns3::AsciiTraceHelper::GetFilenameFromInterfacePair(std::string prefix, ns3::Ptr<ns3::Object> object, uint32_t interface, bool useObjectNames=true) [member function]
+    cls.add_method('GetFilenameFromInterfacePair', 
+                   'std::string', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Object >', 'object'), param('uint32_t', 'interface'), param('bool', 'useObjectNames', default_value='true')])
+    return
+
+def register_Ns3AsciiTraceHelperForDevice_methods(root_module, cls):
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelperForDevice::AsciiTraceHelperForDevice(ns3::AsciiTraceHelperForDevice const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AsciiTraceHelperForDevice const &', 'arg0')])
+    ## trace-helper.h (module 'network'): ns3::AsciiTraceHelperForDevice::AsciiTraceHelperForDevice() [constructor]
+    cls.add_constructor([])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool explicitFilename=false) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'explicitFilename', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, ns3::Ptr<ns3::NetDevice> nd) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, std::string ndName, bool explicitFilename=false) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('std::string', 'ndName'), param('bool', 'explicitFilename', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, std::string ndName) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'ndName')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::NetDeviceContainer d) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, ns3::NetDeviceContainer d) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NetDeviceContainer', 'd')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::NodeContainer n) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, ns3::NodeContainer n) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NodeContainer', 'n')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, uint32_t nodeid, uint32_t deviceid, bool explicitFilename) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid'), param('bool', 'explicitFilename')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamWrapper> stream, uint32_t nodeid, uint32_t deviceid) [member function]
+    cls.add_method('EnableAscii', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(std::string prefix) [member function]
+    cls.add_method('EnableAsciiAll', 
+                   'void', 
+                   [param('std::string', 'prefix')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(ns3::Ptr<ns3::OutputStreamWrapper> stream) [member function]
+    cls.add_method('EnableAsciiAll', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')])
+    ## trace-helper.h (module 'network'): void ns3::AsciiTraceHelperForDevice::EnableAsciiInternal(ns3::Ptr<ns3::OutputStreamWrapper> stream, std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool explicitFilename) [member function]
+    cls.add_method('EnableAsciiInternal', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'explicitFilename')], 
+                   is_pure_virtual=True, is_virtual=True)
+    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')])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::AttributeConstructionList() [constructor]
+    cls.add_constructor([])
+    ## attribute-construction-list.h (module 'core'): void ns3::AttributeConstructionList::Add(std::string name, ns3::Ptr<ns3::AttributeChecker const> checker, ns3::Ptr<ns3::AttributeValue> value) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker'), param('ns3::Ptr< ns3::AttributeValue >', 'value')])
+    ## attribute-construction-list.h (module 'core'): std::_List_const_iterator<ns3::AttributeConstructionList::Item> ns3::AttributeConstructionList::Begin() const [member function]
+    cls.add_method('Begin', 
+                   'std::_List_const_iterator< ns3::AttributeConstructionList::Item >', 
+                   [], 
+                   is_const=True)
+    ## attribute-construction-list.h (module 'core'): std::_List_const_iterator<ns3::AttributeConstructionList::Item> ns3::AttributeConstructionList::End() const [member function]
+    cls.add_method('End', 
+                   'std::_List_const_iterator< ns3::AttributeConstructionList::Item >', 
+                   [], 
+                   is_const=True)
+    ## attribute-construction-list.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeConstructionList::Find(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('Find', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True)
+    return
+
+def register_Ns3AttributeConstructionListItem_methods(root_module, cls):
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::Item() [constructor]
+    cls.add_constructor([])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::Item(ns3::AttributeConstructionList::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeConstructionList::Item const &', 'arg0')])
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::checker [variable]
+    cls.add_instance_attribute('checker', 'ns3::Ptr< ns3::AttributeChecker const >', is_const=False)
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item::value [variable]
+    cls.add_instance_attribute('value', 'ns3::Ptr< ns3::AttributeValue >', is_const=False)
+    return
+
+def register_Ns3Bar_methods(root_module, cls):
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::Bar(ns3::Bar const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Bar const &', 'arg0')])
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::Bar() [constructor]
+    cls.add_constructor([])
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::Bar(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address recipient, uint8_t tid, bool immediate) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('bool', 'immediate')])
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::bar [variable]
+    cls.add_instance_attribute('bar', 'ns3::Ptr< ns3::Packet const >', is_const=False)
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::immediate [variable]
+    cls.add_instance_attribute('immediate', 'bool', is_const=False)
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::recipient [variable]
+    cls.add_instance_attribute('recipient', 'ns3::Mac48Address', is_const=False)
+    ## block-ack-manager.h (module 'wifi'): ns3::Bar::tid [variable]
+    cls.add_instance_attribute('tid', 'uint8_t', is_const=False)
+    return
+
+def register_Ns3BlockAckAgreement_methods(root_module, cls):
+    ## block-ack-agreement.h (module 'wifi'): ns3::BlockAckAgreement::BlockAckAgreement(ns3::BlockAckAgreement const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::BlockAckAgreement const &', 'arg0')])
+    ## block-ack-agreement.h (module 'wifi'): ns3::BlockAckAgreement::BlockAckAgreement() [constructor]
+    cls.add_constructor([])
+    ## block-ack-agreement.h (module 'wifi'): ns3::BlockAckAgreement::BlockAckAgreement(ns3::Mac48Address peer, uint8_t tid) [constructor]
+    cls.add_constructor([param('ns3::Mac48Address', 'peer'), param('uint8_t', 'tid')])
+    ## block-ack-agreement.h (module 'wifi'): uint16_t ns3::BlockAckAgreement::GetBufferSize() const [member function]
+    cls.add_method('GetBufferSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): ns3::Mac48Address ns3::BlockAckAgreement::GetPeer() const [member function]
+    cls.add_method('GetPeer', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): uint16_t ns3::BlockAckAgreement::GetStartingSequence() const [member function]
+    cls.add_method('GetStartingSequence', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): uint16_t ns3::BlockAckAgreement::GetStartingSequenceControl() const [member function]
+    cls.add_method('GetStartingSequenceControl', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): uint8_t ns3::BlockAckAgreement::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): uint16_t ns3::BlockAckAgreement::GetTimeout() const [member function]
+    cls.add_method('GetTimeout', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): bool ns3::BlockAckAgreement::IsAmsduSupported() const [member function]
+    cls.add_method('IsAmsduSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): bool ns3::BlockAckAgreement::IsImmediateBlockAck() const [member function]
+    cls.add_method('IsImmediateBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetAmsduSupport(bool supported) [member function]
+    cls.add_method('SetAmsduSupport', 
+                   'void', 
+                   [param('bool', 'supported')])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetBufferSize(uint16_t bufferSize) [member function]
+    cls.add_method('SetBufferSize', 
+                   'void', 
+                   [param('uint16_t', 'bufferSize')])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetDelayedBlockAck() [member function]
+    cls.add_method('SetDelayedBlockAck', 
+                   'void', 
+                   [])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetImmediateBlockAck() [member function]
+    cls.add_method('SetImmediateBlockAck', 
+                   'void', 
+                   [])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetStartingSequence(uint16_t seq) [member function]
+    cls.add_method('SetStartingSequence', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## block-ack-agreement.h (module 'wifi'): void ns3::BlockAckAgreement::SetTimeout(uint16_t timeout) [member function]
+    cls.add_method('SetTimeout', 
+                   'void', 
+                   [param('uint16_t', 'timeout')])
+    return
+
+def register_Ns3BlockAckCache_methods(root_module, cls):
+    ## block-ack-cache.h (module 'wifi'): ns3::BlockAckCache::BlockAckCache() [constructor]
+    cls.add_constructor([])
+    ## block-ack-cache.h (module 'wifi'): ns3::BlockAckCache::BlockAckCache(ns3::BlockAckCache const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::BlockAckCache const &', 'arg0')])
+    ## block-ack-cache.h (module 'wifi'): void ns3::BlockAckCache::FillBlockAckBitmap(ns3::CtrlBAckResponseHeader * blockAckHeader) [member function]
+    cls.add_method('FillBlockAckBitmap', 
+                   'void', 
+                   [param('ns3::CtrlBAckResponseHeader *', 'blockAckHeader')])
+    ## block-ack-cache.h (module 'wifi'): void ns3::BlockAckCache::Init(uint16_t winStart, uint16_t winSize) [member function]
+    cls.add_method('Init', 
+                   'void', 
+                   [param('uint16_t', 'winStart'), param('uint16_t', 'winSize')])
+    ## block-ack-cache.h (module 'wifi'): void ns3::BlockAckCache::UpdateWithBlockAckReq(uint16_t startingSeq) [member function]
+    cls.add_method('UpdateWithBlockAckReq', 
+                   'void', 
+                   [param('uint16_t', 'startingSeq')])
+    ## block-ack-cache.h (module 'wifi'): void ns3::BlockAckCache::UpdateWithMpdu(ns3::WifiMacHeader const * hdr) [member function]
+    cls.add_method('UpdateWithMpdu', 
+                   'void', 
+                   [param('ns3::WifiMacHeader const *', 'hdr')])
+    return
+
+def register_Ns3BlockAckManager_methods(root_module, cls):
+    ## block-ack-manager.h (module 'wifi'): ns3::BlockAckManager::BlockAckManager() [constructor]
+    cls.add_constructor([])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::CreateAgreement(ns3::MgtAddBaRequestHeader const * reqHdr, ns3::Mac48Address recipient) [member function]
+    cls.add_method('CreateAgreement', 
+                   'void', 
+                   [param('ns3::MgtAddBaRequestHeader const *', 'reqHdr'), param('ns3::Mac48Address', 'recipient')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::DestroyAgreement(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    cls.add_method('DestroyAgreement', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')])
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::ExistsAgreement(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    cls.add_method('ExistsAgreement', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::ExistsAgreementInState(ns3::Mac48Address recipient, uint8_t tid, ns3::OriginatorBlockAckAgreement::State state) const [member function]
+    cls.add_method('ExistsAgreementInState', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::OriginatorBlockAckAgreement::State', 'state')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): uint32_t ns3::BlockAckManager::GetNBufferedPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    cls.add_method('GetNBufferedPackets', 
+                   'uint32_t', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): uint32_t ns3::BlockAckManager::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)
+    ## block-ack-manager.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::BlockAckManager::GetNextPacket(ns3::WifiMacHeader & hdr) [member function]
+    cls.add_method('GetNextPacket', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader &', 'hdr')])
+    ## block-ack-manager.h (module 'wifi'): uint32_t ns3::BlockAckManager::GetNextPacketSize() const [member function]
+    cls.add_method('GetNextPacketSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): uint16_t ns3::BlockAckManager::GetSeqNumOfNextRetryPacket(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    cls.add_method('GetSeqNumOfNextRetryPacket', 
+                   'uint16_t', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::HasBar(ns3::Bar & bar) [member function]
+    cls.add_method('HasBar', 
+                   'bool', 
+                   [param('ns3::Bar &', 'bar')])
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::HasOtherFragments(uint16_t sequenceNumber) const [member function]
+    cls.add_method('HasOtherFragments', 
+                   'bool', 
+                   [param('uint16_t', 'sequenceNumber')], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::HasPackets() const [member function]
+    cls.add_method('HasPackets', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::NotifyAgreementEstablished(ns3::Mac48Address recipient, uint8_t tid, uint16_t startingSeq) [member function]
+    cls.add_method('NotifyAgreementEstablished', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('uint16_t', 'startingSeq')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::NotifyAgreementUnsuccessful(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    cls.add_method('NotifyAgreementUnsuccessful', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::NotifyGotBlockAck(ns3::CtrlBAckResponseHeader const * blockAck, ns3::Mac48Address recipient) [member function]
+    cls.add_method('NotifyGotBlockAck', 
+                   'void', 
+                   [param('ns3::CtrlBAckResponseHeader const *', 'blockAck'), param('ns3::Mac48Address', 'recipient')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::NotifyMpduTransmission(ns3::Mac48Address recipient, uint8_t tid, uint16_t nextSeqNumber) [member function]
+    cls.add_method('NotifyMpduTransmission', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('uint16_t', 'nextSeqNumber')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetBlockAckInactivityCallback(ns3::Callback<void, ns3::Mac48Address, unsigned char, bool, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetBlockAckInactivityCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Mac48Address, unsigned char, bool, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetBlockAckThreshold(uint8_t nPackets) [member function]
+    cls.add_method('SetBlockAckThreshold', 
+                   'void', 
+                   [param('uint8_t', 'nPackets')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetBlockAckType(ns3::BlockAckType bAckType) [member function]
+    cls.add_method('SetBlockAckType', 
+                   'void', 
+                   [param('ns3::BlockAckType', 'bAckType')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetBlockDestinationCallback(ns3::Callback<void, ns3::Mac48Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetBlockDestinationCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Mac48Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetMaxPacketDelay(ns3::Time maxDelay) [member function]
+    cls.add_method('SetMaxPacketDelay', 
+                   'void', 
+                   [param('ns3::Time', 'maxDelay')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetQueue(ns3::Ptr<ns3::WifiMacQueue> queue) [member function]
+    cls.add_method('SetQueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiMacQueue >', 'queue')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetTxMiddle(ns3::MacTxMiddle * txMiddle) [member function]
+    cls.add_method('SetTxMiddle', 
+                   'void', 
+                   [param('ns3::MacTxMiddle *', 'txMiddle')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::SetUnblockDestinationCallback(ns3::Callback<void, ns3::Mac48Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetUnblockDestinationCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Mac48Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::StorePacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr, ns3::Time tStamp) [member function]
+    cls.add_method('StorePacket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr'), param('ns3::Time', 'tStamp')])
+    ## block-ack-manager.h (module 'wifi'): bool ns3::BlockAckManager::SwitchToBlockAckIfNeeded(ns3::Mac48Address recipient, uint8_t tid, uint16_t startingSeq) [member function]
+    cls.add_method('SwitchToBlockAckIfNeeded', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('uint16_t', 'startingSeq')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::TearDownBlockAck(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    cls.add_method('TearDownBlockAck', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')])
+    ## block-ack-manager.h (module 'wifi'): void ns3::BlockAckManager::UpdateAgreement(ns3::MgtAddBaResponseHeader const * respHdr, ns3::Mac48Address recipient) [member function]
+    cls.add_method('UpdateAgreement', 
+                   'void', 
+                   [param('ns3::MgtAddBaResponseHeader const *', 'respHdr'), param('ns3::Mac48Address', 'recipient')])
+    return
+
+def register_Ns3Buffer_methods(root_module, cls):
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer() [constructor]
+    cls.add_constructor([])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize) [constructor]
+    cls.add_constructor([param('uint32_t', 'dataSize')])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize, bool initialize) [constructor]
+    cls.add_constructor([param('uint32_t', 'dataSize'), param('bool', 'initialize')])
+    ## buffer.h (module 'network'): ns3::Buffer::Buffer(ns3::Buffer const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Buffer const &', 'o')])
+    ## buffer.h (module 'network'): bool ns3::Buffer::AddAtEnd(uint32_t end) [member function]
+    cls.add_method('AddAtEnd', 
+                   'bool', 
+                   [param('uint32_t', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::AddAtEnd(ns3::Buffer const & o) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::Buffer const &', 'o')])
+    ## buffer.h (module 'network'): bool ns3::Buffer::AddAtStart(uint32_t start) [member function]
+    cls.add_method('AddAtStart', 
+                   'bool', 
+                   [param('uint32_t', 'start')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   'ns3::Buffer::Iterator', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::CopyData(std::ostream * os, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'void', 
+                   [param('std::ostream *', 'os'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::CopyData(uint8_t * buffer, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFragment(uint32_t start, uint32_t length) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::Buffer', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFullCopy() const [member function]
+    cls.add_method('CreateFullCopy', 
+                   'ns3::Buffer', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::End() const [member function]
+    cls.add_method('End', 
+                   'ns3::Buffer::Iterator', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentEndOffset() const [member function]
+    cls.add_method('GetCurrentEndOffset', 
+                   'int32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentStartOffset() const [member function]
+    cls.add_method('GetCurrentStartOffset', 
+                   'int32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint8_t const * ns3::Buffer::PeekData() const [member function]
+    cls.add_method('PeekData', 
+                   'uint8_t const *', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtEnd(uint32_t end) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtStart(uint32_t start) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'start')])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3BufferIterator_methods(root_module, cls):
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator(ns3::Buffer::Iterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Buffer::Iterator const &', 'arg0')])
+    ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator() [constructor]
+    cls.add_constructor([])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size) [member function]
+    cls.add_method('CalculateIpChecksum', 
+                   'uint16_t', 
+                   [param('uint16_t', 'size')])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size, uint32_t initialChecksum) [member function]
+    cls.add_method('CalculateIpChecksum', 
+                   'uint16_t', 
+                   [param('uint16_t', 'size'), param('uint32_t', 'initialChecksum')])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetDistanceFrom(ns3::Buffer::Iterator const & o) const [member function]
+    cls.add_method('GetDistanceFrom', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator const &', 'o')], 
+                   is_const=True)
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsEnd() const [member function]
+    cls.add_method('IsEnd', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsStart() const [member function]
+    cls.add_method('IsStart', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next() [member function]
+    cls.add_method('Next', 
+                   'void', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next(uint32_t delta) [member function]
+    cls.add_method('Next', 
+                   'void', 
+                   [param('uint32_t', 'delta')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev() [member function]
+    cls.add_method('Prev', 
+                   'void', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev(uint32_t delta) [member function]
+    cls.add_method('Prev', 
+                   'void', 
+                   [param('uint32_t', 'delta')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Read(uint8_t * buffer, uint32_t size) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadLsbtohU16() [member function]
+    cls.add_method('ReadLsbtohU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadLsbtohU32() [member function]
+    cls.add_method('ReadLsbtohU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadLsbtohU64() [member function]
+    cls.add_method('ReadLsbtohU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadNtohU16() [member function]
+    cls.add_method('ReadNtohU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadNtohU32() [member function]
+    cls.add_method('ReadNtohU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadNtohU64() [member function]
+    cls.add_method('ReadNtohU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadU16() [member function]
+    cls.add_method('ReadU16', 
+                   'uint16_t', 
+                   [])
+    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadU32() [member function]
+    cls.add_method('ReadU32', 
+                   'uint32_t', 
+                   [])
+    ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadU64() [member function]
+    cls.add_method('ReadU64', 
+                   'uint64_t', 
+                   [])
+    ## buffer.h (module 'network'): uint8_t ns3::Buffer::Iterator::ReadU8() [member function]
+    cls.add_method('ReadU8', 
+                   'uint8_t', 
+                   [])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(ns3::Buffer::Iterator start, ns3::Buffer::Iterator end) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('ns3::Buffer::Iterator', 'end')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU16(uint16_t data) [member function]
+    cls.add_method('WriteHtolsbU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU32(uint32_t data) [member function]
+    cls.add_method('WriteHtolsbU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU64(uint64_t data) [member function]
+    cls.add_method('WriteHtolsbU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU16(uint16_t data) [member function]
+    cls.add_method('WriteHtonU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU32(uint32_t data) [member function]
+    cls.add_method('WriteHtonU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU64(uint64_t data) [member function]
+    cls.add_method('WriteHtonU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU16(uint16_t data) [member function]
+    cls.add_method('WriteU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU32(uint32_t data) [member function]
+    cls.add_method('WriteU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU64(uint64_t data) [member function]
+    cls.add_method('WriteU64', 
+                   'void', 
+                   [param('uint64_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'data')])
+    ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data, uint32_t len) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'data'), param('uint32_t', 'len')])
+    return
+
+def register_Ns3ByteTagIterator_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::ByteTagIterator::ByteTagIterator(ns3::ByteTagIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagIterator const &', 'arg0')])
+    ## packet.h (module 'network'): bool ns3::ByteTagIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item ns3::ByteTagIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::ByteTagIterator::Item', 
+                   [])
+    return
+
+def register_Ns3ByteTagIteratorItem_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::ByteTagIterator::Item::Item(ns3::ByteTagIterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagIterator::Item const &', 'arg0')])
+    ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetEnd() const [member function]
+    cls.add_method('GetEnd', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetStart() const [member function]
+    cls.add_method('GetStart', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::ByteTagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
+    cls.add_method('GetTag', 
+                   'void', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::TypeId ns3::ByteTagIterator::Item::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3ByteTagList_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList() [constructor]
+    cls.add_constructor([])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList(ns3::ByteTagList const & o) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList const &', 'o')])
+    ## byte-tag-list.h (module 'network'): ns3::TagBuffer ns3::ByteTagList::Add(ns3::TypeId tid, uint32_t bufferSize, int32_t start, int32_t end) [member function]
+    cls.add_method('Add', 
+                   'ns3::TagBuffer', 
+                   [param('ns3::TypeId', 'tid'), param('uint32_t', 'bufferSize'), param('int32_t', 'start'), param('int32_t', 'end')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::Add(ns3::ByteTagList const & o) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::ByteTagList const &', 'o')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtEnd(int32_t adjustment, int32_t appendOffset) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('int32_t', 'adjustment'), param('int32_t', 'appendOffset')])
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtStart(int32_t adjustment, int32_t prependOffset) [member function]
+    cls.add_method('AddAtStart', 
+                   'void', 
+                   [param('int32_t', 'adjustment'), param('int32_t', 'prependOffset')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator ns3::ByteTagList::Begin(int32_t offsetStart, int32_t offsetEnd) const [member function]
+    cls.add_method('Begin', 
+                   'ns3::ByteTagList::Iterator', 
+                   [param('int32_t', 'offsetStart'), param('int32_t', 'offsetEnd')], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::RemoveAll() [member function]
+    cls.add_method('RemoveAll', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3ByteTagListIterator_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Iterator(ns3::ByteTagList::Iterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList::Iterator const &', 'arg0')])
+    ## byte-tag-list.h (module 'network'): uint32_t ns3::ByteTagList::Iterator::GetOffsetStart() const [member function]
+    cls.add_method('GetOffsetStart', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): bool ns3::ByteTagList::Iterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item ns3::ByteTagList::Iterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::ByteTagList::Iterator::Item', 
+                   [])
+    return
+
+def register_Ns3ByteTagListIteratorItem_methods(root_module, cls):
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::ByteTagList::Iterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ByteTagList::Iterator::Item const &', 'arg0')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::TagBuffer buf) [constructor]
+    cls.add_constructor([param('ns3::TagBuffer', 'buf')])
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::buf [variable]
+    cls.add_instance_attribute('buf', 'ns3::TagBuffer', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::end [variable]
+    cls.add_instance_attribute('end', 'int32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::size [variable]
+    cls.add_instance_attribute('size', 'uint32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::start [variable]
+    cls.add_instance_attribute('start', 'int32_t', is_const=False)
+    ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3CallbackBase_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::CallbackBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackBase const &', 'arg0')])
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::Ptr<ns3::CallbackImplBase> ns3::CallbackBase::GetImpl() const [member function]
+    cls.add_method('GetImpl', 
+                   'ns3::Ptr< ns3::CallbackImplBase >', 
+                   [], 
+                   is_const=True)
+    ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::Ptr<ns3::CallbackImplBase> impl) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::CallbackImplBase >', 'impl')], 
+                        visibility='protected')
+    ## callback.h (module 'core'): static std::string ns3::CallbackBase::Demangle(std::string const & mangled) [member function]
+    cls.add_method('Demangle', 
+                   'std::string', 
+                   [param('std::string const &', 'mangled')], 
+                   is_static=True, visibility='protected')
+    return
+
+def register_Ns3CapabilityInformation_methods(root_module, cls):
+    ## capability-information.h (module 'wifi'): ns3::CapabilityInformation::CapabilityInformation(ns3::CapabilityInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CapabilityInformation const &', 'arg0')])
+    ## capability-information.h (module 'wifi'): ns3::CapabilityInformation::CapabilityInformation() [constructor]
+    cls.add_constructor([])
+    ## capability-information.h (module 'wifi'): ns3::Buffer::Iterator ns3::CapabilityInformation::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')])
+    ## capability-information.h (module 'wifi'): uint32_t ns3::CapabilityInformation::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## capability-information.h (module 'wifi'): bool ns3::CapabilityInformation::IsEss() const [member function]
+    cls.add_method('IsEss', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## capability-information.h (module 'wifi'): bool ns3::CapabilityInformation::IsIbss() const [member function]
+    cls.add_method('IsIbss', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## capability-information.h (module 'wifi'): ns3::Buffer::Iterator ns3::CapabilityInformation::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## capability-information.h (module 'wifi'): void ns3::CapabilityInformation::SetEss() [member function]
+    cls.add_method('SetEss', 
+                   'void', 
+                   [])
+    ## capability-information.h (module 'wifi'): void ns3::CapabilityInformation::SetIbss() [member function]
+    cls.add_method('SetIbss', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3EventId_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('==')
+    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::EventId const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventId const &', 'arg0')])
+    ## event-id.h (module 'core'): ns3::EventId::EventId() [constructor]
+    cls.add_constructor([])
+    ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::Ptr<ns3::EventImpl> const & impl, uint64_t ts, uint32_t context, uint32_t uid) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::EventImpl > const &', 'impl'), param('uint64_t', 'ts'), param('uint32_t', 'context'), param('uint32_t', 'uid')])
+    ## event-id.h (module 'core'): void ns3::EventId::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetContext() const [member function]
+    cls.add_method('GetContext', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): uint64_t ns3::EventId::GetTs() const [member function]
+    cls.add_method('GetTs', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): uint32_t ns3::EventId::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): bool ns3::EventId::IsExpired() const [member function]
+    cls.add_method('IsExpired', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): bool ns3::EventId::IsRunning() const [member function]
+    cls.add_method('IsRunning', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## event-id.h (module 'core'): ns3::EventImpl * ns3::EventId::PeekEventImpl() const [member function]
+    cls.add_method('PeekEventImpl', 
+                   'ns3::EventImpl *', 
+                   [], 
+                   is_const=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')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
+def register_Ns3Ipv4Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(uint32_t address) [constructor]
+    cls.add_constructor([param('uint32_t', 'address')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(char const * address) [constructor]
+    cls.add_constructor([param('char const *', 'address')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4Address::CombineMask(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('CombineMask', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::Deserialize(uint8_t const * buf) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Ipv4Address', 
+                   [param('uint8_t const *', 'buf')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Address::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetAny() [member function]
+    cls.add_method('GetAny', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetBroadcast() [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4Address::GetSubnetDirectedBroadcast(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('GetSubnetDirectedBroadcast', 
+                   'ns3::Ipv4Address', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Address ns3::Ipv4Address::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsEqual(ns3::Ipv4Address const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv4Address const &', 'other')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsLocalMulticast() const [member function]
+    cls.add_method('IsLocalMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static bool ns3::Ipv4Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsSubnetDirectedBroadcast(ns3::Ipv4Mask const & mask) const [member function]
+    cls.add_method('IsSubnetDirectedBroadcast', 
+                   'bool', 
+                   [param('ns3::Ipv4Mask const &', 'mask')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Serialize(uint8_t * buf) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Set(uint32_t address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint32_t', 'address')])
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Address::Set(char const * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('char const *', 'address')])
+    return
+
+def register_Ns3Ipv4Mask_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(ns3::Ipv4Mask const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4Mask const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(uint32_t mask) [constructor]
+    cls.add_constructor([param('uint32_t', 'mask')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask::Ipv4Mask(char const * mask) [constructor]
+    cls.add_constructor([param('char const *', 'mask')])
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Mask::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): uint32_t ns3::Ipv4Mask::GetInverse() const [member function]
+    cls.add_method('GetInverse', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): uint16_t ns3::Ipv4Mask::GetPrefixLength() const [member function]
+    cls.add_method('GetPrefixLength', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): static ns3::Ipv4Mask ns3::Ipv4Mask::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_static=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Mask::IsEqual(ns3::Ipv4Mask other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv4Mask', 'other')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4Mask::IsMatch(ns3::Ipv4Address a, ns3::Ipv4Address b) const [member function]
+    cls.add_method('IsMatch', 
+                   'bool', 
+                   [param('ns3::Ipv4Address', 'a'), param('ns3::Ipv4Address', 'b')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Mask::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4Mask::Set(uint32_t mask) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint32_t', 'mask')])
+    return
+
+def register_Ns3Ipv6Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(char const * address) [constructor]
+    cls.add_constructor([param('char const *', 'address')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(uint8_t * address) [constructor]
+    cls.add_constructor([param('uint8_t *', 'address')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const & addr) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const &', 'addr')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const * addr) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const *', 'addr')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address ns3::Ipv6Address::CombinePrefix(ns3::Ipv6Prefix const & prefix) [member function]
+    cls.add_method('CombinePrefix', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Prefix const &', 'prefix')])
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::Deserialize(uint8_t const * buf) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Ipv6Address', 
+                   [param('uint8_t const *', 'buf')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllHostsMulticast() [member function]
+    cls.add_method('GetAllHostsMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllNodesMulticast() [member function]
+    cls.add_method('GetAllNodesMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAllRoutersMulticast() [member function]
+    cls.add_method('GetAllRoutersMulticast', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetAny() [member function]
+    cls.add_method('GetAny', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::GetBytes(uint8_t * buf) const [member function]
+    cls.add_method('GetBytes', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv6Address::GetIpv4MappedAddress() const [member function]
+    cls.add_method('GetIpv4MappedAddress', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllHostsMulticast() const [member function]
+    cls.add_method('IsAllHostsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function]
+    cls.add_method('IsAllNodesMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllRoutersMulticast() const [member function]
+    cls.add_method('IsAllRoutersMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAny() const [member function]
+    cls.add_method('IsAny', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv6Address const &', 'other')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
+    cls.add_method('IsIpv4MappedAddress', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
+    cls.add_method('IsLinkLocal', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocalMulticast() const [member function]
+    cls.add_method('IsLinkLocalMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLocalhost() const [member function]
+    cls.add_method('IsLocalhost', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static bool ns3::Ipv6Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsSolicitedMulticast() const [member function]
+    cls.add_method('IsSolicitedMulticast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac48Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
+    cls.add_method('MakeIpv4MappedAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv4Address', 'addr')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeSolicitedAddress(ns3::Ipv6Address addr) [member function]
+    cls.add_method('MakeSolicitedAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Serialize(uint8_t * buf) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Set(char const * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('char const *', 'address')])
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Address::Set(uint8_t * address) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint8_t *', 'address')])
+    return
+
+def register_Ns3Ipv6Prefix_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(uint8_t * prefix) [constructor]
+    cls.add_constructor([param('uint8_t *', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(char const * prefix) [constructor]
+    cls.add_constructor([param('char const *', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(uint8_t prefix) [constructor]
+    cls.add_constructor([param('uint8_t', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const & prefix) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const &', 'prefix')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const * prefix) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const *', 'prefix')])
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Prefix::GetBytes(uint8_t * buf) const [member function]
+    cls.add_method('GetBytes', 
+                   'void', 
+                   [param('uint8_t *', 'buf')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetLoopback() [member function]
+    cls.add_method('GetLoopback', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetOnes() [member function]
+    cls.add_method('GetOnes', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): uint8_t ns3::Ipv6Prefix::GetPrefixLength() const [member function]
+    cls.add_method('GetPrefixLength', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetZero() [member function]
+    cls.add_method('GetZero', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Prefix::IsEqual(ns3::Ipv6Prefix const & other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ipv6Prefix const &', 'other')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Prefix::IsMatch(ns3::Ipv6Address a, ns3::Ipv6Address b) const [member function]
+    cls.add_method('IsMatch', 
+                   'bool', 
+                   [param('ns3::Ipv6Address', 'a'), param('ns3::Ipv6Address', 'b')], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6Prefix::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    return
+
+def register_Ns3Mac48Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')])
+    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address() [constructor]
+    cls.add_constructor([])
+    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(char const * str) [constructor]
+    cls.add_constructor([param('char const *', 'str')])
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::Allocate() [member function]
+    cls.add_method('Allocate', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): void ns3::Mac48Address::CopyFrom(uint8_t const * buffer) [member function]
+    cls.add_method('CopyFrom', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer')])
+    ## mac48-address.h (module 'network'): void ns3::Mac48Address::CopyTo(uint8_t * buffer) const [member function]
+    cls.add_method('CopyTo', 
+                   'void', 
+                   [param('uint8_t *', 'buffer')], 
+                   is_const=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetBroadcast() [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv4Address address) [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::Ipv4Address', 'address')], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv6Address address) [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::Ipv6Address', 'address')], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast6Prefix() [member function]
+    cls.add_method('GetMulticast6Prefix', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticastPrefix() [member function]
+    cls.add_method('GetMulticastPrefix', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_static=True)
+    ## mac48-address.h (module 'network'): bool ns3::Mac48Address::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac48-address.h (module 'network'): bool ns3::Mac48Address::IsGroup() const [member function]
+    cls.add_method('IsGroup', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac48-address.h (module 'network'): static bool ns3::Mac48Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   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]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::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)
+    return
+
+def register_Ns3MacLowDcfListener_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener::MacLowDcfListener(ns3::MacLowDcfListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowDcfListener const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener::MacLowDcfListener() [constructor]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::AckTimeoutReset() [member function]
+    cls.add_method('AckTimeoutReset', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::AckTimeoutStart(ns3::Time duration) [member function]
+    cls.add_method('AckTimeoutStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::CtsTimeoutReset() [member function]
+    cls.add_method('CtsTimeoutReset', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::CtsTimeoutStart(ns3::Time duration) [member function]
+    cls.add_method('CtsTimeoutStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::NavReset(ns3::Time duration) [member function]
+    cls.add_method('NavReset', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowDcfListener::NavStart(ns3::Time duration) [member function]
+    cls.add_method('NavStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3MacLowTransmissionListener_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener::MacLowTransmissionListener(ns3::MacLowTransmissionListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowTransmissionListener const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener::MacLowTransmissionListener() [constructor]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::EndTxNoAck() [member function]
+    cls.add_method('EndTxNoAck', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::GotAck(double snr, ns3::WifiMode txMode) [member function]
+    cls.add_method('GotAck', 
+                   'void', 
+                   [param('double', 'snr'), param('ns3::WifiMode', 'txMode')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::GotBlockAck(ns3::CtrlBAckResponseHeader const * blockAck, ns3::Mac48Address source) [member function]
+    cls.add_method('GotBlockAck', 
+                   'void', 
+                   [param('ns3::CtrlBAckResponseHeader const *', 'blockAck'), param('ns3::Mac48Address', 'source')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::GotCts(double snr, ns3::WifiMode txMode) [member function]
+    cls.add_method('GotCts', 
+                   'void', 
+                   [param('double', 'snr'), param('ns3::WifiMode', 'txMode')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::MissedAck() [member function]
+    cls.add_method('MissedAck', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::MissedBlockAck() [member function]
+    cls.add_method('MissedBlockAck', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::MissedCts() [member function]
+    cls.add_method('MissedCts', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionListener::StartNext() [member function]
+    cls.add_method('StartNext', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3MacLowTransmissionParameters_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionParameters::MacLowTransmissionParameters(ns3::MacLowTransmissionParameters const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowTransmissionParameters const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionParameters::MacLowTransmissionParameters() [constructor]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::DisableAck() [member function]
+    cls.add_method('DisableAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::DisableNextData() [member function]
+    cls.add_method('DisableNextData', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::DisableOverrideDurationId() [member function]
+    cls.add_method('DisableOverrideDurationId', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::DisableRts() [member function]
+    cls.add_method('DisableRts', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableAck() [member function]
+    cls.add_method('EnableAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableBasicBlockAck() [member function]
+    cls.add_method('EnableBasicBlockAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableCompressedBlockAck() [member function]
+    cls.add_method('EnableCompressedBlockAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableFastAck() [member function]
+    cls.add_method('EnableFastAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableMultiTidBlockAck() [member function]
+    cls.add_method('EnableMultiTidBlockAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableNextData(uint32_t size) [member function]
+    cls.add_method('EnableNextData', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableOverrideDurationId(ns3::Time durationId) [member function]
+    cls.add_method('EnableOverrideDurationId', 
+                   'void', 
+                   [param('ns3::Time', 'durationId')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableRts() [member function]
+    cls.add_method('EnableRts', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLowTransmissionParameters::EnableSuperFastAck() [member function]
+    cls.add_method('EnableSuperFastAck', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLowTransmissionParameters::GetDurationId() const [member function]
+    cls.add_method('GetDurationId', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowTransmissionParameters::GetNextPacketSize() const [member function]
+    cls.add_method('GetNextPacketSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::HasDurationId() const [member function]
+    cls.add_method('HasDurationId', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::HasNextPacket() const [member function]
+    cls.add_method('HasNextPacket', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustSendRts() const [member function]
+    cls.add_method('MustSendRts', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitAck() const [member function]
+    cls.add_method('MustWaitAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitBasicBlockAck() const [member function]
+    cls.add_method('MustWaitBasicBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitCompressedBlockAck() const [member function]
+    cls.add_method('MustWaitCompressedBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitFastAck() const [member function]
+    cls.add_method('MustWaitFastAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitMultiTidBlockAck() const [member function]
+    cls.add_method('MustWaitMultiTidBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitNormalAck() const [member function]
+    cls.add_method('MustWaitNormalAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowTransmissionParameters::MustWaitSuperFastAck() const [member function]
+    cls.add_method('MustWaitSuperFastAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3NetDeviceContainer_methods(root_module, cls):
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NetDeviceContainer const &', 'arg0')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer() [constructor]
+    cls.add_constructor([])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::Ptr<ns3::NetDevice> dev) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(std::string devName) [constructor]
+    cls.add_constructor([param('std::string', 'devName')])
+    ## net-device-container.h (module 'network'): ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & a, ns3::NetDeviceContainer const & b) [constructor]
+    cls.add_constructor([param('ns3::NetDeviceContainer const &', 'a'), param('ns3::NetDeviceContainer const &', 'b')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(ns3::NetDeviceContainer other) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::NetDeviceContainer', 'other')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(ns3::Ptr<ns3::NetDevice> device) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+    ## net-device-container.h (module 'network'): void ns3::NetDeviceContainer::Add(std::string deviceName) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'deviceName')])
+    ## net-device-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::NetDevice > const, std::vector< ns3::Ptr< ns3::NetDevice > > >', 
+                   [], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::End() const [member function]
+    cls.add_method('End', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::NetDevice > const, std::vector< ns3::Ptr< ns3::NetDevice > > >', 
+                   [], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::NetDeviceContainer::Get(uint32_t i) const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## net-device-container.h (module 'network'): uint32_t ns3::NetDeviceContainer::GetN() const [member function]
+    cls.add_method('GetN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3NodeContainer_methods(root_module, cls):
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'arg0')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer() [constructor]
+    cls.add_constructor([])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::Ptr<ns3::Node> node) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(std::string nodeName) [constructor]
+    cls.add_constructor([param('std::string', 'nodeName')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b) [constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c) [constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d) [constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c'), param('ns3::NodeContainer const &', 'd')])
+    ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d, ns3::NodeContainer const & e) [constructor]
+    cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c'), param('ns3::NodeContainer const &', 'd'), param('ns3::NodeContainer const &', 'e')])
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Add(ns3::NodeContainer other) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::NodeContainer', 'other')])
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Add(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')])
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Add(std::string nodeName) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('std::string', 'nodeName')])
+    ## node-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Node>*,std::vector<ns3::Ptr<ns3::Node>, std::allocator<ns3::Ptr<ns3::Node> > > > ns3::NodeContainer::Begin() const [member function]
+    cls.add_method('Begin', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Node > const, std::vector< ns3::Ptr< ns3::Node > > >', 
+                   [], 
+                   is_const=True)
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Create(uint32_t n) [member function]
+    cls.add_method('Create', 
+                   'void', 
+                   [param('uint32_t', 'n')])
+    ## node-container.h (module 'network'): void ns3::NodeContainer::Create(uint32_t n, uint32_t systemId) [member function]
+    cls.add_method('Create', 
+                   'void', 
+                   [param('uint32_t', 'n'), param('uint32_t', 'systemId')])
+    ## node-container.h (module 'network'): __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Node>*,std::vector<ns3::Ptr<ns3::Node>, std::allocator<ns3::Ptr<ns3::Node> > > > ns3::NodeContainer::End() const [member function]
+    cls.add_method('End', 
+                   '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Node > const, std::vector< ns3::Ptr< ns3::Node > > >', 
+                   [], 
+                   is_const=True)
+    ## node-container.h (module 'network'): ns3::Ptr<ns3::Node> ns3::NodeContainer::Get(uint32_t i) const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## node-container.h (module 'network'): static ns3::NodeContainer ns3::NodeContainer::GetGlobal() [member function]
+    cls.add_method('GetGlobal', 
+                   'ns3::NodeContainer', 
+                   [], 
+                   is_static=True)
+    ## node-container.h (module 'network'): uint32_t ns3::NodeContainer::GetN() const [member function]
+    cls.add_method('GetN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3ObjectBase_methods(root_module, cls):
+    ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase() [constructor]
+    cls.add_constructor([])
+    ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectBase const &', 'arg0')])
+    ## object-base.h (module 'core'): void ns3::ObjectBase::GetAttribute(std::string name, ns3::AttributeValue & value) const [member function]
+    cls.add_method('GetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue &', 'value')], 
+                   is_const=True)
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::GetAttributeFailSafe(std::string name, ns3::AttributeValue & attribute) const [member function]
+    cls.add_method('GetAttributeFailSafe', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue &', 'attribute')], 
+                   is_const=True)
+    ## object-base.h (module 'core'): ns3::TypeId ns3::ObjectBase::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## object-base.h (module 'core'): static ns3::TypeId ns3::ObjectBase::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## object-base.h (module 'core'): void ns3::ObjectBase::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::SetAttributeFailSafe(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttributeFailSafe', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceConnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceConnect', 
+                   'bool', 
+                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceConnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceConnectWithoutContext', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceDisconnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceDisconnect', 
+                   'bool', 
+                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): bool ns3::ObjectBase::TraceDisconnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
+    cls.add_method('TraceDisconnectWithoutContext', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')])
+    ## object-base.h (module 'core'): void ns3::ObjectBase::ConstructSelf(ns3::AttributeConstructionList const & attributes) [member function]
+    cls.add_method('ConstructSelf', 
+                   'void', 
+                   [param('ns3::AttributeConstructionList const &', 'attributes')], 
+                   visibility='protected')
+    ## object-base.h (module 'core'): void ns3::ObjectBase::NotifyConstructionCompleted() [member function]
+    cls.add_method('NotifyConstructionCompleted', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ObjectDeleter_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::ObjectDeleter::ObjectDeleter() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): ns3::ObjectDeleter::ObjectDeleter(ns3::ObjectDeleter const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectDeleter const &', 'arg0')])
+    ## object.h (module 'core'): static void ns3::ObjectDeleter::Delete(ns3::Object * object) [member function]
+    cls.add_method('Delete', 
+                   'void', 
+                   [param('ns3::Object *', 'object')], 
+                   is_static=True)
+    return
+
+def register_Ns3ObjectFactory_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')])
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(std::string typeId) [constructor]
+    cls.add_constructor([param('std::string', 'typeId')])
+    ## object-factory.h (module 'core'): ns3::Ptr<ns3::Object> ns3::ObjectFactory::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::Object >', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('ns3::TypeId', 'tid')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('char const *', 'tid')])
+    ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function]
+    cls.add_method('SetTypeId', 
+                   'void', 
+                   [param('std::string', 'tid')])
+    return
+
+def register_Ns3OrganizationIdentifier_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifier(ns3::OrganizationIdentifier const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OrganizationIdentifier const &', 'arg0')])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifier() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifier(uint8_t const * str, uint32_t length) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'str'), param('uint32_t', 'length')])
+    ## vendor-specific-action.h (module 'wave'): uint32_t ns3::OrganizationIdentifier::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')])
+    ## vendor-specific-action.h (module 'wave'): uint8_t ns3::OrganizationIdentifier::GetManagementId() const [member function]
+    cls.add_method('GetManagementId', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): uint32_t ns3::OrganizationIdentifier::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier::OrganizationIdentifierType ns3::OrganizationIdentifier::GetType() const [member function]
+    cls.add_method('GetType', 
+                   'ns3::OrganizationIdentifier::OrganizationIdentifierType', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): bool ns3::OrganizationIdentifier::IsNull() const [member function]
+    cls.add_method('IsNull', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::OrganizationIdentifier::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::OrganizationIdentifier::SetType(ns3::OrganizationIdentifier::OrganizationIdentifierType type) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier::OrganizationIdentifierType', 'type')])
+    return
+
+def register_Ns3OriginatorBlockAckAgreement_methods(root_module, cls):
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement::OriginatorBlockAckAgreement(ns3::OriginatorBlockAckAgreement const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OriginatorBlockAckAgreement const &', 'arg0')])
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement::OriginatorBlockAckAgreement() [constructor]
+    cls.add_constructor([])
+    ## originator-block-ack-agreement.h (module 'wifi'): ns3::OriginatorBlockAckAgreement::OriginatorBlockAckAgreement(ns3::Mac48Address recipient, uint8_t tid) [constructor]
+    cls.add_constructor([param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')])
+    ## originator-block-ack-agreement.h (module 'wifi'): void ns3::OriginatorBlockAckAgreement::CompleteExchange() [member function]
+    cls.add_method('CompleteExchange', 
+                   'void', 
+                   [])
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsBlockAckRequestNeeded() const [member function]
+    cls.add_method('IsBlockAckRequestNeeded', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsEstablished() const [member function]
+    cls.add_method('IsEstablished', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsInactive() const [member function]
+    cls.add_method('IsInactive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsPending() const [member function]
+    cls.add_method('IsPending', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): bool ns3::OriginatorBlockAckAgreement::IsUnsuccessful() const [member function]
+    cls.add_method('IsUnsuccessful', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## originator-block-ack-agreement.h (module 'wifi'): void ns3::OriginatorBlockAckAgreement::NotifyMpduTransmission(uint16_t nextSeqNumber) [member function]
+    cls.add_method('NotifyMpduTransmission', 
+                   'void', 
+                   [param('uint16_t', 'nextSeqNumber')])
+    ## originator-block-ack-agreement.h (module 'wifi'): void ns3::OriginatorBlockAckAgreement::SetState(ns3::OriginatorBlockAckAgreement::State state) [member function]
+    cls.add_method('SetState', 
+                   'void', 
+                   [param('ns3::OriginatorBlockAckAgreement::State', 'state')])
+    return
+
+def register_Ns3PacketMetadata_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor]
+    cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(ns3::PacketMetadata const & o) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata const &', 'o')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddAtEnd(ns3::PacketMetadata const & o) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::PacketMetadata const &', 'o')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddHeader(ns3::Header const & header, uint32_t size) [member function]
+    cls.add_method('AddHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddPaddingAtEnd(uint32_t end) [member function]
+    cls.add_method('AddPaddingAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddTrailer(ns3::Trailer const & trailer, uint32_t size) [member function]
+    cls.add_method('AddTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::PacketMetadata::BeginItem(ns3::Buffer buffer) const [member function]
+    cls.add_method('BeginItem', 
+                   'ns3::PacketMetadata::ItemIterator', 
+                   [param('ns3::Buffer', 'buffer')], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata ns3::PacketMetadata::CreateFragment(uint32_t start, uint32_t end) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::PacketMetadata', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'end')], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::Enable() [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::EnableChecking() [member function]
+    cls.add_method('EnableChecking', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): uint64_t ns3::PacketMetadata::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtEnd(uint32_t end) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'end')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtStart(uint32_t start) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'start')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveHeader(ns3::Header const & header, uint32_t size) [member function]
+    cls.add_method('RemoveHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveTrailer(ns3::Trailer const & trailer, uint32_t size) [member function]
+    cls.add_method('RemoveTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')])
+    ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3PacketMetadataItem_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item() [constructor]
+    cls.add_constructor([])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item(ns3::PacketMetadata::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata::Item const &', 'arg0')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::current [variable]
+    cls.add_instance_attribute('current', 'ns3::Buffer::Iterator', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentSize [variable]
+    cls.add_instance_attribute('currentSize', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromEnd [variable]
+    cls.add_instance_attribute('currentTrimedFromEnd', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromStart [variable]
+    cls.add_instance_attribute('currentTrimedFromStart', 'uint32_t', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::isFragment [variable]
+    cls.add_instance_attribute('isFragment', 'bool', is_const=False)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3PacketMetadataItemIterator_methods(root_module, cls):
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata::ItemIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketMetadata::ItemIterator const &', 'arg0')])
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata const * metadata, ns3::Buffer buffer) [constructor]
+    cls.add_constructor([param('ns3::PacketMetadata const *', 'metadata'), param('ns3::Buffer', 'buffer')])
+    ## packet-metadata.h (module 'network'): bool ns3::PacketMetadata::ItemIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item ns3::PacketMetadata::ItemIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::PacketMetadata::Item', 
+                   [])
+    return
+
+def register_Ns3PacketTagIterator_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::PacketTagIterator::PacketTagIterator(ns3::PacketTagIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagIterator const &', 'arg0')])
+    ## packet.h (module 'network'): bool ns3::PacketTagIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item ns3::PacketTagIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::PacketTagIterator::Item', 
+                   [])
+    return
+
+def register_Ns3PacketTagIteratorItem_methods(root_module, cls):
+    ## packet.h (module 'network'): ns3::PacketTagIterator::Item::Item(ns3::PacketTagIterator::Item const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagIterator::Item const &', 'arg0')])
+    ## packet.h (module 'network'): void ns3::PacketTagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
+    cls.add_method('GetTag', 
+                   'void', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::TypeId ns3::PacketTagIterator::Item::GetTypeId() const [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3PacketTagList_methods(root_module, cls):
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList() [constructor]
+    cls.add_constructor([])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList(ns3::PacketTagList const & o) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagList const &', 'o')])
+    ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::Add(ns3::Tag const & tag) const [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData const * ns3::PacketTagList::Head() const [member function]
+    cls.add_method('Head', 
+                   'ns3::PacketTagList::TagData const *', 
+                   [], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Peek(ns3::Tag & tag) const [member function]
+    cls.add_method('Peek', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Remove(ns3::Tag & tag) [member function]
+    cls.add_method('Remove', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::RemoveAll() [member function]
+    cls.add_method('RemoveAll', 
+                   'void', 
+                   [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    return
+
+def register_Ns3PacketTagListTagData_methods(root_module, cls):
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData() [constructor]
+    cls.add_constructor([])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData(ns3::PacketTagList::TagData const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketTagList::TagData const &', 'arg0')])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::count [variable]
+    cls.add_instance_attribute('count', 'uint32_t', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::data [variable]
+    cls.add_instance_attribute('data', 'uint8_t [ 20 ]', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::next [variable]
+    cls.add_instance_attribute('next', 'ns3::PacketTagList::TagData *', is_const=False)
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::tid [variable]
+    cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False)
+    return
+
+def register_Ns3PcapFile_methods(root_module, cls):
+    ## pcap-file.h (module 'network'): ns3::PcapFile::PcapFile() [constructor]
+    cls.add_constructor([])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Clear() [member function]
+    cls.add_method('Clear', 
+                   'void', 
+                   [])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Close() [member function]
+    cls.add_method('Close', 
+                   'void', 
+                   [])
+    ## pcap-file.h (module 'network'): static bool ns3::PcapFile::Diff(std::string const & f1, std::string const & f2, uint32_t & sec, uint32_t & usec, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT) [member function]
+    cls.add_method('Diff', 
+                   'bool', 
+                   [param('std::string const &', 'f1'), param('std::string const &', 'f2'), param('uint32_t &', 'sec'), param('uint32_t &', 'usec'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT')], 
+                   is_static=True)
+    ## pcap-file.h (module 'network'): bool ns3::PcapFile::Eof() const [member function]
+    cls.add_method('Eof', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## pcap-file.h (module 'network'): bool ns3::PcapFile::Fail() const [member function]
+    cls.add_method('Fail', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## pcap-file.h (module 'network'): uint32_t ns3::PcapFile::GetDataLinkType() [member function]
+    cls.add_method('GetDataLinkType', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint32_t ns3::PcapFile::GetMagic() [member function]
+    cls.add_method('GetMagic', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint32_t ns3::PcapFile::GetSigFigs() [member function]
+    cls.add_method('GetSigFigs', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint32_t ns3::PcapFile::GetSnapLen() [member function]
+    cls.add_method('GetSnapLen', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): bool ns3::PcapFile::GetSwapMode() [member function]
+    cls.add_method('GetSwapMode', 
+                   'bool', 
+                   [])
+    ## pcap-file.h (module 'network'): int32_t ns3::PcapFile::GetTimeZoneOffset() [member function]
+    cls.add_method('GetTimeZoneOffset', 
+                   'int32_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint16_t ns3::PcapFile::GetVersionMajor() [member function]
+    cls.add_method('GetVersionMajor', 
+                   'uint16_t', 
+                   [])
+    ## pcap-file.h (module 'network'): uint16_t ns3::PcapFile::GetVersionMinor() [member function]
+    cls.add_method('GetVersionMinor', 
+                   'uint16_t', 
+                   [])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Init(uint32_t dataLinkType, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT, int32_t timeZoneCorrection=ns3::PcapFile::ZONE_DEFAULT, bool swapMode=false) [member function]
+    cls.add_method('Init', 
+                   'void', 
+                   [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT'), param('int32_t', 'timeZoneCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT'), param('bool', 'swapMode', default_value='false')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Open(std::string const & filename, std::_Ios_Openmode mode) [member function]
+    cls.add_method('Open', 
+                   'void', 
+                   [param('std::string const &', 'filename'), param('std::_Ios_Openmode', 'mode')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Read(uint8_t * const data, uint32_t maxBytes, uint32_t & tsSec, uint32_t & tsUsec, uint32_t & inclLen, uint32_t & origLen, uint32_t & readLen) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t * const', 'data'), param('uint32_t', 'maxBytes'), param('uint32_t &', 'tsSec'), param('uint32_t &', 'tsUsec'), param('uint32_t &', 'inclLen'), param('uint32_t &', 'origLen'), param('uint32_t &', 'readLen')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, uint8_t const * const data, uint32_t totalLen) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('uint8_t const * const', 'data'), param('uint32_t', 'totalLen')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Ptr< ns3::Packet const >', 'p')])
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
+    ## pcap-file.h (module 'network'): ns3::PcapFile::SNAPLEN_DEFAULT [variable]
+    cls.add_static_attribute('SNAPLEN_DEFAULT', 'uint32_t const', is_const=True)
+    ## pcap-file.h (module 'network'): ns3::PcapFile::ZONE_DEFAULT [variable]
+    cls.add_static_attribute('ZONE_DEFAULT', 'int32_t const', is_const=True)
+    return
+
+def register_Ns3PcapHelper_methods(root_module, cls):
+    ## trace-helper.h (module 'network'): ns3::PcapHelper::PcapHelper(ns3::PcapHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PcapHelper const &', 'arg0')])
+    ## trace-helper.h (module 'network'): ns3::PcapHelper::PcapHelper() [constructor]
+    cls.add_constructor([])
+    ## trace-helper.h (module 'network'): ns3::Ptr<ns3::PcapFileWrapper> ns3::PcapHelper::CreateFile(std::string filename, std::_Ios_Openmode filemode, uint32_t dataLinkType, uint32_t snapLen=65535, int32_t tzCorrection=0) [member function]
+    cls.add_method('CreateFile', 
+                   'ns3::Ptr< ns3::PcapFileWrapper >', 
+                   [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='65535'), param('int32_t', 'tzCorrection', default_value='0')])
+    ## trace-helper.h (module 'network'): std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
+    cls.add_method('GetFilenameFromDevice', 
+                   'std::string', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'useObjectNames', default_value='true')])
+    ## trace-helper.h (module 'network'): std::string ns3::PcapHelper::GetFilenameFromInterfacePair(std::string prefix, ns3::Ptr<ns3::Object> object, uint32_t interface, bool useObjectNames=true) [member function]
+    cls.add_method('GetFilenameFromInterfacePair', 
+                   'std::string', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Object >', 'object'), param('uint32_t', 'interface'), param('bool', 'useObjectNames', default_value='true')])
+    return
+
+def register_Ns3PcapHelperForDevice_methods(root_module, cls):
+    ## trace-helper.h (module 'network'): ns3::PcapHelperForDevice::PcapHelperForDevice(ns3::PcapHelperForDevice const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PcapHelperForDevice const &', 'arg0')])
+    ## trace-helper.h (module 'network'): ns3::PcapHelperForDevice::PcapHelperForDevice() [constructor]
+    cls.add_constructor([])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false, bool explicitFilename=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false'), param('bool', 'explicitFilename', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, std::string ndName, bool promiscuous=false, bool explicitFilename=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('std::string', 'ndName'), param('bool', 'promiscuous', default_value='false'), param('bool', 'explicitFilename', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, ns3::NetDeviceContainer d, bool promiscuous=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd'), param('bool', 'promiscuous', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, ns3::NodeContainer n, bool promiscuous=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n'), param('bool', 'promiscuous', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcap(std::string prefix, uint32_t nodeid, uint32_t deviceid, bool promiscuous=false) [member function]
+    cls.add_method('EnablePcap', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid'), param('bool', 'promiscuous', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcapAll(std::string prefix, bool promiscuous=false) [member function]
+    cls.add_method('EnablePcapAll', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('bool', 'promiscuous', default_value='false')])
+    ## trace-helper.h (module 'network'): void ns3::PcapHelperForDevice::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous, bool explicitFilename) [member function]
+    cls.add_method('EnablePcapInternal', 
+                   'void', 
+                   [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous'), param('bool', 'explicitFilename')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount(ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3Simulator_methods(root_module, cls):
+    ## simulator.h (module 'core'): ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Simulator const &', 'arg0')])
+    ## simulator.h (module 'core'): static void ns3::Simulator::Cancel(ns3::EventId const & id) [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [param('ns3::EventId const &', 'id')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::Destroy() [member function]
+    cls.add_method('Destroy', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetContext() [member function]
+    cls.add_method('GetContext', 
+                   'uint32_t', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetDelayLeft(ns3::EventId const & id) [member function]
+    cls.add_method('GetDelayLeft', 
+                   'ns3::Time', 
+                   [param('ns3::EventId const &', 'id')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static ns3::Ptr<ns3::SimulatorImpl> ns3::Simulator::GetImplementation() [member function]
+    cls.add_method('GetImplementation', 
+                   'ns3::Ptr< ns3::SimulatorImpl >', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetMaximumSimulationTime() [member function]
+    cls.add_method('GetMaximumSimulationTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetSystemId() [member function]
+    cls.add_method('GetSystemId', 
+                   'uint32_t', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static bool ns3::Simulator::IsExpired(ns3::EventId const & id) [member function]
+    cls.add_method('IsExpired', 
+                   'bool', 
+                   [param('ns3::EventId const &', 'id')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static bool ns3::Simulator::IsFinished() [member function]
+    cls.add_method('IsFinished', 
+                   'bool', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function]
+    cls.add_method('Now', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::Remove(ns3::EventId const & id) [member function]
+    cls.add_method('Remove', 
+                   'void', 
+                   [param('ns3::EventId const &', 'id')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr<ns3::SimulatorImpl> impl) [member function]
+    cls.add_method('SetImplementation', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function]
+    cls.add_method('SetScheduler', 
+                   'void', 
+                   [param('ns3::ObjectFactory', 'schedulerFactory')], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::Stop() [member function]
+    cls.add_method('Stop', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## simulator.h (module 'core'): static void ns3::Simulator::Stop(ns3::Time const & time) [member function]
+    cls.add_method('Stop', 
+                   'void', 
+                   [param('ns3::Time const &', 'time')], 
+                   is_static=True)
+    return
+
+def register_Ns3StatusCode_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## status-code.h (module 'wifi'): ns3::StatusCode::StatusCode(ns3::StatusCode const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::StatusCode const &', 'arg0')])
+    ## status-code.h (module 'wifi'): ns3::StatusCode::StatusCode() [constructor]
+    cls.add_constructor([])
+    ## status-code.h (module 'wifi'): ns3::Buffer::Iterator ns3::StatusCode::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')])
+    ## status-code.h (module 'wifi'): uint32_t ns3::StatusCode::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## status-code.h (module 'wifi'): bool ns3::StatusCode::IsSuccess() const [member function]
+    cls.add_method('IsSuccess', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## status-code.h (module 'wifi'): ns3::Buffer::Iterator ns3::StatusCode::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## status-code.h (module 'wifi'): void ns3::StatusCode::SetFailure() [member function]
+    cls.add_method('SetFailure', 
+                   'void', 
+                   [])
+    ## status-code.h (module 'wifi'): void ns3::StatusCode::SetSuccess() [member function]
+    cls.add_method('SetSuccess', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3Tag_methods(root_module, cls):
+    ## tag.h (module 'network'): ns3::Tag::Tag() [constructor]
+    cls.add_constructor([])
+    ## tag.h (module 'network'): ns3::Tag::Tag(ns3::Tag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Tag const &', 'arg0')])
+    ## tag.h (module 'network'): void ns3::Tag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## tag.h (module 'network'): uint32_t ns3::Tag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## tag.h (module 'network'): static ns3::TypeId ns3::Tag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## tag.h (module 'network'): void ns3::Tag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## tag.h (module 'network'): void ns3::Tag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3TagBuffer_methods(root_module, cls):
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(ns3::TagBuffer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TagBuffer const &', 'arg0')])
+    ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(uint8_t * start, uint8_t * end) [constructor]
+    cls.add_constructor([param('uint8_t *', 'start'), param('uint8_t *', 'end')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::CopyFrom(ns3::TagBuffer o) [member function]
+    cls.add_method('CopyFrom', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'o')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::Read(uint8_t * buffer, uint32_t size) [member function]
+    cls.add_method('Read', 
+                   'void', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+    ## tag-buffer.h (module 'network'): double ns3::TagBuffer::ReadDouble() [member function]
+    cls.add_method('ReadDouble', 
+                   'double', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint16_t ns3::TagBuffer::ReadU16() [member function]
+    cls.add_method('ReadU16', 
+                   'uint16_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint32_t ns3::TagBuffer::ReadU32() [member function]
+    cls.add_method('ReadU32', 
+                   'uint32_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint64_t ns3::TagBuffer::ReadU64() [member function]
+    cls.add_method('ReadU64', 
+                   'uint64_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): uint8_t ns3::TagBuffer::ReadU8() [member function]
+    cls.add_method('ReadU8', 
+                   'uint8_t', 
+                   [])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::TrimAtEnd(uint32_t trim) [member function]
+    cls.add_method('TrimAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'trim')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::Write(uint8_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteDouble(double v) [member function]
+    cls.add_method('WriteDouble', 
+                   'void', 
+                   [param('double', 'v')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU16(uint16_t data) [member function]
+    cls.add_method('WriteU16', 
+                   'void', 
+                   [param('uint16_t', 'data')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU32(uint32_t data) [member function]
+    cls.add_method('WriteU32', 
+                   'void', 
+                   [param('uint32_t', 'data')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU64(uint64_t v) [member function]
+    cls.add_method('WriteU64', 
+                   'void', 
+                   [param('uint64_t', 'v')])
+    ## tag-buffer.h (module 'network'): void ns3::TagBuffer::WriteU8(uint8_t v) [member function]
+    cls.add_method('WriteU8', 
+                   'void', 
+                   [param('uint8_t', 'v')])
+    return
+
+def register_Ns3TypeId_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor]
+    cls.add_constructor([param('char const *', 'name')])
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::TypeId(ns3::TypeId const & o) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId const &', 'o')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('AddAttribute', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('AddAttribute', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]
+    cls.add_method('AddTraceSource', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation ns3::TypeId::GetAttribute(uint32_t i) const [member function]
+    cls.add_method('GetAttribute', 
+                   'ns3::TypeId::AttributeInformation', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetAttributeFullName(uint32_t i) const [member function]
+    cls.add_method('GetAttributeFullName', 
+                   'std::string', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetAttributeN() const [member function]
+    cls.add_method('GetAttributeN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::Callback<ns3::ObjectBase*,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::TypeId::GetConstructor() const [member function]
+    cls.add_method('GetConstructor', 
+                   'ns3::Callback< ns3::ObjectBase *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetGroupName() const [member function]
+    cls.add_method('GetGroupName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::GetParent() const [member function]
+    cls.add_method('GetParent', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::GetRegistered(uint32_t i) [member function]
+    cls.add_method('GetRegistered', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'i')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static uint32_t ns3::TypeId::GetRegisteredN() [member function]
+    cls.add_method('GetRegisteredN', 
+                   'uint32_t', 
+                   [], 
+                   is_static=True)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation ns3::TypeId::GetTraceSource(uint32_t i) const [member function]
+    cls.add_method('GetTraceSource', 
+                   'ns3::TypeId::TraceSourceInformation', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetTraceSourceN() const [member function]
+    cls.add_method('GetTraceSourceN', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): uint16_t ns3::TypeId::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::HasConstructor() const [member function]
+    cls.add_method('HasConstructor', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::HasParent() const [member function]
+    cls.add_method('HasParent', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::HideFromDocumentation() [member function]
+    cls.add_method('HideFromDocumentation', 
+                   'ns3::TypeId', 
+                   [])
+    ## type-id.h (module 'core'): bool ns3::TypeId::IsChildOf(ns3::TypeId other) const [member function]
+    cls.add_method('IsChildOf', 
+                   'bool', 
+                   [param('ns3::TypeId', 'other')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::LookupAttributeByName(std::string name, ns3::TypeId::AttributeInformation * info) const [member function]
+    cls.add_method('LookupAttributeByName', 
+                   'bool', 
+                   [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
+                   is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
+    cls.add_method('LookupByName', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'name')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): ns3::Ptr<ns3::TraceSourceAccessor const> ns3::TypeId::LookupTraceSourceByName(std::string name) const [member function]
+    cls.add_method('LookupTraceSourceByName', 
+                   'ns3::Ptr< ns3::TraceSourceAccessor const >', 
+                   [param('std::string', 'name')], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::MustHideFromDocumentation() const [member function]
+    cls.add_method('MustHideFromDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): bool ns3::TypeId::SetAttributeInitialValue(uint32_t i, ns3::Ptr<ns3::AttributeValue const> initialValue) [member function]
+    cls.add_method('SetAttributeInitialValue', 
+                   'bool', 
+                   [param('uint32_t', 'i'), param('ns3::Ptr< ns3::AttributeValue const >', 'initialValue')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetGroupName(std::string groupName) [member function]
+    cls.add_method('SetGroupName', 
+                   'ns3::TypeId', 
+                   [param('std::string', 'groupName')])
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetParent(ns3::TypeId tid) [member function]
+    cls.add_method('SetParent', 
+                   'ns3::TypeId', 
+                   [param('ns3::TypeId', 'tid')])
+    ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t tid) [member function]
+    cls.add_method('SetUid', 
+                   'void', 
+                   [param('uint16_t', 'tid')])
+    return
+
+def register_Ns3TypeIdAttributeInformation_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::AttributeInformation() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::AttributeInformation(ns3::TypeId::AttributeInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId::AttributeInformation const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::accessor [variable]
+    cls.add_instance_attribute('accessor', 'ns3::Ptr< ns3::AttributeAccessor const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::checker [variable]
+    cls.add_instance_attribute('checker', 'ns3::Ptr< ns3::AttributeChecker const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::flags [variable]
+    cls.add_instance_attribute('flags', 'uint32_t', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::help [variable]
+    cls.add_instance_attribute('help', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::initialValue [variable]
+    cls.add_instance_attribute('initialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::originalInitialValue [variable]
+    cls.add_instance_attribute('originalInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)
+    return
+
+def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::TraceSourceInformation() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::TraceSourceInformation(ns3::TypeId::TraceSourceInformation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeId::TraceSourceInformation const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::accessor [variable]
+    cls.add_instance_attribute('accessor', 'ns3::Ptr< ns3::TraceSourceAccessor const >', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::help [variable]
+    cls.add_instance_attribute('help', 'std::string', is_const=False)
+    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::name [variable]
+    cls.add_instance_attribute('name', 'std::string', is_const=False)
+    return
+
+def register_Ns3VendorSpecificContentManager_methods(root_module, cls):
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificContentManager::VendorSpecificContentManager(ns3::VendorSpecificContentManager const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::VendorSpecificContentManager const &', 'arg0')])
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificContentManager::VendorSpecificContentManager() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificContentManager::DeregisterVscCallback(ns3::OrganizationIdentifier & oi) [member function]
+    cls.add_method('DeregisterVscCallback', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier &', 'oi')])
+    ## vendor-specific-action.h (module 'wave'): ns3::VscCallback ns3::VendorSpecificContentManager::FindVscCallback(ns3::OrganizationIdentifier & oi) [member function]
+    cls.add_method('FindVscCallback', 
+                   'ns3::VscCallback', 
+                   [param('ns3::OrganizationIdentifier &', 'oi')])
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificContentManager::RegisterVscCallback(ns3::OrganizationIdentifier oi, ns3::VscCallback cb) [member function]
+    cls.add_method('RegisterVscCallback', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier', 'oi'), param('ns3::VscCallback', 'cb')])
+    return
+
+def register_Ns3WifiHelper_methods(root_module, cls):
+    ## wifi-helper.h (module 'wifi'): ns3::WifiHelper::WifiHelper(ns3::WifiHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiHelper const &', 'arg0')])
+    ## wifi-helper.h (module 'wifi'): ns3::WifiHelper::WifiHelper() [constructor]
+    cls.add_constructor([])
+    ## wifi-helper.h (module 'wifi'): int64_t ns3::WifiHelper::AssignStreams(ns3::NetDeviceContainer c, int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('ns3::NetDeviceContainer', 'c'), param('int64_t', 'stream')])
+    ## wifi-helper.h (module 'wifi'): static ns3::WifiHelper ns3::WifiHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::WifiHelper', 
+                   [], 
+                   is_static=True)
+    ## wifi-helper.h (module 'wifi'): static void ns3::WifiHelper::EnableLogComponents() [member function]
+    cls.add_method('EnableLogComponents', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::NodeContainer c) const [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::NodeContainer', 'c')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::Ptr<ns3::Node> node) const [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, std::string nodeName) const [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('std::string', 'nodeName')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetRemoteStationManager(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetRemoteStationManager', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')])
+    ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('SetStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_virtual=True)
+    return
+
+def register_Ns3WifiMacHelper_methods(root_module, cls):
+    ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper::WifiMacHelper() [constructor]
+    cls.add_constructor([])
+    ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper::WifiMacHelper(ns3::WifiMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMacHelper const &', 'arg0')])
+    ## wifi-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::WifiMacHelper::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::WifiMac >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3WifiMode_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode::WifiMode(ns3::WifiMode const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMode const &', 'arg0')])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode::WifiMode() [constructor]
+    cls.add_constructor([])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode::WifiMode(std::string name) [constructor]
+    cls.add_constructor([param('std::string', 'name')])
+    ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetBandwidth() const [member function]
+    cls.add_method('GetBandwidth', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate ns3::WifiMode::GetCodeRate() const [member function]
+    cls.add_method('GetCodeRate', 
+                   'ns3::WifiCodeRate', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): uint8_t ns3::WifiMode::GetConstellationSize() const [member function]
+    cls.add_method('GetConstellationSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate() const [member function]
+    cls.add_method('GetDataRate', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass ns3::WifiMode::GetModulationClass() const [member function]
+    cls.add_method('GetModulationClass', 
+                   'ns3::WifiModulationClass', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate() const [member function]
+    cls.add_method('GetPhyRate', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): std::string ns3::WifiMode::GetUniqueName() const [member function]
+    cls.add_method('GetUniqueName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): bool ns3::WifiMode::IsMandatory() const [member function]
+    cls.add_method('IsMandatory', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3WifiModeFactory_methods(root_module, cls):
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeFactory::WifiModeFactory(ns3::WifiModeFactory const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiModeFactory const &', 'arg0')])
+    ## wifi-mode.h (module 'wifi'): static ns3::WifiMode ns3::WifiModeFactory::CreateWifiMode(std::string uniqueName, ns3::WifiModulationClass modClass, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, ns3::WifiCodeRate codingRate, uint8_t constellationSize) [member function]
+    cls.add_method('CreateWifiMode', 
+                   'ns3::WifiMode', 
+                   [param('std::string', 'uniqueName'), param('ns3::WifiModulationClass', 'modClass'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('ns3::WifiCodeRate', 'codingRate'), param('uint8_t', 'constellationSize')], 
+                   is_static=True)
+    return
+
+def register_Ns3WifiPhyHelper_methods(root_module, cls):
+    ## wifi-helper.h (module 'wifi'): ns3::WifiPhyHelper::WifiPhyHelper() [constructor]
+    cls.add_constructor([])
+    ## wifi-helper.h (module 'wifi'): ns3::WifiPhyHelper::WifiPhyHelper(ns3::WifiPhyHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiPhyHelper const &', 'arg0')])
+    ## wifi-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiPhy> ns3::WifiPhyHelper::Create(ns3::Ptr<ns3::Node> node, ns3::Ptr<ns3::WifiNetDevice> device) const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::WifiPhy >', 
+                   [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::WifiNetDevice >', 'device')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3WifiPhyListener_methods(root_module, cls):
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhyListener::WifiPhyListener() [constructor]
+    cls.add_constructor([])
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhyListener::WifiPhyListener(ns3::WifiPhyListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiPhyListener const &', 'arg0')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyMaybeCcaBusyStart(ns3::Time duration) [member function]
+    cls.add_method('NotifyMaybeCcaBusyStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyRxEndError() [member function]
+    cls.add_method('NotifyRxEndError', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyRxEndOk() [member function]
+    cls.add_method('NotifyRxEndOk', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyRxStart(ns3::Time duration) [member function]
+    cls.add_method('NotifyRxStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifySwitchingStart(ns3::Time duration) [member function]
+    cls.add_method('NotifySwitchingStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhyListener::NotifyTxStart(ns3::Time duration) [member function]
+    cls.add_method('NotifyTxStart', 
+                   'void', 
+                   [param('ns3::Time', 'duration')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3WifiRemoteStation_methods(root_module, cls):
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::WifiRemoteStation() [constructor]
+    cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::WifiRemoteStation(ns3::WifiRemoteStation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiRemoteStation const &', 'arg0')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::m_slrc [variable]
+    cls.add_instance_attribute('m_slrc', 'uint32_t', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::m_ssrc [variable]
+    cls.add_instance_attribute('m_ssrc', 'uint32_t', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::m_state [variable]
+    cls.add_instance_attribute('m_state', 'ns3::WifiRemoteStationState *', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation::m_tid [variable]
+    cls.add_instance_attribute('m_tid', 'uint8_t', is_const=False)
+    return
+
+def register_Ns3WifiRemoteStationInfo_methods(root_module, cls):
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo::WifiRemoteStationInfo(ns3::WifiRemoteStationInfo const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiRemoteStationInfo const &', 'arg0')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo::WifiRemoteStationInfo() [constructor]
+    cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): double ns3::WifiRemoteStationInfo::GetFrameErrorRate() const [member function]
+    cls.add_method('GetFrameErrorRate', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationInfo::NotifyTxFailed() [member function]
+    cls.add_method('NotifyTxFailed', 
+                   'void', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationInfo::NotifyTxSuccess(uint32_t retryCounter) [member function]
+    cls.add_method('NotifyTxSuccess', 
+                   'void', 
+                   [param('uint32_t', 'retryCounter')])
+    return
+
+def register_Ns3WifiRemoteStationState_methods(root_module, cls):
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::WifiRemoteStationState() [constructor]
+    cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::WifiRemoteStationState(ns3::WifiRemoteStationState const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiRemoteStationState const &', 'arg0')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_address [variable]
+    cls.add_instance_attribute('m_address', 'ns3::Mac48Address', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_greenfield [variable]
+    cls.add_instance_attribute('m_greenfield', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_info [variable]
+    cls.add_instance_attribute('m_info', 'ns3::WifiRemoteStationInfo', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_operationalMcsSet [variable]
+    cls.add_instance_attribute('m_operationalMcsSet', 'ns3::WifiMcsList', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_operationalRateSet [variable]
+    cls.add_instance_attribute('m_operationalRateSet', 'ns3::WifiModeList', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_rx [variable]
+    cls.add_instance_attribute('m_rx', 'uint32_t', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_shortGuardInterval [variable]
+    cls.add_instance_attribute('m_shortGuardInterval', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_stbc [variable]
+    cls.add_instance_attribute('m_stbc', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_tx [variable]
+    cls.add_instance_attribute('m_tx', 'uint32_t', is_const=False)
+    return
+
+def register_Ns3WifiTxVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiTxVector const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
+    cls.add_constructor([])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNess() const [member function]
+    cls.add_method('GetNess', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNss() const [member function]
+    cls.add_method('GetNss', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetRetries() const [member function]
+    cls.add_method('GetRetries', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetTxPowerLevel() const [member function]
+    cls.add_method('GetTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsShortGuardInterval() const [member function]
+    cls.add_method('IsShortGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsStbc() const [member function]
+    cls.add_method('IsStbc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetMode(ns3::WifiMode mode) [member function]
+    cls.add_method('SetMode', 
+                   'void', 
+                   [param('ns3::WifiMode', 'mode')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNess(uint8_t ness) [member function]
+    cls.add_method('SetNess', 
+                   'void', 
+                   [param('uint8_t', 'ness')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNss(uint8_t nss) [member function]
+    cls.add_method('SetNss', 
+                   'void', 
+                   [param('uint8_t', 'nss')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetRetries(uint8_t retries) [member function]
+    cls.add_method('SetRetries', 
+                   'void', 
+                   [param('uint8_t', 'retries')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetShortGuardInterval(bool guardinterval) [member function]
+    cls.add_method('SetShortGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardinterval')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
+    cls.add_method('SetTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'powerlevel')])
+    return
+
+def register_Ns3Empty_methods(root_module, cls):
+    ## empty.h (module 'core'): ns3::empty::empty() [constructor]
+    cls.add_constructor([])
+    ## empty.h (module 'core'): ns3::empty::empty(ns3::empty const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::empty const &', 'arg0')])
+    return
+
+def register_Ns3Int64x64_t_methods(root_module, cls):
+    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_comparison_operator('<=')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_unary_numeric_operator('-')
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('>')
+    cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    cls.add_binary_comparison_operator('>=')
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
+    cls.add_constructor([])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(double v) [constructor]
+    cls.add_constructor([param('double', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long int v) [constructor]
+    cls.add_constructor([param('long int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long long int v) [constructor]
+    cls.add_constructor([param('long long int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(unsigned int v) [constructor]
+    cls.add_constructor([param('unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long unsigned int v) [constructor]
+    cls.add_constructor([param('long unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(long long unsigned int v) [constructor]
+    cls.add_constructor([param('long long unsigned int', 'v')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(int64_t hi, uint64_t lo) [constructor]
+    cls.add_constructor([param('int64_t', 'hi'), param('uint64_t', 'lo')])
+    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t(ns3::int64x64_t const & o) [copy constructor]
+    cls.add_constructor([param('ns3::int64x64_t const &', 'o')])
+    ## int64x64-double.h (module 'core'): double ns3::int64x64_t::GetDouble() const [member function]
+    cls.add_method('GetDouble', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): int64_t ns3::int64x64_t::GetHigh() const [member function]
+    cls.add_method('GetHigh', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): uint64_t ns3::int64x64_t::GetLow() const [member function]
+    cls.add_method('GetLow', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## int64x64-double.h (module 'core'): static ns3::int64x64_t ns3::int64x64_t::Invert(uint64_t v) [member function]
+    cls.add_method('Invert', 
+                   'ns3::int64x64_t', 
+                   [param('uint64_t', 'v')], 
+                   is_static=True)
+    ## int64x64-double.h (module 'core'): void ns3::int64x64_t::MulByInvert(ns3::int64x64_t const & o) [member function]
+    cls.add_method('MulByInvert', 
+                   'void', 
+                   [param('ns3::int64x64_t const &', 'o')])
+    return
+
+def register_Ns3Chunk_methods(root_module, cls):
+    ## chunk.h (module 'network'): ns3::Chunk::Chunk() [constructor]
+    cls.add_constructor([])
+    ## chunk.h (module 'network'): ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Chunk const &', 'arg0')])
+    ## chunk.h (module 'network'): uint32_t ns3::Chunk::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## chunk.h (module 'network'): static ns3::TypeId ns3::Chunk::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## chunk.h (module 'network'): void ns3::Chunk::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Header_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## header.h (module 'network'): ns3::Header::Header() [constructor]
+    cls.add_constructor([])
+    ## header.h (module 'network'): ns3::Header::Header(ns3::Header const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Header const &', 'arg0')])
+    ## header.h (module 'network'): uint32_t ns3::Header::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## header.h (module 'network'): uint32_t ns3::Header::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## header.h (module 'network'): static ns3::TypeId ns3::Header::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## header.h (module 'network'): void ns3::Header::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## header.h (module 'network'): void ns3::Header::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3HigherDataTxVectorTag_methods(root_module, cls):
+    ## higher-tx-tag.h (module 'wave'): ns3::HigherDataTxVectorTag::HigherDataTxVectorTag(ns3::HigherDataTxVectorTag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HigherDataTxVectorTag const &', 'arg0')])
+    ## higher-tx-tag.h (module 'wave'): ns3::HigherDataTxVectorTag::HigherDataTxVectorTag() [constructor]
+    cls.add_constructor([])
+    ## higher-tx-tag.h (module 'wave'): ns3::HigherDataTxVectorTag::HigherDataTxVectorTag(ns3::WifiTxVector dataTxVector, bool adapter) [constructor]
+    cls.add_constructor([param('ns3::WifiTxVector', 'dataTxVector'), param('bool', 'adapter')])
+    ## higher-tx-tag.h (module 'wave'): void ns3::HigherDataTxVectorTag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_virtual=True)
+    ## higher-tx-tag.h (module 'wave'): ns3::WifiTxVector ns3::HigherDataTxVectorTag::GetDataTxVector() const [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [], 
+                   is_const=True)
+    ## higher-tx-tag.h (module 'wave'): ns3::TypeId ns3::HigherDataTxVectorTag::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## higher-tx-tag.h (module 'wave'): uint32_t ns3::HigherDataTxVectorTag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## higher-tx-tag.h (module 'wave'): static ns3::TypeId ns3::HigherDataTxVectorTag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## higher-tx-tag.h (module 'wave'): bool ns3::HigherDataTxVectorTag::IsAdapter() const [member function]
+    cls.add_method('IsAdapter', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## higher-tx-tag.h (module 'wave'): void ns3::HigherDataTxVectorTag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## higher-tx-tag.h (module 'wave'): void ns3::HigherDataTxVectorTag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_const=True, is_virtual=True)
+    return
+
+def register_Ns3MgtAddBaRequestHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaRequestHeader::MgtAddBaRequestHeader(ns3::MgtAddBaRequestHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtAddBaRequestHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaRequestHeader::MgtAddBaRequestHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAddBaRequestHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaRequestHeader::GetBufferSize() const [member function]
+    cls.add_method('GetBufferSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtAddBaRequestHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAddBaRequestHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaRequestHeader::GetStartingSequence() const [member function]
+    cls.add_method('GetStartingSequence', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint8_t ns3::MgtAddBaRequestHeader::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaRequestHeader::GetTimeout() const [member function]
+    cls.add_method('GetTimeout', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtAddBaRequestHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtAddBaRequestHeader::IsAmsduSupported() const [member function]
+    cls.add_method('IsAmsduSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtAddBaRequestHeader::IsImmediateBlockAck() const [member function]
+    cls.add_method('IsImmediateBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetAmsduSupport(bool supported) [member function]
+    cls.add_method('SetAmsduSupport', 
+                   'void', 
+                   [param('bool', 'supported')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetBufferSize(uint16_t size) [member function]
+    cls.add_method('SetBufferSize', 
+                   'void', 
+                   [param('uint16_t', 'size')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetDelayedBlockAck() [member function]
+    cls.add_method('SetDelayedBlockAck', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetImmediateBlockAck() [member function]
+    cls.add_method('SetImmediateBlockAck', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetStartingSequence(uint16_t seq) [member function]
+    cls.add_method('SetStartingSequence', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetTid(uint8_t tid) [member function]
+    cls.add_method('SetTid', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaRequestHeader::SetTimeout(uint16_t timeout) [member function]
+    cls.add_method('SetTimeout', 
+                   'void', 
+                   [param('uint16_t', 'timeout')])
+    return
+
+def register_Ns3MgtAddBaResponseHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaResponseHeader::MgtAddBaResponseHeader(ns3::MgtAddBaResponseHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtAddBaResponseHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAddBaResponseHeader::MgtAddBaResponseHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAddBaResponseHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaResponseHeader::GetBufferSize() const [member function]
+    cls.add_method('GetBufferSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtAddBaResponseHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAddBaResponseHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::StatusCode ns3::MgtAddBaResponseHeader::GetStatusCode() const [member function]
+    cls.add_method('GetStatusCode', 
+                   'ns3::StatusCode', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint8_t ns3::MgtAddBaResponseHeader::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAddBaResponseHeader::GetTimeout() const [member function]
+    cls.add_method('GetTimeout', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtAddBaResponseHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtAddBaResponseHeader::IsAmsduSupported() const [member function]
+    cls.add_method('IsAmsduSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtAddBaResponseHeader::IsImmediateBlockAck() const [member function]
+    cls.add_method('IsImmediateBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetAmsduSupport(bool supported) [member function]
+    cls.add_method('SetAmsduSupport', 
+                   'void', 
+                   [param('bool', 'supported')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetBufferSize(uint16_t size) [member function]
+    cls.add_method('SetBufferSize', 
+                   'void', 
+                   [param('uint16_t', 'size')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetDelayedBlockAck() [member function]
+    cls.add_method('SetDelayedBlockAck', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetImmediateBlockAck() [member function]
+    cls.add_method('SetImmediateBlockAck', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetStatusCode(ns3::StatusCode code) [member function]
+    cls.add_method('SetStatusCode', 
+                   'void', 
+                   [param('ns3::StatusCode', 'code')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetTid(uint8_t tid) [member function]
+    cls.add_method('SetTid', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAddBaResponseHeader::SetTimeout(uint16_t timeout) [member function]
+    cls.add_method('SetTimeout', 
+                   'void', 
+                   [param('uint16_t', 'timeout')])
+    return
+
+def register_Ns3MgtAssocRequestHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocRequestHeader::MgtAssocRequestHeader(ns3::MgtAssocRequestHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtAssocRequestHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocRequestHeader::MgtAssocRequestHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAssocRequestHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::HtCapabilities ns3::MgtAssocRequestHeader::GetHtCapabilities() const [member function]
+    cls.add_method('GetHtCapabilities', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtAssocRequestHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint16_t ns3::MgtAssocRequestHeader::GetListenInterval() const [member function]
+    cls.add_method('GetListenInterval', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAssocRequestHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::Ssid ns3::MgtAssocRequestHeader::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::SupportedRates ns3::MgtAssocRequestHeader::GetSupportedRates() const [member function]
+    cls.add_method('GetSupportedRates', 
+                   'ns3::SupportedRates', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtAssocRequestHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::SetHtCapabilities(ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('SetHtCapabilities', 
+                   'void', 
+                   [param('ns3::HtCapabilities', 'htcapabilities')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::SetListenInterval(uint16_t interval) [member function]
+    cls.add_method('SetListenInterval', 
+                   'void', 
+                   [param('uint16_t', 'interval')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocRequestHeader::SetSupportedRates(ns3::SupportedRates rates) [member function]
+    cls.add_method('SetSupportedRates', 
+                   'void', 
+                   [param('ns3::SupportedRates', 'rates')])
+    return
+
+def register_Ns3MgtAssocResponseHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocResponseHeader::MgtAssocResponseHeader(ns3::MgtAssocResponseHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtAssocResponseHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtAssocResponseHeader::MgtAssocResponseHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAssocResponseHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::HtCapabilities ns3::MgtAssocResponseHeader::GetHtCapabilities() const [member function]
+    cls.add_method('GetHtCapabilities', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtAssocResponseHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtAssocResponseHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::StatusCode ns3::MgtAssocResponseHeader::GetStatusCode() [member function]
+    cls.add_method('GetStatusCode', 
+                   'ns3::StatusCode', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): ns3::SupportedRates ns3::MgtAssocResponseHeader::GetSupportedRates() [member function]
+    cls.add_method('GetSupportedRates', 
+                   'ns3::SupportedRates', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtAssocResponseHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::SetHtCapabilities(ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('SetHtCapabilities', 
+                   'void', 
+                   [param('ns3::HtCapabilities', 'htcapabilities')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::SetStatusCode(ns3::StatusCode code) [member function]
+    cls.add_method('SetStatusCode', 
+                   'void', 
+                   [param('ns3::StatusCode', 'code')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtAssocResponseHeader::SetSupportedRates(ns3::SupportedRates rates) [member function]
+    cls.add_method('SetSupportedRates', 
+                   'void', 
+                   [param('ns3::SupportedRates', 'rates')])
+    return
+
+def register_Ns3MgtDelBaHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtDelBaHeader::MgtDelBaHeader(ns3::MgtDelBaHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtDelBaHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtDelBaHeader::MgtDelBaHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtDelBaHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtDelBaHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtDelBaHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint8_t ns3::MgtDelBaHeader::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtDelBaHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): bool ns3::MgtDelBaHeader::IsByOriginator() const [member function]
+    cls.add_method('IsByOriginator', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::SetByOriginator() [member function]
+    cls.add_method('SetByOriginator', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::SetByRecipient() [member function]
+    cls.add_method('SetByRecipient', 
+                   'void', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtDelBaHeader::SetTid(uint8_t arg0) [member function]
+    cls.add_method('SetTid', 
+                   'void', 
+                   [param('uint8_t', 'arg0')])
+    return
+
+def register_Ns3MgtProbeRequestHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeRequestHeader::MgtProbeRequestHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeRequestHeader::MgtProbeRequestHeader(ns3::MgtProbeRequestHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtProbeRequestHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtProbeRequestHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::HtCapabilities ns3::MgtProbeRequestHeader::GetHtCapabilities() const [member function]
+    cls.add_method('GetHtCapabilities', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtProbeRequestHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtProbeRequestHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::Ssid ns3::MgtProbeRequestHeader::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::SupportedRates ns3::MgtProbeRequestHeader::GetSupportedRates() const [member function]
+    cls.add_method('GetSupportedRates', 
+                   'ns3::SupportedRates', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtProbeRequestHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::SetHtCapabilities(ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('SetHtCapabilities', 
+                   'void', 
+                   [param('ns3::HtCapabilities', 'htcapabilities')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeRequestHeader::SetSupportedRates(ns3::SupportedRates rates) [member function]
+    cls.add_method('SetSupportedRates', 
+                   'void', 
+                   [param('ns3::SupportedRates', 'rates')])
+    return
+
+def register_Ns3MgtProbeResponseHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeResponseHeader::MgtProbeResponseHeader(ns3::MgtProbeResponseHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtProbeResponseHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtProbeResponseHeader::MgtProbeResponseHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtProbeResponseHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint64_t ns3::MgtProbeResponseHeader::GetBeaconIntervalUs() const [member function]
+    cls.add_method('GetBeaconIntervalUs', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::HtCapabilities ns3::MgtProbeResponseHeader::GetHtCapabilities() const [member function]
+    cls.add_method('GetHtCapabilities', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::MgtProbeResponseHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::MgtProbeResponseHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::Ssid ns3::MgtProbeResponseHeader::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): ns3::SupportedRates ns3::MgtProbeResponseHeader::GetSupportedRates() const [member function]
+    cls.add_method('GetSupportedRates', 
+                   'ns3::SupportedRates', 
+                   [], 
+                   is_const=True)
+    ## mgt-headers.h (module 'wifi'): uint64_t ns3::MgtProbeResponseHeader::GetTimestamp() [member function]
+    cls.add_method('GetTimestamp', 
+                   'uint64_t', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::MgtProbeResponseHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::SetBeaconIntervalUs(uint64_t us) [member function]
+    cls.add_method('SetBeaconIntervalUs', 
+                   'void', 
+                   [param('uint64_t', 'us')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::SetHtCapabilities(ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('SetHtCapabilities', 
+                   'void', 
+                   [param('ns3::HtCapabilities', 'htcapabilities')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')])
+    ## mgt-headers.h (module 'wifi'): void ns3::MgtProbeResponseHeader::SetSupportedRates(ns3::SupportedRates rates) [member function]
+    cls.add_method('SetSupportedRates', 
+                   'void', 
+                   [param('ns3::SupportedRates', 'rates')])
+    return
+
+def register_Ns3NqosWifiMacHelper_methods(root_module, cls):
+    ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::NqosWifiMacHelper::NqosWifiMacHelper(ns3::NqosWifiMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NqosWifiMacHelper const &', 'arg0')])
+    ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::NqosWifiMacHelper::NqosWifiMacHelper() [constructor]
+    cls.add_constructor([])
+    ## nqos-wifi-mac-helper.h (module 'wifi'): static ns3::NqosWifiMacHelper ns3::NqosWifiMacHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::NqosWifiMacHelper', 
+                   [], 
+                   is_static=True)
+    ## nqos-wifi-mac-helper.h (module 'wifi'): void ns3::NqosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
+    ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::NqosWifiMacHelper::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::WifiMac >', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3Object_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::Object::Object() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): void ns3::Object::AggregateObject(ns3::Ptr<ns3::Object> other) [member function]
+    cls.add_method('AggregateObject', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'other')])
+    ## object.h (module 'core'): void ns3::Object::Dispose() [member function]
+    cls.add_method('Dispose', 
+                   'void', 
+                   [])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator ns3::Object::GetAggregateIterator() const [member function]
+    cls.add_method('GetAggregateIterator', 
+                   'ns3::Object::AggregateIterator', 
+                   [], 
+                   is_const=True)
+    ## object.h (module 'core'): ns3::TypeId ns3::Object::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## object.h (module 'core'): static ns3::TypeId ns3::Object::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## object.h (module 'core'): void ns3::Object::Initialize() [member function]
+    cls.add_method('Initialize', 
+                   'void', 
+                   [])
+    ## object.h (module 'core'): ns3::Object::Object(ns3::Object const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Object const &', 'o')], 
+                        visibility='protected')
+    ## object.h (module 'core'): void ns3::Object::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## object.h (module 'core'): void ns3::Object::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## object.h (module 'core'): void ns3::Object::NotifyNewAggregate() [member function]
+    cls.add_method('NotifyNewAggregate', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
+    ## object.h (module 'core'): ns3::Object::AggregateIterator::AggregateIterator(ns3::Object::AggregateIterator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Object::AggregateIterator const &', 'arg0')])
+    ## object.h (module 'core'): ns3::Object::AggregateIterator::AggregateIterator() [constructor]
+    cls.add_constructor([])
+    ## object.h (module 'core'): bool ns3::Object::AggregateIterator::HasNext() const [member function]
+    cls.add_method('HasNext', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## object.h (module 'core'): ns3::Ptr<ns3::Object const> ns3::Object::AggregateIterator::Next() [member function]
+    cls.add_method('Next', 
+                   'ns3::Ptr< ns3::Object const >', 
+                   [])
+    return
+
+def register_Ns3PcapFileWrapper_methods(root_module, cls):
+    ## pcap-file-wrapper.h (module 'network'): static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
+    cls.add_constructor([])
+    ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
+    cls.add_method('Fail', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Eof() const [member function]
+    cls.add_method('Eof', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Clear() [member function]
+    cls.add_method('Clear', 
+                   'void', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Open(std::string const & filename, std::_Ios_Openmode mode) [member function]
+    cls.add_method('Open', 
+                   'void', 
+                   [param('std::string const &', 'filename'), param('std::_Ios_Openmode', 'mode')])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Close() [member function]
+    cls.add_method('Close', 
+                   'void', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Init(uint32_t dataLinkType, uint32_t snapLen=std::numeric_limits<unsigned int>::max(), int32_t tzCorrection=ns3::PcapFile::ZONE_DEFAULT) [member function]
+    cls.add_method('Init', 
+                   'void', 
+                   [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits<unsigned int>::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, uint8_t const * buffer, uint32_t length) [member function]
+    cls.add_method('Write', 
+                   'void', 
+                   [param('ns3::Time', 't'), param('uint8_t const *', 'buffer'), param('uint32_t', 'length')])
+    ## pcap-file-wrapper.h (module 'network'): uint32_t ns3::PcapFileWrapper::GetMagic() [member function]
+    cls.add_method('GetMagic', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint16_t ns3::PcapFileWrapper::GetVersionMajor() [member function]
+    cls.add_method('GetVersionMajor', 
+                   'uint16_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint16_t ns3::PcapFileWrapper::GetVersionMinor() [member function]
+    cls.add_method('GetVersionMinor', 
+                   'uint16_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): int32_t ns3::PcapFileWrapper::GetTimeZoneOffset() [member function]
+    cls.add_method('GetTimeZoneOffset', 
+                   'int32_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint32_t ns3::PcapFileWrapper::GetSigFigs() [member function]
+    cls.add_method('GetSigFigs', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint32_t ns3::PcapFileWrapper::GetSnapLen() [member function]
+    cls.add_method('GetSnapLen', 
+                   'uint32_t', 
+                   [])
+    ## pcap-file-wrapper.h (module 'network'): uint32_t ns3::PcapFileWrapper::GetDataLinkType() [member function]
+    cls.add_method('GetDataLinkType', 
+                   'uint32_t', 
+                   [])
+    return
+
+def register_Ns3QosWifiMacHelper_methods(root_module, cls):
+    ## qos-wifi-mac-helper.h (module 'wifi'): ns3::QosWifiMacHelper::QosWifiMacHelper(ns3::QosWifiMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::QosWifiMacHelper const &', 'arg0')])
+    ## qos-wifi-mac-helper.h (module 'wifi'): ns3::QosWifiMacHelper::QosWifiMacHelper() [constructor]
+    cls.add_constructor([])
+    ## qos-wifi-mac-helper.h (module 'wifi'): static ns3::QosWifiMacHelper ns3::QosWifiMacHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::QosWifiMacHelper', 
+                   [], 
+                   is_static=True)
+    ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetBlockAckInactivityTimeoutForAc(ns3::AcIndex ac, uint16_t timeout) [member function]
+    cls.add_method('SetBlockAckInactivityTimeoutForAc', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac'), param('uint16_t', 'timeout')])
+    ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetBlockAckThresholdForAc(ns3::AcIndex ac, uint8_t threshold) [member function]
+    cls.add_method('SetBlockAckThresholdForAc', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac'), param('uint8_t', 'threshold')])
+    ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetMsduAggregatorForAc(ns3::AcIndex ac, std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetMsduAggregatorForAc', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac'), param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()')])
+    ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
+    ## qos-wifi-mac-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::QosWifiMacHelper::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::WifiMac >', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter< ns3::AttributeAccessor > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter< ns3::AttributeChecker > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::SimpleRefCount(ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter< ns3::AttributeValue > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::SimpleRefCount(ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter< ns3::CallbackImplBase > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::SimpleRefCount(ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter< ns3::EventImpl > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount(ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter< ns3::NixVector > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >::SimpleRefCount(ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter< ns3::OutputStreamWrapper > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter< ns3::Packet > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount(ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter< ns3::TraceSourceAccessor > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3SimpleRefCount__Ns3WifiInformationElement_Ns3Empty_Ns3DefaultDeleter__lt__ns3WifiInformationElement__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >::SimpleRefCount(ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter< ns3::WifiInformationElement > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::WifiInformationElement, ns3::empty, ns3::DefaultDeleter<ns3::WifiInformationElement> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
+def register_Ns3Time_methods(root_module, cls):
+    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
+    cls.add_binary_comparison_operator('<=')
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('>')
+    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    cls.add_binary_comparison_operator('>=')
+    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
+    cls.add_constructor([])
+    ## nstime.h (module 'core'): ns3::Time::Time(ns3::Time const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Time const &', 'o')])
+    ## nstime.h (module 'core'): ns3::Time::Time(double v) [constructor]
+    cls.add_constructor([param('double', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long int v) [constructor]
+    cls.add_constructor([param('long int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long long int v) [constructor]
+    cls.add_constructor([param('long long int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(unsigned int v) [constructor]
+    cls.add_constructor([param('unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long unsigned int v) [constructor]
+    cls.add_constructor([param('long unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(long long unsigned int v) [constructor]
+    cls.add_constructor([param('long long unsigned int', 'v')])
+    ## nstime.h (module 'core'): ns3::Time::Time(std::string const & s) [constructor]
+    cls.add_constructor([param('std::string const &', 's')])
+    ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & value) [constructor]
+    cls.add_constructor([param('ns3::int64x64_t const &', 'value')])
+    ## nstime.h (module 'core'): int ns3::Time::Compare(ns3::Time const & o) const [member function]
+    cls.add_method('Compare', 
+                   'int', 
+                   [param('ns3::Time const &', 'o')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & from, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('From', 
+                   'ns3::Time', 
+                   [param('ns3::int64x64_t const &', 'from'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value) [member function]
+    cls.add_method('From', 
+                   'ns3::Time', 
+                   [param('ns3::int64x64_t const &', 'value')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('FromDouble', 
+                   'ns3::Time', 
+                   [param('double', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit timeUnit) [member function]
+    cls.add_method('FromInteger', 
+                   'ns3::Time', 
+                   [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
+    cls.add_method('GetDouble', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetFemtoSeconds() const [member function]
+    cls.add_method('GetFemtoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
+    cls.add_method('GetInteger', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetMicroSeconds() const [member function]
+    cls.add_method('GetMicroSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetMilliSeconds() const [member function]
+    cls.add_method('GetMilliSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
+    cls.add_method('GetNanoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetPicoSeconds() const [member function]
+    cls.add_method('GetPicoSeconds', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time::Unit ns3::Time::GetResolution() [member function]
+    cls.add_method('GetResolution', 
+                   'ns3::Time::Unit', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetSeconds() const [member function]
+    cls.add_method('GetSeconds', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::GetTimeStep() const [member function]
+    cls.add_method('GetTimeStep', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
+    cls.add_method('IsNegative', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsPositive() const [member function]
+    cls.add_method('IsPositive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyNegative() const [member function]
+    cls.add_method('IsStrictlyNegative', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyPositive() const [member function]
+    cls.add_method('IsStrictlyPositive', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): bool ns3::Time::IsZero() const [member function]
+    cls.add_method('IsZero', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
+    cls.add_method('SetResolution', 
+                   'void', 
+                   [param('ns3::Time::Unit', 'resolution')], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('To', 
+                   'ns3::int64x64_t', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('ToDouble', 
+                   'double', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit timeUnit) const [member function]
+    cls.add_method('ToInteger', 
+                   'int64_t', 
+                   [param('ns3::Time::Unit', 'timeUnit')], 
+                   is_const=True)
+    return
+
+def register_Ns3TraceSourceAccessor_methods(root_module, cls):
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor::TraceSourceAccessor(ns3::TraceSourceAccessor const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TraceSourceAccessor const &', 'arg0')])
+    ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor::TraceSourceAccessor() [constructor]
+    cls.add_constructor([])
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::Connect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('Connect', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::ConnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('ConnectWithoutContext', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::Disconnect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('Disconnect', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trace-source-accessor.h (module 'core'): bool ns3::TraceSourceAccessor::DisconnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
+    cls.add_method('DisconnectWithoutContext', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase const &', 'cb')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3Trailer_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## trailer.h (module 'network'): ns3::Trailer::Trailer() [constructor]
+    cls.add_constructor([])
+    ## trailer.h (module 'network'): ns3::Trailer::Trailer(ns3::Trailer const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Trailer const &', 'arg0')])
+    ## trailer.h (module 'network'): uint32_t ns3::Trailer::Deserialize(ns3::Buffer::Iterator end) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'end')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## trailer.h (module 'network'): uint32_t ns3::Trailer::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trailer.h (module 'network'): static ns3::TypeId ns3::Trailer::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## trailer.h (module 'network'): void ns3::Trailer::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## trailer.h (module 'network'): void ns3::Trailer::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3VendorSpecificActionHeader_methods(root_module, cls):
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificActionHeader::VendorSpecificActionHeader(ns3::VendorSpecificActionHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::VendorSpecificActionHeader const &', 'arg0')])
+    ## vendor-specific-action.h (module 'wave'): ns3::VendorSpecificActionHeader::VendorSpecificActionHeader() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): uint32_t ns3::VendorSpecificActionHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): uint8_t ns3::VendorSpecificActionHeader::GetCategory() const [member function]
+    cls.add_method('GetCategory', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): ns3::TypeId ns3::VendorSpecificActionHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier ns3::VendorSpecificActionHeader::GetOrganizationIdentifier() const [member function]
+    cls.add_method('GetOrganizationIdentifier', 
+                   'ns3::OrganizationIdentifier', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): uint32_t ns3::VendorSpecificActionHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): static ns3::TypeId ns3::VendorSpecificActionHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificActionHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificActionHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::VendorSpecificActionHeader::SetOrganizationIdentifier(ns3::OrganizationIdentifier oi) [member function]
+    cls.add_method('SetOrganizationIdentifier', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier', 'oi')])
+    return
+
+def register_Ns3Wifi80211pHelper_methods(root_module, cls):
+    ## wifi-80211p-helper.h (module 'wave'): ns3::Wifi80211pHelper::Wifi80211pHelper(ns3::Wifi80211pHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Wifi80211pHelper const &', 'arg0')])
+    ## wifi-80211p-helper.h (module 'wave'): ns3::Wifi80211pHelper::Wifi80211pHelper() [constructor]
+    cls.add_constructor([])
+    ## wifi-80211p-helper.h (module 'wave'): static ns3::Wifi80211pHelper ns3::Wifi80211pHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::Wifi80211pHelper', 
+                   [], 
+                   is_static=True)
+    ## wifi-80211p-helper.h (module 'wave'): static void ns3::Wifi80211pHelper::EnableLogComponents() [member function]
+    cls.add_method('EnableLogComponents', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## wifi-80211p-helper.h (module 'wave'): ns3::NetDeviceContainer ns3::Wifi80211pHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & macHelper, ns3::NodeContainer c) const [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'macHelper'), param('ns3::NodeContainer', 'c')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-80211p-helper.h (module 'wave'): void ns3::Wifi80211pHelper::SetStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('SetStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_virtual=True)
+    return
+
+def register_Ns3WifiActionHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::WifiActionHeader(ns3::WifiActionHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiActionHeader const &', 'arg0')])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::WifiActionHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::WifiActionHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue ns3::WifiActionHeader::GetAction() [member function]
+    cls.add_method('GetAction', 
+                   'ns3::WifiActionHeader::ActionValue', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue ns3::WifiActionHeader::GetCategory() [member function]
+    cls.add_method('GetCategory', 
+                   'ns3::WifiActionHeader::CategoryValue', 
+                   [])
+    ## mgt-headers.h (module 'wifi'): ns3::TypeId ns3::WifiActionHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): uint32_t ns3::WifiActionHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): static ns3::TypeId ns3::WifiActionHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::WifiActionHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::WifiActionHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## mgt-headers.h (module 'wifi'): void ns3::WifiActionHeader::SetAction(ns3::WifiActionHeader::CategoryValue type, ns3::WifiActionHeader::ActionValue action) [member function]
+    cls.add_method('SetAction', 
+                   'void', 
+                   [param('ns3::WifiActionHeader::CategoryValue', 'type'), param('ns3::WifiActionHeader::ActionValue', 'action')])
+    return
+
+def register_Ns3WifiActionHeaderActionValue_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::ActionValue() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::ActionValue(ns3::WifiActionHeader::ActionValue const & arg0) [copy constructor]
+    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)
+    return
+
+def register_Ns3WifiInformationElement_methods(root_module, cls):
+    cls.add_binary_comparison_operator('<')
+    cls.add_binary_comparison_operator('==')
+    ## wifi-information-element.h (module 'wifi'): ns3::WifiInformationElement::WifiInformationElement() [constructor]
+    cls.add_constructor([])
+    ## wifi-information-element.h (module 'wifi'): ns3::WifiInformationElement::WifiInformationElement(ns3::WifiInformationElement const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiInformationElement const &', 'arg0')])
+    ## wifi-information-element.h (module 'wifi'): ns3::Buffer::Iterator ns3::WifiInformationElement::Deserialize(ns3::Buffer::Iterator i) [member function]
+    cls.add_method('Deserialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'i')])
+    ## wifi-information-element.h (module 'wifi'): ns3::Buffer::Iterator ns3::WifiInformationElement::DeserializeIfPresent(ns3::Buffer::Iterator i) [member function]
+    cls.add_method('DeserializeIfPresent', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'i')])
+    ## wifi-information-element.h (module 'wifi'): uint8_t ns3::WifiInformationElement::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-information-element.h (module 'wifi'): ns3::WifiInformationElementId ns3::WifiInformationElement::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-information-element.h (module 'wifi'): uint8_t ns3::WifiInformationElement::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-information-element.h (module 'wifi'): uint16_t ns3::WifiInformationElement::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-information-element.h (module 'wifi'): void ns3::WifiInformationElement::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-information-element.h (module 'wifi'): ns3::Buffer::Iterator ns3::WifiInformationElement::Serialize(ns3::Buffer::Iterator i) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'i')], 
+                   is_const=True)
+    ## wifi-information-element.h (module 'wifi'): void ns3::WifiInformationElement::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3WifiMac_methods(root_module, cls):
+    ## wifi-mac.h (module 'wifi'): ns3::WifiMac::WifiMac() [constructor]
+    cls.add_constructor([])
+    ## wifi-mac.h (module 'wifi'): ns3::WifiMac::WifiMac(ns3::WifiMac const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMac const &', 'arg0')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('ConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to, ns3::Mac48Address from) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetAckTimeout() const [member function]
+    cls.add_method('GetAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Mac48Address ns3::WifiMac::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetBasicBlockAckTimeout() const [member function]
+    cls.add_method('GetBasicBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Mac48Address ns3::WifiMac::GetBssid() const [member function]
+    cls.add_method('GetBssid', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetCompressedBlockAckTimeout() const [member function]
+    cls.add_method('GetCompressedBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetCtsTimeout() const [member function]
+    cls.add_method('GetCtsTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetEifsNoDifs() const [member function]
+    cls.add_method('GetEifsNoDifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetMaxPropagationDelay() const [member function]
+    cls.add_method('GetMaxPropagationDelay', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetMsduLifetime() const [member function]
+    cls.add_method('GetMsduLifetime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetPifs() const [member function]
+    cls.add_method('GetPifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetRifs() const [member function]
+    cls.add_method('GetRifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetSifs() const [member function]
+    cls.add_method('GetSifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetSlot() const [member function]
+    cls.add_method('GetSlot', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Ssid ns3::WifiMac::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): static ns3::TypeId ns3::WifiMac::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyPromiscRx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyPromiscRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyRx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyRxDrop(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRxDrop', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyTx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::NotifyTxDrop(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTxDrop', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetAckTimeout(ns3::Time ackTimeout) [member function]
+    cls.add_method('SetAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ackTimeout')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetAddress(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetBasicBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetBasicBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')], 
+                   is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetCompressedBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetCompressedBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')], 
+                   is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetCtsTimeout(ns3::Time ctsTimeout) [member function]
+    cls.add_method('SetCtsTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ctsTimeout')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetEifsNoDifs(ns3::Time eifsNoDifs) [member function]
+    cls.add_method('SetEifsNoDifs', 
+                   'void', 
+                   [param('ns3::Time', 'eifsNoDifs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetForwardUpCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, ns3::Mac48Address, ns3::Mac48Address, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> upCallback) [member function]
+    cls.add_method('SetForwardUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::Mac48Address, ns3::Mac48Address, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'upCallback')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetLinkDownCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkDown) [member function]
+    cls.add_method('SetLinkDownCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkDown')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetLinkUpCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkUp) [member function]
+    cls.add_method('SetLinkUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkUp')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetMaxPropagationDelay(ns3::Time delay) [member function]
+    cls.add_method('SetMaxPropagationDelay', 
+                   'void', 
+                   [param('ns3::Time', 'delay')])
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetPifs(ns3::Time pifs) [member function]
+    cls.add_method('SetPifs', 
+                   'void', 
+                   [param('ns3::Time', 'pifs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetPromisc() [member function]
+    cls.add_method('SetPromisc', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetRifs(ns3::Time rifs) [member function]
+    cls.add_method('SetRifs', 
+                   'void', 
+                   [param('ns3::Time', 'rifs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSifs(ns3::Time sifs) [member function]
+    cls.add_method('SetSifs', 
+                   'void', 
+                   [param('ns3::Time', 'sifs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSlot(ns3::Time slotTime) [member function]
+    cls.add_method('SetSlot', 
+                   'void', 
+                   [param('ns3::Time', 'slotTime')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetWifiPhy(ns3::Ptr<ns3::WifiPhy> phy) [member function]
+    cls.add_method('SetWifiPhy', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiPhy >', 'phy')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> stationManager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'stationManager')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): bool ns3::WifiMac::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
+    cls.add_method('ConfigureDcf', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')], 
+                   visibility='protected')
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('FinishConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3WifiMacHeader_methods(root_module, cls):
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::WifiMacHeader(ns3::WifiMacHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMacHeader const &', 'arg0')])
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::WifiMacHeader() [constructor]
+    cls.add_constructor([])
+    ## wifi-mac-header.h (module 'wifi'): uint32_t ns3::WifiMacHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacHeader::GetAddr1() const [member function]
+    cls.add_method('GetAddr1', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacHeader::GetAddr2() const [member function]
+    cls.add_method('GetAddr2', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacHeader::GetAddr3() const [member function]
+    cls.add_method('GetAddr3', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacHeader::GetAddr4() const [member function]
+    cls.add_method('GetAddr4', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::Time ns3::WifiMacHeader::GetDuration() const [member function]
+    cls.add_method('GetDuration', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetFragmentNumber() const [member function]
+    cls.add_method('GetFragmentNumber', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::TypeId ns3::WifiMacHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::QosAckPolicy ns3::WifiMacHeader::GetQosAckPolicy() const [member function]
+    cls.add_method('GetQosAckPolicy', 
+                   'ns3::WifiMacHeader::QosAckPolicy', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint8_t ns3::WifiMacHeader::GetQosTid() const [member function]
+    cls.add_method('GetQosTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint8_t ns3::WifiMacHeader::GetQosTxopLimit() const [member function]
+    cls.add_method('GetQosTxopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetRawDuration() const [member function]
+    cls.add_method('GetRawDuration', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetSequenceControl() const [member function]
+    cls.add_method('GetSequenceControl', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetSequenceNumber() const [member function]
+    cls.add_method('GetSequenceNumber', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): uint32_t ns3::WifiMacHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): uint32_t ns3::WifiMacHeader::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType ns3::WifiMacHeader::GetType() const [member function]
+    cls.add_method('GetType', 
+                   'ns3::WifiMacType', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): static ns3::TypeId ns3::WifiMacHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-mac-header.h (module 'wifi'): char const * ns3::WifiMacHeader::GetTypeString() const [member function]
+    cls.add_method('GetTypeString', 
+                   'char const *', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAck() const [member function]
+    cls.add_method('IsAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAction() const [member function]
+    cls.add_method('IsAction', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAssocReq() const [member function]
+    cls.add_method('IsAssocReq', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAssocResp() const [member function]
+    cls.add_method('IsAssocResp', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsAuthentication() const [member function]
+    cls.add_method('IsAuthentication', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsBeacon() const [member function]
+    cls.add_method('IsBeacon', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsBlockAck() const [member function]
+    cls.add_method('IsBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsBlockAckReq() const [member function]
+    cls.add_method('IsBlockAckReq', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsCfpoll() const [member function]
+    cls.add_method('IsCfpoll', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsCtl() const [member function]
+    cls.add_method('IsCtl', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsCts() const [member function]
+    cls.add_method('IsCts', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsData() const [member function]
+    cls.add_method('IsData', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsDeauthentication() const [member function]
+    cls.add_method('IsDeauthentication', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsDisassociation() const [member function]
+    cls.add_method('IsDisassociation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsFromDs() const [member function]
+    cls.add_method('IsFromDs', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsMgt() const [member function]
+    cls.add_method('IsMgt', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsMoreFragments() const [member function]
+    cls.add_method('IsMoreFragments', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsMultihopAction() const [member function]
+    cls.add_method('IsMultihopAction', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsProbeReq() const [member function]
+    cls.add_method('IsProbeReq', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsProbeResp() const [member function]
+    cls.add_method('IsProbeResp', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosAck() const [member function]
+    cls.add_method('IsQosAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosAmsdu() const [member function]
+    cls.add_method('IsQosAmsdu', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosBlockAck() const [member function]
+    cls.add_method('IsQosBlockAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosData() const [member function]
+    cls.add_method('IsQosData', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosEosp() const [member function]
+    cls.add_method('IsQosEosp', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsQosNoAck() const [member function]
+    cls.add_method('IsQosNoAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsReassocReq() const [member function]
+    cls.add_method('IsReassocReq', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsReassocResp() const [member function]
+    cls.add_method('IsReassocResp', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsRetry() const [member function]
+    cls.add_method('IsRetry', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsRts() const [member function]
+    cls.add_method('IsRts', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): bool ns3::WifiMacHeader::IsToDs() const [member function]
+    cls.add_method('IsToDs', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAction() [member function]
+    cls.add_method('SetAction', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAddr1(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddr1', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAddr2(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddr2', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAddr3(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddr3', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAddr4(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddr4', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAssocReq() [member function]
+    cls.add_method('SetAssocReq', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetAssocResp() [member function]
+    cls.add_method('SetAssocResp', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetBeacon() [member function]
+    cls.add_method('SetBeacon', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetBlockAck() [member function]
+    cls.add_method('SetBlockAck', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetBlockAckReq() [member function]
+    cls.add_method('SetBlockAckReq', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDsFrom() [member function]
+    cls.add_method('SetDsFrom', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDsNotFrom() [member function]
+    cls.add_method('SetDsNotFrom', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDsNotTo() [member function]
+    cls.add_method('SetDsNotTo', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDsTo() [member function]
+    cls.add_method('SetDsTo', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetDuration(ns3::Time duration) [member function]
+    cls.add_method('SetDuration', 
+                   'void', 
+                   [param('ns3::Time', 'duration')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetFragmentNumber(uint8_t frag) [member function]
+    cls.add_method('SetFragmentNumber', 
+                   'void', 
+                   [param('uint8_t', 'frag')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetId(uint16_t id) [member function]
+    cls.add_method('SetId', 
+                   'void', 
+                   [param('uint16_t', 'id')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetMoreFragments() [member function]
+    cls.add_method('SetMoreFragments', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetMultihopAction() [member function]
+    cls.add_method('SetMultihopAction', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoMoreFragments() [member function]
+    cls.add_method('SetNoMoreFragments', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoOrder() [member function]
+    cls.add_method('SetNoOrder', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoRetry() [member function]
+    cls.add_method('SetNoRetry', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetOrder() [member function]
+    cls.add_method('SetOrder', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetProbeReq() [member function]
+    cls.add_method('SetProbeReq', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetProbeResp() [member function]
+    cls.add_method('SetProbeResp', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
+    cls.add_method('SetQosAckPolicy', 
+                   'void', 
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
+    cls.add_method('SetQosAmsdu', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosBlockAck() [member function]
+    cls.add_method('SetQosBlockAck', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosEosp() [member function]
+    cls.add_method('SetQosEosp', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoAck() [member function]
+    cls.add_method('SetQosNoAck', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoAmsdu() [member function]
+    cls.add_method('SetQosNoAmsdu', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoEosp() [member function]
+    cls.add_method('SetQosNoEosp', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNormalAck() [member function]
+    cls.add_method('SetQosNormalAck', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosTid(uint8_t tid) [member function]
+    cls.add_method('SetQosTid', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosTxopLimit(uint8_t txop) [member function]
+    cls.add_method('SetQosTxopLimit', 
+                   'void', 
+                   [param('uint8_t', 'txop')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetRawDuration(uint16_t duration) [member function]
+    cls.add_method('SetRawDuration', 
+                   'void', 
+                   [param('uint16_t', 'duration')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetRetry() [member function]
+    cls.add_method('SetRetry', 
+                   'void', 
+                   [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetSequenceNumber(uint16_t seq) [member function]
+    cls.add_method('SetSequenceNumber', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetType(ns3::WifiMacType type) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('ns3::WifiMacType', 'type')])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetTypeData() [member function]
+    cls.add_method('SetTypeData', 
+                   'void', 
+                   [])
+    return
+
+def register_Ns3WifiMacQueue_methods(root_module, cls):
+    ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue::WifiMacQueue(ns3::WifiMacQueue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiMacQueue const &', 'arg0')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue::WifiMacQueue() [constructor]
+    cls.add_constructor([])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::Dequeue(ns3::WifiMacHeader * hdr) [member function]
+    cls.add_method('Dequeue', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::DequeueByTidAndAddress(ns3::WifiMacHeader * hdr, uint8_t tid, ns3::WifiMacHeader::AddressType type, ns3::Mac48Address addr) [member function]
+    cls.add_method('DequeueByTidAndAddress', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr'), param('uint8_t', 'tid'), param('ns3::WifiMacHeader::AddressType', 'type'), param('ns3::Mac48Address', 'addr')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::DequeueFirstAvailable(ns3::WifiMacHeader * hdr, ns3::Time & tStamp, ns3::QosBlockedDestinations const * blockedPackets) [member function]
+    cls.add_method('DequeueFirstAvailable', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr'), param('ns3::Time &', 'tStamp'), param('ns3::QosBlockedDestinations const *', 'blockedPackets')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Flush() [member function]
+    cls.add_method('Flush', 
+                   'void', 
+                   [])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Time ns3::WifiMacQueue::GetMaxDelay() const [member function]
+    cls.add_method('GetMaxDelay', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-queue.h (module 'wifi'): uint32_t ns3::WifiMacQueue::GetMaxSize() const [member function]
+    cls.add_method('GetMaxSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-mac-queue.h (module 'wifi'): uint32_t ns3::WifiMacQueue::GetNPacketsByTidAndAddress(uint8_t tid, ns3::WifiMacHeader::AddressType type, ns3::Mac48Address addr) [member function]
+    cls.add_method('GetNPacketsByTidAndAddress', 
+                   'uint32_t', 
+                   [param('uint8_t', 'tid'), param('ns3::WifiMacHeader::AddressType', 'type'), param('ns3::Mac48Address', 'addr')])
+    ## wifi-mac-queue.h (module 'wifi'): uint32_t ns3::WifiMacQueue::GetSize() [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [])
+    ## wifi-mac-queue.h (module 'wifi'): static ns3::TypeId ns3::WifiMacQueue::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::IsEmpty() [member function]
+    cls.add_method('IsEmpty', 
+                   'bool', 
+                   [])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::Peek(ns3::WifiMacHeader * hdr) [member function]
+    cls.add_method('Peek', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::PeekByTidAndAddress(ns3::WifiMacHeader * hdr, uint8_t tid, ns3::WifiMacHeader::AddressType type, ns3::Mac48Address addr) [member function]
+    cls.add_method('PeekByTidAndAddress', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr'), param('uint8_t', 'tid'), param('ns3::WifiMacHeader::AddressType', 'type'), param('ns3::Mac48Address', 'addr')])
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::WifiMacQueue::PeekFirstAvailable(ns3::WifiMacHeader * hdr, ns3::Time & tStamp, ns3::QosBlockedDestinations const * blockedPackets) [member function]
+    cls.add_method('PeekFirstAvailable', 
+                   'ns3::Ptr< ns3::Packet const >', 
+                   [param('ns3::WifiMacHeader *', 'hdr'), param('ns3::Time &', 'tStamp'), param('ns3::QosBlockedDestinations const *', 'blockedPackets')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::PushFront(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('PushFront', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::Remove(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('Remove', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::SetMaxDelay(ns3::Time delay) [member function]
+    cls.add_method('SetMaxDelay', 
+                   'void', 
+                   [param('ns3::Time', 'delay')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::SetMaxSize(uint32_t maxSize) [member function]
+    cls.add_method('SetMaxSize', 
+                   'void', 
+                   [param('uint32_t', 'maxSize')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacQueue::GetAddressForPacket(ns3::WifiMacHeader::AddressType type, std::_List_iterator<ns3::WifiMacQueue::Item> it) [member function]
+    cls.add_method('GetAddressForPacket', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader::AddressType', 'type'), param('std::_List_iterator< ns3::WifiMacQueue::Item >', 'it')], 
+                   visibility='protected')
+    return
+
+def register_Ns3WifiPhy_methods(root_module, cls):
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhy::WifiPhy(ns3::WifiPhy const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiPhy const &', 'arg0')])
+    ## wifi-phy.h (module 'wifi'): ns3::WifiPhy::WifiPhy() [constructor]
+    cls.add_constructor([])
+    ## wifi-phy.h (module 'wifi'): int64_t ns3::WifiPhy::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
+    cls.add_method('CalculateSnr', 
+                   'double', 
+                   [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculateTxDuration', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('ConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
+    cls.add_method('GetBssMembershipSelector', 
+                   'uint32_t', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::WifiPhy::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::WifiChannel >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetChannelBonding() const [member function]
+    cls.add_method('GetChannelBonding', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetChannelNumber() const [member function]
+    cls.add_method('GetChannelNumber', 
+                   'uint16_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetDelayUntilIdle() [member function]
+    cls.add_method('GetDelayUntilIdle', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetDsssRate11Mbps() [member function]
+    cls.add_method('GetDsssRate11Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetDsssRate1Mbps() [member function]
+    cls.add_method('GetDsssRate1Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetDsssRate2Mbps() [member function]
+    cls.add_method('GetDsssRate2Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetDsssRate5_5Mbps() [member function]
+    cls.add_method('GetDsssRate5_5Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate12Mbps() [member function]
+    cls.add_method('GetErpOfdmRate12Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate18Mbps() [member function]
+    cls.add_method('GetErpOfdmRate18Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate24Mbps() [member function]
+    cls.add_method('GetErpOfdmRate24Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate36Mbps() [member function]
+    cls.add_method('GetErpOfdmRate36Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate48Mbps() [member function]
+    cls.add_method('GetErpOfdmRate48Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate54Mbps() [member function]
+    cls.add_method('GetErpOfdmRate54Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate6Mbps() [member function]
+    cls.add_method('GetErpOfdmRate6Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetErpOfdmRate9Mbps() [member function]
+    cls.add_method('GetErpOfdmRate9Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGuardInterval() const [member function]
+    cls.add_method('GetGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetLastRxStartTime() const [member function]
+    cls.add_method('GetLastRxStartTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetMFPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetMFPlcpHeaderMode', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetMcs(uint8_t mcs) const [member function]
+    cls.add_method('GetMcs', 
+                   'uint8_t', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::WifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
+    cls.add_method('GetMembershipSelectorModes', 
+                   'ns3::WifiModeList', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::GetMode(uint32_t mode) const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [param('uint32_t', 'mode')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNBssMembershipSelectors() const [member function]
+    cls.add_method('GetNBssMembershipSelectors', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetNMcs() const [member function]
+    cls.add_method('GetNMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNModes() const [member function]
+    cls.add_method('GetNModes', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNTxPower() const [member function]
+    cls.add_method('GetNTxPower', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfReceiveAntennas() const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfTransmitAntennas() const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate108MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate108MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate120MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate120MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate121_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate121_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12Mbps() [member function]
+    cls.add_method('GetOfdmRate12Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate12MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate12MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHzShGi() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate13MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate13_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate13_5MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate14_4MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate14_4MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate150MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate150MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate15MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate15MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate18Mbps() [member function]
+    cls.add_method('GetOfdmRate18Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate18MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate18MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate19_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate19_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate1_5MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate1_5MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate21_7MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate21_7MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate24Mbps() [member function]
+    cls.add_method('GetOfdmRate24Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate24MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate24MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate26MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate26MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate27MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate27MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate28_9MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate28_9MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate2_25MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate2_25MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate30MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate30MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate36Mbps() [member function]
+    cls.add_method('GetOfdmRate36Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate39MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate39MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate3MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate3MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate3MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate3MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate40_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate40_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate43_3MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate43_3MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate45MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate45MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate48Mbps() [member function]
+    cls.add_method('GetOfdmRate48Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate4_5MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate4_5MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate4_5MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate4_5MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate52MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate52MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54Mbps() [member function]
+    cls.add_method('GetOfdmRate54Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate54MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate57_8MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate57_8MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate58_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate58_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate60MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate60MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHzShGi() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6Mbps() [member function]
+    cls.add_method('GetOfdmRate6Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate6MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate6MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate6_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate72_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate72_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate7_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate7_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate81MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate81MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate90MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate90MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9Mbps() [member function]
+    cls.add_method('GetOfdmRate9Mbps', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9MbpsBW10MHz() [member function]
+    cls.add_method('GetOfdmRate9MbpsBW10MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9MbpsBW5MHz() [member function]
+    cls.add_method('GetOfdmRate9MbpsBW5MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static double ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('GetPayloadDurationMicroSeconds', 
+                   'double', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHeaderDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHeaderMode', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtSigHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHtSigHeaderDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtTrainingSymbolDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('GetPlcpHtTrainingSymbolDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpPreambleDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetStateDuration() [member function]
+    cls.add_method('GetStateDuration', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetStbc() const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxPowerEnd() const [member function]
+    cls.add_method('GetTxPowerEnd', 
+                   'double', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxPowerStart() const [member function]
+    cls.add_method('GetTxPowerStart', 
+                   'double', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::TypeId ns3::WifiPhy::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateBusy() [member function]
+    cls.add_method('IsStateBusy', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateCcaBusy() [member function]
+    cls.add_method('IsStateCcaBusy', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateIdle() [member function]
+    cls.add_method('IsStateIdle', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateRx() [member function]
+    cls.add_method('IsStateRx', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateSwitching() [member function]
+    cls.add_method('IsStateSwitching', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::IsStateTx() [member function]
+    cls.add_method('IsStateTx', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::McsToWifiMode(uint8_t mcs) [member function]
+    cls.add_method('McsToWifiMode', 
+                   'ns3::WifiMode', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function]
+    cls.add_method('NotifyMonitorSniffRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, uint8_t txPower) [member function]
+    cls.add_method('NotifyMonitorSniffTx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('uint8_t', 'txPower')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRxBegin', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxDrop(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRxDrop', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyRxEnd', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyTxBegin(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTxBegin', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyTxDrop(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTxDrop', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyTxEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NotifyTxEnd', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::RegisterListener(ns3::WifiPhyListener * listener) [member function]
+    cls.add_method('RegisterListener', 
+                   'void', 
+                   [param('ns3::WifiPhyListener *', 'listener')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('SendPacket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelBonding(bool channelbonding) [member function]
+    cls.add_method('SetChannelBonding', 
+                   'void', 
+                   [param('bool', 'channelbonding')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelNumber(uint16_t id) [member function]
+    cls.add_method('SetChannelNumber', 
+                   'void', 
+                   [param('uint16_t', 'id')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrequency(uint32_t freq) [member function]
+    cls.add_method('SetFrequency', 
+                   'void', 
+                   [param('uint32_t', 'freq')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGreenfield(bool greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('bool', 'greenfield')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
+    cls.add_method('SetGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardInterval')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('bool', 'ldpc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
+    cls.add_method('SetNumberOfReceiveAntennas', 
+                   'void', 
+                   [param('uint32_t', 'rx')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
+    cls.add_method('SetNumberOfTransmitAntennas', 
+                   'void', 
+                   [param('uint32_t', 'tx')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveErrorCallback(ns3::Callback<void,ns3::Ptr<const ns3::Packet>,double,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    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')], 
+                   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]
+    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')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetStbc(bool stbc) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::WifiModeToMcs(ns3::WifiMode mode) [member function]
+    cls.add_method('WifiModeToMcs', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'mode')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3WifiRemoteStationManager_methods(root_module, cls):
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationManager::WifiRemoteStationManager(ns3::WifiRemoteStationManager const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiRemoteStationManager const &', 'arg0')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationManager::WifiRemoteStationManager() [constructor]
+    cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddBasicMcs(uint8_t mcs) [member function]
+    cls.add_method('AddBasicMcs', 
+                   'void', 
+                   [param('uint8_t', 'mcs')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddBasicMode(ns3::WifiMode mode) [member function]
+    cls.add_method('AddBasicMode', 
+                   'void', 
+                   [param('ns3::WifiMode', 'mode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddStationHtCapabilities(ns3::Mac48Address from, ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('AddStationHtCapabilities', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'from'), param('ns3::HtCapabilities', 'htcapabilities')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddSupportedMcs(ns3::Mac48Address address, uint8_t mcs) [member function]
+    cls.add_method('AddSupportedMcs', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('uint8_t', 'mcs')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddSupportedMode(ns3::Mac48Address address, ns3::WifiMode mode) [member function]
+    cls.add_method('AddSupportedMode', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'mode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetCtsToSelfTxVector() [member function]
+    cls.add_method('DoGetCtsToSelfTxVector', 
+                   'ns3::WifiTxVector', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetAckTxVector(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
+    cls.add_method('GetAckTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetBasicMcs(uint32_t i) const [member function]
+    cls.add_method('GetBasicMcs', 
+                   'uint8_t', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetBasicMode(uint32_t i) const [member function]
+    cls.add_method('GetBasicMode', 
+                   'ns3::WifiMode', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetBlockAckTxVector(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
+    cls.add_method('GetBlockAckTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsToSelfTxVector(ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('GetCtsToSelfTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsTxVector(ns3::Mac48Address address, ns3::WifiMode rtsMode) [member function]
+    cls.add_method('GetCtsTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'rtsMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetDataTxVector(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fullPacketSize) [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fullPacketSize')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetDefaultMcs() const [member function]
+    cls.add_method('GetDefaultMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetDefaultMode() const [member function]
+    cls.add_method('GetDefaultMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetDefaultTxPowerLevel() const [member function]
+    cls.add_method('GetDefaultTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetFragmentOffset(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fragmentNumber) [member function]
+    cls.add_method('GetFragmentOffset', 
+                   'uint32_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fragmentNumber')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetFragmentSize(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fragmentNumber) [member function]
+    cls.add_method('GetFragmentSize', 
+                   'uint32_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fragmentNumber')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetFragmentationThreshold() const [member function]
+    cls.add_method('GetFragmentationThreshold', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfieldSupported(ns3::Mac48Address address) const [member function]
+    cls.add_method('GetGreenfieldSupported', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo ns3::WifiRemoteStationManager::GetInfo(ns3::Mac48Address address) [member function]
+    cls.add_method('GetInfo', 
+                   'ns3::WifiRemoteStationInfo', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetMaxSlrc() const [member function]
+    cls.add_method('GetMaxSlrc', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetMaxSsrc() const [member function]
+    cls.add_method('GetMaxSsrc', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNBasicMcs() const [member function]
+    cls.add_method('GetNBasicMcs', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNBasicModes() const [member function]
+    cls.add_method('GetNBasicModes', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetNonUnicastMode() const [member function]
+    cls.add_method('GetNonUnicastMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfTransmitAntennas() [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetRtsCtsThreshold() const [member function]
+    cls.add_method('GetRtsCtsThreshold', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetRtsTxVector(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('GetRtsTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): static ns3::TypeId ns3::WifiRemoteStationManager::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::HasHtSupported() const [member function]
+    cls.add_method('HasHtSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsAssociated(ns3::Mac48Address address) const [member function]
+    cls.add_method('IsAssociated', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsBrandNew(ns3::Mac48Address address) const [member function]
+    cls.add_method('IsBrandNew', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsLastFragment(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fragmentNumber) [member function]
+    cls.add_method('IsLastFragment', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fragmentNumber')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsWaitAssocTxOk(ns3::Mac48Address address) const [member function]
+    cls.add_method('IsWaitAssocTxOk', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedCtsToSelf(ns3::WifiTxVector txVector) [member function]
+    cls.add_method('NeedCtsToSelf', 
+                   'bool', 
+                   [param('ns3::WifiTxVector', 'txVector')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedDataRetransmission(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NeedDataRetransmission', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedFragmentation(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NeedFragmentation', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedRts(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NeedRts', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedRtsRetransmission(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('NeedRtsRetransmission', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::PrepareForQueue(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fullPacketSize) [member function]
+    cls.add_method('PrepareForQueue', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fullPacketSize')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::RecordDisassociated(ns3::Mac48Address address) [member function]
+    cls.add_method('RecordDisassociated', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::RecordGotAssocTxFailed(ns3::Mac48Address address) [member function]
+    cls.add_method('RecordGotAssocTxFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::RecordGotAssocTxOk(ns3::Mac48Address address) [member function]
+    cls.add_method('RecordGotAssocTxOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::RecordWaitAssocTxOk(ns3::Mac48Address address) [member function]
+    cls.add_method('RecordWaitAssocTxOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportDataFailed(ns3::Mac48Address address, ns3::WifiMacHeader const * header) [member function]
+    cls.add_method('ReportDataFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportDataOk(ns3::Mac48Address address, ns3::WifiMacHeader const * header, double ackSnr, ns3::WifiMode ackMode, double dataSnr) [member function]
+    cls.add_method('ReportDataOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('double', 'ackSnr'), param('ns3::WifiMode', 'ackMode'), param('double', 'dataSnr')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportFinalDataFailed(ns3::Mac48Address address, ns3::WifiMacHeader const * header) [member function]
+    cls.add_method('ReportFinalDataFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportFinalRtsFailed(ns3::Mac48Address address, ns3::WifiMacHeader const * header) [member function]
+    cls.add_method('ReportFinalRtsFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportRtsFailed(ns3::Mac48Address address, ns3::WifiMacHeader const * header) [member function]
+    cls.add_method('ReportRtsFailed', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportRtsOk(ns3::Mac48Address address, ns3::WifiMacHeader const * header, double ctsSnr, ns3::WifiMode ctsMode, double rtsSnr) [member function]
+    cls.add_method('ReportRtsOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('double', 'ctsSnr'), param('ns3::WifiMode', 'ctsMode'), param('double', 'rtsSnr')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::ReportRxOk(ns3::Mac48Address address, ns3::WifiMacHeader const * header, double rxSnr, ns3::WifiMode txMode) [member function]
+    cls.add_method('ReportRxOk', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::Reset() [member function]
+    cls.add_method('Reset', 
+                   'void', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::Reset(ns3::Mac48Address address) [member function]
+    cls.add_method('Reset', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetDefaultTxPowerLevel(uint8_t txPower) [member function]
+    cls.add_method('SetDefaultTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'txPower')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetFragmentationThreshold(uint32_t threshold) [member function]
+    cls.add_method('SetFragmentationThreshold', 
+                   'void', 
+                   [param('uint32_t', 'threshold')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetHtSupported(bool enable) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('bool', 'enable')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetMaxSlrc(uint32_t maxSlrc) [member function]
+    cls.add_method('SetMaxSlrc', 
+                   'void', 
+                   [param('uint32_t', 'maxSlrc')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetMaxSsrc(uint32_t maxSsrc) [member function]
+    cls.add_method('SetMaxSsrc', 
+                   'void', 
+                   [param('uint32_t', 'maxSsrc')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetRtsCtsThreshold(uint32_t threshold) [member function]
+    cls.add_method('SetRtsCtsThreshold', 
+                   'void', 
+                   [param('uint32_t', 'threshold')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetupPhy(ns3::Ptr<ns3::WifiPhy> phy) [member function]
+    cls.add_method('SetupPhy', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiPhy >', 'phy')], 
+                   is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfield(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetLongRetryCount(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetLongRetryCount', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetMcsSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function]
+    cls.add_method('GetMcsSupported', 
+                   'uint8_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station'), param('uint32_t', 'i')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNMcsSupported(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNMcsSupported', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNSupported(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNSupported', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfReceiveAntennas(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfTransmitAntennas(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetShortGuardInterval(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetShortGuardInterval', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetShortRetryCount(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetShortRetryCount', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetStbc(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function]
+    cls.add_method('GetSupported', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiRemoteStation const *', 'station'), param('uint32_t', 'i')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStation * ns3::WifiRemoteStationManager::DoCreateStation() const [member function]
+    cls.add_method('DoCreateStation', 
+                   'ns3::WifiRemoteStation *', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxNess(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxNss(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetAckTxStbc(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetBlockAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxNess(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxNss(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetBlockAckTxStbc(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetCtsTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxNess(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxNss(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetCtsTxStbc(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetDataTxVector(ns3::WifiRemoteStation * station, uint32_t size) [member function]
+    cls.add_method('DoGetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('uint32_t', 'size')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetRtsTxVector(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoGetRtsTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedDataRetransmission(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
+    cls.add_method('DoNeedDataRetransmission', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedFragmentation(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
+    cls.add_method('DoNeedFragmentation', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedRts(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
+    cls.add_method('DoNeedRts', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedRtsRetransmission(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
+    cls.add_method('DoNeedRtsRetransmission', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('bool', 'normally')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportDataFailed(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoReportDataFailed', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportDataOk(ns3::WifiRemoteStation * station, double ackSnr, ns3::WifiMode ackMode, double dataSnr) [member function]
+    cls.add_method('DoReportDataOk', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('double', 'ackSnr'), param('ns3::WifiMode', 'ackMode'), param('double', 'dataSnr')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportFinalDataFailed(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoReportFinalDataFailed', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportFinalRtsFailed(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoReportFinalRtsFailed', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportRtsFailed(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoReportRtsFailed', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportRtsOk(ns3::WifiRemoteStation * station, double ctsSnr, ns3::WifiMode ctsMode, double rtsSnr) [member function]
+    cls.add_method('DoReportRtsOk', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('double', 'ctsSnr'), param('ns3::WifiMode', 'ctsMode'), param('double', 'rtsSnr')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::DoReportRxOk(ns3::WifiRemoteStation * station, double rxSnr, ns3::WifiMode txMode) [member function]
+    cls.add_method('DoReportRxOk', 
+                   'void', 
+                   [param('ns3::WifiRemoteStation *', 'station'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsLowLatency() const [member function]
+    cls.add_method('IsLowLatency', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=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')])
+    ## attribute.h (module 'core'): ns3::AttributeAccessor::AttributeAccessor() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::Get(ns3::ObjectBase const * object, ns3::AttributeValue & attribute) const [member function]
+    cls.add_method('Get', 
+                   'bool', 
+                   [param('ns3::ObjectBase const *', 'object'), param('ns3::AttributeValue &', 'attribute')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::HasGetter() const [member function]
+    cls.add_method('HasGetter', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::HasSetter() const [member function]
+    cls.add_method('HasSetter', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeAccessor::Set(ns3::ObjectBase * object, ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Set', 
+                   'bool', 
+                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False), param('ns3::AttributeValue const &', 'value')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3AttributeChecker_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::AttributeChecker::AttributeChecker(ns3::AttributeChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeChecker const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::AttributeChecker::AttributeChecker() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::Check(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Check', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::Copy(ns3::AttributeValue const & source, ns3::AttributeValue & destination) const [member function]
+    cls.add_method('Copy', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'source'), param('ns3::AttributeValue &', 'destination')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::CreateValidValue(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('CreateValidValue', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_const=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeChecker::GetUnderlyingTypeInformation() const [member function]
+    cls.add_method('GetUnderlyingTypeInformation', 
+                   'std::string', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeChecker::GetValueTypeName() const [member function]
+    cls.add_method('GetValueTypeName', 
+                   'std::string', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeChecker::HasUnderlyingTypeInformation() const [member function]
+    cls.add_method('HasUnderlyingTypeInformation', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3AttributeValue_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::AttributeValue::AttributeValue(ns3::AttributeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AttributeValue const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::AttributeValue::AttributeValue() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::AttributeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::AttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::AttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3CallbackChecker_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker(ns3::CallbackChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackChecker const &', 'arg0')])
+    return
+
+def register_Ns3CallbackImplBase_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackImplBase::CallbackImplBase() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackImplBase::CallbackImplBase(ns3::CallbackImplBase const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackImplBase const &', 'arg0')])
+    ## callback.h (module 'core'): bool ns3::CallbackImplBase::IsEqual(ns3::Ptr<ns3::CallbackImplBase const> other) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::CallbackImplBase const >', 'other')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3CallbackValue_methods(root_module, cls):
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue(ns3::CallbackValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CallbackValue const &', 'arg0')])
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue() [constructor]
+    cls.add_constructor([])
+    ## callback.h (module 'core'): ns3::CallbackValue::CallbackValue(ns3::CallbackBase const & base) [constructor]
+    cls.add_constructor([param('ns3::CallbackBase const &', 'base')])
+    ## callback.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::CallbackValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## callback.h (module 'core'): bool ns3::CallbackValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## callback.h (module 'core'): std::string ns3::CallbackValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## callback.h (module 'core'): void ns3::CallbackValue::Set(ns3::CallbackBase base) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::CallbackBase', 'base')])
+    return
+
+def register_Ns3CtrlBAckRequestHeader_methods(root_module, cls):
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckRequestHeader::CtrlBAckRequestHeader(ns3::CtrlBAckRequestHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CtrlBAckRequestHeader const &', 'arg0')])
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckRequestHeader::CtrlBAckRequestHeader() [constructor]
+    cls.add_constructor([])
+    ## ctrl-headers.h (module 'wifi'): uint32_t ns3::CtrlBAckRequestHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): ns3::TypeId ns3::CtrlBAckRequestHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint32_t ns3::CtrlBAckRequestHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t ns3::CtrlBAckRequestHeader::GetStartingSequence() const [member function]
+    cls.add_method('GetStartingSequence', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t ns3::CtrlBAckRequestHeader::GetStartingSequenceControl() const [member function]
+    cls.add_method('GetStartingSequenceControl', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint8_t ns3::CtrlBAckRequestHeader::GetTidInfo() const [member function]
+    cls.add_method('GetTidInfo', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): static ns3::TypeId ns3::CtrlBAckRequestHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckRequestHeader::IsBasic() const [member function]
+    cls.add_method('IsBasic', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckRequestHeader::IsCompressed() const [member function]
+    cls.add_method('IsCompressed', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckRequestHeader::IsMultiTid() const [member function]
+    cls.add_method('IsMultiTid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckRequestHeader::MustSendHtImmediateAck() const [member function]
+    cls.add_method('MustSendHtImmediateAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::SetHtImmediateAck(bool immediateAck) [member function]
+    cls.add_method('SetHtImmediateAck', 
+                   'void', 
+                   [param('bool', 'immediateAck')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::SetStartingSequence(uint16_t seq) [member function]
+    cls.add_method('SetStartingSequence', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::SetTidInfo(uint8_t tid) [member function]
+    cls.add_method('SetTidInfo', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckRequestHeader::SetType(ns3::BlockAckType type) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('ns3::BlockAckType', 'type')])
+    return
+
+def register_Ns3CtrlBAckResponseHeader_methods(root_module, cls):
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckResponseHeader::CtrlBAckResponseHeader(ns3::CtrlBAckResponseHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CtrlBAckResponseHeader const &', 'arg0')])
+    ## ctrl-headers.h (module 'wifi'): ns3::CtrlBAckResponseHeader::CtrlBAckResponseHeader() [constructor]
+    cls.add_constructor([])
+    ## ctrl-headers.h (module 'wifi'): uint32_t ns3::CtrlBAckResponseHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t const * ns3::CtrlBAckResponseHeader::GetBitmap() const [member function]
+    cls.add_method('GetBitmap', 
+                   'uint16_t const *', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint64_t ns3::CtrlBAckResponseHeader::GetCompressedBitmap() const [member function]
+    cls.add_method('GetCompressedBitmap', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): ns3::TypeId ns3::CtrlBAckResponseHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint32_t ns3::CtrlBAckResponseHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t ns3::CtrlBAckResponseHeader::GetStartingSequence() const [member function]
+    cls.add_method('GetStartingSequence', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint16_t ns3::CtrlBAckResponseHeader::GetStartingSequenceControl() const [member function]
+    cls.add_method('GetStartingSequenceControl', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): uint8_t ns3::CtrlBAckResponseHeader::GetTidInfo() const [member function]
+    cls.add_method('GetTidInfo', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): static ns3::TypeId ns3::CtrlBAckResponseHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsBasic() const [member function]
+    cls.add_method('IsBasic', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsCompressed() const [member function]
+    cls.add_method('IsCompressed', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsFragmentReceived(uint16_t seq, uint8_t frag) const [member function]
+    cls.add_method('IsFragmentReceived', 
+                   'bool', 
+                   [param('uint16_t', 'seq'), param('uint8_t', 'frag')], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsMultiTid() const [member function]
+    cls.add_method('IsMultiTid', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::IsPacketReceived(uint16_t seq) const [member function]
+    cls.add_method('IsPacketReceived', 
+                   'bool', 
+                   [param('uint16_t', 'seq')], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): bool ns3::CtrlBAckResponseHeader::MustSendHtImmediateAck() const [member function]
+    cls.add_method('MustSendHtImmediateAck', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::ResetBitmap() [member function]
+    cls.add_method('ResetBitmap', 
+                   'void', 
+                   [])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immediateAck) [member function]
+    cls.add_method('SetHtImmediateAck', 
+                   'void', 
+                   [param('bool', 'immediateAck')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedFragment(uint16_t seq, uint8_t frag) [member function]
+    cls.add_method('SetReceivedFragment', 
+                   'void', 
+                   [param('uint16_t', 'seq'), param('uint8_t', 'frag')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedPacket(uint16_t seq) [member function]
+    cls.add_method('SetReceivedPacket', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetStartingSequence(uint16_t seq) [member function]
+    cls.add_method('SetStartingSequence', 
+                   'void', 
+                   [param('uint16_t', 'seq')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetStartingSequenceControl(uint16_t seqControl) [member function]
+    cls.add_method('SetStartingSequenceControl', 
+                   'void', 
+                   [param('uint16_t', 'seqControl')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetTidInfo(uint8_t tid) [member function]
+    cls.add_method('SetTidInfo', 
+                   'void', 
+                   [param('uint8_t', 'tid')])
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetType(ns3::BlockAckType type) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('ns3::BlockAckType', 'type')])
+    return
+
+def register_Ns3Dcf_methods(root_module, cls):
+    ## dcf.h (module 'wifi'): ns3::Dcf::Dcf() [constructor]
+    cls.add_constructor([])
+    ## dcf.h (module 'wifi'): ns3::Dcf::Dcf(ns3::Dcf const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Dcf const &', 'arg0')])
+    ## dcf.h (module 'wifi'): uint32_t ns3::Dcf::GetAifsn() const [member function]
+    cls.add_method('GetAifsn', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): uint32_t ns3::Dcf::GetMaxCw() const [member function]
+    cls.add_method('GetMaxCw', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): uint32_t ns3::Dcf::GetMinCw() const [member function]
+    cls.add_method('GetMinCw', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): static ns3::TypeId ns3::Dcf::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## dcf.h (module 'wifi'): void ns3::Dcf::SetAifsn(uint32_t aifsn) [member function]
+    cls.add_method('SetAifsn', 
+                   'void', 
+                   [param('uint32_t', 'aifsn')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): void ns3::Dcf::SetMaxCw(uint32_t maxCw) [member function]
+    cls.add_method('SetMaxCw', 
+                   'void', 
+                   [param('uint32_t', 'maxCw')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## dcf.h (module 'wifi'): void ns3::Dcf::SetMinCw(uint32_t minCw) [member function]
+    cls.add_method('SetMinCw', 
+                   'void', 
+                   [param('uint32_t', 'minCw')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3EdcaTxopN_methods(root_module, cls):
+    ## edca-txop-n.h (module 'wifi'): static ns3::TypeId ns3::EdcaTxopN::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## edca-txop-n.h (module 'wifi'): ns3::EdcaTxopN::EdcaTxopN() [constructor]
+    cls.add_constructor([])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetLow(ns3::Ptr<ns3::MacLow> low) [member function]
+    cls.add_method('SetLow', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MacLow >', 'low')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetTxMiddle(ns3::MacTxMiddle * txMiddle) [member function]
+    cls.add_method('SetTxMiddle', 
+                   'void', 
+                   [param('ns3::MacTxMiddle *', 'txMiddle')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetManager(ns3::DcfManager * manager) [member function]
+    cls.add_method('SetManager', 
+                   'void', 
+                   [param('ns3::DcfManager *', 'manager')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetTxOkCallback(ns3::Callback<void, ns3::WifiMacHeader const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetTxOkCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::WifiMacHeader const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetTxFailedCallback(ns3::Callback<void, ns3::WifiMacHeader const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetTxFailedCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::WifiMacHeader const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> remoteManager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'remoteManager')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetTypeOfStation(ns3::TypeOfStation type) [member function]
+    cls.add_method('SetTypeOfStation', 
+                   'void', 
+                   [param('ns3::TypeOfStation', 'type')])
+    ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation ns3::EdcaTxopN::GetTypeOfStation() const [member function]
+    cls.add_method('GetTypeOfStation', 
+                   'ns3::TypeOfStation', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::EdcaTxopN::GetQueue() const [member function]
+    cls.add_method('GetQueue', 
+                   'ns3::Ptr< ns3::WifiMacQueue >', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetMinCw(uint32_t minCw) [member function]
+    cls.add_method('SetMinCw', 
+                   'void', 
+                   [param('uint32_t', 'minCw')], 
+                   is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetMaxCw(uint32_t maxCw) [member function]
+    cls.add_method('SetMaxCw', 
+                   'void', 
+                   [param('uint32_t', 'maxCw')], 
+                   is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetAifsn(uint32_t aifsn) [member function]
+    cls.add_method('SetAifsn', 
+                   'void', 
+                   [param('uint32_t', 'aifsn')], 
+                   is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetMinCw() const [member function]
+    cls.add_method('GetMinCw', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetMaxCw() const [member function]
+    cls.add_method('GetMaxCw', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetAifsn() const [member function]
+    cls.add_method('GetAifsn', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## edca-txop-n.h (module 'wifi'): ns3::Ptr<ns3::MacLow> ns3::EdcaTxopN::Low() [member function]
+    cls.add_method('Low', 
+                   'ns3::Ptr< ns3::MacLow >', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): ns3::Ptr<ns3::MsduAggregator> ns3::EdcaTxopN::GetMsduAggregator() const [member function]
+    cls.add_method('GetMsduAggregator', 
+                   'ns3::Ptr< ns3::MsduAggregator >', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedsAccess() const [member function]
+    cls.add_method('NeedsAccess', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NotifyAccessGranted() [member function]
+    cls.add_method('NotifyAccessGranted', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NotifyInternalCollision() [member function]
+    cls.add_method('NotifyInternalCollision', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NotifyCollision() [member function]
+    cls.add_method('NotifyCollision', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NotifyChannelSwitching() [member function]
+    cls.add_method('NotifyChannelSwitching', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotCts(double snr, ns3::WifiMode txMode) [member function]
+    cls.add_method('GotCts', 
+                   'void', 
+                   [param('double', 'snr'), param('ns3::WifiMode', 'txMode')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::MissedCts() [member function]
+    cls.add_method('MissedCts', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotAck(double snr, ns3::WifiMode txMode) [member function]
+    cls.add_method('GotAck', 
+                   'void', 
+                   [param('double', 'snr'), param('ns3::WifiMode', 'txMode')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotBlockAck(ns3::CtrlBAckResponseHeader const * blockAck, ns3::Mac48Address recipient) [member function]
+    cls.add_method('GotBlockAck', 
+                   'void', 
+                   [param('ns3::CtrlBAckResponseHeader const *', 'blockAck'), param('ns3::Mac48Address', 'recipient')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::MissedBlockAck() [member function]
+    cls.add_method('MissedBlockAck', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotAddBaResponse(ns3::MgtAddBaResponseHeader const * respHdr, ns3::Mac48Address recipient) [member function]
+    cls.add_method('GotAddBaResponse', 
+                   'void', 
+                   [param('ns3::MgtAddBaResponseHeader const *', 'respHdr'), param('ns3::Mac48Address', 'recipient')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::GotDelBaFrame(ns3::MgtDelBaHeader const * delBaHdr, ns3::Mac48Address recipient) [member function]
+    cls.add_method('GotDelBaFrame', 
+                   'void', 
+                   [param('ns3::MgtDelBaHeader const *', 'delBaHdr'), param('ns3::Mac48Address', 'recipient')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::MissedAck() [member function]
+    cls.add_method('MissedAck', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::StartNext() [member function]
+    cls.add_method('StartNext', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::EndTxNoAck() [member function]
+    cls.add_method('EndTxNoAck', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::RestartAccessIfNeeded() [member function]
+    cls.add_method('RestartAccessIfNeeded', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::StartAccessIfNeeded() [member function]
+    cls.add_method('StartAccessIfNeeded', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedRts() [member function]
+    cls.add_method('NeedRts', 
+                   'bool', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedRtsRetransmission() [member function]
+    cls.add_method('NeedRtsRetransmission', 
+                   'bool', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedDataRetransmission() [member function]
+    cls.add_method('NeedDataRetransmission', 
+                   'bool', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::NeedFragmentation() const [member function]
+    cls.add_method('NeedFragmentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetNextFragmentSize() [member function]
+    cls.add_method('GetNextFragmentSize', 
+                   'uint32_t', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetFragmentSize() [member function]
+    cls.add_method('GetFragmentSize', 
+                   'uint32_t', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): uint32_t ns3::EdcaTxopN::GetFragmentOffset() [member function]
+    cls.add_method('GetFragmentOffset', 
+                   'uint32_t', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): bool ns3::EdcaTxopN::IsLastFragment() const [member function]
+    cls.add_method('IsLastFragment', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::NextFragment() [member function]
+    cls.add_method('NextFragment', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): ns3::Ptr<ns3::Packet> ns3::EdcaTxopN::GetFragmentPacket(ns3::WifiMacHeader * hdr) [member function]
+    cls.add_method('GetFragmentPacket', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [param('ns3::WifiMacHeader *', 'hdr')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetAccessCategory(ns3::AcIndex ac) [member function]
+    cls.add_method('SetAccessCategory', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::Queue(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('Queue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetMsduAggregator(ns3::Ptr<ns3::MsduAggregator> aggr) [member function]
+    cls.add_method('SetMsduAggregator', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MsduAggregator >', 'aggr')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::PushFront(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('PushFront', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::CompleteConfig() [member function]
+    cls.add_method('CompleteConfig', 
+                   'void', 
+                   [])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetBlockAckThreshold(uint8_t threshold) [member function]
+    cls.add_method('SetBlockAckThreshold', 
+                   'void', 
+                   [param('uint8_t', 'threshold')])
+    ## edca-txop-n.h (module 'wifi'): uint8_t ns3::EdcaTxopN::GetBlockAckThreshold() const [member function]
+    cls.add_method('GetBlockAckThreshold', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SetBlockAckInactivityTimeout(uint16_t timeout) [member function]
+    cls.add_method('SetBlockAckInactivityTimeout', 
+                   'void', 
+                   [param('uint16_t', 'timeout')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::SendDelbaFrame(ns3::Mac48Address addr, uint8_t tid, bool byOriginator) [member function]
+    cls.add_method('SendDelbaFrame', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'addr'), param('uint8_t', 'tid'), param('bool', 'byOriginator')])
+    ## edca-txop-n.h (module 'wifi'): int64_t ns3::EdcaTxopN::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
+    ## edca-txop-n.h (module 'wifi'): void ns3::EdcaTxopN::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3EmptyAttributeValue_methods(root_module, cls):
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])
+    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue() [constructor]
+    cls.add_constructor([])
+    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EmptyAttributeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
+    ## attribute.h (module 'core'): bool ns3::EmptyAttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   visibility='private', is_virtual=True)
+    ## attribute.h (module 'core'): std::string ns3::EmptyAttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3EventImpl_methods(root_module, cls):
+    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventImpl const &', 'arg0')])
+    ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl() [constructor]
+    cls.add_constructor([])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Cancel() [member function]
+    cls.add_method('Cancel', 
+                   'void', 
+                   [])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Invoke() [member function]
+    cls.add_method('Invoke', 
+                   'void', 
+                   [])
+    ## event-impl.h (module 'core'): bool ns3::EventImpl::IsCancelled() [member function]
+    cls.add_method('IsCancelled', 
+                   'bool', 
+                   [])
+    ## event-impl.h (module 'core'): void ns3::EventImpl::Notify() [member function]
+    cls.add_method('Notify', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3ExtendedSupportedRatesIE_methods(root_module, cls):
+    ## supported-rates.h (module 'wifi'): ns3::ExtendedSupportedRatesIE::ExtendedSupportedRatesIE(ns3::ExtendedSupportedRatesIE const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ExtendedSupportedRatesIE const &', 'arg0')])
+    ## supported-rates.h (module 'wifi'): ns3::ExtendedSupportedRatesIE::ExtendedSupportedRatesIE() [constructor]
+    cls.add_constructor([])
+    ## supported-rates.h (module 'wifi'): ns3::ExtendedSupportedRatesIE::ExtendedSupportedRatesIE(ns3::SupportedRates * rates) [constructor]
+    cls.add_constructor([param('ns3::SupportedRates *', 'rates')])
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::ExtendedSupportedRatesIE::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## supported-rates.h (module 'wifi'): ns3::WifiInformationElementId ns3::ExtendedSupportedRatesIE::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::ExtendedSupportedRatesIE::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): uint16_t ns3::ExtendedSupportedRatesIE::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): ns3::Buffer::Iterator ns3::ExtendedSupportedRatesIE::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): void ns3::ExtendedSupportedRatesIE::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    return
+
+def register_Ns3HtCapabilities_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities::HtCapabilities(ns3::HtCapabilities const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilities const &', 'arg0')])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities::HtCapabilities() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): ns3::WifiInformationElementId ns3::HtCapabilities::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetAmpduParameters() const [member function]
+    cls.add_method('GetAmpduParameters', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint16_t ns3::HtCapabilities::GetHtCapabilitiesInfo() const [member function]
+    cls.add_method('GetHtCapabilitiesInfo', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t * ns3::HtCapabilities::GetRxMcsBitmask() [member function]
+    cls.add_method('GetRxMcsBitmask', 
+                   'uint8_t *', 
+                   [])
+    ## ht-capabilities.h (module 'wifi'): uint16_t ns3::HtCapabilities::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetShortGuardInterval20() const [member function]
+    cls.add_method('GetShortGuardInterval20', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetSupportedChannelWidth() const [member function]
+    cls.add_method('GetSupportedChannelWidth', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint64_t ns3::HtCapabilities::GetSupportedMcsSet1() const [member function]
+    cls.add_method('GetSupportedMcsSet1', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint64_t ns3::HtCapabilities::GetSupportedMcsSet2() const [member function]
+    cls.add_method('GetSupportedMcsSet2', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): bool ns3::HtCapabilities::IsSupportedMcs(uint8_t mcs) [member function]
+    cls.add_method('IsSupportedMcs', 
+                   'bool', 
+                   [param('uint8_t', 'mcs')])
+    ## ht-capabilities.h (module 'wifi'): ns3::Buffer::Iterator ns3::HtCapabilities::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetAmpduParameters(uint8_t ctrl) [member function]
+    cls.add_method('SetAmpduParameters', 
+                   'void', 
+                   [param('uint8_t', 'ctrl')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetGreenfield(uint8_t greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('uint8_t', 'greenfield')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetHtCapabilitiesInfo(uint16_t ctrl) [member function]
+    cls.add_method('SetHtCapabilitiesInfo', 
+                   'void', 
+                   [param('uint16_t', 'ctrl')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetHtSupported(uint8_t htsupported) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('uint8_t', 'htsupported')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetLdpc(uint8_t ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('uint8_t', 'ldpc')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetRxMcsBitmask(uint8_t index) [member function]
+    cls.add_method('SetRxMcsBitmask', 
+                   'void', 
+                   [param('uint8_t', 'index')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetShortGuardInterval20(uint8_t shortguardinterval) [member function]
+    cls.add_method('SetShortGuardInterval20', 
+                   'void', 
+                   [param('uint8_t', 'shortguardinterval')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetSupportedChannelWidth(uint8_t supportedchannelwidth) [member function]
+    cls.add_method('SetSupportedChannelWidth', 
+                   'void', 
+                   [param('uint8_t', 'supportedchannelwidth')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetSupportedMcsSet(uint64_t ctrl1, uint64_t ctrl2) [member function]
+    cls.add_method('SetSupportedMcsSet', 
+                   'void', 
+                   [param('uint64_t', 'ctrl1'), param('uint64_t', 'ctrl2')])
+    return
+
+def register_Ns3HtCapabilitiesChecker_methods(root_module, cls):
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker::HtCapabilitiesChecker() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker::HtCapabilitiesChecker(ns3::HtCapabilitiesChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilitiesChecker const &', 'arg0')])
+    return
+
+def register_Ns3HtCapabilitiesValue_methods(root_module, cls):
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue(ns3::HtCapabilitiesValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilitiesValue const &', 'arg0')])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue(ns3::HtCapabilities const & value) [constructor]
+    cls.add_constructor([param('ns3::HtCapabilities const &', 'value')])
+    ## ht-capabilities.h (module 'wifi'): ns3::Ptr<ns3::AttributeValue> ns3::HtCapabilitiesValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): bool ns3::HtCapabilitiesValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities ns3::HtCapabilitiesValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): std::string ns3::HtCapabilitiesValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilitiesValue::Set(ns3::HtCapabilities const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::HtCapabilities const &', 'value')])
+    return
+
+def register_Ns3Ipv4AddressChecker_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker(ns3::Ipv4AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv4AddressValue_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue(ns3::Ipv4AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4AddressValue const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue::Ipv4AddressValue(ns3::Ipv4Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Address const &', 'value')])
+    ## ipv4-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv4AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Address ns3::Ipv4AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): std::string ns3::Ipv4AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4AddressValue::Set(ns3::Ipv4Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv4Address const &', 'value')])
+    return
+
+def register_Ns3Ipv4MaskChecker_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker::Ipv4MaskChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskChecker::Ipv4MaskChecker(ns3::Ipv4MaskChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4MaskChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv4MaskValue_methods(root_module, cls):
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue() [constructor]
+    cls.add_constructor([])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue(ns3::Ipv4MaskValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4MaskValue const &', 'arg0')])
+    ## ipv4-address.h (module 'network'): ns3::Ipv4MaskValue::Ipv4MaskValue(ns3::Ipv4Mask const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Mask const &', 'value')])
+    ## ipv4-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv4MaskValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): bool ns3::Ipv4MaskValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv4-address.h (module 'network'): ns3::Ipv4Mask ns3::Ipv4MaskValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv4Mask', 
+                   [], 
+                   is_const=True)
+    ## ipv4-address.h (module 'network'): std::string ns3::Ipv4MaskValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-address.h (module 'network'): void ns3::Ipv4MaskValue::Set(ns3::Ipv4Mask const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv4Mask const &', 'value')])
+    return
+
+def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker::Ipv6AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressChecker::Ipv6AddressChecker(ns3::Ipv6AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv6AddressValue_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6AddressValue const &', 'arg0')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address const &', 'value')])
+    ## ipv6-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv6AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Address ns3::Ipv6AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): std::string ns3::Ipv6AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6AddressValue::Set(ns3::Ipv6Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv6Address const &', 'value')])
+    return
+
+def register_Ns3Ipv6PrefixChecker_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker(ns3::Ipv6PrefixChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PrefixChecker const &', 'arg0')])
+    return
+
+def register_Ns3Ipv6PrefixValue_methods(root_module, cls):
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue() [constructor]
+    cls.add_constructor([])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6PrefixValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PrefixValue const &', 'arg0')])
+    ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6Prefix const & value) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Prefix const &', 'value')])
+    ## ipv6-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Ipv6PrefixValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6PrefixValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix ns3::Ipv6PrefixValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ipv6Prefix', 
+                   [], 
+                   is_const=True)
+    ## ipv6-address.h (module 'network'): std::string ns3::Ipv6PrefixValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ipv6-address.h (module 'network'): void ns3::Ipv6PrefixValue::Set(ns3::Ipv6Prefix const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ipv6Prefix const &', 'value')])
+    return
+
+def register_Ns3Mac48AddressChecker_methods(root_module, cls):
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker(ns3::Mac48AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac48AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Mac48AddressValue_methods(root_module, cls):
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue() [constructor]
+    cls.add_constructor([])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue(ns3::Mac48AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac48AddressValue const &', 'arg0')])
+    ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue(ns3::Mac48Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Mac48Address const &', 'value')])
+    ## mac48-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Mac48AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac48-address.h (module 'network'): bool ns3::Mac48AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## mac48-address.h (module 'network'): ns3::Mac48Address ns3::Mac48AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## mac48-address.h (module 'network'): std::string ns3::Mac48AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## mac48-address.h (module 'network'): void ns3::Mac48AddressValue::Set(ns3::Mac48Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Mac48Address const &', 'value')])
+    return
+
+def register_Ns3MacLow_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLow::MacLow(ns3::MacLow const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLow const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLow::MacLow() [constructor]
+    cls.add_constructor([])
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::CalculateTransmissionTime(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr, ns3::MacLowTransmissionParameters const & parameters) const [member function]
+    cls.add_method('CalculateTransmissionTime', 
+                   'ns3::Time', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters const &', 'parameters')], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::CreateBlockAckAgreement(ns3::MgtAddBaResponseHeader const * respHdr, ns3::Mac48Address originator, uint16_t startingSeq) [member function]
+    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::DestroyBlockAckAgreement(ns3::Mac48Address originator, uint8_t tid) [member function]
+    cls.add_method('DestroyBlockAckAgreement', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'originator'), param('uint8_t', 'tid')])
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetAckTimeout() const [member function]
+    cls.add_method('GetAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLow::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetBasicBlockAckTimeout() const [member function]
+    cls.add_method('GetBasicBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLow::GetBssid() const [member function]
+    cls.add_method('GetBssid', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetCompressedBlockAckTimeout() const [member function]
+    cls.add_method('GetCompressedBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetCtsTimeout() const [member function]
+    cls.add_method('GetCtsTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::GetCtsToSelfSupported() const [member function]
+    cls.add_method('GetCtsToSelfSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetPifs() const [member function]
+    cls.add_method('GetPifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetRifs() const [member function]
+    cls.add_method('GetRifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetSifs() const [member function]
+    cls.add_method('GetSifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): ns3::Time ns3::MacLow::GetSlotTime() const [member function]
+    cls.add_method('GetSlotTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::IsPromisc() const [member function]
+    cls.add_method('IsPromisc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::NotifySwitchingStartNow(ns3::Time duration) [member function]
+    cls.add_method('NotifySwitchingStartNow', 
+                   'void', 
+                   [param('ns3::Time', 'duration')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveError(ns3::Ptr<ns3::Packet const> packet, double rxSnr) [member function]
+    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) [member function]
+    cls.add_method('ReceiveOk', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+    cls.add_method('RegisterBlockAckListenerForAc', 
+                   'void', 
+                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
+    cls.add_method('RegisterDcfListener', 
+                   'void', 
+                   [param('ns3::MacLowDcfListener *', 'listener')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetAckTimeout(ns3::Time ackTimeout) [member function]
+    cls.add_method('SetAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ackTimeout')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetAddress(ns3::Mac48Address ad) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'ad')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetBasicBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetBasicBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetBssid(ns3::Mac48Address ad) [member function]
+    cls.add_method('SetBssid', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'ad')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetCompressedBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetCompressedBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetCtsTimeout(ns3::Time ctsTimeout) [member function]
+    cls.add_method('SetCtsTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ctsTimeout')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetCtsToSelfSupported(bool enable) [member function]
+    cls.add_method('SetCtsToSelfSupported', 
+                   'void', 
+                   [param('bool', 'enable')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetPhy(ns3::Ptr<ns3::WifiPhy> phy) [member function]
+    cls.add_method('SetPhy', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiPhy >', 'phy')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetPifs(ns3::Time pifs) [member function]
+    cls.add_method('SetPifs', 
+                   'void', 
+                   [param('ns3::Time', 'pifs')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetPromisc() [member function]
+    cls.add_method('SetPromisc', 
+                   'void', 
+                   [])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetRifs(ns3::Time rifs) [member function]
+    cls.add_method('SetRifs', 
+                   'void', 
+                   [param('ns3::Time', 'rifs')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetRxCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, ns3::WifiMacHeader const*, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetRxCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::WifiMacHeader const *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetSifs(ns3::Time sifs) [member function]
+    cls.add_method('SetSifs', 
+                   'void', 
+                   [param('ns3::Time', 'sifs')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetSlotTime(ns3::Time slotTime) [member function]
+    cls.add_method('SetSlotTime', 
+                   'void', 
+                   [param('ns3::Time', 'slotTime')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> manager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'manager')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::StartTransmission(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr, ns3::MacLowTransmissionParameters parameters, ns3::MacLowTransmissionListener * listener) [member function]
+    cls.add_method('StartTransmission', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')])
+    ## mac-low.h (module 'wifi'): ns3::WifiTxVector ns3::MacLow::GetDataTxVector(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr) const [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   is_const=True, visibility='protected', is_virtual=True)
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3MgtBeaconHeader_methods(root_module, cls):
+    ## mgt-headers.h (module 'wifi'): ns3::MgtBeaconHeader::MgtBeaconHeader() [constructor]
+    cls.add_constructor([])
+    ## mgt-headers.h (module 'wifi'): ns3::MgtBeaconHeader::MgtBeaconHeader(ns3::MgtBeaconHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MgtBeaconHeader const &', 'arg0')])
+    return
+
+def register_Ns3NetDevice_methods(root_module, cls):
+    ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
+    cls.add_constructor([])
+    ## net-device.h (module 'network'): ns3::NetDevice::NetDevice(ns3::NetDevice const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NetDevice const &', 'arg0')])
+    ## net-device.h (module 'network'): void ns3::NetDevice::AddLinkChangeCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('AddLinkChangeCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetBroadcast() const [member function]
+    cls.add_method('GetBroadcast', 
+                   'ns3::Address', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Ptr<ns3::Channel> ns3::NetDevice::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::Channel >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): uint32_t ns3::NetDevice::GetIfIndex() const [member function]
+    cls.add_method('GetIfIndex', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): uint16_t ns3::NetDevice::GetMtu() const [member function]
+    cls.add_method('GetMtu', 
+                   'uint16_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv4Address multicastGroup) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv4Address', 'multicastGroup')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function]
+    cls.add_method('GetMulticast', 
+                   'ns3::Address', 
+                   [param('ns3::Ipv6Address', 'addr')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): ns3::Ptr<ns3::Node> ns3::NetDevice::GetNode() const [member function]
+    cls.add_method('GetNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): static ns3::TypeId ns3::NetDevice::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsBridge() const [member function]
+    cls.add_method('IsBridge', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsLinkUp() const [member function]
+    cls.add_method('IsLinkUp', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsMulticast() const [member function]
+    cls.add_method('IsMulticast', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::IsPointToPoint() const [member function]
+    cls.add_method('IsPointToPoint', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::NeedsArp() const [member function]
+    cls.add_method('NeedsArp', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('Send', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
+    cls.add_method('SendFrom', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetIfIndex(uint32_t const index) [member function]
+    cls.add_method('SetIfIndex', 
+                   'void', 
+                   [param('uint32_t const', 'index')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SetMtu(uint16_t const mtu) [member function]
+    cls.add_method('SetMtu', 
+                   'bool', 
+                   [param('uint16_t const', 'mtu')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetNode(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('SetNode', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetPromiscReceiveCallback(ns3::Callback<bool,ns3::Ptr<ns3::NetDevice>,ns3::Ptr<const ns3::Packet>,short unsigned int,const ns3::Address&,const ns3::Address&,ns3::NetDevice::PacketType,ns3::empty,ns3::empty,ns3::empty> cb) [member function]
+    cls.add_method('SetPromiscReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, short unsigned int, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'cb')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): void ns3::NetDevice::SetReceiveCallback(ns3::Callback<bool,ns3::Ptr<ns3::NetDevice>,ns3::Ptr<const ns3::Packet>,short unsigned int,const ns3::Address&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> cb) [member function]
+    cls.add_method('SetReceiveCallback', 
+                   'void', 
+                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, short unsigned int, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'cb')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## net-device.h (module 'network'): bool ns3::NetDevice::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3NixVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## nix-vector.h (module 'network'): ns3::NixVector::NixVector() [constructor]
+    cls.add_constructor([])
+    ## nix-vector.h (module 'network'): ns3::NixVector::NixVector(ns3::NixVector const & o) [copy constructor]
+    cls.add_constructor([param('ns3::NixVector const &', 'o')])
+    ## nix-vector.h (module 'network'): void ns3::NixVector::AddNeighborIndex(uint32_t newBits, uint32_t numberOfBits) [member function]
+    cls.add_method('AddNeighborIndex', 
+                   'void', 
+                   [param('uint32_t', 'newBits'), param('uint32_t', 'numberOfBits')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::BitCount(uint32_t numberOfNeighbors) const [member function]
+    cls.add_method('BitCount', 
+                   'uint32_t', 
+                   [param('uint32_t', 'numberOfNeighbors')], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): ns3::Ptr<ns3::NixVector> ns3::NixVector::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::NixVector >', 
+                   [], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Deserialize(uint32_t const * buffer, uint32_t size) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('uint32_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::ExtractNeighborIndex(uint32_t numberOfBits) [member function]
+    cls.add_method('ExtractNeighborIndex', 
+                   'uint32_t', 
+                   [param('uint32_t', 'numberOfBits')])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetRemainingBits() [member function]
+    cls.add_method('GetRemainingBits', 
+                   'uint32_t', 
+                   [])
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Serialize(uint32_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint32_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    return
+
+def register_Ns3Node_methods(root_module, cls):
+    ## node.h (module 'network'): ns3::Node::Node(ns3::Node const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Node const &', 'arg0')])
+    ## node.h (module 'network'): ns3::Node::Node() [constructor]
+    cls.add_constructor([])
+    ## node.h (module 'network'): ns3::Node::Node(uint32_t systemId) [constructor]
+    cls.add_constructor([param('uint32_t', 'systemId')])
+    ## node.h (module 'network'): uint32_t ns3::Node::AddApplication(ns3::Ptr<ns3::Application> application) [member function]
+    cls.add_method('AddApplication', 
+                   'uint32_t', 
+                   [param('ns3::Ptr< ns3::Application >', 'application')])
+    ## node.h (module 'network'): uint32_t ns3::Node::AddDevice(ns3::Ptr<ns3::NetDevice> device) [member function]
+    cls.add_method('AddDevice', 
+                   'uint32_t', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+    ## node.h (module 'network'): static bool ns3::Node::ChecksumEnabled() [member function]
+    cls.add_method('ChecksumEnabled', 
+                   'bool', 
+                   [], 
+                   is_static=True)
+    ## node.h (module 'network'): ns3::Ptr<ns3::Application> ns3::Node::GetApplication(uint32_t index) const [member function]
+    cls.add_method('GetApplication', 
+                   'ns3::Ptr< ns3::Application >', 
+                   [param('uint32_t', 'index')], 
+                   is_const=True)
+    ## node.h (module 'network'): ns3::Ptr<ns3::NetDevice> ns3::Node::GetDevice(uint32_t index) const [member function]
+    cls.add_method('GetDevice', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [param('uint32_t', 'index')], 
+                   is_const=True)
+    ## node.h (module 'network'): uint32_t ns3::Node::GetId() const [member function]
+    cls.add_method('GetId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## node.h (module 'network'): uint32_t ns3::Node::GetNApplications() const [member function]
+    cls.add_method('GetNApplications', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## node.h (module 'network'): uint32_t ns3::Node::GetNDevices() const [member function]
+    cls.add_method('GetNDevices', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## node.h (module 'network'): uint32_t ns3::Node::GetSystemId() const [member function]
+    cls.add_method('GetSystemId', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## node.h (module 'network'): static ns3::TypeId ns3::Node::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback<void,ns3::Ptr<ns3::NetDevice>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function]
+    cls.add_method('RegisterDeviceAdditionListener', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')])
+    ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback<void, 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> handler, uint16_t protocolType, ns3::Ptr<ns3::NetDevice> device, bool promiscuous=false) [member function]
+    cls.add_method('RegisterProtocolHandler', 
+                   'void', 
+                   [param('ns3::Callback< void, 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 >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')])
+    ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback<void,ns3::Ptr<ns3::NetDevice>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function]
+    cls.add_method('UnregisterDeviceAdditionListener', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')])
+    ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback<void, 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> handler) [member function]
+    cls.add_method('UnregisterProtocolHandler', 
+                   'void', 
+                   [param('ns3::Callback< void, 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 >', 'handler')])
+    ## node.h (module 'network'): void ns3::Node::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## node.h (module 'network'): void ns3::Node::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3NqosWaveMacHelper_methods(root_module, cls):
+    ## wave-mac-helper.h (module 'wave'): ns3::NqosWaveMacHelper::NqosWaveMacHelper(ns3::NqosWaveMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NqosWaveMacHelper const &', 'arg0')])
+    ## wave-mac-helper.h (module 'wave'): ns3::NqosWaveMacHelper::NqosWaveMacHelper() [constructor]
+    cls.add_constructor([])
+    ## wave-mac-helper.h (module 'wave'): static ns3::NqosWaveMacHelper ns3::NqosWaveMacHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::NqosWaveMacHelper', 
+                   [], 
+                   is_static=True)
+    ## wave-mac-helper.h (module 'wave'): void ns3::NqosWaveMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
+    return
+
+def register_Ns3ObjectFactoryChecker_methods(root_module, cls):
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')])
+    return
+
+def register_Ns3ObjectFactoryValue_methods(root_module, cls):
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor]
+    cls.add_constructor([])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')])
+    ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor]
+    cls.add_constructor([param('ns3::ObjectFactory const &', 'value')])
+    ## object-factory.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::ObjectFactoryValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::ObjectFactory', 
+                   [], 
+                   is_const=True)
+    ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::ObjectFactory const &', 'value')])
+    return
+
+def register_Ns3OrganizationIdentifierChecker_methods(root_module, cls):
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierChecker::OrganizationIdentifierChecker() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierChecker::OrganizationIdentifierChecker(ns3::OrganizationIdentifierChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OrganizationIdentifierChecker const &', 'arg0')])
+    return
+
+def register_Ns3OrganizationIdentifierValue_methods(root_module, cls):
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierValue::OrganizationIdentifierValue() [constructor]
+    cls.add_constructor([])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierValue::OrganizationIdentifierValue(ns3::OrganizationIdentifierValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OrganizationIdentifierValue const &', 'arg0')])
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifierValue::OrganizationIdentifierValue(ns3::OrganizationIdentifier const & value) [constructor]
+    cls.add_constructor([param('ns3::OrganizationIdentifier const &', 'value')])
+    ## vendor-specific-action.h (module 'wave'): ns3::Ptr<ns3::AttributeValue> ns3::OrganizationIdentifierValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): bool ns3::OrganizationIdentifierValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): ns3::OrganizationIdentifier ns3::OrganizationIdentifierValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::OrganizationIdentifier', 
+                   [], 
+                   is_const=True)
+    ## vendor-specific-action.h (module 'wave'): std::string ns3::OrganizationIdentifierValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## vendor-specific-action.h (module 'wave'): void ns3::OrganizationIdentifierValue::Set(ns3::OrganizationIdentifier const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier const &', 'value')])
+    return
+
+def register_Ns3OutputStreamWrapper_methods(root_module, cls):
+    ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper::OutputStreamWrapper(ns3::OutputStreamWrapper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::OutputStreamWrapper const &', 'arg0')])
+    ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper::OutputStreamWrapper(std::string filename, std::_Ios_Openmode filemode) [constructor]
+    cls.add_constructor([param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode')])
+    ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper::OutputStreamWrapper(std::ostream * os) [constructor]
+    cls.add_constructor([param('std::ostream *', 'os')])
+    ## output-stream-wrapper.h (module 'network'): std::ostream * ns3::OutputStreamWrapper::GetStream() [member function]
+    cls.add_method('GetStream', 
+                   'std::ostream *', 
+                   [])
+    return
+
+def register_Ns3Packet_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## packet.h (module 'network'): ns3::Packet::Packet() [constructor]
+    cls.add_constructor([])
+    ## packet.h (module 'network'): ns3::Packet::Packet(ns3::Packet const & o) [copy constructor]
+    cls.add_constructor([param('ns3::Packet const &', 'o')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint32_t size) [constructor]
+    cls.add_constructor([param('uint32_t', 'size')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size, bool magic) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')])
+    ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
+    cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('AddAtEnd', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet.h (module 'network'): void ns3::Packet::AddByteTag(ns3::Tag const & tag) const [member function]
+    cls.add_method('AddByteTag', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::AddHeader(ns3::Header const & header) [member function]
+    cls.add_method('AddHeader', 
+                   'void', 
+                   [param('ns3::Header const &', 'header')])
+    ## packet.h (module 'network'): void ns3::Packet::AddPacketTag(ns3::Tag const & tag) const [member function]
+    cls.add_method('AddPacketTag', 
+                   'void', 
+                   [param('ns3::Tag const &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::AddPaddingAtEnd(uint32_t size) [member function]
+    cls.add_method('AddPaddingAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::AddTrailer(ns3::Trailer const & trailer) [member function]
+    cls.add_method('AddTrailer', 
+                   'void', 
+                   [param('ns3::Trailer const &', 'trailer')])
+    ## packet.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::Packet::BeginItem() const [member function]
+    cls.add_method('BeginItem', 
+                   'ns3::PacketMetadata::ItemIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::Packet> ns3::Packet::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::CopyData(uint8_t * buffer, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::CopyData(std::ostream * os, uint32_t size) const [member function]
+    cls.add_method('CopyData', 
+                   'void', 
+                   [param('std::ostream *', 'os'), param('uint32_t', 'size')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::Packet> ns3::Packet::CreateFragment(uint32_t start, uint32_t length) const [member function]
+    cls.add_method('CreateFragment', 
+                   'ns3::Ptr< ns3::Packet >', 
+                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
+                   is_const=True)
+    ## packet.h (module 'network'): static void ns3::Packet::EnableChecking() [member function]
+    cls.add_method('EnableChecking', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet.h (module 'network'): static void ns3::Packet::EnablePrinting() [member function]
+    cls.add_method('EnablePrinting', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    ## packet.h (module 'network'): bool ns3::Packet::FindFirstMatchingByteTag(ns3::Tag & tag) const [member function]
+    cls.add_method('FindFirstMatchingByteTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::ByteTagIterator ns3::Packet::GetByteTagIterator() const [member function]
+    cls.add_method('GetByteTagIterator', 
+                   'ns3::ByteTagIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::Ptr<ns3::NixVector> ns3::Packet::GetNixVector() const [member function]
+    cls.add_method('GetNixVector', 
+                   'ns3::Ptr< ns3::NixVector >', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): ns3::PacketTagIterator ns3::Packet::GetPacketTagIterator() const [member function]
+    cls.add_method('GetPacketTagIterator', 
+                   'ns3::PacketTagIterator', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::GetSize() const [member function]
+    cls.add_method('GetSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint64_t ns3::Packet::GetUid() const [member function]
+    cls.add_method('GetUid', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint8_t const * ns3::Packet::PeekData() const [member function]
+    cls.add_method('PeekData', 
+                   'uint8_t const *', 
+                   [], 
+                   deprecated=True, is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::PeekHeader(ns3::Header & header) const [member function]
+    cls.add_method('PeekHeader', 
+                   'uint32_t', 
+                   [param('ns3::Header &', 'header')], 
+                   is_const=True)
+    ## packet.h (module 'network'): bool ns3::Packet::PeekPacketTag(ns3::Tag & tag) const [member function]
+    cls.add_method('PeekPacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')], 
+                   is_const=True)
+    ## packet.h (module 'network'): uint32_t ns3::Packet::PeekTrailer(ns3::Trailer & trailer) [member function]
+    cls.add_method('PeekTrailer', 
+                   'uint32_t', 
+                   [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): void ns3::Packet::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::PrintByteTags(std::ostream & os) const [member function]
+    cls.add_method('PrintByteTags', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::PrintPacketTags(std::ostream & os) const [member function]
+    cls.add_method('PrintPacketTags', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAllByteTags() [member function]
+    cls.add_method('RemoveAllByteTags', 
+                   'void', 
+                   [])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAllPacketTags() [member function]
+    cls.add_method('RemoveAllPacketTags', 
+                   'void', 
+                   [])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAtEnd(uint32_t size) [member function]
+    cls.add_method('RemoveAtEnd', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): void ns3::Packet::RemoveAtStart(uint32_t size) [member function]
+    cls.add_method('RemoveAtStart', 
+                   'void', 
+                   [param('uint32_t', 'size')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveHeader(ns3::Header & header) [member function]
+    cls.add_method('RemoveHeader', 
+                   'uint32_t', 
+                   [param('ns3::Header &', 'header')])
+    ## packet.h (module 'network'): bool ns3::Packet::RemovePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('RemovePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveTrailer(ns3::Trailer & trailer) [member function]
+    cls.add_method('RemoveTrailer', 
+                   'uint32_t', 
+                   [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
+    ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
+    cls.add_method('Serialize', 
+                   'uint32_t', 
+                   [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], 
+                   is_const=True)
+    ## packet.h (module 'network'): void ns3::Packet::SetNixVector(ns3::Ptr<ns3::NixVector> arg0) [member function]
+    cls.add_method('SetNixVector', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
+    return
+
+def register_Ns3PointerChecker_methods(root_module, cls):
+    ## pointer.h (module 'core'): ns3::PointerChecker::PointerChecker() [constructor]
+    cls.add_constructor([])
+    ## pointer.h (module 'core'): ns3::PointerChecker::PointerChecker(ns3::PointerChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointerChecker const &', 'arg0')])
+    ## pointer.h (module 'core'): ns3::TypeId ns3::PointerChecker::GetPointeeTypeId() const [member function]
+    cls.add_method('GetPointeeTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    return
+
+def register_Ns3PointerValue_methods(root_module, cls):
+    ## pointer.h (module 'core'): ns3::PointerValue::PointerValue(ns3::PointerValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointerValue const &', 'arg0')])
+    ## pointer.h (module 'core'): ns3::PointerValue::PointerValue() [constructor]
+    cls.add_constructor([])
+    ## pointer.h (module 'core'): ns3::PointerValue::PointerValue(ns3::Ptr<ns3::Object> object) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Object >', 'object')])
+    ## pointer.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::PointerValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## pointer.h (module 'core'): bool ns3::PointerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## pointer.h (module 'core'): ns3::Ptr<ns3::Object> ns3::PointerValue::GetObject() const [member function]
+    cls.add_method('GetObject', 
+                   'ns3::Ptr< ns3::Object >', 
+                   [], 
+                   is_const=True)
+    ## pointer.h (module 'core'): std::string ns3::PointerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## pointer.h (module 'core'): void ns3::PointerValue::SetObject(ns3::Ptr<ns3::Object> object) [member function]
+    cls.add_method('SetObject', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'object')])
+    return
+
+def register_Ns3QosWaveMacHelper_methods(root_module, cls):
+    ## wave-mac-helper.h (module 'wave'): ns3::QosWaveMacHelper::QosWaveMacHelper(ns3::QosWaveMacHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::QosWaveMacHelper const &', 'arg0')])
+    ## wave-mac-helper.h (module 'wave'): ns3::QosWaveMacHelper::QosWaveMacHelper() [constructor]
+    cls.add_constructor([])
+    ## wave-mac-helper.h (module 'wave'): static ns3::QosWaveMacHelper ns3::QosWaveMacHelper::Default() [member function]
+    cls.add_method('Default', 
+                   'ns3::QosWaveMacHelper', 
+                   [], 
+                   is_static=True)
+    ## wave-mac-helper.h (module 'wave'): void ns3::QosWaveMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
+    cls.add_method('SetType', 
+                   'void', 
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
+    return
+
+def register_Ns3RegularWifiMac_methods(root_module, cls):
+    ## regular-wifi-mac.h (module 'wifi'): static ns3::TypeId ns3::RegularWifiMac::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::RegularWifiMac::RegularWifiMac() [constructor]
+    cls.add_constructor([])
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetSlot(ns3::Time slotTime) [member function]
+    cls.add_method('SetSlot', 
+                   'void', 
+                   [param('ns3::Time', 'slotTime')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetSifs(ns3::Time sifs) [member function]
+    cls.add_method('SetSifs', 
+                   'void', 
+                   [param('ns3::Time', 'sifs')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetEifsNoDifs(ns3::Time eifsNoDifs) [member function]
+    cls.add_method('SetEifsNoDifs', 
+                   'void', 
+                   [param('ns3::Time', 'eifsNoDifs')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetPifs(ns3::Time pifs) [member function]
+    cls.add_method('SetPifs', 
+                   'void', 
+                   [param('ns3::Time', 'pifs')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetRifs(ns3::Time rifs) [member function]
+    cls.add_method('SetRifs', 
+                   'void', 
+                   [param('ns3::Time', 'rifs')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetCtsTimeout(ns3::Time ctsTimeout) [member function]
+    cls.add_method('SetCtsTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ctsTimeout')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetAckTimeout(ns3::Time ackTimeout) [member function]
+    cls.add_method('SetAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'ackTimeout')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetRifs() const [member function]
+    cls.add_method('GetRifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetPifs() const [member function]
+    cls.add_method('GetPifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetSifs() const [member function]
+    cls.add_method('GetSifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetSlot() const [member function]
+    cls.add_method('GetSlot', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetEifsNoDifs() const [member function]
+    cls.add_method('GetEifsNoDifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetCtsTimeout() const [member function]
+    cls.add_method('GetCtsTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetAckTimeout() const [member function]
+    cls.add_method('GetAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetCtsToSelfSupported(bool enable) [member function]
+    cls.add_method('SetCtsToSelfSupported', 
+                   'void', 
+                   [param('bool', 'enable')])
+    ## regular-wifi-mac.h (module 'wifi'): bool ns3::RegularWifiMac::GetCtsToSelfSupported() const [member function]
+    cls.add_method('GetCtsToSelfSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Mac48Address ns3::RegularWifiMac::GetAddress() const [member function]
+    cls.add_method('GetAddress', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ssid ns3::RegularWifiMac::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetAddress(ns3::Mac48Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetBssid(ns3::Mac48Address bssid) [member function]
+    cls.add_method('SetBssid', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'bssid')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Mac48Address ns3::RegularWifiMac::GetBssid() const [member function]
+    cls.add_method('GetBssid', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetPromisc() [member function]
+    cls.add_method('SetPromisc', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to, ns3::Mac48Address from) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): bool ns3::RegularWifiMac::SupportsSendFrom() const [member function]
+    cls.add_method('SupportsSendFrom', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetWifiPhy(ns3::Ptr<ns3::WifiPhy> phy) [member function]
+    cls.add_method('SetWifiPhy', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiPhy >', 'phy')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::WifiPhy> ns3::RegularWifiMac::GetWifiPhy() const [member function]
+    cls.add_method('GetWifiPhy', 
+                   'ns3::Ptr< ns3::WifiPhy >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> stationManager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'stationManager')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::WifiRemoteStationManager> ns3::RegularWifiMac::GetWifiRemoteStationManager() const [member function]
+    cls.add_method('GetWifiRemoteStationManager', 
+                   'ns3::Ptr< ns3::WifiRemoteStationManager >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetForwardUpCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, ns3::Mac48Address, ns3::Mac48Address, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> upCallback) [member function]
+    cls.add_method('SetForwardUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::Mac48Address, ns3::Mac48Address, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'upCallback')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetLinkUpCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkUp) [member function]
+    cls.add_method('SetLinkUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkUp')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetLinkDownCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkDown) [member function]
+    cls.add_method('SetLinkDownCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkDown')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetBasicBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetBasicBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetBasicBlockAckTimeout() const [member function]
+    cls.add_method('GetBasicBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetCompressedBlockAckTimeout(ns3::Time blockAckTimeout) [member function]
+    cls.add_method('SetCompressedBlockAckTimeout', 
+                   'void', 
+                   [param('ns3::Time', 'blockAckTimeout')], 
+                   is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Time ns3::RegularWifiMac::GetCompressedBlockAckTimeout() const [member function]
+    cls.add_method('GetCompressedBlockAckTimeout', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::DcaTxop> ns3::RegularWifiMac::GetDcaTxop() const [member function]
+    cls.add_method('GetDcaTxop', 
+                   'ns3::Ptr< ns3::DcaTxop >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVOQueue() const [member function]
+    cls.add_method('GetVOQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVIQueue() const [member function]
+    cls.add_method('GetVIQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBEQueue() const [member function]
+    cls.add_method('GetBEQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBKQueue() const [member function]
+    cls.add_method('GetBKQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('FinishConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetTypeOfStation(ns3::TypeOfStation type) [member function]
+    cls.add_method('SetTypeOfStation', 
+                   'void', 
+                   [param('ns3::TypeOfStation', 'type')], 
+                   visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::Receive(ns3::Ptr<ns3::Packet> packet, ns3::WifiMacHeader const * hdr) [member function]
+    cls.add_method('Receive', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::TxOk(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('TxOk', 
+                   'void', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::TxFailed(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('TxFailed', 
+                   'void', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::ForwardUp(ns3::Ptr<ns3::Packet> packet, ns3::Mac48Address from, ns3::Mac48Address to) [member function]
+    cls.add_method('ForwardUp', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Mac48Address', 'from'), param('ns3::Mac48Address', 'to')], 
+                   visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::DeaggregateAmsduAndForward(ns3::Ptr<ns3::Packet> aggregatedPacket, ns3::WifiMacHeader const * hdr) [member function]
+    cls.add_method('DeaggregateAmsduAndForward', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SendAddBaResponse(ns3::MgtAddBaRequestHeader const * reqHdr, ns3::Mac48Address originator) [member function]
+    cls.add_method('SendAddBaResponse', 
+                   'void', 
+                   [param('ns3::MgtAddBaRequestHeader const *', 'reqHdr'), param('ns3::Mac48Address', 'originator')], 
+                   visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetQosSupported(bool enable) [member function]
+    cls.add_method('SetQosSupported', 
+                   'void', 
+                   [param('bool', 'enable')], 
+                   visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): bool ns3::RegularWifiMac::GetQosSupported() const [member function]
+    cls.add_method('GetQosSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetHtSupported(bool enable) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('bool', 'enable')], 
+                   visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): bool ns3::RegularWifiMac::GetHtSupported() const [member function]
+    cls.add_method('GetHtSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    return
+
+def register_Ns3Ssid_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(ns3::Ssid const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ssid const &', 'arg0')])
+    ## ssid.h (module 'wifi'): ns3::Ssid::Ssid() [constructor]
+    cls.add_constructor([])
+    ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(std::string s) [constructor]
+    cls.add_constructor([param('std::string', 's')])
+    ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(char const * ssid, uint8_t length) [constructor]
+    cls.add_constructor([param('char const *', 'ssid'), param('uint8_t', 'length')])
+    ## ssid.h (module 'wifi'): uint8_t ns3::Ssid::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## ssid.h (module 'wifi'): ns3::WifiInformationElementId ns3::Ssid::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ssid.h (module 'wifi'): uint8_t ns3::Ssid::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ssid.h (module 'wifi'): bool ns3::Ssid::IsBroadcast() const [member function]
+    cls.add_method('IsBroadcast', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## ssid.h (module 'wifi'): bool ns3::Ssid::IsEqual(ns3::Ssid const & o) const [member function]
+    cls.add_method('IsEqual', 
+                   'bool', 
+                   [param('ns3::Ssid const &', 'o')], 
+                   is_const=True)
+    ## ssid.h (module 'wifi'): char * ns3::Ssid::PeekString() const [member function]
+    cls.add_method('PeekString', 
+                   'char *', 
+                   [], 
+                   is_const=True)
+    ## ssid.h (module 'wifi'): void ns3::Ssid::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    return
+
+def register_Ns3SsidChecker_methods(root_module, cls):
+    ## ssid.h (module 'wifi'): ns3::SsidChecker::SsidChecker() [constructor]
+    cls.add_constructor([])
+    ## ssid.h (module 'wifi'): ns3::SsidChecker::SsidChecker(ns3::SsidChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SsidChecker const &', 'arg0')])
+    return
+
+def register_Ns3SsidValue_methods(root_module, cls):
+    ## ssid.h (module 'wifi'): ns3::SsidValue::SsidValue() [constructor]
+    cls.add_constructor([])
+    ## ssid.h (module 'wifi'): ns3::SsidValue::SsidValue(ns3::SsidValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SsidValue const &', 'arg0')])
+    ## ssid.h (module 'wifi'): ns3::SsidValue::SsidValue(ns3::Ssid const & value) [constructor]
+    cls.add_constructor([param('ns3::Ssid const &', 'value')])
+    ## ssid.h (module 'wifi'): ns3::Ptr<ns3::AttributeValue> ns3::SsidValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ssid.h (module 'wifi'): bool ns3::SsidValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ssid.h (module 'wifi'): ns3::Ssid ns3::SsidValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True)
+    ## ssid.h (module 'wifi'): std::string ns3::SsidValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ssid.h (module 'wifi'): void ns3::SsidValue::Set(ns3::Ssid const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Ssid const &', 'value')])
+    return
+
+def register_Ns3SupportedRates_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## supported-rates.h (module 'wifi'): ns3::SupportedRates::SupportedRates(ns3::SupportedRates const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SupportedRates const &', 'arg0')])
+    ## supported-rates.h (module 'wifi'): ns3::SupportedRates::SupportedRates() [constructor]
+    cls.add_constructor([])
+    ## supported-rates.h (module 'wifi'): void ns3::SupportedRates::AddSupportedRate(uint32_t bs) [member function]
+    cls.add_method('AddSupportedRate', 
+                   'void', 
+                   [param('uint32_t', 'bs')])
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::SupportedRates::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## supported-rates.h (module 'wifi'): ns3::WifiInformationElementId ns3::SupportedRates::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::SupportedRates::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): uint8_t ns3::SupportedRates::GetNRates() const [member function]
+    cls.add_method('GetNRates', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): uint32_t ns3::SupportedRates::GetRate(uint8_t i) const [member function]
+    cls.add_method('GetRate', 
+                   'uint32_t', 
+                   [param('uint8_t', 'i')], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): bool ns3::SupportedRates::IsBasicRate(uint32_t bs) const [member function]
+    cls.add_method('IsBasicRate', 
+                   'bool', 
+                   [param('uint32_t', 'bs')], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): bool ns3::SupportedRates::IsSupportedRate(uint32_t bs) const [member function]
+    cls.add_method('IsSupportedRate', 
+                   'bool', 
+                   [param('uint32_t', 'bs')], 
+                   is_const=True)
+    ## supported-rates.h (module 'wifi'): void ns3::SupportedRates::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## supported-rates.h (module 'wifi'): void ns3::SupportedRates::SetBasicRate(uint32_t bs) [member function]
+    cls.add_method('SetBasicRate', 
+                   'void', 
+                   [param('uint32_t', 'bs')])
+    ## supported-rates.h (module 'wifi'): ns3::SupportedRates::extended [variable]
+    cls.add_instance_attribute('extended', 'ns3::ExtendedSupportedRatesIE', is_const=False)
+    return
+
+def register_Ns3TimeValue_methods(root_module, cls):
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
+    cls.add_constructor([])
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::TimeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TimeValue const &', 'arg0')])
+    ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::Time const & value) [constructor]
+    cls.add_constructor([param('ns3::Time const &', 'value')])
+    ## nstime.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::TimeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## nstime.h (module 'core'): bool ns3::TimeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## nstime.h (module 'core'): ns3::Time ns3::TimeValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## nstime.h (module 'core'): std::string ns3::TimeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## nstime.h (module 'core'): void ns3::TimeValue::Set(ns3::Time const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Time const &', 'value')])
+    return
+
+def register_Ns3TypeIdChecker_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker(ns3::TypeIdChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeIdChecker const &', 'arg0')])
+    return
+
+def register_Ns3TypeIdValue_methods(root_module, cls):
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue() [constructor]
+    cls.add_constructor([])
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue(ns3::TypeIdValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TypeIdValue const &', 'arg0')])
+    ## type-id.h (module 'core'): ns3::TypeIdValue::TypeIdValue(ns3::TypeId const & value) [constructor]
+    cls.add_constructor([param('ns3::TypeId const &', 'value')])
+    ## type-id.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::TypeIdValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## type-id.h (module 'core'): bool ns3::TypeIdValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeIdValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True)
+    ## type-id.h (module 'core'): std::string ns3::TypeIdValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## type-id.h (module 'core'): void ns3::TypeIdValue::Set(ns3::TypeId const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::TypeId const &', 'value')])
+    return
+
+def register_Ns3UintegerValue_methods(root_module, cls):
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue() [constructor]
+    cls.add_constructor([])
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue(ns3::UintegerValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::UintegerValue const &', 'arg0')])
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue(uint64_t const & value) [constructor]
+    cls.add_constructor([param('uint64_t const &', 'value')])
+    ## uinteger.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::UintegerValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## uinteger.h (module 'core'): bool ns3::UintegerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## uinteger.h (module 'core'): uint64_t ns3::UintegerValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## uinteger.h (module 'core'): std::string ns3::UintegerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## uinteger.h (module 'core'): void ns3::UintegerValue::Set(uint64_t const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint64_t const &', 'value')])
+    return
+
+def register_Ns3WaveMacLow_methods(root_module, cls):
+    ## wave-mac-low.h (module 'wave'): ns3::WaveMacLow::WaveMacLow(ns3::WaveMacLow const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WaveMacLow const &', 'arg0')])
+    ## wave-mac-low.h (module 'wave'): ns3::WaveMacLow::WaveMacLow() [constructor]
+    cls.add_constructor([])
+    ## wave-mac-low.h (module 'wave'): static ns3::TypeId ns3::WaveMacLow::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## wave-mac-low.h (module 'wave'): ns3::WifiTxVector ns3::WaveMacLow::GetDataTxVector(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr) const [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   is_const=True, visibility='private', is_virtual=True)
+    return
+
+def register_Ns3WifiModeChecker_methods(root_module, cls):
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeChecker::WifiModeChecker() [constructor]
+    cls.add_constructor([])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeChecker::WifiModeChecker(ns3::WifiModeChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiModeChecker const &', 'arg0')])
+    return
+
+def register_Ns3WifiModeValue_methods(root_module, cls):
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeValue::WifiModeValue() [constructor]
+    cls.add_constructor([])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeValue::WifiModeValue(ns3::WifiModeValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiModeValue const &', 'arg0')])
+    ## wifi-mode.h (module 'wifi'): ns3::WifiModeValue::WifiModeValue(ns3::WifiMode const & value) [constructor]
+    cls.add_constructor([param('ns3::WifiMode const &', 'value')])
+    ## wifi-mode.h (module 'wifi'): ns3::Ptr<ns3::AttributeValue> ns3::WifiModeValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mode.h (module 'wifi'): bool ns3::WifiModeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## wifi-mode.h (module 'wifi'): ns3::WifiMode ns3::WifiModeValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-mode.h (module 'wifi'): std::string ns3::WifiModeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## wifi-mode.h (module 'wifi'): void ns3::WifiModeValue::Set(ns3::WifiMode const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::WifiMode const &', 'value')])
+    return
+
+def register_Ns3AddressChecker_methods(root_module, cls):
+    ## address.h (module 'network'): ns3::AddressChecker::AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::AddressChecker::AddressChecker(ns3::AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3AddressValue_methods(root_module, cls):
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue() [constructor]
+    cls.add_constructor([])
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue(ns3::AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AddressValue const &', 'arg0')])
+    ## address.h (module 'network'): ns3::AddressValue::AddressValue(ns3::Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Address const &', 'value')])
+    ## address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## address.h (module 'network'): bool ns3::AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## address.h (module 'network'): ns3::Address ns3::AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Address', 
+                   [], 
+                   is_const=True)
+    ## address.h (module 'network'): std::string ns3::AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## address.h (module 'network'): void ns3::AddressValue::Set(ns3::Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Address const &', 'value')])
+    return
+
+def register_Ns3DcaTxop_methods(root_module, cls):
+    ## dca-txop.h (module 'wifi'): static ns3::TypeId ns3::DcaTxop::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## dca-txop.h (module 'wifi'): ns3::DcaTxop::DcaTxop() [constructor]
+    cls.add_constructor([])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetLow(ns3::Ptr<ns3::MacLow> low) [member function]
+    cls.add_method('SetLow', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MacLow >', 'low')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetManager(ns3::DcfManager * manager) [member function]
+    cls.add_method('SetManager', 
+                   'void', 
+                   [param('ns3::DcfManager *', 'manager')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetWifiRemoteStationManager(ns3::Ptr<ns3::WifiRemoteStationManager> remoteManager) [member function]
+    cls.add_method('SetWifiRemoteStationManager', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'remoteManager')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetTxOkCallback(ns3::Callback<void, ns3::WifiMacHeader const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetTxOkCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::WifiMacHeader const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetTxFailedCallback(ns3::Callback<void, ns3::WifiMacHeader const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetTxFailedCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::WifiMacHeader const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## dca-txop.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::DcaTxop::GetQueue() const [member function]
+    cls.add_method('GetQueue', 
+                   'ns3::Ptr< ns3::WifiMacQueue >', 
+                   [], 
+                   is_const=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetMinCw(uint32_t minCw) [member function]
+    cls.add_method('SetMinCw', 
+                   'void', 
+                   [param('uint32_t', 'minCw')], 
+                   is_virtual=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetMaxCw(uint32_t maxCw) [member function]
+    cls.add_method('SetMaxCw', 
+                   'void', 
+                   [param('uint32_t', 'maxCw')], 
+                   is_virtual=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetAifsn(uint32_t aifsn) [member function]
+    cls.add_method('SetAifsn', 
+                   'void', 
+                   [param('uint32_t', 'aifsn')], 
+                   is_virtual=True)
+    ## dca-txop.h (module 'wifi'): uint32_t ns3::DcaTxop::GetMinCw() const [member function]
+    cls.add_method('GetMinCw', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## dca-txop.h (module 'wifi'): uint32_t ns3::DcaTxop::GetMaxCw() const [member function]
+    cls.add_method('GetMaxCw', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## dca-txop.h (module 'wifi'): uint32_t ns3::DcaTxop::GetAifsn() const [member function]
+    cls.add_method('GetAifsn', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::Queue(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('Queue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const &', 'hdr')])
+    ## dca-txop.h (module 'wifi'): int64_t ns3::DcaTxop::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3OcbWifiMac_methods(root_module, cls):
+    ## ocb-wifi-mac.h (module 'wave'): static ns3::TypeId ns3::OcbWifiMac::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ocb-wifi-mac.h (module 'wave'): ns3::OcbWifiMac::OcbWifiMac() [constructor]
+    cls.add_constructor([])
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SendVsc(ns3::Ptr<ns3::Packet> vsc, ns3::Mac48Address peer, ns3::OrganizationIdentifier oi) [member function]
+    cls.add_method('SendVsc', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'vsc'), param('ns3::Mac48Address', 'peer'), param('ns3::OrganizationIdentifier', 'oi')])
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::AddReceiveVscCallback(ns3::OrganizationIdentifier oi, ns3::VscCallback cb) [member function]
+    cls.add_method('AddReceiveVscCallback', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier', 'oi'), param('ns3::VscCallback', 'cb')])
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::RemoveReceiveVscCallback(ns3::OrganizationIdentifier oi) [member function]
+    cls.add_method('RemoveReceiveVscCallback', 
+                   'void', 
+                   [param('ns3::OrganizationIdentifier', 'oi')])
+    ## ocb-wifi-mac.h (module 'wave'): ns3::Ssid ns3::OcbWifiMac::GetSsid() const [member function]
+    cls.add_method('GetSsid', 
+                   'ns3::Ssid', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SetSsid(ns3::Ssid ssid) [member function]
+    cls.add_method('SetSsid', 
+                   'void', 
+                   [param('ns3::Ssid', 'ssid')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SetBssid(ns3::Mac48Address bssid) [member function]
+    cls.add_method('SetBssid', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'bssid')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): ns3::Mac48Address ns3::OcbWifiMac::GetBssid() const [member function]
+    cls.add_method('GetBssid', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SetLinkUpCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkUp) [member function]
+    cls.add_method('SetLinkUpCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkUp')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::SetLinkDownCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> linkDown) [member function]
+    cls.add_method('SetLinkDownCallback', 
+                   'void', 
+                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkDown')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::Enqueue(ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address to) [member function]
+    cls.add_method('Enqueue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'to')], 
+                   is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::ConfigureEdca(uint32_t cwmin, uint32_t cwmax, uint32_t aifsn, ns3::AcIndex ac) [member function]
+    cls.add_method('ConfigureEdca', 
+                   'void', 
+                   [param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('uint32_t', 'aifsn'), param('ns3::AcIndex', 'ac')])
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('FinishConfigureStandard', 
+                   'void', 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   visibility='protected', is_virtual=True)
+    ## ocb-wifi-mac.h (module 'wave'): void ns3::OcbWifiMac::Receive(ns3::Ptr<ns3::Packet> packet, ns3::WifiMacHeader const * hdr) [member function]
+    cls.add_method('Receive', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   visibility='private', is_virtual=True)
+    return
+
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_functions(root_module):
+    module = root_module
+    ## vendor-specific-action.h (module 'wave'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeOrganizationIdentifierChecker() [free function]
+    module.add_function('MakeOrganizationIdentifierChecker', 
+                        'ns3::Ptr< ns3::AttributeChecker const >', 
+                        [])
+    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
+    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
+    return
+
+def register_functions_ns3_FatalImpl(module, root_module):
+    return
+
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
+def register_functions_ns3_internal(module, root_module):
+    return
+
+def main():
+    out = FileCodeSink(sys.stdout)
+    root_module = module_init()
+    register_types(root_module)
+    register_methods(root_module)
+    register_functions(root_module)
+    root_module.generate(out)
+
+if __name__ == '__main__':
+    main()
+
diff -Naur ns-3.18.1/src/wave/doc/wave.rst ns-3.19/src/wave/doc/wave.rst
--- ns-3.18.1/src/wave/doc/wave.rst	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/doc/wave.rst	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,311 @@
+WAVE models
+-----------
+WAVE is a system architecture for wireless-based vehicular communications, 
+specified by the IEEE.  This chapter documents available models for WAVE
+within |ns3|.  The focus is on the MAC layer and MAC extension layer
+defined by [ieee80211p]_.
+
+.. include:: replace.txt
+
+.. heading hierarchy:
+   ------------- Chapter
+   ************* Section (#.#)
+   ============= Subsection (#.#.#)
+   ############# Paragraph (no number)
+
+Model Description
+*****************
+
+WAVE is an overall system architecture for vehicular communications.
+The standards for specifying WAVE include a set of extensions to the IEEE
+802.11 standard, found in IEEE Std 802.11p-2010 [ieee80211p]_, and
+the IEEE 1609 standard set, consisting of four documents:  
+resource manager:  IEEE 1609.1 [ieee1609dot1]_,
+security services:  IEEE 1609.2 [ieee1609dot2]_,
+network and transport layer services:  IEEE 1609.3 [ieee1609dot3]_,
+and multi-channel coordination:  IEEE 1609.4 [ieee1609dot4]_.
+
+In |ns3|, the focus of the ``wave`` module is on the MAC layer.
+The key design aspect of WAVE-compilant MACs is that they allow
+communications outside the context of a basic service set (BSS).
+The literature uses the acronym OCB to denote "outside the context
+of a BSS", and the class ``ns3::OcbWifiMac`` models this in |ns3|. 
+Many management frames will not be used, but when used, the BSSID field 
+needs to be set to a wildcard BSSID value. 
+Management information is transmitted by what is called a vendor specific 
+action frame. 
+
+With these changes, the packet transmissions (for a moving vehicle) can
+be fast with small delay.  At the physical layer, the biggest difference is 
+to use the 5.9 GHz band with a channel bandwidth of 10 MHz.  These physical
+layer changes can make the wireless signal relatively more stable,
+without degrading throughput too much (ranging from 3 Mbps to 27 Mbps), 
+although 20 MHz channel bandwidth is still supported.
+
+The source code for the WAVE MAC models lives in the directory
+``src/wave``.
+
+The current code represents an interim capability to realize an
+802.11p-compliant device, but without the WAVE extensions (which
+are planned for a later patch).  In vehicular communications using
+WAVE, radios have the capability of switching between control and
+service channels, or using multiple radios.  These aspects are not
+yet modelled.  The WaveNetDevice modelled herein enforces that
+a WAVE-compliant physical layer (at 5.9 GHz) is selected, and 
+does not require any association between devices (similar to an 
+adhoc WiFi MAC), but is otherwise similar (at this time) to a
+WifiNetDevice.
+
+Design
+======
+
+In |ns3|, support for 802.11p involves the MAC and PHY layers.
+To use an 802.11p NetDevice, ``ns3::Wifi80211pHelper`` is suggested.
+
+MAC layer
+#########
+
+The classes used to model the MAC layer are ``ns3::OrganizationIdentifier``,
+``ns3::VendorSpecificActionHeader``, ``ns3::HigherDataTxVectorTag``,
+``ns3::WaveMacLow``, and ``ns3::OcbWifiMac``.
+
+The OrganizationIdentifier and VendorSpecificActionHeader are used to support 
+the sending of a Vendor Specific Action frame. The HigherDataTxVectorTag 
+and WaveMacLow are used to support higher control transmission parameters. 
+These classes are all used in OcbWifiMac.
+
+OcbWifiMac is very similar to AdhocWifiMac, with some modifications. 
+(|ns3| AdhocWifiMac class is implemented very close to the 802.11p OCB 
+mode rather than a real 802.11 ad-hoc mode. The AdhocWifiMac has no BSS 
+context that is defined in 802.11 standard, so it will not take time to 
+send beacon and authenticate.)
+
+1. SetBssid, GetBssid, SetSsid, GetSsid
+   these methods are related to 802.11 BSS context which is unused in OCB context.
+2. SetLinkUpCallback, SetLinkDownCallback
+   WAVE device can send packets directly, so the WiFi link is never down.
+3. SendVsc, AddReceiveVscCallback
+   WAVE management information shall be sent by vendor specific action frame, 
+   and it will be called by upper layer 1609.4 standard to send WSA
+   (WAVE Service Advertisement) packets or other vendor specific information.
+4. SendTimingAdvertisement (not implemented)
+   Although Timing Advertisement is very important and specifically defined in 
+   802.11p standard, it is not useful in a simulation environment. 
+   Every node in |ns3| vehicular simulation is assumed to be already time 
+   synchronized (perhaps by GPS).
+5. ConfigureEdca
+   This method will allow the user to set EDCA parameters of WAVE channeles 
+   including CCH ans SCHs. And the OcbWifiMac itself also uses this method 
+   to configure default 802.11p EDCA parameters.
+6. WILDCARD BSSID
+   The WILDCARD BSSID is set to "ff:ff:ff:ff:ff:ff".
+   As defined in 802.11-2007, a wildcard BSSID shall not be used in the
+   BSSID field except for management frames of subtype probe request. But Adhoc 
+   mode of |ns3| simplifies this mechanism:  when stations receive packets, 
+   packets regardless of BSSID will be forwarded up to the higher layer. 
+   This process is very close 
+   to OCB mode as defined in 802.11p-2010, in which stations use the wildcard 
+   BSSID to allow the higher layer of other stations to hear directly.
+7. Enqueue, Receive
+   The most important methods are send and receive methods. According to the 
+   standard, we should filter the frames that are not permitted. However here we 
+   just identify the frames we care about; the other frames will be discarded.
+
+PHY layer
+#########
+Actually, no modification or extension happens in the |ns3| PHY layer
+corresponding to this model.
+In the 802.11p standard, the PHY layer wireless technology is still 80211a OFDM with 10MHz channel width,
+so Wifi80211pHelper will only allow the user to set the standard 
+to WIFI_PHY_STANDARD_80211_10MHZ or WIFI_PHY_STANDARD_80211_20MHZ
+(WIFI_PHY_STANDARD_80211a with 20MHz is supported, but not recommended.)
+The maximum station transmit power and maximum permitted EIRP defined in 
+802.11p is larger 
+than that of WiFi, so transmit range can normally become longer than 
+usual WiFi.  However, this feature will 
+not be implemented. Users who want to obtain longer range should configure 
+attributes "TxPowerStart", 
+"TxPowerEnd" and "TxPowerLevels" of the YansWifiPhy class.
+
+Scope and Limitations
+=====================
+
+1. Does the model involve vehicular mobility of some sort?
+
+Vehicular networks involve not only communication protocols, but also 
+a communication environment 
+including vehicular mobility and propagation models. Because of specific 
+features of the latter, the protocols need to change. The MAC layer model 
+in this 
+project just adapts MAC changes to vehicular environment. However this model 
+does not involve any
+vehicular mobility with time limit. Users can use any mobility model in |ns3|, 
+but should understand that vehicular mobility is out of scope for the
+current WAVE module.
+
+2. Is this model going to use different propagation models?
+
+Referring to the first issue, some more realistic propagation models 
+for vehicualr environment
+are suggested and welcome. And some existing propagation models in |ns3| are 
+also suitable. 
+Normally, users can use Friis, Two-Ray Ground, and Nakagami models. 
+
+3. Are there any vehicular application models to drive the code?
+
+About vehicular application models, SAE J2375 depends on WAVE architecture and
+is an application message set in US; CAM and DENM in Europe between network 
+and application layer, but is very close to application model. The BSM in 
+J2375 and CAM send alert messages that every 
+vehicle node will sent periodicity about its status information to 
+cooperate with others. 
+Fow now, a vehicular application model is not within scope.
+
+References
+==========
+
+.. [ieee80211p] IEEE Std 802.11p-2010 "IEEE Standard for Information technology-- Local and metropolitan area networks-- Specific requirements-- Part 11: Wireless LAN Medium Access Control (MAC) and Physical Layer (PHY) Specifications Amendment 6: Wireless Access in Vehicular Environments"
+
+.. [ieee1609dot1] IEEE Std 1609.1-2010 "IEEE Standard for Wireless Access in Vehicular Environments (WAVE) - Resource Manager, 2010"
+
+.. [ieee1609dot2] IEEE Std 1609.2-2010 "IEEE Standard for Wireless Access in Vehicular Environments (WAVE) - Security Services for Applications and Management Messages, 2010"
+
+.. [ieee1609dot3] IEEE Std 1609.3-2010 "IEEE Standard for Wireless Access in Vehicular Environments (WAVE) - Networking Services, 2010"
+
+.. [ieee1609dot4] IEEE Std 1609.4-2010 "IEEE Standard for Wireless Access in Vehicular Environments (WAVE) - Multi-Channel Operation, 2010"
+
+Usage
+*****
+
+Helpers
+=======
+The helpers include ``ns3::NqosWaveMacHelper``, ``ns3::QosWaveMacHelper``, 
+``ns3::Wifi80211pHelper`` and ``ns3::WaveHelper``. Wifi80211pHelper is used 
+to create 
+802.11p devices that follow the 802.11p-2010 standard. WaveHelper is 
+used to create WAVE devices that follow the 802.11p-2010 and 1609.4-2010 
+standards which are the MAC and PHY layers of the WAVE architecture. 
+The relation of them is described as below:
+
+::
+
+    WifiHelper ----------use---------->  WifiMacHelper
+        ^                             ^       ^
+        |                             |       |
+        |                          inherit  inherit
+        |                             |       |
+        |                 QosWifiMacHelper  NqosWifiMacHelper
+        |                             ^       ^
+        |                             |       |
+      inherit                     inherit  inherit
+        |                             |       |
+      Wifi80211pHelper     QosWaveMacHelper  NqosWaveHelper
+
+Although Wifi80211Helper can use any subclasses inheriting from 
+WifiMacHelper, we force users to use subclasses inheriting from 
+QosWaveMacHelper or NqosWaveHelper.
+
+Although the functions of WiFi 802.11p device can be achieved by 
+WaveNetDevice's ContinuousAccess assignment, Wifi80211pHelper is recommeneded
+if there is no need for multiple channel operation.
+Usage is as follows:
+
+::
+
+    NodeContainer nodes;
+    NetDeviceContainer devices;
+    nodes.Create (2);
+    YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+    YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
+    wifiPhy.SetChannel (wifiChannel.Create ());
+    NqosWave80211pMacHelper wifi80211pMac = NqosWaveMacHelper::Default();
+    Wifi80211pHelper 80211pHelper = Wifi80211pHelper::Default ();
+    devices = 80211pHelper.Install (wifiPhy, wifi80211pMac, nodes);
+
+APIs
+====
+
+The 802.11p device can allow the upper layer to send different information
+over Vendor Specific Action management frames by using different
+OrganizationIdentifier fields to identify differences.
+
+1. already create a Node object and WifiNetDevice object
+2. define an OrganizationIdentifier
+
+::
+
+   uint8_t oi_bytes[5] = {0x00, 0x50, 0xC2, 0x4A, 0x40};
+   OrganizationIdentifier oi(oi_bytes,5);
+
+3. define a Callback for the defined OrganizationIdentifier
+
+::
+
+   VscCallback vsccall = MakeCallback (&VsaExample::GetWsaAndOi, this);
+
+4. OcbWifiMac of 802.11p device registers this identifier and function
+
+::
+
+      Ptr<WifiNetDevice> device1 = DynamicCast<WifiNetDevice>(nodes.Get (i)->GetDevice (0));
+      Ptr<OcbWifiMac> ocb1 = DynamicCast<OcbWifiMac>(device->GetMac ());
+      ocb1->AddReceiveVscCallback (oi, vsccall);
+
+5. now one can send management packets over VSA frames
+
+::
+
+      Ptr<Packet> vsc = Create<Packet> ();
+      ocb2->SendVsc (vsc, Mac48Address::GetBroadcast (), m_16093oi);
+
+6. then registered callbacks in other devices will be called.
+
+Attributes
+==========
+
+The current classes do not provide any additional attributes beyond those
+in the WiFi module.
+
+Output
+======
+
+The current classes provide output of the same type as WiFi devices;
+namely, ASCII and pcap traces, and logging output.  The WAVE logging
+components can be enabled globally via the call to
+
+::
+  
+  Wifi80211pHelper::EnableLogComponents ();
+
+
+Advanced Usage
+==============
+
+To be defined.
+
+Examples
+========
+
+A basic example exists called ``wave-simple-80211p.cc``.
+This example shows basic construction of an 802.11p node.  Two nodes
+are constructed with 802.11p devices, and by default, one node sends a single
+packet to another node (the number of packets and interval between
+them can be configured by command-line arguments).  The example shows
+typical usage of the helper classes for this mode of WiFi.
+
+Troubleshooting
+===============
+
+To be defined.
+
+Validation
+**********
+
+A single test suite named ``wifi-80211p-ocb`` is defined.  This test
+case consists of a stationary node and a mobile node.  The mobile
+node moves towards the stationary mode, and time points are checked
+at which time the physical layer starts to receive packets (and
+whether the MAC becomes associated, if applicable).  The same physical
+experiment is repeated for normal WiFi NetDevices in AP/STA mode, in
+Adhoc mode, and the new OCB mode.
+
diff -Naur ns-3.18.1/src/wave/examples/wave-simple-80211p.cc ns-3.19/src/wave/examples/wave-simple-80211p.cc
--- ns-3.18.1/src/wave/examples/wave-simple-80211p.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/examples/wave-simple-80211p.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,174 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2005,2006,2007 INRIA
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ * Author: Junling Bu <linlinjavaer@gmail.com>
+ *
+ */
+/**
+ * This example shows basic construction of an 802.11p node.  Two nodes
+ * are constructed with 802.11p devices, and by default, one node sends a single
+ * packet to another node (the number of packets and interval between
+ * them can be configured by command-line arguments).  The example shows
+ * typical usage of the helper classes for this mode of WiFi (where "OCB" refers
+ * to "Outside the Context of a BSS")."
+ */
+
+#include "ns3/vector.h"
+#include "ns3/string.h"
+#include "ns3/socket.h"
+#include "ns3/double.h"
+#include "ns3/config.h"
+#include "ns3/log.h"
+#include "ns3/command-line.h"
+#include "ns3/mobility-model.h"
+#include "ns3/yans-wifi-helper.h"
+#include "ns3/position-allocator.h"
+#include "ns3/mobility-helper.h"
+#include "ns3/internet-stack-helper.h"
+#include "ns3/ipv4-address-helper.h"
+#include "ns3/ipv4-interface-container.h"
+#include <iostream>
+
+#include "ns3/ocb-wifi-mac.h"
+#include "ns3/wifi-80211p-helper.h"
+#include "ns3/wave-mac-helper.h"
+
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleOcb");
+using namespace ns3;
+
+/*
+ * In WAVE module, there is no net device class named like "Wifi80211pNetDevice",
+ * instead, we need to use Wifi80211pHelper to create an object of
+ * WifiNetDevice class.
+ *
+ * usage:
+ *  NodeContainer nodes;
+ *  NetDeviceContainer devices;
+ *  nodes.Create (2);
+ *  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+ *  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
+ *  wifiPhy.SetChannel (wifiChannel.Create ());
+ *  NqosWaveMacHelper wifi80211pMac = NqosWave80211pMacHelper::Default();
+ *  Wifi80211pHelper wifi80211p = Wifi80211pHelper::Default ();
+ *  devices = wifi80211p.Install (wifiPhy, wifi80211pMac, nodes);
+ *
+ * The reason of not providing a 802.11p class is that most of modeling
+ * 802.11p standard has been done in wifi module, so we only need a high
+ * MAC class that enables OCB mode.
+ */
+
+void ReceivePacket (Ptr<Socket> socket)
+{
+  NS_LOG_UNCOND ("Received one packet!");
+}
+
+static void GenerateTraffic (Ptr<Socket> socket, uint32_t pktSize,
+                             uint32_t pktCount, Time pktInterval )
+{
+  if (pktCount > 0)
+    {
+      socket->Send (Create<Packet> (pktSize));
+      Simulator::Schedule (pktInterval, &GenerateTraffic,
+                           socket, pktSize,pktCount - 1, pktInterval);
+    }
+  else
+    {
+      socket->Close ();
+    }
+}
+
+int main (int argc, char *argv[])
+{
+  std::string phyMode ("OfdmRate6MbpsBW10MHz");
+  uint32_t packetSize = 1000; // bytes
+  uint32_t numPackets = 1;
+  double interval = 1.0; // seconds
+  bool verbose = false;
+
+  CommandLine cmd;
+
+  cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
+  cmd.AddValue ("packetSize", "size of application packet sent", packetSize);
+  cmd.AddValue ("numPackets", "number of packets generated", numPackets);
+  cmd.AddValue ("interval", "interval (seconds) between packets", interval);
+  cmd.AddValue ("verbose", "turn on all WifiNetDevice log components", verbose);
+  cmd.Parse (argc, argv);
+  // Convert to time object
+  Time interPacketInterval = Seconds (interval);
+
+
+  NodeContainer c;
+  c.Create (2);
+
+  // The below set of helpers will help us to put together the wifi NICs we want
+  YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();
+  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
+  Ptr<YansWifiChannel> channel = wifiChannel.Create ();
+  wifiPhy.SetChannel (channel);
+  // ns-3 supports generate a pcap trace
+  wifiPhy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11);
+
+  NqosWaveMacHelper wifi80211pMac = NqosWaveMacHelper::Default ();
+  Wifi80211pHelper wifi80211p = Wifi80211pHelper::Default ();
+  if (verbose)
+    {
+      wifi80211p.EnableLogComponents ();      // Turn on all Wifi 802.11p logging
+    }
+
+  wifi80211p.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
+                                      "DataMode",StringValue (phyMode),
+                                      "ControlMode",StringValue (phyMode));
+  NetDeviceContainer devices = wifi80211p.Install (wifiPhy, wifi80211pMac, c);
+
+  MobilityHelper mobility;
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+  positionAlloc->Add (Vector (0.0, 0.0, 0.0));
+  positionAlloc->Add (Vector (5.0, 0.0, 0.0));
+  mobility.SetPositionAllocator (positionAlloc);
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.Install (c);
+
+  InternetStackHelper internet;
+  internet.Install (c);
+
+  Ipv4AddressHelper ipv4;
+  NS_LOG_INFO ("Assign IP Addresses.");
+  ipv4.SetBase ("10.1.1.0", "255.255.255.0");
+  Ipv4InterfaceContainer i = ipv4.Assign (devices);
+
+  TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");
+  Ptr<Socket> recvSink = Socket::CreateSocket (c.Get (0), tid);
+  InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), 80);
+  recvSink->Bind (local);
+  recvSink->SetRecvCallback (MakeCallback (&ReceivePacket));
+
+  Ptr<Socket> source = Socket::CreateSocket (c.Get (1), tid);
+  InetSocketAddress remote = InetSocketAddress (Ipv4Address ("255.255.255.255"), 80);
+  source->SetAllowBroadcast (true);
+  source->Connect (remote);
+
+  Simulator::ScheduleWithContext (source->GetNode ()->GetId (),
+                                  Seconds (1.0), &GenerateTraffic,
+                                  source, packetSize, numPackets, interPacketInterval);
+
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+  return 0;
+}
diff -Naur ns-3.18.1/src/wave/examples/wscript ns-3.19/src/wave/examples/wscript
--- ns-3.18.1/src/wave/examples/wscript	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/examples/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,6 @@
+# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+    obj = bld.create_ns3_program('wave-simple-80211p',
+        ['core', 'applications', 'mobility', 'network', 'wifi','wave'])
+    obj.source = 'wave-simple-80211p.cc'
diff -Naur ns-3.18.1/src/wave/helper/wave-mac-helper.cc ns-3.19/src/wave/helper/wave-mac-helper.cc
--- ns-3.18.1/src/wave/helper/wave-mac-helper.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/helper/wave-mac-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,125 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2009 MIRKO BANCHI
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ * Author: Mirko Banchi <mk.banchi@gmail.com>
+ * Author: Junling Bu <linlinjavaer@gmail.com>
+ */
+#include "ns3/wifi-mac.h"
+#include "ns3/wifi-phy.h"
+#include "ns3/log.h"
+#include "ns3/pointer.h"
+#include "ns3/boolean.h"
+#include "ns3/string.h"
+#include "wave-mac-helper.h"
+
+namespace ns3 {
+
+NqosWaveMacHelper::NqosWaveMacHelper (void)
+{
+
+}
+NqosWaveMacHelper::~NqosWaveMacHelper (void)
+{
+
+}
+NqosWaveMacHelper
+NqosWaveMacHelper::Default (void)
+{
+  NqosWaveMacHelper helper;
+  // We're making non QoS-enabled Wi-Fi MACs here, so we set the
+  // necessary attribute. I've carefully positioned this here so that
+  // someone who knows what they're doing can override with explicit
+  // attributes.
+  helper.SetType ("ns3::OcbWifiMac", "QosSupported", BooleanValue (false));
+  return helper;
+}
+void
+NqosWaveMacHelper::SetType (std::string type,
+                            std::string n0, const AttributeValue &v0,
+                            std::string n1, const AttributeValue &v1,
+                            std::string n2, const AttributeValue &v2,
+                            std::string n3, const AttributeValue &v3,
+                            std::string n4, const AttributeValue &v4,
+                            std::string n5, const AttributeValue &v5,
+                            std::string n6, const AttributeValue &v6,
+                            std::string n7, const AttributeValue &v7)
+{
+  if (type.compare ("ns3::OcbWifiMac") != 0)
+    {
+      NS_FATAL_ERROR ("QosWaveMacHelper shall set OcbWifiMac");
+    }
+  NqosWifiMacHelper::SetType ("ns3::OcbWifiMac",
+                              n0, v0,
+                              n1, v1,
+                              n2, v2,
+                              n3, v3,
+                              n4, v4,
+                              n5, v5,
+                              n6, v6,
+                              n7, v7);
+}
+
+/**********  QosWifi80211pMacHelper *********/
+QosWaveMacHelper::QosWaveMacHelper ()
+{
+}
+QosWaveMacHelper::~QosWaveMacHelper ()
+{
+}
+QosWaveMacHelper
+QosWaveMacHelper::Default (void)
+{
+  QosWaveMacHelper helper;
+
+  // We're making QoS-enabled Wi-Fi MACs here, so we set the necessary
+  // attribute. I've carefully positioned this here so that someone
+  // who knows what they're doing can override with explicit
+  // attributes.
+  helper.SetType ("ns3::OcbWifiMac", "QosSupported", BooleanValue (true));
+
+  return helper;
+}
+void
+QosWaveMacHelper::SetType (std::string type,
+                           std::string n0, const AttributeValue &v0,
+                           std::string n1, const AttributeValue &v1,
+                           std::string n2, const AttributeValue &v2,
+                           std::string n3, const AttributeValue &v3,
+                           std::string n4, const AttributeValue &v4,
+                           std::string n5, const AttributeValue &v5,
+                           std::string n6, const AttributeValue &v6,
+                           std::string n7, const AttributeValue &v7)
+{
+  if (type.compare ("ns3::OcbWifiMac") != 0)
+    {
+      NS_FATAL_ERROR ("QosWaveMacHelper shall set OcbWifiMac");
+    }
+  QosWifiMacHelper::SetType ("ns3::OcbWifiMac",
+                             n0, v0,
+                             n1, v1,
+                             n2, v2,
+                             n3, v3,
+                             n4, v4,
+                             n5, v5,
+                             n6, v6,
+                             n7, v7);
+}
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/wave/helper/wave-mac-helper.h ns-3.19/src/wave/helper/wave-mac-helper.h
--- ns-3.18.1/src/wave/helper/wave-mac-helper.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/helper/wave-mac-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,144 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2009 MIRKO BANCHI
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ * Author: Mirko Banchi <mk.banchi@gmail.com>
+ * Author: Junling Bu <linlinjavaer@gmail.com>
+ */
+#ifndef WAVE_MAC_HELPER_H
+#define WAVE_MAC_HELPER_H
+#include "ns3/qos-wifi-mac-helper.h"
+#include "ns3/nqos-wifi-mac-helper.h"
+
+namespace ns3 {
+
+class NqosWaveMacHelper : public NqosWifiMacHelper
+{
+public:
+  /**
+   * Create a NqosWaveMacHelper to make life easier for people who want to
+   * work with non-QOS Wave MAC layers.
+   */
+  NqosWaveMacHelper (void);
+
+  /**
+   * \internal
+   * Destroy a NqosWaveMacHelper.
+   */
+  virtual ~NqosWaveMacHelper (void);
+  /**
+   * Create a mac helper in a default working state.
+   * i.e., this is an ocb mac by default.
+   */
+  static NqosWaveMacHelper Default (void);
+  /**
+   * \param type the type of ns3::WifiMac to create.
+   * \param n0 the name of the attribute to set
+   * \param v0 the value of the attribute to set
+   * \param n1 the name of the attribute to set
+   * \param v1 the value of the attribute to set
+   * \param n2 the name of the attribute to set
+   * \param v2 the value of the attribute to set
+   * \param n3 the name of the attribute to set
+   * \param v3 the value of the attribute to set
+   * \param n4 the name of the attribute to set
+   * \param v4 the value of the attribute to set
+   * \param n5 the name of the attribute to set
+   * \param v5 the value of the attribute to set
+   * \param n6 the name of the attribute to set
+   * \param v6 the value of the attribute to set
+   * \param n7 the name of the attribute to set
+   * \param v7 the value of the attribute to set
+   *
+   * All the attributes specified in this method should exist
+   * in the requested mac.
+   *
+   * note: Here we require users set type with OcbWifiMac or its
+   * subclass, otherwise it will become error
+   */
+  virtual void SetType (std::string type,
+                        std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
+                        std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+                        std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+                        std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+                        std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+                        std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+                        std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+                        std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
+};
+
+class QosWaveMacHelper : public QosWifiMacHelper
+{
+public:
+  /**
+   * Create a QosWaveMacHelper that is used to make life easier when working
+   * with Wifi 802.11p devices using a QOS MAC layer.
+   */
+  QosWaveMacHelper (void);
+
+  /**
+   * \internal
+   * Destroy a QosWaveMacHelper
+   */
+  virtual ~QosWaveMacHelper (void);
+
+  /**
+   * Create a mac helper in a default working state.
+   */
+  static QosWaveMacHelper Default (void);
+
+  /**
+   * \param type the type of ns3::WifiMac to create.
+   * \param n0 the name of the attribute to set
+   * \param v0 the value of the attribute to set
+   * \param n1 the name of the attribute to set
+   * \param v1 the value of the attribute to set
+   * \param n2 the name of the attribute to set
+   * \param v2 the value of the attribute to set
+   * \param n3 the name of the attribute to set
+   * \param v3 the value of the attribute to set
+   * \param n4 the name of the attribute to set
+   * \param v4 the value of the attribute to set
+   * \param n5 the name of the attribute to set
+   * \param v5 the value of the attribute to set
+   * \param n6 the name of the attribute to set
+   * \param v6 the value of the attribute to set
+   * \param n7 the name of the attribute to set
+   * \param v7 the value of the attribute to set
+   *
+   * All the attributes specified in this method should exist
+   * in the requested mac.
+   *
+   * note: Here we require users set type with OcbWifiMac or its
+   * subclass, otherwise it will become error
+   */
+  virtual void SetType (std::string type,
+                        std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
+                        std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+                        std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+                        std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+                        std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+                        std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+                        std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+                        std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
+};
+
+}
+
+#endif /* WAVE_MAC_HELPER_H */
diff -Naur ns-3.18.1/src/wave/helper/wifi-80211p-helper.cc ns-3.19/src/wave/helper/wifi-80211p-helper.cc
--- ns-3.18.1/src/wave/helper/wifi-80211p-helper.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/helper/wifi-80211p-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,117 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2009 MIRKO BANCHI
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ * Author: Mirko Banchi <mk.banchi@gmail.com>
+ * Author: Junling Bu <linlinjavaer@gmail.com>
+ */
+#include "ns3/string.h"
+#include "ns3/log.h"
+#include <typeinfo>
+#include "wave-mac-helper.h"
+#include "wifi-80211p-helper.h"
+
+namespace ns3 {
+
+Wifi80211pHelper::Wifi80211pHelper ()
+{
+}
+
+Wifi80211pHelper::~Wifi80211pHelper ()
+{
+}
+
+Wifi80211pHelper
+Wifi80211pHelper::Default (void)
+{
+  Wifi80211pHelper helper;
+  helper.SetStandard (WIFI_PHY_STANDARD_80211_10MHZ);
+  helper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
+                                  "DataMode", StringValue ("OfdmRate6MbpsBW10MHz"),
+                                  "ControlMode",StringValue ("OfdmRate6MbpsBW10MHz"));
+  return helper;
+}
+
+void
+Wifi80211pHelper::SetStandard (enum WifiPhyStandard standard)
+{
+  if ((standard == WIFI_PHY_STANDARD_80211a) || (standard == WIFI_PHY_STANDARD_80211_10MHZ))
+    {
+      WifiHelper::SetStandard (standard);
+    }
+  else
+    {
+      NS_FATAL_ERROR ("802.11p only use 802.11 standard with 10MHz or 20MHz");
+    }
+}
+
+
+void
+Wifi80211pHelper::EnableLogComponents (void)
+{
+  WifiHelper::EnableLogComponents ();
+
+  LogComponentEnable ("OcbWifiMac", LOG_LEVEL_ALL);
+  LogComponentEnable ("VendorSpecificAction", LOG_LEVEL_ALL);
+}
+
+NetDeviceContainer
+Wifi80211pHelper::Install (const WifiPhyHelper &phyHelper, const WifiMacHelper &macHelper, NodeContainer c) const
+{
+  bool isWaveMacHelper = false;
+  try
+    {
+      const QosWaveMacHelper& qosMac = dynamic_cast<const QosWaveMacHelper&> (macHelper);
+      isWaveMacHelper = true;
+      // 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");
+        }
+    }
+  catch (const std::bad_cast &)
+    {
+
+    }
+
+  try
+    {
+      const NqosWaveMacHelper& nqosMac = dynamic_cast<const NqosWaveMacHelper&> (macHelper);
+      isWaveMacHelper = true;
+      if (&nqosMac == 0)
+        {
+          NS_FATAL_ERROR ("it could never get here");
+        }
+    }
+  catch (const std::bad_cast &)
+    {
+
+    }
+
+  if (!isWaveMacHelper)
+    {
+      NS_FATAL_ERROR ("the macHelper should be either QosWaveMacHelper or NqosWaveMacHelper"
+                      ", or should be the subclass of QosWaveMacHelper or NqosWaveMacHelper");
+    }
+
+  return WifiHelper::Install (phyHelper, macHelper, c);
+}
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/wave/helper/wifi-80211p-helper.h ns-3.19/src/wave/helper/wifi-80211p-helper.h
--- ns-3.18.1/src/wave/helper/wifi-80211p-helper.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/helper/wifi-80211p-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,79 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2009 MIRKO BANCHI
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ * Author: Mirko Banchi <mk.banchi@gmail.com>
+ * Author: Junling Bu <linlinjavaer@gmail.com>
+ */
+#ifndef WIFI_802_11P_HELPER_H
+#define WIFI_802_11P_HELPER_H
+#include "ns3/wifi-helper.h"
+
+namespace ns3 {
+
+/**
+ * \brief helps to create wifi 802.11p objects of
+ * WifiNetDevice class
+ *
+ * This class can help to create a large set of similar
+ * wifi 802.11p objects and to configure a large set of
+ * their attributes during creation.
+ */
+class Wifi80211pHelper : public WifiHelper
+{
+public:
+  Wifi80211pHelper ();
+  virtual ~Wifi80211pHelper ();
+
+  /**
+   * \returns a new Wifi80211pHelper in a default state
+   *
+   * The default state is defined as being an OcbWifiMac MAC
+   * layer with constant rate OfdmRate6MbpsBW10MHz
+   * and both objects using their default attribute values.
+   */
+  static Wifi80211pHelper Default (void);
+
+  /**
+   * \param standard the phy standard to configure during installation
+   *
+   * Users can only configure 802.11a with 10MHz channel bandwidth indicated by
+   * WIFI_PHY_STANDARD_80211_10MHZ or 20MHz channel bandwidth indicated by
+   * WIFI_PHY_STANDARD_80211a, other standard types will be not allowed.
+   * The default standard is 10MHz.
+   */
+  virtual void SetStandard (enum WifiPhyStandard standard);
+
+  /**
+   * \param phy the PHY helper to create PHY objects
+   * \param mac the MAC helper to create MAC objects
+   * \param c the set of nodes on which a wifi device must be created
+   * \returns a device container which contains all the devices created by this method.
+   */
+  virtual NetDeviceContainer Install (const WifiPhyHelper &phy, const WifiMacHelper &macHelper,NodeContainer c) const;
+
+  /**
+   * Helper to enable all WifiNetDevice log components with one statement
+   */
+  static void EnableLogComponents (void);
+};
+
+}
+
+#endif /* WIFI_802_11P_HELPER_H */
diff -Naur ns-3.18.1/src/wave/model/higher-tx-tag.cc ns-3.19/src/wave/model/higher-tx-tag.cc
--- ns-3.18.1/src/wave/model/higher-tx-tag.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/model/higher-tx-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,104 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ *         Junling Bu <linlinjavaer@gmail.com>
+ */
+#include "higher-tx-tag.h"
+#include "ns3/tag.h"
+#include "ns3/log.h"
+#include "ns3/uinteger.h"
+
+NS_LOG_COMPONENT_DEFINE ("HigherDataTxVectorTag");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (HigherDataTxVectorTag);
+
+TypeId
+HigherDataTxVectorTag::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::HigherDataTxVectorTag")
+    .SetParent<Tag> ()
+    .AddConstructor<HigherDataTxVectorTag> ()
+  ;
+  return tid;
+}
+HigherDataTxVectorTag::HigherDataTxVectorTag (void)
+  : m_adapter (false)
+{
+  NS_LOG_FUNCTION (this);
+}
+HigherDataTxVectorTag::HigherDataTxVectorTag (WifiTxVector dataTxVector, bool adapter)
+  : m_dataTxVector (dataTxVector),
+    m_adapter (adapter)
+{
+  NS_LOG_FUNCTION (this);
+}
+HigherDataTxVectorTag::~HigherDataTxVectorTag (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+TypeId
+HigherDataTxVectorTag::GetInstanceTypeId (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return GetTypeId ();
+}
+
+WifiTxVector
+HigherDataTxVectorTag::GetDataTxVector (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_dataTxVector;
+}
+bool
+HigherDataTxVectorTag::IsAdapter (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_adapter;
+}
+
+uint32_t
+HigherDataTxVectorTag::GetSerializedSize (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return (sizeof (WifiTxVector) + 1);
+}
+void
+HigherDataTxVectorTag::Serialize (TagBuffer i) const
+{
+  NS_LOG_FUNCTION (this << &i);
+  i.Write ((uint8_t *)&m_dataTxVector, sizeof (WifiTxVector));
+  i.WriteU8 (static_cast<uint8_t> (m_adapter));
+}
+void
+HigherDataTxVectorTag::Deserialize (TagBuffer i)
+{
+  NS_LOG_FUNCTION (this << &i);
+  i.Read ((uint8_t *)&m_dataTxVector, sizeof (WifiTxVector));
+  m_adapter = i.ReadU8 ();
+}
+void
+HigherDataTxVectorTag::Print (std::ostream &os) const
+{
+  NS_LOG_FUNCTION (this << &os);
+  os << " Data=" << m_dataTxVector << " Adapter=" << m_adapter;
+}
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/wave/model/higher-tx-tag.h ns-3.19/src/wave/model/higher-tx-tag.h
--- ns-3.18.1/src/wave/model/higher-tx-tag.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/model/higher-tx-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,59 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ *         Junling Bu <linlinjavaer@gmail.com>
+ */
+#ifndef HIGHER_DATA_TXVECTOR_TAG_H
+#define HIGHER_DATA_TXVECTOR_TAG_H
+
+#include "ns3/packet.h"
+#include "ns3/wifi-tx-vector.h"
+
+namespace ns3 {
+class Tag;
+
+/**
+ * This tag will be used to support higher layer control data rate
+ * and tx power level.
+ */
+class HigherDataTxVectorTag : public Tag
+{
+public:
+  HigherDataTxVectorTag (void);
+  HigherDataTxVectorTag (WifiTxVector dataTxVector, bool adapter);
+  virtual ~HigherDataTxVectorTag (void);
+
+  WifiTxVector GetDataTxVector (void) const;
+  bool IsAdapter (void) const;
+
+  static TypeId GetTypeId (void);
+  virtual TypeId GetInstanceTypeId (void) const;
+  virtual uint32_t GetSerializedSize (void) const;
+  virtual void Serialize (TagBuffer i) const;
+  virtual void Deserialize (TagBuffer i);
+  virtual void Print (std::ostream &os) const;
+
+private:
+  WifiTxVector m_dataTxVector;
+  bool m_adapter;
+};
+
+} // namespace ns3
+
+#endif /* HIGHER_DATA_TXVECTOR_TAG_H*/
diff -Naur ns-3.18.1/src/wave/model/ocb-wifi-mac.cc ns-3.19/src/wave/model/ocb-wifi-mac.cc
--- ns-3.18.1/src/wave/model/ocb-wifi-mac.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/model/ocb-wifi-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,372 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ *         Junling Bu <linlinjavaer@gmail.com>
+ */
+#include "ns3/pointer.h"
+#include "ns3/log.h"
+#include "ns3/string.h"
+#include "ns3/qos-tag.h"
+#include "ns3/mac-low.h"
+#include "ns3/dcf-manager.h"
+#include "ns3/mac-rx-middle.h"
+#include "ns3/mgt-headers.h"
+#include "wave-mac-low.h"
+#include "ocb-wifi-mac.h"
+#include "vendor-specific-action.h"
+#include "higher-tx-tag.h"
+
+NS_LOG_COMPONENT_DEFINE ("OcbWifiMac");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (OcbWifiMac);
+
+const static Mac48Address WILDCARD_BSSID = Mac48Address::GetBroadcast ();
+
+TypeId
+OcbWifiMac::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::OcbWifiMac")
+    .SetParent<RegularWifiMac> ()
+    .AddConstructor<OcbWifiMac> ()
+  ;
+  return tid;
+}
+
+OcbWifiMac::OcbWifiMac (void)
+{
+  NS_LOG_FUNCTION (this);
+
+  // use WaveMacLow instead of MacLow
+  m_low = CreateObject<WaveMacLow> ();
+  m_low->SetRxCallback (MakeCallback (&MacRxMiddle::Receive, m_rxMiddle));
+  m_dcfManager->SetupLowListener (m_low);
+  m_dca->SetLow (m_low);
+  for (EdcaQueues::iterator i = m_edca.begin (); i != m_edca.end (); ++i)
+    {
+      i->second->SetLow (m_low);
+    }
+
+  // Let the lower layers know that we are acting as an OCB node
+  SetTypeOfStation (OCB);
+  // BSSID is still needed in the low part of MAC
+  RegularWifiMac::SetBssid (WILDCARD_BSSID);
+}
+
+OcbWifiMac::~OcbWifiMac (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+OcbWifiMac::SendVsc (Ptr<Packet> vsc, Mac48Address peer, OrganizationIdentifier oi)
+{
+  NS_LOG_FUNCTION (this << vsc << peer << oi);
+  WifiMacHeader hdr;
+  hdr.SetAction ();
+  hdr.SetAddr1 (peer);
+  hdr.SetAddr2 (GetAddress ());
+  hdr.SetAddr3 (WILDCARD_BSSID);
+  hdr.SetDsNotFrom ();
+  hdr.SetDsNotTo ();
+  VendorSpecificActionHeader vsa;
+  vsa.SetOrganizationIdentifier (oi);
+  vsc->AddHeader (vsa);
+
+  if (m_qosSupported)
+    {
+      uint8_t tid = QosUtilsGetTidForPacket (vsc);
+      tid = tid > 7 ? 0 : tid;
+      m_edca[QosUtilsMapTidToAc (tid)]->Queue (vsc, hdr);
+    }
+  else
+    {
+      m_dca->Queue (vsc, hdr);
+    }
+}
+
+void
+OcbWifiMac::AddReceiveVscCallback (OrganizationIdentifier oi, VscCallback cb)
+{
+  NS_LOG_FUNCTION (this << oi << &cb);
+  m_vscManager.RegisterVscCallback (oi, cb);
+}
+
+void
+OcbWifiMac::RemoveReceiveVscCallback (OrganizationIdentifier oi)
+{
+  NS_LOG_FUNCTION (this << oi);
+  m_vscManager.DeregisterVscCallback (oi);
+}
+
+void
+OcbWifiMac::SetSsid (Ssid ssid)
+{
+  NS_LOG_WARN ("in OCB mode we should not call SetSsid");
+}
+
+Ssid
+OcbWifiMac::GetSsid (void) const
+{
+  NS_FATAL_ERROR ("in OCB mode we should not call GetSsid");
+  // we really do not want to return ssid, however we have to provide
+  return RegularWifiMac::GetSsid ();
+}
+
+
+void
+OcbWifiMac::SetBssid (Mac48Address bssid)
+{
+  NS_FATAL_ERROR ("in OCB mode we should not call SetBsid");
+}
+
+Mac48Address
+OcbWifiMac::GetBssid (void) const
+{
+  NS_FATAL_ERROR ("in OCB mode we should not call GetBssid");
+  return WILDCARD_BSSID;
+}
+
+void
+OcbWifiMac::SetLinkUpCallback (Callback<void> linkUp)
+{
+  NS_LOG_FUNCTION (this << &linkUp);
+  RegularWifiMac::SetLinkUpCallback (linkUp);
+
+  // The approach taken here is that, from the point of view of a STA
+  // in OCB mode, the link is always up, so we immediately invoke the
+  // callback if one is set
+  linkUp ();
+}
+
+void
+OcbWifiMac::SetLinkDownCallback (Callback<void> linkDown)
+{
+  NS_LOG_FUNCTION (this << &linkDown);
+  RegularWifiMac::SetLinkDownCallback (linkDown);
+  NS_LOG_WARN ("in OCB mode the like will never down, so linkDown will never be called");
+}
+
+void
+OcbWifiMac::Enqueue (Ptr<const Packet> packet, Mac48Address to)
+{
+  NS_LOG_FUNCTION (this << packet << to);
+  if (m_stationManager->IsBrandNew (to))
+    {
+      // In ocb mode, we assume that every destination supports all
+      // the rates we support.
+      for (uint32_t i = 0; i < m_phy->GetNModes (); i++)
+        {
+          m_stationManager->AddSupportedMode (to, m_phy->GetMode (i));
+        }
+      m_stationManager->RecordDisassociated (to);
+    }
+
+  WifiMacHeader hdr;
+
+  // If we are not a QoS STA then we definitely want to use AC_BE to
+  // transmit the packet. A TID of zero will map to AC_BE (through \c
+  // QosUtilsMapTidToAc()), so we use that as our default here.
+  uint8_t tid = 0;
+
+  if (m_qosSupported)
+    {
+      hdr.SetType (WIFI_MAC_QOSDATA);
+      hdr.SetQosAckPolicy (WifiMacHeader::NORMAL_ACK);
+      hdr.SetQosNoEosp ();
+      hdr.SetQosNoAmsdu ();
+      // About transmission of multiple frames,
+      // in Ad-hoc mode TXOP is not supported for now, so TxopLimit=0;
+      // however in OCB mode, 802.11p do not allow transmit multiple frames
+      // so TxopLimit must equal 0
+      hdr.SetQosTxopLimit (0);
+
+      // Fill in the QoS control field in the MAC header
+      tid = QosUtilsGetTidForPacket (packet);
+      // Any value greater than 7 is invalid and likely indicates that
+      // the packet had no QoS tag, so we revert to zero, which'll
+      // mean that AC_BE is used.
+      if (tid >= 7)
+        {
+          tid = 0;
+        }
+      hdr.SetQosTid (tid);
+    }
+  else
+    {
+      hdr.SetTypeData ();
+    }
+
+  hdr.SetAddr1 (to);
+  hdr.SetAddr2 (GetAddress ());
+  hdr.SetAddr3 (WILDCARD_BSSID);
+  hdr.SetDsNotFrom ();
+  hdr.SetDsNotTo ();
+
+  if (m_qosSupported)
+    {
+      // Sanity check that the TID is valid
+      NS_ASSERT (tid < 8);
+      m_edca[QosUtilsMapTidToAc (tid)]->Queue (packet, hdr);
+    }
+  else
+    {
+      m_dca->Queue (packet, hdr);
+    }
+}
+
+/*
+ * see 802.11p-2010 chapter 11.19
+ * here we only care about data packet and vsa management frame
+ */
+void
+OcbWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
+{
+  NS_LOG_FUNCTION (this << packet << hdr);
+  NS_ASSERT (!hdr->IsCtl ());
+  NS_ASSERT (hdr->GetAddr3 () == WILDCARD_BSSID);
+
+  Mac48Address from = hdr->GetAddr2 ();
+  Mac48Address to = hdr->GetAddr1 ();
+
+  if (hdr->IsData ())
+    {
+      if (hdr->IsQosData () && hdr->IsQosAmsdu ())
+        {
+          NS_LOG_DEBUG ("Received A-MSDU from" << from);
+          DeaggregateAmsduAndForward (packet, hdr);
+        }
+      else
+        {
+          ForwardUp (packet, from, to);
+        }
+      return;
+    }
+
+  // why put check here, not before "if (hdr->IsData ())" ?
+  // because WifiNetDevice::ForwardUp needs to m_promiscRx data packet
+  // and will filter data packet for itself
+  // so we need to filter management frame
+  if (to != GetAddress () && !to.IsGroup ())
+    {
+      NS_LOG_LOGIC ("the management frame is not for us");
+      NotifyRxDrop (packet);
+      return;
+    }
+
+  if (hdr->IsMgt () && hdr->IsAction ())
+    {
+      // yes, we only care about VendorSpecificAction frame in OCB mode
+      // other management frames will be handled by RegularWifiMac::Receive
+      VendorSpecificActionHeader vsaHdr;
+      packet->PeekHeader (vsaHdr);
+      if (vsaHdr.GetCategory () == CATEGORY_OF_VSA)
+        {
+          VendorSpecificActionHeader vsa;
+          packet->RemoveHeader (vsa);
+          OrganizationIdentifier oi = vsa.GetOrganizationIdentifier ();
+          VscCallback cb = m_vscManager.FindVscCallback (oi);
+
+          if (cb.IsNull ())
+            {
+              NS_LOG_DEBUG ("cannot find VscCallback for OrganizationIdentifier=" << oi);
+              return;
+            }
+          bool succeed = cb (this, oi,packet, from);
+
+          if (!succeed)
+            {
+              NS_LOG_DEBUG ("vsc callback could not handle the packet successfully");
+            }
+
+          return;
+        }
+    }
+  // Invoke the receive handler of our parent class to deal with any
+  // other frames. Specifically, this will handle Block Ack-related
+  // Management Action frames.
+  RegularWifiMac::Receive (packet, hdr);
+}
+
+void
+OcbWifiMac::ConfigureEdca (uint32_t cwmin, uint32_t cwmax, uint32_t aifsn, enum AcIndex ac)
+{
+  Ptr<Dcf> dcf;
+  switch (ac)
+    {
+    case AC_VO:
+      dcf = RegularWifiMac::GetVOQueue ();
+      dcf->SetMinCw ((cwmin + 1) / 4 - 1);
+      dcf->SetMaxCw ((cwmin + 1) / 2 - 1);
+      dcf->SetAifsn (aifsn);
+      break;
+    case AC_VI:
+      dcf = RegularWifiMac::GetVIQueue ();
+      dcf->SetMinCw ((cwmin + 1) / 2 - 1);
+      dcf->SetMaxCw (cwmin);
+      dcf->SetAifsn (aifsn);
+      break;
+    case AC_BE:
+      dcf = RegularWifiMac::GetBEQueue ();
+      dcf->SetMinCw (cwmin);
+      dcf->SetMaxCw (cwmax);
+      dcf->SetAifsn (aifsn);
+      break;
+    case AC_BK:
+      dcf = RegularWifiMac::GetBKQueue ();
+      dcf->SetMinCw (cwmin);
+      dcf->SetMaxCw (cwmax);
+      dcf->SetAifsn (aifsn);
+      break;
+    case AC_BE_NQOS:
+      dcf = RegularWifiMac::GetDcaTxop ();
+      dcf->SetMinCw (cwmin);
+      dcf->SetMaxCw (cwmax);
+      dcf->SetAifsn (aifsn);
+      break;
+    case AC_UNDEF:
+      NS_FATAL_ERROR ("I don't know what to do with this");
+      break;
+    }
+}
+
+void
+OcbWifiMac::FinishConfigureStandard (enum WifiPhyStandard standard)
+{
+  NS_ASSERT ((standard == WIFI_PHY_STANDARD_80211_10MHZ)
+             || (standard == WIFI_PHY_STANDARD_80211a));
+
+  uint32_t cwmin = 15;
+  uint32_t cwmax = 1023;
+
+  // The special value of AC_BE_NQOS which exists in the Access
+  // Category enumeration allows us to configure plain old DCF.
+  ConfigureEdca (cwmin, cwmax, 2, AC_BE_NQOS);
+
+  // Now we configure the EDCA functions
+  // see IEEE802.11p-2010 section 7.3.2.29
+  // Wave CCH and SCHs set default 802.11p EDCA
+  ConfigureEdca (cwmin, cwmax, 2, AC_VO);
+  ConfigureEdca (cwmin, cwmax, 3, AC_VI);
+  ConfigureEdca (cwmin, cwmax, 6, AC_BE);
+  ConfigureEdca (cwmin, cwmax, 9, AC_BK);
+
+}
+} // namespace ns3
diff -Naur ns-3.18.1/src/wave/model/ocb-wifi-mac.h ns-3.19/src/wave/model/ocb-wifi-mac.h
--- ns-3.18.1/src/wave/model/ocb-wifi-mac.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/model/ocb-wifi-mac.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,141 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ *         Junling Bu <linlinjavaer@gmail.com>
+ */
+#ifndef OCB_WIFI_MAC_H
+#define OCB_WIFI_MAC_H
+
+#include "ns3/object-factory.h"
+#include "ns3/regular-wifi-mac.h"
+#include "ns3/wifi-mac-queue.h"
+#include "ns3/qos-utils.h"
+#include "vendor-specific-action.h"
+
+namespace ns3 {
+class OrganizationIdentifier;
+class WifiMacQueue;
+/**
+ * \brief STAs communicate with each directly outside the context of a BSS
+ * \ingroup wave
+ *
+ * In OCB mac mode,synchronization, association, dis-association
+ * and authentication of normal wifi are not used for wireless access in
+ * vehicular environments.
+ *
+ * Although Timing Advertisement frame is a specific management frame defined
+ * in 802.11p. It is mainly used by IEEE Std 1609.4 for channel switch synchronization.
+ * However in simulation nodes are supposed to have GPS synchronization ability,
+ * so we will not implement this feature.
+ */
+class OcbWifiMac : public RegularWifiMac
+{
+public:
+  static TypeId GetTypeId (void);
+  OcbWifiMac (void);
+  virtual ~OcbWifiMac (void);
+  /**
+   * \param vsc management packet to send.
+   * \param peer the address to which the packet should be sent.
+   * \param oi Organization Identifier field
+   * see 7.3.1.31 Organization Identifier field and 10.3.29 Vendor-specific action
+   *
+   * management information can be transmitted over vender specific action frame.
+   * This will be mainly called by IEEE Std 1609.4 to send WSA from IEEE Std 1609.3
+   */
+  void SendVsc (Ptr<Packet> vsc, Mac48Address peer, OrganizationIdentifier oi);
+  /**
+   * \param oi Organization Identifier
+   * \param cb callback to invoke whenever a vender specific action frame has been received and must
+   *        be forwarded to the higher layers.
+   * every node shall register first if it wants to receive specific vendor specific content.
+   */
+  void AddReceiveVscCallback (OrganizationIdentifier oi, VscCallback cb);
+
+  void RemoveReceiveVscCallback (OrganizationIdentifier oi);
+
+  /**
+   * \returns the ssid which this MAC layer is going to try to stay in.
+   *
+   * This method shall not be used in WAVE environment and
+   * here it will overloaded to log warn message
+   */
+  virtual Ssid GetSsid (void) const;
+  /**
+   * \param ssid the current ssid of this MAC layer.
+   *
+   * This method shall not be used in WAVE environment and
+   * here it will overloaded to log warn message
+   */
+  virtual void SetSsid (Ssid ssid);
+  /**
+   * \param bssid the BSSID of the network that this device belongs to.
+   * This method shall not be used in WAVE environment and
+   * here it will overloaded to log warn message
+   */
+  virtual void SetBssid (Mac48Address bssid);
+  /**
+   * \param bssid the BSSID of the network that this device belongs to.
+   *
+   * This method shall not be used in WAVE environment and
+   * here it will overloaded to log warn message
+   */
+  virtual Mac48Address GetBssid (void) const;
+  /**
+   * SetLinkUpCallback and SetLinkDownCallback will be overloaded
+   * In OCB mode, stations can send packets directly whenever they want
+   * so the link is always up and never down even during channel switch
+   */
+  /**
+   * \param linkUp the callback to invoke when the link becomes up.
+   */
+  virtual void SetLinkUpCallback (Callback<void> linkUp);
+  /**
+   * \param linkDown the callback to invoke when the link becomes down.
+   */
+  virtual void SetLinkDownCallback (Callback<void> linkDown);
+  /**
+   * \param packet the packet to send.
+   * \param to the address to which the packet should be sent.
+   *
+   * The packet should be enqueued in a tx queue, and should be
+   * dequeued as soon as the channel access function determines that
+   * access is granted to this MAC.
+   */
+  virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to);
+  /**
+    * \param cwmin the min contention window
+    * \param cwmax the max contention window
+    * \param aifsn the arbitration inter-frame space
+    * \param ac    the access category index
+    *
+    * configure EDCA queue parameters
+    */
+  void ConfigureEdca (uint32_t cwmin, uint32_t cwmax, uint32_t aifsn, enum AcIndex ac);
+
+protected:
+  virtual void FinishConfigureStandard (enum WifiPhyStandard standard);
+private:
+  virtual void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
+
+  VendorSpecificContentManager m_vscManager;
+};
+
+}
+#endif /* OCB_WIFI_MAC_H */
diff -Naur ns-3.18.1/src/wave/model/vendor-specific-action.cc ns-3.19/src/wave/model/vendor-specific-action.cc
--- ns-3.18.1/src/wave/model/vendor-specific-action.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/model/vendor-specific-action.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,346 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Dalian University of Technology
+ * 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: Junling Bu <linlinjavaer@gmail.com>
+ */
+#include <iomanip>
+#include <iostream>
+#include <cstring>
+#include "ns3/log.h"
+#include "ns3/assert.h"
+#include "vendor-specific-action.h"
+
+NS_LOG_COMPONENT_DEFINE ("VendorSpecificAction");
+
+namespace ns3 {
+
+/*********** OrganizationIdentifier *******/
+
+ATTRIBUTE_HELPER_CPP (OrganizationIdentifier);
+
+OrganizationIdentifier::OrganizationIdentifier (void)
+  : m_type (Unknown)
+{
+  NS_LOG_FUNCTION (this);
+  m_type = Unknown;
+  std::memset (m_oi, 0, 5);
+}
+
+OrganizationIdentifier::OrganizationIdentifier (const uint8_t *str, uint32_t length)
+{
+  NS_LOG_FUNCTION (this << str << length);
+  if (length == 3)
+    {
+      m_type = OUI24;
+      std::memcpy (m_oi, str, length);
+    }
+  else if (length == 5)
+    {
+      m_type = OUI36;
+      std::memcpy (m_oi, str, length);
+    }
+  else
+    {
+      m_type = Unknown;
+      NS_FATAL_ERROR ("cannot support organization identifier with length=" << length);
+    }
+}
+
+OrganizationIdentifier&
+OrganizationIdentifier::operator= (const OrganizationIdentifier& oi)
+{
+  this->m_type = oi.m_type;
+  std::memcpy (this->m_oi, oi.m_oi, 5);
+  return (*this);
+}
+
+OrganizationIdentifier::~OrganizationIdentifier (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+uint8_t
+OrganizationIdentifier::GetManagementId (void) const
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT (m_type == OUI36);
+  return (m_oi[4] & 0x0f);
+}
+
+bool
+OrganizationIdentifier::IsNull (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_type == Unknown;
+}
+
+uint32_t
+OrganizationIdentifier::GetSerializedSize (void) const
+{
+  NS_LOG_FUNCTION (this);
+  switch (m_type)
+    {
+    case OUI24:
+      return 3;
+    case OUI36:
+      return 5;
+    case Unknown:
+    default:
+      NS_FATAL_ERROR_NO_MSG ();
+      return 0;
+    }
+}
+
+void
+OrganizationIdentifier::SetType (enum OrganizationIdentifierType type)
+{
+  NS_LOG_FUNCTION (this);
+  m_type = type;
+}
+
+enum OrganizationIdentifier::OrganizationIdentifierType
+OrganizationIdentifier::GetType (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_type;
+}
+
+void
+OrganizationIdentifier::Serialize (Buffer::Iterator start) const
+{
+  NS_LOG_FUNCTION (this << &start);
+  start.Write (m_oi, GetSerializedSize ());
+}
+
+/*  because OrganizationIdentifier field is not standard
+ *  and the length of OrganizationIdentifier is variable
+ *  so data parse here is troublesome
+ */
+uint32_t
+OrganizationIdentifier::Deserialize (Buffer::Iterator start)
+{
+  NS_LOG_FUNCTION (this << &start);
+  // first try to parse OUI24 with 3 bytes
+  start.Read (m_oi,  3);
+  for (std::vector<OrganizationIdentifier>::iterator  i = OrganizationIdentifiers.begin (); i != OrganizationIdentifiers.end (); ++i)
+    {
+      if ((i->m_type == OUI24)
+          && (std::memcmp (i->m_oi, m_oi, 3) == 0 ))
+        {
+          m_type = OUI24;
+          return 3;
+        }
+    }
+
+  // then try to parse OUI36 with 5 bytes
+  start.Read (m_oi + 3,  2);
+  for (std::vector<OrganizationIdentifier>::iterator  i = OrganizationIdentifiers.begin (); i != OrganizationIdentifiers.end (); ++i)
+    {
+      if ((i->m_type == OUI36)
+          && (std::memcmp (i->m_oi, m_oi, 4) == 0 ))
+        {
+          // OUI36 first check 4 bytes, then check half of the 5th byte
+          if ((i->m_oi[4] & 0xf0) == (m_oi[4] & 0xf0))
+            {
+              m_type = OUI36;
+              return 5;
+            }
+        }
+    }
+
+  // if we cannot deserialize the organization identifier field,
+  // we will fail
+  NS_FATAL_ERROR ("cannot deserialize the organization identifier field successfully");
+  return 0;
+}
+
+bool operator == (const OrganizationIdentifier& a, const OrganizationIdentifier& b)
+{
+  if (a.m_type != b.m_type)
+    {
+      return false;
+    }
+
+  if (a.m_type == OrganizationIdentifier::OUI24)
+    {
+      return memcmp (a.m_oi, b.m_oi, 3) == 0;
+    }
+
+  if (a.m_type == OrganizationIdentifier::OUI36)
+    {
+      return (memcmp (a.m_oi, b.m_oi, 4) == 0)
+             && ((a.m_oi[4] & 0xf0) == (b.m_oi[4] & 0xf0));
+    }
+
+  return false;
+}
+
+bool operator != (const OrganizationIdentifier& a, const OrganizationIdentifier& b)
+{
+  return !(a == b);
+}
+
+bool operator < (const OrganizationIdentifier& a, const OrganizationIdentifier& b)
+{
+  return memcmp (a.m_oi, b.m_oi, std::min (a.m_type, b.m_type)) < 0;
+}
+
+std::ostream& operator << (std::ostream& os, const OrganizationIdentifier& oi)
+{
+  for (int i = 0; i < oi.m_type; i++)
+    {
+      os << "0x" << std::hex << static_cast<int> (oi.m_oi[i]) << " ";
+    }
+  os << std::endl;
+  return os;
+}
+
+std::istream& operator >> (std::istream& is, const OrganizationIdentifier& oi)
+{
+  return is;
+}
+
+/*********** VendorSpecificActionHeader *******/
+NS_OBJECT_ENSURE_REGISTERED (VendorSpecificActionHeader);
+
+VendorSpecificActionHeader::VendorSpecificActionHeader (void)
+  : m_oi (),
+    m_category (CATEGORY_OF_VSA)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+VendorSpecificActionHeader::~VendorSpecificActionHeader (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+VendorSpecificActionHeader::SetOrganizationIdentifier (OrganizationIdentifier oi)
+{
+  NS_LOG_FUNCTION (this << oi);
+  m_oi = oi;
+}
+
+OrganizationIdentifier
+VendorSpecificActionHeader::GetOrganizationIdentifier (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_oi;
+}
+
+TypeId
+VendorSpecificActionHeader::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::VendorSpecificActionHeader")
+    .SetParent<Header> ()
+    .AddConstructor<VendorSpecificActionHeader> ()
+  ;
+
+  return tid;
+}
+
+uint8_t
+VendorSpecificActionHeader::GetCategory (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_category;
+}
+
+TypeId
+VendorSpecificActionHeader::GetInstanceTypeId (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return GetTypeId ();
+}
+
+void
+VendorSpecificActionHeader::Print (std::ostream &os) const
+{
+  NS_LOG_FUNCTION (this << &os);
+  os << "VendorSpecificActionHeader[ "
+     << "category = 0x" << std::hex << (int)m_category
+     << "organization identifier = " << m_oi
+     << std::dec;
+}
+
+uint32_t
+VendorSpecificActionHeader::GetSerializedSize (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return sizeof(m_category) + m_oi.GetSerializedSize ();
+}
+
+void
+VendorSpecificActionHeader::Serialize (Buffer::Iterator start) const
+{
+  NS_LOG_FUNCTION (this << &start);
+  start.WriteU8 (m_category);
+  m_oi.Serialize (start);
+}
+
+uint32_t
+VendorSpecificActionHeader::Deserialize (Buffer::Iterator start)
+{
+  NS_LOG_FUNCTION (this << &start);
+  m_category = start.ReadU8 ();
+  if (m_category != CATEGORY_OF_VSA)
+    {
+      return 0;
+    }
+  m_oi.Deserialize (start);
+
+  return GetSerializedSize ();
+}
+
+/********* VendorSpecificContentManager ***********/
+VendorSpecificContentManager::VendorSpecificContentManager (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+VendorSpecificContentManager::~VendorSpecificContentManager (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+VendorSpecificContentManager::RegisterVscCallback (OrganizationIdentifier oi, VscCallback cb)
+{
+  NS_LOG_FUNCTION (this << oi << &cb);
+  m_callbacks.insert (std::make_pair (oi, cb));
+  OrganizationIdentifiers.push_back (oi);
+}
+
+void
+VendorSpecificContentManager::DeregisterVscCallback (OrganizationIdentifier &oi)
+{
+  NS_LOG_FUNCTION (this << oi);
+  m_callbacks.erase (oi);
+}
+
+static VscCallback null_callback = MakeNullCallback<bool, Ptr<WifiMac>, const OrganizationIdentifier &,Ptr<const Packet>,const Address &> ();
+
+VscCallback
+VendorSpecificContentManager::FindVscCallback (OrganizationIdentifier &oi)
+{
+  NS_LOG_FUNCTION (this << oi);
+  VscCallbacksI i;
+  i = m_callbacks.find (oi);
+  return (i == m_callbacks.end ()) ? null_callback : i->second;
+}
+
+} // namespace ns3
diff -Naur ns-3.18.1/src/wave/model/vendor-specific-action.h ns-3.19/src/wave/model/vendor-specific-action.h
--- ns-3.18.1/src/wave/model/vendor-specific-action.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/model/vendor-specific-action.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,191 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Dalian University of Technology
+ * 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: Junling Bu <linlinjavaer@gmail.com>
+ */
+#ifndef Vendor_Specific_Action_H
+#define Vendor_Specific_Action_H
+
+#include <ostream>
+#include <map>
+#include "ns3/header.h"
+#include "ns3/packet.h"
+#include "ns3/pointer.h"
+#include "ns3/attribute.h"
+#include "ns3/attribute-helper.h"
+#include "ns3/address.h"
+#include "ns3/wifi-mac.h"
+
+namespace ns3 {
+class VendorSpecificContentManager;
+
+/**
+ * \brief the organization identifier is a public organizationally
+ * unique identifier assigned by the IEEE.
+ * \ingroup wave
+ *
+ * Similar to protocol field of data packets that indicates which
+ * entity of higher layer should handle received packets, Organization
+ * Identifier field is used in Vendor Specific Action frames to
+ * indicate which entity or higher layer should handle vendor specific
+ * content.
+ * Normally the value is assigned by IEEE and the length of field is
+ * either 24 bits or 36 bits.
+ * For more, see IEEE802.11p-2010 section 7.3.1.31 and 7.4.5
+ */
+class OrganizationIdentifier
+{
+public:
+  OrganizationIdentifier (void);
+  OrganizationIdentifier (const uint8_t *str, uint32_t length);
+  OrganizationIdentifier& operator= (const OrganizationIdentifier& oi);
+  virtual ~OrganizationIdentifier (void);
+
+  enum OrganizationIdentifierType
+  {
+    OUI24 = 3,  // 3 bytes
+    OUI36 = 5,   // 5 bytes
+    Unknown = 0,
+  };
+
+  /**
+   * \returns last 4 bits when OrganizationIdentifier is OUI36
+   */
+  uint8_t GetManagementId (void) const;
+  /**
+   * \returns whether current OrganizationIdentifier is initial state
+   */
+  bool IsNull (void) const;
+
+  void SetType (enum OrganizationIdentifierType type);
+  enum OrganizationIdentifierType GetType () const;
+
+  // below methods will be called by VendorSpecificActionHeader
+  uint32_t GetSerializedSize (void) const;
+  void Serialize (Buffer::Iterator start) const;
+  uint32_t Deserialize (Buffer::Iterator start);
+
+private:
+  friend bool operator == (const OrganizationIdentifier& a, const OrganizationIdentifier& b);
+  friend bool operator != (const OrganizationIdentifier& a, const OrganizationIdentifier& b);
+  friend bool operator < (const OrganizationIdentifier& a, const OrganizationIdentifier& b);
+  friend std::ostream& operator << (std::ostream& os, const OrganizationIdentifier& oi);
+  friend std::istream& operator >> (std::istream& is, const OrganizationIdentifier& oi);
+
+  enum OrganizationIdentifierType m_type;
+  uint8_t m_oi[5];
+};
+
+ATTRIBUTE_HELPER_HEADER (OrganizationIdentifier);
+
+bool operator == (const OrganizationIdentifier& a, const OrganizationIdentifier& b);
+bool operator != (const OrganizationIdentifier& a, const OrganizationIdentifier& b);
+bool operator < (const OrganizationIdentifier& a, const OrganizationIdentifier& b);
+
+std::ostream& operator << (std::ostream& os, const OrganizationIdentifier& oi);
+std::istream& operator >> (std::istream& is, const OrganizationIdentifier& oi);
+
+/**
+ * see IEEE 802.11-2007 chapter 7.3.1.11
+ * Table 7-24—Category values
+ */
+const static uint8_t CATEGORY_OF_VSA = 127;
+
+/**
+ * \ingroup wave
+ * See IEEE 802.11-2007 chapter 7.3.1.11 and 7.4.5
+ * also IEEE 802.11p-2010 chapter 7.4.5
+ * Although WifiActionHeader has been defined in wifi mgt-header.h/.cc,
+ * it is not a good way to inherit from it or add vendor specific action support.
+ * The reason is Action field. Other Action frames contains Action field, and
+ * the VSA frame contains OUI or variable OrganizationIdentifier instead of one byte Action field.
+ * Header format: | Category | Organization IdentifierType | Vendor Specific content |
+ *        Octets:       1                j                        Variable
+ *
+ * In ns-3, VSA frame will be divided into  VendorSpecificActionHeader vsaHeader
+ * and Packet vsc that indicates vendor specific content.
+ *
+ * This frame is used by IEEE 1609.4 to send WSA packet of IEEE 1609.3,
+ * and if users want to send management information without customized management
+ * frames, he can use VSA frames.
+ */
+class VendorSpecificActionHeader : public Header
+{
+public:
+  VendorSpecificActionHeader (void);
+  virtual ~VendorSpecificActionHeader (void);
+
+  /**
+   * \param oi the OrganizationIdentifier of current VSA header
+   */
+  void SetOrganizationIdentifier (OrganizationIdentifier oi);
+  /**
+   * \returns current OrganizationIdentifier of the VSA header
+   */
+  OrganizationIdentifier GetOrganizationIdentifier (void) const;
+  /**
+   * the category field shall be CATEGORY_OF_VSA
+   */
+  uint8_t GetCategory () const;
+
+  static TypeId GetTypeId (void);
+  virtual TypeId GetInstanceTypeId (void) const;
+  virtual void Print (std::ostream &os) const;
+  virtual uint32_t GetSerializedSize (void) const;
+  virtual void Serialize (Buffer::Iterator start) const;
+  virtual uint32_t Deserialize (Buffer::Iterator start);
+
+private:
+  OrganizationIdentifier m_oi;
+  uint8_t m_category;
+};
+
+/**
+ * \param mac a pointer to the mac object which is calling this callback
+ * \param oi the organization identifier of vendor specific action frame
+ * \param packet the vendor specifc content packet received
+ * \param sender the address of the sender
+ * \returns true if the callback could handle the packet successfully;
+ *       false otherwise.
+ */
+typedef Callback<bool, Ptr<WifiMac>, const OrganizationIdentifier &, Ptr<const Packet>,const Address &> VscCallback;
+
+class VendorSpecificContentManager
+{
+public:
+  VendorSpecificContentManager (void);
+  virtual ~VendorSpecificContentManager (void);
+  /**
+   * \param oi the specific OrganizationIdentifier when receive management information
+   * by VendorSpecificAction management frame.
+   * \param cb the receive callback when oi related management packets are received
+   */
+  void RegisterVscCallback (OrganizationIdentifier oi, VscCallback cb);
+  void DeregisterVscCallback (OrganizationIdentifier &oi);
+  VscCallback FindVscCallback (OrganizationIdentifier &oi);
+
+private:
+  typedef std::map<OrganizationIdentifier,VscCallback> VscCallbacks;
+  typedef std::map<OrganizationIdentifier,VscCallback>::iterator VscCallbacksI;
+
+  VscCallbacks m_callbacks;
+  friend class OrganizationIdentifier;
+};
+
+static std::vector<OrganizationIdentifier> OrganizationIdentifiers;
+}
+
+#endif /* Vendor_Specific_Action_H */
diff -Naur ns-3.18.1/src/wave/model/wave-mac-low.cc ns-3.19/src/wave/model/wave-mac-low.cc
--- ns-3.18.1/src/wave/model/wave-mac-low.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/model/wave-mac-low.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,86 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ *         Junling Bu <linlinjavaer@gmail.com>
+ */
+#include "ns3/log.h"
+#include "wave-mac-low.h"
+#include "higher-tx-tag.h"
+
+NS_LOG_COMPONENT_DEFINE ("WaveMacLow");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (WaveMacLow);
+
+TypeId
+WaveMacLow::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::WaveMacLow")
+    .SetParent<MacLow> ()
+    .AddConstructor<WaveMacLow> ()
+  ;
+  return tid;
+}
+WaveMacLow::WaveMacLow (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+WaveMacLow::~WaveMacLow (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+WifiTxVector
+WaveMacLow::GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const
+{
+  NS_LOG_FUNCTION (this << packet << *hdr);
+  HigherDataTxVectorTag datatag;
+  bool found;
+  found = ConstCast<Packet> (packet)->PeekPacketTag (datatag);
+  if (!found)
+    {
+      return MacLow::GetDataTxVector (packet, hdr);
+    }
+
+  if (!datatag.IsAdapter ())
+    {
+      return datatag.GetDataTxVector ();
+    }
+
+  WifiTxVector txHigher = datatag.GetDataTxVector ();
+  WifiTxVector txMac = MacLow::GetDataTxVector (packet, hdr);
+  WifiTxVector txAdapter;
+  // if adapter is true, DataRate set by higher layer is the minimum data rate
+  // that sets the lower bound for the actual data rate.
+  if (txHigher.GetMode ().GetDataRate () > txMac.GetMode ().GetDataRate ())
+    {
+      txAdapter.SetMode (txHigher.GetMode ());
+    }
+  else
+    {
+      txAdapter.SetMode (txMac.GetMode ());
+    }
+
+  // if adapter is true, TxPwr_Level set by higher layer is the maximum
+  // transmit power that sets the upper bound for the actual transmit power;
+  txAdapter.SetTxPowerLevel (std::min (txHigher.GetTxPowerLevel (), txMac.GetTxPowerLevel ()));
+  return txAdapter;
+}
+} // namespace ns3
diff -Naur ns-3.18.1/src/wave/model/wave-mac-low.h ns-3.19/src/wave/model/wave-mac-low.h
--- ns-3.18.1/src/wave/model/wave-mac-low.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/model/wave-mac-low.h	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,51 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ *         Junling Bu <linlinjavaer@gmail.com>
+ */
+#ifndef WAVE_MAC_LOW_H
+#define WAVE_MAC_LOW_H
+
+#include "ns3/mac-low.h"
+
+namespace ns3 {
+/**
+ * \ingroup wave
+ * This class allows higher layer control data rate and tx power level.
+ * If higher layer do not select, it will select by WifiRemoteStationManager
+ * of MAC layer;
+ * If higher layer selects tx arguments without adapter set, the data rate
+ * and tx power level will be used to send the packet.
+ * If higher layer selects tx arguments with adapter set, the data rate
+ * will be lower bound for the actual data rate, and the power level
+ * will be upper bound for the actual transmit power.
+ */
+class WaveMacLow : public MacLow
+{
+public:
+  static TypeId GetTypeId (void);
+  WaveMacLow (void);
+  virtual ~WaveMacLow (void);
+private:
+  virtual WifiTxVector GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
+};
+
+} // namespace ns3
+
+#endif /* WAVE_MAC_LOW_H*/
diff -Naur ns-3.18.1/src/wave/test/examples-to-run.py ns-3.19/src/wave/test/examples-to-run.py
--- ns-3.18.1/src/wave/test/examples-to-run.py	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/test/examples-to-run.py	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,20 @@
+#! /usr/bin/env python
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+# A list of C++ examples to run in order to ensure that they remain
+# buildable and runnable over time.  Each tuple in the list contains
+#
+#     (example_name, do_run, do_valgrind_run).
+#
+# See test.py for more information.
+cpp_examples = [
+    ("wave-simple-80211p", "True", "True"),
+]
+
+# A list of Python examples to run in order to ensure that they remain
+# runnable over time.  Each tuple in the list contains
+#
+#     (example_name, do_run).
+#
+# See test.py for more information.
+python_examples = []
diff -Naur ns-3.18.1/src/wave/test/ocb-test-suite.cc ns-3.19/src/wave/test/ocb-test-suite.cc
--- ns-3.18.1/src/wave/test/ocb-test-suite.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/test/ocb-test-suite.cc	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,396 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Dalian University of Technology
+ *
+ * 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: Junling Bu <linlinjavaer@gmail.com>
+ */
+#include "ns3/test.h"
+#include "ns3/rng-seed-manager.h"
+#include "ns3/config.h"
+#include "ns3/data-rate.h"
+#include "ns3/vector.h"
+#include "ns3/string.h"
+#include "ns3/ssid.h"
+#include "ns3/packet-socket-address.h"
+#include "ns3/mobility-model.h"
+#include "ns3/on-off-helper.h"
+#include "ns3/yans-wifi-helper.h"
+#include "ns3/position-allocator.h"
+#include "ns3/packet-socket-helper.h"
+#include "ns3/mobility-helper.h"
+#include "ns3/nqos-wifi-mac-helper.h"
+#include "ns3/wifi-net-device.h"
+#include <iostream>
+
+#include "ns3/ocb-wifi-mac.h"
+#include "ns3/wifi-80211p-helper.h"
+#include "ns3/wave-mac-helper.h"
+
+using namespace ns3;
+// helper function to assign streams to random variables, to control
+// randomness in the tests
+static void
+AssignWifiRandomStreams (Ptr<WifiMac> mac, int64_t stream)
+{
+  int64_t currentStream = stream;
+  Ptr<RegularWifiMac> rmac = DynamicCast<RegularWifiMac> (mac);
+  if (rmac)
+    {
+      PointerValue ptr;
+      rmac->GetAttribute ("DcaTxop", ptr);
+      Ptr<DcaTxop> dcaTxop = ptr.Get<DcaTxop> ();
+      currentStream += dcaTxop->AssignStreams (currentStream);
+
+      rmac->GetAttribute ("VO_EdcaTxopN", ptr);
+      Ptr<EdcaTxopN> vo_edcaTxopN = ptr.Get<EdcaTxopN> ();
+      currentStream += vo_edcaTxopN->AssignStreams (currentStream);
+
+      rmac->GetAttribute ("VI_EdcaTxopN", ptr);
+      Ptr<EdcaTxopN> vi_edcaTxopN = ptr.Get<EdcaTxopN> ();
+      currentStream += vi_edcaTxopN->AssignStreams (currentStream);
+
+      rmac->GetAttribute ("BE_EdcaTxopN", ptr);
+      Ptr<EdcaTxopN> be_edcaTxopN = ptr.Get<EdcaTxopN> ();
+      currentStream += be_edcaTxopN->AssignStreams (currentStream);
+
+      rmac->GetAttribute ("BK_EdcaTxopN", ptr);
+      Ptr<EdcaTxopN> bk_edcaTxopN = ptr.Get<EdcaTxopN> ();
+      currentStream += bk_edcaTxopN->AssignStreams (currentStream);
+    }
+}
+
+class OcbWifiMacTestCase : public TestCase
+{
+public:
+  OcbWifiMacTestCase (void);
+  virtual ~OcbWifiMacTestCase (void);
+private:
+  virtual void DoRun (void);
+
+  void MacAssoc (std::string context,Mac48Address bssid);
+  void PhyRxOkTrace (std::string context, Ptr<const Packet> packet, double snr, WifiMode mode, enum WifiPreamble preamble);
+  void PhyTxTrace (std::string context, Ptr<const Packet> packet, WifiMode mode, WifiPreamble preamble, uint8_t txPower);
+  Vector GetCurrentPosition (uint32_t i);
+  void AdvancePosition (Ptr<Node> node);
+
+  void PreRandomConfiguration (void);
+  void ConfigureApStaMode (Ptr<Node> static_node, Ptr<Node> mobile_node);
+  void ConfigureAdhocMode (Ptr<Node> static_node, Ptr<Node> mobile_node);
+  void ConfigureOcbMode (Ptr<Node> static_node, Ptr<Node> mobile_node);
+  void PostDeviceConfiguration (Ptr<Node> static_node, Ptr<Node> mobile_node);
+
+  Time phytx_time;
+  Vector phytx_pos;
+
+  Time macassoc_time;
+  Vector macassoc_pos;
+
+  Time phyrx_time;
+  Vector phyrx_pos;
+
+  // nodes.Get (0) is static node
+  // nodes.Get (1) is mobile node
+  NodeContainer nodes;
+};
+
+OcbWifiMacTestCase::OcbWifiMacTestCase (void)
+  : TestCase ("Association time: Ap+Sta mode vs Adhoc mode vs Ocb mode")
+{
+}
+
+OcbWifiMacTestCase::~OcbWifiMacTestCase (void)
+{
+}
+
+// mobility is like walk on line with velocity 5 m/s
+// We prefer to update 0.5m every 0.1s rather than 5m every 1s
+void
+OcbWifiMacTestCase::AdvancePosition (Ptr<Node> node)
+{
+  Ptr<MobilityModel> mobility = node->GetObject<MobilityModel> ();
+  Vector pos = mobility->GetPosition ();
+  pos.x -= 0.5;
+  if (pos.x < 1.0 )
+    {
+      pos.x = 1.0;
+      return;
+    }
+  mobility->SetPosition (pos);
+
+  Simulator::Schedule (Seconds (0.1), &OcbWifiMacTestCase::AdvancePosition, this, node);
+}
+
+// here are only two nodes, a stationary and a mobile one
+// the i value of the first = 0; the i value of second = 1.
+Vector
+OcbWifiMacTestCase::GetCurrentPosition (uint32_t i)
+{
+  NS_ASSERT (i < 2);
+  Ptr<Node> node = nodes.Get (i);
+  Ptr<MobilityModel> mobility = node->GetObject<MobilityModel> ();
+  Vector pos = mobility->GetPosition ();
+  return pos;
+}
+
+void
+OcbWifiMacTestCase::MacAssoc (std::string context,Mac48Address bssid)
+{
+  if (macassoc_time == Time (0))
+    {
+      macassoc_time = Now ();
+      macassoc_pos = GetCurrentPosition (1);
+      std::cout << "MacAssoc time = " << macassoc_time.GetNanoSeconds ()
+                << " position = " << macassoc_pos
+                << std::endl;
+    }
+}
+
+// We want to get the time that sta receives the first beacon frame from AP
+// it means that in this time this sta has ability to receive frame
+void
+OcbWifiMacTestCase::PhyRxOkTrace (std::string context, Ptr<const Packet> packet, double snr, WifiMode mode, enum WifiPreamble preamble)
+{
+  if (phyrx_time == Time (0))
+    {
+      phyrx_time = Now ();
+      phyrx_pos = GetCurrentPosition (1);
+      std::cout << "PhyRxOk time = " << phyrx_time.GetNanoSeconds ()
+                << " position = " << phyrx_pos
+                << std::endl;
+    }
+}
+
+// We want to get the time that STA sends the first data packet successfully
+void
+OcbWifiMacTestCase::PhyTxTrace (std::string context, Ptr<const Packet> packet, WifiMode mode, WifiPreamble preamble, uint8_t txPower)
+{
+  WifiMacHeader h;
+  packet->PeekHeader (h);
+  if ((phytx_time == Time (0)) && h.IsData ())
+    {
+      phytx_time = Now ();
+      phytx_pos = GetCurrentPosition (1);
+      std::cout << "PhyTx data time = " << phytx_time.GetNanoSeconds ()
+                << " position = " << phytx_pos
+                << std::endl;
+    }
+}
+
+void
+OcbWifiMacTestCase::ConfigureApStaMode (Ptr<Node> static_node, Ptr<Node> mobile_node)
+{
+  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
+  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+  wifiPhy.SetChannel (wifiChannel.Create ());
+
+  Ssid ssid = Ssid ("wifi-default");
+  NqosWifiMacHelper wifiStaMac = NqosWifiMacHelper::Default ();
+  wifiStaMac.SetType ("ns3::StaWifiMac", "Ssid", SsidValue (ssid));
+  NqosWifiMacHelper wifiApMac = NqosWifiMacHelper::Default ();
+  wifiApMac.SetType ("ns3::ApWifiMac","Ssid", SsidValue (ssid));
+
+  WifiHelper wifi = WifiHelper::Default ();
+  wifi.SetStandard (WIFI_PHY_STANDARD_80211_10MHZ);
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
+                                "DataMode", StringValue ("OfdmRate6MbpsBW10MHz"),
+                                "ControlMode",StringValue ("OfdmRate6MbpsBW10MHz"));
+  wifi.Install (wifiPhy, wifiStaMac, mobile_node);
+  wifi.Install (wifiPhy, wifiApMac, static_node);
+}
+
+void
+OcbWifiMacTestCase::ConfigureAdhocMode (Ptr<Node> static_node, Ptr<Node> mobile_node)
+{
+  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
+  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+  wifiPhy.SetChannel (wifiChannel.Create ());
+
+  NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+  wifiMac.SetType ("ns3::AdhocWifiMac");
+
+  WifiHelper wifi = WifiHelper::Default ();
+  wifi.SetStandard (WIFI_PHY_STANDARD_80211_10MHZ);
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
+                                "DataMode", StringValue ("OfdmRate6MbpsBW10MHz"),
+                                "ControlMode",StringValue ("OfdmRate6MbpsBW10MHz"));
+  wifi.Install (wifiPhy, wifiMac, mobile_node);
+  wifi.Install (wifiPhy, wifiMac, static_node);
+}
+
+void
+OcbWifiMacTestCase::ConfigureOcbMode (Ptr<Node> static_node, Ptr<Node> mobile_node)
+{
+  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
+  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+  wifiPhy.SetChannel (wifiChannel.Create ());
+
+  NqosWaveMacHelper wifi80211pMac = NqosWaveMacHelper::Default ();
+
+  Wifi80211pHelper wifi80211p = Wifi80211pHelper::Default ();
+  wifi80211p.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
+                                      "DataMode", StringValue ("OfdmRate6MbpsBW10MHz"),
+                                      "ControlMode",StringValue ("OfdmRate6MbpsBW10MHz"));
+  wifi80211p.Install (wifiPhy, wifi80211pMac, mobile_node);
+  wifi80211p.Install (wifiPhy, wifi80211pMac, static_node);
+}
+
+void
+OcbWifiMacTestCase::PostDeviceConfiguration (Ptr<Node> static_node, Ptr<Node> mobile_node)
+{
+  Ptr<WifiNetDevice> static_device = DynamicCast<WifiNetDevice> (static_node->GetDevice (0));
+  Ptr<WifiNetDevice> mobile_device = DynamicCast<WifiNetDevice> (mobile_node->GetDevice (0));
+
+  // Fix the stream assignment to the Dcf Txop objects (backoffs)
+  // The below stream assignment will result in the DcaTxop object
+  // using a backoff value of zero for this test when the
+  // DcaTxop::EndTxNoAck() calls to StartBackoffNow()
+  AssignWifiRandomStreams (static_device->GetMac (), 21);
+  AssignWifiRandomStreams (mobile_device->GetMac (), 22);
+
+  // setup mobility
+  // the initial position of static node is at 0,
+  // and the initial position of mobile node is 350.
+  MobilityHelper mobility;
+  mobility.Install (mobile_node);
+  mobility.Install (static_node);
+  Ptr<MobilityModel> mm = mobile_node->GetObject<MobilityModel> ();
+  Vector possta = mm->GetPosition ();
+  possta.x = 350;
+  mm->SetPosition (possta);
+  Simulator::Schedule (Seconds (1.0), &OcbWifiMacTestCase::AdvancePosition, this, mobile_node);
+
+  PacketSocketAddress socket;
+  socket.SetSingleDevice (mobile_device->GetIfIndex ());
+  socket.SetPhysicalAddress (static_device->GetAddress ());
+  socket.SetProtocol (1);
+
+  // give packet socket powers to nodes.
+  PacketSocketHelper packetSocket;
+  packetSocket.Install (static_node);
+  packetSocket.Install (mobile_node);
+
+  OnOffHelper onoff ("ns3::PacketSocketFactory", Address (socket));
+  onoff.SetConstantRate (DataRate ("500kb/s"));
+  ApplicationContainer apps = onoff.Install (mobile_node);
+  apps.Start (Seconds (0.5));
+  apps.Stop (Seconds (70.0));
+
+  phytx_time = macassoc_time = phyrx_time = Time ();
+  phytx_pos = macassoc_pos = phyrx_pos = Vector ();
+
+  Config::Connect ("/NodeList/1/DeviceList/*/Mac/Assoc", MakeCallback (&OcbWifiMacTestCase::MacAssoc, this));
+  Config::Connect ("/NodeList/1/DeviceList/*/Phy/State/RxOk", MakeCallback (&OcbWifiMacTestCase::PhyRxOkTrace, this));
+  Config::Connect ("/NodeList/1/DeviceList/*/Phy/State/Tx", MakeCallback (&OcbWifiMacTestCase::PhyTxTrace, this));
+}
+
+/**
+ *
+ *   static-node:0    <----       mobile-node:1
+ *        *   ------ 350m -------    *
+ *
+ * the node transmit range is less than 150m
+ *
+ * Ap+Sta mode vs Adhoc mode vs Ocb mode
+ * first test the time point when the stationary node is
+ * an AP and the mobile node is a Sta
+ * then test when one Ad-hoc node and another Ad-hoc node
+ * last test when one OCB node and another OCB node
+ */
+void
+OcbWifiMacTestCase::DoRun ()
+{
+  std::cout << "test time point for Ap-Sta mode" << std::endl;
+  PreRandomConfiguration ();
+  nodes = NodeContainer ();
+  nodes.Create (2);
+  Ptr<Node> static_node = nodes.Get (0);
+  Ptr<Node> mobile_node = nodes.Get (1);
+  ConfigureApStaMode (static_node, mobile_node);
+  PostDeviceConfiguration (static_node, mobile_node);
+  Simulator::Stop (Seconds (71.0));
+  Simulator::Run ();
+  Simulator::Destroy ();
+  NS_TEST_ASSERT_MSG_LT (phyrx_time, macassoc_time, "In Sta mode with AP, you cannot associate until receive beacon or AssocResponse frame" );
+  NS_TEST_ASSERT_MSG_LT (macassoc_time, phytx_time, "In Sta mode with AP,  you cannot send data packet until associate" );
+  NS_TEST_ASSERT_MSG_GT ((phyrx_pos.x - macassoc_pos.x), 0.0, "");
+  //actually macassoc_pos.x - phytx_pos.x is greater than 0
+  //however associate switch to send is so fast with less than 100ms
+  //and in our mobility model that every 0.1s update position,
+  //so turn out to be that macassoc_pos.x - phytx_pos.x is equal to 0
+  //NS_TEST_ASSERT_MSG_GT ((macassoc_pos.x - phytx_pos.x), 0.0, "");
+
+  std::cout << "test time point for Adhoc mode" << std::endl;
+  PreRandomConfiguration ();
+  nodes = NodeContainer ();
+  nodes.Create (2);
+  static_node = nodes.Get (0);
+  mobile_node = nodes.Get (1);
+  ConfigureAdhocMode (static_node, mobile_node);
+  PostDeviceConfiguration (static_node, mobile_node);
+  Simulator::Stop (Seconds (71.0));
+  Simulator::Run ();
+  Simulator::Destroy ();
+  // below test assert will fail, because AdhocWifiMac has not implement state machine.
+  // if someone takes a look at the output in adhoc mode and in Ocb mode
+  // he will find these two outputs are almost same.
+  //NS_TEST_ASSERT_MSG_LT (phyrx_time, macassoc_time, "In Adhoc mode, you cannot associate until receive beacon or AssocResponse frame" );
+  //NS_TEST_ASSERT_MSG_LT (macassoc_time, phytx_time, "In Adhoc mode,  you cannot send data packet until associate" );
+  //NS_TEST_ASSERT_MSG_GT ((phyrx_pos.x - macassoc_pos.x), 0.0, "");
+  // below test assert result refer to Ap-Sta mode
+  //NS_TEST_ASSERT_MSG_GT ((macassoc_pos.x - phytx_pos.x), 0.0, "");
+
+  std::cout << "test time point for Ocb mode" << std::endl;
+  PreRandomConfiguration ();
+  nodes = NodeContainer ();
+  nodes.Create (2);
+  static_node = nodes.Get (0);
+  mobile_node = nodes.Get (1);
+  ConfigureOcbMode (static_node, mobile_node);
+  PostDeviceConfiguration (static_node, mobile_node);
+  Simulator::Stop (Seconds (71.0));
+  Simulator::Run ();
+  Simulator::Destroy ();
+  NS_TEST_ASSERT_MSG_EQ (macassoc_time.GetNanoSeconds (), 0, "In Ocb mode, there is no associate state machine" );
+  NS_TEST_ASSERT_MSG_LT (phytx_time, phyrx_time, "before mobile node receives frames from far static node, it can send data packet directly" );
+  NS_TEST_ASSERT_MSG_EQ (macassoc_pos.x, 0.0, "");
+  NS_TEST_ASSERT_MSG_GT ((phytx_pos.x - phyrx_pos.x), 0.0, "");
+}
+void
+OcbWifiMacTestCase::PreRandomConfiguration ()
+{
+  // Assign a seed and run number, and later fix the assignment of streams to
+  // WiFi random variables, so that the first backoff used is zero slots
+  RngSeedManager::SetSeed (1);
+  RngSeedManager::SetRun (17);
+  // the WiFi random variables is set in PostDeviceConfiguration method.
+}
+
+class OcbTestSuite : public TestSuite
+{
+public:
+  OcbTestSuite ();
+};
+
+OcbTestSuite::OcbTestSuite ()
+  : TestSuite ("wifi-80211p-ocb", UNIT)
+{
+  // TestDuration for TestCase can be QUICK, EXTENSIVE or TAKES_FOREVER
+  AddTestCase (new OcbWifiMacTestCase, TestCase::QUICK);
+}
+
+// Do not forget to allocate an instance of this TestSuite
+static OcbTestSuite ocbTestSuite;
+
diff -Naur ns-3.18.1/src/wave/wscript ns-3.19/src/wave/wscript
--- ns-3.18.1/src/wave/wscript	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.19/src/wave/wscript	2013-12-20 09:44:50.000000000 -0800
@@ -0,0 +1,40 @@
+# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+# def options(opt):
+#     pass
+
+# def configure(conf):
+#     conf.check_nonfatal(header_name='stdint.h', define_name='HAVE_STDINT_H')
+
+def build(bld):
+    module = bld.create_ns3_module('wave', ['core','wifi', 'propagation', 'applications'])
+    module.source = [
+	'model/wave-mac-low.cc',
+        'model/ocb-wifi-mac.cc',
+        'model/vendor-specific-action.cc',
+        'model/higher-tx-tag.cc',
+        'helper/wave-mac-helper.cc',
+        'helper/wifi-80211p-helper.cc',
+        ]
+
+    module_test = bld.create_ns3_module_test_library('wave')
+    module_test.source = [
+        'test/ocb-test-suite.cc',
+        ]
+
+    headers = bld(features='ns3header')
+    headers.module = 'wave'
+    headers.source = [
+    	'model/wave-mac-low.h',
+        'model/ocb-wifi-mac.h',
+        'model/vendor-specific-action.h',
+        'model/higher-tx-tag.h',
+        'helper/wave-mac-helper.h',
+        'helper/wifi-80211p-helper.h',
+        ]
+
+    if bld.env.ENABLE_EXAMPLES:
+        bld.recurse('examples')
+
+    bld.ns3_python_bindings()
+
diff -Naur ns-3.18.1/src/wifi/bindings/modulegen__gcc_ILP32.py ns-3.19/src/wifi/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/wifi/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/wifi/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -39,7 +39,7 @@
     ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
     module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'])
     ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration]
-    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA'])
+    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'])
     ## ctrl-headers.h (module 'wifi'): ns3::BlockAckType [enumeration]
     module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'])
     ## address.h (module 'network'): ns3::Address [class]
@@ -189,7 +189,7 @@
     ## vector.h (module 'core'): ns3::Vector3D [class]
     module.add_class('Vector3D', import_from_module='ns.core')
     ## wifi-helper.h (module 'wifi'): ns3::WifiHelper [class]
-    module.add_class('WifiHelper')
+    module.add_class('WifiHelper', allow_subclassing=True)
     ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper [class]
     module.add_class('WifiMacHelper', allow_subclassing=True)
     ## wifi-mode.h (module 'wifi'): ns3::WifiMode [class]
@@ -295,7 +295,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -313,7 +313,7 @@
     ## 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'], outer_class=root_module['ns3::WifiActionHeader'])
+    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]
@@ -2069,6 +2069,8 @@
     return
 
 def register_Ns3InterferenceHelper_methods(root_module, cls):
+    ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::InterferenceHelper(ns3::InterferenceHelper const & arg0) [copy constructor]
+    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]
@@ -2401,10 +2403,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3969,17 +3972,17 @@
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::NodeContainer', 'c')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::Ptr<ns3::Node> node) const [member function]
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::Ptr< ns3::Node >', 'node')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, std::string nodeName) const [member function]
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('std::string', 'nodeName')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetRemoteStationManager(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
     cls.add_method('SetRemoteStationManager', 
                    'void', 
@@ -3987,7 +3990,8 @@
     ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('SetStandard', 
                    'void', 
-                   [param('ns3::WifiPhyStandard', 'standard')])
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_virtual=True)
     return
 
 def register_Ns3WifiMacHelper_methods(root_module, cls):
@@ -4183,8 +4187,8 @@
     cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
     cls.add_constructor([])
-    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
-    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
@@ -4240,10 +4244,10 @@
     cls.add_method('SetShortGuardInterval', 
                    'void', 
                    [param('bool', 'guardinterval')])
-    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
-                   [param('bool', 'stbcsatuts')])
+                   [param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
     cls.add_method('SetTxPowerLevel', 
                    'void', 
@@ -5033,7 +5037,8 @@
     ## nqos-wifi-mac-helper.h (module 'wifi'): void ns3::NqosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
     cls.add_method('SetType', 
                    'void', 
-                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')])
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
     ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::NqosWifiMacHelper::Create() const [member function]
     cls.add_method('Create', 
                    'ns3::Ptr< ns3::WifiMac >', 
@@ -5323,7 +5328,8 @@
     ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
     cls.add_method('SetType', 
                    'void', 
-                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')])
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
     ## qos-wifi-mac-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::QosWifiMacHelper::Create() const [member function]
     cls.add_method('Create', 
                    'ns3::Ptr< ns3::WifiMac >', 
@@ -5747,6 +5753,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5757,6 +5768,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5772,6 +5788,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5797,6 +5818,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -6868,10 +6894,10 @@
     cls.add_method('SetProbeResp', 
                    'void', 
                    [])
-    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function]
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
     cls.add_method('SetQosAckPolicy', 
                    'void', 
-                   [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')])
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
     cls.add_method('SetQosAmsdu', 
                    'void', 
@@ -7010,6 +7036,16 @@
     cls.add_method('SetMaxSize', 
                    'void', 
                    [param('uint32_t', 'maxSize')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacQueue::GetAddressForPacket(ns3::WifiMacHeader::AddressType type, std::_List_iterator<ns3::WifiMacQueue::Item> it) [member function]
+    cls.add_method('GetAddressForPacket', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader::AddressType', 'type'), param('std::_List_iterator< ns3::WifiMacQueue::Item >', 'it')], 
+                   visibility='protected')
     return
 
 def register_Ns3WifiMacTrailer_methods(root_module, cls):
@@ -7666,15 +7702,15 @@
                    'void', 
                    [param('bool', 'greenfield')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
     cls.add_method('SetGuardInterval', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('bool', 'guardInterval')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
     cls.add_method('SetLdpc', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [param('bool', 'ldpc')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
@@ -8280,25 +8316,43 @@
     return
 
 def register_Ns3YansWifiPhy_methods(root_module, cls):
-    ## yans-wifi-phy.h (module 'wifi'): static ns3::TypeId ns3::YansWifiPhy::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::YansWifiPhy::YansWifiPhy(ns3::YansWifiPhy const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::YansWifiPhy const &', 'arg0')])
     ## yans-wifi-phy.h (module 'wifi'): ns3::YansWifiPhy::YansWifiPhy() [constructor]
     cls.add_constructor([])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannel(ns3::Ptr<ns3::YansWifiChannel> channel) [member function]
-    cls.add_method('SetChannel', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::YansWifiChannel >', 'channel')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannelNumber(uint16_t id) [member function]
-    cls.add_method('SetChannelNumber', 
+    ## yans-wifi-phy.h (module 'wifi'): int64_t ns3::YansWifiPhy::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
+    cls.add_method('CalculateSnr', 
+                   'double', 
+                   [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('ConfigureStandard', 
                    'void', 
-                   [param('uint16_t', 'id')], 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint16_t ns3::YansWifiPhy::GetChannelNumber() const [member function]
-    cls.add_method('GetChannelNumber', 
-                   'uint16_t', 
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
+    cls.add_method('GetBssMembershipSelector', 
+                   'uint32_t', 
+                   [param('uint32_t', 'selector')], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetCcaMode1Threshold() const [member function]
+    cls.add_method('GetCcaMode1Threshold', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::YansWifiPhy::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::WifiChannel >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetChannelBonding() const [member function]
+    cls.add_method('GetChannelBonding', 
+                   'bool', 
                    [], 
                    is_const=True, is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetChannelFrequencyMhz() const [member function]
@@ -8306,67 +8360,19 @@
                    'double', 
                    [], 
                    is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::StartReceivePacket(ns3::Ptr<ns3::Packet> packet, double rxPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) [member function]
-    cls.add_method('StartReceivePacket', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxNoiseFigure(double noiseFigureDb) [member function]
-    cls.add_method('SetRxNoiseFigure', 
-                   'void', 
-                   [param('double', 'noiseFigureDb')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxPowerStart(double start) [member function]
-    cls.add_method('SetTxPowerStart', 
-                   'void', 
-                   [param('double', 'start')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxPowerEnd(double end) [member function]
-    cls.add_method('SetTxPowerEnd', 
-                   'void', 
-                   [param('double', 'end')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNTxPower(uint32_t n) [member function]
-    cls.add_method('SetNTxPower', 
-                   'void', 
-                   [param('uint32_t', 'n')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxGain(double gain) [member function]
-    cls.add_method('SetTxGain', 
-                   'void', 
-                   [param('double', 'gain')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxGain(double gain) [member function]
-    cls.add_method('SetRxGain', 
-                   'void', 
-                   [param('double', 'gain')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetEdThreshold(double threshold) [member function]
-    cls.add_method('SetEdThreshold', 
-                   'void', 
-                   [param('double', 'threshold')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetCcaMode1Threshold(double threshold) [member function]
-    cls.add_method('SetCcaMode1Threshold', 
-                   'void', 
-                   [param('double', 'threshold')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetErrorRateModel(ns3::Ptr<ns3::ErrorRateModel> rate) [member function]
-    cls.add_method('SetErrorRateModel', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::ErrorRateModel >', 'rate')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetDevice(ns3::Ptr<ns3::Object> device) [member function]
-    cls.add_method('SetDevice', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Object >', 'device')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetMobility(ns3::Ptr<ns3::Object> mobility) [member function]
-    cls.add_method('SetMobility', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Object >', 'mobility')])
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetRxNoiseFigure() const [member function]
-    cls.add_method('GetRxNoiseFigure', 
-                   'double', 
+    ## yans-wifi-phy.h (module 'wifi'): uint16_t ns3::YansWifiPhy::GetChannelNumber() const [member function]
+    cls.add_method('GetChannelNumber', 
+                   'uint16_t', 
                    [], 
-                   is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxGain() const [member function]
-    cls.add_method('GetTxGain', 
-                   'double', 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetDelayUntilIdle() [member function]
+    cls.add_method('GetDelayUntilIdle', 
+                   'ns3::Time', 
                    [], 
-                   is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetRxGain() const [member function]
-    cls.add_method('GetRxGain', 
-                   'double', 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::Object> ns3::YansWifiPhy::GetDevice() const [member function]
+    cls.add_method('GetDevice', 
+                   'ns3::Ptr< ns3::Object >', 
                    [], 
                    is_const=True)
     ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetEdThreshold() const [member function]
@@ -8374,33 +8380,68 @@
                    'double', 
                    [], 
                    is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetCcaMode1Threshold() const [member function]
-    cls.add_method('GetCcaMode1Threshold', 
-                   'double', 
-                   [], 
-                   is_const=True)
     ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::ErrorRateModel> ns3::YansWifiPhy::GetErrorRateModel() const [member function]
     cls.add_method('GetErrorRateModel', 
                    'ns3::Ptr< ns3::ErrorRateModel >', 
                    [], 
                    is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::Object> ns3::YansWifiPhy::GetDevice() const [member function]
-    cls.add_method('GetDevice', 
-                   'ns3::Ptr< ns3::Object >', 
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
+                   'uint32_t', 
                    [], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetGuardInterval() const [member function]
+    cls.add_method('GetGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetLastRxStartTime() const [member function]
+    cls.add_method('GetLastRxStartTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): uint8_t ns3::YansWifiPhy::GetMcs(uint8_t mcs) const [member function]
+    cls.add_method('GetMcs', 
+                   'uint8_t', 
+                   [param('uint8_t', 'mcs')], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::YansWifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
+    cls.add_method('GetMembershipSelectorModes', 
+                   'ns3::WifiModeList', 
+                   [param('uint32_t', 'selector')], 
+                   is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::Object> ns3::YansWifiPhy::GetMobility() [member function]
     cls.add_method('GetMobility', 
                    'ns3::Ptr< ns3::Object >', 
                    [])
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxPowerStart() const [member function]
-    cls.add_method('GetTxPowerStart', 
-                   'double', 
+    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::YansWifiPhy::GetMode(uint32_t mode) const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [param('uint32_t', 'mode')], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNBssMembershipSelectors() const [member function]
+    cls.add_method('GetNBssMembershipSelectors', 
+                   'uint32_t', 
                    [], 
                    is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxPowerEnd() const [member function]
-    cls.add_method('GetTxPowerEnd', 
-                   'double', 
+    ## yans-wifi-phy.h (module 'wifi'): uint8_t ns3::YansWifiPhy::GetNMcs() const [member function]
+    cls.add_method('GetNMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNModes() const [member function]
+    cls.add_method('GetNModes', 
+                   'uint32_t', 
                    [], 
                    is_const=True, is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNTxPower() const [member function]
@@ -8408,216 +8449,213 @@
                    'uint32_t', 
                    [], 
                    is_const=True, 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]
-    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')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetReceiveErrorCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
-    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')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
-    cls.add_method('SendPacket', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::RegisterListener(ns3::WifiPhyListener * listener) [member function]
-    cls.add_method('RegisterListener', 
-                   'void', 
-                   [param('ns3::WifiPhyListener *', 'listener')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateCcaBusy() [member function]
-    cls.add_method('IsStateCcaBusy', 
-                   'bool', 
-                   [], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateIdle() [member function]
-    cls.add_method('IsStateIdle', 
-                   'bool', 
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNumberOfReceiveAntennas() const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
                    [], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateBusy() [member function]
-    cls.add_method('IsStateBusy', 
-                   'bool', 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNumberOfTransmitAntennas() const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
                    [], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateRx() [member function]
-    cls.add_method('IsStateRx', 
-                   'bool', 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetRxGain() const [member function]
+    cls.add_method('GetRxGain', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetRxNoiseFigure() const [member function]
+    cls.add_method('GetRxNoiseFigure', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetStateDuration() [member function]
+    cls.add_method('GetStateDuration', 
+                   'ns3::Time', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateTx() [member function]
-    cls.add_method('IsStateTx', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetStbc() const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxGain() const [member function]
+    cls.add_method('GetTxGain', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxPowerEnd() const [member function]
+    cls.add_method('GetTxPowerEnd', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxPowerStart() const [member function]
+    cls.add_method('GetTxPowerStart', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): static ns3::TypeId ns3::YansWifiPhy::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateBusy() [member function]
+    cls.add_method('IsStateBusy', 
                    'bool', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateSwitching() [member function]
-    cls.add_method('IsStateSwitching', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateCcaBusy() [member function]
+    cls.add_method('IsStateCcaBusy', 
                    'bool', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetStateDuration() [member function]
-    cls.add_method('GetStateDuration', 
-                   'ns3::Time', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateIdle() [member function]
+    cls.add_method('IsStateIdle', 
+                   'bool', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetDelayUntilIdle() [member function]
-    cls.add_method('GetDelayUntilIdle', 
-                   'ns3::Time', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateRx() [member function]
+    cls.add_method('IsStateRx', 
+                   'bool', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetLastRxStartTime() const [member function]
-    cls.add_method('GetLastRxStartTime', 
-                   'ns3::Time', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateSwitching() [member function]
+    cls.add_method('IsStateSwitching', 
+                   'bool', 
                    [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNModes() const [member function]
-    cls.add_method('GetNModes', 
-                   'uint32_t', 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateTx() [member function]
+    cls.add_method('IsStateTx', 
+                   'bool', 
                    [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::YansWifiPhy::GetMode(uint32_t mode) const [member function]
-    cls.add_method('GetMode', 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::YansWifiPhy::McsToWifiMode(uint8_t mcs) [member function]
+    cls.add_method('McsToWifiMode', 
                    'ns3::WifiMode', 
-                   [param('uint32_t', 'mode')], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
-    cls.add_method('CalculateSnr', 
-                   'double', 
-                   [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::YansWifiPhy::GetChannel() const [member function]
-    cls.add_method('GetChannel', 
-                   'ns3::Ptr< ns3::WifiChannel >', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
-    cls.add_method('ConfigureStandard', 
+                   [param('uint8_t', 'mcs')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::RegisterListener(ns3::WifiPhyListener * listener) [member function]
+    cls.add_method('RegisterListener', 
                    'void', 
-                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   [param('ns3::WifiPhyListener *', 'listener')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): int64_t ns3::YansWifiPhy::AssignStreams(int64_t stream) [member function]
-    cls.add_method('AssignStreams', 
-                   'int64_t', 
-                   [param('int64_t', 'stream')], 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('SendPacket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
                    is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetCcaMode1Threshold(double threshold) [member function]
+    cls.add_method('SetCcaMode1Threshold', 
+                   'void', 
+                   [param('double', 'threshold')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannel(ns3::Ptr<ns3::YansWifiChannel> channel) [member function]
+    cls.add_method('SetChannel', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::YansWifiChannel >', 'channel')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannelBonding(bool channelbonding) [member function]
+    cls.add_method('SetChannelBonding', 
+                   'void', 
+                   [param('bool', 'channelbonding')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannelNumber(uint16_t id) [member function]
+    cls.add_method('SetChannelNumber', 
+                   'void', 
+                   [param('uint16_t', 'id')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetDevice(ns3::Ptr<ns3::Object> device) [member function]
+    cls.add_method('SetDevice', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'device')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetEdThreshold(double threshold) [member function]
+    cls.add_method('SetEdThreshold', 
+                   'void', 
+                   [param('double', 'threshold')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetErrorRateModel(ns3::Ptr<ns3::ErrorRateModel> rate) [member function]
+    cls.add_method('SetErrorRateModel', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::ErrorRateModel >', 'rate')])
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetFrequency(uint32_t freq) [member function]
     cls.add_method('SetFrequency', 
                    'void', 
                    [param('uint32_t', 'freq')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetFrequency() const [member function]
-    cls.add_method('GetFrequency', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
-    cls.add_method('SetNumberOfTransmitAntennas', 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetGreenfield(bool greenfield) [member function]
+    cls.add_method('SetGreenfield', 
                    'void', 
-                   [param('uint32_t', 'tx')], 
+                   [param('bool', 'greenfield')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNumberOfTransmitAntennas() const [member function]
-    cls.add_method('GetNumberOfTransmitAntennas', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetGuardInterval(bool guardInterval) [member function]
+    cls.add_method('SetGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardInterval')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetLdpc(bool ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('bool', 'ldpc')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetMobility(ns3::Ptr<ns3::Object> mobility) [member function]
+    cls.add_method('SetMobility', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'mobility')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNTxPower(uint32_t n) [member function]
+    cls.add_method('SetNTxPower', 
+                   'void', 
+                   [param('uint32_t', 'n')])
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
                    'void', 
                    [param('uint32_t', 'rx')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNumberOfReceiveAntennas() const [member function]
-    cls.add_method('GetNumberOfReceiveAntennas', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetGuardInterval(bool GuardInterval) [member function]
-    cls.add_method('SetGuardInterval', 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
+    cls.add_method('SetNumberOfTransmitAntennas', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('uint32_t', 'tx')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetGuardInterval() const [member function]
-    cls.add_method('GetGuardInterval', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetLdpc(bool Ldpc) [member function]
-    cls.add_method('SetLdpc', 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetReceiveErrorCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetReceiveErrorCallback', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [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'): bool ns3::YansWifiPhy::GetLdpc() const [member function]
-    cls.add_method('GetLdpc', 
-                   'bool', 
-                   [], 
-                   is_const=True, 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]
+    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')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxGain(double gain) [member function]
+    cls.add_method('SetRxGain', 
+                   'void', 
+                   [param('double', 'gain')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxNoiseFigure(double noiseFigureDb) [member function]
+    cls.add_method('SetRxNoiseFigure', 
+                   'void', 
+                   [param('double', 'noiseFigureDb')])
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
                    [param('bool', 'stbc')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetStbc() const [member function]
-    cls.add_method('GetStbc', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetGreenfield(bool greenfield) [member function]
-    cls.add_method('SetGreenfield', 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxGain(double gain) [member function]
+    cls.add_method('SetTxGain', 
                    'void', 
-                   [param('bool', 'greenfield')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetGreenfield() const [member function]
-    cls.add_method('GetGreenfield', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetChannelBonding() const [member function]
-    cls.add_method('GetChannelBonding', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannelBonding(bool channelbonding) [member function]
-    cls.add_method('SetChannelBonding', 
+                   [param('double', 'gain')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxPowerEnd(double end) [member function]
+    cls.add_method('SetTxPowerEnd', 
                    'void', 
-                   [param('bool', 'channelbonding')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNBssMembershipSelectors() const [member function]
-    cls.add_method('GetNBssMembershipSelectors', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
-    cls.add_method('GetBssMembershipSelector', 
-                   'uint32_t', 
-                   [param('uint32_t', 'selector')], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::YansWifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
-    cls.add_method('GetMembershipSelectorModes', 
-                   'ns3::WifiModeList', 
-                   [param('uint32_t', 'selector')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint8_t ns3::YansWifiPhy::GetNMcs() const [member function]
-    cls.add_method('GetNMcs', 
-                   'uint8_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint8_t ns3::YansWifiPhy::GetMcs(uint8_t mcs) const [member function]
-    cls.add_method('GetMcs', 
-                   'uint8_t', 
-                   [param('uint8_t', 'mcs')], 
-                   is_const=True, is_virtual=True)
+                   [param('double', 'end')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxPowerStart(double start) [member function]
+    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) [member function]
+    cls.add_method('StartReceivePacket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
     ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::WifiModeToMcs(ns3::WifiMode mode) [member function]
     cls.add_method('WifiModeToMcs', 
                    'uint32_t', 
                    [param('ns3::WifiMode', 'mode')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::YansWifiPhy::McsToWifiMode(uint8_t mcs) [member function]
-    cls.add_method('McsToWifiMode', 
-                   'ns3::WifiMode', 
-                   [param('uint8_t', 'mcs')], 
-                   is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -9721,10 +9759,10 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immeadiateAck) [member function]
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immediateAck) [member function]
     cls.add_method('SetHtImmediateAck', 
                    'void', 
-                   [param('bool', 'immeadiateAck')])
+                   [param('bool', 'immediateAck')])
     ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedFragment(uint16_t seq, uint8_t frag) [member function]
     cls.add_method('SetReceivedFragment', 
                    'void', 
@@ -11155,6 +11193,11 @@
                    'ns3::Time', 
                    [], 
                    is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::IsPromisc() const [member function]
+    cls.add_method('IsPromisc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## mac-low.h (module 'wifi'): void ns3::MacLow::NotifySwitchingStartNow(ns3::Time duration) [member function]
     cls.add_method('NotifySwitchingStartNow', 
                    'void', 
@@ -11239,6 +11282,11 @@
     cls.add_method('StartTransmission', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')])
+    ## mac-low.h (module 'wifi'): ns3::WifiTxVector ns3::MacLow::GetDataTxVector(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr) const [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   is_const=True, visibility='protected', is_virtual=True)
     ## mac-low.h (module 'wifi'): void ns3::MacLow::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -12360,6 +12408,31 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::DcaTxop> ns3::RegularWifiMac::GetDcaTxop() const [member function]
+    cls.add_method('GetDcaTxop', 
+                   'ns3::Ptr< ns3::DcaTxop >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVOQueue() const [member function]
+    cls.add_method('GetVOQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVIQueue() const [member function]
+    cls.add_method('GetVIQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBEQueue() const [member function]
+    cls.add_method('GetBEQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBKQueue() const [member function]
+    cls.add_method('GetBKQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
     ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('FinishConfigureStandard', 
                    'void', 
@@ -13074,12 +13147,17 @@
     cls.add_method('DoDispose', 
                    'void', 
                    [], 
-                   visibility='private', is_virtual=True)
+                   visibility='protected', is_virtual=True)
     ## wifi-net-device.h (module 'wifi'): void ns3::WifiNetDevice::DoInitialize() [member function]
     cls.add_method('DoInitialize', 
                    'void', 
                    [], 
-                   visibility='private', is_virtual=True)
+                   visibility='protected', is_virtual=True)
+    ## wifi-net-device.h (module 'wifi'): void ns3::WifiNetDevice::ForwardUp(ns3::Ptr<ns3::Packet> packet, ns3::Mac48Address from, ns3::Mac48Address to) [member function]
+    cls.add_method('ForwardUp', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Mac48Address', 'from'), param('ns3::Mac48Address', 'to')], 
+                   visibility='protected')
     return
 
 def register_Ns3YansErrorRateModel_methods(root_module, cls):
@@ -13100,44 +13178,46 @@
     return
 
 def register_Ns3YansWifiChannel_methods(root_module, cls):
-    ## yans-wifi-channel.h (module 'wifi'): static ns3::TypeId ns3::YansWifiChannel::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
+    ## yans-wifi-channel.h (module 'wifi'): ns3::YansWifiChannel::YansWifiChannel(ns3::YansWifiChannel const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::YansWifiChannel const &', 'arg0')])
     ## yans-wifi-channel.h (module 'wifi'): ns3::YansWifiChannel::YansWifiChannel() [constructor]
     cls.add_constructor([])
-    ## yans-wifi-channel.h (module 'wifi'): uint32_t ns3::YansWifiChannel::GetNDevices() const [member function]
-    cls.add_method('GetNDevices', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
+    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::Add(ns3::Ptr<ns3::YansWifiPhy> phy) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::YansWifiPhy >', 'phy')])
+    ## yans-wifi-channel.h (module 'wifi'): int64_t ns3::YansWifiChannel::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
     ## yans-wifi-channel.h (module 'wifi'): ns3::Ptr<ns3::NetDevice> ns3::YansWifiChannel::GetDevice(uint32_t i) const [member function]
     cls.add_method('GetDevice', 
                    'ns3::Ptr< ns3::NetDevice >', 
                    [param('uint32_t', 'i')], 
                    is_const=True, is_virtual=True)
-    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::Add(ns3::Ptr<ns3::YansWifiPhy> phy) [member function]
-    cls.add_method('Add', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::YansWifiPhy >', 'phy')])
-    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::SetPropagationLossModel(ns3::Ptr<ns3::PropagationLossModel> loss) [member function]
-    cls.add_method('SetPropagationLossModel', 
+    ## yans-wifi-channel.h (module 'wifi'): uint32_t ns3::YansWifiChannel::GetNDevices() const [member function]
+    cls.add_method('GetNDevices', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-channel.h (module 'wifi'): static ns3::TypeId ns3::YansWifiChannel::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::Send(ns3::Ptr<ns3::YansWifiPhy> sender, ns3::Ptr<ns3::Packet const> packet, double txPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) const [member function]
+    cls.add_method('Send', 
                    'void', 
-                   [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')])
+                   [param('ns3::Ptr< ns3::YansWifiPhy >', 'sender'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'txPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_const=True)
     ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::SetPropagationDelayModel(ns3::Ptr<ns3::PropagationDelayModel> delay) [member function]
     cls.add_method('SetPropagationDelayModel', 
                    'void', 
                    [param('ns3::Ptr< ns3::PropagationDelayModel >', 'delay')])
-    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::Send(ns3::Ptr<ns3::YansWifiPhy> sender, ns3::Ptr<ns3::Packet const> packet, double txPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) const [member function]
-    cls.add_method('Send', 
+    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::SetPropagationLossModel(ns3::Ptr<ns3::PropagationLossModel> loss) [member function]
+    cls.add_method('SetPropagationLossModel', 
                    'void', 
-                   [param('ns3::Ptr< ns3::YansWifiPhy >', 'sender'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'txPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')], 
-                   is_const=True)
-    ## yans-wifi-channel.h (module 'wifi'): int64_t ns3::YansWifiChannel::AssignStreams(int64_t stream) [member function]
-    cls.add_method('AssignStreams', 
-                   'int64_t', 
-                   [param('int64_t', 'stream')])
+                   [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')])
     return
 
 def register_Ns3AddressChecker_methods(root_module, cls):
diff -Naur ns-3.18.1/src/wifi/bindings/modulegen__gcc_LP64.py ns-3.19/src/wifi/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/wifi/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/wifi/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -39,7 +39,7 @@
     ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
     module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'])
     ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration]
-    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA'])
+    module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'])
     ## ctrl-headers.h (module 'wifi'): ns3::BlockAckType [enumeration]
     module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'])
     ## address.h (module 'network'): ns3::Address [class]
@@ -189,7 +189,7 @@
     ## vector.h (module 'core'): ns3::Vector3D [class]
     module.add_class('Vector3D', import_from_module='ns.core')
     ## wifi-helper.h (module 'wifi'): ns3::WifiHelper [class]
-    module.add_class('WifiHelper')
+    module.add_class('WifiHelper', allow_subclassing=True)
     ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper [class]
     module.add_class('WifiMacHelper', allow_subclassing=True)
     ## wifi-mode.h (module 'wifi'): ns3::WifiMode [class]
@@ -295,7 +295,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -313,7 +313,7 @@
     ## 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'], outer_class=root_module['ns3::WifiActionHeader'])
+    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]
@@ -2069,6 +2069,8 @@
     return
 
 def register_Ns3InterferenceHelper_methods(root_module, cls):
+    ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::InterferenceHelper(ns3::InterferenceHelper const & arg0) [copy constructor]
+    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]
@@ -2401,10 +2403,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -3969,17 +3972,17 @@
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::NodeContainer', 'c')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::Ptr<ns3::Node> node) const [member function]
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::Ptr< ns3::Node >', 'node')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, std::string nodeName) const [member function]
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('std::string', 'nodeName')], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
     ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetRemoteStationManager(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
     cls.add_method('SetRemoteStationManager', 
                    'void', 
@@ -3987,7 +3990,8 @@
     ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('SetStandard', 
                    'void', 
-                   [param('ns3::WifiPhyStandard', 'standard')])
+                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   is_virtual=True)
     return
 
 def register_Ns3WifiMacHelper_methods(root_module, cls):
@@ -4183,8 +4187,8 @@
     cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
     cls.add_constructor([])
-    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
-    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
@@ -4240,10 +4244,10 @@
     cls.add_method('SetShortGuardInterval', 
                    'void', 
                    [param('bool', 'guardinterval')])
-    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
-                   [param('bool', 'stbcsatuts')])
+                   [param('bool', 'stbc')])
     ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
     cls.add_method('SetTxPowerLevel', 
                    'void', 
@@ -5033,7 +5037,8 @@
     ## nqos-wifi-mac-helper.h (module 'wifi'): void ns3::NqosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
     cls.add_method('SetType', 
                    'void', 
-                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')])
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
     ## nqos-wifi-mac-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::NqosWifiMacHelper::Create() const [member function]
     cls.add_method('Create', 
                    'ns3::Ptr< ns3::WifiMac >', 
@@ -5323,7 +5328,8 @@
     ## qos-wifi-mac-helper.h (module 'wifi'): void ns3::QosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
     cls.add_method('SetType', 
                    'void', 
-                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')])
+                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')], 
+                   is_virtual=True)
     ## qos-wifi-mac-helper.h (module 'wifi'): ns3::Ptr<ns3::WifiMac> ns3::QosWifiMacHelper::Create() const [member function]
     cls.add_method('Create', 
                    'ns3::Ptr< ns3::WifiMac >', 
@@ -5747,6 +5753,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -5757,6 +5768,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -5772,6 +5788,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -5797,6 +5818,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
@@ -6868,10 +6894,10 @@
     cls.add_method('SetProbeResp', 
                    'void', 
                    [])
-    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function]
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function]
     cls.add_method('SetQosAckPolicy', 
                    'void', 
-                   [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')])
+                   [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function]
     cls.add_method('SetQosAmsdu', 
                    'void', 
@@ -7010,6 +7036,16 @@
     cls.add_method('SetMaxSize', 
                    'void', 
                    [param('uint32_t', 'maxSize')])
+    ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## wifi-mac-queue.h (module 'wifi'): ns3::Mac48Address ns3::WifiMacQueue::GetAddressForPacket(ns3::WifiMacHeader::AddressType type, std::_List_iterator<ns3::WifiMacQueue::Item> it) [member function]
+    cls.add_method('GetAddressForPacket', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader::AddressType', 'type'), param('std::_List_iterator< ns3::WifiMacQueue::Item >', 'it')], 
+                   visibility='protected')
     return
 
 def register_Ns3WifiMacTrailer_methods(root_module, cls):
@@ -7666,15 +7702,15 @@
                    'void', 
                    [param('bool', 'greenfield')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function]
     cls.add_method('SetGuardInterval', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('bool', 'guardInterval')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function]
     cls.add_method('SetLdpc', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [param('bool', 'ldpc')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
@@ -8280,25 +8316,43 @@
     return
 
 def register_Ns3YansWifiPhy_methods(root_module, cls):
-    ## yans-wifi-phy.h (module 'wifi'): static ns3::TypeId ns3::YansWifiPhy::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::YansWifiPhy::YansWifiPhy(ns3::YansWifiPhy const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::YansWifiPhy const &', 'arg0')])
     ## yans-wifi-phy.h (module 'wifi'): ns3::YansWifiPhy::YansWifiPhy() [constructor]
     cls.add_constructor([])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannel(ns3::Ptr<ns3::YansWifiChannel> channel) [member function]
-    cls.add_method('SetChannel', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::YansWifiChannel >', 'channel')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannelNumber(uint16_t id) [member function]
-    cls.add_method('SetChannelNumber', 
+    ## yans-wifi-phy.h (module 'wifi'): int64_t ns3::YansWifiPhy::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
+    cls.add_method('CalculateSnr', 
+                   'double', 
+                   [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
+    cls.add_method('ConfigureStandard', 
                    'void', 
-                   [param('uint16_t', 'id')], 
+                   [param('ns3::WifiPhyStandard', 'standard')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint16_t ns3::YansWifiPhy::GetChannelNumber() const [member function]
-    cls.add_method('GetChannelNumber', 
-                   'uint16_t', 
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
+    cls.add_method('GetBssMembershipSelector', 
+                   'uint32_t', 
+                   [param('uint32_t', 'selector')], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetCcaMode1Threshold() const [member function]
+    cls.add_method('GetCcaMode1Threshold', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::YansWifiPhy::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::WifiChannel >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetChannelBonding() const [member function]
+    cls.add_method('GetChannelBonding', 
+                   'bool', 
                    [], 
                    is_const=True, is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetChannelFrequencyMhz() const [member function]
@@ -8306,67 +8360,19 @@
                    'double', 
                    [], 
                    is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::StartReceivePacket(ns3::Ptr<ns3::Packet> packet, double rxPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) [member function]
-    cls.add_method('StartReceivePacket', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxNoiseFigure(double noiseFigureDb) [member function]
-    cls.add_method('SetRxNoiseFigure', 
-                   'void', 
-                   [param('double', 'noiseFigureDb')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxPowerStart(double start) [member function]
-    cls.add_method('SetTxPowerStart', 
-                   'void', 
-                   [param('double', 'start')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxPowerEnd(double end) [member function]
-    cls.add_method('SetTxPowerEnd', 
-                   'void', 
-                   [param('double', 'end')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNTxPower(uint32_t n) [member function]
-    cls.add_method('SetNTxPower', 
-                   'void', 
-                   [param('uint32_t', 'n')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxGain(double gain) [member function]
-    cls.add_method('SetTxGain', 
-                   'void', 
-                   [param('double', 'gain')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxGain(double gain) [member function]
-    cls.add_method('SetRxGain', 
-                   'void', 
-                   [param('double', 'gain')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetEdThreshold(double threshold) [member function]
-    cls.add_method('SetEdThreshold', 
-                   'void', 
-                   [param('double', 'threshold')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetCcaMode1Threshold(double threshold) [member function]
-    cls.add_method('SetCcaMode1Threshold', 
-                   'void', 
-                   [param('double', 'threshold')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetErrorRateModel(ns3::Ptr<ns3::ErrorRateModel> rate) [member function]
-    cls.add_method('SetErrorRateModel', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::ErrorRateModel >', 'rate')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetDevice(ns3::Ptr<ns3::Object> device) [member function]
-    cls.add_method('SetDevice', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Object >', 'device')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetMobility(ns3::Ptr<ns3::Object> mobility) [member function]
-    cls.add_method('SetMobility', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Object >', 'mobility')])
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetRxNoiseFigure() const [member function]
-    cls.add_method('GetRxNoiseFigure', 
-                   'double', 
+    ## yans-wifi-phy.h (module 'wifi'): uint16_t ns3::YansWifiPhy::GetChannelNumber() const [member function]
+    cls.add_method('GetChannelNumber', 
+                   'uint16_t', 
                    [], 
-                   is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxGain() const [member function]
-    cls.add_method('GetTxGain', 
-                   'double', 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetDelayUntilIdle() [member function]
+    cls.add_method('GetDelayUntilIdle', 
+                   'ns3::Time', 
                    [], 
-                   is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetRxGain() const [member function]
-    cls.add_method('GetRxGain', 
-                   'double', 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::Object> ns3::YansWifiPhy::GetDevice() const [member function]
+    cls.add_method('GetDevice', 
+                   'ns3::Ptr< ns3::Object >', 
                    [], 
                    is_const=True)
     ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetEdThreshold() const [member function]
@@ -8374,33 +8380,68 @@
                    'double', 
                    [], 
                    is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetCcaMode1Threshold() const [member function]
-    cls.add_method('GetCcaMode1Threshold', 
-                   'double', 
-                   [], 
-                   is_const=True)
     ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::ErrorRateModel> ns3::YansWifiPhy::GetErrorRateModel() const [member function]
     cls.add_method('GetErrorRateModel', 
                    'ns3::Ptr< ns3::ErrorRateModel >', 
                    [], 
                    is_const=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::Object> ns3::YansWifiPhy::GetDevice() const [member function]
-    cls.add_method('GetDevice', 
-                   'ns3::Ptr< ns3::Object >', 
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
+                   'uint32_t', 
                    [], 
-                   is_const=True)
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetGuardInterval() const [member function]
+    cls.add_method('GetGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetLastRxStartTime() const [member function]
+    cls.add_method('GetLastRxStartTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): uint8_t ns3::YansWifiPhy::GetMcs(uint8_t mcs) const [member function]
+    cls.add_method('GetMcs', 
+                   'uint8_t', 
+                   [param('uint8_t', 'mcs')], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::YansWifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
+    cls.add_method('GetMembershipSelectorModes', 
+                   'ns3::WifiModeList', 
+                   [param('uint32_t', 'selector')], 
+                   is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::Object> ns3::YansWifiPhy::GetMobility() [member function]
     cls.add_method('GetMobility', 
                    'ns3::Ptr< ns3::Object >', 
                    [])
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxPowerStart() const [member function]
-    cls.add_method('GetTxPowerStart', 
-                   'double', 
+    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::YansWifiPhy::GetMode(uint32_t mode) const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [param('uint32_t', 'mode')], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNBssMembershipSelectors() const [member function]
+    cls.add_method('GetNBssMembershipSelectors', 
+                   'uint32_t', 
                    [], 
                    is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxPowerEnd() const [member function]
-    cls.add_method('GetTxPowerEnd', 
-                   'double', 
+    ## yans-wifi-phy.h (module 'wifi'): uint8_t ns3::YansWifiPhy::GetNMcs() const [member function]
+    cls.add_method('GetNMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNModes() const [member function]
+    cls.add_method('GetNModes', 
+                   'uint32_t', 
                    [], 
                    is_const=True, is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNTxPower() const [member function]
@@ -8408,216 +8449,213 @@
                    'uint32_t', 
                    [], 
                    is_const=True, 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]
-    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')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetReceiveErrorCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
-    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')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
-    cls.add_method('SendPacket', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::RegisterListener(ns3::WifiPhyListener * listener) [member function]
-    cls.add_method('RegisterListener', 
-                   'void', 
-                   [param('ns3::WifiPhyListener *', 'listener')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateCcaBusy() [member function]
-    cls.add_method('IsStateCcaBusy', 
-                   'bool', 
-                   [], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateIdle() [member function]
-    cls.add_method('IsStateIdle', 
-                   'bool', 
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNumberOfReceiveAntennas() const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
                    [], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateBusy() [member function]
-    cls.add_method('IsStateBusy', 
-                   'bool', 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNumberOfTransmitAntennas() const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
                    [], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateRx() [member function]
-    cls.add_method('IsStateRx', 
-                   'bool', 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetRxGain() const [member function]
+    cls.add_method('GetRxGain', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetRxNoiseFigure() const [member function]
+    cls.add_method('GetRxNoiseFigure', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetStateDuration() [member function]
+    cls.add_method('GetStateDuration', 
+                   'ns3::Time', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateTx() [member function]
-    cls.add_method('IsStateTx', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetStbc() const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxGain() const [member function]
+    cls.add_method('GetTxGain', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxPowerEnd() const [member function]
+    cls.add_method('GetTxPowerEnd', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::GetTxPowerStart() const [member function]
+    cls.add_method('GetTxPowerStart', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): static ns3::TypeId ns3::YansWifiPhy::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateBusy() [member function]
+    cls.add_method('IsStateBusy', 
                    'bool', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateSwitching() [member function]
-    cls.add_method('IsStateSwitching', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateCcaBusy() [member function]
+    cls.add_method('IsStateCcaBusy', 
                    'bool', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetStateDuration() [member function]
-    cls.add_method('GetStateDuration', 
-                   'ns3::Time', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateIdle() [member function]
+    cls.add_method('IsStateIdle', 
+                   'bool', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetDelayUntilIdle() [member function]
-    cls.add_method('GetDelayUntilIdle', 
-                   'ns3::Time', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateRx() [member function]
+    cls.add_method('IsStateRx', 
+                   'bool', 
                    [], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Time ns3::YansWifiPhy::GetLastRxStartTime() const [member function]
-    cls.add_method('GetLastRxStartTime', 
-                   'ns3::Time', 
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateSwitching() [member function]
+    cls.add_method('IsStateSwitching', 
+                   'bool', 
                    [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNModes() const [member function]
-    cls.add_method('GetNModes', 
-                   'uint32_t', 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::IsStateTx() [member function]
+    cls.add_method('IsStateTx', 
+                   'bool', 
                    [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::YansWifiPhy::GetMode(uint32_t mode) const [member function]
-    cls.add_method('GetMode', 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::YansWifiPhy::McsToWifiMode(uint8_t mcs) [member function]
+    cls.add_method('McsToWifiMode', 
                    'ns3::WifiMode', 
-                   [param('uint32_t', 'mode')], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): double ns3::YansWifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
-    cls.add_method('CalculateSnr', 
-                   'double', 
-                   [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::YansWifiPhy::GetChannel() const [member function]
-    cls.add_method('GetChannel', 
-                   'ns3::Ptr< ns3::WifiChannel >', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
-    cls.add_method('ConfigureStandard', 
+                   [param('uint8_t', 'mcs')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::RegisterListener(ns3::WifiPhyListener * listener) [member function]
+    cls.add_method('RegisterListener', 
                    'void', 
-                   [param('ns3::WifiPhyStandard', 'standard')], 
+                   [param('ns3::WifiPhyListener *', 'listener')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): int64_t ns3::YansWifiPhy::AssignStreams(int64_t stream) [member function]
-    cls.add_method('AssignStreams', 
-                   'int64_t', 
-                   [param('int64_t', 'stream')], 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('SendPacket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
                    is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetCcaMode1Threshold(double threshold) [member function]
+    cls.add_method('SetCcaMode1Threshold', 
+                   'void', 
+                   [param('double', 'threshold')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannel(ns3::Ptr<ns3::YansWifiChannel> channel) [member function]
+    cls.add_method('SetChannel', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::YansWifiChannel >', 'channel')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannelBonding(bool channelbonding) [member function]
+    cls.add_method('SetChannelBonding', 
+                   'void', 
+                   [param('bool', 'channelbonding')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannelNumber(uint16_t id) [member function]
+    cls.add_method('SetChannelNumber', 
+                   'void', 
+                   [param('uint16_t', 'id')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetDevice(ns3::Ptr<ns3::Object> device) [member function]
+    cls.add_method('SetDevice', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'device')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetEdThreshold(double threshold) [member function]
+    cls.add_method('SetEdThreshold', 
+                   'void', 
+                   [param('double', 'threshold')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetErrorRateModel(ns3::Ptr<ns3::ErrorRateModel> rate) [member function]
+    cls.add_method('SetErrorRateModel', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::ErrorRateModel >', 'rate')])
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetFrequency(uint32_t freq) [member function]
     cls.add_method('SetFrequency', 
                    'void', 
                    [param('uint32_t', 'freq')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetFrequency() const [member function]
-    cls.add_method('GetFrequency', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
-    cls.add_method('SetNumberOfTransmitAntennas', 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetGreenfield(bool greenfield) [member function]
+    cls.add_method('SetGreenfield', 
                    'void', 
-                   [param('uint32_t', 'tx')], 
+                   [param('bool', 'greenfield')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNumberOfTransmitAntennas() const [member function]
-    cls.add_method('GetNumberOfTransmitAntennas', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetGuardInterval(bool guardInterval) [member function]
+    cls.add_method('SetGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardInterval')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetLdpc(bool ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('bool', 'ldpc')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetMobility(ns3::Ptr<ns3::Object> mobility) [member function]
+    cls.add_method('SetMobility', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Object >', 'mobility')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNTxPower(uint32_t n) [member function]
+    cls.add_method('SetNTxPower', 
+                   'void', 
+                   [param('uint32_t', 'n')])
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
     cls.add_method('SetNumberOfReceiveAntennas', 
                    'void', 
                    [param('uint32_t', 'rx')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNumberOfReceiveAntennas() const [member function]
-    cls.add_method('GetNumberOfReceiveAntennas', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetGuardInterval(bool GuardInterval) [member function]
-    cls.add_method('SetGuardInterval', 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
+    cls.add_method('SetNumberOfTransmitAntennas', 
                    'void', 
-                   [param('bool', 'GuardInterval')], 
+                   [param('uint32_t', 'tx')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetGuardInterval() const [member function]
-    cls.add_method('GetGuardInterval', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetLdpc(bool Ldpc) [member function]
-    cls.add_method('SetLdpc', 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetReceiveErrorCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    cls.add_method('SetReceiveErrorCallback', 
                    'void', 
-                   [param('bool', 'Ldpc')], 
+                   [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'): bool ns3::YansWifiPhy::GetLdpc() const [member function]
-    cls.add_method('GetLdpc', 
-                   'bool', 
-                   [], 
-                   is_const=True, 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]
+    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')], 
+                   is_virtual=True)
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxGain(double gain) [member function]
+    cls.add_method('SetRxGain', 
+                   'void', 
+                   [param('double', 'gain')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxNoiseFigure(double noiseFigureDb) [member function]
+    cls.add_method('SetRxNoiseFigure', 
+                   'void', 
+                   [param('double', 'noiseFigureDb')])
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetStbc(bool stbc) [member function]
     cls.add_method('SetStbc', 
                    'void', 
                    [param('bool', 'stbc')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetStbc() const [member function]
-    cls.add_method('GetStbc', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetGreenfield(bool greenfield) [member function]
-    cls.add_method('SetGreenfield', 
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxGain(double gain) [member function]
+    cls.add_method('SetTxGain', 
                    'void', 
-                   [param('bool', 'greenfield')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetGreenfield() const [member function]
-    cls.add_method('GetGreenfield', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): bool ns3::YansWifiPhy::GetChannelBonding() const [member function]
-    cls.add_method('GetChannelBonding', 
-                   'bool', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetChannelBonding(bool channelbonding) [member function]
-    cls.add_method('SetChannelBonding', 
+                   [param('double', 'gain')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxPowerEnd(double end) [member function]
+    cls.add_method('SetTxPowerEnd', 
                    'void', 
-                   [param('bool', 'channelbonding')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetNBssMembershipSelectors() const [member function]
-    cls.add_method('GetNBssMembershipSelectors', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
-    cls.add_method('GetBssMembershipSelector', 
-                   'uint32_t', 
-                   [param('uint32_t', 'selector')], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::YansWifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
-    cls.add_method('GetMembershipSelectorModes', 
-                   'ns3::WifiModeList', 
-                   [param('uint32_t', 'selector')], 
-                   is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint8_t ns3::YansWifiPhy::GetNMcs() const [member function]
-    cls.add_method('GetNMcs', 
-                   'uint8_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): uint8_t ns3::YansWifiPhy::GetMcs(uint8_t mcs) const [member function]
-    cls.add_method('GetMcs', 
-                   'uint8_t', 
-                   [param('uint8_t', 'mcs')], 
-                   is_const=True, is_virtual=True)
+                   [param('double', 'end')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetTxPowerStart(double start) [member function]
+    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) [member function]
+    cls.add_method('StartReceivePacket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
     ## yans-wifi-phy.h (module 'wifi'): uint32_t ns3::YansWifiPhy::WifiModeToMcs(ns3::WifiMode mode) [member function]
     cls.add_method('WifiModeToMcs', 
                    'uint32_t', 
                    [param('ns3::WifiMode', 'mode')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::YansWifiPhy::McsToWifiMode(uint8_t mcs) [member function]
-    cls.add_method('McsToWifiMode', 
-                   'ns3::WifiMode', 
-                   [param('uint8_t', 'mcs')], 
-                   is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -9721,10 +9759,10 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immeadiateAck) [member function]
+    ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immediateAck) [member function]
     cls.add_method('SetHtImmediateAck', 
                    'void', 
-                   [param('bool', 'immeadiateAck')])
+                   [param('bool', 'immediateAck')])
     ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedFragment(uint16_t seq, uint8_t frag) [member function]
     cls.add_method('SetReceivedFragment', 
                    'void', 
@@ -11155,6 +11193,11 @@
                    'ns3::Time', 
                    [], 
                    is_const=True)
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::IsPromisc() const [member function]
+    cls.add_method('IsPromisc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## mac-low.h (module 'wifi'): void ns3::MacLow::NotifySwitchingStartNow(ns3::Time duration) [member function]
     cls.add_method('NotifySwitchingStartNow', 
                    'void', 
@@ -11239,6 +11282,11 @@
     cls.add_method('StartTransmission', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')])
+    ## mac-low.h (module 'wifi'): ns3::WifiTxVector ns3::MacLow::GetDataTxVector(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr) const [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr')], 
+                   is_const=True, visibility='protected', is_virtual=True)
     ## mac-low.h (module 'wifi'): void ns3::MacLow::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -12360,6 +12408,31 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::DcaTxop> ns3::RegularWifiMac::GetDcaTxop() const [member function]
+    cls.add_method('GetDcaTxop', 
+                   'ns3::Ptr< ns3::DcaTxop >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVOQueue() const [member function]
+    cls.add_method('GetVOQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetVIQueue() const [member function]
+    cls.add_method('GetVIQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBEQueue() const [member function]
+    cls.add_method('GetBEQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr<ns3::EdcaTxopN> ns3::RegularWifiMac::GetBKQueue() const [member function]
+    cls.add_method('GetBKQueue', 
+                   'ns3::Ptr< ns3::EdcaTxopN >', 
+                   [], 
+                   is_const=True, visibility='protected')
     ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('FinishConfigureStandard', 
                    'void', 
@@ -13074,12 +13147,17 @@
     cls.add_method('DoDispose', 
                    'void', 
                    [], 
-                   visibility='private', is_virtual=True)
+                   visibility='protected', is_virtual=True)
     ## wifi-net-device.h (module 'wifi'): void ns3::WifiNetDevice::DoInitialize() [member function]
     cls.add_method('DoInitialize', 
                    'void', 
                    [], 
-                   visibility='private', is_virtual=True)
+                   visibility='protected', is_virtual=True)
+    ## wifi-net-device.h (module 'wifi'): void ns3::WifiNetDevice::ForwardUp(ns3::Ptr<ns3::Packet> packet, ns3::Mac48Address from, ns3::Mac48Address to) [member function]
+    cls.add_method('ForwardUp', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Mac48Address', 'from'), param('ns3::Mac48Address', 'to')], 
+                   visibility='protected')
     return
 
 def register_Ns3YansErrorRateModel_methods(root_module, cls):
@@ -13100,44 +13178,46 @@
     return
 
 def register_Ns3YansWifiChannel_methods(root_module, cls):
-    ## yans-wifi-channel.h (module 'wifi'): static ns3::TypeId ns3::YansWifiChannel::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
+    ## yans-wifi-channel.h (module 'wifi'): ns3::YansWifiChannel::YansWifiChannel(ns3::YansWifiChannel const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::YansWifiChannel const &', 'arg0')])
     ## yans-wifi-channel.h (module 'wifi'): ns3::YansWifiChannel::YansWifiChannel() [constructor]
     cls.add_constructor([])
-    ## yans-wifi-channel.h (module 'wifi'): uint32_t ns3::YansWifiChannel::GetNDevices() const [member function]
-    cls.add_method('GetNDevices', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True, is_virtual=True)
+    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::Add(ns3::Ptr<ns3::YansWifiPhy> phy) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::YansWifiPhy >', 'phy')])
+    ## yans-wifi-channel.h (module 'wifi'): int64_t ns3::YansWifiChannel::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
     ## yans-wifi-channel.h (module 'wifi'): ns3::Ptr<ns3::NetDevice> ns3::YansWifiChannel::GetDevice(uint32_t i) const [member function]
     cls.add_method('GetDevice', 
                    'ns3::Ptr< ns3::NetDevice >', 
                    [param('uint32_t', 'i')], 
                    is_const=True, is_virtual=True)
-    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::Add(ns3::Ptr<ns3::YansWifiPhy> phy) [member function]
-    cls.add_method('Add', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::YansWifiPhy >', 'phy')])
-    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::SetPropagationLossModel(ns3::Ptr<ns3::PropagationLossModel> loss) [member function]
-    cls.add_method('SetPropagationLossModel', 
+    ## yans-wifi-channel.h (module 'wifi'): uint32_t ns3::YansWifiChannel::GetNDevices() const [member function]
+    cls.add_method('GetNDevices', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## yans-wifi-channel.h (module 'wifi'): static ns3::TypeId ns3::YansWifiChannel::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::Send(ns3::Ptr<ns3::YansWifiPhy> sender, ns3::Ptr<ns3::Packet const> packet, double txPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) const [member function]
+    cls.add_method('Send', 
                    'void', 
-                   [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')])
+                   [param('ns3::Ptr< ns3::YansWifiPhy >', 'sender'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'txPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_const=True)
     ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::SetPropagationDelayModel(ns3::Ptr<ns3::PropagationDelayModel> delay) [member function]
     cls.add_method('SetPropagationDelayModel', 
                    'void', 
                    [param('ns3::Ptr< ns3::PropagationDelayModel >', 'delay')])
-    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::Send(ns3::Ptr<ns3::YansWifiPhy> sender, ns3::Ptr<ns3::Packet const> packet, double txPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) const [member function]
-    cls.add_method('Send', 
+    ## yans-wifi-channel.h (module 'wifi'): void ns3::YansWifiChannel::SetPropagationLossModel(ns3::Ptr<ns3::PropagationLossModel> loss) [member function]
+    cls.add_method('SetPropagationLossModel', 
                    'void', 
-                   [param('ns3::Ptr< ns3::YansWifiPhy >', 'sender'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'txPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')], 
-                   is_const=True)
-    ## yans-wifi-channel.h (module 'wifi'): int64_t ns3::YansWifiChannel::AssignStreams(int64_t stream) [member function]
-    cls.add_method('AssignStreams', 
-                   'int64_t', 
-                   [param('int64_t', 'stream')])
+                   [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')])
     return
 
 def register_Ns3AddressChecker_methods(root_module, cls):
diff -Naur ns-3.18.1/src/wifi/doc/wifi.rst ns-3.19/src/wifi/doc/wifi.rst
--- ns-3.18.1/src/wifi/doc/wifi.rst	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/wifi/doc/wifi.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Wifi
 ----
@@ -149,7 +150,7 @@
 loss based on a log distance model with a reference loss of 46.6777 dB at
 reference distance of 1m.
 
-Users will typically type code such as:::
+Users will typically type code such as::
 
   YansWifiChannelHelper wifiChannelHelper = YansWifiChannelHelper::Default ();
   Ptr<WifiChannel> wifiChannel = wifiChannelHelper.Create ();
@@ -174,7 +175,7 @@
 The YansWifiPhyHelper class configures an object factory to create instances of
 a ``YansWifiPhy`` and adds some other objects to it, including possibly a
 supplemental ErrorRateModel and a pointer to a MobilityModel. The user code is
-typically:::
+typically::
 
   YansWifiPhyHelper wifiPhyHelper = YansWifiPhyHelper::Default ();
   wifiPhyHelper.SetChannel (wifiChannel);
@@ -199,7 +200,7 @@
 
 For example the following user code configures a non-QoS MAC that
 will be a non-AP STA in an infrastructure network where the AP has
-SSID ``ns-3-ssid``:::
+SSID ``ns-3-ssid``::
 
     NqosWifiMacHelper wifiMacHelper = NqosWifiMacHelper::Default ();
     Ssid ssid = Ssid ("ns-3-ssid");
@@ -217,7 +218,7 @@
   mechanism should be used) and inactivity timeout.
 
 The following code shows an example use of ``ns3::QosWifiMacHelper`` to 
-create an AP with QoS enabled, aggregation on AC_VO, and Block Ack on AC_BE:::
+create an AP with QoS enabled, aggregation on AC_VO, and Block Ack on AC_BE::
 
   QosWifiMacHelper wifiMacHelper = QosWifiMacHelper::Default ();
   wifiMacHelper.SetType ("ns3::ApWifiMac",
@@ -238,7 +239,7 @@
 
 For example the following user code configures a HT MAC that
 will be a non-AP STA in an infrastructure network where the AP has
-SSID ``ns-3-ssid``:::
+SSID ``ns-3-ssid``::
 
     HtWifiMacHelper wifiMacHelper = HtWifiMacHelper::Default ();
     Ssid ssid = Ssid ("ns-3-ssid");
@@ -252,14 +253,14 @@
 ++++++++++
 
 We're now ready to create WifiNetDevices. First, let's create
-a WifiHelper with default settings:::
+a WifiHelper with default settings::
 
   WifiHelper wifiHelper = WifiHelper::Default ();
 
 What does this do?  It sets the RemoteStationManager to
 ``ns3::ArfWifiManager``.
 Now, let's use the wifiPhyHelper and wifiMacHelper created above to install WifiNetDevices
-on a set of nodes in a NodeContainer "c":::
+on a set of nodes in a NodeContainer "c"::
 
   NetDeviceContainer wifiContainer = WifiHelper::Install (wifiPhyHelper, wifiMacHelper, c);
 
diff -Naur ns-3.18.1/src/wifi/helper/athstats-helper.cc ns-3.19/src/wifi/helper/athstats-helper.cc
--- ns-3.18.1/src/wifi/helper/athstats-helper.cc	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/wifi/helper/athstats-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -105,7 +105,8 @@
 
 
 
-NS_OBJECT_ENSURE_REGISTERED (AthstatsWifiTraceSink);
+NS_OBJECT_ENSURE_REGISTERED (AthstatsWifiTraceSink)
+  ;
 
 TypeId
 AthstatsWifiTraceSink::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/helper/nqos-wifi-mac-helper.h ns-3.19/src/wifi/helper/nqos-wifi-mac-helper.h
--- ns-3.18.1/src/wifi/helper/nqos-wifi-mac-helper.h	2013-11-15 13:50:31.000000000 -0800
+++ ns-3.19/src/wifi/helper/nqos-wifi-mac-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -72,7 +72,7 @@
    * All the attributes specified in this method should exist
    * in the requested mac.
    */
-  void SetType (std::string type,
+  virtual void SetType (std::string type,
                 std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
                 std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
                 std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
@@ -81,6 +81,8 @@
                 std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
                 std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
                 std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
+protected:
+  ObjectFactory m_mac;
 private:
   /**
    * \internal
@@ -89,8 +91,6 @@
    * This method implements the pure virtual method defined in \ref ns3::WifiMacHelper.
    */
   virtual Ptr<WifiMac> Create (void) const;
-
-  ObjectFactory m_mac;
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/wifi/helper/qos-wifi-mac-helper.h ns-3.19/src/wifi/helper/qos-wifi-mac-helper.h
--- ns-3.18.1/src/wifi/helper/qos-wifi-mac-helper.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/helper/qos-wifi-mac-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -77,7 +77,7 @@
    * All the attributes specified in this method should exist
    * in the requested mac.
    */
-  void SetType (std::string type,
+  virtual void SetType (std::string type,
                 std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
                 std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
                 std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
@@ -131,6 +131,8 @@
    * \param timeout number of block of 1024 microseconds.
    */
   void SetBlockAckInactivityTimeoutForAc (enum AcIndex ac, uint16_t timeout);
+protected:
+  ObjectFactory m_mac;
 private:
   /**
    * \internal
@@ -141,8 +143,6 @@
   virtual Ptr<WifiMac> Create (void) const;
   void Setup (Ptr<WifiMac> mac, enum AcIndex ac, std::string dcaAttrName) const;
 
-
-  ObjectFactory m_mac;
   std::map<AcIndex, ObjectFactory> m_aggregators;
   /*
    * Next maps contain, for every access category, the values for
diff -Naur ns-3.18.1/src/wifi/helper/wifi-helper.cc ns-3.19/src/wifi/helper/wifi-helper.cc
--- ns-3.18.1/src/wifi/helper/wifi-helper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/helper/wifi-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -52,6 +52,10 @@
 {
 }
 
+WifiHelper::~WifiHelper ()
+{
+}
+
 WifiHelper::WifiHelper ()
   : m_standard (WIFI_PHY_STANDARD_80211a)
 {
diff -Naur ns-3.18.1/src/wifi/helper/wifi-helper.h ns-3.19/src/wifi/helper/wifi-helper.h
--- ns-3.18.1/src/wifi/helper/wifi-helper.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/helper/wifi-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -88,6 +88,8 @@
 class WifiHelper
 {
 public:
+  virtual ~WifiHelper ();
+
   /**
    * Create a Wifi helper in an empty state: all its parameters
    * must be set before calling ns3::WifiHelper::Install
@@ -140,7 +142,7 @@
    * \param c the set of nodes on which a wifi device must be created
    * \returns a device container which contains all the devices created by this method.
    */
-  NetDeviceContainer Install (const WifiPhyHelper &phy,
+  virtual NetDeviceContainer Install (const WifiPhyHelper &phy,
                               const WifiMacHelper &mac, NodeContainer c) const;
   /**
    * \param phy the PHY helper to create PHY objects
@@ -148,7 +150,7 @@
    * \param node the node on which a wifi device must be created
    * \returns a device container which contains all the devices created by this method.
    */
-  NetDeviceContainer Install (const WifiPhyHelper &phy,
+  virtual NetDeviceContainer Install (const WifiPhyHelper &phy,
                               const WifiMacHelper &mac, Ptr<Node> node) const;
   /**
    * \param phy the PHY helper to create PHY objects
@@ -156,7 +158,7 @@
    * \param nodeName the name of node on which a wifi device must be created
    * \returns a device container which contains all the devices created by this method.
    */
-  NetDeviceContainer Install (const WifiPhyHelper &phy,
+  virtual NetDeviceContainer Install (const WifiPhyHelper &phy,
                               const WifiMacHelper &mac, std::string nodeName) const;
 
   /**
@@ -164,7 +166,7 @@
    *
    * By default, all objects are configured for 802.11a
    */
-  void SetStandard (enum WifiPhyStandard standard);
+  virtual void SetStandard (enum WifiPhyStandard standard);
 
   /**
    * Helper to enable all WifiNetDevice log components with one statement
@@ -187,7 +189,7 @@
   */
   int64_t AssignStreams (NetDeviceContainer c, int64_t stream);
 
-private:
+protected:
   ObjectFactory m_stationManager;
   enum WifiPhyStandard m_standard;
 };
diff -Naur ns-3.18.1/src/wifi/model/aarfcd-wifi-manager.cc ns-3.19/src/wifi/model/aarfcd-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/aarfcd-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/aarfcd-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,6 +34,12 @@
 
 namespace ns3 {
 
+/**
+ * \brief hold per-remote-station state for AARF-CD Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the AARF-CD Wifi manager
+ */
 struct AarfcdWifiRemoteStation : public WifiRemoteStation
 {
   uint32_t m_timer;
@@ -53,7 +59,8 @@
   bool m_haveASuccess;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (AarfcdWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (AarfcdWifiManager)
+  ;
 
 TypeId
 AarfcdWifiManager::GetTypeId (void)
@@ -148,15 +155,7 @@
 {
   NS_LOG_FUNCTION (this << station);
 }
-/**
- * It is important to realize that "recovery" mode starts after failure of
- * the first transmission after a rate increase and ends at the first successful
- * transmission. Specifically, recovery mode transcends retransmissions boundaries.
- * Fundamentally, ARF handles each data transmission independently, whether it
- * is the initial transmission of a packet or the retransmission of a packet.
- * The fundamental reason for this is that there is a backoff between each data
- * transmission, be it an initial transmission or a retransmission.
- */
+
 void
 AarfcdWifiManager::DoReportDataFailed (WifiRemoteStation *st)
 {
diff -Naur ns-3.18.1/src/wifi/model/aarfcd-wifi-manager.h ns-3.19/src/wifi/model/aarfcd-wifi-manager.h
--- ns-3.18.1/src/wifi/model/aarfcd-wifi-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/aarfcd-wifi-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -47,7 +47,19 @@
   virtual WifiRemoteStation * DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station,
                              double rxSnr, WifiMode txMode);
+
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
+  /**
+   * It is important to realize that "recovery" mode starts after failure of
+   * the first transmission after a rate increase and ends at the first successful
+   * transmission. Specifically, recovery mode transcends retransmissions boundaries.
+   * Fundamentally, ARF handles each data transmission independently, whether it
+   * is the initial transmission of a packet or the retransmission of a packet.
+   * The fundamental reason for this is that there is a backoff between each data
+   * transmission, be it an initial transmission or a retransmission.
+   *
+   * \param station the station that we failed to send DATA
+   */
   virtual void DoReportDataFailed (WifiRemoteStation *station);
   virtual void DoReportRtsOk (WifiRemoteStation *station,
                               double ctsSnr, WifiMode ctsMode, double rtsSnr);
@@ -61,10 +73,35 @@
                           Ptr<const Packet> packet, bool normally);
   virtual bool IsLowLatency (void) const;
 
+  /**
+   * Check if the use of RTS for the given station can be turned off.
+   *
+   * \param station the station that we are checking
+   */
   void CheckRts (AarfcdWifiRemoteStation *station);
+  /**
+   * Increase the RTS window size of the given station.
+   *
+   * \param station the station to increase RTS window
+   */
   void IncreaseRtsWnd (AarfcdWifiRemoteStation *station);
+  /**
+   * Reset the RTS window of the given station.
+   *
+   * \param station the station to reset RTS window
+   */
   void ResetRtsWnd (AarfcdWifiRemoteStation *station);
+  /**
+   * Turn off RTS for the given station.
+   *
+   * \param station the station to turn RTS off
+   */
   void TurnOffRts (AarfcdWifiRemoteStation *station);
+  /**
+   * Turn on RTS for the given station.
+   *
+   * \param station the station to turn RTS on
+   */
   void TurnOnRts (AarfcdWifiRemoteStation *station);
 
   // aarf fields below
diff -Naur ns-3.18.1/src/wifi/model/aarf-wifi-manager.cc ns-3.19/src/wifi/model/aarf-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/aarf-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/aarf-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,6 +31,12 @@
 
 namespace ns3 {
 
+/**
+ * \brief hold per-remote-station state for AARF Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the AARF Wifi manager
+ */
 struct AarfWifiRemoteStation : public WifiRemoteStation
 {
   uint32_t m_timer;
@@ -46,7 +52,8 @@
 };
 
 
-NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager)
+  ;
 
 TypeId
 AarfWifiManager::GetTypeId (void)
@@ -122,6 +129,8 @@
  * is the initial transmission of a packet or the retransmission of a packet.
  * The fundamental reason for this is that there is a backoff between each data
  * transmission, be it an initial transmission or a retransmission.
+ *
+ * \param st the station that we failed to send DATA
  */
 void
 AarfWifiManager::DoReportDataFailed (WifiRemoteStation *st)
diff -Naur ns-3.18.1/src/wifi/model/adhoc-wifi-mac.cc ns-3.19/src/wifi/model/adhoc-wifi-mac.cc
--- ns-3.18.1/src/wifi/model/adhoc-wifi-mac.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/adhoc-wifi-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -40,7 +40,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac);
+NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac)
+  ;
 
 TypeId
 AdhocWifiMac::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/amrr-wifi-manager.cc ns-3.19/src/wifi/model/amrr-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/amrr-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/amrr-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,6 +30,12 @@
 
 namespace ns3 {
 
+/**
+ * \brief hold per-remote-station state for AMRR Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the AMRR Wifi manager
+ */
 struct AmrrWifiRemoteStation : public WifiRemoteStation
 {
   Time m_nextModeUpdate;
@@ -44,7 +50,8 @@
 };
 
 
-NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager)
+  ;
 
 TypeId
 AmrrWifiManager::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/amrr-wifi-manager.h ns-3.19/src/wifi/model/amrr-wifi-manager.h
--- ns-3.18.1/src/wifi/model/amrr-wifi-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/amrr-wifi-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -60,15 +60,78 @@
   virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
   virtual bool IsLowLatency (void) const;
 
-  void UpdateRetry (AmrrWifiRemoteStation *station);
+  //void UpdateRetry (AmrrWifiRemoteStation *station);
+  /**
+   * Update the mode used to send to the given station.
+   *
+   * \param station
+   */
   void UpdateMode (AmrrWifiRemoteStation *station);
+  /**
+   * Reset transmission statistics of the given station.
+   *
+   * \param station
+   */
   void ResetCnt (AmrrWifiRemoteStation *station);
+  /**
+   * Increase the transmission rate to the given station.
+   *
+   * \param station
+   */
   void IncreaseRate (AmrrWifiRemoteStation *station);
+  /**
+   * Decrease the transmission rate to the given station.
+   *
+   * \param station
+   */
   void DecreaseRate (AmrrWifiRemoteStation *station);
+  /**
+   * Check if the current rate for the given station is the
+   * minimum rate.
+   *
+   * \param station
+   * \return true if the current rate is the minimum rate,
+   *         false otherwise
+   */
   bool IsMinRate (AmrrWifiRemoteStation *station) const;
+  /**
+   * Check if the current rate for the given station is the
+   * maximum rate.
+   *
+   * \param station
+   * \return true if the current rate is the maximum rate,
+   *         false otherwise
+   */
   bool IsMaxRate (AmrrWifiRemoteStation *station) const;
+  /**
+   * Check if the number of retransmission and transmission error
+   * is less than the number of successful transmission (times ratio).
+   *
+   * \param station
+   * \return true if the number of retransmission and transmission error
+   *              is less than the number of successful transmission
+   *              (times ratio), false otherwise
+   */
   bool IsSuccess (AmrrWifiRemoteStation *station) const;
+  /**
+   * Check if the number of retransmission and transmission error
+   * is greater than the number of successful transmission (times ratio).
+   *
+   * \param station
+   * \return true if the number of retransmission and transmission error
+   *              is less than the number of successful transmission
+   *              (times ratio), false otherwise
+   */
   bool IsFailure (AmrrWifiRemoteStation *station) const;
+  /**
+   * Check if the number of retransmission, transmission error,
+   * and successful transmission are greater than 10.
+   *
+   * \param station
+   * \return true if the number of retransmission, transmission error,
+   *         and successful transmission are greater than 10,
+   *         false otherwise
+   */
   bool IsEnough (AmrrWifiRemoteStation *station) const;
 
   Time m_updatePeriod;
diff -Naur ns-3.18.1/src/wifi/model/amsdu-subframe-header.cc ns-3.19/src/wifi/model/amsdu-subframe-header.cc
--- ns-3.18.1/src/wifi/model/amsdu-subframe-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/amsdu-subframe-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (AmsduSubframeHeader);
+NS_OBJECT_ENSURE_REGISTERED (AmsduSubframeHeader)
+  ;
 
 TypeId
 AmsduSubframeHeader::GetTypeId ()
diff -Naur ns-3.18.1/src/wifi/model/ap-wifi-mac.cc ns-3.19/src/wifi/model/ap-wifi-mac.cc
--- ns-3.18.1/src/wifi/model/ap-wifi-mac.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ap-wifi-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -42,7 +42,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ApWifiMac);
+NS_OBJECT_ENSURE_REGISTERED (ApWifiMac)
+  ;
 
 TypeId
 ApWifiMac::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/ap-wifi-mac.h ns-3.19/src/wifi/model/ap-wifi-mac.h
--- ns-3.18.1/src/wifi/model/ap-wifi-mac.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ap-wifi-mac.h	2013-12-20 09:44:50.000000000 -0800
@@ -88,7 +88,7 @@
    */
   void SetBeaconInterval (Time interval);
   /**
-   * \returns the interval between two beacon transmissions.
+   * \return the interval between two beacon transmissions.
    */
   Time GetBeaconInterval (void) const;
   /**
@@ -108,7 +108,23 @@
 
 private:
   virtual void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
+  /**
+   * The packet we sent was successfully received by the receiver
+   * (i.e. we received an ACK from the receiver).  If the packet
+   * was an association response to the receiver, we record that
+   * the receiver is now associated with us.
+   * 
+   * \param hdr the header of the packet that we successfully sent
+   */
   virtual void TxOk (const WifiMacHeader &hdr);
+  /**
+   * The packet we sent was successfully received by the receiver
+   * (i.e. we did not receive an ACK from the receiver).  If the packet
+   * was an association response to the receiver, we record that
+   * the receiver is not associated with us yet.
+   *
+   * \param hdr the header of the packet that we failed to sent
+   */
   virtual void TxFailed (const WifiMacHeader &hdr);
 
   /**
@@ -123,24 +139,77 @@
   virtual void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket,
                                            const WifiMacHeader *hdr);
 
+  /**
+   * Forward the packet down to DCF/EDCAF (enqueue the packet). This method
+   * is a wrapper for ForwardDown with traffic id.
+   *
+   * \param packet the packet we are forwarding to DCF/EDCAF
+   * \param from the address to be used for Address 3 field in the header
+   * \param to the address to be used for Address 1 field in the header
+   */
   void ForwardDown (Ptr<const Packet> packet, Mac48Address from, Mac48Address to);
+  /**
+   * Forward the packet down to DCF/EDCAF (enqueue the packet).
+   *
+   * \param packet the packet we are forwarding to DCF/EDCAF
+   * \param from the address to be used for Address 3 field in the header
+   * \param to the address to be used for Address 1 field in the header
+   * \param tid the traffic id for the packet
+   */
   void ForwardDown (Ptr<const Packet> packet, Mac48Address from, Mac48Address to, uint8_t tid);
+  /**
+   * Forward a probe response packet to the DCF. The standard is not clear on the correct
+   * queue for management frames if QoS is supported. We always use the DCF.
+   *
+   * \param to the address of the STA we are sending a probe response to
+   */
   void SendProbeResp (Mac48Address to);
+  /**
+   * Forward an association response packet to the DCF. The standard is not clear on the correct
+   * queue for management frames if QoS is supported. We always use the DCF.
+   *
+   * \param to the address of the STA we are sending an association response to
+   * \param success indicates whether the association was successful or not
+   */
   void SendAssocResp (Mac48Address to, bool success);
+  /**
+   * Forward a beacon packet to the beacon special DCF.
+   */
   void SendOneBeacon (void);
+  /**
+   * Return the HT capability of the current AP.
+   * 
+   * \return the HT capability that we support
+   */
   HtCapabilities GetHtCapabilities (void) const;
+  /**
+   * Return an instance of SupportedRates that contains all rates that we support
+   * including HT rates.
+   *
+   * \return SupportedRates all rates that we support
+   */
   SupportedRates GetSupportedRates (void) const;
+  /**
+   * Enable or disable beacon generation of the AP.
+   *
+   * \param enable enable or disable beacon generation
+   */
   void SetBeaconGeneration (bool enable);
+  /**
+   * Return whether the AP is generating beacons.
+   *
+   * \return true if beacons are periodically generated, false otherwise
+   */
   bool GetBeaconGeneration (void) const;
   virtual void DoDispose (void);
   virtual void DoInitialize (void);
 
-  Ptr<DcaTxop> m_beaconDca;
-  Time m_beaconInterval;
-  bool m_enableBeaconGeneration;
-  EventId m_beaconEvent;
-  Ptr<UniformRandomVariable> m_beaconJitter;
-  bool m_enableBeaconJitter;
+  Ptr<DcaTxop> m_beaconDca; //!< Dedicated DcaTxop for beacons
+  Time m_beaconInterval; //!< Interval between beacons
+  bool m_enableBeaconGeneration; //!< Flag if beacons are being generated
+  EventId m_beaconEvent; //!< Event to generate one beacon
+  Ptr<UniformRandomVariable> m_beaconJitter; //!< UniformRandomVariable used to randomize the time of the first beacon
+  bool m_enableBeaconJitter; //!< Flag if the first beacon should be generated at random time
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/wifi/model/arf-wifi-manager.cc ns-3.19/src/wifi/model/arf-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/arf-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/arf-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,6 +30,12 @@
 
 namespace ns3 {
 
+/**
+ * \brief hold per-remote-station state for ARF Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the ARF Wifi manager
+ */
 struct ArfWifiRemoteStation : public WifiRemoteStation
 {
   uint32_t m_timer;
@@ -44,7 +50,8 @@
   uint32_t m_rate;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager)
+  ;
 
 TypeId
 ArfWifiManager::GetTypeId (void)
@@ -104,6 +111,8 @@
  * is the initial transmission of a packet or the retransmission of a packet.
  * The fundamental reason for this is that there is a backoff between each data
  * transmission, be it an initial transmission or a retransmission.
+ *
+ * \param st the station that we failed to send DATA
  */
 void
 ArfWifiManager::DoReportDataFailed (WifiRemoteStation *st)
diff -Naur ns-3.18.1/src/wifi/model/block-ack-agreement.h ns-3.19/src/wifi/model/block-ack-agreement.h
--- ns-3.18.1/src/wifi/model/block-ack-agreement.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/block-ack-agreement.h	2013-12-20 09:44:50.000000000 -0800
@@ -33,22 +33,96 @@
   friend class MacLow;
 public:
   BlockAckAgreement ();
+  /**
+   * Constructor for BlockAckAgreement with given peer and TID.
+   *
+   * \param peer
+   * \param tid
+   */
   BlockAckAgreement (Mac48Address peer, uint8_t tid);
   ~BlockAckAgreement ();
+  /**
+   * Set buffer size.
+   *
+   * \param bufferSize
+   */
   void SetBufferSize (uint16_t bufferSize);
+  /**
+   * Set timeout.
+   *
+   * \param timeout
+   */
   void SetTimeout (uint16_t timeout);
+  /**
+   * Set starting sequence number.
+   *
+   * \param seq the starting sequence number
+   */
   void SetStartingSequence (uint16_t seq);
+  /**
+   * Set Block ACK policy to immediate ACK.
+   */
   void SetImmediateBlockAck (void);
+  /**
+   * Set Block ACK policy to delayed ACK.
+   */
   void SetDelayedBlockAck (void);
+  /**
+   * Enable or disable A-MSDU support.
+   *
+   * \param supported enable or disable A-MSDU support
+   */
   void SetAmsduSupport (bool supported);
 
+  /**
+   * Return the Traffic ID (TID).
+   *
+   * \return TID
+   */
   uint8_t GetTid (void) const;
+  /**
+   * Return the peer address.
+   *
+   * \return Mac48Address
+   */
   Mac48Address GetPeer (void) const;
+  /**
+   * Return the buffer size.
+   *
+   * \return buffer size
+   */
   uint16_t GetBufferSize (void) const;
+  /**
+   * Return the timeout.
+   *
+   * \return timeout
+   */
   uint16_t GetTimeout (void) const;
+  /**
+   * Return the starting squence number.
+   *
+   * \return starting sequence number
+   */
   uint16_t GetStartingSequence (void) const;
+  /**
+   * Return the starting squence control
+   *
+   * \return starting sequence control
+   */
   uint16_t GetStartingSequenceControl (void) const;
+  /**
+   * Check whether the current ACK policy is immediate block ACK.
+   *
+   * \return true if the current ACK policy is immediate block ACK,
+   *         false otherwise
+   */
   bool IsImmediateBlockAck (void) const;
+  /**
+   * Check whether A-MSDU is supported
+   *
+   * \return true if A-MSDU is supported,
+   *         false otherwise
+   */
   bool IsAmsduSupported (void) const;
 
 protected:
diff -Naur ns-3.18.1/src/wifi/model/block-ack-manager.h ns-3.19/src/wifi/model/block-ack-manager.h
--- ns-3.18.1/src/wifi/model/block-ack-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/block-ack-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -47,6 +47,15 @@
 struct Bar
 {
   Bar ();
+  /**
+   * Construct Block ACK request for a given packet,
+   * receiver address, Traffic ID, and ACK policy.
+   *
+   * \param packet
+   * \param recipient
+   * \param tid
+   * \param immediate
+   */
   Bar (Ptr<const Packet> packet,
        Mac48Address recipient,
        uint8_t tid,
@@ -73,6 +82,7 @@
   /**
    * \param recipient Address of peer station involved in block ack mechanism.
    * \param tid Traffic ID.
+   * \return true  if a block ack agreement exists, false otherwise
    *
    * Checks if a block ack agreement exists with station addressed by
    * <i>recipient</i> for tid <i>tid</i>.
@@ -82,7 +92,8 @@
    * \param recipient Address of peer station involved in block ack mechanism.
    * \param tid Traffic ID.
    * \param state The state for block ack agreement
-
+   * \return true if a block ack agreement exists, false otherwise
+   *
    * Checks if a block ack agreement with a state equals to <i>state</i> exists with
    * station addressed by <i>recipient</i> for tid <i>tid</i>.
    */
@@ -122,6 +133,7 @@
   void StorePacket (Ptr<const Packet> packet, const WifiMacHeader &hdr, Time tStamp);
   /**
    * \param hdr 802.11 header of returned packet (if exists).
+   * \return the packet
    *
    * This methods returns a packet (if exists) indicated as not received in
    * corresponding block ack bitmap.
@@ -131,6 +143,9 @@
   /**
    * Returns true if there are packets that need of retransmission or at least a
    * BAR is scheduled. Returns false otherwise.
+   *
+   * \return true if there are packets that need of retransmission or at least a
+   *         BAR is scheduled, false otherwise
    */
   bool HasPackets (void) const;
   /**
@@ -146,6 +161,7 @@
   /**
    * \param recipient Address of peer station involved in block ack mechanism.
    * \param tid Traffic ID.
+   * \return the number of packets buffered for a specified agreement
    *
    * Returns number of packets buffered for a specified agreement. This methods doesn't return
    * number of buffered MPDUs but number of buffered MSDUs.
@@ -154,6 +170,7 @@
   /**
    * \param recipient Address of peer station involved in block ack mechanism.
    * \param tid Traffic ID.
+   * \return the number of packets for a specific agreement that need retransmission
    *
    * Returns number of packets for a specific agreement that need retransmission.
    * This method doesn't return number of MPDUs that need retransmission but number of MSDUs.
@@ -216,12 +233,16 @@
   /**
    * \param sequenceNumber Sequence number of the packet which fragment is
    * part of.
+   * \return true if another fragment with the given sequence number is scheduled
+   * for retransmission.
    *
    * Returns true if another fragment with sequence number <i>sequenceNumber</i> is scheduled
    * for retransmission.
    */
   bool HasOtherFragments (uint16_t sequenceNumber) const;
   /**
+   * \return the size of the next packet that needs retransmission
+   *
    * Returns size of the next packet that needs retransmission.
    */
   uint32_t GetNextPacketSize (void) const;
@@ -238,6 +259,12 @@
   void SetBlockDestinationCallback (Callback<void, Mac48Address, uint8_t> callback);
   void SetUnblockDestinationCallback (Callback<void, Mac48Address, uint8_t> callback);
   /**
+   * \param recipient
+   * \param tid
+   * \param startingSeq
+   * \return true if there are packets in the queue that could be sent under block ACK,
+   *         false otherwise
+   *
    * Checks if there are in the queue other packets that could be send under block ack.
    * If yes adds these packets in current block ack exchange.
    * However, number of packets exchanged in the current block ack, will not exceed
@@ -245,6 +272,10 @@
    */
   bool SwitchToBlockAckIfNeeded (Mac48Address recipient, uint8_t tid, uint16_t startingSeq);
   /**
+   * \param recipient
+   * \param tid
+   * \return the sequence number of the next retry packet for a specific agreement
+   *
    * Returns the sequence number of the next retry packet for a specific agreement.
    * If there are no packets that need retransmission for the specified agreement or
    * the agreement doesn't exist the function returns 4096;
@@ -252,6 +283,10 @@
   uint16_t GetSeqNumOfNextRetryPacket (Mac48Address recipient, uint8_t tid) const;
 private:
   /**
+   * \param recipient
+   * \param tid
+   * \return a packet
+   *
    * Checks if all packets, for which a block ack agreement was established or refreshed,
    * have been transmitted. If yes, adds a pair in m_bAckReqs to indicate that
    * at next channel access a block ack request (for established agreement
@@ -265,17 +300,39 @@
   void InactivityTimeout (Mac48Address, uint8_t);
 
   struct Item;
+  /**
+   * typedef for a list of Item struct.
+   */
   typedef std::list<Item> PacketQueue;
+  /**
+   * typedef for an iterator for PacketQueue.
+   */
   typedef std::list<Item>::iterator PacketQueueI;
+  /**
+   * typedef for a const iterator for PacketQueue.
+   */
   typedef std::list<Item>::const_iterator PacketQueueCI;
 
+  /**
+   * typedef for a map between MAC address and block ACK agreement.
+   */
   typedef std::map<std::pair<Mac48Address, uint8_t>,
                    std::pair<OriginatorBlockAckAgreement, PacketQueue> > Agreements;
+  /**
+   * typedef for an iterator for Agreements.
+   */
   typedef std::map<std::pair<Mac48Address, uint8_t>,
                    std::pair<OriginatorBlockAckAgreement, PacketQueue> >::iterator AgreementsI;
+  /**
+   * typedef for a const iterator for Agreements.
+   */
   typedef std::map<std::pair<Mac48Address, uint8_t>,
                    std::pair<OriginatorBlockAckAgreement, PacketQueue> >::const_iterator AgreementsCI;
 
+  /**
+   * A struct for packet, Wifi header, and timestamp.
+   * Used in queue by block ACK manager.
+   */
   struct Item
   {
     Item ();
diff -Naur ns-3.18.1/src/wifi/model/capability-information.h ns-3.19/src/wifi/model/capability-information.h
--- ns-3.18.1/src/wifi/model/capability-information.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/capability-information.h	2013-12-20 09:44:50.000000000 -0800
@@ -28,25 +28,84 @@
 /**
  * \ingroup wifi
  *
- *
+ * Capability information
  */
 class CapabilityInformation
 {
 public:
   CapabilityInformation ();
 
+  /**
+   * Set the Extended Service Set (ESS) bit
+   * in the capability information field.
+   */
   void SetEss (void);
+  /**
+   * Set the Independent BSS (IBSS) bit
+   * in the capability information field.
+   */
   void SetIbss (void);
 
+  /**
+   * Check if the Extended Service Set (ESS) bit
+   * in the capability information field is set to 1.
+   *
+   * \return ESS bit in the capability information
+   *         field is set to 1
+   */
   bool IsEss (void) const;
+  /**
+   * Check if the Independent BSS (IBSS) bit
+   * in the capability information field is set to 1.
+   *
+   * \return IBSS bit in the capability information
+   *         field is set to 1
+   */
   bool IsIbss (void) const;
 
+  /**
+   * Return the serialized size of capability 
+   * information.
+   *
+   * \return the serialized size
+   */
   uint32_t GetSerializedSize (void) const;
+  /**
+   * Serialize capability information to the given buffer.
+   *
+   * \param start an iterator to a buffer
+   * \return an iterator to a buffer after capability information
+   *         was serialized
+   */
   Buffer::Iterator Serialize (Buffer::Iterator start) const;
+  /**
+   * Deserialize capability information from the given buffer.
+   *
+   * \param start an iterator to a buffer
+   * \return an iterator to a buffer after capability information
+   *         was deserialized
+   */
   Buffer::Iterator Deserialize (Buffer::Iterator start);
 private:
+  /**
+   * Check if bit n is set to 1.
+   *
+   * \param n the bit position
+   * \return true if bit n is set to 1,
+   *         false otherwise
+   */
   bool Is (uint8_t n) const;
+  /**
+   * Set bit n to 1.
+   *
+   * \param n the bit position
+   */
   void Set (uint8_t n);
+  /**
+   * Set bit n to 0.
+   *
+   * \param n the bit position
+   */
   void Clear (uint8_t n);
   uint16_t m_capability;
 };
diff -Naur ns-3.18.1/src/wifi/model/cara-wifi-manager.cc ns-3.19/src/wifi/model/cara-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/cara-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/cara-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,12 @@
 
 namespace ns3 {
 
+/**
+ * \brief hold per-remote-station state for CARA Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the CARA Wifi manager
+ */
 struct CaraWifiRemoteStation : public WifiRemoteStation
 {
   uint32_t m_timer;
@@ -40,7 +46,8 @@
   uint32_t m_rate;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (CaraWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (CaraWifiManager)
+  ;
 
 TypeId
 CaraWifiManager::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/constant-rate-wifi-manager.cc ns-3.19/src/wifi/model/constant-rate-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/constant-rate-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/constant-rate-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager)
+  ;
 
 TypeId
 ConstantRateWifiManager::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/constant-rate-wifi-manager.h ns-3.19/src/wifi/model/constant-rate-wifi-manager.h
--- ns-3.18.1/src/wifi/model/constant-rate-wifi-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/constant-rate-wifi-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -57,8 +57,8 @@
   virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
   virtual bool IsLowLatency (void) const;
 
-  WifiMode m_dataMode;
-  WifiMode m_ctlMode;
+  WifiMode m_dataMode; //!< Wifi mode for unicast DATA frames
+  WifiMode m_ctlMode; //!< Wifi mode for request control frames
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/wifi/model/ctrl-headers.cc ns-3.19/src/wifi/model/ctrl-headers.cc
--- ns-3.18.1/src/wifi/model/ctrl-headers.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ctrl-headers.cc	2013-12-20 09:44:50.000000000 -0800
@@ -30,7 +30,8 @@
  *       Block ack request
  ***********************************/
 
-NS_OBJECT_ENSURE_REGISTERED (CtrlBAckRequestHeader);
+NS_OBJECT_ENSURE_REGISTERED (CtrlBAckRequestHeader)
+  ;
 
 CtrlBAckRequestHeader::CtrlBAckRequestHeader ()
   : m_barAckPolicy (false),
@@ -278,7 +279,8 @@
  *       Block ack response
  ***********************************/
 
-NS_OBJECT_ENSURE_REGISTERED (CtrlBAckResponseHeader);
+NS_OBJECT_ENSURE_REGISTERED (CtrlBAckResponseHeader)
+  ;
 
 CtrlBAckResponseHeader::CtrlBAckResponseHeader ()
   : m_baAckPolicy (false),
diff -Naur ns-3.18.1/src/wifi/model/ctrl-headers.h ns-3.19/src/wifi/model/ctrl-headers.h
--- ns-3.18.1/src/wifi/model/ctrl-headers.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ctrl-headers.h	2013-12-20 09:44:50.000000000 -0800
@@ -24,6 +24,9 @@
 
 namespace ns3 {
 
+/**
+ * Enumeration for different block ACK policies.
+ */
 enum BlockAckType
 {
   BASIC_BLOCK_ACK,
@@ -55,23 +58,101 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
+  /**
+   * Enable or disable HT immediate ACK.
+   *
+   * \param immediateAck enable or disable HT immediate ACK
+   */
   void SetHtImmediateAck (bool immediateAck);
+  /**
+   * Set the block ACK type.
+   *
+   * \param type
+   */
   void SetType (enum BlockAckType type);
+  /**
+   * Set Traffic ID (TID).
+   *
+   * \param tid
+   */
   void SetTidInfo (uint8_t tid);
+  /**
+   * Set the starting sequence number from the given 
+   * raw sequence control field.
+   *
+   * \param seq the raw sequence control 
+   */
   void SetStartingSequence (uint16_t seq);
 
+  /**
+   * Check if the current ACK policy is immediate.
+   *
+   * \return true if the current ACK policy is immediate,
+   *         false otherwise
+   */
   bool MustSendHtImmediateAck (void) const;
+  /**
+   * Return the Traffic ID (TID).
+   *
+   * \return TID
+   */
   uint8_t GetTidInfo (void) const;
+  /**
+   * Return the starting sequence number.
+   *
+   * \return the starting sequence number
+   */
   uint16_t GetStartingSequence (void) const;
+  /**
+   * Check if the current ACK policy is basic
+   * (i.e. not multiple TID and not compressed ACK).
+   *
+   * \return true if the current ACK policy is basic,
+   *         false otherwise
+   */
   bool IsBasic (void) const;
+  /**
+   * Check if the current ACK policy is compressed ACK
+   * and not multiple TID.
+   *
+   * \return true if the current ACK policy is compressed ACK,
+   *         false otherwise
+   */
   bool IsCompressed (void) const;
+  /**
+   * Check if the current ACK policy has multiple TID.
+   *
+   * \return true if the current ACK policy has multiple TID,
+   *         false otherwise
+   */
   bool IsMultiTid (void) const;
 
+  /**
+   * Return the starting sequence control.
+   *
+   * \return the starting sequence control
+   */
   uint16_t GetStartingSequenceControl (void) const;
 
 private:
+  /**
+   * Set the starting sequence control with the given
+   * sequence control value
+   *
+   * \param seqControl
+   */
   void SetStartingSequenceControl (uint16_t seqControl);
+  /**
+   * Return the Block ACK control.
+   *
+   * \return the Block ACK control
+   */
   uint16_t GetBarControl (void) const;
+  /**
+   * Set the Block ACK control.
+   *
+   * \param bar
+   */
   void SetBarControl (uint16_t bar);
 
   /**
@@ -111,35 +192,169 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
-  void SetHtImmediateAck (bool immeadiateAck);
+  /**
+   * Enable or disable HT immediate ACK.
+   *
+   * \param immediateAck enable or disable HT immediate ACK
+   */
+  void SetHtImmediateAck (bool immediateAck);
+  /**
+   * Set the block ACK type.
+   *
+   * \param type
+   */
   void SetType (enum BlockAckType type);
+  /**
+   * Set Traffic ID (TID).
+   *
+   * \param tid
+   */
   void SetTidInfo (uint8_t tid);
+  /**
+   * Set the starting sequence number from the given 
+   * raw sequence control field.
+   *
+   * \param seq the raw sequence control 
+   */
   void SetStartingSequence (uint16_t seq);
 
+  /**
+   * Check if the current ACK policy is immediate.
+   *
+   * \return true if the current ACK policy is immediate,
+   *         false otherwise
+   */
   bool MustSendHtImmediateAck (void) const;
+  /**
+   * Return the Traffic ID (TID).
+   *
+   * \return TID
+   */
   uint8_t GetTidInfo (void) const;
+  /**
+   * Return the starting sequence number.
+   *
+   * \return the starting sequence number
+   */
   uint16_t GetStartingSequence (void) const;
+  /**
+   * Check if the current ACK policy is basic
+   * (i.e. not multiple TID and not compressed ACK).
+   *
+   * \return true if the current ACK policy is basic,
+   *         false otherwise
+   */
   bool IsBasic (void) const;
+  /**
+   * Check if the current ACK policy is compressed ACK
+   * and not multiple TID.
+   *
+   * \return true if the current ACK policy is compressed ACK,
+   *         false otherwise
+   */
   bool IsCompressed (void) const;
+  /**
+   * Check if the current ACK policy has multiple TID.
+   *
+   * \return true if the current ACK policy has multiple TID,
+   *         false otherwise
+   */
   bool IsMultiTid (void) const;
 
+  /**
+   * Set the bitmap that the packet with the given sequence
+   * number was received.
+   *
+   * \param seq
+   */
   void SetReceivedPacket (uint16_t seq);
+  /**
+   * Set the bitmap that the packet with the given sequence
+   * number and fragment number was received.
+   *
+   * \param seq
+   * \param frag
+   */
   void SetReceivedFragment (uint16_t seq, uint8_t frag);
+  /**
+   * Check if the packet with the given sequence number
+   * was ACKed in this Block ACK response.
+   *
+   * \param seq
+   * \return true if the packet with the given sequence number
+   *         was ACKed in this Block ACK response, false otherwise
+   */
   bool IsPacketReceived (uint16_t seq) const;
+  /**
+   * Check if the packet with the given sequence number
+   * and fragment number was ACKed in this Block ACK response.
+   *
+   * \param seq
+   * \param frag
+   * \return true if the packet with the given sequence number
+   *         and sequence number was ACKed in this Block ACK response,
+   *         false otherwise
+   */
   bool IsFragmentReceived (uint16_t seq, uint8_t frag) const;
 
+  /**
+   * Return the starting sequence control.
+   *
+   * \return the starting sequence control
+   */
   uint16_t GetStartingSequenceControl (void) const;
+  /**
+   * Set the starting sequence control with the given
+   * sequence control value
+   *
+   * \param seqControl
+   */
   void SetStartingSequenceControl (uint16_t seqControl);
+  /**
+   * Return the bitmap from the block ACK response header.
+   *
+   * \return the bitmap from the block ACK response header
+   */
   const uint16_t* GetBitmap (void) const;
+  /**
+   * Return the compressed bitmap from the block ACK response header.
+   *
+   * \return the compressed bitmap from the block ACK response header
+   */
   uint64_t GetCompressedBitmap (void) const;
 
+  /**
+   * Reset the bitmap to 0.
+   */
   void ResetBitmap (void);
 
 private:
+  /**
+   * Return the block ACK control.
+   *
+   * \return the block ACK control
+   */
   uint16_t GetBaControl (void) const;
+  /**
+   * Set the block ACK control.
+   *
+   * \param bar
+   */
   void SetBaControl (uint16_t bar);
 
+  /**
+   * Serialize bitmap to the given buffer.
+   *
+   * \param start
+   * \return Buffer::Iterator to the next available buffer
+   */
   Buffer::Iterator SerializeBitmap (Buffer::Iterator start) const;
+  /**
+   * Deserialize bitmap from the given buffer.
+   *
+   * \param start
+   * \return Buffer::Iterator to the next available buffer
+   */
   Buffer::Iterator DeserializeBitmap (Buffer::Iterator start);
 
   /**
diff -Naur ns-3.18.1/src/wifi/model/dca-txop.cc ns-3.19/src/wifi/model/dca-txop.cc
--- ns-3.18.1/src/wifi/model/dca-txop.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/dca-txop.cc	2013-12-20 09:44:50.000000000 -0800
@@ -69,9 +69,17 @@
   DcaTxop *m_txop;
 };
 
+/**
+ * Listener for MacLow events. Forwards to DcaTxop.
+ */
 class DcaTxop::TransmissionListener : public MacLowTransmissionListener
 {
 public:
+  /**
+   * Create a TransmissionListener for the given DcaTxop.
+   *
+   * \param txop
+   */
   TransmissionListener (DcaTxop * txop)
     : MacLowTransmissionListener (),
       m_txop (txop) {
@@ -112,7 +120,8 @@
   DcaTxop *m_txop;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (DcaTxop);
+NS_OBJECT_ENSURE_REGISTERED (DcaTxop)
+  ;
 
 TypeId
 DcaTxop::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/dca-txop.h ns-3.19/src/wifi/model/dca-txop.h
--- ns-3.18.1/src/wifi/model/dca-txop.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/dca-txop.h	2013-12-20 09:44:50.000000000 -0800
@@ -69,14 +69,37 @@
 public:
   static TypeId GetTypeId (void);
 
+  /**
+   * typedef for a callback to invoke when a
+   * packet transmission was completed successfully.
+   */
   typedef Callback <void, const WifiMacHeader&> TxOk;
+  /**
+   * typedef for a callback to invoke when a
+   * packet transmission was failed.
+   */
   typedef Callback <void, const WifiMacHeader&> TxFailed;
 
   DcaTxop ();
   ~DcaTxop ();
 
+  /**
+   * Set MacLow associated with this DcaTxop.
+   *
+   * \param low MacLow
+   */
   void SetLow (Ptr<MacLow> low);
+  /**
+   * Set DcfManager this DcaTxop is associated to.
+   *
+   * \param manager DcfManager
+   */
   void SetManager (DcfManager *manager);
+  /**
+   * Set WifiRemoteStationsManager this DcaTxop is associated to.
+   *
+   * \param remoteManager WifiRemoteStationManager
+   */
   void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> remoteManager);
 
   /**
@@ -90,6 +113,11 @@
    */
   void SetTxFailedCallback (TxFailed callback);
 
+  /**
+   * Return the packet queue associated with this DcaTxop.
+   *
+   * \return WifiMacQueue
+   */
   Ptr<WifiMacQueue > GetQueue () const;
   virtual void SetMinCw (uint32_t minCw);
   virtual void SetMaxCw (uint32_t maxCw);
@@ -129,37 +157,149 @@
   DcaTxop (const DcaTxop &o);
 
   // Inherited from ns3::Object
+  /**
+   * Return the MacLow associated with this DcaTxop.
+   *
+   * \return MacLow
+   */
   Ptr<MacLow> Low (void);
   void DoInitialize ();
   /* dcf notifications forwarded here */
+  /**
+   * Check if the DCF requires access.
+   *
+   * \return true if the DCF requires access,
+   *         false otherwise
+   */
   bool NeedsAccess (void) const;
+  /**
+   * Notify the DCF that access has been granted.
+   */
   void NotifyAccessGranted (void);
+  /**
+   * Notify the DCF that internal collision has occurred.
+   */
   void NotifyInternalCollision (void);
+  /**
+   * Notify the DCF that collision has occurred.
+   */
   void NotifyCollision (void);
   /**
-  * When a channel switching occurs, enqueued packets are removed.
-  */
+   * When a channel switching occurs, enqueued packets are removed.
+   */
   void NotifyChannelSwitching (void);
-  /* event handlers */
+
+  /* Event handlers */
+  /**
+   * Event handler when a CTS is received.
+   *
+   * \param snr
+   * \param txMode
+   */
   void GotCts (double snr, WifiMode txMode);
+  /**
+   * Event handler when a CTS timeout has occurred.
+   */
   void MissedCts (void);
+  /**
+   * Event handler when an ACK is received.
+   *
+   * \param snr
+   * \param txMode
+   */
   void GotAck (double snr, WifiMode txMode);
+  /**
+   * Event handler when an ACK is received.
+   */
   void MissedAck (void);
+  /**
+   * Start transmission for the next fragment.
+   * This is called for fragment only.
+   */
   void StartNext (void);
+  /**
+   * Cancel the transmission.
+   */
   void Cancel (void);
+  /**
+   * Event handler when a transmission that
+   * does not require an ACK has completed.
+   */
   void EndTxNoAck (void);
 
+  /**
+   * Restart access request if needed.
+   */
   void RestartAccessIfNeeded (void);
+  /**
+   * Request access from DCF manager if needed.
+   */
   void StartAccessIfNeeded (void);
+  /**
+   * Check if the current packet should be sent with a RTS protection.
+   *
+   * \param packet
+   * \param header
+   * \return true if RTS protection should be used, false otherwise
+   */
   bool NeedRts (Ptr<const Packet> packet, const WifiMacHeader *header);
+  /**
+   * Check if RTS should be re-transmitted if CTS was missed.
+   *
+   * \return true if RTS should be re-transmitted, false otherwise
+   */
   bool NeedRtsRetransmission (void);
+  /**
+   * Check if DATA should be re-transmitted if ACK was missed.
+   *
+   * \return true if DATA should be re-transmitted, false otherwise
+   */
   bool NeedDataRetransmission (void);
+  /**
+   * Check if the current packet should be fragmented.
+   *
+   * \return true if the current packet should be fragmented,
+   *         false otherwise
+   */
   bool NeedFragmentation (void);
+  /**
+   * Calculate the size of the next fragment.
+   *
+   * \return the size of the next fragment
+   */
   uint32_t GetNextFragmentSize (void);
+  /**
+   * Calculate the size of the current fragment.
+   *
+   * \return the size of the current fragment
+   */
   uint32_t GetFragmentSize (void);
+  /**
+   * Calculate the offset for the current fragment.
+   *
+   * \return the offset for the current fragment
+   */
   uint32_t GetFragmentOffset (void);
+  /**
+   * Check if the curren fragment is the last fragment.
+   *
+   * \return true if the curren fragment is the last fragment,
+   *         false otherwise
+   */
   bool IsLastFragment (void);
+  /**
+   * Continue to the next fragment. This method simply
+   * increments the internal variable that keep track
+   * of the current fragment number.
+   */
   void NextFragment (void);
+  /**
+   * Get the next fragment from the packet with
+   * appropriate Wifi header for the fragment.
+   *
+   * \param hdr
+   * \return the fragment with the current fragment number
+   */
   Ptr<Packet> GetFragmentPacket (WifiMacHeader *hdr);
   virtual void DoDispose (void);
 
diff -Naur ns-3.18.1/src/wifi/model/dcf.cc ns-3.19/src/wifi/model/dcf.cc
--- ns-3.18.1/src/wifi/model/dcf.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/dcf.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Dcf);
+NS_OBJECT_ENSURE_REGISTERED (Dcf)
+  ;
 
 TypeId
 Dcf::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/dcf.h ns-3.19/src/wifi/model/dcf.h
--- ns-3.18.1/src/wifi/model/dcf.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/dcf.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,11 +34,42 @@
 public:
   static TypeId GetTypeId (void);
 
+  /**
+   * Set the minimum congestion window size.
+   *
+   * \param minCw the minimum congestion window size
+   */
   virtual void SetMinCw (uint32_t minCw) = 0;
+  /**
+   * Set the maximum congestion window size.
+   *
+   * \param maxCw the maximum congestion window size
+   */
   virtual void SetMaxCw (uint32_t maxCw) = 0;
+  /**
+   * \param aifsn the number of slots which make up an AIFS for a specific DCF.
+   *        a DIFS corresponds to an AIFSN = 2.
+   *
+   * Calling this method after DcfManager::Add has been called is not recommended.
+   */
   virtual void SetAifsn (uint32_t aifsn) = 0;
+  /**
+   * Return the minimum congestion window size.
+   *
+   * \return the minimum congestion window size
+   */
   virtual uint32_t GetMinCw (void) const = 0;
+  /**
+   * Return the maximum congestion window size.
+   *
+   * \return the maximum congestion window size
+   */
   virtual uint32_t GetMaxCw (void) const = 0;
+  /**
+   * Return the number of slots that make up an AIFS.
+   *
+   * \return the number of slots that make up an AIFS
+   */
   virtual uint32_t GetAifsn (void) const = 0;
 };
 
diff -Naur ns-3.18.1/src/wifi/model/dcf-manager.cc ns-3.19/src/wifi/model/dcf-manager.cc
--- ns-3.18.1/src/wifi/model/dcf-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/dcf-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -163,13 +163,17 @@
 }
 
 
-/***************************************************************
- *         Listener for Nav events. Forwards to DcfManager
- ***************************************************************/
-
+/**
+ * Listener for NAV events. Forwards to DcfManager
+ */
 class LowDcfListener : public ns3::MacLowDcfListener
 {
 public:
+  /**
+   * Create a LowDcfListener for the given DcfManager.
+   *
+   * \param dcf
+   */
   LowDcfListener (ns3::DcfManager *dcf)
     : m_dcf (dcf)
   {
@@ -202,16 +206,20 @@
     m_dcf->NotifyCtsTimeoutResetNow ();
   }
 private:
-  ns3::DcfManager *m_dcf;
+  ns3::DcfManager *m_dcf;  //!< DcfManager to forward events to
 };
 
-/***************************************************************
- *         Listener for PHY events. Forwards to DcfManager
- ***************************************************************/
-
+/**
+ * Listener for PHY events. Forwards to DcfManager
+ */
 class PhyListener : public ns3::WifiPhyListener
 {
 public:
+  /**
+   * Create a PhyListener for the given DcfManager.
+   *
+   * \param dcf
+   */
   PhyListener (ns3::DcfManager *dcf)
     : m_dcf (dcf)
   {
@@ -244,7 +252,7 @@
     m_dcf->NotifySwitchingStartNow (duration);
   }
 private:
-  ns3::DcfManager *m_dcf;
+  ns3::DcfManager *m_dcf;  //!< DcfManager to forward events to
 };
 
 /****************************************************************
diff -Naur ns-3.18.1/src/wifi/model/dcf-manager.h ns-3.19/src/wifi/model/dcf-manager.h
--- ns-3.18.1/src/wifi/model/dcf-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/dcf-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -57,10 +57,35 @@
    * Calling this method after DcfManager::Add has been called is not recommended.
    */
   void SetAifsn (uint32_t aifsn);
+  /**
+   * Set the minimum congestion window size.
+   *
+   * \param minCw the minimum congestion window size
+   */
   void SetCwMin (uint32_t minCw);
+  /**
+   * Set the maximum congestion window size.
+   *
+   * \param maxCw the maximum congestion window size
+   */
   void SetCwMax (uint32_t maxCw);
+  /**
+   * Return the number of slots that make up an AIFS.
+   *
+   * \return the number of slots that make up an AIFS
+   */
   uint32_t GetAifsn (void) const;
+  /**
+   * Return the minimum congestion window size.
+   *
+   * \return the minimum congestion window size
+   */
   uint32_t GetCwMin (void) const;
+  /**
+   * Return the maximum congestion window size.
+   *
+   * \return the maximum congestion window size
+   */
   uint32_t GetCwMax (void) const;
   /**
    * Update the value of the CW variable to take into account
@@ -96,13 +121,44 @@
 private:
   friend class DcfManager;
 
+  /**
+   * Return the current number of backoff slots.
+   *
+   * \return the current number of backoff slots
+   */
   uint32_t GetBackoffSlots (void) const;
+  /**
+   * Return the time when the backoff procedure started.
+   *
+   * \return the time when the backoff procedure started
+   */
   Time GetBackoffStart (void) const;
+  /**
+   * Update backoff slots that nSlots has passed.
+   *
+   * \param nSlots
+   * \param backoffUpdateBound
+   */
   void UpdateBackoffSlotsNow (uint32_t nSlots, Time backoffUpdateBound);
+  /**
+   * Notify that access request has been received.
+   */
   void NotifyAccessRequested (void);
+  /**
+   * Notify that access has been granted.
+   */
   void NotifyAccessGranted (void);
+  /**
+   * Notify that collision has occurred.
+   */
   void NotifyCollision (void);
+  /**
+   * Notify that internal collision has occurred.
+   */
   void NotifyInternalCollision (void);
+  /**
+   * Notify that the device is switching channel.
+   */
   void NotifyChannelSwitching (void);
 
 
@@ -176,7 +232,17 @@
   DcfManager ();
   ~DcfManager ();
 
+  /**
+   * Set up listener for Phy events.
+   *
+   * \param phy
+   */
   void SetupPhyListener (Ptr<WifiPhy> phy);
+  /**
+   * Set up listener for MacLow events.
+   *
+   * \param low
+   */
   void SetupLowListener (Ptr<MacLow> low);
 
   /**
@@ -280,16 +346,82 @@
    * Called at end of rx
    */
   void NotifyNavStartNow (Time duration);
+  /**
+   * Notify that ACK timer has started for the given duration.
+   *
+   * \param duration
+   */
   void NotifyAckTimeoutStartNow (Time duration);
+  /**
+   * Notify that ACK timer has resetted.
+   */
   void NotifyAckTimeoutResetNow ();
+  /**
+   * Notify that CTS timer has started for the given duration.
+   *
+   * \param duration
+   */
   void NotifyCtsTimeoutStartNow (Time duration);
+  /**
+   * Notify that CTS timer has resetted.
+   */
   void NotifyCtsTimeoutResetNow ();
 private:
+  /**
+   * Update backoff slots for all DcfStates.
+   */
   void UpdateBackoff (void);
+  /**
+   * Return the most recent time.
+   *
+   * \param a
+   * \param b
+   * \return the most recent time
+   */
   Time MostRecent (Time a, Time b) const;
+  /**
+   * Return the most recent time.
+   *
+   * \param a
+   * \param b
+   * \param c
+   * \return the most recent time
+   */
   Time MostRecent (Time a, Time b, Time c) const;
+  /**
+   * Return the most recent time.
+   *
+   * \param a
+   * \param b
+   * \param c
+   * \param d
+   * \return the most recent time
+   */
   Time MostRecent (Time a, Time b, Time c, Time d) const;
+  /**
+   * Return the most recent time.
+   *
+   * \param a
+   * \param b
+   * \param c
+   * \param d
+   * \param e
+   * \param f
+   * \return the most recent time
+   */
   Time MostRecent (Time a, Time b, Time c, Time d, Time e, Time f) const;
+  /**
+   * Return the most recent time.
+   *
+   * \param a
+   * \param b
+   * \param c
+   * \param d
+   * \param e
+   * \param f
+   * \param g
+   * \return the most recent time
+   */
   Time MostRecent (Time a, Time b, Time c, Time d, Time e, Time f, Time g) const;
   /**
    * Access will never be granted to the medium _before_
@@ -299,13 +431,44 @@
    * be granted
    */
   Time GetAccessGrantStart (void) const;
+  /**
+   * Return the time when the backoff procedure
+   * started for the given DcfState.
+   *
+   * \param state
+   * \return the time when the backoff procedure started
+   */
   Time GetBackoffStartFor (DcfState *state);
+  /**
+   * Return the time when the backoff procedure
+   * ended (or will ended) for the given DcfState.
+   *
+   * \param state
+   * \return the time when the backoff procedure ended (or will ended)
+   */
   Time GetBackoffEndFor (DcfState *state);
   void DoRestartAccessTimeoutIfNeeded (void);
+  /**
+   * Called when access timeout should occur
+   * (e.g. backoff procedure expired).
+   */
   void AccessTimeout (void);
+  /**
+   * Grant access to DCF
+   */
   void DoGrantAccess (void);
+  /**
+   * Check if the device is busy sending or receiving,
+   * or NAV busy.
+   *
+   * \return true if the device is busy,
+   *         false otherwise
+   */
   bool IsBusy (void) const;
 
+  /**
+   * typedef for a vector of DcfStates
+   */
   typedef std::vector<DcfState *> States;
 
   States m_states;
diff -Naur ns-3.18.1/src/wifi/model/dsss-error-rate-model.h ns-3.19/src/wifi/model/dsss-error-rate-model.h
--- ns-3.18.1/src/wifi/model/dsss-error-rate-model.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/dsss-error-rate-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -67,10 +67,46 @@
 class DsssErrorRateModel
 {
 public:
+  /**
+   * A function DQPSK
+   *
+   * \param x x
+   * \return DQPSK(x)
+   */
   static double DqpskFunction (double x);
+  /**
+   * Return the chunk success rate of the differential BPSK.
+   *
+   * \param sinr the SINR of the chunk
+   * \param nbits the size of the chunk
+   * \return the chunk success rate of the differential BPSK
+   */
   static double GetDsssDbpskSuccessRate (double sinr, uint32_t nbits);
+  /**
+   * Return the chunk success rate of the differential encoded QPSK.
+   *
+   * \param sinr the SINR of the chunk
+   * \param nbits the size of the chunk
+   * \return the chunk success rate of the differential encoded QPSK.
+   */
   static double GetDsssDqpskSuccessRate (double sinr,uint32_t nbits);
+  /**
+   * Return the chunk success rate of the differential encoded QPSK for
+   * 5.5Mbps data rate.
+   *
+   * \param sinr the SINR of the chunk
+   * \param nbits the size of the chunk
+   * \return the chunk success rate of the differential encoded QPSK for
+   */
   static double GetDsssDqpskCck5_5SuccessRate (double sinr,uint32_t nbits);
+  /**
+   * Return the chunk success rate of the differential encoded QPSK for
+   * 11Mbps data rate.
+   *
+   * \param sinr the SINR of the chunk
+   * \param nbits the size of the chunk
+   * \return the chunk success rate of the differential encoded QPSK for
+   */
   static double GetDsssDqpskCck11SuccessRate (double sinr,uint32_t nbits);
 #ifdef ENABLE_GSL
   static double SymbolErrorProb16Cck (double e2);  /// equation (18) in Pursley's paper
diff -Naur ns-3.18.1/src/wifi/model/edca-txop-n.cc ns-3.19/src/wifi/model/edca-txop-n.cc
--- ns-3.18.1/src/wifi/model/edca-txop-n.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/edca-txop-n.cc	2013-12-20 09:44:50.000000000 -0800
@@ -138,7 +138,8 @@
   EdcaTxopN *m_txop;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (EdcaTxopN);
+NS_OBJECT_ENSURE_REGISTERED (EdcaTxopN)
+  ;
 
 TypeId
 EdcaTxopN::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/edca-txop-n.h ns-3.19/src/wifi/model/edca-txop-n.h
--- ns-3.18.1/src/wifi/model/edca-txop-n.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/edca-txop-n.h	2013-12-20 09:44:50.000000000 -0800
@@ -53,6 +53,9 @@
 class BlockAckManager;
 class MgtDelBaHeader;
 
+/**
+ * Enumeration for type of station
+ */
 enum TypeOfStation
 {
   STA,
@@ -61,7 +64,8 @@
   MESH,
   HT_STA,
   HT_AP,
-  HT_ADHOC_STA
+  HT_ADHOC_STA,
+  OCB
 };
 
 
@@ -80,7 +84,15 @@
 class EdcaTxopN : public Dcf
 {
 public:
+  /**
+   * typedef for a callback to invoke when a
+   * packet transmission was completed successfully.
+   */
   typedef Callback <void, const WifiMacHeader&> TxOk;
+  /**
+   * typedef for a callback to invoke when a
+   * packet transmission was failed.
+   */
   typedef Callback <void, const WifiMacHeader&> TxFailed;
 
   static TypeId GetTypeId (void);
@@ -88,15 +100,53 @@
   virtual ~EdcaTxopN ();
   void DoDispose ();
 
+  /**
+   * Set MacLow associated with this EdcaTxopN.
+   *
+   * \param low MacLow
+   */
   void SetLow (Ptr<MacLow> low);
   void SetTxMiddle (MacTxMiddle *txMiddle);
+  /**
+   * Set DcfManager this EdcaTxopN is associated to.
+   *
+   * \param manager DcfManager
+   */
   void SetManager (DcfManager *manager);
+  /**
+   * \param callback the callback to invoke when a
+   * packet transmission was completed successfully.
+   */
   void SetTxOkCallback (TxOk callback);
+  /**
+   * \param callback the callback to invoke when a
+   * packet transmission was completed unsuccessfully.
+   */
   void SetTxFailedCallback (TxFailed callback);
+  /**
+   * Set WifiRemoteStationsManager this EdcaTxopN is associated to.
+   *
+   * \param remoteManager WifiRemoteStationManager
+   */
   void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> remoteManager);
+  /**
+   * Set type of station with the given type.
+   *
+   * \param type
+   */
   void SetTypeOfStation (enum TypeOfStation type);
+  /**
+   * Return type of station.
+   *
+   * \return type of station
+   */
   enum TypeOfStation GetTypeOfStation (void) const;
 
+  /**
+   * Return the packet queue associated with this EdcaTxopN.
+   *
+   * \return WifiMacQueue
+   */
   Ptr<WifiMacQueue > GetQueue () const;
   virtual void SetMinCw (uint32_t minCw);
   virtual void SetMaxCw (uint32_t maxCw);
@@ -105,51 +155,202 @@
   virtual uint32_t GetMaxCw (void) const;
   virtual uint32_t GetAifsn (void) const;
 
+  /**
+   * Return the MacLow associated with this EdcaTxopN.
+   *
+   * \return MacLow
+   */
   Ptr<MacLow> Low (void);
   Ptr<MsduAggregator> GetMsduAggregator (void) const;
 
   /* dcf notifications forwarded here */
+  /**
+   * Check if the EDCAF requires access.
+   *
+   * \return true if the EDCAF requires access,
+   *         false otherwise
+   */
   bool NeedsAccess (void) const;
+  /**
+   * Notify the EDCAF that access has been granted.
+   */
   void NotifyAccessGranted (void);
+  /**
+   * Notify the EDCAF that internal collision has occurred.
+   */
   void NotifyInternalCollision (void);
+  /**
+   * Notify the EDCAF that collision has occurred.
+   */
   void NotifyCollision (void);
   /**
-  * When a channel switching occurs, enqueued packets are removed.
-  */
+   * When a channel switching occurs, enqueued packets are removed.
+   */
   void NotifyChannelSwitching (void);
 
-  /*event handlers*/
+  /* Event handlers */
+  /**
+   * Event handler when a CTS is received.
+   *
+   * \param snr
+   * \param txMode
+   */
   void GotCts (double snr, WifiMode txMode);
+  /**
+   * Event handler when a CTS timeout has occurred.
+   */
   void MissedCts (void);
+  /**
+   * Event handler when an ACK is received.
+   *
+   * \param snr
+   * \param txMode
+   */
   void GotAck (double snr, WifiMode txMode);
+  /**
+   * Event handler when a Block ACK is received.
+   *
+   * \param blockAck
+   * \param recipient
+   */
   void GotBlockAck (const CtrlBAckResponseHeader *blockAck, Mac48Address recipient);
+  /**
+   * Event handler when a Block ACK timeout has occurred.
+   */
   void MissedBlockAck (void);
   void GotAddBaResponse (const MgtAddBaResponseHeader *respHdr, Mac48Address recipient);
   void GotDelBaFrame (const MgtDelBaHeader *delBaHdr, Mac48Address recipient);
+  /**
+   * Event handler when an ACK is received.
+   */
   void MissedAck (void);
+  /**
+   * Start transmission for the next fragment.
+   * This is called for fragment only.
+   */
   void StartNext (void);
+  /**
+   * Cancel the transmission.
+   */
   void Cancel (void);
+  /**
+   * Event handler when a transmission that
+   * does not require an ACK has completed.
+   */
   void EndTxNoAck (void);
 
+  /**
+   * Restart access request if needed.
+   */
   void RestartAccessIfNeeded (void);
+  /**
+   * Request access from DCF manager if needed.
+   */
   void StartAccessIfNeeded (void);
+  /**
+   * Check if the current packet should be sent with a RTS protection.
+   *
+   * \return true if RTS protection should be used, false otherwise
+   */
   bool NeedRts (void);
+  /**
+   * Check if RTS should be re-transmitted if CTS was missed.
+   *
+   * \return true if RTS should be re-transmitted, false otherwise
+   */
   bool NeedRtsRetransmission (void);
+  /**
+   * Check if DATA should be re-transmitted if ACK was missed.
+   *
+   * \return true if DATA should be re-transmitted, false otherwise
+   */
   bool NeedDataRetransmission (void);
+  /**
+   * Check if the current packet should be fragmented.
+   *
+   * \return true if the current packet should be fragmented,
+   *         false otherwise
+   */
   bool NeedFragmentation (void) const;
+  /**
+   * Calculate the size of the next fragment.
+   *
+   * \return the size of the next fragment
+   */
   uint32_t GetNextFragmentSize (void);
+  /**
+   * Calculate the size of the current fragment.
+   *
+   * \return the size of the current fragment
+   */
   uint32_t GetFragmentSize (void);
+  /**
+   * Calculate the offset for the current fragment.
+   *
+   * \return the offset for the current fragment
+   */
   uint32_t GetFragmentOffset (void);
+  /**
+   * Check if the curren fragment is the last fragment.
+   *
+   * \return true if the curren fragment is the last fragment,
+   *         false otherwise
+   */
   bool IsLastFragment (void) const;
+  /**
+   * Continue to the next fragment. This method simply
+   * increments the internal variable that keep track
+   * of the current fragment number.
+   */
   void NextFragment (void);
+  /**
+   * Get the next fragment from the packet with
+   * appropriate Wifi header for the fragment.
+   *
+   * \param hdr
+   * \return the fragment with the current fragment number
+   */
   Ptr<Packet> GetFragmentPacket (WifiMacHeader *hdr);
 
+  /**
+   * Set the access category of this EDCAF.
+   *
+   * \param ac
+   */
   void SetAccessCategory (enum AcIndex ac);
+  /**
+   * \param packet packet to send
+   * \param hdr header of packet to send.
+   *
+   * Store the packet in the internal queue until it
+   * can be sent safely.
+   */
   void Queue (Ptr<const Packet> packet, const WifiMacHeader &hdr);
   void SetMsduAggregator (Ptr<MsduAggregator> aggr);
+  /**
+   * \param packet packet to send
+   * \param hdr header of packet to send.
+   *
+   * Store the packet in the front of the internal queue until it
+   * can be sent safely.
+   */
   void PushFront (Ptr<const Packet> packet, const WifiMacHeader &hdr);
+  /**
+   * Complete block ACK configuration.
+   */
   void CompleteConfig (void);
+  /**
+   * Set threshold for block ACK mechanism. If number of packets in the
+   * queue reaches the threshold, block ACK mechanism is used.
+   *
+   * \param threshold
+   */
   void SetBlockAckThreshold (uint8_t threshold);
+  /**
+   * Return the current threshold for block ACK mechanism.
+   *
+   * \return the current threshold for block ACK mechanism
+   */
   uint8_t GetBlockAckThreshold (void) const;
   void SetBlockAckInactivityTimeout (uint16_t timeout);
   void SendDelbaFrame (Mac48Address addr, uint8_t tid, bool byOriginator);
@@ -174,30 +375,48 @@
    * If aggregating sta is an AP
    *   SA = Address3
    *   DA = Address1
+   *
+   * \param hdr
+   * \return Mac48Address
    */
   Mac48Address MapSrcAddressForAggregation (const WifiMacHeader &hdr);
   Mac48Address MapDestAddressForAggregation (const WifiMacHeader &hdr);
   EdcaTxopN &operator = (const EdcaTxopN &);
   EdcaTxopN (const EdcaTxopN &);
 
-  /* If number of packets in the queue reaches m_blockAckThreshold value, an ADDBARequest frame
+  /**
+   * If number of packets in the queue reaches m_blockAckThreshold value, an ADDBARequest frame
    * is sent to destination in order to setup a block ack.
+   *
+   * \return true if we tried to set up block ACK, false otherwise
    */
   bool SetupBlockAckIfNeeded ();
-  /* Sends an ADDBARequest to establish a block ack agreement with sta
+  /**
+   * Sends an ADDBARequest to establish a block ack agreement with sta
    * addressed by <i>recipient</i> for tid <i>tid</i>.
+   *
+   * \param recipient
+   * \param tid
+   * \param startSeq
+   * \param timeout
+   * \param immediateBAck
    */
   void SendAddBaRequest (Mac48Address recipient, uint8_t tid, uint16_t startSeq,
                          uint16_t timeout, bool immediateBAck);
-  /* After that all packets, for which a block ack agreement was established, have been
+  /**
+   * After that all packets, for which a block ack agreement was established, have been
    * transmitted, we have to send a block ack request.
+   *
+   * \param bar
    */
   void SendBlockAckRequest (const struct Bar &bar);
-  /* For now is typically invoked to complete transmission of a packets sent with ack policy
+  /**
+   * For now is typically invoked to complete transmission of a packets sent with ack policy
    * Block Ack: the packet is buffered and dcf is reset.
    */
   void CompleteTx (void);
-  /* Verifies if dequeued packet has to be transmitted with ack policy Block Ack. This happens
+  /**
+   * Verifies if dequeued packet has to be transmitted with ack policy Block Ack. This happens
    * if an established block ack agreement exists with the receiver.
    */
   void VerifyBlockAck (void);
diff -Naur ns-3.18.1/src/wifi/model/error-rate-model.cc ns-3.19/src/wifi/model/error-rate-model.cc
--- ns-3.18.1/src/wifi/model/error-rate-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/error-rate-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -21,7 +21,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel);
+NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel)
+  ;
 
 TypeId ErrorRateModel::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wifi/model/error-rate-model.h ns-3.19/src/wifi/model/error-rate-model.h
--- ns-3.18.1/src/wifi/model/error-rate-model.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/error-rate-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -43,6 +43,20 @@
    */
   double CalculateSnr (WifiMode txMode, double ber) const;
 
+  /**
+   * A pure virtual method that must be implemented in the subclass.
+   * This method returns the probability that the given 'chuck' of the
+   * packet will be successfully received by the PHY.
+   *
+   * A chuck can be viewed as a part of a packet with equal SNR.
+   * The probability of successfully receiving the chunk depends on
+   * the mode, the SNR, and the size of the chunk.
+   *
+   * \param mode the Wi-Fi mode the chunk is sent
+   * \param snr the SNR of the chunk
+   * \param nbits the number of bits in this chunk
+   * \return probability of successfully receiving the chunk
+   */
   virtual double GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbits) const = 0;
 };
 
diff -Naur ns-3.18.1/src/wifi/model/ht-capabilities.h ns-3.19/src/wifi/model/ht-capabilities.h
--- ns-3.18.1/src/wifi/model/ht-capabilities.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ht-capabilities.h	2013-12-20 09:44:50.000000000 -0800
@@ -72,13 +72,23 @@
   void SerializeInformationField (Buffer::Iterator start) const;
   uint8_t DeserializeInformationField (Buffer::Iterator start,
                                        uint8_t length);
- /*
+  /**
    * This information element is a bit special in that it is only
    * included if the STA is an HT STA. To support this we
    * override the Serialize and GetSerializedSize methods of
    * WifiInformationElement.
+   *
+   * \param start
+   * \return an iterator
    */
   Buffer::Iterator Serialize (Buffer::Iterator start) const;
+  /**
+   * Return the serialized size of this HT capability 
+   * information element.
+   * 
+   * \return the serialized size of this HT capability 
+   * information element
+   */
   uint16_t GetSerializedSize () const;
  
 private:
diff -Naur ns-3.18.1/src/wifi/model/ideal-wifi-manager.cc ns-3.19/src/wifi/model/ideal-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/ideal-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ideal-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,12 +27,19 @@
 
 namespace ns3 {
 
+/**
+ * \brief hold per-remote-station state for Ideal Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the Ideal Wifi manager
+ */
 struct IdealWifiRemoteStation : public WifiRemoteStation
 {
-  double m_lastSnr;
+  double m_lastSnr;  //!< SNR of last packet sent to the remote station
 };
 
-NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager)
+  ;
 
 TypeId
 IdealWifiManager::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/ideal-wifi-manager.h ns-3.19/src/wifi/model/ideal-wifi-manager.h
--- ns-3.18.1/src/wifi/model/ideal-wifi-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ideal-wifi-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -68,15 +68,30 @@
   virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
   virtual bool IsLowLatency (void) const;
 
-  // return the min snr needed to successfully transmit
-  // data with this mode at the specified ber.
+  /**
+   * Return the minimum SNR needed to successfully transmit
+   * data with this mode at the specified BER.
+   *
+   * \param mode WifiMode
+   * \return the minimum SNR for the given mode
+   */
   double GetSnrThreshold (WifiMode mode) const;
-  void AddModeSnrThreshold (WifiMode mode, double ber);
+  /**
+   * Adds a pair of WifiMode and the minimum SNR for that given mode
+   * to the list.
+   *
+   * \param mode WifiMode
+   * \param snr the minimum SNR for the given mode
+   */
+  void AddModeSnrThreshold (WifiMode mode, double snr);
 
+  /**
+   * A vector of <snr, mode> pair that holds the minimum SNR for different mode
+   */
   typedef std::vector<std::pair<double,WifiMode> > Thresholds;
 
-  double m_ber;
-  Thresholds m_thresholds;
+  double m_ber;  //!< The maximum Bit Error Rate acceptable at any transmission mode
+  Thresholds m_thresholds;  //!< List of WifiMode and the minimum SNR pair
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/wifi/model/interference-helper.h ns-3.19/src/wifi/model/interference-helper.h
--- ns-3.18.1/src/wifi/model/interference-helper.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/interference-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -41,21 +41,74 @@
 class InterferenceHelper
 {
 public:
+  /**
+   * Signal event for a packet.
+   */
   class Event : public SimpleRefCount<InterferenceHelper::Event>
   {
 public:
+    /**
+     * Create an Event with the given parameters.
+     *
+     * \param size packet size
+     * \param payloadMode Wi-Fi mode used for the payload
+     * \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,
            enum WifiPreamble preamble,
            Time duration, double rxPower, WifiTxVector txvector);
     ~Event ();
 
+    /**
+     * Return the duration of the signal.
+     *
+     * \return the duration of the signal
+     */
     Time GetDuration (void) const;
+    /**
+     * Return the start time of the signal.
+     *
+     * \return the start time of the signal
+     */
     Time GetStartTime (void) const;
+    /**
+     * Return the end time of the signal.
+     *
+     * \return the end time of the signal
+     */
     Time GetEndTime (void) const;
+    /**
+     * Return the receive power (w).
+     *
+     * \return the receive power (w)
+     */
     double GetRxPowerW (void) const;
+    /**
+     * Return the size of the packet (bytes).
+     *
+     * \return the size of the packet (bytes)
+     */
     uint32_t GetSize (void) const;
+    /**
+     * Return the Wi-Fi mode used for the payload.
+     *
+     * \return the Wi-Fi mode used for the payload
+     */
     WifiMode GetPayloadMode (void) const;
+    /**
+     * Return the preamble type of the packet.
+     *
+     * \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;
@@ -66,6 +119,9 @@
     double m_rxPowerW;
     WifiTxVector m_txVector;
   };
+  /**
+   * A struct for both SNR and PER
+   */
   struct SnrPer
   {
     double snr;
@@ -75,10 +131,30 @@
   InterferenceHelper ();
   ~InterferenceHelper ();
 
+  /**
+   * Set the noise figure.
+   *
+   * \param value noise figure
+   */
   void SetNoiseFigure (double value);
+  /**
+   * Set the error rate model for this interference helper.
+   *
+   * \param rate Error rate model
+   */
   void SetErrorRateModel (Ptr<ErrorRateModel> rate);
 
+  /**
+   * Return the noise figure.
+   *
+   * \return the noise figure
+   */
   double GetNoiseFigure (void) const;
+  /**
+   * Return the error rate model.
+   *
+   * \return Error rate model
+   */
   Ptr<ErrorRateModel> GetErrorRateModel (void) const;
 
 
@@ -90,36 +166,131 @@
    */
   Time GetEnergyDuration (double energyW);
 
-
+  /**
+   * Add the packet-related signal to interference helper.
+   *
+   * \param size packet size
+   * \param payloadMode Wi-Fi mode for the payload
+   * \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,
                                       enum WifiPreamble preamble,
                                       Time duration, double rxPower, WifiTxVector txvector);
 
+  /**
+   * Calculate the SNIR at the start of the packet and accumulate
+   * all SNIR changes in the snir vector.
+   *
+   * \param event the event corresponding to the first time the packet arrives
+   * \return struct of SNR and PER
+   */
   struct InterferenceHelper::SnrPer CalculateSnrPer (Ptr<InterferenceHelper::Event> event);
+  /**
+   * Notify that RX has started.
+   */
   void NotifyRxStart ();
+  /**
+   * Notify that RX has ended.
+   */
   void NotifyRxEnd ();
+  /**
+   * Erase all events.
+   */
   void EraseEvents (void);
 private:
+  /**
+   * Noise and Interference (thus Ni) event.
+   */
   class NiChange
   {
 public:
+    /**
+     * Create a NiChange at the given time and the amount of NI change.
+     *
+     * \param time time of the event
+     * \param delta the power
+     */
     NiChange (Time time, double delta);
+    /**
+     * Return the event time.
+     *
+     * \return the event time.
+     */
     Time GetTime (void) const;
+    /**
+     * Return the power
+     *
+     * \return the power
+     */
     double GetDelta (void) const;
+    /**
+     * Compare the event time of two NiChange objects (a < o).
+     *
+     * \param o
+     * \return true if a < o.time, false otherwise
+     */
     bool operator < (const NiChange& o) const;
 private:
     Time m_time;
     double m_delta;
   };
+  /**
+   * typedef for a vector of NiChanges
+   */
   typedef std::vector <NiChange> NiChanges;
+  /**
+   * typedef for a list of Events
+   */
   typedef std::list<Ptr<Event> > Events;
 
-  InterferenceHelper (const InterferenceHelper &o);
-  InterferenceHelper &operator = (const InterferenceHelper &o);
+  //InterferenceHelper (const InterferenceHelper &o);
+  //InterferenceHelper &operator = (const InterferenceHelper &o);
+  /**
+   * Append the given Event.
+   *
+   * \param event
+   */
   void AppendEvent (Ptr<Event> event);
+  /**
+   * Calculate noise and interference power in W.
+   *
+   * \param event
+   * \param ni
+   * \return noise and interference power
+   */
   double CalculateNoiseInterferenceW (Ptr<Event> event, NiChanges *ni) const;
+  /**
+   * Calculate SNR (linear ratio) from the given signal power and noise+interference power.
+   * (Mode is not currently used)
+   *
+   * \param signal
+   * \param noiseInterference
+   * \param mode
+   * \return SNR in liear ratio
+   */
   double CalculateSnr (double signal, double noiseInterference, WifiMode mode) const;
-  double CalculateChunkSuccessRate (double snir, Time delay, WifiMode mode) const;
+  /**
+   * Calculate the success rate of the chunk given the SINR, duration, and Wi-Fi mode.
+   * The duration and mode are used to calculate how many bits are present in the chunk.
+   *
+   * \param snir SINR
+   * \param duration
+   * \param mode
+   * \return the success rate
+   */
+  double CalculateChunkSuccessRate (double snir, Time duration, WifiMode mode) const;
+  /**
+   * Calculate the error rate of the given packet. The packet 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 m_noiseFigure; /**< noise figure (linear) */
@@ -130,6 +301,11 @@
   bool m_rxing;
   /// Returns an iterator to the first nichange, which is later than moment
   NiChanges::iterator GetPosition (Time moment);
+  /**
+   * Add NiChange to the list at the appropriate position.
+   *
+   * \param change
+   */
   void AddNiChangeEvent (NiChange change);
 };
 
diff -Naur ns-3.18.1/src/wifi/model/mac-low.cc ns-3.19/src/wifi/model/mac-low.cc
--- ns-3.18.1/src/wifi/model/mac-low.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/mac-low.cc	2013-12-20 09:44:50.000000000 -0800
@@ -243,14 +243,17 @@
 }
 
 
-/***************************************************************
- *         Listener for PHY events. Forwards to MacLow
- ***************************************************************/
-
-
+/**
+ * Listener for PHY events. Forwards to MacLow
+ */
 class PhyMacLowListener : public ns3::WifiPhyListener
 {
 public:
+  /**
+   * Create a PhyMacLowListener for the given MacLow.
+   *
+   * \param macLow
+   */
   PhyMacLowListener (ns3::MacLow *macLow)
     : m_macLow (macLow)
   {
@@ -295,7 +298,9 @@
     m_waitSifsEvent (),
     m_endTxNoAckEvent (),
     m_currentPacket (0),
-    m_listener (0)
+    m_listener (0),
+    m_phyMacLowListener (0),
+    m_ctsToSelfSupported (false)
 {
   NS_LOG_FUNCTION (this);
   m_lastNavDuration = Seconds (0);
@@ -334,8 +339,11 @@
    m_waitRifsEvent.Cancel();
   m_phy = 0;
   m_stationManager = 0;
-  delete m_phyMacLowListener;
-  m_phyMacLowListener = 0;
+  if (m_phyMacLowListener != 0)
+    {
+	  delete m_phyMacLowListener;
+	  m_phyMacLowListener = 0;
+    }
 }
 
 void
@@ -539,6 +547,11 @@
 {
   return m_bssid;
 }
+bool
+MacLow::IsPromisc (void) const
+{
+  return m_promisc;
+}
 
 void
 MacLow::SetRxCallback (Callback<void,Ptr<Packet>,const WifiMacHeader *> callback)
diff -Naur ns-3.18.1/src/wifi/model/mac-low.h ns-3.19/src/wifi/model/mac-low.h
--- ns-3.18.1/src/wifi/model/mac-low.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/mac-low.h	2013-12-20 09:44:50.000000000 -0800
@@ -150,16 +150,36 @@
   MacLowDcfListener ();
   virtual ~MacLowDcfListener ();
   /**
+   * Norify that NAV has started for the given duration.
+   *
    * \param duration duration of NAV timer
    */
   virtual void NavStart (Time duration) = 0;
   /**
+   * Notify that NAV has resetted.
+   *
    * \param duration duration of NAV timer
    */
   virtual void NavReset (Time duration) = 0;
+  /**
+   * Notify that ACK timeout has started for a given duration.
+   *
+   * \param duration duration of ACK timeout
+   */
   virtual void AckTimeoutStart (Time duration) = 0;
+  /**
+   * Notify that ACK timeout has resetted.
+   */
   virtual void AckTimeoutReset () = 0;
+  /**
+   * Notify that CTS timeout has started for a given duration.
+   *
+   * \param duration duration of CTS timeout
+   */
   virtual void CtsTimeoutStart (Time duration) = 0;
+  /**
+   * Notify that CTS timeout has resetted.
+   */
   virtual void CtsTimeoutReset () = 0;
 };
 
@@ -180,6 +200,9 @@
    * agreement. Timer is reset when a frame with ack policy block ack
    * or a block ack request are received. When this timer reaches zero
    * this method is called and a delba frame is scheduled for transmission.
+   *
+   * \param originator MAC address of the data originator
+   * \param tid
    */
   virtual void BlockAckInactivityTimeout (Mac48Address originator, uint8_t tid) = 0;
 };
@@ -354,6 +377,7 @@
   uint32_t GetNextPacketSize (void) const;
 
 private:
+
   friend std::ostream &operator << (std::ostream &os, const MacLowTransmissionParameters &params);
   uint32_t m_nextSize;
   enum
@@ -370,6 +394,13 @@
   Time m_overrideDurationId;
 };
 
+/**
+ * Serialize MacLowTransmissionParameters to ostream in a human-readable form.
+ *
+ * \param os std::ostream
+ * \param params MacLowTransmissionParameters
+ * \return std::ostream
+ */
 std::ostream &operator << (std::ostream &os, const MacLowTransmissionParameters &params);
 
 
@@ -380,37 +411,170 @@
 class MacLow : public Object
 {
 public:
+  /**
+   * typedef for a callback for MacLowRx
+   */
   typedef Callback<void, Ptr<Packet>, const WifiMacHeader*> MacLowRxCallback;
 
   MacLow ();
   virtual ~MacLow ();
 
+  /**
+   * Set up WifiPhy associated with this MacLow.
+   *
+   * \param phy WifiPhy associated with this MacLow
+   */
   void SetPhy (Ptr<WifiPhy> phy);
+  /**
+   * Set up WifiRemoteStationManager associated with this MacLow.
+   *
+   * \param manager WifiRemoteStationManager associated with this MacLow
+   */
   void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> manager);
 
+  /**
+   * Set MAC address of this MacLow.
+   *
+   * \param ad Mac48Address of this MacLow
+   */
   void SetAddress (Mac48Address ad);
+  /**
+   * Set ACK timeout of this MacLow.
+   *
+   * \param ackTimeout ACK timeout of this MacLow
+   */
   void SetAckTimeout (Time ackTimeout);
+  /**
+   * Set Basic Block ACK timeout of this MacLow.
+   *
+   * \param blockAckTimeout Basic Block ACK timeout of this MacLow
+   */
   void SetBasicBlockAckTimeout (Time blockAckTimeout);
+  /**
+   * Set Compressed Block ACK timeout of this MacLow.
+   *
+   * \param blockAckTimeout Compressed Block ACK timeout of this MacLow
+   */
   void SetCompressedBlockAckTimeout (Time blockAckTimeout);
+  /**
+   * Enable or disable CTS-to-self capability.
+   *
+   * \param enable Enable or disable CTS-to-self capability
+   */
   void SetCtsToSelfSupported (bool enable);
+  /**
+   * Set CTS timeout of this MacLow.
+   *
+   * \param ctsTimeout CTS timeout of this MacLow
+   */
   void SetCtsTimeout (Time ctsTimeout);
+  /**
+   * Set Short Interframe Space (SIFS) of this MacLow.
+   *
+   * \param sifs SIFS of this MacLow
+   */
   void SetSifs (Time sifs);
+  /**
+   * Set Reduced Interframe Space (RIFS) of this MacLow.
+   *
+   * \param rifs RIFS of this MacLow
+   */
   void SetRifs (Time rifs);
+  /**
+   * Set slot duration of this MacLow.
+   *
+   * \param slotTime slot duration of this MacLow
+   */
   void SetSlotTime (Time slotTime);
+  /**
+   * Set PCF Interframe Space (PIFS) of this MacLow.
+   *
+   * \param pifs PIFS of this MacLow
+   */
   void SetPifs (Time pifs);
+  /**
+   * Set the Basic Service Set Identification.
+   *
+   * \param ad the BSSID
+   */
   void SetBssid (Mac48Address ad);
+  /**
+   * Enable promiscuous mode.
+   */
   void SetPromisc (void);
+  /**
+   * Return whether CTS-to-self capability is supported.
+   *
+   * \return true if CTS-to-self is supported, false otherwise
+   */
   bool GetCtsToSelfSupported () const;
+  /**
+   * Return the MAC address of this MacLow.
+   *
+   * \return Mac48Address of this MacLow
+   */
   Mac48Address GetAddress (void) const;
+  /**
+   * Return ACK timeout of this MacLow.
+   *
+   * \return ACK timeout
+   */
   Time GetAckTimeout (void) const;
+  /**
+   * Return Basic Block ACK timeout of this MacLow.
+   *
+   * \return Basic Block ACK timeout
+   */
   Time GetBasicBlockAckTimeout () const;
+  /**
+   * Return Compressed Block ACK timeout of this MacLow.
+   *
+   * \return Compressed Block ACK timeout
+   */
   Time GetCompressedBlockAckTimeout () const;
+  /**
+   * Return CTS timeout of this MacLow.
+   *
+   * \return CTS timeout
+   */
   Time GetCtsTimeout (void) const;
+  /**
+   * Return Short Interframe Space (SIFS) of this MacLow.
+   *
+   * \return SIFS
+   */
   Time GetSifs (void) const;
+  /**
+   * Return slot duration of this MacLow.
+   *
+   * \return slot duration
+   */
   Time GetSlotTime (void) const;
+  /**
+   * Return PCF Interframe Space (PIFS) of this MacLow.
+   *
+   * \return PIFS
+   */
   Time GetPifs (void) const;
+  /**
+   * Return Reduced Interframe Space (RIFS) of this MacLow.
+   *
+   * \return RIFS
+   */
   Time GetRifs (void) const;
+  /**
+   * Return the Basic Service Set Identification.
+   *
+   * \return BSSID
+   */
   Mac48Address GetBssid (void) const;
+  /**
+   * Check if MacLow is operating in promiscuous mode.
+   *
+   * \return true if MacLow is operating in promiscuous mode,
+   *         false otherwise
+   */
+  bool IsPromisc (void) const;
 
   /**
    * \param callback the callback which receives every incoming packet.
@@ -429,6 +593,7 @@
    * \param packet to send (does not include the 802.11 MAC header and checksum)
    * \param hdr header associated to the packet to send.
    * \param parameters transmission parameters of packet.
+   * \return the transmission time that includes the time for the next packet transmission
    *
    * This transmission time includes the time required for
    * the next packet transmission if one was selected.
@@ -512,62 +677,326 @@
    * associated to this AC.
    */
   void RegisterBlockAckListenerForAc (enum AcIndex ac, MacLowBlockAckEventListener *listener);
+protected:
+  /**
+   * Return a TXVECTOR for the DATA frame given the destination.
+   * The function consults WifiRemoteStationManager, which controls the rate
+   * to different destinations.
+   *
+   * \param packet the packet being asked for TXVECTOR
+   * \param hdr the WifiMacHeader
+   * \return TXVECTOR for the given packet
+   */
+  virtual WifiTxVector GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
 private:
+  /**
+   * Cancel all scheduled events. Called before beginning a transmission
+   * or switching channel.
+   */
   void CancelAllEvents (void);
+  /**
+   * Return the total ACK size (including FCS trailer).
+   *
+   * \return the total ACK size
+   */
   uint32_t GetAckSize (void) const;
+  /**
+   * Return the total Block ACK size (including FCS trailer).
+   *
+   * \param type the Block ACK type
+   * \return the total Block ACK size
+   */
   uint32_t GetBlockAckSize (enum BlockAckType type) const;
+  /**
+   * Return the total RTS size (including FCS trailer).
+   *
+   * \return the total RTS size
+   */
   uint32_t GetRtsSize (void) const;
+  /**
+   * Return the total CTS size (including FCS trailer).
+   *
+   * \return the total CTS size
+   */
   uint32_t GetCtsSize (void) const;
+  /**
+   * Return the total size of the packet after WifiMacHeader and FCS trailer
+   * have been added.
+   *
+   * \param packet the packet to be encapsulated with WifiMacHeader and FCS trailer
+   * \param hdr the WifiMacHeader
+   * \return the total packet size
+   */
   uint32_t GetSize (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
+  /**
+   * Forward the packet down to WifiPhy for transmission.
+   *
+   * \param packet
+   * \param hdr
+   * \param txVector
+   * \param preamble
+   */
   void ForwardDown (Ptr<const Packet> packet, const WifiMacHeader *hdr,
                     WifiTxVector txVector, WifiPreamble preamble);
+  /**
+   * Return a TXVECTOR for the RTS frame given the destination.
+   * The function consults WifiRemoteStationManager, which controls the rate
+   * to different destinations.
+   *
+   * \param packet the packet being asked for RTS TXVECTOR
+   * \param hdr the WifiMacHeader
+   * \return TXVECTOR for the RTS of the given packet
+   */
   WifiTxVector GetRtsTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
-  WifiTxVector GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
+  /**
+   * Return a TXVECTOR for the CTS frame given the destination and the mode of the RTS
+   * used by the sender.
+   * The function consults WifiRemoteStationManager, which controls the rate
+   * to different destinations.
+   *
+   * \param to the MAC address of the CTS receiver
+   * \param rtsTxMode the mode of the RTS used by the sender
+   * \return TXVECTOR for the CTS
+   */
   WifiTxVector GetCtsTxVector (Mac48Address to, WifiMode rtsTxMode) const;
+  /**
+   * Return a TXVECTOR for the ACK frame given the destination and the mode of the DATA
+   * used by the sender.
+   * The function consults WifiRemoteStationManager, which controls the rate
+   * to different destinations.
+   *
+   * \param to the MAC address of the ACK receiver
+   * \param dataTxMode the mode of the DATA used by the sender
+   * \return TXVECTOR for the ACK
+   */
   WifiTxVector GetAckTxVector (Mac48Address to, WifiMode dataTxMode) const;
+  /**
+   * Return a TXVECTOR for the Block ACK frame given the destination and the mode of the DATA
+   * used by the sender.
+   * The function consults WifiRemoteStationManager, which controls the rate
+   * to different destinations.
+   *
+   * \param to the MAC address of the Block ACK receiver
+   * \param dataTxMode the mode of the DATA used by the sender
+   * \return TXVECTOR for the Block ACK
+   */
   WifiTxVector GetBlockAckTxVector (Mac48Address to, WifiMode dataTxMode) const;
 
+  /**
+   * Return a TXVECTOR for the CTS-to-self frame.
+   * The function consults WifiRemoteStationManager, which controls the rate
+   * to different destinations.
+   *
+   * \param packet the packet that requires CTS-to-self
+   * \param hdr the Wifi header of the packet
+   * \return TXVECTOR for the CTS-to-self operation
+   */
   WifiTxVector GetCtsToSelfTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
 
+  /**
+   * Return a TXVECTOR for the CTS frame given the destination and the mode of the RTS
+   * used by the sender.
+   * The function consults WifiRemoteStationManager, which controls the rate
+   * to different destinations.
+   *
+   * \param to the MAC address of the CTS receiver
+   * \param rtsTxMode the mode of the RTS used by the sender
+   * \return TXVECTOR for the CTS
+   */
   WifiTxVector GetCtsTxVectorForRts (Mac48Address to, WifiMode rtsTxMode) const;
+  /**
+   * Return a TXVECTOR for the Block ACK frame given the destination and the mode of the DATA
+   * used by the sender.
+   * The function consults WifiRemoteStationManager, which controls the rate
+   * to different destinations.
+   *
+   * \param to the MAC address of the Block ACK receiver
+   * \param dataTxMode the mode of the DATA used by the sender
+   * \return TXVECTOR for the Block ACK
+   */
   WifiTxVector GetAckTxVectorForData (Mac48Address to, WifiMode dataTxMode) const;
 
+  /**
+   * Return the time required to transmit the CTS (including preamble and FCS).
+   *
+   * \param ctsTxVector
+   * \return the time required to transmit the CTS (including preamble and FCS)
+   */
   Time GetCtsDuration (WifiTxVector ctsTxVector) const;
+  /**
+   * Return the time required to transmit the CTS to the specified address
+   * given the TXVECTOR of the RTS (including preamble and FCS).
+   *
+   * \param to
+   * \param rtsTxVector
+   * \return the time required to transmit the CTS (including preamble and FCS)
+   */
   Time GetCtsDuration (Mac48Address to, WifiTxVector rtsTxVector) const;
+  /**
+   * Return the time required to transmit the ACK (including preamble and FCS).
+   *
+   * \param ackTxVector
+   * \return the time required to transmit the ACK (including preamble and FCS)
+   */
   Time GetAckDuration (WifiTxVector ackTxVector) const;
+  /**
+   * Return the time required to transmit the ACK to the specified address
+   * given the TXVECTOR of the DATA (including preamble and FCS).
+   *
+   * \param to
+   * \param dataTxVector
+   * \return the time required to transmit the ACK (including preamble and FCS)
+   */
   Time GetAckDuration (Mac48Address to, WifiTxVector dataTxVector) const;
   Time GetBlockAckDuration (Mac48Address to, WifiTxVector blockAckReqTxVector, enum BlockAckType type) const;
 
+  /**
+   * Check if CTS-to-self mechanism should be used for the current packet.
+   *
+   * \return true if CTS-to-self mechanism should be used for the current packet,
+   *         false otherwise
+   */
   bool NeedCtsToSelf (void);
   
   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);
+  /**
+   * Reset NAV with the given duration.
+   *
+   * \param duration
+   */
   void DoNavResetNow (Time duration);
+  /**
+   * Start NAV with the given duration.
+   *
+   * \param duration
+   * \return true if NAV is resetted
+   */
   bool DoNavStartNow (Time duration);
+  /**
+   * Check if NAV is zero.
+   *
+   * \return true if NAV is zero,
+   *         false otherwise
+   */
   bool IsNavZero (void) const;
+  /**
+   * Notify DcfManager (via DcfListener) that
+   * ACK timer should be started for the given
+   * duration.
+   *
+   * \param duration
+   */
   void NotifyAckTimeoutStartNow (Time duration);
+  /**
+   * Notify DcfManager (via DcfListener) that
+   * ACK timer should be resetted.
+   */
   void NotifyAckTimeoutResetNow ();
+  /**
+   * Notify DcfManager (via DcfListener) that
+   * CTS timer should be started for the given
+   * duration.
+   *
+   * \param duration
+   */
   void NotifyCtsTimeoutStartNow (Time duration);
+  /**
+   * Notify DcfManager (via DcfListener) that
+   * CTS timer should be resetted.
+   */
   void NotifyCtsTimeoutResetNow ();
 
+  /**
+   * Reset NAV after CTS was missed when the NAV was
+   * setted with RTS.
+   *
+   * \param rtsEndRxTime
+   */
   void NavCounterResetCtsMissed (Time rtsEndRxTime);
+
+  /* Event handlers */
+  /**
+   * Event handler when normal ACK timeout occurs.
+   */
   void NormalAckTimeout (void);
+  /**
+   * Event handler when fast ACK timeout occurs (idle).
+   */
   void FastAckTimeout (void);
+  /**
+   * Event handler when super fast ACK timeout occurs.
+   */
   void SuperFastAckTimeout (void);
+  /**
+   * Event handler when fast ACK timeout occurs (busy).
+   */
   void FastAckFailedTimeout (void);
+  /**
+   * Event handler when block ACK timeout occurs.
+   */
   void BlockAckTimeout (void);
+  /**
+   * Event handler when CTS timeout occurs.
+   */
   void CtsTimeout (void);
+  /**
+   * Send CTS for a CTS-to-self mechanism.
+   */
   void SendCtsToSelf (void);
+  /**
+   * Send CTS after receiving RTS.
+   *
+   * \param source
+   * \param duration
+   * \param txMode
+   * \param rtsSnr
+   */
   void SendCtsAfterRts (Mac48Address source, Time duration, WifiMode txMode, double rtsSnr);
-  void SendAckAfterData (Mac48Address source, Time duration, WifiMode txMode, double rtsSnr);
+  /**
+   * Send ACK after receiving DATA.
+   *
+   * \param source
+   * \param duration
+   * \param dataTxMode
+   * \param dataSnr
+   */
+  void SendAckAfterData (Mac48Address source, Time duration, WifiMode dataTxMode, double dataSnr);
+  /**
+   * Send DATA after receiving CTS.
+   *
+   * \param source
+   * \param duration
+   * \param txMode
+   */
   void SendDataAfterCts (Mac48Address source, Time duration, WifiMode txMode);
+  /**
+   * Event handler that is usually scheduled to fired at the appropriate time
+   * after completing transmissions.
+   */
   void WaitSifsAfterEndTx (void);
+  /**
+   * A transmission that does not require an ACK has completed.
+   */
   void EndTxNoAck (void);
 
+  /**
+   * Send RTS to begin RTS-CTS-DATA-ACK transaction.
+   */
   void SendRtsForPacket (void);
+  /**
+   * Send DATA packet, which can be DATA-ACK or
+   * RTS-CTS-DATA-ACK transaction.
+   */
   void SendDataPacket (void);
+  /**
+   * Start a DATA timer by scheduling appropriate
+   * ACK timeout.
+   *
+   * \param dataTxVector
+   */
   void StartDataTxTimers (WifiTxVector dataTxVector);
   virtual void DoDispose (void);
   /**
@@ -599,70 +1028,93 @@
    * circularly modulo 2^12.
    */
   bool StoreMpduIfNeeded (Ptr<Packet> packet, WifiMacHeader hdr);
-  /*
+  /**
    * Invoked after that a block ack request has been received. Looks for corresponding
    * block ack agreement and creates block ack bitmap on a received packets basis.
+   *
+   * \param reqHdr
+   * \param originator
+   * \param duration
+   * \param blockAckReqTxMode
    */
   void SendBlockAckAfterBlockAckRequest (const CtrlBAckRequestHeader reqHdr, Mac48Address originator,
                                          Time duration, WifiMode blockAckReqTxMode);
-  /*
+  /**
    * This method creates block ack frame with header equals to <i>blockAck</i> and start its transmission.
+   *
+   * \param blockAck
+   * \param originator
+   * \param immediate
+   * \param duration
+   * \param blockAckReqTxMode
    */
   void SendBlockAckResponse (const CtrlBAckResponseHeader* blockAck, Mac48Address originator, bool immediate,
                              Time duration, WifiMode blockAckReqTxMode);
-  /*
+  /**
    * Every time that a block ack request or a packet with ack policy equals to <i>block ack</i>
    * are received, if a relative block ack agreement exists and the value of inactivity timeout
    * is not 0, the timer is reset.
    * see section 11.5.3 in IEEE802.11e for more details.
+   *
+   * \param agreement
    */
   void ResetBlockAckInactivityTimerIfNeeded (BlockAckAgreement &agreement);
 
+  /**
+   * Set up WifiPhy listener for this MacLow.
+   *
+   * \param phy the WifiPhy this MacLow is connected to
+   */
   void SetupPhyMacLowListener (Ptr<WifiPhy> phy);
 
-  Ptr<WifiPhy> m_phy;
-  Ptr<WifiRemoteStationManager> m_stationManager;
-  MacLowRxCallback m_rxCallback;
+  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
+  /**
+   * typedef for an iterator for a list of MacLowDcfListener.
+   */
   typedef std::vector<MacLowDcfListener *>::const_iterator DcfListenersCI;
+  /**
+   * typedef for a list of MacLowDcfListener.
+   */
   typedef std::vector<MacLowDcfListener *> DcfListeners;
-  DcfListeners m_dcfListeners;
+  DcfListeners m_dcfListeners; //!< List of MacLowDcfListener (pass events to Dcf)
 
-  EventId m_normalAckTimeoutEvent;
-  EventId m_fastAckTimeoutEvent;
-  EventId m_superFastAckTimeoutEvent;
-  EventId m_fastAckFailedTimeoutEvent;
-  EventId m_blockAckTimeoutEvent;
-  EventId m_ctsTimeoutEvent;
-  EventId m_sendCtsEvent;
-  EventId m_sendAckEvent;
-  EventId m_sendDataEvent;
-  EventId m_waitSifsEvent;
-  EventId m_endTxNoAckEvent;
-  EventId m_navCounterResetCtsMissed;
-  EventId m_waitRifsEvent;
-
-  Ptr<Packet> m_currentPacket;
-  WifiMacHeader m_currentHdr;
-  MacLowTransmissionParameters m_txParams;
-  MacLowTransmissionListener *m_listener;
-  Mac48Address m_self;
-  Mac48Address m_bssid;
-  Time m_ackTimeout;
-  Time m_basicBlockAckTimeout;
-  Time m_compressedBlockAckTimeout;
-  Time m_ctsTimeout;
-  Time m_sifs;
-  Time m_slotTime;
-  Time m_pifs;
-  Time m_rifs;
+  EventId m_normalAckTimeoutEvent;      //!< Normal ACK timeout event
+  EventId m_fastAckTimeoutEvent;        //!< Fast ACK timeout event
+  EventId m_superFastAckTimeoutEvent;   //!< Super fast ACK timeout event
+  EventId m_fastAckFailedTimeoutEvent;  //!< Fast ACK failed timeout event
+  EventId m_blockAckTimeoutEvent;       //!< Block ACK timeout event
+  EventId m_ctsTimeoutEvent;            //!< CTS timeout event
+  EventId m_sendCtsEvent;               //!< Event to send CTS
+  EventId m_sendAckEvent;               //!< Event to send ACK
+  EventId m_sendDataEvent;              //!< Event to send DATA
+  EventId m_waitSifsEvent;              //!< Wait for SIFS event
+  EventId m_endTxNoAckEvent;            //!< Event for finishing transmission that does not require ACK
+  EventId m_navCounterResetCtsMissed;   //!< Event to reset NAV when CTS is not received
+  EventId m_waitRifsEvent;              //!< Wait for RIFS event
+
+  Ptr<Packet> m_currentPacket;              //!< Current packet transmitted/to be transmitted
+  WifiMacHeader m_currentHdr;               //!< Header of the current packet
+  MacLowTransmissionParameters m_txParams;  //!< Transmission parameters of the current packet
+  MacLowTransmissionListener *m_listener;   //!< Transmission listener for the current packet
+  Mac48Address m_self;                      //!< Address of this MacLow (Mac48Address)
+  Mac48Address m_bssid;                     //!< BSSID address (Mac48Address)
+  Time m_ackTimeout;                        //!< ACK timeout duration
+  Time m_basicBlockAckTimeout;              //!< Basic block ACK timeout duration
+  Time m_compressedBlockAckTimeout;         //!< Compressed block ACK timeout duration
+  Time m_ctsTimeout;                        //!< CTS timeout duration
+  Time m_sifs;                              //!< Short Interframe Space (SIFS) duration
+  Time m_slotTime;                          //!< Slot duration
+  Time m_pifs;                              //!< PCF Interframe Space (PIFS) duration
+  Time m_rifs;                              //!< Reduced Interframe Space (RIFS) duration
 
-  Time m_lastNavStart;
-  Time m_lastNavDuration;
+  Time m_lastNavStart;     //!< The time when the latest NAV started
+  Time m_lastNavDuration;  //!< The duration of the latest NAV
 
-  bool m_promisc;
+  bool m_promisc;  //!< Flag if the device is operating in promiscuous mode
 
-  // Listerner needed to monitor when a channel switching occurs.
-  class PhyMacLowListener * m_phyMacLowListener;
+  class PhyMacLowListener * m_phyMacLowListener; //!< Listerner needed to monitor when a channel switching occurs.
 
   /*
    * BlockAck data structures.
diff -Naur ns-3.18.1/src/wifi/model/mac-rx-middle.cc ns-3.19/src/wifi/model/mac-rx-middle.cc
--- ns-3.18.1/src/wifi/model/mac-rx-middle.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/mac-rx-middle.cc	2013-12-20 09:44:50.000000000 -0800
@@ -33,10 +33,20 @@
 namespace ns3 {
 
 
+/**
+ * A class to keep track of the packet originator status.
+ * It recomposes the packet from multiple fragments.
+ */
 class OriginatorRxStatus
 {
 private:
+  /**
+   * typedef for a list of fragments (i.e. incomplete Packet).
+   */
   typedef std::list<Ptr<const Packet> > Fragments;
+  /**
+   * typedef for a const iterator for Fragments
+   */
   typedef std::list<Ptr<const Packet> >::const_iterator FragmentsCI;
 
   bool m_defragmenting;
@@ -53,16 +63,37 @@
   {
     m_fragments.clear ();
   }
+  /**
+   * Check if we are de-fragmenting packets.
+   *
+   * \return true if we are de-fragmenting packets,
+   *         false otherwise
+   */
   bool IsDeFragmenting (void)
   {
     return m_defragmenting;
   }
+  /**
+   * We have received a first fragmented packet.
+   * We start the deframentation by saving the first fragment.
+   *
+   * \param packet the first fragmented packet
+   */
   void AccumulateFirstFragment (Ptr<const Packet> packet)
   {
     NS_ASSERT (!m_defragmenting);
     m_defragmenting = true;
     m_fragments.push_back (packet);
   }
+  /**
+   * We have received a last fragment of the fragmented packets
+   * (indicated by the no more fragment field).
+   * We re-construct the packet from the fragments we saved
+   * and return the full packet.
+   *
+   * \param packet the last fragment
+   * \return the fully reconstructed packet
+   */
   Ptr<Packet> AccumulateLastFragment (Ptr<const Packet> packet)
   {
     NS_ASSERT (m_defragmenting);
@@ -76,11 +107,25 @@
     m_fragments.erase (m_fragments.begin (), m_fragments.end ());
     return full;
   }
+  /**
+   * We received a fragmented packet (not first and not last).
+   * We simply save it into our internal list.
+   *
+   * \param packet the received fragment
+   */
   void AccumulateFragment (Ptr<const Packet> packet)
   {
     NS_ASSERT (m_defragmenting);
     m_fragments.push_back (packet);
   }
+  /**
+   * Check if the sequence control (i.e. fragment number) is
+   * in order.
+   *
+   * \param sequenceControl the raw sequence control
+   * \return true if the sequence control is in order,
+   *         false otherwise
+   */
   bool IsNextFragment (uint16_t sequenceControl)
   {
     if ((sequenceControl >> 4) == (m_lastSequenceControl >> 4)
@@ -93,10 +138,20 @@
         return false;
       }
   }
+  /**
+   * Return the last sequence control we received.
+   *
+   * \return the last sequence control
+   */
   uint16_t GetLastSequenceControl (void)
   {
     return m_lastSequenceControl;
   }
+  /**
+   * Set the last sequence control we received.
+   *
+   * \param sequenceControl the last sequence control we received
+   */ 
   void SetSequenceControl (uint16_t sequenceControl)
   {
     m_lastSequenceControl = sequenceControl;
diff -Naur ns-3.18.1/src/wifi/model/mac-rx-middle.h ns-3.19/src/wifi/model/mac-rx-middle.h
--- ns-3.18.1/src/wifi/model/mac-rx-middle.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/mac-rx-middle.h	2013-12-20 09:44:50.000000000 -0800
@@ -40,24 +40,75 @@
 class MacRxMiddle
 {
 public:
+  /**
+   * typedef for callback
+   */
   typedef Callback<void, Ptr<Packet>, const WifiMacHeader*> ForwardUpCallback;
 
   MacRxMiddle ();
   ~MacRxMiddle ();
 
+  /**
+   * Set a callback to forward the packet up.
+   *
+   * \param callback
+   */
   void SetForwardCallback (ForwardUpCallback callback);
 
   void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
 private:
   friend class MacRxMiddleTest;
+  /**
+   * Look up for OriginatorRxStatus associated with the sender address
+   * (by looking at ADDR2 field in the header).
+   * The method creates a new OriginatorRxStatus if one is not already presented.
+   *
+   * \param hdr
+   * \return OriginatorRxStatus
+   */
   OriginatorRxStatus* Lookup (const WifiMacHeader* hdr);
+  /**
+   * Check if we have already received the packet from the sender before
+   * (by looking at the sequence control field).
+   *
+   * \param hdr
+   * \param originator
+   * \return true if we already received the packet previously,
+   *         false otherwise
+   */
   bool IsDuplicate (const WifiMacHeader* hdr, OriginatorRxStatus *originator) const;
+  /**
+   * Check if the received packet is a fragment and handle it appropriately.
+   * If the packet is not a fragment, the method returns the packet.
+   * If the packet is a fragment (not the last fragment), the method initiates
+   * de-fragmentation process and return 0.
+   * If the packet is the last fragment, the method tries to re-construct the full packet
+   * and return the packet if success.
+   *
+   * \param packet
+   * \param hdr
+   * \param originator
+   * \return a packet if the packet is successfully reassembled (or not a fragment),
+   *         0 if we failed to reassemble the packet (e.g. missing fragments/out-of-order).
+   */
   Ptr<Packet> HandleFragments (Ptr<Packet> packet, const WifiMacHeader* hdr,
                                OriginatorRxStatus *originator);
 
+  /**
+   * typedef for a map between address and OriginatorRxStatus
+   */
   typedef std::map <Mac48Address, OriginatorRxStatus *, std::less<Mac48Address> > Originators;
+  /**
+   * typedef for a map between address, OriginatorRxStatus, and Traffic ID
+   */
   typedef std::map <std::pair<Mac48Address, uint8_t>, OriginatorRxStatus *, std::less<std::pair<Mac48Address,uint8_t> > > QosOriginators;
+  /**
+   * typedef for an interator for Originators
+   */
   typedef std::map <Mac48Address, OriginatorRxStatus *, std::less<Mac48Address> >::iterator OriginatorsI;
+  /**
+   * typedef for an interator for QosOriginators
+   */
   typedef std::map <std::pair<Mac48Address, uint8_t>, OriginatorRxStatus *, std::less<std::pair<Mac48Address,uint8_t> > >::iterator QosOriginatorsI;
   Originators m_originatorStatus;
   QosOriginators m_qosOriginatorStatus;
diff -Naur ns-3.18.1/src/wifi/model/mac-tx-middle.h ns-3.19/src/wifi/model/mac-tx-middle.h
--- ns-3.18.1/src/wifi/model/mac-tx-middle.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/mac-tx-middle.h	2013-12-20 09:44:50.000000000 -0800
@@ -42,7 +42,20 @@
   MacTxMiddle ();
   ~MacTxMiddle ();
 
+  /**
+   * Return the next sequence number for the given header.
+   *
+   * \param hdr Wi-Fi header
+   * \return the next sequence number
+   */
   uint16_t GetNextSequenceNumberfor (const WifiMacHeader *hdr);
+  /**
+   * Return the next sequence number for the Traffic ID and destination.
+   *
+   * \param tid Traffic ID
+   * \param addr destination address
+   * \return the next sequence number
+   */
   uint16_t GetNextSeqNumberByTidAndAddress (uint8_t tid, Mac48Address addr) const;
 
 private:
diff -Naur ns-3.18.1/src/wifi/model/mgt-headers.cc ns-3.19/src/wifi/model/mgt-headers.cc
--- ns-3.18.1/src/wifi/model/mgt-headers.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/mgt-headers.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
  *          Probe Request
  ***********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (MgtProbeRequestHeader);
+NS_OBJECT_ENSURE_REGISTERED (MgtProbeRequestHeader)
+  ;
 
 MgtProbeRequestHeader::~MgtProbeRequestHeader ()
 {
@@ -122,7 +123,8 @@
  *          Probe Response
  ***********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (MgtProbeResponseHeader);
+NS_OBJECT_ENSURE_REGISTERED (MgtProbeResponseHeader)
+  ;
 
 MgtProbeResponseHeader::MgtProbeResponseHeader ()
 {
@@ -255,7 +257,8 @@
  *          Assoc Request
  ***********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (MgtAssocRequestHeader);
+NS_OBJECT_ENSURE_REGISTERED (MgtAssocRequestHeader)
+  ;
 
 MgtAssocRequestHeader::MgtAssocRequestHeader ()
   : m_listenInterval (0)
@@ -367,7 +370,8 @@
  *          Assoc Response
  ***********************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (MgtAssocResponseHeader);
+NS_OBJECT_ENSURE_REGISTERED (MgtAssocResponseHeader)
+  ;
 
 MgtAssocResponseHeader::MgtAssocResponseHeader ()
   : m_aid (0)
@@ -501,6 +505,7 @@
     case MESH_INTERWORKING:
     case MESH_RESOURCE_COORDINATION:
     case MESH_PROXY_FORWARDING:
+    case VENDOR_SPECIFIC_ACTION:
       break;
     }
 }
@@ -523,6 +528,8 @@
       return MESH_RESOURCE_COORDINATION;
     case MESH_PROXY_FORWARDING:
       return MESH_PROXY_FORWARDING;
+    case VENDOR_SPECIFIC_ACTION:
+      return VENDOR_SPECIFIC_ACTION;
     default:
       NS_FATAL_ERROR ("Unknown action value");
       return MESH_PEERING_MGT;
@@ -579,7 +586,8 @@
           retval.peerLink = PEER_LINK_OPEN; /* quiet compiler */
         }
       break ;
-      
+    case VENDOR_SPECIFIC_ACTION:
+      break ;
     case MESH_LINK_METRIC:
     // not yet supported
     case MESH_INTERWORKING:
@@ -633,7 +641,8 @@
 *                 ADDBARequest
 ****************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (MgtAddBaRequestHeader);
+NS_OBJECT_ENSURE_REGISTERED (MgtAddBaRequestHeader)
+  ;
 
 MgtAddBaRequestHeader::MgtAddBaRequestHeader ()
   : m_dialogToken (1),
@@ -809,7 +818,8 @@
 *                 ADDBAResponse
 ****************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (MgtAddBaResponseHeader);
+NS_OBJECT_ENSURE_REGISTERED (MgtAddBaResponseHeader)
+  ;
 
 MgtAddBaResponseHeader::MgtAddBaResponseHeader ()
   : m_dialogToken (1),
@@ -975,7 +985,8 @@
 *                     DelBa
 ****************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (MgtDelBaHeader);
+NS_OBJECT_ENSURE_REGISTERED (MgtDelBaHeader)
+  ;
 
 MgtDelBaHeader::MgtDelBaHeader ()
   : m_reasonCode (1)
diff -Naur ns-3.18.1/src/wifi/model/mgt-headers.h ns-3.19/src/wifi/model/mgt-headers.h
--- ns-3.18.1/src/wifi/model/mgt-headers.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/mgt-headers.h	2013-12-20 09:44:50.000000000 -0800
@@ -43,14 +43,54 @@
   MgtAssocRequestHeader ();
   ~MgtAssocRequestHeader ();
 
+  /**
+   * Set the Service Set Identifier (SSID).
+   *
+   * \param ssid SSID
+   */
   void SetSsid (Ssid ssid);
+  /**
+   * Set the supported rates.
+   *
+   * \param rates the supported rates
+   */
   void SetSupportedRates (SupportedRates rates);
+  /**
+   * Set the listen interval.
+   *
+   * \param interval the listen interval
+   */
   void SetListenInterval (uint16_t interval);
+  /**
+   * Set the HT capabilities.
+   *
+   * \param htcapabilities HT capabilities
+   */
   void SetHtCapabilities(HtCapabilities htcapabilities);
   
+  /**
+   * Return the HT capabilities.
+   *
+   * \return HT capabilities
+   */
   HtCapabilities GetHtCapabilities (void) const;
+  /**
+   * Return the Service Set Identifier (SSID).
+   *
+   * \return SSID
+   */
   Ssid GetSsid (void) const;
+  /**
+   * Return the supported rates.
+   *
+   * \return the supported rates
+   */
   SupportedRates GetSupportedRates (void) const;
+  /**
+   * Return the listen interval.
+   *
+   * \return the listen interval
+   */
   uint16_t GetListenInterval (void) const;
 
   static TypeId GetTypeId (void);
@@ -61,10 +101,10 @@
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
 private:
-  Ssid m_ssid;
-  SupportedRates m_rates;
-  CapabilityInformation m_capability;
-  HtCapabilities m_htCapability;
+  Ssid m_ssid; //!< Service Set ID (SSID)
+  SupportedRates m_rates; //!< List of supported rates
+  CapabilityInformation m_capability; //!< Capability information
+  HtCapabilities m_htCapability; //!< HT capabilities
   uint16_t m_listenInterval;
 };
 
@@ -79,12 +119,42 @@
   MgtAssocResponseHeader ();
   ~MgtAssocResponseHeader ();
 
+  /**
+   * Return the status code.
+   *
+   * \return the status code
+   */
   StatusCode GetStatusCode (void);
+  /**
+   * Return the supported rates.
+   *
+   * \return the supported rates
+   */
   SupportedRates GetSupportedRates (void);
+  /**
+   * Return the HT capabilities.
+   *
+   * \return HT capabilities
+   */
   HtCapabilities GetHtCapabilities (void) const;
 
+  /**
+   * Set the HT capabilities.
+   *
+   * \param htcapabilities HT capabilities
+   */
   void SetHtCapabilities(HtCapabilities htcapabilities);
+  /**
+   * Set the supported rates.
+   *
+   * \param rates the supported rates
+   */
   void SetSupportedRates (SupportedRates rates);
+  /**
+   * Set the status code.
+   *
+   * \param code the status code
+   */
   void SetStatusCode (StatusCode code);
 
   static TypeId GetTypeId (void);
@@ -95,11 +165,11 @@
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
 private:
-  SupportedRates m_rates;
-  CapabilityInformation m_capability;
-  StatusCode m_code;
+  SupportedRates m_rates; //!< List of supported rates
+  CapabilityInformation m_capability; //!< Capability information
+  StatusCode m_code; //!< Status code
   uint16_t m_aid;
-  HtCapabilities m_htCapability;
+  HtCapabilities m_htCapability; //!< HT capabilities
 };
 
 
@@ -112,12 +182,42 @@
 public:
   ~MgtProbeRequestHeader ();
 
+  /**
+   * Set the Service Set Identifier (SSID).
+   *
+   * \param ssid SSID
+   */
   void SetSsid (Ssid ssid);
+  /**
+   * Set the supported rates.
+   *
+   * \param rates the supported rates
+   */
   void SetSupportedRates (SupportedRates rates);
+  /**
+   * Return the Service Set Identifier (SSID).
+   *
+   * \return SSID
+   */
   Ssid GetSsid (void) const;
+  /**
+   * Return the supported rates.
+   *
+   * \return the supported rates
+   */
   SupportedRates GetSupportedRates (void) const;
- HtCapabilities GetHtCapabilities (void) const;
+  /**
+   * Return the HT capabilities.
+   *
+   * \return HT capabilities
+   */
+  HtCapabilities GetHtCapabilities (void) const;
 
+  /**
+   * Set the HT capabilities.
+   *
+   * \param htcapabilities HT capabilities
+   */
   void SetHtCapabilities(HtCapabilities htcapabilities);
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
@@ -126,9 +226,9 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 private:
-  Ssid m_ssid;
-  SupportedRates m_rates;
-  HtCapabilities m_htCapability;
+  Ssid m_ssid; //!< Service Set ID (SSID)
+  SupportedRates m_rates; //!< List of supported rates
+  HtCapabilities m_htCapability; //!< HT capabilities
 };
 
 
@@ -142,15 +242,60 @@
   MgtProbeResponseHeader ();
   ~MgtProbeResponseHeader ();
 
+  /**
+   * Return the Service Set Identifier (SSID).
+   *
+   * \return SSID
+   */
   Ssid GetSsid (void) const;
+  /**
+   * Return the beacon interval in microseconds unit.
+   *
+   * \return beacon interval in microseconds unit
+   */
   uint64_t GetBeaconIntervalUs (void) const;
+  /**
+   * Return the supported rates.
+   *
+   * \return the supported rates
+   */
   SupportedRates GetSupportedRates (void) const;
- HtCapabilities GetHtCapabilities (void) const;
+  /**
+   * Return the HT capabilities.
+   *
+   * \return HT capabilities
+   */
+  HtCapabilities GetHtCapabilities (void) const;
 
+  /**
+   * Set the HT capabilities.
+   *
+   * \param htcapabilities HT capabilities
+   */
   void SetHtCapabilities(HtCapabilities htcapabilities);
+  /**
+   * Set the Service Set Identifier (SSID).
+   *
+   * \param ssid SSID
+   */
   void SetSsid (Ssid ssid);
+  /**
+   * Set the beacon interval in microseconds unit.
+   *
+   * \param us beacon interval in microseconds unit
+   */
   void SetBeaconIntervalUs (uint64_t us);
+  /**
+   * Set the supported rates.
+   *
+   * \param rates the supported rates
+   */
   void SetSupportedRates (SupportedRates rates);
+  /**
+   * Return the time stamp.
+   *
+   * \return time stamp
+   */
   uint64_t GetTimestamp ();
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;
@@ -160,12 +305,12 @@
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
 private:
-  uint64_t m_timestamp;
-  Ssid m_ssid;
-  uint64_t m_beaconInterval;
-  SupportedRates m_rates;
-  CapabilityInformation m_capability;
-  HtCapabilities m_htCapability;
+  uint64_t m_timestamp; //!< Timestamp
+  Ssid m_ssid; //!< Service set ID (SSID)
+  uint64_t m_beaconInterval; //!< Beacon interval
+  SupportedRates m_rates; //!< List of supported rates
+  CapabilityInformation m_capability; //!< Capability information
+  HtCapabilities m_htCapability; //!< HT capabilities
 };
 
 
@@ -194,8 +339,11 @@
   WifiActionHeader ();
   ~WifiActionHeader ();
 
-  /* Compatible with open80211s implementation */
-  enum CategoryValue //table 7-24 staring from 4
+  /**
+   * Compatible with open80211s implementation
+   * Category values - see 802.11-2012 Table 8-38
+   */
+  enum CategoryValue
   {
     BLOCK_ACK = 3,
     MESH_PEERING_MGT = 30,
@@ -204,8 +352,13 @@
     MESH_INTERWORKING = 33,
     MESH_RESOURCE_COORDINATION = 34,
     MESH_PROXY_FORWARDING = 35,
+    // 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 */
+  /**
+   * Compatible with open80211s implementation
+   */
   enum PeerLinkMgtActionValue
   {
     PEER_LINK_OPEN = 0,
@@ -217,7 +370,9 @@
     LINK_METRIC_REQUEST = 0,
     LINK_METRIC_REPORT,
   };
-  /* Compatible with open80211s implementation */
+  /**
+   * Compatible with open80211s implementation
+   */
   enum PathSelectionActionValue
   {
     PATH_SELECTION = 0,
@@ -239,12 +394,19 @@
     TBTT_ADJUSTMENT_REQUEST,
     MESH_CHANNEL_SWITCH_ANNOUNCEMENT,
   };
+  /**
+   * Block ACK action field values
+   * See 802.11 Table 8-202
+   */
   enum BlockAckActionValue
   {
     BLOCK_ACK_ADDBA_REQUEST = 0,
     BLOCK_ACK_ADDBA_RESPONSE = 1,
     BLOCK_ACK_DELBA = 2
   };
+  /**
+   * typedef for union of different ActionValues
+   */
   typedef union
   {
     enum PeerLinkMgtActionValue peerLink;
@@ -254,9 +416,25 @@
     enum ResourceCoordinationActionValue resourceCoordination;
     enum BlockAckActionValue blockAck;
   } ActionValue;
+  /**
+   * Set action for this Action header.
+   *
+   * \param type category
+   * \param action action
+   */
   void   SetAction (enum CategoryValue type,ActionValue action);
 
+  /**
+   * Return the category value.
+   *
+   * \return CategoryValue
+   */
   CategoryValue GetCategory ();
+  /**
+   * Return the action value.
+   *
+   * \return ActionValue
+   */
   ActionValue GetAction ();
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId () const;
@@ -265,8 +443,8 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 private:
-  uint8_t m_category;
-  uint8_t m_actionValue;
+  uint8_t m_category; //!< Category of the action
+  uint8_t m_actionValue; //!< Action value
 };
 
 /**
@@ -285,34 +463,115 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
+  /**
+   * Enable delayed Block ACK.
+   */
   void SetDelayedBlockAck ();
+  /**
+   * Enable immediate Block ACK
+   */
   void SetImmediateBlockAck ();
+  /**
+   * Set Traffic ID (TID).
+   *
+   * \param tid traffic ID
+   */
   void SetTid (uint8_t tid);
+  /**
+   * Set timeout.
+   *
+   * \param timeout timeout
+   */
   void SetTimeout (uint16_t timeout);
+  /**
+   * Set buffer size.
+   *
+   * \param size buffer size
+   */
   void SetBufferSize (uint16_t size);
+  /**
+   * Set the starting sequence number.
+   *
+   * \param seq the starting sequence number
+   */
   void SetStartingSequence (uint16_t seq);
+  /**
+   * Enable or disable A-MSDU support.
+   *
+   * \param supported enable or disable A-MSDU support
+   */
   void SetAmsduSupport (bool supported);
 
+  /**
+   * Return the starting sequence number.
+   *
+   * \return the starting sequence number
+   */
   uint16_t GetStartingSequence (void) const;
+  /**
+   * Return the Traffic ID (TID).
+   *
+   * \return TID
+   */
   uint8_t GetTid (void) const;
+  /**
+   * Return whether the Block ACK policy is immediate Block ACK.
+   *
+   * \return true if immediate Block ACK is being used, false otherwise
+   */
   bool IsImmediateBlockAck (void) const;
+  /**
+   * Return the timeout.
+   *
+   * \return timeout
+   */
   uint16_t GetTimeout (void) const;
+  /**
+   * Return the buffer size.
+   *
+   * \return the buffer size.
+   */
   uint16_t GetBufferSize (void) const;
+  /**
+   * Return whether A-MSDU capability is supported.
+   *
+   * \return true is A-MSDU is supported, false otherwise
+   */
   bool IsAmsduSupported (void) const;
 
 private:
+  /**
+   * Return the raw parameter set.
+   *
+   * \return the raw parameter set
+   */
   uint16_t GetParameterSet (void) const;
+  /**
+   * Set the parameter set from the given raw value.
+   *
+   * \param params raw parameter set value
+   */
   void SetParameterSet (uint16_t params);
+  /**
+   * Return the raw sequence control.
+   *
+   * \return the raw sequence control
+   */
   uint16_t GetStartingSequenceControl (void) const;
+  /**
+   * Set sequence control with the given raw value.
+   *
+   * \param seqControl
+   */
   void SetStartingSequenceControl (uint16_t seqControl);
 
   uint8_t m_dialogToken; /* Not used for now */
-  uint8_t m_amsduSupport;
-  uint8_t m_policy;
-  uint8_t m_tid;
-  uint16_t m_bufferSize;
-  uint16_t m_timeoutValue;
-  uint16_t m_startingSeq;
+  uint8_t m_amsduSupport; //!< Flag if A-MSDU is supported
+  uint8_t m_policy; //!< Block ACK policy
+  uint8_t m_tid; //!< Traffic ID
+  uint16_t m_bufferSize; //!< Buffer size
+  uint16_t m_timeoutValue; //!< Timeout
+  uint16_t m_startingSeq; //!< Starting sequence number
 };
 
 
@@ -332,32 +591,103 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
+  /**
+   * Enable delayed Block ACK.
+   */
   void SetDelayedBlockAck ();
+  /**
+   * Enable immediate Block ACK
+   */
   void SetImmediateBlockAck ();
+  /**
+   * Set Traffic ID (TID).
+   *
+   * \param tid traffic ID
+   */
   void SetTid (uint8_t tid);
+  /**
+   * Set timeout.
+   *
+   * \param timeout timeout
+   */
   void SetTimeout (uint16_t timeout);
+  /**
+   * Set buffer size.
+   *
+   * \param size buffer size
+   */
   void SetBufferSize (uint16_t size);
+  /**
+   * Set the status code.
+   *
+   * \param code the status code
+   */
   void SetStatusCode (StatusCode code);
+  /**
+   * Enable or disable A-MSDU support.
+   *
+   * \param supported enable or disable A-MSDU support
+   */
   void SetAmsduSupport (bool supported);
 
+  /**
+   * Return the status code.
+   *
+   * \return the status code
+   */
   StatusCode GetStatusCode (void) const;
+  /**
+   * Return the Traffic ID (TID).
+   *
+   * \return TID
+   */
   uint8_t GetTid (void) const;
+  /**
+   * Return whether the Block ACK policy is immediate Block ACK.
+   *
+   * \return true if immediate Block ACK is being used, false otherwise
+   */
   bool IsImmediateBlockAck (void) const;
+  /**
+   * Return the timeout.
+   *
+   * \return timeout
+   */
   uint16_t GetTimeout (void) const;
+  /**
+   * Return the buffer size.
+   *
+   * \return the buffer size.
+   */
   uint16_t GetBufferSize (void) const;
+  /**
+   * Return whether A-MSDU capability is supported.
+   *
+   * \return true is A-MSDU is supported, false otherwise
+   */
   bool IsAmsduSupported (void) const;
 
 private:
+  /**
+   * Return the raw parameter set.
+   *
+   * \return the raw parameter set
+   */
   uint16_t GetParameterSet (void) const;
+  /**
+   * Set the parameter set from the given raw value.
+   *
+   * \param params raw parameter set value
+   */
   void SetParameterSet (uint16_t params);
 
   uint8_t m_dialogToken; /* Not used for now */
-  StatusCode m_code;
-  uint8_t m_amsduSupport;
-  uint8_t m_policy;
-  uint8_t m_tid;
-  uint16_t m_bufferSize;
-  uint16_t m_timeoutValue;
+  StatusCode m_code; //!< Status code
+  uint8_t m_amsduSupport; //!< Flag if A-MSDU is supported
+  uint8_t m_policy; //!< Block ACK policy
+  uint8_t m_tid; //!< Traffic ID
+  uint16_t m_bufferSize; //!< Buffer size
+  uint16_t m_timeoutValue; //!< Timeout
 };
 
 
@@ -377,18 +707,50 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
+  /**
+   * Check if the initiator bit in the DELBA is setted.
+   *
+   * \return true if the initiator bit in the DELBA is setted,
+   *         false otherwise
+   */
   bool IsByOriginator (void) const;
+  /**
+   * Return the Traffic ID (TID).
+   *
+   * \return TID
+   */
   uint8_t GetTid (void) const;
+  /**
+   * Set Traffic ID (TID).
+   *
+   * \param tid traffic ID
+   */
   void SetTid (uint8_t);
+  /**
+   * Set the initiator bit in the DELBA.
+   */
   void SetByOriginator (void);
+  /**
+   * Un-set the initiator bit in the DELBA.
+   */
   void SetByRecipient (void);
 
 private:
+  /**
+   * Return the raw parameter set.
+   *
+   * \return the raw parameter set
+   */
   uint16_t GetParameterSet (void) const;
+  /**
+   * Set the parameter set from the given raw value.
+   *
+   * \param params raw parameter set value
+   */
   void SetParameterSet (uint16_t params);
 
   uint16_t m_initiator;
-  uint16_t m_tid;
+  uint16_t m_tid; //!< Traffic ID
   /* Not used for now.
      Always set to 1: "Unspecified reason" */
   uint16_t m_reasonCode;
diff -Naur ns-3.18.1/src/wifi/model/minstrel-wifi-manager.cc ns-3.19/src/wifi/model/minstrel-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/minstrel-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/minstrel-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -45,7 +45,12 @@
 
 namespace ns3 {
 
-
+/**
+ * \brief hold per-remote-station state for Minstrel Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the Minstrel Wifi manager
+ */
 struct MinstrelWifiRemoteStation : public WifiRemoteStation
 {
   Time m_nextStatsUpdate;  ///< 10 times every second
@@ -78,7 +83,8 @@
   bool m_initialized;  ///< for initializing tables
 };
 
-NS_OBJECT_ENSURE_REGISTERED (MinstrelWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (MinstrelWifiManager)
+  ;
 
 TypeId
 MinstrelWifiManager::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/minstrel-wifi-manager.h ns-3.19/src/wifi/model/minstrel-wifi-manager.h
--- ns-3.18.1/src/wifi/model/minstrel-wifi-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/minstrel-wifi-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -123,6 +123,12 @@
 
   /// for estimating the TxTime of a packet with a given mode
   Time GetCalcTxTime (WifiMode mode) const;
+  /**
+   * Add transmission time for the given mode to an internal list.
+   *
+   * \param mode Wi-Fi mode
+   * \param t transmission time
+   */
   void AddCalcTxTime (WifiMode mode, Time t);
 
   /// update the number of retries and reset accordingly
@@ -151,7 +157,11 @@
 
   void CheckInit (MinstrelWifiRemoteStation *station);  ///< check for initializations
 
-
+  /**
+   * typedef for a vector of a pair of Time, WifiMode.
+   * (Essentially a list for WifiMode and its corresponding transmission time
+   * to transmit a reference packet.
+   */
   typedef std::vector<std::pair<Time,WifiMode> > TxTime;
   MinstrelRate m_minstrelTable;  ///< minstrel table
   SampleRate m_sampleTable;  ///< sample table
diff -Naur ns-3.18.1/src/wifi/model/msdu-aggregator.cc ns-3.19/src/wifi/model/msdu-aggregator.cc
--- ns-3.18.1/src/wifi/model/msdu-aggregator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/msdu-aggregator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MsduAggregator);
+NS_OBJECT_ENSURE_REGISTERED (MsduAggregator)
+  ;
 
 TypeId
 MsduAggregator::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/msdu-standard-aggregator.cc ns-3.19/src/wifi/model/msdu-standard-aggregator.cc
--- ns-3.18.1/src/wifi/model/msdu-standard-aggregator.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/msdu-standard-aggregator.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MsduStandardAggregator);
+NS_OBJECT_ENSURE_REGISTERED (MsduStandardAggregator)
+  ;
 
 TypeId
 MsduStandardAggregator::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/msdu-standard-aggregator.h ns-3.19/src/wifi/model/msdu-standard-aggregator.h
--- ns-3.18.1/src/wifi/model/msdu-standard-aggregator.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/msdu-standard-aggregator.h	2013-12-20 09:44:50.000000000 -0800
@@ -40,6 +40,7 @@
    * \param aggregatedPacket Packet that will contain <i>packet</i>, if aggregation is possible,
    * \param src Source address of <i>packet</i>.
    * \param dest Destination address of <i>packet</i>.
+   * \return true if the packet can be aggregated, false otherwise
    *
    * This method performs an MSDU aggregation.
    * Returns true if <i>packet</i> can be aggregated to <i>aggregatedPacket</i>, false otherwise.
@@ -47,9 +48,13 @@
   virtual bool Aggregate (Ptr<const Packet> packet, Ptr<Packet> aggregatedPacket,
                           Mac48Address src, Mac48Address dest);
 private:
-  /*  Calculates how much padding must be added to the end of aggregated packet,
-      after that a new packet is added.
-      Each A-MSDU subframe is padded so that its length is multiple of 4 octets.
+  /** 
+   * Calculates how much padding must be added to the end of aggregated packet,
+   * after that a new packet is added.
+   * Each A-MSDU subframe is padded so that its length is multiple of 4 octets.
+   *
+   * \param packet
+   * \return the number of octets required for padding
    */
   uint32_t CalculatePadding (Ptr<const Packet> packet);
 
diff -Naur ns-3.18.1/src/wifi/model/nist-error-rate-model.cc ns-3.19/src/wifi/model/nist-error-rate-model.cc
--- ns-3.18.1/src/wifi/model/nist-error-rate-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/nist-error-rate-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (NistErrorRateModel);
+NS_OBJECT_ENSURE_REGISTERED (NistErrorRateModel)
+  ;
 
 TypeId
 NistErrorRateModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/nist-error-rate-model.h ns-3.19/src/wifi/model/nist-error-rate-model.h
--- ns-3.18.1/src/wifi/model/nist-error-rate-model.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/nist-error-rate-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -45,17 +45,80 @@
   virtual double GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbits) const;
 
 private:
+  /**
+   * Return the coded BER for the given p and b.
+   *
+   * \param p
+   * \param bValue
+   * \return BER
+   */
   double CalculatePe (double p, uint32_t bValue) const;
+  /**
+   * Return BER of BPSK at the given SNR.
+   *
+   * \param snr snr value
+   * \return BER of BPSK at the given SNR
+   */
   double GetBpskBer (double snr) const;
+  /**
+   * Return BER of QPSK at the given SNR.
+   *
+   * \param snr snr value
+   * \return BER of QPSK at the given SNR
+   */
   double GetQpskBer (double snr) const;
+  /**
+   * Return BER of QAM16 at the given SNR.
+   *
+   * \param snr snr value
+   * \return BER of QAM16 at the given SNR
+   */
   double Get16QamBer (double snr) const;
+  /**
+   * Return BER of QAM64 at the given SNR.
+   *
+   * \param snr snr value
+   * \return BER of QAM64 at the given SNR
+   */
   double Get64QamBer (double snr) const;
+  /**
+   * Return BER of BPSK at the given SNR after applying FEC.
+   *
+   * \param snr snr value
+   * \param nbits the number of bits in the chunk
+   * \param bValue
+   * \return BER of BPSK at the given SNR after applying FEC
+   */
   double GetFecBpskBer (double snr, double nbits,
                         uint32_t bValue) const;
+  /**
+   * Return BER of QPSK at the given SNR after applying FEC.
+   *
+   * \param snr snr value
+   * \param nbits the number of bits in the chunk
+   * \param bValue
+   * \return BER of QPSK at the given SNR after applying FEC
+   */
   double GetFecQpskBer (double snr, double nbits,
                         uint32_t bValue) const;
+  /**
+   * Return BER of QAM16 at the given SNR after applying FEC.
+   *
+   * \param snr snr value
+   * \param nbits the number of bits in the chunk
+   * \param bValue
+   * \return BER of QAM16 at the given SNR after applying FEC
+   */
   double GetFec16QamBer (double snr, uint32_t nbits,
                          uint32_t bValue) const;
+  /**
+   * Return BER of QAM64 at the given SNR after applying FEC.
+   *
+   * \param snr snr value
+   * \param nbits the number of bits in the chunk
+   * \param bValue
+   * \return BER of QAM64 at the given SNR after applying FEC
+   */
   double GetFec64QamBer (double snr, uint32_t nbits,
                          uint32_t bValue) const;
 };
diff -Naur ns-3.18.1/src/wifi/model/onoe-wifi-manager.cc ns-3.19/src/wifi/model/onoe-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/onoe-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/onoe-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,6 +29,12 @@
 
 namespace ns3 {
 
+/**
+ * \brief hold per-remote-station state for ONOE Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the ONOE Wifi manager
+ */
 struct OnoeWifiRemoteStation : public WifiRemoteStation
 {
   Time m_nextModeUpdate;
@@ -42,7 +48,8 @@
 };
 
 
-NS_OBJECT_ENSURE_REGISTERED (OnoeWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (OnoeWifiManager)
+  ;
 
 TypeId
 OnoeWifiManager::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/onoe-wifi-manager.h ns-3.19/src/wifi/model/onoe-wifi-manager.h
--- ns-3.18.1/src/wifi/model/onoe-wifi-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/onoe-wifi-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -62,6 +62,11 @@
   virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
   virtual bool IsLowLatency (void) const;
 
+  /**
+   * Update the number of retry (both short and long).
+   *
+   * \param station
+   */
   void UpdateRetry (OnoeWifiRemoteStation *station);
   void UpdateMode (OnoeWifiRemoteStation *station);
 
diff -Naur ns-3.18.1/src/wifi/model/originator-block-ack-agreement.h ns-3.19/src/wifi/model/originator-block-ack-agreement.h
--- ns-3.18.1/src/wifi/model/originator-block-ack-agreement.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/originator-block-ack-agreement.h	2013-12-20 09:44:50.000000000 -0800
@@ -94,17 +94,46 @@
     UNSUCCESSFUL
   };
   void SetState (enum State state);
+  /**
+   * Check if the current state of this agreement is PENDING.
+   *
+   * \return true if the current state of this agreement is PENDING,
+   *         false otherwise
+   */
   bool IsPending (void) const;
+  /**
+   * Check if the current state of this agreement is ESTABLISHED.
+   *
+   * \return true if the current state of this agreement is ESTABLISHED,
+   *         false otherwise
+   */
   bool IsEstablished (void) const;
+  /**
+   * Check if the current state of this agreement is INACTIVE.
+   *
+   * \return true if the current state of this agreement is INACTIVE,
+   *         false otherwise
+   */
   bool IsInactive (void) const;
+  /**
+   * Check if the current state of this agreement is UNSUCCESSFUL.
+   *
+   * \return true if the current state of this agreement is UNSUCCESSFUL,
+   *         false otherwise
+   */
   bool IsUnsuccessful (void) const;
   /**
    * Notifies a packet's transmission with ack policy Block Ack.
+   *
+   * \param nextSeqNumber
    */
   void NotifyMpduTransmission (uint16_t nextSeqNumber);
   /**
    * Returns true if all packets for which a block ack was negotiated have been transmitted so
    * a block ack request is needed in order to acknowledge them.
+   *
+   * \return  true if all packets for which a block ack was negotiated have been transmitted,
+   * false otherwise
    */
   bool IsBlockAckRequestNeeded (void) const;
   void CompleteExchange (void);
diff -Naur ns-3.18.1/src/wifi/model/qos-blocked-destinations.h ns-3.19/src/wifi/model/qos-blocked-destinations.h
--- ns-3.18.1/src/wifi/model/qos-blocked-destinations.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/qos-blocked-destinations.h	2013-12-20 09:44:50.000000000 -0800
@@ -26,19 +26,55 @@
 
 namespace ns3 {
 
+/**
+ * Keep track of destination address - TID pairs that are waiting
+ * for a block ACK response.
+ */
 class QosBlockedDestinations
 {
 public:
   QosBlockedDestinations ();
   ~QosBlockedDestinations ();
 
+  /**
+   * Block the given destination address and TID from sending (e.g. pending
+   * block ACK response).
+   *
+   * \param dest
+   * \param tid
+   */
   void Block (Mac48Address dest, uint8_t tid);
+  /**
+   * Un-block the given destination address and TID (e.g. block ACK
+   * response received).
+   *
+   * \param dest
+   * \param tid
+   */
   void Unblock (Mac48Address dest, uint8_t tid);
+  /**
+   * Check if the given destination address and TID are blocked
+   * from sending (e.g. pending block ACK response).
+   *
+   * \param dest
+   * \param tid
+   * \return true if the given destination address and TID are blocked
+   *         from sending, false otherwise
+   */
   bool IsBlocked (Mac48Address dest, uint8_t tid) const;
 
 private:
+  /**
+   * typedef for a list of <Mac48Address, TID> pair.
+   */
   typedef std::list<std::pair<Mac48Address, uint8_t> > BlockedPackets;
+  /**
+   * typedef for an iterator of BlockedPackets
+   */
   typedef std::list<std::pair<Mac48Address, uint8_t> >::iterator BlockedPacketsI;
+  /**
+   * typedef for a constan iterator of BlockedPackets
+   */
   typedef std::list<std::pair<Mac48Address, uint8_t> >::const_iterator BlockedPacketsCI;
   BlockedPackets m_blockedQosPackets;
 };
diff -Naur ns-3.18.1/src/wifi/model/qos-tag.cc ns-3.19/src/wifi/model/qos-tag.cc
--- ns-3.18.1/src/wifi/model/qos-tag.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/qos-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (QosTag);
+NS_OBJECT_ENSURE_REGISTERED (QosTag)
+  ;
 
 TypeId
 QosTag::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/qos-tag.h ns-3.19/src/wifi/model/qos-tag.h
--- ns-3.18.1/src/wifi/model/qos-tag.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/qos-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -70,7 +70,9 @@
   QosTag ();
 
   /**
-   * Create a QosTag with the given TID
+   * Create a QosTag with the given Traffic ID
+   *
+   * \param tid the given Traffic ID
    */
   QosTag (uint8_t tid);
 
@@ -100,10 +102,15 @@
   virtual uint32_t GetSerializedSize () const;
   virtual void Print (std::ostream &os) const;
 
+  /**
+   * Return the Type ID.
+   *
+   * \return type ID
+   */
   uint8_t GetTid (void) const;
 
 private:
-  uint8_t m_tid;
+  uint8_t m_tid;  //!< Traffic ID
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/wifi/model/qos-utils.h ns-3.19/src/wifi/model/qos-utils.h
--- ns-3.18.1/src/wifi/model/qos-utils.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/qos-utils.h	2013-12-20 09:44:50.000000000 -0800
@@ -52,6 +52,9 @@
  * \ingroup wifi
  * Maps TID (Traffic ID) to Access classes.
  * For more details see table 9-1 of IEEE802.11 standard.
+ *
+ * \param tid the Traffic ID to be mapped to Access class
+ * \return the access class for the given TID
  */
 AcIndex QosUtilsMapTidToAc (uint8_t tid);
 
@@ -59,6 +62,10 @@
  * \ingroup wifi
  * If a qos tag is attached to the packet, returns a value < 8.
  * A value >= 8 is returned otherwise.
+ *
+ * \param packet the packet to checked for a QoS tag
+ * \return a value less than 8 if QoS tag was present, a value >= 8
+ *         is returned if no QoS tag was present
  */
 uint8_t QosUtilsGetTidForPacket (Ptr<const Packet> packet);
 
@@ -67,6 +74,10 @@
  * Next function is useful to correctly sort buffered packets under block ack.
  * When an BAR is received from originator station, completed "old"
  * (see section 9.10.3 in IEEE802.11e) packets must be forwarded up before "new" packets.
+ *
+ * \param seqControl the sequence control field
+ * \param endSequence
+ * \return a unique integer for the given sequence control and end sequence
  */
 uint32_t QosUtilsMapSeqControlToUniqueInteger (uint16_t seqControl, uint16_t endSequence);
 
@@ -102,7 +113,9 @@
  * if that packet (with sequence number <i>numberSeq</i>)) belongs to the section of the
  * sequence number space marked with '-' characters. The function returns false otherwise.
  *
- *
+ * \param startingSeq the starting sequence number
+ * \param seqNumber the sequence number to be checked
+ * \return true if the packet is old, false otherwise
  */
 bool QosUtilsIsOldPacket (uint16_t startingSeq, uint16_t seqNumber);
 
diff -Naur ns-3.18.1/src/wifi/model/random-stream.h ns-3.19/src/wifi/model/random-stream.h
--- ns-3.18.1/src/wifi/model/random-stream.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/random-stream.h	2013-12-20 09:44:50.000000000 -0800
@@ -34,6 +34,13 @@
 {
 public:
   virtual ~RandomStream ();
+  /**
+   * Get integer between min and max (including min and max).
+   *
+   * \param min lower bound (inclusive)
+   * \param max upper bound (inclusive)
+   * \return a random number between min and max (including min and max)
+   */
   virtual uint32_t GetNext (uint32_t min, uint32_t max) = 0;
 
  /**
@@ -71,6 +78,11 @@
 class TestRandomStream : public RandomStream
 {
 public:
+  /**
+   * Add the given value to the list.
+   *
+   * \param v
+   */
   void AddNext (uint32_t v);
   virtual uint32_t GetNext (uint32_t min, uint32_t max);
 
diff -Naur ns-3.18.1/src/wifi/model/regular-wifi-mac.cc ns-3.19/src/wifi/model/regular-wifi-mac.cc
--- ns-3.18.1/src/wifi/model/regular-wifi-mac.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/regular-wifi-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac);
+NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac)
+  ;
 
 RegularWifiMac::RegularWifiMac ()
 {
diff -Naur ns-3.18.1/src/wifi/model/regular-wifi-mac.h ns-3.19/src/wifi/model/regular-wifi-mac.h
--- ns-3.18.1/src/wifi/model/regular-wifi-mac.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/regular-wifi-mac.h	2013-12-20 09:44:50.000000000 -0800
@@ -87,39 +87,51 @@
 
   Time GetRifs (void) const;
   /**
-   * \returns the current PIFS duration.
+   * \return the current PIFS duration.
    */
   Time GetPifs (void) const;
   /**
-   * \returns the current SIFS duration.
+   * \return the current SIFS duration.
    */
   Time GetSifs (void) const;
   /**
-   * \returns the current slot duration.
+   * \return the current slot duration.
    */
   Time GetSlot (void) const;
   /**
-   * \returns the current EIFS minus DIFS duration
+   * \return the current EIFS minus DIFS duration
    */
   Time GetEifsNoDifs (void) const;
   /**
-   * \returns the current CTS timeout duration.
+   * \return the current CTS timeout duration.
    */
   Time GetCtsTimeout (void) const;
   /**
-   * \returns the current ACK timeout duration.
+   * \return the current ACK timeout duration.
    */
   Time GetAckTimeout (void) const;
 
+  /**
+   * Enable or disable CTS-to-self feature.
+   *
+   * \param enable true if CTS-to-self is to be supported,
+   *        false otherwise
+   */
   void SetCtsToSelfSupported (bool enable);
  
+  /**
+   * Return whether the device supports CTS-to-self
+   * capability.
+   *
+   * \return true if CTS-to-self is supported, false otherwise.
+   */
   bool GetCtsToSelfSupported () const;
   /**
-   * \returns the MAC address associated to this MAC layer.
+   * \return the MAC address associated to this MAC layer.
    */
   virtual Mac48Address GetAddress (void) const;
   /**
-   * \returns the ssid which this MAC layer is going to try to stay in.
+   * \return the ssid which this MAC layer is going to try to stay in.
    */
   virtual Ssid GetSsid (void) const;
   /**
@@ -135,7 +147,7 @@
    */
   virtual void SetBssid (Mac48Address bssid);
   /**
-   * \returns the bssid of the network this device belongs to.
+   * \return the bssid of the network this device belongs to.
    */
   virtual Mac48Address GetBssid (void) const;
   /**
@@ -175,7 +187,7 @@
    */
   virtual void SetWifiPhy (Ptr<WifiPhy> phy);
   /**
-   * \returns the physical layer attached to this MAC.
+   * \return the physical layer attached to this MAC.
    */
   virtual Ptr<WifiPhy> GetWifiPhy () const;
   /**
@@ -183,7 +195,7 @@
    */
   virtual void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager);
   /**
-   * \returns the station manager attached to this MAC.
+   * \return the station manager attached to this MAC.
    */
   virtual Ptr<WifiRemoteStationManager> GetWifiRemoteStationManager () const;
 
@@ -222,19 +234,19 @@
   virtual void DoInitialize ();
   virtual void DoDispose ();
 
-  MacRxMiddle *m_rxMiddle;
-  MacTxMiddle *m_txMiddle;
-  Ptr<MacLow> m_low;
-  DcfManager *m_dcfManager;
-  Ptr<WifiPhy> m_phy;
-
-  Ptr<WifiRemoteStationManager> m_stationManager;
-
-  ForwardUpCallback m_forwardUp;
-  Callback<void> m_linkUp;
-  Callback<void> m_linkDown;
+  MacRxMiddle *m_rxMiddle; //!< RX middle (de-fragmentation etc.)
+  MacTxMiddle *m_txMiddle; //!< TX middle (aggregation etc.)
+  Ptr<MacLow> m_low; //!< MacLow (RTS, CTS, DATA, ACK etc.)
+  DcfManager *m_dcfManager; //!< DCF manager (access to channel)
+  Ptr<WifiPhy> m_phy; //!< Wifi PHY
+
+  Ptr<WifiRemoteStationManager> m_stationManager; //!< Remote station manager (rate control, RTS/CTS/fragmentation thresholds etc.)
+
+  ForwardUpCallback m_forwardUp; //!< Callback to forward packet up the stack
+  Callback<void> m_linkUp; //!< Callback when a link is up
+  Callback<void> m_linkDown; //!< Callback when a link is down
 
-  Ssid m_ssid;
+  Ssid m_ssid; //!< Service Set ID (SSID)
 
   /** This holds a pointer to the DCF instance for this WifiMac - used
   for transmission of frames to non-QoS peers. */
@@ -248,6 +260,38 @@
   EdcaQueues m_edca;
 
   /**
+   * Accessor for the DCF object
+   * 
+   * \return a smart pointer to DcaTxop
+   */
+  Ptr<DcaTxop> GetDcaTxop (void) const;
+
+  /**
+   * Accessor for the AC_VO channel access function
+   * 
+   * \return a smart pointer to EdcaTxopN
+   */
+  Ptr<EdcaTxopN> GetVOQueue (void) const;
+  /**
+   * Accessor for the AC_VI channel access function
+   * 
+   * \return a smart pointer to EdcaTxopN
+   */
+  Ptr<EdcaTxopN> GetVIQueue (void) const;
+  /**
+   * Accessor for the AC_BE channel access function
+   * 
+   * \return a smart pointer to EdcaTxopN
+   */
+  Ptr<EdcaTxopN> GetBEQueue (void) const;
+  /**
+   * Accessor for the AC_BK channel access function
+   * 
+   * \return a smart pointer to EdcaTxopN
+   */
+  Ptr<EdcaTxopN> GetBKQueue (void) const;
+
+  /**
    * \param standard the phy standard to be used
    *
    * This method is called by ns3::WifiMac::ConfigureStandard to
@@ -286,9 +330,28 @@
    * \param hdr a pointer to the MAC header of the received frame.
    */
   virtual void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
+    /**
+   * The packet we sent was successfully received by the receiver
+   * (i.e. we received an ACK from the receiver).
+   * 
+   * \param hdr the header of the packet that we successfully sent
+   */
   virtual void TxOk (const WifiMacHeader &hdr);
+  /**
+   * The packet we sent was successfully received by the receiver
+   * (i.e. we did not receive an ACK from the receiver).
+   *
+   * \param hdr the header of the packet that we failed to sent
+   */
   virtual void TxFailed (const WifiMacHeader &hdr);
 
+  /**
+   * Forward the packet up to the device.
+   *
+   * \param packet the packet that we are forwarding up to the device
+   * \param from the address of the source
+   * \param to the address of the destination
+   */
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
 
   /**
@@ -325,9 +388,17 @@
    * however.
    */
   bool m_qosSupported;
-  /** Set accessor for the \c m_qosSupported member */
+  /**
+   * Enable or disable QoS support for the device.
+   *
+   * \param enable whether QoS is supported
+   */
   void SetQosSupported (bool enable);
-  /** Get accessor for the \c m_qosSupported member */
+  /** 
+   * Return whether the device supports QoS.
+   *
+   * \return true if QoS is supported, false otherwise
+   */
   bool GetQosSupported () const;
 
  /**
@@ -344,9 +415,17 @@
    * however.
    */
   bool m_htSupported;
-  /** Set accessor for the \c m_htSupported member */
+  /**
+   * Enable or disable HT support for the device.
+   *
+   * \param enable whether HT is supported
+   */
   void SetHtSupported (bool enable);
-  /** Get accessor for the \c m_htSupported member */
+  /**
+   * Return whether the device supports QoS.
+   *
+   * \return true if HT is supported, false otherwise
+   */
   bool GetHtSupported () const;
 
 private:
@@ -361,18 +440,6 @@
    */
   void SetupEdcaQueue (enum AcIndex ac);
 
-  /** Accessor for the DCF object */
-  Ptr<DcaTxop> GetDcaTxop (void) const;
-
-  /** Accessor for the AC_VO channel access function */
-  Ptr<EdcaTxopN> GetVOQueue (void) const;
-  /** Accessor for the AC_VI channel access function */
-  Ptr<EdcaTxopN> GetVIQueue (void) const;
-  /** Accessor for the AC_BE channel access function */
-  Ptr<EdcaTxopN> GetBEQueue (void) const;
-  /** Accessor for the AC_BK channel access function */
-  Ptr<EdcaTxopN> GetBKQueue (void) const;
-
   TracedCallback<const WifiMacHeader &> m_txOkCallback;
   TracedCallback<const WifiMacHeader &> m_txErrCallback;
 };
diff -Naur ns-3.18.1/src/wifi/model/rraa-wifi-manager.cc ns-3.19/src/wifi/model/rraa-wifi-manager.cc
--- ns-3.18.1/src/wifi/model/rraa-wifi-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/rraa-wifi-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -32,6 +32,12 @@
 
 namespace ns3 {
 
+/**
+ * \brief hold per-remote-station state for RRAA Wifi manager.
+ *
+ * This struct extends from WifiRemoteStation struct to hold additional
+ * information required by the RRAA Wifi manager
+ */
 struct RraaWifiRemoteStation : public WifiRemoteStation
 {
   uint32_t m_counter;
@@ -46,7 +52,8 @@
   uint32_t m_rate;
 };
 
-NS_OBJECT_ENSURE_REGISTERED (RraaWifiManager);
+NS_OBJECT_ENSURE_REGISTERED (RraaWifiManager)
+  ;
 
 TypeId
 RraaWifiManager::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/rraa-wifi-manager.h ns-3.19/src/wifi/model/rraa-wifi-manager.h
--- ns-3.18.1/src/wifi/model/rraa-wifi-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/rraa-wifi-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -71,13 +71,61 @@
                           Ptr<const Packet> packet, bool normally);
   virtual bool IsLowLatency (void) const;
 
+  /**
+   * Return the index for the maximum transmission rate for
+   * the given station.
+   *
+   * \param station
+   * \return the index for the maximum transmission rate
+   */
   uint32_t GetMaxRate (RraaWifiRemoteStation *station);
+  /**
+   * Return the index for the minimum transmission rate for
+   * the given station.
+   *
+   * \param station
+   * \return the index for the minimum transmission rate
+   */
   uint32_t GetMinRate (RraaWifiRemoteStation *station);
+  /**
+   * Check if the counter should be resetted.
+   *
+   * \param station
+   */
   void CheckTimeout (RraaWifiRemoteStation *station);
+  /**
+   * Find an appropriate rate for the given station, using
+   * a basic algorithm.
+   *
+   * \param station
+   */
   void RunBasicAlgorithm (RraaWifiRemoteStation *station);
+  /**
+   * Activate the use of RTS for the given station if the conditions are met.
+   *
+   * \param station
+   */
   void ARts (RraaWifiRemoteStation *station);
+  /**
+   * Reset the counters of the given station.
+   *
+   * \param station
+   */
   void ResetCountersBasic (RraaWifiRemoteStation *station);
+  /**
+   * Get a threshold for the given mode.
+   *
+   * \param mode
+   * \return threshold
+   */
   struct ThresholdsItem GetThresholds (WifiMode mode) const;
+  /**
+   * Get a threshold for the given station and mode index.
+   *
+   * \param station
+   * \param rate
+   * \return threshold
+   */
   struct ThresholdsItem GetThresholds (RraaWifiRemoteStation *station, uint32_t rate) const;
 
   bool m_basic;
diff -Naur ns-3.18.1/src/wifi/model/snr-tag.cc ns-3.19/src/wifi/model/snr-tag.cc
--- ns-3.18.1/src/wifi/model/snr-tag.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/snr-tag.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SnrTag);
+NS_OBJECT_ENSURE_REGISTERED (SnrTag)
+  ;
 
 TypeId
 SnrTag::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/snr-tag.h ns-3.19/src/wifi/model/snr-tag.h
--- ns-3.18.1/src/wifi/model/snr-tag.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/snr-tag.h	2013-12-20 09:44:50.000000000 -0800
@@ -44,6 +44,7 @@
 
   /**
    * Create a SnrTag with the given snr value
+   * \param snr the given SNR value
    */
   SnrTag(double snr);
 
@@ -55,12 +56,17 @@
   /**
    * Set the SNR to the given value.
    *
-   * @param snr the value of the snr to set
+   * \param snr the value of the snr to set
    */
   void Set (double snr);
+  /**
+   * Return the SNR value.
+   *
+   * \return the SNR value
+   */
   double Get (void) const;
 private:
-  double m_snr;
+  double m_snr;  //!< SNR value
 };
 
 
diff -Naur ns-3.18.1/src/wifi/model/ssid.cc ns-3.19/src/wifi/model/ssid.cc
--- ns-3.18.1/src/wifi/model/ssid.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ssid.cc	2013-12-20 09:44:50.000000000 -0800
@@ -129,6 +129,13 @@
 
 ATTRIBUTE_HELPER_CPP (Ssid);
 
+/**
+ * Serialize SSID to the given ostream
+ *
+ * \param os
+ * \param ssid
+ * \return std::ostream
+ */
 std::ostream &
 operator << (std::ostream &os, const Ssid &ssid)
 {
@@ -136,6 +143,13 @@
   return os;
 }
 
+/**
+ * Serialize from the given istream to this SSID.
+ *
+ * \param is
+ * \param ssid
+ * \return std::istream
+ */
 std::istream &operator >> (std::istream &is, Ssid &ssid)
 {
   std::string str;
diff -Naur ns-3.18.1/src/wifi/model/ssid.h ns-3.19/src/wifi/model/ssid.h
--- ns-3.18.1/src/wifi/model/ssid.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/ssid.h	2013-12-20 09:44:50.000000000 -0800
@@ -37,12 +37,41 @@
 public:
   // broadcast ssid
   Ssid ();
+  /**
+   * Create SSID from a given string
+   *
+   * \param s SSID in string
+   */
   Ssid (std::string s);
+  /**
+   * Create SSID from a given array of char and given length.
+   *
+   * \param ssid
+   * \param length
+   */
   Ssid (char const ssid[32], uint8_t length);
 
+  /**
+   * Check if the two SSIDs are equal.
+   *
+   * \param o SSID to compare to
+   * \return true if the two SSIDs are equal,
+   *         false otherwise
+   */
   bool IsEqual (const Ssid& o) const;
+  /**
+   * Check if the SSID is broadcast.
+   *
+   * \return true if the SSID is broadcast,
+   *         false otherwise
+   */
   bool IsBroadcast (void) const;
 
+  /**
+   * Peek the SSID.
+   *
+   * \return a pointer to SSID string
+   */
   char* PeekString (void) const;
 
   WifiInformationElementId ElementId () const;
@@ -52,8 +81,8 @@
                                        uint8_t length);
 
 private:
-  uint8_t m_ssid[33];
-  uint8_t m_length;
+  uint8_t m_ssid[33]; //!< Raw SSID value
+  uint8_t m_length;   //!< Length of the SSID
 };
 
 std::ostream &operator << (std::ostream &os, const Ssid &ssid);
diff -Naur ns-3.18.1/src/wifi/model/status-code.cc ns-3.19/src/wifi/model/status-code.cc
--- ns-3.18.1/src/wifi/model/status-code.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/status-code.cc	2013-12-20 09:44:50.000000000 -0800
@@ -61,6 +61,13 @@
   return start;
 }
 
+/**
+ * Serialize StatusCode to the given ostream.
+ *
+ * \param os
+ * \param code
+ * \return std::ostream
+ */
 std::ostream &
 operator << (std::ostream &os, const StatusCode &code)
 {
diff -Naur ns-3.18.1/src/wifi/model/status-code.h ns-3.19/src/wifi/model/status-code.h
--- ns-3.18.1/src/wifi/model/status-code.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/status-code.h	2013-12-20 09:44:50.000000000 -0800
@@ -26,17 +26,54 @@
 
 namespace ns3 {
 
+/**
+ * Status code for association response.
+ */
 class StatusCode
 {
 public:
   StatusCode ();
+  /**
+   * Set success bit to 0 (success).
+   */
   void SetSuccess (void);
+  /**
+   * Set success bit to 1 (failure.
+   */
   void SetFailure (void);
 
+  /**
+   * Return whether the status code is success.
+   *
+   * \return true if success, false otherwise
+   */
   bool IsSuccess (void) const;
 
+  /**
+   * \returns the expected size of the status code.
+   *
+   * This method should return the number of bytes which are needed to store
+   * the status code data by Serialize.
+   */
   uint32_t GetSerializedSize (void) const;
+  /**
+   * \param start an iterator which points to where the status code should
+   *        be written.
+   * \return Buffer::Iterator
+   *
+   * This method is used to store a status code into the byte buffer.
+   * The data written is expected to match bit-for-bit the representation of this
+   * header in a real network.
+   */
   Buffer::Iterator Serialize (Buffer::Iterator start) const;
+  /**
+   * \param start an iterator which points to where the status code should be read.
+   * \returns the number of bytes read.
+   *
+   * This method is used to re-create a status code from the byte buffer. 
+   * The data read is expected to match bit-for-bit the representation of this
+   * header in real networks.
+   */
   Buffer::Iterator Deserialize (Buffer::Iterator start);
 private:
   uint16_t m_code;
diff -Naur ns-3.18.1/src/wifi/model/sta-wifi-mac.cc ns-3.19/src/wifi/model/sta-wifi-mac.cc
--- ns-3.18.1/src/wifi/model/sta-wifi-mac.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/sta-wifi-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -60,7 +60,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (StaWifiMac);
+NS_OBJECT_ENSURE_REGISTERED (StaWifiMac)
+  ;
 
 TypeId
 StaWifiMac::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/sta-wifi-mac.h ns-3.19/src/wifi/model/sta-wifi-mac.h
--- ns-3.18.1/src/wifi/model/sta-wifi-mac.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/sta-wifi-mac.h	2013-12-20 09:44:50.000000000 -0800
@@ -84,6 +84,9 @@
   void StartActiveAssociation (void);
 
 private:
+  /**
+   * The current MAC state of the STA.
+   */
   enum MacState
   {
     ASSOCIATED,
@@ -93,21 +96,86 @@
     REFUSED
   };
 
+  /**
+   * Enable or disable active probing.
+   *
+   * \param enable enable or disable active probing
+   */
   void SetActiveProbing (bool enable);
+  /**
+   * Return whether active probing is enabled.
+   *
+   * \return true if active probing is enabled, false otherwise
+   */
   bool GetActiveProbing (void) const;
   virtual void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
+
+  /**
+   * Forward a probe request packet to the DCF. The standard is not clear on the correct
+   * queue for management frames if QoS is supported. We always use the DCF.
+   */
   void SendProbeRequest (void);
+  /**
+   * Forward an association request packet to the DCF. The standard is not clear on the correct
+   * queue for management frames if QoS is supported. We always use the DCF.
+   */
   void SendAssociationRequest (void);
+  /**
+   * Try to ensure that we are associated with an AP by taking an appropriate action
+   * depending on the current association status.
+   */
   void TryToEnsureAssociated (void);
+  /**
+   * This method is called after the association timeout occurred. We switch the state to 
+   * WAIT_ASSOC_RESP and re-send an association request.
+   */
   void AssocRequestTimeout (void);
+  /**
+   * This method is called after the probe request timeout occurred. We switch the state to 
+   * WAIT_PROBE_RESP and re-send a probe request.
+   */
   void ProbeRequestTimeout (void);
+  /**
+   * Return whether we are associated with an AP.
+   *
+   * \return true if we are associated with an AP, false otherwise
+   */
   bool IsAssociated (void) const;
+  /**
+   * Return whether we are waiting for an association response from an AP.
+   *
+   * \return true if we are waiting for an association response from an AP, false otherwise
+   */
   bool IsWaitAssocResp (void) const;
+  /**
+   * This method is called after we have not received a beacon from the AP 
+   */
   void MissedBeacons (void);
+  /**
+   * Restarts the beacon timer. 
+   *
+   * \param delay the delay before the watchdog fires
+   */
   void RestartBeaconWatchdog (Time delay);
+  /**
+   * Return an instance of SupportedRates that contains all rates that we support
+   * including HT rates.
+   *
+   * \return SupportedRates all rates that we support
+   */
   SupportedRates GetSupportedRates (void) const;
+  /**
+   * Set the current MAC state.
+   *
+   * \param value the new state
+   */
   void SetState (enum MacState value);
 
+  /**
+   * Return the HT capability of the current AP.
+   * 
+   * \return the HT capability that we support
+   */
   HtCapabilities GetHtCapabilities (void) const;
 
 
diff -Naur ns-3.18.1/src/wifi/model/supported-rates.cc ns-3.19/src/wifi/model/supported-rates.cc
--- ns-3.18.1/src/wifi/model/supported-rates.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/supported-rates.cc	2013-12-20 09:44:50.000000000 -0800
@@ -217,6 +217,13 @@
   return length;
 }
 
+/**
+ * Serialize SupportedRates to the given ostream.
+ *
+ * \param os
+ * \param rates
+ * \return std::ostream
+ */
 std::ostream &operator << (std::ostream &os, const SupportedRates &rates)
 {
   os << "[";
diff -Naur ns-3.18.1/src/wifi/model/supported-rates.h ns-3.19/src/wifi/model/supported-rates.h
--- ns-3.18.1/src/wifi/model/supported-rates.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/supported-rates.h	2013-12-20 09:44:50.000000000 -0800
@@ -53,6 +53,12 @@
 {
 public:
   ExtendedSupportedRatesIE ();
+  /**
+   * Create an extended supported rates information element
+   * from the given rates.
+   *
+   * \param rates
+   */
   ExtendedSupportedRatesIE (SupportedRates *rates);
 
   WifiInformationElementId ElementId () const;
@@ -61,13 +67,23 @@
   uint8_t DeserializeInformationField (Buffer::Iterator start,
                                        uint8_t length);
 
-  /*
+  /**
    * This information element is a bit special in that it is only
    * included if there are more than 8 rates. To support this we
    * override the Serialize and GetSerializedSize methods of
    * WifiInformationElement.
+   *
+   * \param start
+   * \return an iterator
    */
   Buffer::Iterator Serialize (Buffer::Iterator start) const;
+  /**
+   * Return the serialized size of this supported rates 
+   * information element.
+   * 
+   * \return the serialized size of this supported rates 
+   * information element
+   */
   uint16_t GetSerializedSize () const;
 private:
   /**
@@ -94,13 +110,46 @@
 public:
   SupportedRates ();
 
+  /**
+   * Add the given rate to the supported rates.
+   *
+   * \param bs the rate to be added
+   */
   void AddSupportedRate (uint32_t bs);
+  /**
+   * Set the given rate to basic rates.
+   *
+   * \param bs the rate to be set
+   */
   void SetBasicRate (uint32_t bs);
 
+  /**
+   * Check if the given rate is supported.
+   *
+   * \param bs the rate to be checked
+   * \return true if the rate is supported, false otherwise
+   */
   bool IsSupportedRate (uint32_t bs) const;
+  /**
+   * Check if the given rate is a basic rate.
+   *
+   * \param bs the rate to be checked
+   * \return true if the rate is a basic rate, false otherwise
+   */
   bool IsBasicRate (uint32_t bs) const;
 
+  /**
+   * Return the number of supported rates.
+   *
+   * \return the number of supported rates
+   */
   uint8_t GetNRates (void) const;
+  /**
+   * Return the rate at the given index.
+   *
+   * \param i the given index
+   * \return the rate
+   */
   uint32_t GetRate (uint8_t i) const;
 
   WifiInformationElementId ElementId () const;
@@ -119,8 +168,8 @@
   friend class ExtendedSupportedRatesIE;
   ExtendedSupportedRatesIE extended;
 private:
-  uint8_t m_nRates;
-  uint8_t m_rates[MAX_SUPPORTED_RATES];
+  uint8_t m_nRates;  //!< Number of supported rates
+  uint8_t m_rates[MAX_SUPPORTED_RATES];  //!< List of supported bitrate (divided by 500000)
 };
 
 std::ostream &operator << (std::ostream &os, const SupportedRates &rates);
diff -Naur ns-3.18.1/src/wifi/model/wifi-channel.cc ns-3.19/src/wifi/model/wifi-channel.cc
--- ns-3.18.1/src/wifi/model/wifi-channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiChannel);
+NS_OBJECT_ENSURE_REGISTERED (WifiChannel)
+  ;
 
 TypeId
 WifiChannel::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/wifi-information-element.h ns-3.19/src/wifi/model/wifi-information-element.h
--- ns-3.18.1/src/wifi/model/wifi-information-element.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-information-element.h	2013-12-20 09:44:50.000000000 -0800
@@ -131,48 +131,99 @@
 {
 public:
   virtual ~WifiInformationElement ();
-  /// Serialize entire IE including Element ID and length fields
+  /**
+   * Serialize entire IE including Element ID and length fields
+   *
+   * \param i an iterator which points to where the IE should
+   *        be written.
+   * \return an iterator
+   */
   Buffer::Iterator Serialize (Buffer::Iterator i) const;
-  /// Deserialize entire IE, which must be present. The iterator
-  /// passed in must be pointing at the Element ID (i.e., the very
-  /// first octet) of the correct type of information element,
-  /// otherwise this method will generate a fatal error.
+  /**
+   * Deserialize entire IE, which must be present. The iterator
+   * passed in must be pointing at the Element ID (i.e., the very
+   * first octet) of the correct type of information element,
+   * otherwise this method will generate a fatal error.
+   *
+   * \param i an iterator which points to where the IE should be read.
+   * \return an iterator
+   */
   Buffer::Iterator Deserialize (Buffer::Iterator i);
-  /// Deserialize entire IE if it is present. The iterator passed in
-  /// must be pointing at the Element ID of an information element. If
-  /// the Element ID is not the one that the given class is interested
-  /// in then it will return the same iterator.
+  /**
+   * Deserialize entire IE if it is present. The iterator passed in
+   * must be pointing at the Element ID of an information element. If
+   * the Element ID is not the one that the given class is interested
+   * in then it will return the same iterator.
+   *
+   * \param i an iterator which points to where the IE should be read.
+   * \return an iterator
+   */
   Buffer::Iterator DeserializeIfPresent (Buffer::Iterator i);
-  /// Get the size of the serialized IE including Element ID and
-  /// length fields.
+  /**
+   * Get the size of the serialized IE including Element ID and
+   * length fields.
+   *
+   * \return the size of the serialized IE
+   */
   uint16_t GetSerializedSize () const;
 
   ///\name Each subclass must implement
   //\{
   /// Own unique Element ID
   virtual WifiInformationElementId ElementId () const = 0;
-  /// Length of serialized information (i.e., the length of the body
-  /// of the IE, not including the Element ID and length octets. This
-  /// is the value that will appear in the second octet of the entire
-  /// IE - the length field)
+  /**
+   * Length of serialized information (i.e., the length of the body
+   * of the IE, not including the Element ID and length octets. This
+   * is the value that will appear in the second octet of the entire
+   * IE - the length field)
+   *
+   * \return the length of serialized information
+   */
   virtual uint8_t GetInformationFieldSize () const = 0;
-  /// Serialize information (i.e., the body of the IE, not including
-  /// the Element ID and length octets)
+  /**
+   * Serialize information (i.e., the body of the IE, not including
+   * the Element ID and length octets)
+   *
+   * \param start an iterator which points to where the information should
+   *        be written.
+   */
   virtual void SerializeInformationField (Buffer::Iterator start) const = 0;
-  /// Deserialize information (i.e., the body of the IE, not including
-  /// the Element ID and length octets)
+  /**
+   * Deserialize information (i.e., the body of the IE, not including
+   * the Element ID and length octets)
+   *
+   * \param start an iterator which points to where the information should
+   *        be written.
+   * \param length
+   * \return the number of bytes read
+   */
   virtual uint8_t DeserializeInformationField (Buffer::Iterator start,
                                                uint8_t length) = 0;
   //\}
 
   /// In addition, a subclass may optionally override the following...
   //\{
-  /// Generate human-readable form of IE
+  /**
+   * Generate human-readable form of IE
+   *
+   * \param os output stream
+   */
   virtual void Print (std::ostream &os) const;
-  /// Compare information elements using Element ID
+  /**
+   * Compare information elements using Element ID
+   *
+   * \param a another information element to compare with
+   * \return true if the Element ID is less than the other IE Element ID,
+   *         false otherwise
+   */
   virtual bool operator< (WifiInformationElement const & a) const;
-  /// Compare two IEs for equality by ID & Length, and then through
-  /// memcmp of serialised version
+  /**
+   * Compare two IEs for equality by ID & Length, and then through
+   * memcmp of serialised version
+   *
+   * \param a another information element to compare with
+   * \return true if the two IEs are equal, false otherwise
+   */
   virtual bool operator== (WifiInformationElement const & a) const;
   //\}
 };
diff -Naur ns-3.18.1/src/wifi/model/wifi-information-element-vector.cc ns-3.19/src/wifi/model/wifi-information-element-vector.cc
--- ns-3.18.1/src/wifi/model/wifi-information-element-vector.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-information-element-vector.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector);
+NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector)
+  ;
 
 WifiInformationElementVector::WifiInformationElementVector ()
   : m_maxSize (1500)
diff -Naur ns-3.18.1/src/wifi/model/wifi-information-element-vector.h ns-3.19/src/wifi/model/wifi-information-element-vector.h
--- ns-3.18.1/src/wifi/model/wifi-information-element-vector.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-information-element-vector.h	2013-12-20 09:44:50.000000000 -0800
@@ -45,8 +45,7 @@
 public:
   WifiInformationElementVector ();
   ~WifiInformationElementVector ();
-  ///\name Inherited from Header
-  // \{
+
   static TypeId GetTypeId ();
   TypeId GetInstanceTypeId () const;
   virtual uint32_t GetSerializedSize () const;
@@ -59,14 +58,14 @@
    */
   virtual uint32_t Deserialize (Buffer::Iterator start);
   virtual void Print (std::ostream &os) const;
-  //\}
+
   /**
    * \brief Needed when you try to deserialize a lonely IE inside other header
    * \param start is the start of the buffer
    * \return deserialized bytes
    */
   virtual uint32_t DeserializeSingleIe (Buffer::Iterator start);
-  ///Set maximum size to control overflow of the max packet length
+  /// Set maximum size to control overflow of the max packet length
   void SetMaxSize (uint16_t size);
   /// As soon as this is a vector, we define an Iterator
   typedef std::vector<Ptr<WifiInformationElement> >::iterator Iterator;
@@ -79,12 +78,22 @@
   /// vector of pointers to information elements is the body of IeVector
   Ptr<WifiInformationElement> FindFirst (WifiInformationElementId id) const;
 
+  /**
+   * Check if the given WifiInformationElementVectors are equivalent.
+   * 
+   * \param a another WifiInformationElementVector
+   * \return true if the given WifiInformationElementVectors are equivalent,
+   *         false otherwise
+   */
   virtual bool operator== (const WifiInformationElementVector & a) const;
 protected:
+  /**
+   * typedef for a vector of WifiInformationElements.
+   */
   typedef std::vector<Ptr<WifiInformationElement> > IE_VECTOR;
   /// Current number of bytes
   uint32_t GetSize () const;
-  IE_VECTOR m_elements;
+  IE_VECTOR m_elements; //!< Information element vector
   /// Size in bytes (actually, max packet length)
   uint16_t m_maxSize;
 };
diff -Naur ns-3.18.1/src/wifi/model/wifi-mac.cc ns-3.19/src/wifi/model/wifi-mac.cc
--- ns-3.18.1/src/wifi/model/wifi-mac.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mac.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,9 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiMac);
+NS_OBJECT_ENSURE_REGISTERED (WifiMac)
+  ;
+  
 
 Time
 WifiMac::GetDefaultMaxPropagationDelay (void)
diff -Naur ns-3.18.1/src/wifi/model/wifi-mac.h ns-3.19/src/wifi/model/wifi-mac.h
--- ns-3.18.1/src/wifi/model/wifi-mac.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mac.h	2013-12-20 09:44:50.000000000 -0800
@@ -85,50 +85,54 @@
    */
   void SetMaxPropagationDelay (Time delay);
 /**
-   * \returns the current RIFS duration.
+   * \return the current RIFS duration.
    */
 
   virtual Time GetRifs (void) const = 0;
 
   /**
-   * \returns the current PIFS duration.
+   * \return the current PIFS duration.
    */
   virtual Time GetPifs (void) const = 0;
   /**
-   * \returns the current SIFS duration.
+   * \return the current SIFS duration.
    */
   virtual Time GetSifs (void) const = 0;
   /**
-   * \returns the current slot duration.
+   * \return the current slot duration.
    */
   virtual Time GetSlot (void) const = 0;
   /**
-   * \returns the current EIFS minus DIFS duration
+   * \return the current EIFS minus DIFS duration
    */
   virtual Time GetEifsNoDifs (void) const = 0;
   /**
-   * \returns the current CTS timeout duration.
+   * \return the current CTS timeout duration.
    */
   virtual Time GetCtsTimeout (void) const = 0;
   /**
-   * \returns the current ACK timeout duration.
+   * \return the current ACK timeout duration.
    */
   virtual Time GetAckTimeout (void) const = 0;
   /**
+   * \return the maximum lifetime of an MSDU.
+   *
    * Unused for now.
    */
   Time GetMsduLifetime (void) const;
   /**
+   * \return the maximum propagation delay.
+   * 
    * Unused for now.
    */
   Time GetMaxPropagationDelay (void) const;
 
   /**
-   * \returns the MAC address associated to this MAC layer.
+   * \return the MAC address associated to this MAC layer.
    */
   virtual Mac48Address GetAddress (void) const = 0;
   /**
-   * \returns the ssid which this MAC layer is going to try to stay in.
+   * \return the ssid which this MAC layer is going to try to stay in.
    */
   virtual Ssid GetSsid (void) const = 0;
   /**
@@ -140,7 +144,7 @@
    */
   virtual void SetSsid (Ssid ssid) = 0;
   /**
-   * \returns the bssid of the network this device belongs to.
+   * \return the bssid of the network this device belongs to.
    */
   virtual Mac48Address GetBssid (void) const = 0;
   /**
@@ -173,6 +177,13 @@
    * access it granted to this MAC.
    */
   virtual void Enqueue (Ptr<const Packet> packet, Mac48Address to) = 0;
+  /**
+   * \return if this MAC supports sending from arbitrary address.
+   *
+   * The interface may or may not support sending from arbitrary address.
+   * This function returns true if sending from arbitrary address is supported,
+   * false otherwise.
+   */
   virtual bool SupportsSendFrom (void) const = 0;
   /**
    * \param phy the physical layer attached to this MAC.
@@ -197,36 +208,65 @@
   /* Next functions are not pure virtual so non Qos WifiMacs are not
    * forced to implement them.
    */
+
+  /**
+   * \param blockAckTimeout the duration for basic block ACK timeout.
+   *
+   * Sets the timeout for basic block ACK.
+   */
   virtual void SetBasicBlockAckTimeout (Time blockAckTimeout);
+  /**
+   * \return the current basic block ACK timeout duration.
+   */
   virtual Time GetBasicBlockAckTimeout (void) const;
+  /**
+   * \param blockAckTimeout
+   *
+   * Sets the timeout for compressed block ACK.
+   */
   virtual void SetCompressedBlockAckTimeout (Time blockAckTimeout);
+  /**
+   * \return the current compressed block ACK timeout duration.
+   */
   virtual Time GetCompressedBlockAckTimeout (void) const;
 
   /**
+   * \param packet the packet being enqueued
+   *
    * Public method used to fire a MacTx trace.  Implemented for encapsulation
-   * purposes.
+   * purposes.  Note this trace indicates that the packet was accepted by the
+   * device only.  The packet may be dropped later (e.g. if the queue is full).
    */
   void NotifyTx (Ptr<const Packet> packet);
 
   /**
+   * \param packet the packet being dropped
+   * 
    * Public method used to fire a MacTxDrop trace.  Implemented for encapsulation
-   * purposes.
+   * purposes.  This trace indicates that the packet was dropped before it was
+   * transmitted (e.g. when a STA is not associated with an AP).
    */
   void NotifyTxDrop (Ptr<const Packet> packet);
 
   /**
+   * \param packet the packet we received
+   * 
    * Public method used to fire a MacRx trace.  Implemented for encapsulation
    * purposes.
    */
   void NotifyRx (Ptr<const Packet> packet);
 
   /**
+   * \param packet the packet we received promiscuously
+   *
    * Public method used to fire a MacPromiscRx trace.  Implemented for encapsulation
    * purposes.
    */
   void NotifyPromiscRx (Ptr<const Packet> packet);
 
   /**
+   * \param packet the packet we received but is not destined for us
+   * 
    * Public method used to fire a MacRxDrop trace.  Implemented for encapsulation
    * purposes.
    */
@@ -237,18 +277,88 @@
   void ConfigureStandard (enum WifiPhyStandard standard);
 
 protected:
+  /**
+   * \param dcf the DCF to be configured
+   * \param cwmin the minimum congestion window for the DCF
+   * \param cwmax the maximum congestion window for the DCF
+   * \param ac the access category for the DCF
+   *
+   * Configure the DCF with appropriate values depending on the given access category.
+   */
   void ConfigureDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac);
 private:
+  /**
+   * \return the default maximum propagation delay
+   *
+   * By default, we get the maximum propagation delay from 1000 m and speed of light
+   * (3e8 m/s).
+   */
   static Time GetDefaultMaxPropagationDelay (void);
+  /**
+   * \return the default slot duration
+   * 
+   * Return a default slot value for 802.11a (9 microseconds).
+   */
   static Time GetDefaultSlot (void);
+  /**
+   * \return the default short interframe space (SIFS)
+   * 
+   * Return a default SIFS value for 802.11a (16 microseconds).
+   */
   static Time GetDefaultSifs (void);
+  /**
+   * \return the default reduced interframe space (RIFS)
+   * 
+   * Return a default RIFS value for 802.11n (2 microseconds).
+   */
   static Time GetDefaultRifs (void);
+  /**
+   * \return the default extended interframe space (EIFS) without
+   *          DCF interframe space (DIFS)
+   * 
+   * Return default SIFS + default CTS-ACK delay
+   */
   static Time GetDefaultEifsNoDifs (void);
+  /**
+   * \return the default CTS-ACK delay
+   * 
+   * Return a default value for 802.11a at 6Mbps (44 microseconds)
+   */
   static Time GetDefaultCtsAckDelay (void);
+  /**
+   * \return the default CTS and ACK timeout
+   * 
+   * Return the default CTS and ACK timeout.
+   * Cts_Timeout and Ack_Timeout are specified in the Annex C
+   * (Formal description of MAC operation, see details on the
+   * Trsp timer setting at page 346)
+   */
   static Time GetDefaultCtsAckTimeout (void);
+  /**
+   * Return the default basic block ACK delay.
+   * Currently it returns 250 microseconds.
+   *
+   * \return the default basic block ACK delay
+   */
   static Time GetDefaultBasicBlockAckDelay (void);
+  /**
+   * Return the default basic block ACK timeout.
+   *
+   * \return the default basic block ACK timeout
+   */
   static Time GetDefaultBasicBlockAckTimeout (void);
+  /**
+   * Return the default compressed block ACK delay.
+   * Currently it returns 76 microseconds.
+   *
+   * \return the default compressed block ACK delay
+   */
   static Time GetDefaultCompressedBlockAckDelay (void);
+  /**
+   * Return the default compressed block ACK timeout.
+   *
+   * \return the default compressed block ACK timeout
+   */
   static Time GetDefaultCompressedBlockAckTimeout (void);
   /**
    * \param standard the phy standard to be used
@@ -262,12 +372,33 @@
 
   Time m_maxPropagationDelay;
 
+  /**
+   * Configure appropriate timing parameters for 802.11a.
+   */
   void Configure80211a (void);
+  /**
+   * Configure appropriate timing parameters for 802.11b.
+   */
   void Configure80211b (void);
+  /**
+   * Configure appropriate timing parameters for 802.11g.
+   */
   void Configure80211g (void);
+  /**
+   * Configure appropriate timing parameters for 802.11 with 10Mhz channel spacing.
+   */
   void Configure80211_10Mhz (void);
+  /**
+   * Configure appropriate timing parameters for 802.11 with 5Mhz channel spacing.
+   */
   void Configure80211_5Mhz ();
+  /**
+   * Configure appropriate timing parameters for 802.11n operating at 2.4Ghz.
+   */
   void Configure80211n_2_4Ghz (void);
+  /**
+   * Configure appropriate timing parameters for 802.11n operating at 5Ghz.
+   */
   void Configure80211n_5Ghz (void);
 
   /**
diff -Naur ns-3.18.1/src/wifi/model/wifi-mac-header.cc ns-3.19/src/wifi/model/wifi-mac-header.cc
--- ns-3.18.1/src/wifi/model/wifi-mac-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mac-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiMacHeader);
+NS_OBJECT_ENSURE_REGISTERED (WifiMacHeader)
+  ;
 
 enum
 {
diff -Naur ns-3.18.1/src/wifi/model/wifi-mac-header.h ns-3.19/src/wifi/model/wifi-mac-header.h
--- ns-3.18.1/src/wifi/model/wifi-mac-header.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mac-header.h	2013-12-20 09:44:50.000000000 -0800
@@ -29,6 +29,9 @@
 
 namespace ns3 {
 
+/**
+ * Combination of valid MAC header type/subtype.
+ */
 enum WifiMacType
 {
   WIFI_MAC_CTL_RTS = 0,
@@ -77,6 +80,9 @@
 class WifiMacHeader : public Header
 {
 public:
+  /**
+   * ACK policy for QoS frames.
+   */
   enum QosAckPolicy
   {
     NORMAL_ACK = 0,
@@ -85,6 +91,9 @@
     BLOCK_ACK = 3,
   };
 
+  /**
+   * Address types.
+   */
   enum AddressType
   {
     ADDR1,
@@ -103,103 +112,513 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
-
+  /**
+   * Set Type/Subtype values for an association request header.
+   */
   void SetAssocReq (void);
+  /**
+   * Set Type/Subtype values for an association response header.
+   */
   void SetAssocResp (void);
+  /**
+   * Set Type/Subtype values for a probe request header.
+   */
   void SetProbeReq (void);
+  /**
+   * Set Type/Subtype values for a probe response header.
+   */
   void SetProbeResp (void);
+  /**
+   * Set Type/Subtype values for a beacon header.
+   */
   void SetBeacon (void);
+  /**
+   * Set Type/Subtype values for a data packet with
+   * no subtype equal to 0.
+   */
   void SetTypeData (void);
+  /**
+   * Set Type/Subtype values for an action header.
+   */
   void SetAction ();
+  /**
+   * Set Type/Subtype values for a Block Ack Request header.
+   */
   void SetBlockAckReq (void);
+  /**
+   * Set Type/Subtype values for a Block Ack header.
+   */
   void SetBlockAck (void);
+  /**
+   * Set Type/Subtype values for a multihop action header.
+   */
   void SetMultihopAction ();
+  /**
+   * Set the From DS bit in the Frame Control field.
+   */
   void SetDsFrom (void);
+  /**
+   * Un-set the From DS bit in the Frame Control field.
+   */
   void SetDsNotFrom (void);
+  /**
+   * Set the To DS bit in the Frame Control field.
+   */
   void SetDsTo (void);
+  /**
+   * Un-set the To DS bit in the Frame Control field.
+   */
   void SetDsNotTo (void);
+  /**
+   * Fill the Address 1 field with the given address.
+   *
+   * \param address the address to be used in the Address 1 field
+   */
   void SetAddr1 (Mac48Address address);
+  /**
+   * Fill the Address 2 field with the given address.
+   *
+   * \param address the address to be used in the Address 2 field
+   */
   void SetAddr2 (Mac48Address address);
+  /**
+   * Fill the Address 3 field with the given address.
+   *
+   * \param address the address to be used in the Address 3 field
+   */
   void SetAddr3 (Mac48Address address);
+  /**
+   * Fill the Address 4 field with the given address.
+   *
+   * \param address the address to be used in the Address 4 field
+   */
   void SetAddr4 (Mac48Address address);
+  /**
+   * Set Type/Subtype values with the correct values depending
+   * on the given type.
+   *
+   * \param type the WifiMacType for the header
+   */
   void SetType (enum WifiMacType type);
+  /**
+   * Set the Duration/ID field with the given raw uint16_t value.
+   *
+   * \param duration the raw duration in uint16_t
+   */
   void SetRawDuration (uint16_t duration);
+  /**
+   * Set the Duration/ID field with the given duration (Time object).
+   * The method converts the given time to microseconds.
+   *
+   * \param duration the duration (Time object)
+   */
   void SetDuration (Time duration);
+  /**
+   * Set the Duration/ID field with the given ID.
+   *
+   * \param id the ID
+   */
   void SetId (uint16_t id);
+  /**
+   * Set the sequence number of the header.
+   *
+   * \param seq the given sequence number
+   */
   void SetSequenceNumber (uint16_t seq);
+  /**
+   * Set the fragment number of the header.
+   *
+   * \param frag the given fragment number
+   */
   void SetFragmentNumber (uint8_t frag);
+  /**
+   * Un-set the More Fragment bit in the Frame Control Field
+   */
   void SetNoMoreFragments (void);
+  /**
+   * Set the More Fragment bit in the Frame Control field
+   */
   void SetMoreFragments (void);
+  /**
+   * Set the Retry bit in the Frame Control field.
+   */
   void SetRetry (void);
+  /**
+   * Un-set the Retry bit in the Frame Control field.
+   */
   void SetNoRetry (void);
+  /**
+   * Set the TID for the QoS header.
+   *
+   * \param tid the TID for the QoS header
+   */
   void SetQosTid (uint8_t tid);
+  /**
+   * Set the end of service period (EOSP) bit in the QoS control field.
+   */
   void SetQosEosp ();
+  /**
+   * Un-set the end of service period (EOSP) bit in the QoS control field.
+   */
   void SetQosNoEosp ();
-  void SetQosAckPolicy (enum QosAckPolicy);
+  /**
+   * Set the QoS ACK policy in the QoS control field.
+   *
+   * \param policy
+   */
+  void SetQosAckPolicy (enum QosAckPolicy policy);
+  /**
+   * Set the QoS ACK policy in the QoS control field to normal ACK.
+   */
   void SetQosNormalAck (void);
+  /**
+   * Set the QoS ACK policy in the QoS control field to block ACK.
+   */
   void SetQosBlockAck (void);
+  /**
+   * Set the QoS ACK policy in the QoS control field to no ACK.
+   */
   void SetQosNoAck (void);
+  /**
+   * Set that A-MSDU is present.
+   */
   void SetQosAmsdu (void);
+  /**
+   * Set that A-MSDU is not present.
+   */
   void SetQosNoAmsdu (void);
+  /**
+   * Set TXOP limit in the QoS control field.
+   *
+   * \param txop
+   */
   void SetQosTxopLimit (uint8_t txop);
+  /**
+   * Set order bit in the frame control field.
+   */
   void SetOrder (void);
+  /**
+   * Unset order bit in the frame control field.
+   */
   void SetNoOrder (void);
 
+  /**
+   * Return the address in the Address 1 field.
+   *
+   * \return the address in the Address 1 field
+   */
   Mac48Address GetAddr1 (void) const;
+  /**
+   * Return the address in the Address 2 field.
+   *
+   * \return the address in the Address 2 field
+   */
   Mac48Address GetAddr2 (void) const;
+  /**
+   * Return the address in the Address 3 field.
+   *
+   * \return the address in the Address 3 field
+   */
   Mac48Address GetAddr3 (void) const;
+  /**
+   * Return the address in the Address 4 field.
+   *
+   * \return the address in the Address 4 field
+   */
   Mac48Address GetAddr4 (void) const;
+  /**
+   * Return the type (enum WifiMacType)
+   *
+   * \return the type (enum WifiMacType)
+   */
   enum WifiMacType GetType (void) const;
+  /**
+   * \return true if From DS bit is set, false otherwise
+   */
   bool IsFromDs (void) const;
+  /**
+   * \return true if To DS bit is set, false otherwise
+   */
   bool IsToDs (void) const;
+  /**
+   * Return true if the Type is DATA.  The method does
+   * not check the Subtype field. (e.g. the header may be
+   * DATA with QoS)
+   *
+   * \return true if Type is DATA, false otherwise
+   */
   bool IsData (void) const;
+  /**
+   * Return true if the Type is DATA and Subtype is one of the
+   * possible values for QoS DATA.
+   *
+   * \return true if Type is QoS DATA, false otherwise
+   */
   bool IsQosData (void) const;
+  /**
+   * Return true if the Type is Control.
+   *
+   * \return true if Type is Control, false otherwise
+   */
   bool IsCtl (void) const;
+  /**
+   * Return true if the Type is Management.
+   *
+   * \return true if Type is Management, false otherwise
+   */
   bool IsMgt (void) const;
+  /**
+   * Return true if the Type/Subtype is one of the possible CF-Poll headers.
+   *
+   * \return true if the Type/Subtype is one of the possible CF-Poll headers, false otherwise
+   */
   bool IsCfpoll (void) const;
+  /**
+   * Return true if the header is a RTS header.
+   *
+   * \return true if the header is a RTS header, false otherwise
+   */
   bool IsRts (void) const;
+  /**
+   * Return true if the header is a CTS header.
+   *
+   * \return true if the header is a CTS header, false otherwise
+   */
   bool IsCts (void) const;
+  /**
+   * Return true if the header is an ACK header.
+   *
+   * \return true if the header is an ACK header, false otherwise
+   */
   bool IsAck (void) const;
+  /**
+   * Return true if the header is a Block ACK Request header.
+   *
+   * \return true if the header is a Block ACK Request header, false otherwise
+   */
   bool IsBlockAckReq (void) const;
+  /**
+   * Return true if the header is a Block ACK header.
+   *
+   * \return true if the header is a Block ACK header, false otherwise
+   */
   bool IsBlockAck (void) const;
+  /**
+   * Return true if the header is an Association Request header.
+   *
+   * \return true if the header is an Association Request header, false otherwise
+   */
   bool IsAssocReq (void) const;
+  /**
+   * Return true if the header is an Association Response header.
+   *
+   * \return true if the header is an Association Response header, false otherwise
+   */
   bool IsAssocResp (void) const;
+  /**
+   * Return true if the header is a Reassociation Request header.
+   *
+   * \return true if the header is a Reassociation Request header, false otherwise
+   */
   bool IsReassocReq (void) const;
+  /**
+   * Return true if the header is a Reassociation Response header.
+   *
+   * \return true if the header is a Reassociation Response header, false otherwise
+   */
   bool IsReassocResp (void) const;
+  /**
+   * Return true if the header is a Probe Request header.
+   *
+   * \return true if the header is a Probe Request header, false otherwise
+   */
   bool IsProbeReq (void) const;
+  /**
+   * Return true if the header is a Probe Response header.
+   *
+   * \return true if the header is a Probe Response header, false otherwise
+   */
   bool IsProbeResp (void) const;
+  /**
+   * Return true if the header is a Beacon header.
+   *
+   * \return true if the header is a Beacon header, false otherwise
+   */
   bool IsBeacon (void) const;
+  /**
+   * Return true if the header is a Disassociation header.
+   *
+   * \return true if the header is a Disassociation header, false otherwise
+   */
   bool IsDisassociation (void) const;
+  /**
+   * Return true if the header is an Authentication header.
+   *
+   * \return true if the header is an Authentication header, false otherwise
+   */
   bool IsAuthentication (void) const;
+  /**
+   * Return true if the header is a Deauthentication header.
+   *
+   * \return true if the header is a Deauthentication header, false otherwise
+   */
   bool IsDeauthentication (void) const;
+  /**
+   * Return true if the header is an Action header.
+   *
+   * \return true if the header is an Action header, false otherwise
+   */
   bool IsAction () const;
+  /**
+   * Check if the header is a Multihop action header.
+   *
+   * \return true if the header is a Multihop action header,
+   *         false otherwise
+   */
   bool IsMultihopAction () const;
+  /**
+   * Return the raw duration from the Duration/ID field.
+   *
+   * \return the raw duration from the Duration/ID field
+   */
   uint16_t GetRawDuration (void) const;
+  /**
+   * Return the duration from the Duration/ID field (Time object).
+   *
+   * \return the duration from the Duration/ID field (Time object)
+   */
   Time GetDuration (void) const;
+  /**
+   * Return the raw Sequence Control field.
+   *
+   * \return the raw Sequence Control field
+   */
   uint16_t GetSequenceControl (void) const;
+  /**
+   * Return the sequence number of the header.
+   *
+   * \return the sequence number of the header
+   */
   uint16_t GetSequenceNumber (void) const;
+  /**
+   * Return the fragment number of the header.
+   *
+   * \return the fragment number of the header
+   */
   uint16_t GetFragmentNumber (void) const;
+  /**
+   * Return if the Retry bit is set.
+   *
+   * \return true if the Retry bit is set, false otherwise
+   */
   bool IsRetry (void) const;
+  /**
+   * Return if the More Fragment bit is set.
+   *
+   * \return true if the More Fragment bit is set, false otherwise
+   */
   bool IsMoreFragments (void) const;
+  /**
+   * Return if the QoS ACK policy is Block ACK.
+   *
+   * \return true if the QoS ACK policy is Block ACK, false otherwise
+   */
   bool IsQosBlockAck (void) const;
+  /**
+   * Return if the QoS ACK policy is No ACK.
+   *
+   * \return true if the QoS ACK policy is No ACK, false otherwise
+   */
   bool IsQosNoAck (void) const;
+  /**
+   * Return if the QoS ACK policy is Normal ACK.
+   *
+   * \return true if the QoS ACK policy is No ACK, false otherwise
+   */
   bool IsQosAck (void) const;
+  /**
+   * Return if the end of service period (EOSP) is set.
+   *
+   * \return true if the end of service period (EOSP) is set, false otherwise
+   */
   bool IsQosEosp (void) const;
+  /**
+   * Check if the A-MSDU present bit is set in the QoS control field.
+   *
+   * \return true if the A-MSDU present bit is set,
+   *        false otherwise
+   */
   bool IsQosAmsdu (void) const;
+  /**
+   * Return the Traffic ID of a QoS header.
+   *
+   * \return the Traffic ID of a QoS header
+   */
   uint8_t GetQosTid (void) const;
+  /**
+   * Return the QoS ACK Policy of a QoS header.
+   *
+   * \return the QoS ACK Policy of a QoS header
+   */
   enum QosAckPolicy GetQosAckPolicy (void) const;
+  /**
+   * Return the TXOP limit.
+   *
+   * \return the TXOP limit
+   */
   uint8_t GetQosTxopLimit (void) const;
 
+  /**
+   * Return the size of the WifiMacHeader in octets.
+   * GetSerializedSize calls this function.
+   *
+   * \return the size of the WifiMacHeader in octets
+   */
   uint32_t GetSize (void) const;
+  /**
+   * Return a string corresponds to the header type.
+   *
+   * \returns a string corresponds to the header type.
+   */
   const char * GetTypeString (void) const;
 
 
 private:
+  /**
+   * Return the raw Frame Control field.
+   *
+   * \return the raw Frame Control field
+   */
   uint16_t GetFrameControl (void) const;
+  /**
+   * Return the raw QoS Control field.
+   *
+   * \return the raw QoS Control field
+   */
   uint16_t GetQosControl (void) const;
+  /**
+   * Set the Frame Control field with the given raw value.
+   *
+   * \param control the raw Frame Control field value
+   */
   void SetFrameControl (uint16_t control);
+  /**
+   * Set the Sequence Control field with the given raw value.
+   *
+   * \param seq the raw Sequence Control field value
+   */
   void SetSequenceControl (uint16_t seq);
+  /**
+   * Set the QoS Control field with the given raw value.
+   *
+   * \param qos the raw QoS Control field value
+   */
   void SetQosControl (uint16_t qos);
+  /**
+   * Print the Frame Control field to the output stream.
+   *
+   * \param os the output stream to print to
+   */
   void PrintFrameControl (std::ostream &os) const;
 
   uint8_t m_ctrlType;
diff -Naur ns-3.18.1/src/wifi/model/wifi-mac-queue.cc ns-3.19/src/wifi/model/wifi-mac-queue.cc
--- ns-3.18.1/src/wifi/model/wifi-mac-queue.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mac-queue.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiMacQueue);
+NS_OBJECT_ENSURE_REGISTERED (WifiMacQueue)
+  ;
 
 WifiMacQueue::Item::Item (Ptr<const Packet> packet,
                           const WifiMacHeader &hdr,
diff -Naur ns-3.18.1/src/wifi/model/wifi-mac-queue.h ns-3.19/src/wifi/model/wifi-mac-queue.h
--- ns-3.18.1/src/wifi/model/wifi-mac-queue.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mac-queue.h	2013-12-20 09:44:50.000000000 -0800
@@ -30,8 +30,6 @@
 #include "wifi-mac-header.h"
 
 namespace ns3 {
-
-class WifiMacParameters;
 class QosBlockedDestinations;
 
 /**
@@ -56,14 +54,58 @@
   WifiMacQueue ();
   ~WifiMacQueue ();
 
+  /**
+   * Set the maximum queue size.
+   *
+   * \param maxSize the maximum queue size
+   */
   void SetMaxSize (uint32_t maxSize);
+  /**
+   * Set the maximum delay before the packet is discarded.
+   *
+   * \param delay the maximum delay
+   */
   void SetMaxDelay (Time delay);
+  /**
+   * Return the maximum queue size.
+   *
+   * \return the maximum queue size
+   */
   uint32_t GetMaxSize (void) const;
+  /**
+   * Return the maximum delay before the packet is discarded.
+   *
+   * \return the maximum delay
+   */
   Time GetMaxDelay (void) const;
 
+  /**
+   * Enqueue the given packet and its corresponding WifiMacHeader at the <i>end</i> of the queue.
+   *
+   * \param packet the packet to be euqueued at the end
+   * \param hdr the header of the given packet
+   */
   void Enqueue (Ptr<const Packet> packet, const WifiMacHeader &hdr);
+  /**
+   * Enqueue the given packet and its corresponding WifiMacHeader at the <i>front</i> of the queue.
+   *
+   * \param packet the packet to be euqueued at the end
+   * \param hdr the header of the given packet
+   */
   void PushFront (Ptr<const Packet> packet, const WifiMacHeader &hdr);
+  /**
+   * Dequeue the packet in the front of the queue.
+   *
+   * \param hdr the WifiMacHeader of the packet
+   * \return the packet
+   */
   Ptr<const Packet> Dequeue (WifiMacHeader *hdr);
+  /**
+   * Peek the packet in the front of the queue. The packet is not removed.
+   *
+   * \param hdr the WifiMacHeader of the packet
+   * \return the packet
+   */
   Ptr<const Packet> Peek (WifiMacHeader *hdr);
   /**
    * Searchs and returns, if is present in this queue, first packet having
@@ -71,6 +113,12 @@
    * equals to <i>tid</i>. This method removes the packet from this queue.
    * Is typically used by ns3::EdcaTxopN in order to perform correct MSDU
    * aggregation (A-MSDU).
+   *
+   * \param hdr the header of the dequeued packet
+   * \param tid the given TID
+   * \param type the given address type
+   * \param addr the given destination
+   * \return packet
    */
   Ptr<const Packet> DequeueByTidAndAddress (WifiMacHeader *hdr,
                                             uint8_t tid,
@@ -82,6 +130,12 @@
    * equals to <i>tid</i>. This method doesn't remove the packet from this queue.
    * Is typically used by ns3::EdcaTxopN in order to perform correct MSDU
    * aggregation (A-MSDU).
+   *
+   * \param hdr the header of the dequeued packet
+   * \param tid the given TID
+   * \param type the given address type
+   * \param addr the given destination
+   * \return packet
    */
   Ptr<const Packet> PeekByTidAndAddress (WifiMacHeader *hdr,
                                          uint8_t tid,
@@ -91,11 +145,19 @@
    * If exists, removes <i>packet</i> from queue and returns true. Otherwise it
    * takes no effects and return false. Deletion of the packet is
    * performed in linear time (O(n)).
+   *
+   * \param packet the packet to be removed
+   * \return true if the packet was removed, false otherwise
    */
   bool Remove (Ptr<const Packet> packet);
   /**
    * Returns number of QoS packets having tid equals to <i>tid</i> and address
    * specified by <i>type</i> equals to <i>addr</i>.
+   *
+   * \param tid the given TID
+   * \param type the given address type
+   * \param addr the given destination
+   * \return the number of QoS packets
    */
   uint32_t GetNPacketsByTidAndAddress (uint8_t tid,
                                        WifiMacHeader::AddressType type,
@@ -106,44 +168,97 @@
    * respectively that index a pending agreement in the BlockAckManager object.
    * So that packet must not be transmitted until reception of an ADDBA response frame from station
    * addressed by <i>addr</i>. This method removes the packet from queue.
+   *
+   * \param hdr the header of the dequeued packet
+   * \param tStamp
+   * \param blockedPackets
+   * \return packet
    */
   Ptr<const Packet> DequeueFirstAvailable (WifiMacHeader *hdr,
                                            Time &tStamp,
                                            const QosBlockedDestinations *blockedPackets);
   /**
-   * Returns first available packet for transmission. The packet isn't removed from queue.
+   * Returns first available packet for transmission. The packet isn't removed from queue.  
+   *
+   * \param hdr the header of the dequeued packet
+   * \param tStamp
+   * \param blockedPackets
+   * \return packet
    */
   Ptr<const Packet> PeekFirstAvailable (WifiMacHeader *hdr,
                                         Time &tStamp,
                                         const QosBlockedDestinations *blockedPackets);
+  /**
+   * Flush the queue.
+   */
   void Flush (void);
 
+  /**
+   * Return if the queue is empty.
+   *
+   * \return true if the queue is empty, false otherwise
+   */
   bool IsEmpty (void);
+  /**
+   * Return the current queue size.
+   *
+   * \return the current queue size
+   */
   uint32_t GetSize (void);
-private:
+protected:
+  /**
+   * Clean up the queue by removing packets that exceeded the maximum delay.
+   */
+  virtual void Cleanup (void);
+
   struct Item;
 
+  /**
+   * typedef for packet (struct Item) queue.
+   */
   typedef std::list<struct Item> PacketQueue;
+  /**
+   * typedef for packet (struct Item) queue reverse iterator.
+   */
   typedef std::list<struct Item>::reverse_iterator PacketQueueRI;
+  /**
+   * typedef for packet (struct Item) queue iterator.
+   */
   typedef std::list<struct Item>::iterator PacketQueueI;
+  /**
+   * Return the appropriate address for the given packet (given by PacketQueue iterator).
+   *
+   * \param type
+   * \param it
+   * \return the address
+   */
+  Mac48Address GetAddressForPacket (enum WifiMacHeader::AddressType type, PacketQueueI it);
 
-  void Cleanup (void);
-  Mac48Address GetAddressForPacket (enum WifiMacHeader::AddressType type, PacketQueueI);
-
+  /**
+   * A struct that holds information about a packet for putting
+   * in a packet queue.
+   */
   struct Item
   {
+    /**
+     * Create a struct with the given parameters.
+     *
+     * \param packet
+     * \param hdr
+     * \param tstamp
+     */
     Item (Ptr<const Packet> packet,
           const WifiMacHeader &hdr,
           Time tstamp);
-    Ptr<const Packet> packet;
-    WifiMacHeader hdr;
-    Time tstamp;
+    Ptr<const Packet> packet; //!< Actual packet
+    WifiMacHeader hdr; //!< Wifi MAC header associated with the packet
+    Time tstamp; //!< timestamp when the packet arrived at the queue
   };
 
-  PacketQueue m_queue;
-  uint32_t m_size;
-  uint32_t m_maxSize;
-  Time m_maxDelay;
+  PacketQueue m_queue; //!< Packet (struct Item) queue
+  uint32_t m_size; //!< Current queue size
+  uint32_t m_maxSize; //!< Queue capacity
+  Time m_maxDelay; //!< Time to live for packets in the queue
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/wifi/model/wifi-mac-trailer.cc ns-3.19/src/wifi/model/wifi-mac-trailer.cc
--- ns-3.18.1/src/wifi/model/wifi-mac-trailer.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mac-trailer.cc	2013-12-20 09:44:50.000000000 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiMacTrailer);
+NS_OBJECT_ENSURE_REGISTERED (WifiMacTrailer)
+  ;
 
 WifiMacTrailer::WifiMacTrailer ()
 {
diff -Naur ns-3.18.1/src/wifi/model/wifi-mode.cc ns-3.19/src/wifi/model/wifi-mode.cc
--- ns-3.18.1/src/wifi/model/wifi-mode.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mode.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,15 +24,37 @@
 
 namespace ns3 {
 
+/**
+ * Check if the two WifiModes are identical.
+ *
+ * \param a WifiMode
+ * \param b WifiMode
+ * \return true if the two WifiModes are identical,
+ *         false otherwise
+ */
 bool operator == (const WifiMode &a, const WifiMode &b)
 {
   return a.GetUid () == b.GetUid ();
 }
+/**
+ * Serialize WifiMode to ostream (human-readable).
+ *
+ * \param os std::ostream
+ * \param mode
+ * \return std::ostream
+ */
 std::ostream & operator << (std::ostream & os, const WifiMode &mode)
 {
   os << mode.GetUniqueName ();
   return os;
 }
+/**
+ * Serialize WifiMode from istream (human-readable).
+ *
+ * \param is std::istream
+ * \param mode
+ * \return std::istream
+ */
 std::istream & operator >> (std::istream &is, WifiMode &mode)
 {
   std::string str;
diff -Naur ns-3.18.1/src/wifi/model/wifi-mode.h ns-3.19/src/wifi/model/wifi-mode.h
--- ns-3.18.1/src/wifi/model/wifi-mode.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-mode.h	2013-12-20 09:44:50.000000000 -0800
@@ -150,9 +150,20 @@
    * its initialization.
    */
   WifiMode ();
+  /**
+   * Create a WifiMode if the given string represents a valid
+   * WifiMode name.
+   *
+   * \param name std::string of a valid WifiMode name
+   */
   WifiMode (std::string name);
 private:
   friend class WifiModeFactory;
+  /**
+   * Create a WifiMode from a given unique ID.
+   *
+   * \param uid unique ID
+   */
   WifiMode (uint32_t uid);
   uint32_t m_uid;
 };
@@ -175,9 +186,18 @@
  * WifiModeList type, and a corresponding iterator.
  */
 typedef std::vector<WifiMode> WifiModeList;
+/**
+ * An iterator for WifiModeList vector.
+ */
 typedef WifiModeList::const_iterator WifiModeListIterator;
 
+/**
+ * A list of Wi-Fi Modulation and Coding Scheme (MCS).
+ */
 typedef std::vector<uint8_t> WifiMcsList;
+/**
+ * An iterator for WifiMcsList vector.
+ */
 typedef WifiMcsList::const_iterator WifiMcsListIterator;
 
 /**
@@ -198,11 +218,12 @@
    *        associated WifiMode is used.
    * \param dataRate the rate (bits/second) at which the user data is transmitted
    * \param codingRate if convolutional coding is used for this rate
-   * then this parameter specifies the convolutional coding rate
-   * used. If there is no explicit convolutional coding step (e.g.,
-   * for DSSS rates) then the caller should set this parameter to
-   * WIFI_CODE_RATE_UNCODED.
+   *        then this parameter specifies the convolutional coding rate
+   *        used. If there is no explicit convolutional coding step (e.g.,
+   *        for DSSS rates) then the caller should set this parameter to
+   *        WIFI_CODE_RATE_UNCODED.
    * \param constellationSize the order of the constellation used.
+   * \return WifiMode
    *
    * Create a WifiMode.
    */
@@ -217,6 +238,12 @@
 private:
   friend class WifiMode;
   friend std::istream & operator >> (std::istream &is, WifiMode &mode);
+
+  /**
+   * Return a WifiModeFactory
+   *
+   * \return a WifiModeFactory
+   */
   static WifiModeFactory* GetFactory ();
   WifiModeFactory ();
 
@@ -237,10 +264,31 @@
     bool isMandatory;
   };
 
+  /**
+   * Search and return WifiMode from a given name.
+   *
+   * \param name human-readable WifiMode
+   * \return WifiMode
+   */
   WifiMode Search (std::string name);
-  uint32_t AllocateUid (std::string uniqueName);
+  /**
+   * Allocate a WifiModeItem from a given uniqueUid.
+   *
+   * \param uniqueUid
+   * \return uid
+   */
+  uint32_t AllocateUid (std::string uniqueUid);
+  /**
+   * Return a WifiModeItem at the given uid index.
+   *
+   * \param uid
+   * \return WifiModeItem at the given uid
+   */
   WifiModeItem* Get (uint32_t uid);
 
+  /**
+   * typedef for a vector of WifiModeItem.
+   */
   typedef std::vector<struct WifiModeItem> WifiModeItemList;
   WifiModeItemList m_itemList;
 };
diff -Naur ns-3.18.1/src/wifi/model/wifi-net-device.cc ns-3.19/src/wifi/model/wifi-net-device.cc
--- ns-3.18.1/src/wifi/model/wifi-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (WifiNetDevice)
+  ;
 
 TypeId
 WifiNetDevice::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/wifi-net-device.h ns-3.19/src/wifi/model/wifi-net-device.h
--- ns-3.18.1/src/wifi/model/wifi-net-device.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-net-device.h	2013-12-20 09:44:50.000000000 -0800
@@ -109,17 +109,41 @@
   virtual bool SendFrom (Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber);
   virtual void SetPromiscReceiveCallback (PromiscReceiveCallback cb);
   virtual bool SupportsSendFrom (void) const;
-
+protected:
+   virtual void DoDispose (void);
+   virtual void DoInitialize (void);
+  /**
+   * Receive a packet from the lower layer and pass the
+   * packet up the stack.
+   *
+   * \param packet
+   * \param from
+   * \param to
+   */
+   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
 private:
   // This value conforms to the 802.11 specification
   static const uint16_t MAX_MSDU_SIZE = 2304;
 
-  virtual void DoDispose (void);
-  virtual void DoInitialize (void);
-  void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
+  /**
+   * Set that the link is up. A link is always up in ad-hoc mode.
+   * For a STA, a link is up when the STA is associated with an AP.
+   */
   void LinkUp (void);
+  /**
+   * Set that the link is down (i.e. STA is not associated).
+   */
   void LinkDown (void);
+  /**
+   * Return the WifiChannel this device is connected to.
+   *
+   * \return WifiChannel
+   */
   Ptr<WifiChannel> DoGetChannel (void) const;
+  /**
+   * Complete the configuration of this Wi-Fi device by
+   * connecting all lower components (e.g. MAC, WifiRemoteStation) together.
+   */
   void CompleteConfig (void);
 
   Ptr<Node> m_node;
diff -Naur ns-3.18.1/src/wifi/model/wifi-phy.cc ns-3.19/src/wifi/model/wifi-phy.cc
--- ns-3.18.1/src/wifi/model/wifi-phy.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -48,7 +48,8 @@
  *       The actual WifiPhy class
  ****************************************************************/
 
-NS_OBJECT_ENSURE_REGISTERED (WifiPhy);
+NS_OBJECT_ENSURE_REGISTERED (WifiPhy)
+  ;
 
 TypeId
 WifiPhy::GetTypeId (void)
@@ -260,7 +261,7 @@
             }
       }
     case WIFI_MOD_CLASS_ERP_OFDM:
-      return 16;
+      return 4;
 
     case WIFI_MOD_CLASS_DSSS:
       if (preamble == WIFI_PREAMBLE_SHORT)
@@ -309,7 +310,7 @@
            return 16;
       }
     case WIFI_MOD_CLASS_ERP_OFDM:
-      return 4;
+      return 16;
 
     case WIFI_MOD_CLASS_DSSS:
       if (preamble == WIFI_PREAMBLE_SHORT)
@@ -498,9 +499,7 @@
 }
 
 
-/**
- * Clause 15 rates (DSSS)
- */
+// Clause 15 rates (DSSS)
 
 WifiMode
 WifiPhy::GetDsssRate1Mbps ()
@@ -529,9 +528,8 @@
 }
 
 
-/**
- * Clause 18 rates (HR/DSSS)
- */
+// Clause 18 rates (HR/DSSS)
+
 WifiMode
 WifiPhy::GetDsssRate5_5Mbps ()
 {
@@ -559,9 +557,8 @@
 }
 
 
-/**
- * Clause 19.5 rates (ERP-OFDM)
- */
+// Clause 19.5 rates (ERP-OFDM)
+
 WifiMode
 WifiPhy::GetErpOfdmRate6Mbps ()
 {
@@ -667,9 +664,8 @@
 }
 
 
-/**
- * Clause 17 rates (OFDM)
- */
+// Clause 17 rates (OFDM)
+
 WifiMode
 WifiPhy::GetOfdmRate6Mbps ()
 {
@@ -774,7 +770,8 @@
   return mode;
 }
 
-/* 10 MHz channel rates */
+// 10 MHz channel rates
+
 WifiMode
 WifiPhy::GetOfdmRate3MbpsBW10MHz ()
 {
@@ -879,7 +876,8 @@
   return mode;
 }
 
-/* 5 MHz channel rates */
+// 5 MHz channel rates
+
 WifiMode
 WifiPhy::GetOfdmRate1_5MbpsBW5MHz ()
 {
@@ -984,7 +982,7 @@
   return mode;
 }
 
-/*Clause 20*/
+// Clause 20
 
 WifiMode
 WifiPhy::GetOfdmRate6_5MbpsBW20MHz ()
diff -Naur ns-3.18.1/src/wifi/model/wifi-phy.h ns-3.19/src/wifi/model/wifi-phy.h
--- ns-3.18.1/src/wifi/model/wifi-phy.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-phy.h	2013-12-20 09:44:50.000000000 -0800
@@ -162,10 +162,20 @@
   WifiPhy ();
   virtual ~WifiPhy ();
 
+  /**
+   * Return the minimum available transmission power level (dBm).
+   *
+   * \return the minimum available transmission power level in dBm
+   */
   virtual double GetTxPowerStart (void) const = 0;
+  /**
+   * Return the maximum available transmission power level (dBm).
+   *
+   * \return the maximum available transmission power level in dBm
+   */
   virtual double GetTxPowerEnd (void) const = 0;
   /**
-   * \returns the number of tx power levels available for this PHY.
+   * \return the number of tx power levels available for this PHY.
    */
   virtual uint32_t GetNTxPower (void) const = 0;
 
@@ -198,41 +208,46 @@
   virtual void RegisterListener (WifiPhyListener *listener) = 0;
 
   /**
-   * \returns true of the current state of the PHY layer is WifiPhy::IDLE, false otherwise.
+   * \return true of the current state of the PHY layer is WifiPhy::IDLE, false otherwise.
    */
   virtual bool IsStateIdle (void) = 0;
   /**
-   * \returns true of the current state of the PHY layer is WifiPhy::CCA_BUSY, false otherwise.
+   * \return true of the current state of the PHY layer is WifiPhy::CCA_BUSY, false otherwise.
    */
   virtual bool IsStateCcaBusy (void) = 0;
   /**
-   * \returns true of the current state of the PHY layer is not WifiPhy::IDLE, false otherwise.
+   * \return true of the current state of the PHY layer is not WifiPhy::IDLE, false otherwise.
    */
   virtual bool IsStateBusy (void) = 0;
   /**
-   * \returns true of the current state of the PHY layer is WifiPhy::RX, false otherwise.
+   * \return true of the current state of the PHY layer is WifiPhy::RX, false otherwise.
    */
   virtual bool IsStateRx (void) = 0;
   /**
-   * \returns true of the current state of the PHY layer is WifiPhy::TX, false otherwise.
+   * \return true of the current state of the PHY layer is WifiPhy::TX, false otherwise.
    */
   virtual bool IsStateTx (void) = 0;
   /**
-   * \returns true of the current state of the PHY layer is WifiPhy::SWITCHING, false otherwise.
+   * \return true of the current state of the PHY layer is WifiPhy::SWITCHING, false otherwise.
    */
   virtual bool IsStateSwitching (void) = 0;
   /**
-   * \returns the amount of time since the current state has started.
+   * \return the amount of time since the current state has started.
    */
   virtual Time GetStateDuration (void) = 0;
   /**
-   * \returns the predicted delay until this PHY can become WifiPhy::IDLE.
+   * \return the predicted delay until this PHY can become WifiPhy::IDLE.
    *
    * The PHY will never become WifiPhy::IDLE _before_ the delay returned by
    * this method but it could become really idle later.
    */
   virtual Time GetDelayUntilIdle (void) = 0;
 
+  /**
+   * Return the start time of the last received packet.
+   *
+   * \return the start time of the last received packet
+   */
   virtual Time GetLastRxStartTime (void) const = 0;
 
   /**
@@ -313,7 +328,7 @@
    * WifiRemoteStationManager), which itself is a superset (again, not
    * necessarily proper) of the BSSBasicRateSet.
    *
-   * \returns the number of transmission modes supported by this PHY.
+   * \return the number of transmission modes supported by this PHY.
    *
    * \sa WifiPhy::GetMode()
    */
@@ -332,7 +347,7 @@
    * necessarily proper) of the BSSBasicRateSet.
    *
    * \param mode index in array of supported modes
-   * \returns the mode whose index is specified.
+   * \return the mode whose index is specified.
    *
    * \sa WifiPhy::GetNModes()
    */
@@ -340,12 +355,12 @@
   /**
    * \param txMode the transmission mode
    * \param ber the probability of bit error rate
-   * \returns the minimum snr which is required to achieve
+   * \return the minimum snr which is required to achieve
    *          the requested ber for the specified transmission mode. (W/W)
    */
   virtual double CalculateSnr (WifiMode txMode, double ber) const = 0;
    /**
-   * The WifiPhy::NBssMembershipSelectors() and WifiPhy::BssMembershipSelector() methods are used
+   * The WifiPhy::NBssMembershipSelectors() method is used
    * (e.g., by a WifiRemoteStationManager) to determine the set of
    * transmission/reception modes that this WifiPhy(-derived class)
    * can support - a set of WifiMode objects which we call the
@@ -353,13 +368,22 @@
    *
    * This was introduced with 11n
    *
-   * \param selector index in array of supported memeberships
-   * \returns the memebership selector whose index is specified.
-   *
-   * \sa WifiPhy::NBssMembershipSelectors()
+   * \return the memebership selector whose index is specified.
    */
   virtual uint32_t GetNBssMembershipSelectors (void) const=0;
 
+   /**
+   * The WifiPhy::BssMembershipSelector() method is used
+   * (e.g., by a WifiRemoteStationManager) to determine the set of
+   * transmission/reception modes that this WifiPhy(-derived class)
+   * can support - a set of WifiMode objects which we call the
+   * BssMemebershipSelectorSet, and which is stored as WifiPhy::m_bssMembershipSelectorSet.
+   *
+   * This was introduced with 11n
+   *
+   * \param selector index in array of supported memeberships
+   * \return the memebership selector whose index is specified.
+   */
   virtual uint32_t GetBssMembershipSelector (uint32_t selector) const=0;
   /**
    * The WifiPhy::GetMembershipSelectorModes() method is used
@@ -371,13 +395,13 @@
    * This was introduced with 11n
    *
    * \param selector index in array of supported memeberships
-   * \returns a WifiModeList that contains the WifiModes associrated with the selected index.
+   * \return a WifiModeList that contains the WifiModes associrated with the selected index.
    *
    * \sa WifiPhy::GetMembershipSelectorModes()
    */
   virtual WifiModeList GetMembershipSelectorModes(uint32_t selector)=0;
   /**
-   * The WifiPhy::GetNMcs() and  WifiPhy::GetMcs() methods are used
+   * The WifiPhy::GetNMcs() method is used
    * (e.g., by a WifiRemoteStationManager) to determine the set of
    * transmission/reception MCS indexes that this WifiPhy(-derived class)
    * can support - a set of Mcs indexes which we call the
@@ -385,16 +409,38 @@
    *
    * This was introduced with 11n
    *
-   * \param Mcs index in array of supported Mcs
-   * \returns the Mcs index whose index is specified.
-   *
-   * \sa WifiPhy::GetNMcs()
+   * \return the Mcs index whose index is specified.
    */
   virtual uint8_t GetNMcs (void) const=0;
+  /**
+   * The WifiPhy::GetMcs() method is used
+   * (e.g., by a WifiRemoteStationManager) to determine the set of
+   * transmission/reception MCS indexes that this WifiPhy(-derived class)
+   * can support - a set of Mcs indexes which we call the
+   * DeviceMcsSet, and which is stored as WifiPhy::m_deviceMcsSet.
+   *
+   * This was introduced with 11n
+   *
+   * \param mcs index in array of supported Mcs
+   * \return the Mcs index whose index is specified.
+   */
   virtual uint8_t GetMcs (uint8_t mcs) const=0;
 
-  /* Converts from DataRate to MCS index and vice versa */
+  /**
+  * For a given WifiMode finds the corresponding MCS value and returns it 
+  * as defined in the IEEE 802.11n standard 
+  *
+  * \param mode the WifiMode
+  * \return the MCS number that corresponds to the given WifiMode
+  */
   virtual uint32_t WifiModeToMcs (WifiMode mode)=0;
+ /**
+  * For a given MCS finds the corresponding WifiMode and returns it 
+  * as defined in the IEEE 802.11n standard. 
+  * 
+  * \param mcs the MCS number 
+  * \return the WifiMode that corresponds to the given mcs number
+  */
   virtual WifiMode McsToWifiMode (uint8_t mcs)=0;
 
   
@@ -405,119 +451,489 @@
    *
    * where Starting channel frequency is standard-dependent, see SetStandard()
    * as defined in IEEE 802.11-2007 17.3.8.3.2.
+   *
+   * \param id the channel number
    */
   virtual void SetChannelNumber (uint16_t id) = 0;
-  /// Return current channel number, see SetChannelNumber()
+  /**  
+   * Return current channel number.
+   *
+   * \return the current channel number
+   */
   virtual uint16_t GetChannelNumber () const = 0;
 
+  /**
+   * Configure the PHY-level parameters for different Wi-Fi standard.
+   *
+   * \param standard the Wi-Fi standard
+   */
   virtual void ConfigureStandard (enum WifiPhyStandard standard) = 0;
 
+  /**
+   * Return the WifiChannel this WifiPhy is connected to.
+   *
+   * \return the WifiChannel this WifiPhy is connected to
+   */
   virtual Ptr<WifiChannel> GetChannel (void) const = 0;
 
+  /**
+   * Return a WifiMode for DSSS at 1Mbps.
+   *
+   * \return a WifiMode for DSSS at 1Mbps
+   */
   static WifiMode GetDsssRate1Mbps ();
+  /**
+   * Return a WifiMode for DSSS at 2Mbps.
+   *
+   * \return a WifiMode for DSSS at 2Mbps
+   */
   static WifiMode GetDsssRate2Mbps ();
+  /**
+   * Return a WifiMode for DSSS at 5.5Mbps.
+   *
+   * \return a WifiMode for DSSS at 5.5Mbps
+   */
   static WifiMode GetDsssRate5_5Mbps ();
+  /**
+   * Return a WifiMode for DSSS at 11Mbps.
+   *
+   * \return a WifiMode for DSSS at 11Mbps
+   */
   static WifiMode GetDsssRate11Mbps ();
+  /**
+   * Return a WifiMode for ERP-ODFM at 6Mbps.
+   *
+   * \return a WifiMode for ERP-OFDM at 6Mbps
+   */
   static WifiMode GetErpOfdmRate6Mbps ();
+  /**
+   * Return a WifiMode for ERP-ODFM at 9Mbps.
+   *
+   * \return a WifiMode for ERP-OFDM at 9Mbps
+   */
   static WifiMode GetErpOfdmRate9Mbps ();
+  /**
+   * Return a WifiMode for ERP-ODFM at 12Mbps.
+   *
+   * \return a WifiMode for ERP-OFDM at 12Mbps
+   */
   static WifiMode GetErpOfdmRate12Mbps ();
+  /**
+   * Return a WifiMode for ERP-ODFM at 18Mbps.
+   *
+   * \return a WifiMode for ERP-OFDM at 18Mbps
+   */
   static WifiMode GetErpOfdmRate18Mbps ();
+  /**
+   * Return a WifiMode for ERP-ODFM at 24Mbps.
+   *
+   * \return a WifiMode for ERP-OFDM at 24Mbps
+   */
   static WifiMode GetErpOfdmRate24Mbps ();
+  /**
+   * Return a WifiMode for ERP-ODFM at 36Mbps.
+   *
+   * \return a WifiMode for ERP-OFDM at 36Mbps
+   */
   static WifiMode GetErpOfdmRate36Mbps ();
+  /**
+   * Return a WifiMode for ERP-ODFM at 48Mbps.
+   *
+   * \return a WifiMode for ERP-OFDM at 48Mbps
+   */
   static WifiMode GetErpOfdmRate48Mbps ();
+  /**
+   * Return a WifiMode for ERP-ODFM at 54Mbps.
+   *
+   * \return a WifiMode for ERP-OFDM at 54Mbps
+   */
   static WifiMode GetErpOfdmRate54Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 6Mbps.
+   *
+   * \return a WifiMode for OFDM at 6Mbps
+   */
   static WifiMode GetOfdmRate6Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 9Mbps.
+   *
+   * \return a WifiMode for OFDM at 9Mbps
+   */
   static WifiMode GetOfdmRate9Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 12Mbps.
+   *
+   * \return a WifiMode for OFDM at 12Mbps
+   */
   static WifiMode GetOfdmRate12Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 18Mbps.
+   *
+   * \return a WifiMode for OFDM at 18Mbps
+   */
   static WifiMode GetOfdmRate18Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 24Mbps.
+   *
+   * \return a WifiMode for OFDM at 24Mbps
+   */
   static WifiMode GetOfdmRate24Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 36Mbps.
+   *
+   * \return a WifiMode for OFDM at 36Mbps
+   */
   static WifiMode GetOfdmRate36Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 48Mbps.
+   *
+   * \return a WifiMode for OFDM at 48Mbps
+   */
   static WifiMode GetOfdmRate48Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 54Mbps.
+   *
+   * \return a WifiMode for OFDM at 54Mbps
+   */
   static WifiMode GetOfdmRate54Mbps ();
+  /**
+   * Return a WifiMode for ODFM at 3Mbps with 10MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 3Mbps with 10MHz channel spacing
+   */
   static WifiMode GetOfdmRate3MbpsBW10MHz ();
+  /**
+   * Return a WifiMode for ODFM at 4.5Mbps with 10MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 4.5Mbps with 10MHz channel spacing
+   */
   static WifiMode GetOfdmRate4_5MbpsBW10MHz ();
+  /**
+   * Return a WifiMode for ODFM at 6Mbps with 10MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 6Mbps with 10MHz channel spacing
+   */
   static WifiMode GetOfdmRate6MbpsBW10MHz ();
+  /**
+   * Return a WifiMode for ODFM at 9Mbps with 10MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 9Mbps with 10MHz channel spacing
+   */
   static WifiMode GetOfdmRate9MbpsBW10MHz ();
+  /**
+   * Return a WifiMode for ODFM at 12Mbps with 10MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 12Mbps with 10MHz channel spacing
+   */
   static WifiMode GetOfdmRate12MbpsBW10MHz ();
+  /**
+   * Return a WifiMode for ODFM at 18Mbps with 10MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 18Mbps with 10MHz channel spacing
+   */
   static WifiMode GetOfdmRate18MbpsBW10MHz ();
+  /**
+   * Return a WifiMode for ODFM at 24Mbps with 10MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 24Mbps with 10MHz channel spacing
+   */
   static WifiMode GetOfdmRate24MbpsBW10MHz ();
+  /**
+   * Return a WifiMode for ODFM at 27Mbps with 10MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 27Mbps with 10MHz channel spacing
+   */
   static WifiMode GetOfdmRate27MbpsBW10MHz ();
+  /**
+   * Return a WifiMode for ODFM at 1.5Mbps with 5MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 1.5Mbps with 5MHz channel spacing
+   */
   static WifiMode GetOfdmRate1_5MbpsBW5MHz ();
+  /**
+   * Return a WifiMode for ODFM at 2.25Mbps with 5MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 2.25Mbps with 5MHz channel spacing
+   */
   static WifiMode GetOfdmRate2_25MbpsBW5MHz ();
+  /**
+   * Return a WifiMode for ODFM at 3Mbps with 5MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 3Mbps with 5MHz channel spacing
+   */
   static WifiMode GetOfdmRate3MbpsBW5MHz ();
+  /**
+   * Return a WifiMode for ODFM at 4.5Mbps with 5MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 4.5Mbps with 5MHz channel spacing
+   */
   static WifiMode GetOfdmRate4_5MbpsBW5MHz ();
+  /**
+   * Return a WifiMode for ODFM at 6Mbps with 5MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 6Mbps with 5MHz channel spacing
+   */
   static WifiMode GetOfdmRate6MbpsBW5MHz ();
+  /**
+   * Return a WifiMode for ODFM at 9Mbps with 5MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 9Mbps with 5MHz channel spacing
+   */
   static WifiMode GetOfdmRate9MbpsBW5MHz ();
+  /**
+   * Return a WifiMode for ODFM at 12Mbps with 5MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 12Mbps with 5MHz channel spacing
+   */
   static WifiMode GetOfdmRate12MbpsBW5MHz ();
+  /**
+   * Return a WifiMode for ODFM at 13.5Mbps with 5MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 13.5Mbps with 5MHz channel spacing
+   */
   static WifiMode GetOfdmRate13_5MbpsBW5MHz ();
+  /**
+   * Return a WifiMode for ODFM at 6.5Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 6.5Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate6_5MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 13Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 13Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate13MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 19.5Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 19.5Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate19_5MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 26Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 26Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate26MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 39Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 39Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate39MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 52Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 52Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate52MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 58.5Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 58.5Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate58_5MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 65Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 65Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate65MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 13.5Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 13.5Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate13_5MbpsBW40MHz ();
-  static WifiMode GetOfdmRate27MbpsBW40MHz (); 
+  /**
+   * Return a WifiMode for ODFM at 27Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 27Mbps with 40MHz channel spacing
+   */
+  static WifiMode GetOfdmRate27MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 40.5Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 40.5Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate40_5MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 54Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 54Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate54MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 81Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 81Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate81MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 108Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 108Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate108MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 121.5Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 121.5Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate121_5MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 135Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 135Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate135MbpsBW40MHz ();
   //Rates for clause 20 with short guard interval
+  /**
+   * Return a WifiMode for ODFM at 7.2Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 7.2Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate7_2MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 14.4Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 14.4Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate14_4MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 21.7Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 21.7Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate21_7MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 28.9Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 28.9Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate28_9MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 43.3Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 43.3Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate43_3MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 57.8Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 57.8Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate57_8MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 65Mbps with 20MHz channel spacing.
+   * The rate supports short guard interval.
+   *
+   * \return a WifiMode for OFDM at 65Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate65MbpsBW20MHzShGi ();
+  /**
+   * Return a WifiMode for ODFM at 72.2Mbps with 20MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 72.2Mbps with 20MHz channel spacing
+   */
   static WifiMode GetOfdmRate72_2MbpsBW20MHz ();
+  /**
+   * Return a WifiMode for ODFM at 15Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 15Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate15MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 30Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 30Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate30MbpsBW40MHz (); 
+  /**
+   * Return a WifiMode for ODFM at 45Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 45Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate45MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 60Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 60Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate60MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 90Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 90Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate90MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 120Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 120Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate120MbpsBW40MHz ();
+  /**
+   * Return a WifiMode for ODFM at 135Mbps with 40MHz channel spacing.
+   * The rate supports short guard interval.
+   *
+   * \return a WifiMode for OFDM at 135Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate135MbpsBW40MHzShGi ();
+  /**
+   * Return a WifiMode for ODFM at 150Mbps with 40MHz channel spacing.
+   *
+   * \return a WifiMode for OFDM at 150Mbps with 40MHz channel spacing
+   */
   static WifiMode GetOfdmRate150MbpsBW40MHz ();
 
 
   /**
    * Public method used to fire a PhyTxBegin trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet the packet being transmitted
    */
   void NotifyTxBegin (Ptr<const Packet> packet);
 
   /**
    * Public method used to fire a PhyTxEnd trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet the packet that was transmitted
    */
   void NotifyTxEnd (Ptr<const Packet> packet);
 
   /**
    * Public method used to fire a PhyTxDrop trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet the packet that was failed to transmitted
    */
   void NotifyTxDrop (Ptr<const Packet> packet);
 
   /**
    * Public method used to fire a PhyRxBegin trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet the packet being received
    */
   void NotifyRxBegin (Ptr<const Packet> packet);
 
   /**
    * Public method used to fire a PhyRxEnd trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet the packet received
    */
   void NotifyRxEnd (Ptr<const Packet> packet);
 
   /**
    * Public method used to fire a PhyRxDrop trace.  Implemented for encapsulation
    * purposes.
+   *
+   * \param packet the packet that was not successfully received
    */
   void NotifyRxDrop (Ptr<const Packet> packet);
 
@@ -526,20 +942,20 @@
    * Public method used to fire a MonitorSniffer trace for a wifi packet being received.  Implemented for encapsulation
    * purposes.
    *
-   * @param packet the packet being received
-   * @param channelFreqMhz the frequency in MHz at which the packet is
-   * received. Note that in real devices this is normally the
-   * frequency to which  the receiver is tuned, and this can be
-   * different than the frequency at which the packet was originally
-   * transmitted. This is because it is possible to have the receiver
-   * tuned on a given channel and still to be able to receive packets
-   * on a nearby channel.
-   * @param channelNumber the channel on which the packet is received
-   * @param rate the PHY data rate in units of 500kbps (i.e., the same
-   * units used both for the radiotap and for the prism header)
-   * @param isShortPreamble true if short preamble is used, false otherwise
-   * @param signalDbm signal power in dBm
-   * @param noiseDbm  noise power in dBm
+   * \param packet the packet being received
+   * \param channelFreqMhz the frequency in MHz at which the packet is
+   *        received. Note that in real devices this is normally the
+   *        frequency to which  the receiver is tuned, and this can be
+   *        different than the frequency at which the packet was originally
+   *        transmitted. This is because it is possible to have the receiver
+   *        tuned on a given channel and still to be able to receive packets
+   *        on a nearby channel.
+   * \param channelNumber the channel on which the packet is received
+   * \param rate the PHY data rate in units of 500kbps (i.e., the same
+   *        units used both for the radiotap and for the prism header)
+   * \param isShortPreamble true if short preamble is used, false otherwise
+   * \param signalDbm signal power in dBm
+   * \param noiseDbm  noise power in dBm
    */
   void NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble,
                              double signalDbm, double noiseDbm);
@@ -549,13 +965,14 @@
    * Public method used to fire a MonitorSniffer trace for a wifi packet being transmitted.  Implemented for encapsulation
    * purposes.
    *
-   * @param packet the packet being transmitted
-   * @param channelFreqMhz the frequency in MHz at which the packet is
-   * transmitted.
-   * @param channelNumber the channel on which the packet is transmitted
-   * @param rate the PHY data rate in units of 500kbps (i.e., the same
-   * units used both for the radiotap and for the prism header)
-   * @param isShortPreamble true if short preamble is used, false otherwise
+   * \param packet the packet being transmitted
+   * \param channelFreqMhz the frequency in MHz at which the packet is
+   *        transmitted.
+   * \param channelNumber the channel on which the packet is transmitted
+   * \param rate the PHY data rate in units of 500kbps (i.e., the same
+   *        units used both for the radiotap and for the prism header)
+   * \param isShortPreamble true if short preamble is used, false otherwise
+   * \param txPower the transmission power in dBm
    */
   void NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, uint8_t txPower);
 
@@ -570,63 +987,69 @@
   virtual int64_t AssignStreams (int64_t stream) = 0;
 
   /**
-   * \param the operating frequency on this node.
+   * \param freq the operating frequency on this node.
    */
   virtual void SetFrequency (uint32_t freq)=0;
+  /**
+   * \return the operating frequency on this node
+   */
   virtual uint32_t GetFrequency (void) const=0;
   /**
-   * \param the number of transmitters on this node.
+   * \param tx the number of transmitters on this node.
    */
   virtual void SetNumberOfTransmitAntennas (uint32_t tx)=0;
 
+  /**
+   * \return the number of transmit antenna on this device
+   */
   virtual uint32_t GetNumberOfTransmitAntennas (void) const=0;
    /**
-   * \param the number of recievers on this node.
+   * \param rx the number of recievers on this node.
    */
   virtual void SetNumberOfReceiveAntennas (uint32_t rx)=0 ;
   /**
-   * \returns the number of recievers on this node.
+   * \return the number of recievers on this node.
    */
   virtual uint32_t GetNumberOfReceiveAntennas (void) const=0;
   /**
-   * \paramif short guard interval is supported or not
+   * \param guardInterval Enable or disable short guard interval
    */
-   virtual void SetGuardInterval (bool GuardInterval)=0;
+   virtual void SetGuardInterval (bool guardInterval)=0;
    /**
-   *  \returns if short guard interval is supported or not
+   *  \return true if short guard interval is supported, false otherwise
    */
   virtual bool GetGuardInterval (void) const = 0;
   /**
-   * \paramif LDPC is supported or not
+   * \param ldpc Enable or disable LDPC
    */
-  virtual void SetLdpc (bool Ldpc)=0;
+  virtual void SetLdpc (bool ldpc)=0;
   /**
-   * \returns if LDPC is supported or not
+   * \return true if LDPC is supported, false otherwise
    */
   virtual bool GetLdpc (void) const=0;
   /**
-   * \paramif STBC is supported or not
+   * \param stbc Enable or disable STBC is supported
    */
   virtual void SetStbc (bool stbc)=0;
   /**
-   *  \returns if STBC is supported or not
+   *  \return true if STBC is supported, false otherwise
    */
   virtual bool GetStbc (void) const=0;
    
   /**
-   * \paramif GreenField is supported or not
+   * \param greenfield Enable or disable GreenField
    */
   virtual void SetGreenfield (bool greenfield)=0;
   /**
-   *  \returns if Green field is supported or not
+   * \return true if Greenfield is supported, false otherwise
    */
   virtual bool GetGreenfield (void) const=0;
   /**
-   * \paramif channel bonding 40 MHz is supported or not
+   * \return true if channel bonding 40 MHz is supported, false otherwise
    */
   virtual bool GetChannelBonding (void) const = 0;
   /**
-   *  \returns if channel bonding is supported or not
+   *  \param channelbonding Enable or disable channel bonding
    */
   virtual void SetChannelBonding (bool channelbonding) = 0 ;
 
@@ -707,6 +1130,7 @@
 /**
  * \param os          output stream
  * \param state       wifi state to stringify
+ * \return output stream
  */
 std::ostream& operator<< (std::ostream& os, enum WifiPhy::State state);
 
diff -Naur ns-3.18.1/src/wifi/model/wifi-phy-state-helper.cc ns-3.19/src/wifi/model/wifi-phy-state-helper.cc
--- ns-3.18.1/src/wifi/model/wifi-phy-state-helper.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-phy-state-helper.cc	2013-12-20 09:44:50.000000000 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiPhyStateHelper);
+NS_OBJECT_ENSURE_REGISTERED (WifiPhyStateHelper)
+  ;
 
 TypeId
 WifiPhyStateHelper::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/wifi-phy-state-helper.h ns-3.19/src/wifi/model/wifi-phy-state-helper.h
--- ns-3.18.1/src/wifi/model/wifi-phy-state-helper.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-phy-state-helper.h	2013-12-20 09:44:50.000000000 -0800
@@ -39,40 +39,179 @@
 
   WifiPhyStateHelper ();
 
+  /**
+   * Set a callback for a successful reception.
+   *
+   * \param callback
+   */
   void SetReceiveOkCallback (WifiPhy::RxOkCallback callback);
+  /**
+   * Set a callback for a failed reception.
+   *
+   * \param callback
+   */
   void SetReceiveErrorCallback (WifiPhy::RxErrorCallback callback);
+  /**
+   * Register WifiPhyListener to this WifiPhyStateHelper.
+   *
+   * \param listener
+   */
   void RegisterListener (WifiPhyListener *listener);
+  /**
+   * Return the current state of WifiPhy.
+   *
+   * \return the current state of WifiPhy
+   */
   enum WifiPhy::State GetState (void);
+  /**
+   * Check whether the current state is CCA busy.
+   *
+   * \return true if the current state is CCA busy, false otherwise
+   */
   bool IsStateCcaBusy (void);
+  /**
+   * Check whether the current state is IDLE.
+   *
+   * \return true if the current state is IDLE, false otherwise
+   */
   bool IsStateIdle (void);
+  /**
+   * Check whether the current state is not IDLE.
+   *
+   * \return true if the current state is not IDLE, false otherwise
+   */
   bool IsStateBusy (void);
+  /**
+   * Check whether the current state is RX.
+   *
+   * \return true if the current state is RX, false otherwise
+   */
   bool IsStateRx (void);
+  /**
+   * Check whether the current state is TX.
+   *
+   * \return true if the current state is TX, false otherwise
+   */
   bool IsStateTx (void);
+  /**
+   * Check whether the current state is SWITCHING.
+   *
+   * \return true if the current state is SWITCHING, false otherwise
+   */
   bool IsStateSwitching (void);
+  /**
+   * Return the elapsed time of the current state.
+   *
+   * \return the elapsed time of the current state
+   */
   Time GetStateDuration (void);
+  /**
+   * Return the time before the state is back to IDLE.
+   *
+   * \return the delay before the state is back to IDLE
+   */
   Time GetDelayUntilIdle (void);
+  /**
+   * Return the time the last RX start.
+   *
+   * \return the time the last RX start.
+   */
   Time GetLastRxStartTime (void) const;
 
+  /**
+   * Switch state to TX for the given duration.
+   *
+   * \param txDuration the duration of the TX
+   * \param packet the packet
+   * \param txMode the transmission mode of the packet
+   * \param preamble the preamble of the packet
+   * \param txPower the transmission power
+   */
   void SwitchToTx (Time txDuration, Ptr<const Packet> packet, WifiMode txMode, WifiPreamble preamble, uint8_t txPower);
+  /**
+   * Switch state to RX for the given duration.
+   *
+   * \param rxDuration the duration of the RX
+   */
   void SwitchToRx (Time rxDuration);
+  /**
+   * Switch state to channel switching for the given duration.
+   *
+   * \param switchingDuration the duration of required to switch the channel
+   */
   void SwitchToChannelSwitching (Time switchingDuration);
+  /**
+   * Switch from RX after the reception was successful.
+   *
+   * \param packet the successfully received packet
+   * \param snr the SNR of the received packet
+   * \param mode the transmission mode of the packet
+   * \param preamble the preamble of the received packet
+   */
   void SwitchFromRxEndOk (Ptr<Packet> packet, double snr, WifiMode mode, enum WifiPreamble preamble);
+  /**
+   * Switch from RX after the reception failed.
+   *
+   * \param packet the packet that we failed to received
+   * \param snr the SNR of the received packet
+   */
   void SwitchFromRxEndError (Ptr<const Packet> packet, double snr);
+  /**
+   * Switch to CCA busy.
+   *
+   * \param duration the duration of CCA busy state
+   */
   void SwitchMaybeToCcaBusy (Time duration);
 
   TracedCallback<Time,Time,enum WifiPhy::State> m_stateLogger;
 private:
+  /**
+   * typedef for a list of WifiPhyListeners
+   */
   typedef std::vector<WifiPhyListener *> Listeners;
 
+  /**
+   * Log the ideal and CCA states.
+   */
   void LogPreviousIdleAndCcaBusyStates (void);
 
+  /**
+   * Notify all WifiPhyListener that the transmission has started for the given duration.
+   *
+   * \param duration the duration of the transmission
+   */
   void NotifyTxStart (Time duration);
-  void NotifyWakeup (void);
+  //void NotifyWakeup (void);
+  /**
+   * Notify all WifiPhyListener that the reception has started for the given duration.
+   *
+   * \param duration the duration of the reception
+   */
   void NotifyRxStart (Time duration);
+  /**
+   * Notify all WifiPhyListener that the reception was successful.
+   */
   void NotifyRxEndOk (void);
+  /**
+   * Notify all WifiPhyListener that the reception was not successful.
+   */
   void NotifyRxEndError (void);
+  /**
+   * Notify all WifiPhyListener that the CCA has started for the given duration.
+   *
+   * \param duration the duration of the CCA state
+   */
   void NotifyMaybeCcaBusyStart (Time duration);
+  /**
+   * Notify all WifiPhyListener that we are switching channel with the given channel
+   * switching delay.
+   *
+   * \param duration the delay to switch the channel
+   */
   void NotifySwitchingStart (Time duration);
+  /**
+   * Switch the state from RX.
+   */
   void DoSwitchFromRx (void);
 
   bool m_rxing;
diff -Naur ns-3.18.1/src/wifi/model/wifi-remote-station-manager.cc ns-3.19/src/wifi/model/wifi-remote-station-manager.cc
--- ns-3.18.1/src/wifi/model/wifi-remote-station-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-remote-station-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -45,6 +45,9 @@
 public:
   HighLatencyDataTxVectorTag ();
   HighLatencyDataTxVectorTag (WifiTxVector dataTxVector);
+  /**
+   * \returns the transmission mode to use to send this packet
+   */
   WifiTxVector GetDataTxVector (void) const;
 
   static TypeId GetTypeId (void);
@@ -110,6 +113,10 @@
 public:
   HighLatencyRtsTxVectorTag ();
   HighLatencyRtsTxVectorTag (WifiTxVector rtsTxVector);
+  /**
+   * \returns the transmission mode to use to send the RTS prior to the
+   *          transmission of the data packet itself.
+   */
   WifiTxVector GetRtsTxVector (void) const;
 
   static TypeId GetTypeId (void);
@@ -175,6 +182,9 @@
 public:
   HighLatencyCtsToSelfTxVectorTag ();
   HighLatencyCtsToSelfTxVectorTag (WifiTxVector ctsToSelfTxVector);
+  /**
+   * \returns the transmission mode to use for the CTS-to-self.
+   */
   WifiTxVector GetCtsToSelfTxVector (void) const;
 
   static TypeId GetTypeId (void);
@@ -239,7 +249,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager);
+NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager)
+  ;
 
 TypeId
 WifiRemoteStationManager::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/wifi-remote-station-manager.h ns-3.19/src/wifi/model/wifi-remote-station-manager.h
--- ns-3.18.1/src/wifi/model/wifi-remote-station-manager.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-remote-station-manager.h	2013-12-20 09:44:50.000000000 -0800
@@ -57,13 +57,15 @@
   void NotifyTxSuccess (uint32_t retryCounter);
   /// Updates average frame error rate when final data or RTS has failed.
   void NotifyTxFailed ();
-  /// Returns frame error rate (probability that frame is corrupted due to transmission error).
+  /// Return frame error rate (probability that frame is corrupted due to transmission error).
   double GetFrameErrorRate () const;
 private:
   /**
    * \brief Calculate averaging coefficient for frame error rate. Depends on time of the last update.
    * \attention Calling this method twice gives different results,
    * because it resets time of last update.
+   *
+   * \return average coefficient for frame error rate
    */
   double CalculateAveragingCoefficient ();
   /// averaging coefficient depends on the memory time
@@ -88,47 +90,171 @@
   WifiRemoteStationManager ();
   virtual ~WifiRemoteStationManager ();
 
+  /**
+   * Set up PHY associated with this device since it is the object that
+   * knows the full set of transmit rates that are supported.
+   *
+   * \param phy the PHY of this device
+   */
   virtual void SetupPhy (Ptr<WifiPhy> phy);
 
+  /**
+   * Return the maximum STA short retry count (SSRC).
+   *
+   * \return the maximum SSRC
+   */
   uint32_t GetMaxSsrc (void) const;
+  /**
+   * Return the maximum STA long retry count (SLRC).
+   *
+   * \return the maximum SLRC
+   */
   uint32_t GetMaxSlrc (void) const;
+  /**
+   * Return the RTS threshold.
+   *
+   * \return the RTS threshold
+   */
   uint32_t GetRtsCtsThreshold (void) const;
+  /**
+   * Return the fragmentation threshold.
+   *
+   * \return the fragmentation threshold
+   */
   uint32_t GetFragmentationThreshold (void) const;
+  /**
+   * Sets the maximum STA short retry count (SSRC).
+   *
+   * \param maxSsrc the maximum SSRC
+   */
   void SetMaxSsrc (uint32_t maxSsrc);
+  /**
+   * Sets the maximum STA long retry count (SLRC).
+   *
+   * \param maxSlrc the maximum SLRC
+   */
   void SetMaxSlrc (uint32_t maxSlrc);
+  /**
+   * Sets the RTS threshold.
+   *
+   * \param threshold the RTS threshold
+   */
   void SetRtsCtsThreshold (uint32_t threshold);
+  /**
+   * Sets a fragmentation threshold. The method calls a private method
+   * DoSetFragmentationThreshold that checks the validity of the value given.
+   *
+   * \param threshold the fragmentation threshold
+   */
   void SetFragmentationThreshold (uint32_t threshold);
-  void AddStationHtCapabilities (Mac48Address from,HtCapabilities     htcapabilities);
+  /**
+   * Records HT capabilities of the remote station.
+   *
+   * \param from the address of the station being recorded
+   * \param htcapabilities the HT capabilities of the station
+   */
+  void AddStationHtCapabilities (Mac48Address from, HtCapabilities htcapabilities);
+  /**
+   * Enable or disable HT capability support.
+   *
+   * \param enable enable or disable HT capability support
+   */
   void SetHtSupported (bool enable);
+  /**
+   * Return whether the device has HT capability support enabled.
+   *
+   * \return true if HT capability support is enabled, false otherwise
+   */
   bool HasHtSupported (void) const;
 
-  // Invoked in a STA upon dis-association
-  // or in an AP upon reboot
+  /**
+   * Reset the station, invoked in a STA upon dis-association or in an AP upon reboot.
+   */
   void Reset (void);
-  // Invoked in a STA upon association to store
-  // the set of rates which belong to the
-  // BSSBasicRateSet of the associated AP
-  // and which are supported locally.
-  // Invoked in an AP to configure the BSSBasicRateSet
+  /**
+   * Invoked in a STA upon association to store the set of rates which belong to the
+   * BSSBasicRateSet of the associated AP and which are supported locally.
+   * Invoked in an AP to configure the BSSBasicRateSet.
+   * 
+   * \param mode the WifiMode to be added to the basic mode set
+   */
   void AddBasicMode (WifiMode mode);
 
+  /**
+   * Return the default transmission mode.
+   *
+   * \return WifiMode the default transmission mode
+   */
   WifiMode GetDefaultMode (void) const;
+  /**
+   * Return the number of basic modes we support.
+   *
+   * \return the number of basic modes we support
+   */
   uint32_t GetNBasicModes (void) const;
+  /**
+   * Return a basic mode from the set of basic modes.
+   *
+   * \param i index of the basic mode in the basic mode set
+   * \return the basic mode at the given index
+   */
   WifiMode GetBasicMode (uint32_t i) const;
+  /**
+   * Return whether the station supports Greenfield or not.
+   *
+   * \param address the address of the station
+   * \return true if Greenfield is supported by the station,
+   *          false otherwise
+   */
   bool GetGreenfieldSupported (Mac48Address address) const;
+  /**
+   * Add a given Modulation and Coding Scheme (MCS) index to
+   * the set of basic MCS.
+   *
+   * \param mcs the MCS index
+   */
   void AddBasicMcs (uint8_t mcs);
 
+  /**
+   * Return the default Modulation and Coding Scheme (MCS) index.
+   *
+   * \return the default MCS index
+   */
   uint8_t GetDefaultMcs (void) const;
+  /**
+   * Return the number of basic MCS index.
+   *
+   * \return the number of basic MCS index
+   */
   uint32_t GetNBasicMcs (void) const;
+  /**
+   * Return the MCS at the given <i>list</i> index.
+   *
+   * \param i the position in the list
+   * \return the MCS at the given list index
+   */
   uint8_t GetBasicMcs (uint32_t i) const;
+  /**
+   * Record the MCS index supported by the station.
+   * 
+   * \param address the address of the station
+   * \param mcs the MCS index
+   */
   void AddSupportedMcs (Mac48Address address, uint8_t mcs);
 
+  /**
+   * Return a mode for non-unicast packets.
+   *
+   * \return WifiMode for non-unicast packets
+   */
   WifiMode GetNonUnicastMode (void) const;
 
 
   /**
    * Invoked in an AP upon disassociation of a
    * specific STA.
+   *
+   * \param address the address of the STA
    */
   void Reset (Mac48Address address);
   /**
@@ -137,16 +263,64 @@
    * also supported locally.
    * The set of supported modes includes
    * the BSSBasicRateSet.
+   *
+   * \param address the address of the station being recorded
+   * \param mode the WifiMode supports by the station
    */
   void AddSupportedMode (Mac48Address address, WifiMode mode);
   //void  AddBssMembershipParameters(Mac48Address address, uint32_t selector);
 
+  /**
+   * Return whether the station state is brand new.
+   *
+   * \param address the address of the station
+   * \return true if the state of the station is brand new,
+   *          false otherwise
+   */
   bool IsBrandNew (Mac48Address address) const;
+  /**
+   * Return whether the station associated.
+   *
+   * \param address the address of the station
+   * \return true if the station is associated,
+   *          false otherwise
+   */
   bool IsAssociated (Mac48Address address) const;
+  /**
+   * Return whether we are waiting for an ACK for
+   * the association response we sent.
+   *
+   * \param address the address of the station
+   * \return true if the station is associated,
+   *          false otherwise
+   */
   bool IsWaitAssocTxOk (Mac48Address address) const;
+  /**
+   * Records that we are waiting for an ACK for
+   * the association response we sent.
+   *
+   * \param address the address of the station
+   */
   void RecordWaitAssocTxOk (Mac48Address address);
+  /**
+   * Records that we got an ACK for
+   * the association response we sent.
+   *
+   * \param address the address of the station
+   */
   void RecordGotAssocTxOk (Mac48Address address);
+  /**
+   * Records that we missed an ACK for
+   * the association response we sent.
+   *
+   * \param address the address of the station
+   */
   void RecordGotAssocTxFailed (Mac48Address address);
+  /**
+   * Records that the STA was disassociated.
+   *
+   * \param address the address of the station
+   */
   void RecordDisassociated (Mac48Address address);
 
   /**
@@ -168,7 +342,7 @@
    * \param header MAC header
    * \param packet the packet to send
    * \param fullPacketSize the size of the packet after its 802.11 MAC header has been added.
-   * \returns the transmission mode to use to send this packet
+   * \return the transmission mode to use to send this packet
    */
   WifiTxVector GetDataTxVector (Mac48Address address, const WifiMacHeader *header,
                         Ptr<const Packet> packet, uint32_t fullPacketSize);
@@ -176,49 +350,88 @@
    * \param address remote address
    * \param header MAC header
    * \param packet the packet to send
-   * \returns the transmission mode to use to send the RTS prior to the
+   *
+   * \return the transmission mode to use to send the RTS prior to the
    *          transmission of the data packet itself.
    */
   WifiTxVector GetRtsTxVector (Mac48Address address, const WifiMacHeader *header,
                        Ptr<const Packet> packet);
 
+  /**
+   * \param header MAC header
+   * \param packet the packet to send
+   *
+   * \return the transmission mode to use to send the CTS-to-self prior to the
+   *          transmission of the data packet itself.
+   */
   WifiTxVector GetCtsToSelfTxVector (const WifiMacHeader *header,
                        Ptr<const Packet> packet);
 
-  //Since CTS to Self parameters don't depened on the station it is implemented in wifiremote station manager
+  /**
+   * Since CTS-to-self parameters are not dependent on the station,
+   * it is implemented in wifiremote station manager
+   *
+   * \return the transmission mode to use to send the CTS-to-self prior to the
+   *          transmission of the data packet itself.
+   */
   WifiTxVector DoGetCtsToSelfTxVector (void);
 
 
   /**
    * Should be invoked whenever the RtsTimeout associated to a transmission
    * attempt expires.
+   *
+   * \param address the address of the receiver
+   * \param header MAC header of the DATA packet
    */
   void ReportRtsFailed (Mac48Address address, const WifiMacHeader *header);
   /**
    * Should be invoked whenever the AckTimeout associated to a transmission
    * attempt expires.
+   *
+   * \param address the address of the receiver
+   * \param header MAC header of the DATA packet
    */
   void ReportDataFailed (Mac48Address address, const WifiMacHeader *header);
   /**
    * Should be invoked whenever we receive the Cts associated to an RTS
-   * we just sent.
+   * we just sent. Note that we also get the SNR of the RTS we sent since
+   * the receiver put a SnrTag in the CTS.
+   * 
+   * \param address the address of the receiver
+   * \param header MAC header of the DATA packet
+   * \param ctsSnr the SNR of the CTS we received
+   * \param ctsMode the WifiMode the receiver used to send the CTS
+   * \param rtsSnr the SNR of the RTS we sent
    */
   void ReportRtsOk (Mac48Address address, const WifiMacHeader *header,
                     double ctsSnr, WifiMode ctsMode, double rtsSnr);
   /**
    * Should be invoked whenever we receive the Ack associated to a data packet
    * we just sent.
+   *
+   * \param address the address of the receiver
+   * \param header MAC header of the DATA packet
+   * \param ackSnr the SNR of the ACK we received
+   * \param ackMode the WifiMode the receiver used to send the ACK
+   * \param dataSnr the SNR of the DATA we sent
    */
   void ReportDataOk (Mac48Address address, const WifiMacHeader *header,
                      double ackSnr, WifiMode ackMode, double dataSnr);
   /**
    * Should be invoked after calling ReportRtsFailed if
    * NeedRtsRetransmission returns false
+   *
+   * \param address the address of the receiver
+   * \param header MAC header of the DATA packet
    */
   void ReportFinalRtsFailed (Mac48Address address, const WifiMacHeader *header);
   /**
    * Should be invoked after calling ReportDataFailed if
    * NeedDataRetransmission returns false
+   *
+   * \param address the address of the receiver
+   * \param header MAC header of the DATA packet
    */
   void ReportFinalDataFailed (Mac48Address address, const WifiMacHeader *header);
 
@@ -237,18 +450,24 @@
    * \param address remote address
    * \param header MAC header
    * \param packet the packet to send
-   * \returns true if we want to use an RTS/CTS handshake for this
+   * \return true if we want to use an RTS/CTS handshake for this
    *          packet before sending it, false otherwise.
    */
   bool NeedRts (Mac48Address address, const WifiMacHeader *header,
                 Ptr<const Packet> packet);
+  /**
+   * Return if we need to do Cts-to-self before sending a DATA.
+   *
+   * \param txVector the TXVECTOR of the packet to be sent
+   * \return true if Cts-to-self is needed, false otherwise
+   */
   bool NeedCtsToSelf (WifiTxVector txVector);
 
   /**
    * \param address remote address
    * \param header MAC header
    * \param packet the packet to send
-   * \returns true if we want to restart a failed RTS/CTS
+   * \return true if we want to restart a failed RTS/CTS
    *          handshake, false otherwise.
    */
   bool NeedRtsRetransmission (Mac48Address address, const WifiMacHeader *header,
@@ -257,7 +476,7 @@
    * \param address remote address
    * \param header MAC header
    * \param packet the packet to send
-   * \returns true if we want to resend a packet
+   * \return true if we want to resend a packet
    *          after a failed transmission attempt, false otherwise.
    */
   bool NeedDataRetransmission (Mac48Address address, const WifiMacHeader *header,
@@ -267,7 +486,7 @@
    * \param address remote address
    * \param header MAC header
    * \param packet the packet to send
-   * \returns true if this packet should be fragmented, false otherwise.
+   * \return true if this packet should be fragmented, false otherwise.
    */
   bool NeedFragmentation (Mac48Address address, const WifiMacHeader *header,
                           Ptr<const Packet> packet);
@@ -276,7 +495,7 @@
    * \param header MAC header
    * \param packet the packet to send
    * \param fragmentNumber the fragment index of the next fragment to send (starts at zero).
-   * \returns the size of the corresponding fragment.
+   * \return the size of the corresponding fragment.
    */
   uint32_t GetFragmentSize (Mac48Address address, const WifiMacHeader *header,
                             Ptr<const Packet> packet, uint32_t fragmentNumber);
@@ -285,7 +504,7 @@
    * \param header MAC header
    * \param packet the packet to send
    * \param fragmentNumber the fragment index of the next fragment to send (starts at zero).
-   * \returns the offset within the original packet where this fragment starts.
+   * \return the offset within the original packet where this fragment starts.
    */
   uint32_t GetFragmentOffset (Mac48Address address, const WifiMacHeader *header,
                               Ptr<const Packet> packet, uint32_t fragmentNumber);
@@ -294,7 +513,7 @@
    * \param header MAC header
    * \param packet the packet to send
    * \param fragmentNumber the fragment index of the next fragment to send (starts at zero).
-   * \returns true if this is the last fragment, false otherwise.
+   * \return true if this is the last fragment, false otherwise.
    */
   bool IsLastFragment (Mac48Address address, const WifiMacHeader *header,
                        Ptr<const Packet> packet, uint32_t fragmentNumber);
@@ -302,64 +521,135 @@
   /**
    * \param address remote address
    * \param rtsMode the transmission mode used to send an RTS we just received
-   * \returns the transmission mode to use for the CTS to complete the RTS/CTS
+   * \return the transmission mode to use for the CTS to complete the RTS/CTS
    *          handshake.
    */
   WifiTxVector GetCtsTxVector (Mac48Address address, WifiMode rtsMode);
   /**
    * \param address
    * \param dataMode the transmission mode used to send an ACK we just received
-   * \returns the transmission mode to use for the ACK to complete the data/ACK
+   * \return the transmission mode to use for the ACK to complete the data/ACK
    *          handshake.
    */
   WifiTxVector GetAckTxVector (Mac48Address address, WifiMode dataMode);
   /**
    * \param address
    * \param dataMode the transmission mode used to send an ACK we just received
-   * \returns the transmission mode to use for the ACK to complete the data/ACK
+   * \return the transmission mode to use for the ACK to complete the data/ACK
    *          handshake.
    */
   WifiTxVector GetBlockAckTxVector (Mac48Address address, WifiMode dataMode);
   /**
-   * \returns the default transmission power
+   * \return the default transmission power
    */ 
   uint8_t GetDefaultTxPowerLevel (void) const;
   /**
    * \param address of the remote station
-   * \returns information regarding the remote station associated with the given address
+   * \return information regarding the remote station associated with the given address
    */
   WifiRemoteStationInfo GetInfo (Mac48Address address);
   /**
    * Set the default transmission power level
+   *
+   * \param txPower the default transmission power level
    */
   void SetDefaultTxPowerLevel (uint8_t txPower);
  /**
-  * \returns the number of transmit antennas supported by the phy layer
+  * \return the number of transmit antennas supported by the phy layer
   */
  uint32_t GetNumberOfTransmitAntennas (void);
 
  protected:
   virtual void DoDispose (void);
-  // for convenience
+  /**
+   * Return whether mode associated with the specified station at the specified index.
+   *
+   * \param station the station being queried
+   * \param i the index
+   * \return WifiMode at the given index of the specified station
+   */
   WifiMode GetSupported (const WifiRemoteStation *station, uint32_t i) const;
+  /**
+   * Return the number of modes supported by the given station.
+   *
+   * \param station the station being queried
+   * \return the number of modes supported by the given station
+   */
   uint32_t GetNSupported (const WifiRemoteStation *station) const;
+  /**
+   * Return the MCS index supported by the specified station at the specified index.
+   *
+   * \param station the station being queried
+   * \param i the index
+   * \return the MCS index at the given index of the specified station
+   */
   uint8_t GetMcsSupported (const WifiRemoteStation *station, uint32_t i) const;
+  /**
+   * Return the number of MCS supported by the given station.
+   *
+   * \param station the station being queried
+   * \return the number of MCS supported by the given station
+   */
   uint32_t GetNMcsSupported (const WifiRemoteStation *station) const;
 
+  /**
+   * Return whether the given station supports short guard interval.
+   *
+   * \param station the station being queried
+   * \return true if the station supports short guard interval,
+   *          false otherwise
+   */
   bool GetShortGuardInterval (const WifiRemoteStation *station) const;
+  /**
+   * Return whether the given station supports space-time block coding (STBC).
+   *
+   * \param station the station being queried
+   * \return true if the station supports STBC, false otherwise
+   */
   bool GetStbc (const WifiRemoteStation *station) const;
+  /**
+   * Return whether the station supports Greenfield or not.
+   *
+   * \param station the station being queried
+   * \return true if Greenfield is supported by the station,
+   *          false otherwise
+   */
   bool GetGreenfield (const WifiRemoteStation *station) const;
+  /**
+   * Return the number of receive antenna the station has.
+   *
+   * \param station the station being queried
+   * \return the number of receive antenna the station has
+   */
   uint32_t GetNumberOfReceiveAntennas (const WifiRemoteStation *station) const;
+  /**
+   * Return the number of transmit antenna the station has.
+   *
+   * \param station the station being queried
+   * \return the number of transmit antenna the station has
+   */
   uint32_t GetNumberOfTransmitAntennas (const WifiRemoteStation *station) const;
+  /**
+   * Return the long retry limit of the given station.
+   *
+   * \param station the station being queried
+   * \return the long retry limit of the the station
+   */
   uint32_t GetLongRetryCount (const WifiRemoteStation *station) const;
+  /**
+   * Return the short retry limit of the given station.
+   *
+   * \param station the station being queried
+   * \return the short retry limit of the the station
+   */
   uint32_t GetShortRetryCount (const WifiRemoteStation *station) const;
 private:
   /**
-   * \param station the station with which we need to communicate
+   * \param station the station that we need to communicate
    * \param packet the packet to send
    * \param normally indicates whether the normal 802.11 rts enable mechanism would
    *        request that the rts is sent or not.
-   * \returns true if we want to use an RTS/CTS handshake for this
+   * \return true if we want to use an RTS/CTS handshake for this
    *          packet before sending it, false otherwise.
    *
    * Note: This method is called before a unicast packet is sent on the medium.
@@ -367,11 +657,11 @@
   virtual bool DoNeedRts (WifiRemoteStation *station,
                           Ptr<const Packet> packet, bool normally);
   /**
-   * \param station the station with which we need to communicate
+   * \param station the station that we need to communicate
    * \param packet the packet to send
    * \param normally indicates whether the normal 802.11 rts enable mechanism would
    *        request that the rts is retransmitted or not.
-   * \returns true if we want to restart a failed RTS/CTS
+   * \return true if we want to restart a failed RTS/CTS
    *          handshake, false otherwise.
    *
    * Note: This method is called after an rts/cts handshake has been attempted
@@ -380,11 +670,11 @@
   virtual bool DoNeedRtsRetransmission (WifiRemoteStation *station,
                                         Ptr<const Packet> packet, bool normally);
   /**
-   * \param station the station with which we need to communicate
+   * \param station the station that we need to communicate
    * \param packet the packet to send
    * \param normally indicates whether the normal 802.11 data retransmission mechanism
    *        would request that the data is retransmitted or not.
-   * \returns true if we want to resend a packet
+   * \return true if we want to resend a packet
    *          after a failed transmission attempt, false otherwise.
    *
    * Note: This method is called after a unicast packet transmission has been attempted
@@ -394,18 +684,18 @@
                                          Ptr<const Packet> packet, bool normally);
 
   /**
-   * \param station the station with which we need to communicate
+   * \param station the station that we need to communicate
    * \param packet the packet to send
    * \param normally indicates whether the normal 802.11 data fragmentation mechanism
    *        would request that the data packet is fragmented or not.
-   * \returns true if this packet should be fragmented, false otherwise.
+   * \return true if this packet should be fragmented, false otherwise.
    *
    * Note: This method is called before sending a unicast packet.
    */
   virtual bool DoNeedFragmentation (WifiRemoteStation *station,
                                     Ptr<const Packet> packet, bool normally);
   /**
-   * \returns whether this manager is a manager designed to work in low-latency
+   * \return whether this manager is a manager designed to work in low-latency
    *          environments.
    *
    * Note: In this context, low vs high latency is defined in <i>IEEE 802.11 Rate Adaptation:
@@ -417,9 +707,9 @@
    */
   virtual WifiRemoteStation* DoCreateStation (void) const = 0;
  /**
-   * \param station the station with which we need to communicate
+   * \param station the station that we need to communicate
    * \param size size of the packet or fragment we want to send
-   * \returns the transmission mode to use to send a packet to the station
+   * \return the transmission mode to use to send a packet to the station
    *
    * Note: This method is called before sending a unicast packet or a fragment
    *       of a unicast packet to decide which transmission mode to use.
@@ -427,8 +717,8 @@
   virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station,
                                   uint32_t size) = 0;
   /**
-   * \param station the station with which we need to communicate
-   * \returns the transmission mode to use to send an rts to the station
+   * \param station the station that we need to communicate
+   * \return the transmission mode to use to send an rts to the station
    *
    * Note: This method is called before sending an rts to a station
    *       to decide which transmission mode to use for the rts.
@@ -446,7 +736,7 @@
 
   /** 
    * \param address the address of the recipient of the ACK
-   * \param ctsMode the mode to be used for the ACK 
+   * \param ackMode the mode to be used for the ACK 
    * 
    * \return the power level to be used to send the ACK
    */  
@@ -454,7 +744,7 @@
 
   /** 
    * \param address the address of the recipient of the Block ACK
-   * \param ctsMode the mode to be used for the Block ACK 
+   * \param blockAckMode the mode to be used for the Block ACK 
    * 
    * \return the power level to be used to send the Block ACK
    */  
@@ -474,32 +764,127 @@
   virtual uint8_t DoGetBlockAckTxNess(Mac48Address address, WifiMode blockAckMode);
   virtual bool DoGetBlockAckTxStbc(Mac48Address address, WifiMode blockAckMode);
 
+  /**
+   * This method is a pure virtual method that must be implemented by the sub-class.
+   * This allows different types of WifiRemoteStationManager to respond differently,
+   *
+   * \param station the station that we failed to send RTS
+   */
   virtual void DoReportRtsFailed (WifiRemoteStation *station) = 0;
+  /**
+   * This method is a pure virtual method that must be implemented by the sub-class.
+   * This allows different types of WifiRemoteStationManager to respond differently,
+   *
+   * \param station the station that we failed to send DATA
+   */
   virtual void DoReportDataFailed (WifiRemoteStation *station) = 0;
+  /**
+   * This method is a pure virtual method that must be implemented by the sub-class.
+   * This allows different types of WifiRemoteStationManager to respond differently,
+   *
+   * \param station the station that we successfully sent RTS
+   * \param ctsSnr the SNR of the CTS we received
+   * \param ctsMode the WifiMode the receiver used to send the CTS
+   * \param rtsSnr the SNR of the RTS we sent
+   */
   virtual void DoReportRtsOk (WifiRemoteStation *station,
                               double ctsSnr, WifiMode ctsMode, double rtsSnr) = 0;
+  /**
+   * This method is a pure virtual method that must be implemented by the sub-class.
+   * This allows different types of WifiRemoteStationManager to respond differently,
+   *
+   * \param station the station that we successfully sent RTS
+   * \param ackSnr the SNR of the ACK we received
+   * \param ackMode the WifiMode the receiver used to send the ACK
+   * \param dataSnr the SNR of the DATA we sent
+   */
   virtual void DoReportDataOk (WifiRemoteStation *station,
                                double ackSnr, WifiMode ackMode, double dataSnr) = 0;
+  /**
+   * This method is a pure virtual method that must be implemented by the sub-class.
+   * This allows different types of WifiRemoteStationManager to respond differently,
+   *
+   * \param station the station that we failed to send RTS
+   */
   virtual void DoReportFinalRtsFailed (WifiRemoteStation *station) = 0;
+  /**
+   * This method is a pure virtual method that must be implemented by the sub-class.
+   * This allows different types of WifiRemoteStationManager to respond differently,
+   *
+   * \param station the station that we failed to send DATA
+   */
   virtual void DoReportFinalDataFailed (WifiRemoteStation *station) = 0;
+  /**
+   * This method is a pure virtual method that must be implemented by the sub-class.
+   * This allows different types of WifiRemoteStationManager to respond differently,
+   *
+   * \param station the station that sent the DATA to us
+   * \param rxSnr the SNR of the DATA we received
+   * \param txMode the WifiMode the sender used to send the DATA
+   */
   virtual void DoReportRxOk (WifiRemoteStation *station,
                              double rxSnr, WifiMode txMode) = 0;
 
+  /**
+   * Return the state of the station associated with the given address.
+   *
+   * \param address the address of the station
+   * \return WifiRemoteStationState corresponding to the address
+   */
   WifiRemoteStationState* LookupState (Mac48Address address) const;
+  /**
+   * Return the station associated with the given address and TID.
+   *
+   * \param address the address of the station
+   * \param tid the TID
+   * \return WifiRemoteStation corresponding to the address
+   */
   WifiRemoteStation* Lookup (Mac48Address address, uint8_t tid) const;
   /// Find a remote station by its remote address and TID taken from MAC header
+  /**
+   * Return the station associated with the given address and MAC header.
+   * It simply gets TID from the MAC header and calls Lookup with tid.
+   *
+   * \param address the address of the station
+   * \param header MAC header
+   * \return WifiRemoteStation corresponding to the address
+   */
   WifiRemoteStation* Lookup (Mac48Address address, const WifiMacHeader *header) const;
   WifiMode GetControlAnswerMode (Mac48Address address, WifiMode reqMode);
 
+  /**
+   * Actually sets the fragmentation threshold, it also checks the validity of
+   * the given threshold.
+   *
+   * \param threshold the fragmentation threshold
+   */
   void DoSetFragmentationThreshold (uint32_t threshold);
+  /**
+   * Return the current fragmentation threshold
+   * 
+   * \return the fragmentation threshold
+   */
   uint32_t DoGetFragmentationThreshold (void) const;
+  /**
+   * Return the number of fragments needed for the given packet.
+   *
+   * \param header MAC header
+   * \param packet the packet to be fragmented
+   * \return the number of fragments needed
+   */
   uint32_t GetNFragments (const WifiMacHeader *header, Ptr<const Packet> packet);
 
+  /**
+   * A vector of WifiRemoteStations
+   */
   typedef std::vector <WifiRemoteStation *> Stations;
+  /**
+   * A vector of WifiRemoteStationStates
+   */
   typedef std::vector <WifiRemoteStationState *> StationStates;
 
-  StationStates m_states;
-  Stations m_stations;
+  StationStates m_states;  //!< States of known stations
+  Stations m_stations;  //!< Information for each known stations
   /**
    * This is a pointer to the WifiPhy associated with this
    * WifiRemoteStationManager that is set on call to
@@ -509,8 +894,8 @@
    * "DeviceRateSet").
    */
   Ptr<WifiPhy> m_wifiPhy;
-  WifiMode m_defaultTxMode;
-  uint8_t m_defaultTxMcs;
+  WifiMode m_defaultTxMode;  //!< The default transmission mode
+  uint8_t m_defaultTxMcs;  //!< The default transmission modulation-coding scheme (MCS)
 
   /**
    * This member is the list of WifiMode objects that comprise the
@@ -523,13 +908,13 @@
   WifiModeList m_bssBasicRateSet;
   WifiMcsList m_bssBasicMcsSet;
 
-  bool m_htSupported;
-  uint32_t m_maxSsrc;
-  uint32_t m_maxSlrc;
-  uint32_t m_rtsCtsThreshold;
-  uint32_t m_fragmentationThreshold;
-  uint8_t m_defaultTxPowerLevel;
-  WifiMode m_nonUnicastMode;
+  bool m_htSupported;  //!< Flag if HT capability is supported
+  uint32_t m_maxSsrc;  //!< Maximum STA short retry count (SSRC)
+  uint32_t m_maxSlrc;  //!< Maximum STA long retry count (SLRC)
+  uint32_t m_rtsCtsThreshold;  //!< Threshold for RTS/CTS
+  uint32_t m_fragmentationThreshold;  //!< Threshold for fragmentation
+  uint8_t m_defaultTxPowerLevel;  //!< Default tranmission power level
+  WifiMode m_nonUnicastMode;  //!< Transmission mode for non-unicast DATA frames
 
   /**
    * The trace source fired when the transmission of a single RTS has failed
@@ -552,8 +937,14 @@
 
 };
 
+/**
+ * A struct that holds information about each remote station.
+ */
 struct WifiRemoteStationState
 {
+  /**
+   * State of the station
+   */
   enum
   {
     BRAND_NEW,
@@ -573,13 +964,13 @@
    */
   WifiModeList m_operationalRateSet;
   WifiMcsList m_operationalMcsSet;
-  Mac48Address m_address;
+  Mac48Address m_address;  //!< Mac48Address of the remote station
   WifiRemoteStationInfo m_info;
-  bool m_shortGuardInterval;
-  uint32_t m_rx;
-  uint32_t m_tx;
-  bool m_stbc;
-  bool m_greenfield;
+  bool m_shortGuardInterval;  //!< Flag if short guard interval is supported by the remote station
+  uint32_t m_rx;  //!< Number of RX antennae of the remote station
+  uint32_t m_tx;  //!< Number of TX antennae of the remote station
+  bool m_stbc;  //!< Flag if STBC is used by the remote station
+  bool m_greenfield;  //!< Flag if green field is used by the remote station
 
 };
 
@@ -593,10 +984,10 @@
  */
 struct WifiRemoteStation
 {
-  WifiRemoteStationState *m_state;
-  uint32_t m_ssrc;
-  uint32_t m_slrc;
-  uint8_t m_tid;
+  WifiRemoteStationState *m_state; //!< Remote station state
+  uint32_t m_ssrc; //!< STA short retry count
+  uint32_t m_slrc; //!< STA long retry count
+  uint8_t m_tid; //!< traffic ID
 };
 
 
diff -Naur ns-3.18.1/src/wifi/model/wifi-tx-vector.cc ns-3.19/src/wifi/model/wifi-tx-vector.cc
--- ns-3.18.1/src/wifi/model/wifi-tx-vector.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-tx-vector.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,14 +27,14 @@
 {
 }
 
-WifiTxVector::WifiTxVector (WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc)
-  : m_mode (m),
-    m_txPowerLevel (l),
-    m_retries (r),
-    m_shortGuardInterval(sg),
-    m_nss(ns),
-    m_ness(ne),
-    m_stbc(Stbc)
+WifiTxVector::WifiTxVector (WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc)
+  : m_mode (mode),
+    m_txPowerLevel (powerLevel),
+    m_retries (retries),
+    m_shortGuardInterval(shortGuardInterval),
+    m_nss(nss),
+    m_ness(ness),
+    m_stbc(stbc)
 {
 }
 
diff -Naur ns-3.18.1/src/wifi/model/wifi-tx-vector.h ns-3.19/src/wifi/model/wifi-tx-vector.h
--- ns-3.18.1/src/wifi/model/wifi-tx-vector.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/wifi-tx-vector.h	2013-12-20 09:44:50.000000000 -0800
@@ -48,13 +48,26 @@
 {
 public:
   WifiTxVector ();
-  WifiTxVector (WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc);
+  /**
+   * Create a TXVECTOR with the given parameters.
+   *
+   * \param mode WifiMode
+   * \param powerLevel transmission power level
+   * \param retries retries
+   * \param shortGuardInterval enable or disable short guard interval
+   * \param nss the number of spatial STBC streams (NSS)
+   * \param ness the number of extension spatial streams (NESS)
+   * \param stbc enable or disable STBC
+   */
+  WifiTxVector (WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc);
   /**
    *  \returns the txvector payload mode
    */
   WifiMode GetMode (void) const;
- /**
+  /**
   * Sets the selected payload transmission mode
+  *
+  * \param mode
   */
   void SetMode (WifiMode mode);
   /**
@@ -63,14 +76,18 @@
   uint8_t GetTxPowerLevel (void) const;
   /**
    * Sets the selected transmission power level
+   *
+   * \param powerlevel
    */
   void SetTxPowerLevel (uint8_t powerlevel);
   /**
    *  \returns the number of retries
    */
   uint8_t GetRetries (void) const;
-   /**
+  /**
    * Sets the number of retries
+   *
+   * \param retries
    */
   void SetRetries (uint8_t retries);
   /**
@@ -79,32 +96,42 @@
   bool IsShortGuardInterval (void) const;
    /**
    * Sets if short gurad interval is being used
+   *
+   * \param guardinterval enable or disable short guard interval
    */
   void SetShortGuardInterval (bool guardinterval);
- /**
+  /**
    *  \returns the number of Nss
    */
   uint8_t GetNss (void) const;
-   /**
+  /**
    * Sets the number of Nss refer to IEEE802.11n Table 20-28 for explanation and range
+   *
+   * \param nss
    */
   void SetNss (uint8_t nss);
   /**
    *  \returns the number of Ness  
    */
   uint8_t GetNess (void) const;
-   /**
+  /**
    * Sets the Ness number refer to IEEE802.11n Table 20-6 for explanation
+   *
+   * \param ness
    */
   void SetNess (uint8_t ness);
   /**
-   *  \returns if STBC is used or not
+   * Check if STBC is used or not
+   *  \returns true if STBC is used,
+   *           false otherwise
    */
   bool IsStbc (void) const;
   /**
    * Sets if STBC is being used
+   *
+   * \param stbc enable or disable STBC
    */
-  void SetStbc (bool stbcsatuts);
+  void SetStbc (bool stbc);
 
   
 private:
@@ -124,6 +151,13 @@
 
 };
 
+/**
+ * Serialize WifiTxVector to the given ostream.
+ *
+ * \param os
+ * \param v
+ * \return ostream
+ */
 std::ostream & operator << (std::ostream & os,const WifiTxVector &v); 
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/wifi/model/yans-error-rate-model.cc ns-3.19/src/wifi/model/yans-error-rate-model.cc
--- ns-3.18.1/src/wifi/model/yans-error-rate-model.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/yans-error-rate-model.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (YansErrorRateModel);
+NS_OBJECT_ENSURE_REGISTERED (YansErrorRateModel)
+  ;
 
 TypeId
 YansErrorRateModel::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/yans-error-rate-model.h ns-3.19/src/wifi/model/yans-error-rate-model.h
--- ns-3.18.1/src/wifi/model/yans-error-rate-model.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/yans-error-rate-model.h	2013-12-20 09:44:50.000000000 -0800
@@ -62,17 +62,89 @@
   virtual double GetChunkSuccessRate (WifiMode mode, double snr, uint32_t nbits) const;
 
 private:
+  /**
+   * Return the logarithm of the given value to base 2.
+   *
+   * \param val
+   * \return the logarithm of val to base 2.
+   */
   double Log2 (double val) const;
+  /**
+   * Return BER of BPSK with the given parameters.
+   *
+   * \param snr snr value
+   * \param signalSpread
+   * \param phyRate
+   * \return BER of BPSK at the given SNR
+   */
   double GetBpskBer (double snr, uint32_t signalSpread, uint32_t phyRate) const;
+  /**
+   * Return BER of QAM-m with the given parameters.
+   *
+   * \param snr snr value
+   * \param m
+   * \param signalSpread
+   * \param phyRate
+   * \return BER of BPSK at the given SNR
+   */
   double GetQamBer (double snr, unsigned int m, uint32_t signalSpread, uint32_t phyRate) const;
+  /**
+   * Return k!
+   *
+   * \param k
+   * \return k!
+   */
   uint32_t Factorial (uint32_t k) const;
+  /**
+   * Return Binomial distribution for a given k, p, and n
+   * 
+   * \param k
+   * \param p
+   * \param n
+   * \return a Binomial distribution
+   */
   double Binomial (uint32_t k, double p, uint32_t n) const;
+  /**
+   * \param ber
+   * \param d
+   * \return double
+   */
   double CalculatePdOdd (double ber, unsigned int d) const;
+  /**
+   * \param ber
+   * \param d
+   * \return double
+   */
   double CalculatePdEven (double ber, unsigned int d) const;
+  /**
+   * \param ber
+   * \param d
+   * \return double
+   */
   double CalculatePd (double ber, unsigned int d) const;
+  /**
+   * \param snr
+   * \param nbits
+   * \param signalSpread
+   * \param phyRate
+   * \param dFree
+   * \param adFree
+   * \return double
+   */
   double GetFecBpskBer (double snr, double nbits,
                         uint32_t signalSpread, uint32_t phyRate,
                         uint32_t dFree, uint32_t adFree) const;
+  /**
+   * \param snr
+   * \param nbits
+   * \param signalSpread
+   * \param phyRate
+   * \param m
+   * \param dfree
+   * \param adFree
+   * \param adFreePlusOne
+   * \return double
+   */
   double GetFecQamBer (double snr, uint32_t nbits,
                        uint32_t signalSpread,
                        uint32_t phyRate,
diff -Naur ns-3.18.1/src/wifi/model/yans-wifi-channel.cc ns-3.19/src/wifi/model/yans-wifi-channel.cc
--- ns-3.18.1/src/wifi/model/yans-wifi-channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/yans-wifi-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel);
+NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel)
+  ;
 
 TypeId
 YansWifiChannel::GetTypeId (void)
diff -Naur ns-3.18.1/src/wifi/model/yans-wifi-channel.h ns-3.19/src/wifi/model/yans-wifi-channel.h
--- ns-3.18.1/src/wifi/model/yans-wifi-channel.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/yans-wifi-channel.h	2013-12-20 09:44:50.000000000 -0800
@@ -59,6 +59,11 @@
   virtual uint32_t GetNDevices (void) const;
   virtual Ptr<NetDevice> GetDevice (uint32_t i) const;
 
+  /**
+   * Adds the given YansWifiPhy to the PHY list
+   *
+   * \param phy the YansWifiPhy to be added to the PHY list
+   */
   void Add (Ptr<YansWifiPhy> phy);
 
   /**
@@ -74,7 +79,7 @@
    * \param sender the device from which the packet is originating.
    * \param packet the packet to send
    * \param txPowerDbm the tx power associated to the packet
-   * \param wifiMode the tx mode associated to the packet
+   * \param txVector the TXVECTOR associated to the packet
    * \param preamble the preamble associated to the packet
    *
    * This method should not be invoked by normal users. It is
@@ -96,17 +101,31 @@
   int64_t AssignStreams (int64_t stream);
 
 private:
-  YansWifiChannel& operator = (const YansWifiChannel &);
-  YansWifiChannel (const YansWifiChannel &);
+  //YansWifiChannel& operator = (const YansWifiChannel &);
+  //YansWifiChannel (const YansWifiChannel &);
 
+  /**
+   * A vector of pointers to YansWifiPhy.
+   */
   typedef std::vector<Ptr<YansWifiPhy> > PhyList;
+  /**
+   * This method is scheduled by Send for each associated YansWifiPhy.
+   * The method then calls the corresponding YansWifiPhy that the first
+   * bit of the packet has arrived.
+   *
+   * \param i index of the corresponding YansWifiPhy in the PHY list
+   * \param packet the packet being sent
+   * \param rxPowerDbm the received power of the packet
+   * \param txVector the TXVECTOR of the packet
+   * \param preamble the type of preamble being used to send the packet
+   */
   void Receive (uint32_t i, Ptr<Packet> packet, double rxPowerDbm,
                 WifiTxVector txVector, WifiPreamble preamble) const;
 
 
-  PhyList m_phyList;
-  Ptr<PropagationLossModel> m_loss;
-  Ptr<PropagationDelayModel> m_delay;
+  PhyList m_phyList; //!< List of YansWifiPhys connected to this YansWifiChannel
+  Ptr<PropagationLossModel> m_loss; //!< Propagation loss model
+  Ptr<PropagationDelayModel> m_delay; //!< Propagation delay model
 };
 
 } // namespace ns3
diff -Naur ns-3.18.1/src/wifi/model/yans-wifi-phy.cc ns-3.19/src/wifi/model/yans-wifi-phy.cc
--- ns-3.18.1/src/wifi/model/yans-wifi-phy.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/yans-wifi-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -42,7 +42,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (YansWifiPhy);
+NS_OBJECT_ENSURE_REGISTERED (YansWifiPhy)
+  ;
 
 TypeId
 YansWifiPhy::GetTypeId (void)
@@ -862,9 +863,9 @@
   return m_guardInterval;
 }
 void
-YansWifiPhy::SetGuardInterval (bool GuardInterval)
+YansWifiPhy::SetGuardInterval (bool guardInterval)
 {
-  m_guardInterval = GuardInterval;
+  m_guardInterval = guardInterval;
 }
 
 uint32_t
diff -Naur ns-3.18.1/src/wifi/model/yans-wifi-phy.h ns-3.19/src/wifi/model/yans-wifi-phy.h
--- ns-3.18.1/src/wifi/model/yans-wifi-phy.h	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wifi/model/yans-wifi-phy.h	2013-12-20 09:44:50.000000000 -0800
@@ -69,59 +69,181 @@
   YansWifiPhy ();
   virtual ~YansWifiPhy ();
 
+  /**
+   * Set the YansWifiChannel this YansWifiPhy is to be connected to.
+   *
+   * \param channel the YansWifiChannel this YansWifiPhy is to be connected to
+   */
   void SetChannel (Ptr<YansWifiChannel> channel);
 
   /**
-   * \brief Set channel number.
-   *
-   * Channel center frequency = Channel starting frequency + 5 MHz * nch
-   *
-   * where Starting channel frequency is standard-dependent, see SetStandard()
-   * as defined in IEEE 802.11-2007 17.3.8.3.2.
+   * Set the current channel number.
    *
-   * YansWifiPhy can switch among different channels. Basically, YansWifiPhy
-   * has a private attribute m_channelNumber that identifies the channel the
-   * PHY operates on. Channel switching cannot interrupt an ongoing transmission.
-   * When PHY is in TX state, the channel switching is postponed until the end
-   * of the current transmission. When the PHY is in RX state, the channel
-   * switching causes the drop of the synchronized packet.
+   * \param id the channel number
    */
   void SetChannelNumber (uint16_t id);
-  /// Return current channel number, see SetChannelNumber()
+  /**
+   * Return the current channel number.
+   *
+   * \return the current channel number
+   */
   uint16_t GetChannelNumber () const;
-  /// Return current center channel frequency in MHz, see SetChannelNumber()
+  /**
+   * Return current center channel frequency in MHz.
+   *
+   * \return the current center channel frequency in MHz
+   */  
   double GetChannelFrequencyMhz () const;
 
+  /**
+   * Starting receiving the 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
+   */
   void StartReceivePacket (Ptr<Packet> packet,
                            double rxPowerDbm,
                            WifiTxVector txVector,
                            WifiPreamble preamble);
 
+  /**
+   * Sets the RX loss (dB) in the Signal-to-Noise-Ratio due to non-idealities in the receiver.
+   *
+   * \param noiseFigureDb noise figure in dB
+   */
   void SetRxNoiseFigure (double noiseFigureDb);
+  /**
+   * Sets the minimum available transmission power level (dBm).
+   *
+   * \param start the minimum transmission power level (dBm)
+   */
   void SetTxPowerStart (double start);
+  /**
+   * Sets the maximum available transmission power level (dBm).
+   *
+   * \param end the maximum transmission power level (dBm)
+   */
   void SetTxPowerEnd (double end);
+  /**
+   * Sets the number of transmission power levels available between the
+   * minimum level and the maximum level.  Transmission power levels are
+   * equally separated (in dBm) with the minimum and the maximum included.
+   *
+   * \param n the number of available levels
+   */
   void SetNTxPower (uint32_t n);
+  /**
+   * Sets the transmission gain (dB).
+   *
+   * \param gain the transmission gain in dB
+   */
   void SetTxGain (double gain);
+  /**
+   * Sets the reception gain (dB).
+   *
+   * \param gain the reception gain in dB
+   */
   void SetRxGain (double gain);
+  /**
+   * Sets the energy detection threshold (dBm).
+   * The energy of a received signal should be higher than
+   * this threshold (dbm) to allow the PHY layer to detect the signal.
+   *
+   * \param threshold the energy detction threshold in dBm
+   */
   void SetEdThreshold (double threshold);
+  /**
+   * Sets the CCA threshold (dBm).  The energy of a received signal
+   * should be higher than this threshold to allow the PHY
+   * layer to declare CCA BUSY state.
+   *
+   * \param threshold the CCA threshold in dBm
+   */
   void SetCcaMode1Threshold (double threshold);
+  /**
+   * Sets the error rate model.
+   *
+   * \param rate the error rate model
+   */
   void SetErrorRateModel (Ptr<ErrorRateModel> rate);
+  /**
+   * Sets the device this PHY is associated with.
+   *
+   * \param device the device this PHY is associated with
+   */
   void SetDevice (Ptr<Object> device);
+  /**
+   * Sets the mobility model.
+   *
+   * \param mobility the mobility model this PHY is associated with
+   */
   void SetMobility (Ptr<Object> mobility);
+  /**
+   * Return the RX noise figure (dBm).
+   *
+   * \return the RX noise figure in dBm
+   */
   double GetRxNoiseFigure (void) const;
+  /**
+   * Return the transmission gain (dB).
+   *
+   * \return the transmission gain in dB
+   */
   double GetTxGain (void) const;
+  /**
+   * Return the reception gain (dB).
+   *
+   * \return the reception gain in dB
+   */
   double GetRxGain (void) const;
+  /**
+   * Return the energy detection threshold (dBm).
+   *
+   * \return the energy detection threshold in dBm
+   */
   double GetEdThreshold (void) const;
+  /**
+   * Return the CCA threshold (dBm).
+   *
+   * \return the CCA threshold in dBm
+   */
   double GetCcaMode1Threshold (void) const;
+  /**
+   * Return the error rate model this PHY is using.
+   *
+   * \return the error rate model this PHY is using
+   */
   Ptr<ErrorRateModel> GetErrorRateModel (void) const;
+  /**
+   * Return the device this PHY is associated with
+   *
+   * \return the device this PHY is associated with
+   */
   Ptr<Object> GetDevice (void) const;
+  /**
+   * Return the mobility model this PHY is associated with.
+   *
+   * \return the mobility model this PHY is associated with
+   */
   Ptr<Object> GetMobility (void);
 
-
-
-
+  /**
+   * Return the minimum available transmission power level (dBm).
+   * \return the minimum available transmission power level (dBm)
+   */
   virtual double GetTxPowerStart (void) const;
+  /**
+   * Return the maximum available transmission power level (dBm).
+   * \return the maximum available transmission power level (dBm)
+   */
   virtual double GetTxPowerEnd (void) const;
+  /**
+   * Return the number of available transmission power levels.
+   *
+   * \return the number of available transmission power levels
+   */
   virtual uint32_t GetNTxPower (void) const;
   virtual void SetReceiveOkCallback (WifiPhy::RxOkCallback callback);
   virtual void SetReceiveErrorCallback (WifiPhy::RxErrorCallback callback);
@@ -140,6 +262,7 @@
   virtual WifiMode GetMode (uint32_t mode) const;
   virtual double CalculateSnr (WifiMode txMode, double ber) const;
   virtual Ptr<WifiChannel> GetChannel (void) const;
+  
   virtual void ConfigureStandard (enum WifiPhyStandard standard);
 
  /**
@@ -153,61 +276,83 @@
   int64_t AssignStreams (int64_t stream);
 
   /**
-   * \param the operating frequency on this node (2.4 GHz or 5GHz).
+   * \param freq the operating frequency on this node (2.4 GHz or 5GHz).
    */
   virtual void SetFrequency (uint32_t freq);
   /**
-   * \returns the operating frequency on this node
+   * \return the operating frequency on this node
    */
   virtual uint32_t GetFrequency (void) const;
   /**
-   * \param the number of transmitters on this node.
+   * \param tx the number of transmitters on this node.
    */
   virtual void SetNumberOfTransmitAntennas (uint32_t tx);
   virtual uint32_t GetNumberOfTransmitAntennas (void) const;
   /**
-   * \param the number of receivers on this node.
+   * \param rx the number of receivers on this node.
    */
   virtual void SetNumberOfReceiveAntennas (uint32_t rx) ;
   /**
-   * \returns the number of receivers on this node.
+   * \return the number of receivers on this node.
    */
   virtual uint32_t GetNumberOfReceiveAntennas (void) const;
   /**
-   * \param set short/long guard interval.
+   * Enable or disable short/long guard interval.
+   *
+   * \param guardInterval Enable or disable guard interval
    */
-  virtual void SetGuardInterval (bool GuardInterval);
-   virtual bool GetGuardInterval (void) const;
+  virtual void SetGuardInterval (bool guardInterval);
   /**
-   * \param sets LDPC is supported or not
+   * Return whether guard interval is being used.
+   *
+   * \return true if guard interval is being used, false otherwise
    */
-  virtual void SetLdpc (bool Ldpc);
+  virtual bool GetGuardInterval (void) const;
   /**
-   * \returns if LDPC is supported or not
+   * Enable or disable LDPC.
+   * \param ldpc Enable or disable LDPC
+   */
+  virtual void SetLdpc (bool ldpc);
+  /**
+   * Return if LDPC is supported.
+   *
+   * \return true if LDPC is supported, false otherwise
    */
   virtual bool GetLdpc (void) const;
   /**
-   * \param sets STBC is supported or not
+   * Enable or disable STBC.
+   *
+   * \param stbc Enable or disable STBC
    */
   virtual void SetStbc (bool stbc);
- /**
-   * \returns if STBC is supported or not
+  /**
+   * Return whether STBC is supported. 
+   *
+   * \return true if STBC is supported, false otherwise
    */
   virtual bool GetStbc (void) const;
   /**
-   * \param sets Greenfield is supported or not
+   * Enable or disable Greenfield support.
+   *
+   * \param greenfield Enable or disable Greenfield
    */
   virtual void SetGreenfield (bool greenfield);
   /**
-   * \returns if Greenfield is supported or not
+   * Return whether Greenfield is supported.
+   *
+   * \return true if Greenfield is supported, false otherwise
    */
   virtual bool GetGreenfield (void) const;
   /**
-   * \param sets channel bonding is supported or not
+   * Return whether channel bonding is supported.
+   * 
+   * \return true if channel bonding is supported, false otherwise
    */
   virtual bool GetChannelBonding (void) const ;
   /**
-   * \returns if channel bonding is supported or not
+   * Enable or disable channel bonding support.
+   * 
+   * \param channelbonding Enable or disable channel bonding
    */
   virtual void SetChannelBonding (bool channelbonding) ;
 
@@ -215,73 +360,119 @@
   virtual uint32_t GetBssMembershipSelector (uint32_t selector) const;
   virtual WifiModeList GetMembershipSelectorModes(uint32_t selector);
   /**
-   * \returns the number of MCS supported by this phy
+   * \return the number of MCS supported by this phy
    */
   virtual uint8_t GetNMcs (void) const;
   virtual uint8_t GetMcs (uint8_t mcs) const;
-  /**
-  * For a given WifiMode finds the corresponding MCS value and returns it 
-  * as defined in the IEEE 802.11n standard 
-  *
-  * \param mode the WifiMode
-  * \returns the MCS number that corresponds to the given WifiMode
-  */
+
   virtual uint32_t WifiModeToMcs (WifiMode mode);
- /**
-  * For a given MCS finds the corresponding WifiMode and returns it 
-  * as defined in the IEEE 802.11n standard. 
-  * 
-  * \param mcs the MCS number 
-  * \returns the WifiMode that corresponds to the given mcs number
-  */
   virtual WifiMode McsToWifiMode (uint8_t mcs);
 
 private:
-  YansWifiPhy (const YansWifiPhy &o);
+  //YansWifiPhy (const YansWifiPhy &o);
   virtual void DoDispose (void);
+  /**
+   * Configure YansWifiPhy with appropriate channel frequency and
+   * supported rates for 802.11a standard.
+   */
   void Configure80211a (void);
+  /**
+   * Configure YansWifiPhy with appropriate channel frequency and
+   * supported rates for 802.11b standard.
+   */
   void Configure80211b (void);
+  /**
+   * Configure YansWifiPhy with appropriate channel frequency and
+   * supported rates for 802.11g standard.
+   */
   void Configure80211g (void);
+  /**
+   * Configure YansWifiPhy with appropriate channel frequency and
+   * supported rates for 802.11a standard with 10MHz channel spacing.
+   */
   void Configure80211_10Mhz (void);
+  /**
+   * Configure YansWifiPhy with appropriate channel frequency and
+   * supported rates for 802.11a standard with 5MHz channel spacing.
+   */
   void Configure80211_5Mhz ();
   void ConfigureHolland (void);
+  /**
+   * Configure YansWifiPhy with appropriate channel frequency and
+   * supported rates for 802.11n standard.
+   */
   void Configure80211n (void);
+  /**
+   * Return the energy detection threshold.
+   *
+   * \return the energy detection threshold.
+   */
   double GetEdThresholdW (void) const;
+  /**
+   * Convert from dBm to Watts.
+   *
+   * \param dbm the power in dBm
+   * \return the equivalent Watts for the given dBm
+   */
   double DbmToW (double dbm) const;
+  /**
+   * Convert from dB to ratio.
+   *
+   * \param db
+   * \return ratio
+   */
   double DbToRatio (double db) const;
+  /**
+   * Convert from Watts to dBm.
+   *
+   * \param w the power in Watts
+   * \return the equivalent dBm for the given Watts
+   */
   double WToDbm (double w) const;
+  /**
+   * Convert from ratio to dB.
+   *
+   * \param ratio
+   * \return dB
+   */
   double RatioToDb (double ratio) const;
+  /**
+   * Get the power of the given power level in dBm.
+   * In YansWifiPhy implementation, the power levels are equally spaced (in dBm).
+   *
+   * \param power the power level
+   * \return the transmission power in dBm at the given power level
+   */
   double GetPowerDbm (uint8_t power) const;
+  /**
+   * The last bit of the packet has arrived.
+   *
+   * \param packet the packet that the last bit has arrived
+   * \param event the corresponding event of the first time the packet arrives
+   */
   void EndReceive (Ptr<Packet> packet, Ptr<InterferenceHelper::Event> event);
 
 private:
-  double   m_edThresholdW;
-  double   m_ccaMode1ThresholdW;
-  double   m_txGainDb;
-  double   m_rxGainDb;
-  double   m_txPowerBaseDbm;
-  double   m_txPowerEndDbm;
-  uint32_t m_nTxPower;
-
-  Ptr<YansWifiChannel> m_channel;
-  uint16_t             m_channelNumber;
-  Ptr<Object>          m_device;
-  Ptr<Object>          m_mobility;
-
-  // number of transmitters
-  uint32_t m_numberOfTransmitters;
-  // number of receivers
-  uint32_t m_numberOfReceivers;
-  //if true use LDPC
-  bool     m_ldpc;
-  // True if STBC is used
-  bool     m_stbc;
-  //True if GreenField format is supported
-  bool     m_greenfield;
-  //True is short guard interval is used
-  bool     m_guardInterval;
-  //True if channel bonding is used
-  bool     m_channelBonding;
+  double   m_edThresholdW;        //!< Energy detection threshold in watts
+  double   m_ccaMode1ThresholdW;  //!< Clear channel assessment (CCA) threshold in watts
+  double   m_txGainDb;            //!< Transmission gain (dB)
+  double   m_rxGainDb;            //!< Reception gain (dB)
+  double   m_txPowerBaseDbm;      //!< Minimum transmission power (dBm)
+  double   m_txPowerEndDbm;       //!< Maximum transmission power (dBm)
+  uint32_t m_nTxPower;            //!< Number of available transmission power levels
+
+  Ptr<YansWifiChannel> m_channel;        //!< YansWifiChannel that this YansWifiPhy is connected to
+  uint16_t             m_channelNumber;  //!< Operating channel number
+  Ptr<Object>          m_device;         //!< Pointer to the device
+  Ptr<Object>          m_mobility;       //!< Pointer to the mobility model
+
+  uint32_t m_numberOfTransmitters;  //!< Number of transmitters
+  uint32_t m_numberOfReceivers;     //!< Number of receivers
+  bool     m_ldpc;                  //!< Flag if LDPC is used
+  bool     m_stbc;                  //!< Flag if STBC is used      
+  bool     m_greenfield;            //!< Flag if GreenField format is supported
+  bool     m_guardInterval;         //!< Flag if short guard interval is used
+  bool     m_channelBonding;        //!< Flag if channel conding is used
 
 
   /**
@@ -325,13 +516,12 @@
   std::vector<uint32_t> m_bssMembershipSelectorSet;
   std::vector<uint8_t> m_deviceMcsSet;
   EventId m_endRxEvent;
-  /// Provides uniform random variables.
-  Ptr<UniformRandomVariable> m_random;
-  /// Standard-dependent center frequency of 0-th channel, MHz
-  double m_channelStartingFrequency;
-  Ptr<WifiPhyStateHelper> m_state;
-  InterferenceHelper m_interference;
-  Time m_channelSwitchDelay;
+
+  Ptr<UniformRandomVariable> m_random;  //!< Provides uniform random variables.
+  double m_channelStartingFrequency;    //!< Standard-dependent center frequency of 0-th channel in MHz
+  Ptr<WifiPhyStateHelper> m_state;      //!< Pointer to WifiPhyStateHelper
+  InterferenceHelper m_interference;    //!< Pointer to InterferenceHelper
+  Time m_channelSwitchDelay;            //!< Time required to switch between channel
 
 };
 
diff -Naur ns-3.18.1/src/wimax/bindings/modulegen__gcc_ILP32.py ns-3.19/src/wimax/bindings/modulegen__gcc_ILP32.py
--- ns-3.18.1/src/wimax/bindings/modulegen__gcc_ILP32.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/bindings/modulegen__gcc_ILP32.py	2013-12-20 09:44:50.000000000 -0800
@@ -305,7 +305,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## wimax-tlv.h (module 'wimax'): ns3::Tlv [class]
@@ -2076,10 +2076,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -6479,6 +6480,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -6489,6 +6495,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -6504,6 +6515,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -6529,6 +6545,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/wimax/bindings/modulegen__gcc_LP64.py ns-3.19/src/wimax/bindings/modulegen__gcc_LP64.py
--- ns-3.18.1/src/wimax/bindings/modulegen__gcc_LP64.py	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/bindings/modulegen__gcc_LP64.py	2013-12-20 09:44:50.000000000 -0800
@@ -305,7 +305,7 @@
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
-    module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
+    module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
     ## wimax-tlv.h (module 'wimax'): ns3::Tlv [class]
@@ -2076,10 +2076,11 @@
                    'bool', 
                    [param('ns3::Ipv6Address const &', 'other')], 
                    is_const=True)
-    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function]
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function]
     cls.add_method('IsIpv4MappedAddress', 
                    'bool', 
-                   [])
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function]
     cls.add_method('IsLinkLocal', 
                    'bool', 
@@ -6479,6 +6480,11 @@
                    'ns3::Time', 
                    [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], 
                    is_static=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
+    cls.add_method('GetDays', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function]
     cls.add_method('GetDouble', 
                    'double', 
@@ -6489,6 +6495,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function]
+    cls.add_method('GetHours', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function]
     cls.add_method('GetInteger', 
                    'int64_t', 
@@ -6504,6 +6515,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function]
+    cls.add_method('GetMinutes', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function]
     cls.add_method('GetNanoSeconds', 
                    'int64_t', 
@@ -6529,6 +6545,11 @@
                    'int64_t', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function]
+    cls.add_method('GetYears', 
+                   'double', 
+                   [], 
+                   is_const=True)
     ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function]
     cls.add_method('IsNegative', 
                    'bool', 
diff -Naur ns-3.18.1/src/wimax/doc/wimax.rst ns-3.19/src/wimax/doc/wimax.rst
--- ns-3.18.1/src/wimax/doc/wimax.rst	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/doc/wimax.rst	2013-12-20 09:44:50.000000000 -0800
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Wimax NetDevice
 ---------------
@@ -78,7 +79,7 @@
 The helper API is defined in ``src/wimax/helper/wimax-helper.{cc,h}``.
 
 The example ``src/wimax/examples/wimax-simple.cc`` contains some basic code that
-shows how to set up the model:::
+shows how to set up the model::
 
   switch (schedType)
     {
@@ -117,7 +118,7 @@
 
 Different variants of ``Install`` are available; for instance, the example
 ``src/wimax/examples/wimax-multicast.cc`` shows how to specify a non-default channel
-or propagation model:::
+or propagation model::
 
   channel = CreateObject<SimpleOfdmWimaxChannel> ();
   channel->SetPropagationModel (SimpleOfdmWimaxChannel::COST231_PROPAGATION);
@@ -140,11 +141,11 @@
 priority, rate, scheduling type, etc. The base station is responsible for
 issuing service flow identifiers and mapping them to WiMAX connections. The
 following code from ``src/wimax/examples/wimax-multicast.cc`` shows how this is
-configured from a helper level:::
+configured from a helper level::
 
  ServiceFlow MulticastServiceFlow = wimax.CreateServiceFlow (ServiceFlow::SF_DIRECTION_DOWN,
-                                                              ServiceFlow::SF_TYPE_UGS,
-                                                              MulticastClassifier);
+                                                             ServiceFlow::SF_TYPE_UGS,
+                                                             MulticastClassifier);
 
   bs->GetServiceFlowManager ()->AddMulticastServiceFlow (MulticastServiceFlow, WimaxPhy::MODULATION_TYPE_QPSK_12);
 
@@ -178,7 +179,7 @@
 existing trace sources, or to define and export new ones.  
 
 Many |ns3| users use the built-in Pcap or Ascii tracing, and the
-WimaxHelper has similar APIs:::
+WimaxHelper has similar APIs::
 
     AsciiTraceHelper ascii;
     WimaxHelper wimax;
@@ -505,7 +506,9 @@
 
 The names of the files should respect the following format: modulation0.txt for
 modulation 0, modulation1.txt for modulation 1 and so on...  The file format
-should be as follows::
+should be as follows:
+
+.. sourcecode:: text
 
     SNR_value1   BER  Blc_ER  STANDARD_DEVIATION  CONFIDENCE_INTERVAL1  CONFIDENCE_INTERVAL2
     SNR_value2   BER  Blc_ER  STANDARD_DEVIATION  CONFIDENCE_INTERVAL1  CONFIDENCE_INTERVAL2
diff -Naur ns-3.18.1/src/wimax/model/bandwidth-manager.cc ns-3.19/src/wimax/model/bandwidth-manager.cc
--- ns-3.18.1/src/wimax/model/bandwidth-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bandwidth-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -37,7 +37,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BandwidthManager);
+NS_OBJECT_ENSURE_REGISTERED (BandwidthManager)
+  ;
 
 TypeId BandwidthManager::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/bs-link-manager.cc ns-3.19/src/wimax/model/bs-link-manager.cc
--- ns-3.18.1/src/wimax/model/bs-link-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-link-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BSLinkManager);
+NS_OBJECT_ENSURE_REGISTERED (BSLinkManager)
+  ;
 
 TypeId BSLinkManager::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/bs-net-device.cc ns-3.19/src/wimax/model/bs-net-device.cc
--- ns-3.18.1/src/wimax/model/bs-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -50,7 +50,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice)
+  ;
 
 TypeId BaseStationNetDevice::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/bs-scheduler.cc ns-3.19/src/wimax/model/bs-scheduler.cc
--- ns-3.18.1/src/wimax/model/bs-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 NS_LOG_COMPONENT_DEFINE ("BSScheduler");
 
 namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BSScheduler);
+NS_OBJECT_ENSURE_REGISTERED (BSScheduler)
+  ;
 
 TypeId
 BSScheduler::GetTypeId (void)
diff -Naur ns-3.18.1/src/wimax/model/bs-scheduler-rtps.cc ns-3.19/src/wimax/model/bs-scheduler-rtps.cc
--- ns-3.18.1/src/wimax/model/bs-scheduler-rtps.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-scheduler-rtps.cc	2013-12-20 09:44:50.000000000 -0800
@@ -41,7 +41,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps);
+NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps)
+  ;
 
 TypeId
 BSSchedulerRtps::GetTypeId (void)
diff -Naur ns-3.18.1/src/wimax/model/bs-scheduler-simple.cc ns-3.19/src/wimax/model/bs-scheduler-simple.cc
--- ns-3.18.1/src/wimax/model/bs-scheduler-simple.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-scheduler-simple.cc	2013-12-20 09:44:50.000000000 -0800
@@ -39,7 +39,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple);
+NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple)
+  ;
 
 TypeId BSSchedulerSimple::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/bs-uplink-scheduler.cc ns-3.19/src/wimax/model/bs-uplink-scheduler.cc
--- ns-3.18.1/src/wimax/model/bs-uplink-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-uplink-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler);
+NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler)
+  ;
 
 UplinkScheduler::UplinkScheduler (void)
   : m_bs (0),
diff -Naur ns-3.18.1/src/wimax/model/bs-uplink-scheduler-mbqos.cc ns-3.19/src/wimax/model/bs-uplink-scheduler-mbqos.cc
--- ns-3.18.1/src/wimax/model/bs-uplink-scheduler-mbqos.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-uplink-scheduler-mbqos.cc	2013-12-20 09:44:50.000000000 -0800
@@ -33,7 +33,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS);
+NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS)
+  ;
 
 UplinkSchedulerMBQoS::UplinkSchedulerMBQoS ()
 {
diff -Naur ns-3.18.1/src/wimax/model/bs-uplink-scheduler-rtps.cc ns-3.19/src/wimax/model/bs-uplink-scheduler-rtps.cc
--- ns-3.18.1/src/wimax/model/bs-uplink-scheduler-rtps.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-uplink-scheduler-rtps.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,9 @@
 NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerRtps");
 
 namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED ( UplinkSchedulerRtps);
+NS_OBJECT_ENSURE_REGISTERED ( UplinkSchedulerRtps)
+  ;
+  
 
 UplinkSchedulerRtps::UplinkSchedulerRtps ()
 {
diff -Naur ns-3.18.1/src/wimax/model/bs-uplink-scheduler-simple.cc ns-3.19/src/wimax/model/bs-uplink-scheduler-simple.cc
--- ns-3.18.1/src/wimax/model/bs-uplink-scheduler-simple.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/bs-uplink-scheduler-simple.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerSimple");
 
 namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple);
+NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple)
+  ;
 
 UplinkSchedulerSimple::UplinkSchedulerSimple (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/burst-profile-manager.cc ns-3.19/src/wimax/model/burst-profile-manager.cc
--- ns-3.18.1/src/wimax/model/burst-profile-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/burst-profile-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (BurstProfileManager);
+NS_OBJECT_ENSURE_REGISTERED (BurstProfileManager)
+  ;
 
 TypeId BurstProfileManager::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/connection-manager.cc ns-3.19/src/wimax/model/connection-manager.cc
--- ns-3.18.1/src/wimax/model/connection-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/connection-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ConnectionManager);
+NS_OBJECT_ENSURE_REGISTERED (ConnectionManager)
+  ;
 
 TypeId ConnectionManager::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/dl-mac-messages.cc ns-3.19/src/wimax/model/dl-mac-messages.cc
--- ns-3.18.1/src/wimax/model/dl-mac-messages.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/dl-mac-messages.cc	2013-12-20 09:44:50.000000000 -0800
@@ -312,7 +312,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (Dcd);
+NS_OBJECT_ENSURE_REGISTERED (Dcd)
+  ;
 
 Dcd::Dcd (void)
   : m_reserved (0),
@@ -544,7 +545,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (DlMap);
+NS_OBJECT_ENSURE_REGISTERED (DlMap)
+  ;
 
 DlMap::DlMap (void)
   : m_dcdCount (0),
diff -Naur ns-3.18.1/src/wimax/model/ipcs-classifier.cc ns-3.19/src/wimax/model/ipcs-classifier.cc
--- ns-3.18.1/src/wimax/model/ipcs-classifier.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/ipcs-classifier.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (IpcsClassifier);
+NS_OBJECT_ENSURE_REGISTERED (IpcsClassifier)
+  ;
 
 TypeId IpcsClassifier::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/mac-messages.cc ns-3.19/src/wimax/model/mac-messages.cc
--- ns-3.18.1/src/wimax/model/mac-messages.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/mac-messages.cc	2013-12-20 09:44:50.000000000 -0800
@@ -29,7 +29,8 @@
 NS_LOG_COMPONENT_DEFINE ("MACMESSAGES");
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType);
+NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType)
+  ;
 
 ManagementMessageType::ManagementMessageType (void)
   : m_type (~0)
@@ -106,7 +107,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (RngReq);
+NS_OBJECT_ENSURE_REGISTERED (RngReq)
+  ;
 
 RngReq::RngReq (void)
   : m_reserved (0),
@@ -220,7 +222,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (RngRsp);
+NS_OBJECT_ENSURE_REGISTERED (RngRsp)
+  ;
 
 RngRsp::RngRsp (void)
   : m_reserved (0),
@@ -497,7 +500,8 @@
 
 // ----------------------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (DsaReq);
+NS_OBJECT_ENSURE_REGISTERED (DsaReq)
+  ;
 
 DsaReq::DsaReq (void)
   : m_transactionId (0),
@@ -631,7 +635,8 @@
 
 // ----------------------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (DsaRsp);
+NS_OBJECT_ENSURE_REGISTERED (DsaRsp)
+  ;
 
 DsaRsp::DsaRsp (void)
   : m_transactionId (0),
@@ -771,7 +776,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (DsaAck);
+NS_OBJECT_ENSURE_REGISTERED (DsaAck)
+  ;
 
 DsaAck::DsaAck (void)
   : m_transactionId (0),
diff -Naur ns-3.18.1/src/wimax/model/service-flow-manager.cc ns-3.19/src/wimax/model/service-flow-manager.cc
--- ns-3.18.1/src/wimax/model/service-flow-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/service-flow-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,7 +43,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (ServiceFlowManager);
+NS_OBJECT_ENSURE_REGISTERED (ServiceFlowManager)
+  ;
 
 TypeId ServiceFlowManager::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/simple-ofdm-wimax-channel.cc ns-3.19/src/wimax/model/simple-ofdm-wimax-channel.cc
--- ns-3.18.1/src/wimax/model/simple-ofdm-wimax-channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/simple-ofdm-wimax-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -36,7 +36,8 @@
 NS_LOG_COMPONENT_DEFINE ("simpleOfdmWimaxChannel");
 
 namespace ns3 {
-// NS_OBJECT_ENSURE_REGISTERED (simpleOfdmWimaxChannel);
+// NS_OBJECT_ENSURE_REGISTERED (simpleOfdmWimaxChannel)
+//   ;
 
 
 SimpleOfdmWimaxChannel::SimpleOfdmWimaxChannel (void)
diff -Naur ns-3.18.1/src/wimax/model/simple-ofdm-wimax-phy.cc ns-3.19/src/wimax/model/simple-ofdm-wimax-phy.cc
--- ns-3.18.1/src/wimax/model/simple-ofdm-wimax-phy.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/simple-ofdm-wimax-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -38,7 +38,8 @@
 NS_LOG_COMPONENT_DEFINE ("SimpleOfdmWimaxPhy");
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy);
+NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy)
+  ;
 
 TypeId SimpleOfdmWimaxPhy::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/ss-link-manager.cc ns-3.19/src/wimax/model/ss-link-manager.cc
--- ns-3.18.1/src/wimax/model/ss-link-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/ss-link-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SSLinkManager);
+NS_OBJECT_ENSURE_REGISTERED (SSLinkManager)
+  ;
 
 TypeId SSLinkManager::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/ss-manager.cc ns-3.19/src/wimax/model/ss-manager.cc
--- ns-3.18.1/src/wimax/model/ss-manager.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/ss-manager.cc	2013-12-20 09:44:50.000000000 -0800
@@ -28,7 +28,8 @@
 NS_LOG_COMPONENT_DEFINE ("SSManager");
 
 namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SSManager);
+NS_OBJECT_ENSURE_REGISTERED (SSManager)
+  ;
 
 TypeId SSManager::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/ss-net-device.cc ns-3.19/src/wimax/model/ss-net-device.cc
--- ns-3.18.1/src/wimax/model/ss-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/ss-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -46,7 +46,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (SubscriberStationNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (SubscriberStationNetDevice)
+  ;
 
 Time SubscriberStationNetDevice::GetDefaultLostDlMapInterval ()
 {
diff -Naur ns-3.18.1/src/wimax/model/ss-scheduler.cc ns-3.19/src/wimax/model/ss-scheduler.cc
--- ns-3.18.1/src/wimax/model/ss-scheduler.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/ss-scheduler.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 NS_LOG_COMPONENT_DEFINE ("SSScheduler");
 
 namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SSScheduler);
+NS_OBJECT_ENSURE_REGISTERED (SSScheduler)
+  ;
 
 TypeId SSScheduler::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/ul-mac-messages.cc ns-3.19/src/wimax/model/ul-mac-messages.cc
--- ns-3.18.1/src/wimax/model/ul-mac-messages.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/ul-mac-messages.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (Ucd);
+NS_OBJECT_ENSURE_REGISTERED (Ucd)
+  ;
 
 UcdChannelEncodings::UcdChannelEncodings (void)
   : m_bwReqOppSize (0),
@@ -577,7 +578,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (UlMap);
+NS_OBJECT_ENSURE_REGISTERED (UlMap)
+  ;
 
 UlMap::UlMap (void)
   : m_reserved (0),
diff -Naur ns-3.18.1/src/wimax/model/wimax-channel.cc ns-3.19/src/wimax/model/wimax-channel.cc
--- ns-3.18.1/src/wimax/model/wimax-channel.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/wimax-channel.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WimaxChannel);
+NS_OBJECT_ENSURE_REGISTERED (WimaxChannel)
+  ;
 
 TypeId WimaxChannel::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/wimax-connection.cc ns-3.19/src/wimax/model/wimax-connection.cc
--- ns-3.18.1/src/wimax/model/wimax-connection.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/wimax-connection.cc	2013-12-20 09:44:50.000000000 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WimaxConnection);
+NS_OBJECT_ENSURE_REGISTERED (WimaxConnection)
+  ;
 
 TypeId WimaxConnection::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/wimax-mac-header.cc ns-3.19/src/wimax/model/wimax-mac-header.cc
--- ns-3.18.1/src/wimax/model/wimax-mac-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/wimax-mac-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (MacHeaderType);
+NS_OBJECT_ENSURE_REGISTERED (MacHeaderType)
+  ;
 
 MacHeaderType::MacHeaderType (void)
   : m_type (0)
@@ -92,7 +93,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader);
+NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader)
+  ;
 
 GenericMacHeader::GenericMacHeader (void)
   : m_ht (0),
@@ -296,7 +298,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader);
+NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader)
+  ;
 
 BandwidthRequestHeader::BandwidthRequestHeader (void)
   : m_ht (1),
@@ -478,7 +481,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader);
+NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader)
+  ;
 
 GrantManagementSubheader::GrantManagementSubheader (void)
   : m_si (0),
@@ -569,7 +573,8 @@
 
 // ----------------------------------------------------------------------------------------------------------
 
-NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader);
+NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader)
+  ;
 
 FragmentationSubheader::FragmentationSubheader (void)
   : m_fc (0),
diff -Naur ns-3.18.1/src/wimax/model/wimax-mac-queue.cc ns-3.19/src/wimax/model/wimax-mac-queue.cc
--- ns-3.18.1/src/wimax/model/wimax-mac-queue.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/wimax-mac-queue.cc	2013-12-20 09:44:50.000000000 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue);
+NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue)
+  ;
 
 WimaxMacQueue::QueueElement::QueueElement (void)
   : m_packet (Create<Packet> ()),
diff -Naur ns-3.18.1/src/wimax/model/wimax-mac-to-mac-header.cc ns-3.19/src/wimax/model/wimax-mac-to-mac-header.cc
--- ns-3.18.1/src/wimax/model/wimax-mac-to-mac-header.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/wimax-mac-to-mac-header.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 #include "ns3/log.h"
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader);
+NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader)
+  ;
 
 WimaxMacToMacHeader::WimaxMacToMacHeader (void)
   : m_len (0)
diff -Naur ns-3.18.1/src/wimax/model/wimax-net-device.cc ns-3.19/src/wimax/model/wimax-net-device.cc
--- ns-3.18.1/src/wimax/model/wimax-net-device.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/wimax-net-device.cc	2013-12-20 09:44:50.000000000 -0800
@@ -43,7 +43,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice);
+NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice)
+  ;
 
 uint32_t WimaxNetDevice::m_nrFrames = 0;
 uint8_t WimaxNetDevice::m_direction = ~0;
diff -Naur ns-3.18.1/src/wimax/model/wimax-phy.cc ns-3.19/src/wimax/model/wimax-phy.cc
--- ns-3.18.1/src/wimax/model/wimax-phy.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/wimax-phy.cc	2013-12-20 09:44:50.000000000 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_OBJECT_ENSURE_REGISTERED (WimaxPhy);
+NS_OBJECT_ENSURE_REGISTERED (WimaxPhy)
+  ;
 
 TypeId WimaxPhy::GetTypeId (void)
 {
diff -Naur ns-3.18.1/src/wimax/model/wimax-tlv.cc ns-3.19/src/wimax/model/wimax-tlv.cc
--- ns-3.18.1/src/wimax/model/wimax-tlv.cc	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/src/wimax/model/wimax-tlv.cc	2013-12-20 09:44:50.000000000 -0800
@@ -24,7 +24,8 @@
 NS_LOG_COMPONENT_DEFINE ("Tlv");
 
 namespace ns3 {
-// NS_OBJECT_ENSURE_REGISTERED ("Tlv");
+// NS_OBJECT_ENSURE_REGISTERED ("Tlv")
+//    ;
 
 TypeId Tlv::GetInstanceTypeId (void) const
 {
diff -Naur ns-3.18.1/VERSION ns-3.19/VERSION
--- ns-3.18.1/VERSION	2013-11-15 15:32:34.000000000 -0800
+++ ns-3.19/VERSION	2013-12-20 09:44:50.000000000 -0800
@@ -1 +1 @@
-3.18.1
+3.19
diff -Naur ns-3.18.1/waf ns-3.19/waf
--- ns-3.18.1/waf	2013-11-15 13:50:32.000000000 -0800
+++ ns-3.19/waf	2013-12-20 09:44:50.000000000 -0800
@@ -32,11 +32,11 @@
 
 import os, sys
 
-VERSION="1.7.11"
-REVISION="edc6ccb516c5e3f9b892efc9f53a610f"
+VERSION="1.7.13"
+REVISION="5a064c2686fe54de4e11018d22148cfc"
 INSTALL=''
-C1='#+'
-C2='#*'
+C1='#('
+C2='#$'
 cwd = os.getcwd()
 join = os.path.join
 
@@ -163,5 +163,5 @@
 	Scripting.waf_entry_point(cwd, VERSION, wafdir)
 
 #==>
-#BZh91AY&SY�`|�����2t������������(2D��H 
Ha��g��S�`WlT���*�W;���=S����UvhJ��gsZ>�ҥB�}n4�}=���p}��v�c[����+�D��� �����slp�k����z��zs�x�}��o�}�U]|{��#*�v�]���}hǯ���'�E�s�J�:(ꁶ�t;>��h��������dٻ@օ
J+�T}�h��AJ�%@J��U �#+��l���j+�����};�2��[���T�#+}�#+�͜�z��]޽�����}�w�;����������;�޷^I.{�}�{}����8���Z��^]���w�{�Cvb"�i;eQ��F�lԽ:Iwc��;����<��a(�]����d�U�"�x���=׹�F��vڲ�v��r�pY[뷳�r���j��_<�w2�N�i�{Z�{�d�w8w���z�n��Ҽ﻽��돹������-A��(���}���[�=Ϩ}�m����w���dGחVc���v���{Dz�mۺ��������P�E��#*���o�}y���m��]fh���Kާ�VU�g��}:��>�tk�u��-���v��y��)Ս�ty���\$w���s�s�a����=@�4�(�ж����.�1��\��O4ռ�wgm^�w��VV%B�@ۺ�C׫�
�:��#*�;������j��꾼��=�=n����s�����w{�:�D^��ށ�w>�x����{.�;5f�ow���]��W�ǏN��u��{TT�x������;�����7�^���g�[�.|Z�<�^���yܡ��n�3���n��A�n��&�����ov�z
�)�
Z��Of�u���z�^=��������G�l>��������{4h}��vx�a���� l��s]�{z���am�-0��t{}�P�F����
��aۼσl`_X+F�i����P���Ǒ5���=�T��Ӵ�S#*�%H˸��Ol�oau*��ou��j��k���v���z�޷=�}�u�r������™ئ�6���z^��Q�r__;_}�Sl����[��˯���ᦈ@4&��4ѓF�z��D�1�
��h� �

�h�M=2�����2��#*= ��	��da4 �"y4��Oj�i�4�jh�OS��@��D 
��=MP�<�=MG��(#*��dd�$D
0C@�!��L&�&LF��&�F�j1��Di#@�#*I��h��"��S��G��M=LOI�#*G����G� (f�G��!r(p�� ���4��QPP�h(��R��n@�Y@O��?�O�!%���G޿��*^fi�S�OWMw��0LV#�)*�'�O���u�3����3nQ�Mw�	�Ts�1j\J�!^>�#\�Mh���I�f�#ܸxw�V&`�^c�.�aV%:T�quR���(�G������"2���#+�%R��(.�L�S
C1DZR�0:��� �
"� D�T.��Q$�2��)C�@�",EQUQQ3D4MA5SIM3%2QMU�Q1�AA
RT�T�QD1(@P1EE�U2TTD$T�-5T4�I4AKIE#*�4�AQUQ$HQ5LU4E-  T5M0�E�R�4EMA-	T*��0E�$LD�HP�TB��M$�
(PDI��� DR�MM4�2�ERJ�UM$��RPD%1	A2��D�#*P�3Q
MMQ
�EE1PTUM34PT51ESRD!UC#*UDĐU3%SD$�@QD�H�DT�T1CSCDTPU1L�EAD�CD��I�E	RDTPUPDSET1JPIPDMQU�Pĕ�KA@P�T�A#*S4�SQE2ETS4��R3�U�EQEQII�TUDDIKT�CT�PIPP�T�IT�0�2CTEMEII5�4L1AL�SL�D�1B�T�CR�LKT�LR��R�TA,�Q"UTS3M$�0D�DPLA0IIA5AAP�EE10DPUMQD��DPUD�
LL�TA�P��EBECJ�P��QQ$M15$R��4UPE#*0D5	3%)TA-MDIS#*K34�DRBKAL�MIDL�#*@AU$QA@�411R��%,CSU#*14T�PĴLTQ%0�E2ITD���EBE#,-T�TLUAQ@Ҕ�#ԑ4�EME�ECUD4CDJP�E4�DBI5SAQDSQSMDQDHRD�LU4C,(�PD��T��DQS1T�@�%1IA2I,A0PLS@J�!P�LL�S$��#+H�`H���a��"��#+J��#+	"��%��i	(�*Z���a�(�"����(�#+�B���R&��iX#+I#+j$��Bh����"��#+�b�(F�X&)������aX �f�H�"����)$`(�(f#+h��$#+�"T"R�J��%��*�$#+������*��)Z��R��� ��%��#+�"����#+�P��)b"
���XIH$�����R�����"ia�jb&e#+`"X%�F@��J��@�`�P�B !�)j*�e&&(!a���B!HXJ#+@�)&)*��� ���#+J���b��������b�B�"h���`��"Hh#+bf��#+���������*��(��	��	i �JH����I���&���j"�$���B*B�H(�*���Z(��j ���J����!$�"F�`��j���jif�(!�)����R��e)h)ii�����!&�)j h ��**�"iJ�H�)&Z��i��	f�����i 	��!��bX�)����*f��(���"!��(�&`�BBa��Fa�&��!��!�a(��eB)��(bb#+e���B��j$�)()�F���&���b"��(h�����H���J���"H�j��#+�"�����Yb�������`��"&*X�������b*����#+�����"F�������J#+@�#+�() �����""j �!)b���eVB�%#+"j��#+�"(��&�*& �""�(��X�"H��$h��X��"H��
fh&�	B�#+�"`&)�hj����f �$���� �h�	H��#+J@�ijj�����#+)B���$������b*)�@��h� ��&B��J#+B�&hH�"��������*��`��*(����&#+������(i��!���R����B������D�(JA�%)�H�!��Zi#+*#+��% �#+J*��F*��H�iJiX�("#+	���%)*��"hhJVHi��bJ(�&#+��((��bX(�(���� ��h�#+�R�#+�E�(@����X"��"Z��`��FK$D�-1PU	H� ]⛌2C��k��D`�,iؖ���r�����V�kR�s�4fF��(��(�֧��M��n�Cn�Ώ�Oȋ,�] >�g�p��F����+ ;#O<ф�R�,���Z�x~ʨ���c�7�p�1�NSc�y@����!���'������V�� �GW�a����c�0}"�pQ�xp�p�P�Cn�f2���cq��0�•1�0ᑭFL��7/|�g��ET�TDj�MTߎa!�x���N�	�^��X���f�Z�hH��q�qh��e��ܺc# �2Ɉ�<��M͎w��LJ�k�rq.�1�;f}E��>�3��$��^�ɦ�,�C9�Z���da������?���S.5�*Sk
�n툟ga�p�a8!��/��Fm'�jG��A���?/��s���]��Y���o���bs#+ma�QY��,L�S�D�DD#*{�<�y�ܵ���t�H9S$��5D�M��g~�������cY��+Q��ۢ"*5n�qa��*�F��{|ot�`MB�{���r�܌�E�����5$ԄM�=]&���oY�����ƶQ
E�3�,"��;��ׁ.��rj�s"�Xf޾��?���,���l D����������/}���x�D`�hf��!2/�1����Φ{b�-�F�n��z��L�������Q��l/D��je�vo�~�olN�@�	�(�Y�wh{�nj��adQ�%�?LHQ��-��6���u�:�x���ѓ��˛��[h�Ү�zR#*�hz��}2��#*�̌,n�竺�^������KR��\�<��zl��� ��c�cL�;�K�†h�c�<]u�gLƎ�Q����q�RFv����c!e(�>��l���y�e(h(5d�4���?#*#zfT
�>Y��{)��%9(zFi�(�������"-��߯��:,!�V��ძ�9'�*��n��l�"_w����i��r[��zb�.���κ�ii#+I��a��A��la�\X�g�����X)��_>�h�?l8�q����H�O�S�%���1�JF0�.p�:x�6�Q��ԁg#*Q�%�6A�#*��f�lY���j2�g�V��tj:|��g"�	��3)k�yh9��eCṽ�5�b>�Z�KN2�2�Q�wXsm1vaS�����wz�O������Dy�G����>�n/�>U~�í��o�%n�X�/.Ϗ8!o���Ta$iy\)ڊ{�ՠ@뢅�&��d
ւ#*#*�b�c�ҚC�#>ƣ���w��Y�����@��M�{�V��3�k�"4�r�	#*1��w��ˏE�Ttk�r��"������=i�+#m���G���r�>=�N�)����8�l�W�z�s^�#*��		��)�Z��,���!�8�_����i𷊇}��j��#+��jL�*h��C3Zٷf!$y�+]��#*`�Q	�);�b�WuQ��5ً�W���I�f��[~�'=,E�#*�'M-/;jV����ɛ��mg��ߞq��.Fp�Hj<�ͳ�p����ls�p�#*i4Q�VѪ�L����9�값!2���/=V���~�~2*l�/w�\�x��Ϸp��<*�$������h�,�~��>��dž�N�i��B;7��c�m��l�_6���-��Tv�l�|d�"vF�L{������r��0�>9V�"����Fx����1���v����9<5kg�U&u�0���AH��U1��6P��ۼ��OG�R2#*z;���i5�c�w�oM�����x�Ď�ѧ�w��Zyww�H^��J���v������!�V�����*�z�V��'ћ�=̎��l�]]'W,�5��8�s>�_{������7��h��s�����5ݘ�d� �1�ö�,Zha���Eߎ!x��>-A��C�鬒��m����5���Zx�'��tr?y4��x��hY=�WZR�R�ȸ=��M�2��#*AI�D̞��M+�����k�#+6�V�_f�n^1�qA	ܴ�#`[�����!@:�ф	4a���o�̦hp���}��hi1�H�� ���^#eFj
}k�Y7LJ�l���j������i���g�Aז�ڽ���!�@:�K���Y�mC�2u����������C�֏���Xh�G
����#�#*v�1��������#+�}S>_#*�jQ�#�e�ҭ1�*��r����@��y'!.��E4��Tj���T�<l��7ޝ*։�o��,l8�#�m2�#*a�6��Ԇگ���0�fr5�"M�I�}�;�x�Jx5̷�z����=ڝV�:#ɔ�ؑ�H�N'�0�#I�_�b0ޯGi�8�p8qo,�%.Ǣ�"[�k��L���S�����<!;����j+�M�fdgwѬL^�?$4�L���C-�����B��y�57��?<�î�e،�Ծ���L�	8��3�� 2��Gb�F#+�W��t��dC��R��#����N��(��������G�q��[ct��X-�M`�q�����O��kξ��=޾������Gl3mWv!��ɚ�f���#*l��VFf=d�w&Ԙ)���Zʼn��k�/�6�>O�2d_'���z��7.�66;��Auߕ&�c'���9�r@J�P��Ȥ�H��TY�Y^��6{T�Jn[�Ž]�jk��MM���|�xTs���|õ��>�G��ɿ`��R����H�H�^���m��3�9��E��e��j��lyN��q�S];������w#+��]�1���۔XzaF�5i��[$�v�&��� �(�d�M�H�H��B�����@=�x�K(d�\{BCW~�2��2��BQ�=.��^�q^�$�	�N�8���$�wP�ߘ�t~����snx >�ޫ�� ��!�6M���x�m'����Ƞ+|�^�<�ٌ#p��&����7�G׏���d�R{��l�(�#�gs]�hk��or5�c�8�y�-�"+GW�u�#�0��m�v����\s�!��y!�_c����~�#+��pt��"��k�sh	.鿣�蕋���%�l}�Z4�����#*�la�7"fH�����&�l�9f�(�9�?�����8^�2HY�[X��!&PR�m���^��Oۭ�t��Y�T�k-/G���ŸC�'|�Q��lsD)iS��.ac^^���v�v���E�lx�"K��k�綃Q���e~J��~	�>(�1�;� ��5,�����6�O6� �#�elg��}S����|ɭF�~uьӏ�9}<�+4�����0���7;e��+��m��#*��d����tg���k^��~eN�[j���U�to���!Ԝ�翄T��f���������/�^,��g�l%�S1�ɱ��*}Q��!�B1ֶ�UQ�3e��M�jP`E150Vj5צ��<lֈ��}ӌvΝf��|���z�̏�>7�����c��3{C��ފ�5�������t�-�TJ-�r���+O!X�>s���#�:]X��$��N'�\��N��a��6d���x���zA|y��'�ȣ�1���d�Cn6@�m��(*���`���;jv�!9��f��ZUJ&�`��F�"s$h�A�4��&5��fQ�����c�DA�Z��"���,1#��bTбppm���D%�7��p�*+����ƣ=9��դ��ɛ=�C)�f5��t�i�.����"
L�`�*�Dz��йB���u���/�fQҧZ��>j;�W�ۘ��BrK��2A�$�C�L&���ɾ�Y0�{s5$f�L�yM�*:5�F!���c ֙���$��E�����M���\��x���!���D��_b��_E����E#*eE�P�3>|�Z�{�8�lW�2�"��h�w�c�>U[ɉ��]������%6换E����P���q_$��c
w#+��b֑uN���ʧV첩�Z�KoVc#+����?�%ןK�����N�Я^�ͺg��N�����h�pNl�Z�.��O�f�I�€u�v#Ç��ۢ�߄ӥ�cz�yԶ�;�	̰˦kۇ����HjW��N$!-;;aU�pCչ	��Yu��#*�F#+^7��|u��z���GiLҌ��y�t�>���dܱ���;��dBڭy�D�������R�U@|��7D�D$*�����Y��46��� ad9����}Iy)�Ky�$>�//�k[�|��)��9���Y���=�3��BH�1�3����=5�rT�7N�x�$s�!�Xw�E-�dAkr����!֓��Jg�8i&4##+�Y�n�kײ�ʢ�{�Bn�u#��7�r��ڃ8pcۮ��\��M���.>����گ5=y�3��w'?C�3�ZK�N�"j�6;���)um�T,Ulv����O�-�����Xj�w�As�^y~�?������W����c��`o0H��o����^��j��nS���čk���]RT5{���������_������1sf�麻�ljc�{�5Y�!�	�A�E��*f�R��J�d!&�*ǝQ	���ݎ�sn%͚e�#cI�&��5T��z�Y�;�kʉ����:�Ő�8�E����]���9]7���>�_2���x�O+�������"3:o���<.�_����������t���"v������(L���="v�<zס�䟯d�������豜r%}�Fq�R�����y5�0�/cϥl*P�<#+N�?t������h���$�j{;����P|o7�����ܞ2�Ʈa�-i�����A�G� ��c�#�@�5껶X�"����zt�I�5�Fm,�[�*W�Q�l,r��\�uᷔ��[�T�|	���Tu�}��G7�N�������{��jD�*��h��!�����V�|�\q�8$��~/o�j�3�9���vH�G��f�Z+��'Wf��ɧ�3|����l�D���x��$A�2�������*b���M�C������D8���i��!�:HE�`�|�y�gƃ�ϫJ 
� �W���)������רgY` �O2�(�6X9������0E�!���D���~����Ζ#�i!���X���{�殚~k�N������}Z.a�]V2�&�ʐ�Mk�Qf55Cz�����&v�{q )�ݼ$���&L�F��}tݻ�q�}{���D!�'���qۏhb�g@�E6������S�t{/�ͽ��q�n%���h.q��,@�!}�B��v����:e[~���?��P^�V�����~b`H��Bb;c��ސ�}#+�#*��v׫�T�w�z��o�qn=�� ��I�Z�n�S�J��D9����~�\��͗W�ѿ;A~���b*R���i�u�߼������yZ���G�O�"�ݍ4��{X=	�TxN����w�WG�fy��4'a�#��L�|+v:�v��i�7F2�C�g���h���K�'>4n���b����,<w���#+��?�PuNp��������@��dâ�#*<TaL�thm��aI#*U��|��Z-�XM�J�$�.���Twwl�ꀉH���F�������ň+קJ���g��3��L�ܦt&�������j��d 7�Ӟq�Ǩ�H�*�[	z����K]�%r�EV��#
��A�̾0���o�<�ÚX�9]=����������,#+Ѹ�����aG�1�����6���(�c1�]53�N��F�|#��H��a#EX�SH?*M���W�Ah"r���.�(s��D�&��y=��q���������2���,�q0��AMNyO�z[Vi�J��i���)����:h�=֎#*A��m�����MEf֚�gQ�D�(s���p��[W7�8_Ulh$�#*gM%��,��8k2�#6��T��u�y��>;�����{�2��?��j�,"h1�'�����5��5��{y�c���h#w<f���zL
��G���^5؍���HmHR�$j����u���G/Q�7�<����hB_;1����K���r�����ߍoo�L�ݔW�oWp���0��C�-�u�8?�ԥ��5�>l�>��L8�;�a#+t:%a�|H�2f������6ّ�B�V��&^���B����_�҂���
�L��<��M�ߋ�m}KM'��.�ܑJ�¡��_��p���z�
m��IJL!��g�D��X-���m*�������׽1x#�C=z���֜�'	��R�N�‡7�1�Fe�8��m�k48��H�;������z����װ6A�/WON��Y�b��!�=V���f�i�ft��n����j�]�	#*����C$��?��:��;��nݿ>+��{hN�
l�G&���
��1Tg���S`�~6�z���R������:݌a<Z�Ā���8������{DGd���UFp#+�����G��S�0�5��4y/.Ѻ��۵�Q]�.��N.|[�Rl^{�a����2.����.f�)�z.�L��LG����J�2-��I=�<v�<cN�T���κC��Q�zצ�����%��	�N���&]�r�y��t�β�(���ά��Ͱً����cliɋ�Ø\9��IB�77IiZP�Xv j^:���?��y���4{9�J�N�p����H�1�����������̎�=5��;G$��Z[�D2Yl�s�;��x���xv�qo��W-��p�>���L#+5v���?�����`s&ƾ�`+�C���yϳ�ɮ��>��KҦ>�ٱ�,�m��C<{�+|T�����s�7�T�Ef
�rH�"�������5��k|�=���_n��R���}�\�S�fI�Ќm��u`��?~����Ӯ�R��{@>�JЏNx���m�h!�i:#*�xl��#�(���3:,v;��|��n[����#r@X���na��"��U�G�uc|o���?H|�9LF�6�$[�X7�-�}p��6��#*T��v�����.�7#*I#+�<�4=#Ϭ�lTC�C�x$�����r�FȾ<��	v���_MVKZq��
�Wق2�CL$���B�FN#*'�����k�GUD+P�˚":R֟��Ph�#y��Fc'��H��f����	�⚡�3в���4�u��kyߡ�:`�A�Ef�5'|���$?�0W� 5.������U9��j��+R�hci(��.�M?s�ga��`L%�3�`��O)TD
A0���S$i;@u��γF��&�y�ƥ�.pM�T�Ht�����������#�t�A�m�ΙxSU����J��Y,��hx�-h�N��g�?zJ�F��z���ъ#*������?���i�c~�a�m
�˰��#+@�;h"�����z�������yި4X؉�jg���8���w>٧9�baZPq�#*&��#7�ټ���=��\y�ڷ�ٌa]��b��<(i��k#^7�g:1�do����:�tK	�$ ��Z�pL����n���m&\�v�9[�	����w5}ΰٌK�pj����9�i�c^I��-�V��f�r�W����o\;��
�.=8�`�2w�����	�)W	���8��=��X�0P�m��0]�ȘV��z�\�Ժ�߶��q'�鈖7T�f�����zgB8`T�~MM"�q�?�xoӴ����^�P���+�#1�p��\�?�Fi���M�����16�8>���^�*�سa��&�A�8�IK"�F�9^j�5�U`mQ9#*���ƌі�&����9�Bр�v�瘡��10�.:h�I�G9���I��em#*%D���#*��+)���#*͜a�սzj^%Ը�u�����Mc��.]'{���av���b�1���PܣI��04K�˳wA>1h�8�đ���"t�}[7I-�u:+�1�J�hCG^׵2��W+�
���qltN�E_�7i�5�f�/U7�~�2���yl@�|��x�u�ɍK��#��$�g���C�GR��X�|��^��l&I�sw�g[@���.��Yg9}%�T`��E#+7]��LRY�M�bw��,����N�;�&�"3�#*)bt:�S����#*MB���������&Cu��	�t�Np����2D9���0�6=�.����vJ�{qf�%����o^qR��Y�|#�z���kBg�11���2�hHPª4v͸���� �I	�����jӥ⬆&�x�l�1����V����gՐ��,l��o w�֬���|����y����Xˑ?Ջ���s�zQ�������M;r��g�vb�@�U��ܖ����a���!���6׌ZK�v��EtM��Bo����h(nB�R��j�!!"(B�(\�p�&L��C���TO�R���Qg�l�M��������-�q3%���kE[��y�i
i���w��<�g�#+�(:�?f���u��{�濏�׼!IB�NJ�>���B�|�G�EZ��b��d9�Δ	�-�o_�~�c����|z-���dy�/أ��?:y�q3���G�}_�	�������\��|�?CN�
��A�G+�5:z݇ѓ�;���㜼�AU?��9t���#(����b`�<@���+Ӯ��z�,�'$Q"��sׯg���p���F�{����D����Y�U�J��tw���Ԃ�ᖶ�m���Nm}[C�����4+�@��\���*�6U��eVK������xXt?Vt��ك�V:k���*�B~z����q?��w����_��u�=~�dsO�F'�������y
ei�
�f�\���d�<��wUc�O��i��b��?ݍ��,`&�YA?b�5�R�CCBab�k�2����f3m'�>���գ?^��.��L���F�S�ʗ�P��sJ��Ƴm���n��t�c6XV@�Y8BVK
������@$����H2����(���?g��B�	
Pc�(��x����7���q�(�4�I�N��?�饐�d�$#+F�m�UD�A�MH@CD|,�i�Ii�ai����CuS����_�=�7o@�T�?����+ $��I��`��+�5Y��?�M;�ӯ=<��h���1s0\ �@PoZ�[�P!�q��+ϫ���O�E�=��cL��eB0���O��`��0Qp�D���@��ш��pU%(QL5({l�Tn_ن�HLD4'��#rnC	#*��*���|�d#��D!ć�p�~ͺ�<5TF���f3����y��ns9���K?���	�e��u�G���]`?�#*Ŋ1?Y{V�2����O�Ջ^��֗(�̓�@c#*��#*f�f���U�Y�S���k>C��z�s�9!�2a�%�<҈<u�����r����0�d'�-�$�o�K�aSI*Mi����{��F�~f��@�NA�-�Y����MP�΁F<�%�y��фv��-�cPHM9$����ن�OⰮ����I���Jz�(�aP	4;t�������$�Ȝ�:��}<���&����z�?���p<�nN��L��p�NW��?�~�~5�[��7w����ŝ�?�����R��G¿ÄC����'P1q�"Dr�;���yU��U]���SijKm}���ן	�D�q3բ�.K�,�+��O:�glG��㩖w��;��+���H��ȃd�8k�-~��p�#+�U�X���g�����%����Լ�0ͨyj��7k�e��85?6K
 e�a���8y��>C,Rl|S����w��q��C#+7WB�|N�4m�%��o�j�X(���{̔1x�͖��|l:�~m?�U��O1�>�X��}Y�_ĸr)�E�E�q�o���|�[Y�as�?�Q[�Hޠ�D��ϏOW�'�>��lv#rя,��;���l�K���}o��ot��8��[��e0g�G�ƛ?c��ކT�t#�Rt7�r�1��%��5&�~�y9'�?��ëA�3W�Q�@����P���곟柊�p�q��B$�#+�#*�A�zܩ"���F����4$&��o��լ�Q��|{����#+��x�>	�ºk�f�@h���E���~��-zX�ȅ�M�#+i����TE��ĩ��X�.d��0�s�����&�Mq$#+���2Y��J�#4UW�����n�o�c}����U���,f�������ɿ�H'�cEau��V�*&���p�d;��\������u�[���8 ?>"A�yX����/F�ه���?���)��ޟ_��G�Wz:������������&bl�٢Z�����#*ye|���#*��h��#*蜶W�F�F��j�aB���U�#*k�)��pP�y��=}0�,��L����>/�б^QY� �n���k�����w��;�8��Q�x�N[�4xh�.�M_�0�ٮ�>˽�Y|sJ�x���xGwOg�����K����c�#+��N�������y�OK&����-�U�_租W���#*����O�c�7���e��%���;*��N=������'(�����g7�y��RZδu3������K}�t�پYK�E5���T������[�:��+tKu���ӜԈ����8説�X�QX��#*·������"L�#+��}��~N5�Y�V��S8�q�sdao�Eݝ6g�����j�_�P��(��/E��>#	U��I;B̡�qwR[ʰ1?��B��Ԏ���9�i�|;�����\4��3y�?�g���{��^��&~!i�����1Xy��ҿ��]��x��{ҡ�rs�F�x܏���=�y=���'�t{f��}��������;z���|�!Y���1D�����n/�P�{gpx������Q�zD��>��!�O������k�t�3�Jx_��W��ѫ:�h��x�����Xg���P��J�6N�Bw#*���6��?��7��e�8����>/w����k��Y��7C���?Ogh�W.��G����k�2>{1�����AA�*��X9B�P�*����(;�q�JA3T҅�I�8�� �kx�Q��SO�a�~v��(ː1?�Q����}��Կ��v�~��y���������h��y����:_��wU���NGF�����y.���z�x�~��0���?��h���:�?�s�'7!�I����J]��
S�c���m_���n����8^4�ʿt�2��;|k���e�s�<����Gdz4��;f<��$��'��%����~�s=�n�
UW!�J｟Ӓ�p�l��S~o�/��c�J��7%������0�_G�,�y|��wf�l�W�۝�%}[*������%���I!���?;��H��y��vV��t��?�^iSf#�ÕZE�(2��Y(ەPTȒ�#+A#��+�8�C�PV\�+q6�
R����#+�W�#D�+	+V��_+��!8\=z_�������u��<@��mEAM.�m�}�ɹ�zqf0��͹�X�o$�#*G�á�����m��!$|���w�=� gJ1R��78V��_.3�U��>�mu�n���eׁU�yhEo���lk8����F�z��uۗ�7��8�s��n�}3�ծg�j֎�Ҟ1�#+����
JP�w���i��/e0d����i������N��w���x�
U���d�5_}�z���7K���Ft�پi�D`�"^"�2 CG-��aj��CQ]PtAd1|Cb�=�p$���߰i���t�
Da�ٞ�_T�=����cq#+iT����(dRۑF
VYG��Q�vtƟ��ˣ�J�����f���,��\^�_g��l�?h������҂�q�������x��ul+�į����M�uQE����|�u��-Qރf���=�0��1���v��wK��?��B��D-���Q��]��xp�V5K�/yCO$�A�۾2��~`F`�O�R��K�r6V܄|XF1<"�ݕ�A��X�ih� m�QZ*T+%M
Z!�Lb�1AQ�b#+�`��zp4.���v�C����*i4��#+B�0lEm��TT8vі��1̑����v�f2�FuDC��h�i�/�Y�޳!�	A�/�y����Ld��dj�O��v�j<���c�gB��������ؙHG
�S�"���s⾋�o�F���ܗdH;��X�i �@y�{t�M��H�dU�"hj)4�N"�ep�<`��#+�H[k�WӒz�׮ں��V���}n�É��������W#+�R�r��B8z�MS�g�'�ȟ���U�Q�?���a��f��^o�tI4܋��Ԡ���Ns�U�uR��[U9�焄1��#+"S�w"��>i
���_w��,|y�ἄ� �+��� L�J���,����S�#*�������ɂ����s��9�fv����v;������H�!���:n��#*�ry������%S�*s�z?���;9�N�d>�|�G�+���ù�����䧲�g�? ��Z�+?��la�'1�s��t�d)4[���#*a�lcjnj��a2)�q�L��	�iX��yl(ɀ�ى�2�IbX��E-aKXč4NⅪ)R���n5h(Q؉F�X2)ZhS ����:-�j\���p�'BW�&�#+o�l�c��4���#**ө����t(�N�(Ù{a��(�er(���@b!�4&��D��C
����&�O*����D�� ���%(f�kQ�����s@���4#*<�d�e��F�8��X�P�*U�D�����a��T&c�""�.ZA#+�!������f(��l,�UY4�찵#*�J(u�a���mL�FZ!Q�N�E�8�oA�lcY���u֡^�n�����^�<�̀�G��ؔ8�W`�ty�h��]ӻ�����7L>p4#*=V�K�w� ����^�V��O���U���g�Via�g��	2a�#l���������y����\5���"��y��&,H/[&gaE*DY?�y���!<=�4�ӹ*�3�4���`������cU�=�񐥧��\p��>�P�7j����,��*~�x��}";��1�cs���K��"�:DŽ9EZPp�Q�\�`;;��������$ا��F���i�{u'IT�IUU���T�-T�&��2����h?�jl_+r��q�}Q��`�Gxj�<��x��_�G���r�αd��e��}�Ԑ��d�^����
�$�������2)��!��"��2a诣�<��l4�V�s����3g5m���ira7Sx��O�~����a�?����ptf<S3AoE
p�>�����gO�?�kǰr��S�����'�S�P��i@1R�J��F�m�`�ڵ���aUuX���h/o�����5-%k�������4��*�&�ǚ�z�Iۤ�bP#*�o֋�G�?R��J);N�O��ɷ]�t-0��J���/����)@�F����WX�mP�$#�Ԉ�j%��Q���cރc+3�WP��h���Ǜ�立�?��}�����w��f��#+! ��#+L���W�B�n����f��㡪V�d�C�k|ow,���&�$*��Z�T�F"�J�1���Q)&��jG$+�QF�QZ��6�_G��^ٰ+]\���q��yU��@Q۽`����L	��u��V���p�#\�Z�ZDza��A1����c�4�vM�D>rB�X�#&��XE��e���c��bv4ذ��9��#*(pʖjt�6��qu`�f��1�+��16C��%�
�w�Y�N3�KB������M�:q�ˮ��ݠ�m�sC8����̪Ɣ#+�xZ�3���]��8&T��:P�7(tg?o>���i���u�b7|=�hߺZW�Y�1#+JPof7<���Y�#+��3��!`A�{!����y���~�n`�U�Rjr�)2�9>�5��_��ԝ��?x���{��`���p�1����1��g�4����4��K�/G#*��U-��G��#"D��5��$zoH'H�o�ڜi)>��gk6m:t�;Mn�QZ��.b�UXh�Q�
Tܡ$m�ڌ �* N�ϗ��Oq���"�nDqv9�������[7��\>y�[�!���,����j�F�Pk��}E�O��lW|q&�E�J*F��M���]��|���VAM
@��յ#*��#,���[lu�a��.�šNB"�)W�$L�*)X�i���h�ײ����k��:2. h���W��B�Ƥ�<��7��j�h�2�Ҫ�uT�I��2�%ox�uw��#*���u����+�� ���hJ�4.��V1�huh�	�:��Z5�7�4�S�k��l�z2��;�܅]S��dP�h#+�eU � �"�J����E������g��q�����z}��u#z�ܚ���	���}�jf.Rܜ�Q��Ci�a4��)(v�	IӀQ?��su�T9HM��z<���x4d���<������d!NO�8��/���?}/or�k��-6քw^4�^x�G��N���VDK��Pn��ݕ�����f���,m�يҽ�3+M8�#D�-V��Ę�j��#*�fjet��8��S:�;�l>IW?��f�0��5��
;Og�t��E-d�C$��Ћ�� ��Z}����Rb�J�sJ���s-�6}͸����j��	N��ۍl�n�h�X�c0�5��L��"%)l��)�)]��;i�8��`��Dr���]�&u0�V %S&M��AhI�$$Z9��Ӎ���xƶ���Г]���IU��ݭ��А���%�t�LP�;o����6�-��������A���%1��ݹmfk���g`�w�$�M�Q�mL�v�9V�+$<2V��N��mf�pVg��v$<��#*�T�m�/�̛�d���D�hC^����l|2v����p�_.I�@�L����€�VJ7:3H#�DD�KR]�ЍNy����|�s��N�
 ~AJ�P[SL��F?o>�/����3�u�����"-�zU�u'��Z�D��[�=ukS�+��^��y��+�7lނ��#���ܢ�Vu[)�<��W�����E�Κ%2y�G��:2z���~�=�*m�'�b�gȵ,��2U��x���Ɉ�$"�F��ü����dĎ�Ģ	v�0��50#\b<��;4$�����-ɿ\7n��,`��	��F�9(�8��j.eg��M�}$�-m�,Y�&D��!u�Rε��<K�V���-�@�.�>ԏ����d�W2�%Rx8����8��}$TR����G0<�WA�_/mO���6�h�Y��L�#+$8%K�Z�L���\;\�Ndޒ�N�*f�xϦ�q���]��������n�H�*�κ3J�UZ$�WO=:*�qq��=��u�硇����j�������_6�v?pד+F�7DO�B0K&�6#*�2��kʗ2�Jߑ���۱������|LF��$Id�#+�BB�^C����d�ݻ�L�����*��;�a���{�B�^��w9�~���x�
�Pu��#�
�e��#*w��\:K�*���ط�枤s�.L�5g#�'k����yd}��w(^�پ�?��u��Z�a��,gћQ���m��p�|os�t���+���o���䷈{ܙymglR.��h��U�
͊Up�l�P������1���)�3�}>�m�$�FQȱV,6-:E�,�h���'�jӤ��-ܦ�ΫQO�a�����F4t
��� �-�R����XR�����nH�v(A�\��J�kS��qì=�(P��`�2	�����I�m�o*��Uu�?�A�����E�I.�#r&$�v��l|-����#*X�S�.t�5���y�4C}�䴸	�8ZQ�V`�e��g�u��k�a%�٨�jBD^ �Ar�#*��v0�" (M% ]<���C��>탿��7��~]�`��%B�c�����Vz��8�O���u�<����i�Ktcb�}��I{����q�i����A�ua\��R�M��솴m�n��QE�-x��1R�������ew72uV᧾pzk)ˠ�@�8;QAD�Oǯ�N���jV�L΋@���,P�&�a h��!��dE�ڱ��|A�JI��dn:��:�߼8$�$��u�c������h~?�/f�H�Wj^?Y���i{7��S��þhC�d��c�̣-D��L�F񼜆�0��}�.��,�����j��$��!��@�Ǚ4�#*�������?I�2Mz���}��꿝�$˱�8����~Tމ�@'��Ꮓ���7ѯNYc�;(מ^�r��AoX��2Α�r̍�t:p�����|4���"p��z��b�̌�V�'բ��+9yi^^I��U&!�^�X����3&��Llf�W�x�m�t�I�X<�*����8>m���G�:�8���ԡ/��!>磝�֔ےߗ���K�'�d���O�%;]����܍�v�U�M���H�`��G0m��7c��c�O���%#�a�T@��L��"��Zc�:��#+�2&��R�f��/�ɾ�SOQ���	\����M\߇�I�_��������ه=*��[�YM��O��F�]&� �<�@��u�*@��"F���c5��Apb�����W�M��k�P�q��x�{?n�#zM����\���7��yR���m���UzZ�Cc+�WAA"D���4h�K.KьΉHþn!���1��#*�uV<��-�"ݮJ]�Γ=����I��$q���f�և�A�T�������M����EЭD�Z�T��` �I-69�l�#+T�g���;�y����H�=|�qv��.���͒_^�D��Gq�#+ЃܽOL=�����V�j���oUFvG#*���;�c+SVP����A{����Ѫ�*उP=�w�F"&1�e�\�;�m�d�T�C��M�LJ�iGP+{�8�$eLۄa�NBza0me������#*���+�ܲ�i|���#nc9���z�w��F���d[l�tۦ�D-~j��7�ǫ;�[Iv�F�iT60����*���`�f]2>�,B=�٨��T܃�=%�#*�?
|y���)��G�]����R�T����yS*�>�Fv$Υ�Z�($=�Ԗm�m3#�������?|��q^|��ax'�����|yˬi.Q"ѻ+�`۶}=�����Au��N'�<�Fw�ƃ���m����m��C�y-@�;:e��uy#*Aܱ�q�#��S��Kͬ�O��0����~���؁$u#�;Io=I����y��+H�+�jFȾ��s��~�#*��֠��������Q�hSܪ0X��Qw�j��u�je3��Iu���&&ɨe�#+�¤Hd�q�^��x&��U6��
[N��H���W#*%gx��0��a��9�/���ZkL�o��q���n�]�Π:mJ�QԶ��aټ'�w,FpH���-�T_�`�Xijt�Ev|0�hF��M*t�'R�������ͷ���9�V���*��zz^�D�S�"�B��D����b�����新���ZK��)�x�:ed��FHJ^w���Qь��*��V#*~{��ӭ��=#=�P��΁�Ev��cU�t5���z֤����<�9��a]P*�d/{�6�����'ܪ��.p|���,��Ҝ���U��p&;.���#(��Kׅ+�}E���a]ґ���}r�_u�kx�Ø=�#�?�X�q	oSwMb��k�ZÅ��#+�C�+���b�=�w<=�A���664��LQ�ꔅ1��:�R��0i���঵���[]��-3�U	�a�~�M�����+\V�j���h�b�r���H7,�D7��|�1�U�'�W5D����#+R�0�?����t�z?;TYƏ�[clm��ާ���o�j�~C�)alu�0�sЛ���rX1pf���o�vtCyc#*�a��FN:�$?cRڠ4�+A�^b�vOO�Sp-�5��Z��q�:�7;�ڱ�"0�B��=�	}���A)ܣ���t=�l��칅z-�7��Wx�Q�.����(�^���[u�\{��7���병���i:����C��s��8tx��तT}蕼��̞;��2�*X7��5J���X_OI�y��8SA������{������t��-�<g(�Nn��u�:q��������r�sk�W]��m��g��<#���X��FOV���oX��g[Na��f,�.��غO'�6,rZ�מu::�ҍ��0�\0���*�Uf����!#*\t�5��2ig���'�T[�8s����Z:[�{�I��IGZ��ү��GVsN����H��&�1g�����aY��N�"ݍS�dY�NJ�^o^�L��W~������#+�m,�j����b�{,�0h���9K�JQ�#*Ј�\�Q3p����M�p�����J!�Yf�j��i���8�dIH��#*mJ��p�DЛ�X���Y�z�x�S��m�u�ớ�9�.�j4Ρ`�	if#=�F��*����LqR?W���TKF6TA�^�]�>{�T�=�z��킁�U�=���t�&4L�k��E��^��`R�أcZ����#m�&�.w�Z��{�)����gE���9.-�YK�L�\�]S�r��{���S�N�{N&�w:s_V綹��*��E�I%!
��<ͷ���&�v{�h#���y$}<�X�f ���+|���O�qx�on:�pR�<�X!�
B+ ,Uv�?[��ռ�/�Q���ڹ�‘�M�V�u�����X���\-����.s�<n#+Ϣ�a�p�.���X!V���_,�rƦ%�,/nx��_USs�x��f7���H��ۨ<�d�-`�a0����O�ٜ�����K�8�篌g�����ۮh���ҵ{@�l�v�|cW8���|�c]m�׀���Z9V����%��Y'H�M�=c�x���j`�>ɡ>"fG4�y�����Sd���/��%.%�%�Џ�9�W��n�|�4��~jIsu���z�����)	/w[�m\���f,k�ʩ���.k�Vj�Y�(��wm�m���`�v�Հ��lQ�Y��7m�+�٤�c�1���zO\��]�Lq�c�S������ѴʖMO/�%���12�'��Y��Ϣ{��sQ��6��G��;}�d�/LR>��V�����+^~X�D({Y�r�G�BK���96�I�/��i�[���m��#+�y
�kK�
;o�t����2���73R+�v���F�{Q!�=��2�xv���Dp@}/��M��H����_QW��*�(��ʉt��#�rׂ0Ǧ�9�U8ݫ������m(�y�,m����aeC��m�C�.i}�e��v�\���1�ve��ɏ��'U�e�`��ć�{�w�Z�-�`u|��3�w_�=_��s7�O�~�ϭ��sz#������U�i�b��*��T�#+��YK�%���Q��!ϳTޜ��Pl�����,P*3PVq�z���tG*f�d��c;�!g�M2���@W��WS��=*�4��2��m��wm�c��:p��JW�K;��#+�f(���]V(�h�(E�-�@����*0{�Ε�n��<k���}���������&Zڜ��8�*,���h�Η�n7�>�s�VD���Gw�/\�*�EGT:CEj����f����wg�S�V#*>����s�(��*K"g0�7?8�Gi|��?���[�پ�#+WMc,#*?HkM�M� �reB��m�O*�JZ�#*��3p�Qg��r�#*��#�<W�n��5���P���=i㝗��8ѫD��ѭdW"�����3��R��7�~Ye�iK֟ʪl�d/\u��N���i��K�$=�!l�i�ؼ5���*�b���#�K�YAe0�-�Kj�nS��.� |�U���] ����`��D�b��rW1]t�@�����`D8N
������̡t��*��v��5��EV�9�8ʿ9�ê)0P�S���㿺���0t��2��#��s ֢������E��}o�%����������?�$%��P���틶�����u�E�!ֺ_<��D㪫pMVD(�"�#+i'B�3��Ԗw|`�s�}���?�ۢy
uL�>*{���B��VUp2��yE>{�,zL��s�=�Ha��+\��L@$�P<��5J��7�@X���j���GA"Ml!>h���hz��+(���:F�F��I���^�u��U8Bg����V*��Z�:���F���`s��_ĉ�ӏQ�������#n��%/��*j��]*z�ޙ�XvX�V�߃#+
.�!s���VWk�������������|=.�_�����z[S�&���Cc�MFµf�!�$�DU]&���ܔ�O��P�e�_Kn�.����}�����(�Z+���o5.��\'Bd9���yL&A�n��ɓ@���~�??S�8�Ń�f�!f�.T�'�!_Q���PD\/՚��
����F&Խ�*�]�j�:͍����)��:L�O⷗j*�E�����V�C��Ef���$63d�gE�	�ڭI%c��myT�)T4l��Z�όtS�}�dw�@J�R�a�-��1�+������Q:���n�Ӻ����#*��˵��=�����˹�o
��������V����S�͔p���德�-�	��qNL�͛�����z3!'��3��FΚiJ�,�G�j�P0u�-\ğ#*��N����s��1�影���~��C���ڍ�3��X����ô�RA�3ͣ^�J]A�V���s�"�1f5/%V4-"��@��*�͉�Iڝ���E\�[�™�2#*'����zL�Ynf��?m�+�#+'k.5�����m�g�bs���7[�#Lb�4��5�Zx $� ��5�)z3�}�#/�<F���������6׳���~�R#*�N�tiP�)�#+�7���f��3k�w�@��Xw��A5E��@��I��Ę��U�F;]��dI�#*��<��+�੓+���#+�V��d��W�F�j����_Hu���K0�3c��٤!���el�[�p��K.�;��=Lm����'ħ!N��d�	�Ze;yam-�Oc��r��K��-���3U��~e��o��)J<���1�`��³�P ��-=�U��ғjUa�:M�obEJ��gEq`��W�yq�����+�9G�@�W���N��}���=�3�8��'���}ޯ���φ�#uZ�>��Ր�E�GnL�)�`�|z�5���Nyl�,ڈ>c�#*����<I��D$P�~� ��"V�#+@3��:����9�P!��(�Co۽o � m{�񐈢'��!�)�:)�ȒЕS%$@t_���EE����4.J	z�ʨr>q��zw��2���a��y�
�,fb��$�@=dD��	o���1�p�"}@KΏ�
�#��Q��3�C��IF.���������fc���M�Dwf
C"�?$�!Mh">B�: P95|�H���M�{�3Y+�`��@Z��g����ߣ�#+�(�-���[G+�h+��n�S���	0�K�윀7#*;�6�8Lc�[����>�0���K�w������8�lT#+I{��3P�b7�HݢX���62�N��f�D�D}fe5jc(1���gC
=�w|i��iz�����KZ�
Ae�Q4oG����v���U��\J� Տ��a~�Z"ጹ�ȸ����nj	���pB$
G��p��!��Ȼ��-<ꂻ����8�3��L���{�ЁF���������?���:Ǿ�������d�$��~jA�D�B�7���KA��Jۺ���C�+�w�!L= �!���z��������#*�Y�A�=шx��qӜ����Z;�龊T�������.��ˆ0� ��k�l�L%OP�I��Iaĝ+����ה���k��]Zq�3M3�H���a[�2!L3�\yֲ���)L��;�=��I�;�)RS��}�>+�`�'� ԭ^��W�z��m$���o��j�yf)
3.� �/�v�_�I��	�N`A����(˺��r�=J���>_^g=3�D�M٢�����v� d�s��4��k���z��(��#G�(�6�1y���1��(|G�w����x�!�G�s 3���9$�h��Oii�&I!�A�t�p�!c�q��\�HR�MK0iZ�(<}{��8�I��?�q��~:w��=
(4�(N��i�\%�����f�J�� �Eǫ2?,�7�1d��)����<3�A����D�D��	5��8��xt��+�D�n��l�^g����r���܃d��-C{'Lͺ�5#**�\�����5we���l{�w��'��r���k}�| �nW�؁0��8gd$Zd�iM�E�.�W�f#*��}~�)2���I���,��~�l3h^� g�Yc���^2��aV���"�!	�)0P�S����%OJ�s�����
��Dŀ����y$�����#+�!r/xl�l�
�Bc�R�+5!�mh�^�~u�8���#���5Ѐ�K�oZ��#+ L*S�	��J8�
�#*Q[4�X�W;"*���3�<��H]���p�,�fDgy���Nvpf�g��ib*�V�My�+"�"�9�R6�#+=�*�_`���l�9cI�4�tW4 ������L�T�--i,9�KE$R�!��#BC��S8uÝO�/�+}T�vo4��K��9otnkC�&w�Qv���t��q�ք6�7�}e�'_��'ω���z#+"���׆�k.P��0��:j�V#>��Sǩ���k��'�Vu�t{_ā����?�!�Q�^��b��}�t&��AR�c�e��f�(Q��-�!�#+��kh�?�@�3(4�(�]h�:�gѯ
]�":7��
��RC.E���N�`��<w����	�����z@[Gwj�#*���"È[���ql�0a�u*b5�F#*��h��E	�iC����ZlN!��J����o��&��t���l	��0�^OK�_�������������L��3�#�|<�S�B�^�j���CX9>:��uu�U��,�&������
�̎aQ���^�c���M��m��G����D��؎�N��8!��} ]���03��: �?\/;�a��>��8C7Jƥ��'n��q���0#+R�&1Nkuf�B�#%�l�����F+�$���:b��ҹ�Խ~؛��Ȁ[U)�^	r����f�I0ẂQ]��0
��2Y[�q��W�:�ٺ�!r����'d���]&E3��k�J`���%M��0G�AP�ކ�j�'�C��k�w�T� e)2n#*s�7��������2s�	L���RV��䣆*���IEP�X6ݐf9 L�'�*;Q�"]���9�Zl�(��[A�xYY���H�ֶ��"D�]$\�b|�.�skӼJ��5����@�o@ߎ�v5PD���5h�::k��f]P�L���d� T+m�Ќ�(�6��°IOL�)h�j3˧�_��]|\����]#*���2��(c�O~+������;|��}�=�L�k�P�$�c�^W��hhD���9��VЮd����#+Je9W!D�o��*��TQM#*$�,�1�Z��d&IUHo�_�z�ՙd�|CɝǏ/����G�$6�BHĄD�a�D��C��x�����f��wGKx�4���]�>|�QS�PH�
����ȃK�K��������ɑ�z��=�Ghy2d��&��(��TA:��=E8�����y�Kl:��q�d�@�[!�*�4�l��Mj�CN��K�M�a�/����#�:_,ZN�*W��X�w€�N�#*�p&(�{����6w�T����}�y��W��QF��	*�#�i��OҞ!�ʱ}u&�Q�i�#+s/|��Q��9S��wYP�=�#+n�N�	��Ȑ���鉎m��ݓ��s.��Op��Ԑ���(>~82{�Y���!�'�/�<��IKJ/�{yeI$
HQZ@Q��?���L�x��?����7��~��#*)=i�<�C�?@����E��$��
? �
�� �l'jv/	GXA���a���K؈16K	c�!���a�10�!�@�݈�D��bhM~� �)Q�%�:U�Z4-�#*���]3ߠ"���F�M��;0�`'2!���b#+�K���B���$�$'��s}�z��W'e
�?]4bl�T��,L-R�x��)V��}p����At��:K��R��^���tv�ٚgt���˒x���t�\�>f�UPʡw��	V&�Q�x�.Rx#�i]f?���ں8���DX���9TãLf���|u#$,s�0�<Y�
��1��"R��}`��z��")#�7l3f�];���w���j�O*�F���9q5�~I��W�iy�Vǂ*��>��`�b}��ĸ�:��,q����2��\6q�����?�gG�t���!��[��5��WY�,�2���q`_bI}��ė��t���=�AywffޏQ!��1�ˬΑ o�B��,�ʡ������b�d`�}-r�x}80�dc�2#*In�> ���x�sN�4tU58%7V��WmK��f
�#*��g���ٝ$c���D��`�C�����c��0N[[Q(QE���p���~�P��8!\�@7ڐ-�o.��22���ޗ����Kt��j>�u��p�,�`<&��@�=����Ɯ�G��h�
�C7׹�􍲏�T�����H��w7�&��$kw3�t�
���`��w33��)����~6!}2f��|h�F�����#�����y�?�<;!ꂄ�D�	i4Jh� R�h�B� �ma�}���1W 
��r#+T���"(��4<�r\�dd9���(go-p$0�$�ӆ]s��4ƫB�RV���5�eܮ1$e>!�#��xIU?4����I�Gͫv�Rp/���l3��I$
$d
��!���Lo�R^#*��#*s������>=��Y�V-�aSN�uta 0��ݒdj�h��<�#��~���?:B�H��E񹣽R���r���I�	�T���3"H!^�%��|l:�G��5�c�j�^5G-�Ր��#+{Iĉ�AJa���޼�����=��]�yzL�NGX��IHv���ui�r�ã�a+��lpƾ�#U5�R�3HE#+:�6�n��G�ݴʊ(�k�`��j	�bm6hV��]�:V��q���,�!��Ō1����狷��&D��[�1��}�o��,���`9W�y�s`��!��#*u�f�ME�Ԅ$����y�B>�	C O�D)Xb�8�T[��#D�B�Y4�̲���������d����'���M�	�;�������8��S8E;�Wƅ�#�EL����0dDiNͼ���]��'"{f��q���kpٙ��s�_�hJ�˼�lY���ĐH%F	����x�~�`,�X���☓V4T��Y2��9���ǖ��fV�e��*��A��Pb\I���
zg$��89ƪ*d���!��K���i���ܱJ�W�K�����n7�!D�Q��(p0;z�icܨ4a��3
�y#�Co;4|���e�"�����rS��55.^�QDS�r�*�+<5��&�3E���>���7�xFt�����]�{Q��-�������9�9�ʢ��x�I�+��z�&c�dMZ�(05�W$�ɑ��o���M����1�1!G��j�^</g6{Ꭵ:}CUK�����}����ú����z����F�x�#+ҖSc�>?��N�s�{��1��xi��#*ۘM���f�F�U#+����0����q\18sp:fQ�-�w�*���s�]A	��$\\�k<r�!*��Qc@o,t�s�OS@i+��\���#*�f���s��5)[A	i8��D�^�i���;���!}�+3�7a�Pj(�1M����K��q tf�ќ�ָ�;��8��҆��1������c���dN�#*�8�����;fW7Wrw�C}�vm�0��B=p������Z�]p��%0N�'���u|l�8S���c���>�	���1$�7�'�"9�yx�єF0]�V�V}W,�ݝ�в�<6���#*�KX��q���'�_Ldd�ee=��=?*�M���d�t��7�i�ԩs�`��=�.�βӴ4DޙP�C���XB�q��!��,����[%�b:7�ns����ɡ����O6˜�Ac|r�)�#�A�1����+څC�[�c8��׭A�}��Z�e]�a�s�P�L�ДnLV%����7�t*#+JS�cwkEF���Z#�~=�c��i���dCW!}I�����TثT쫺�=��ݩQ����L�k!�����)�8]!����<�n�.c�pb�A�m뗮-[�(o�|��#*��8�����M�o�>H�)=
�}=�p*Öe�Y�ٓу���y�L�A���wv�۱����XB�?�"��Yxf?/��wݤ5|����sa0�V%%E��jK*�²�J篢�*��U͟��#*�qm����{p���\���I�������(t�����4�ʶ&�2�T%7&�o�w��L{D�눏�$�j*�
�q��4A=�GHJ�IS4��	7�l3bh����*��E�D�#���|�&C۝�&�P����{~Ϩ��=xݹ�E��Шg��RU�-FI�_:o#*a������h�z����p������ծ��Db#d�����k�/v��)��9 ��=DP�R�Si�����?<���W[6��N�*����,���a��w��������9��0\σ�02���Μ��V,%��]9s��i��_>{ѧ%��l�(�
B��o���,a����o�QA��5C����T����Un�#*x����H0�%W��7�i7�Jz�j#+�����9�͔
����ճq�&�XbEu�ʹ��=ӫ�Ѷ�����>�G�Ѩ��H����.���\9��BT���o�tJ�w���1@��%>��nB����<*��}
�!L��p�-�n�'+j��Z���t�Mz �rO��kЪ,��*ssank�|D?���䢮��ݭ�p��z-���}�R���@#=����|��ܳ�aMU	JCU�oZC�]�?ѓ���]�ھ�/;��\�=��OK�/���4��=L�=3#*hzDD�3�xh��!��=N�ǟ�~�~�3�'7�o��`�l&{�!��"&Ɛ�9�&�������"Wo]�eзƿ��c`Ĩ�|�h��9��p���>�^N��'%'�+�22#*��Sç/I�}u��c��ll�#+(�3&�J��m�,%�����O�wg�,�ޘ`�/>ð7�bD�[����W���h���9<��WX�[�G�ե�?{9�І����#*���S�m8Gba�Z�Nc:2,C�+}�	|�	ࢇ�U�_��{��*�����
�'e\9�n)�L s����w|�Pr���v���Tp����ܟ�����)�#sq�,������A�]�5�k�w�6V����PW�IL��S�ɲ�
�\#+	�J��@��(?F�3s�\�=nh�i�T;��Ȟj匏�ʃ�V�q,��'�/W��f����M~�7M}"=R�BP0��r�m.�n��B��I�l}#*A�>�w�Ny�y��A��?
�2�����4�N�@�j�pV]1�Dݠ��e�QP��׭C�O�v����뿳��"��˿���Lt�%p�UAǛ
_W7|Ú՘����UuQuY�+�E��a2X�i�ӘX)�5J���!zD�13�hk5M1�5%Wwdm�<�O�5�g�	�h#+�*@��J�;�ӧK�l)�z�NVO�"W����|�ͯ]��0�����z��M�y2�[�z��J3�7��Re��YN�o���pW!
�h��������uWj��u�f`����t��v�u$D�3�T�Y�Z������g�,����We�&������F�1@�%\|�P�r{
?0��G�t =�����Ò5�h�u�H�<�9��| 5A���D�㏍)��t����N�h>�1���>d�3ʵ���|,���M�����6����M���A����}aL u�NUf������3X�_6���g�x�� �9�7]��p��?����+���Ё�;}��.�=��a�O6�]]]�t��0#�)-�_�Dۨ��ѻG�Vy���f�ъw����+���TX��`@=���/�ȵ�����WS|j�Ww#+5 �k�Eax�ˀq+��82�c�P���Zxr������cd�zSTΝ��:�r��0[4}�{��<���јX����΂�1��uɪ;:��:#*������Ԭ�V�8�H=��*�2���e���J��*_�i\�v�Q�N� �oGz���{L`��ۏM����͟���t��}sL�f{�Q��;��'b��'逄$b�ʼ�Cц�t��3e!lA@���Mx�7�ottĈ7�Jʋ��~�����F1���6�-�Z��[Jf���1����Ne��J�o���C�>o��u�ʫ+�����0uDC�LC��x0�Dqv޾��?�j/#*S�X���us#���Q$�غ��[}�Q$N9/�f�e��U��ۼ	y^�P�}�(>�9�������}�~�:-��#���s�o���ٌ�J�~�g���q��|?���<pGuۻjFr�'Z;?_\Y�d��	��I獯��S�OlW�Vu}�Z��9�4��9^*�֞�9��'��N���"�Ȟ�nh�=��o���b娠�?()���qأ�|b�K	������	�]����U�<�Q�C�m��F��}�g���z[t�a���[s��]���g==|0uB��"�����3�][���x��4٭�r�(rE�	#+A�O&*P�LJ�o��2��T�!N~�uLIG�(���Գ���J�c�kE'>��+����T�ϳ9�_*�?C�#Q�	���ob�#+-�p���bG+D�s�UJ�h�o��&����s�_j����=���ÇO����k����BE;�{VkЋú�B|wh�5����#����F~�x)�'Cӎ�6����tz�uU�7���ɮޥx�,W9��I�����s�-J���1����%E#-<�]u���i.RdE�cYb�!���A�2�N�B��NqxVȂ��zd����D���~n,�'֨��(^V��Q��L�2�$����1Y��is:zu�I'�w}?M�	�'Om�jj�	DɄ:J�!�* <�/ϡ��^��!�=V�F��ZGGvK�٧m�{z2��T��J:{Tp��o誫*X���ʸ2�#u�ԼWN"�J)�^\�T�&?�s�CKe��@��d���k���y�����D���Q�nց��D�G\\�5���Rc!��rTј��_|ن�~�T�(��Z��5���g��M M򟜱j[��j��O���`3�@�Þ�,��~��Bm/I�����`aC�s�<���tnh�`��L���u2������_����ix�bo��#+0�s�.y׃4>"K���Ed���~�I;n����#~��C}��C֜ G�=����gG���~]&|���~}��L�a1����#*Y�ww�V�x�x��q~�nc�c]'��ÿWe�Y7F������O�:GD��ƻ�t�[Z�6g1�,ò@Z<��0U��3�V.o�Zm,�7)�=s6X7��ǣ��'mOC�/�+:;�F$Z��7=P��������奱�#*s��ZO��6ߕ�l@��roƄ}Sӏ����`��C��Tu��-�'o��Q���1��_�x������h�^&�I�jW/�[�5n�D� j�(��x�]#,�b�j�Zǻ`!ƬE�.#*�����1$7a�9�l���1��tW���mx����3���1�;��	�[�G;��׫Yݽή�v�m0!�1�q��d�4*5i�c��Ԃ6�3`�u,2
�8g�'���WB�z��Ty�)D簒��]�M�b��@@����\��������g���s�!D�d8��p��Oݭ5uR��-����],4������~~���	cD�Uo&w(�!}m祑�10	1�8���������pK0=��7�#+?X��l�i>}���|�gs'/�~�ؐ�]�S2XZ5$ 1}e�@�]���U�8��k��L	ƴ����g��Dj�;�y���
�*�`ZA��U]gk ���k�g�.(��e�P���H�ݯ��1 U8�#�>ʀ�`d�?=�z�i��%H#�
�^A�F#�$#*��^H��?Τ��#���m���|:���"G���,kN��>ϛ�����:���b�?�S<�i�ّ{�2ה����5#+�%�D�����*<e�s@�n��nOV�!"IB�#hG���&^�|�_/�h��=�X&Z����1��hn�¤��^a�*�?ufl���X�Q#+�#���ߏ��bZ�����OA��1�EX�BEb@(�gG��k��u�T
�]ek���*��9�C���ޫ56�U8�!�Lj������n�����ݎ��v�$F#+
ڽ�ʅ�3��:��#+Ps�a��D"INb$ �6�lm�h �x������4���/�(*)Q@<���@>���ka�y�����n��IHᶯ�4^ݗ��^#��\D7��0�H#+Ebh`���Bk��ݚ��~[�Ny4S��tX�v�"׎o��x�z��dC{y�CY��;���:����;�?r����?|!������d8%#��5��6E	}�]TzN�����e��E
�97ür!�r|~������ۦ-��
�D����f�gY���hѧc�y3�?����l��C;��:c��e��-�����׉��b#+��BT���.�o�l���\D"G�H"��<�ަ�_?}xo�'�ak������9Q���;��#*z�-�3�Շ����u�hcS�>R��F�Q
�GDp�VV*ᰒC����2¾s��?Ty�P$�̣�b�b�j���I���>�;����,���ßg8����o3}�z�E�Mk�;�}�x���S�A�=̭�������AR	$��XqH������)4�>2a(|��	F���U�B�����ddJ�����H�:c���N0�½�#5������ң�;v���k���s��w��5�%��)i6~	�"WD(�L�#����L�pI��UcQ��>6o��||�C��Ge��#*���,�4��^ҽ���GPq�7� �b�;�0��b!Y��$ps��
=7<��aJ���]y[�Yw�P���<�\�l[+�:&��t���B-y��~�iA��F�7�����_F�Ш�@e�Qx���0�'�f����4��6]dB�x]�T75-�:�A^������2f��Q��IU�K��De����`���7�Nؗ�uވ��f���cc�|�F��[q�Kӹ���Zi�<3�{\H��(J�C�֖�Ć��`��U�V6��xm��.�n-���M�6AHtf�#*��I�`U�#+� bW}� ̢\�YF�E���2t��!;�1�15�r>�Krm�N�V{����g����/�(�*���04Gr͍12D���V�+���M���[@�����+։T~��0�$�7��@�v]�\�r�A�Y�ęI���hq)�84�>[��t��Ú�ޥ&�M�ÆSgD(����r4���i�I�\�9ޡ&H9�{b���� v�"�SR,)�F\���d��8����S<��,2�4Ck�������hr�~���jM��1��]�������t�ψ�Y<SM�����`����X.����e�����[D4Q�b���1`v�A=��D�����X4�[k�*Z���d@���o�E6d��r����=oM�c���w�?�k�õz��ꬮ�Qm���:X7�?$JH�GP���h�z�N���֕�&�SU�� �����q�mgZ��v��"/c�8�p�E2��kV���#*��ũ�w("��2_P�SKi8[�_�ɀ�	p�����2vOt�M����s�:Y#+�͡�Sc�QHJ��B�HNs��]�#+��q듮��2�ƖG�������U?��A��~w� Ψ����7��K���_>��N����#+�FAiLM��3�t'h�AEd0�h���+��n)!��}{0������Q����j|����9��+=G��%�$#+$V�j�[AH¶|$ �Z��m���0K:��U�ѻK�ߩhA:^1#C�TmQ#+'�X���,��2մ#*��}�omѩ>{���#H��z���Y�sQ��T@d��2׃�L-��w��e@MV&�9]Ď�G���+%�	�@G��#�p�@�E[I]jb+
��n��LD~���K��y89���ӽ������O��T�銞ڼ8�	�iE@�EZ�>��hz���y��m���H-�(��Bkb��������۟-.c;��yv8l������a�0�y���&�-gZ9��⮓����6� V�soc����w#*|�}j� �+�&!b2�ս`��`¡��F�N66c'���öq���}/�#*��'�t#*��T����1���������̶��_'�Xmu��>rPN�� G�	eԴ5."��1���ѻ���*ᾨ<yY�i���F���O�Ï>
�m��|Z�u�RcZ1������J��;�{}���]q�įͳ�<��/'W~�j	#��_�=%�znj�\t�Ş������H>��)����p����^*���́B�63�rj�#+�����?�rww�?�W,�<�)(���ϔ���E0�йu�!g��v�\�����^�o�]7F������4v��{�X������V�B-���1=�8�O�&�?�#+0�$~��!Rw�0+uI�d�Vm��_�'#LJ,�E�`���}A�|.ߎRP���8��ۜ���A�����V�;*]D-f� D��q�q|>6�+zb�a{�k[� �&�Wh�[8�Uꆨw�&�&�$1�a#+E���+\�TGŇ��� ��}�����C��=_Gh�G2M�~!��
�Q
z����]uu���W҆�S�ĉ��6�����
Y�I$�(TU��ȋ��B˭C��=}@>˅��5���o���iZw��^��X#����.�b��X�W��E~�U�ﳯo�����_�G�I�I4�OKeZ��ʁ?x����N7>gM6?�w�Ώ��I����V������\
�T��#+���!Ɇ?�˗S�	;��w���w���'���SPOև����al��3fT����@���_����&�>���M�C��Hl�#�BĢ��5B$����KA�r�?�����ٞ<y��.ߎ��|�Y�Z p��������G7��*�c��Slj�3��C�B\�+��$��I�Nѵ�D(��%V��E0�� ;O��6NQçzc�M0:��)�χ��������@�<;�4�,S��
eN��w��D�GB\�ϵ��n�`9�[G�\"���{Ӟ7��̩��;�]À.#+�{��S)��e4F�J^%��o����o�hǜ�FG��%�>�#*��)�.Eͼ0��	d���*|z�|̦:8��ַ�����~��P���)����<G���}�#+ť
�e�y]�SCR_�e���(C��d��F?xI���OI�r8,X�d��B�_���'�(*��FBX����#*l�!���l�����h����(Ġ.E�)K׊�I�7�T�3C�rs��&=��;�#��8����*k`&���39�,=�%H|�d.p�&����u�>�8
�Ma�@#�j�����
��$�m�%�7���??Q�.��j �����`�0�
)�`p{K��qR�d��z�����'R�fH�R�]�	l�L�U[b��%������)P����Wԧ��/n��]#Q�*2���*�q|�:l�ph	i2���#m������_X�����'�D��/�eM�M�d�$�}�fв��)5�A�����SN�����l�a��@�S/] �@��/�3�z�d��L���v7΅�&6�ĸ���0n��)��vt󮒕��xx��y�W������p(��q��}a�u����)����f��?rhY�� ����aϳ���[�h������|�c!��f?SITHɑ=�y��Y�!Qv*C���s7�(�EʪCP{�cBc��vD!U	A.
c?Csw���s�#�����t����M�{m�%ݡ�����x"2)����I����F3�V�I9�����o��5�s�1g�?N
���3�����5���3�7����wE&I�e��oI)nHR�)�ló�d6#C����Ƽc�<ů�?#d��Г�TE����e�!�$�mW���W,e�^Ce?�?S!�F��=M|�0����ߞv�����3�W���!#�6�F���߬$kd�
��a���_���E��� ��ڢ�!lC$B��Nv������#�����Kw�"�"Jb�5�F;5NRߍ�*,#+��������ې����pNOq_OcI��D3Dи�a�Q������h�����D�HJdw*�MI��8�#+�@9N&�gE�w�
�wź�j��VH����h��a��j=1���V�GO��Â(�N�&�bUuDz��J�35��0<�G����3s&�_�{}�$�F5	�?O�EI:C)��t�ېH}�����]��dh^��{��#+s4091a��!{��k�Ο��5��A���#+HO�}<����Q*Q���arQܙ�\�lnh5_���K�����}��8��43X���o�#�nMAqf�+��ӈVŰc�&���i����d���q�Gl�f-�0�SUƌu�wZ*�z#*ۏ����8�J�7�U�Bo5��rc�b�S��揶���)���YMfLl�0�#+I0���:����ݧ~l��?W}v�z�[�Ü�d�n�̛	s#*�QJ����TU��r��X����N�b�׬4��%��!��ZؤX�.�cI��A���'�	\���*��)���l�W�Nj�"��#+�J+�m���[5ݻk\�$m��Pز��`fU�PD���L��P�!en(��'[�q��]T�]���I���HA?u�V+3��;���13S��)(���~�9#*'�~�w{�DU�TQ�O�2ʜd��:JH5H�ճ������>���`zX���ˁ��D���X��˓"����1��Ip?N������	!�0����Ú�k�5	Hq�Nhn�u9�8�5���`��E�LJ����*�G��8g��Pr(M9G�Tz���:�xvzMۤC���#�/�!�`��&�����΄�Fy����2}�M��}�F�F�:��!�'�@F�vT��P����<g7��Uɵ�S�%|,]�����@B��:���#+C�eh�����,{hh�"_au��{u�1}�u����`w�|��
��#*�����m�!F	߸$�ל�9���QƜn���2�I�r@_}�|�y#*:�5�r��F<����@r=*�0����g&�Z���:͆���[{�]J̎H��I?a�<C��-=xl|G�:}�QADI����r��ܷ��bP����9�{���8<���-Cj�N����7�>c�B�J�
W��{��b����F?��{d�_}���|��?W+��;'������f&�awI�@z̪VE�SJ-؄�o$�N�n�C����[T\�%M@H	���0?(@$�zPN�a�i:#*G)�*��s�٬@Ǒ?Li;�ӗ\|!�&�%���8G�Hx�x�z:�0.u��%`0t����8�$>�͏`B�#�j�#�rN��Q����3b��Z�NF�����ʺ(&�=K�sݸ�������בi?D0m�zAbN5/%��c:��12��??��<0�p�h�e��#jl��o�M᭬��8�G֣A�9�M��m�� 8A�|�N�Ӏ���%!F}�o����XHl_��z����km��!g=;c�_(�Oˮ�@O=fA���r8!�	Ԩu �\�:>�l�`��#UR�?���hw�}��^
S(t�	{�k�ޤ��ވ?�#�8���4ʧ�R�9�hՏN6B$xމ�����i�N�nR�݀�����8�>��g��'4��xdyĺ�@2�?�&��>�/:Z��}U[5� b�`��D���Y��4��#+B>X����ƏB�O���?����L%0���r�.{pŊ�sԧY;2�ۖM՛5���rƳ�u}7~���9:F�:���׶�?"���ٌ�f��Aī�8!�X2%R�Nx�������ir�������$�bG�h-�m��٘��"�JKZ8�$q��U�,2�!���4�aB�'�n�l��%��.�ht���R�L���"B#��0�T3=�~��@�A�6�-~��
�)�}s���4!c3�׊?����@�_:X��#�W ;�Ҟ�����%;�����DԲPRt#;���A���?Gwɨ턿(y�ֶH�
��C�Ľ�2�����ȩ ����V"�c�h��,�2c���T�PQRC*�iB�������Q���x�.�^k����P Lй�|}�~(����6����� ({��CT�!�sr��]�]�
�hKBDƩ��@��,���#*:<���8Rۘ�����2
�]�$Z��5�X�{���SX!�� l1��m"���˫��(	�� ��1#*��`SA�A�e�Q��-hHm�1�՗��7���$���	��o.�������`��tN~{&4
Q5܄-�*�'�pn#+�0�A��*���}������3��A�|e:���$�d }A,i�hx�v�����ƴ���-��i�IԒW-m���~����|(�fkX�<;WP�Z�A���4&�X�!`�	�~^���c�>�=|�Z���!�����I�4h��!
�ʄ8&�E���t������<ɂq<8ѽ�����o�Pbe�*'���A�r{��_�y���:<����9�1��KY$#*p$����q�I�Gϗ�����L�о(|����pS��Pd���x�H���uOvO�n�����U{�����8=��Ia~�|[�2�	�т�C#+���,M�jE�.T���@`�x�\���:�!Gwc��K|@�LΠZ)b2+֦
����0���8�.;���@�>�9�g�(ݫ��X��<MJqS��	l�?g�`��0U����90Cs٣(�Spo#*/Duɟt�R@n=�.!&`9s�5��X��sU�N�χ<����y���3�j�6p�:4d�%܉��ѽ��X���+���J)B'>��[�<��m�W�PJ#�S�1��`6�	��kR� Ydn���d%�m��8с�Vҽ�<�T N�v�k��{�-���\C�\˧�7i���a���� �}0��g�~�8ε=T)KCL�4�/N3�K�=Ƿ���}�Ҟ����o3��^БA6/����"�N��h�F���̒d�i3�H&�%����w*�@$p1�E�/�BzQ�3ʤ�c�� ���$��<��i�v��Zf��OP�2�⾣����D�<���R�,�GQ��W��=��9#+�0>
<�0�b�#*�L,iP����9=ڝ���=����G�le�#֠{�P��؞:_��8jw��J"��e0C�4`{X��TYđ$Eu�>��uݻ�Ӑ$��O?�����N�0L�P}<_�E!6�<��� ?�:���=�r���g�폤�4������b�e,21�h���:�<�����V�V��;��w��k{�"��>���I*Ѧ	_QkzY?;x�ڼ�tcȿ�C���J1$pX�VM�Z�C��r��
���Ĩ���i(?L��x8%��z%'�?�[X�ɀ�SU?�A�@80HD��dC�o��#*Ȼ#*�g������(t
a�5�P(7��nXh*m>��հ�����:����f|�Á��$�0D�c��B{��i-�QYބק��b
���	�&%�^C@>O7��By��b�R~��?=k{o��4D�DC�TEARf�O�f�'^��8�1>�y���-���牆�B��6����d8�v�q��)D<^e	}�3߂���a�L:If��׻J�
��BA�y���* � ���r�Šp�ak0�O�sM���ǰ7C�tʵ�>+����'�.f��X��BT�D6�i=��z�p�ܿ����q0��Qg�yQ���*;�����Gc�	���[HHV�n���Z��kH�B��mUH�#+�gI���2�]8�?��71�`�7�mezb�����M#Y���G�Bl��[i#*��:��c#*J�5%Ŋ��E.e#*��o9;Eݸ�C�����6H|#w�b>_^��XH��E�*�U���S�;#*'y��l5�v^O��
_���r1����0wv��S�|ľH�:�j�{���|�������ǐyvw�����O�Mf*�i�PΑ����_�m�7B̄I:����}�A��KN��%�2#*3a~��T���J0��K��h�#*P� {�!��.���P\���oK��B��|���$pG���m��9�Z�Y<��l��e�d1�p@����v��n��#*���,�r[\GRV.�C�{�a�S�g���Ð7�4��=�$�r�ѻ|<�D�I�n~�wT��D&&�Pk�ph:ȑ4�̈�m"�-1P�0ǎ�1Fs�,���$L�7��JjA8ͺ#*N@��#*��4���N�Z4B� l�^!٬P�Rh��*�p����H2�*4�V�&���������X�B9_�ĠoT�C�0�) O�Jt��i��2�6j�+@�=n�@b"���c	
�b��&��6��	�<wH�T�2�#*���'Z���:���A9�^<_&Ȏ�ȿ�'�]�9�:�6�U��x!���oU_>	�ܟ���ݹ���3+�g�sζc{e35���{����������l�2g��J�8�����F鄃V�*_	��^�r�K@��x�ɿ��!'�r� u׹3{�am`�]�[k�,O
�]��}Xcp���#*���#+��N)G�O���q�j���h��.�`����}ʟHIl����[��#*�	J��H���dz�����,%G �#��B���__�žoG8,W~�Hx,<�A7�z�$�/G�M��}o�#+d�4���d��h�/�9H��7�����* At���*HZ�*W}��7�\�@��ē.�"%�1���RON9q_�߆��	�_zc7p��z��S_��.��z#+ʟ$D;$"��K�8�v��%��ɺ䰒�U�P_�bI����랝#7e0�%�}��#*+$$ADq!Tn��=Q^��	�XE%��������;��2�dk#eJ�-d��C^�4a��H��]���7@�s� D�1�a�p��Ǽ`=��/Eo�y*��w��]z#������n��I�����Ɨ��j�����=<�Q~�
�Ht�I�����iw9�	���&���I"#&I\����m��x�N�_�n��}p)�o'*�V^��c��5��
�o��B	�C�c����wѺf�d0�f�r���]����8m��'
��6�?̷�6V�PB�O�y�T7���D|{1=Ň��s�H��v{�G�S��ك)�'�\�=>Zk��|��~�����(�y�]Z�ߪ��ڱ�`��bn��y�{e�g��Gc<�K�#+���%��s���;3|"AL���N6(:n
Z_@�.̩R��7�6Dq�#+a�,�ƴB�	�|��e��U[��!YӪJ��\U_B?M�隓L��dz����Z5��ieb����(>�K,�	?��/��#+;9�u���8[w�^<��z�2�ߥ�"�V/w�R���s��/z��pl�p&�Pw6N�#+��ʔ{�	Ƞ#+��NѧgS�B[9©�tm�����E>�D��u��2�m�c)���qY�E��(@�4@P%%RD�@R��ݣ���g�#+j�>~�:l\y0�f���d�(�m59�PP03�PW��W����	$�������#+�'�f��B���;���M#*C[hJl?Up���sNe]���dgX�Ō�|�|�T�h�um73�lԤ��csw�g��(��9zNL���X}HN\�}pt�S$$�%]{B}6�	�-c\E���WkV1Y&��2�]���G��(v��t�ג�o걻�˘5��5��ce�j�LeR�J:�r
��1�>~<�52Ϻk�Ǫ)D�����Ρ�/����@�_؜ݐ��5Glpj���շ���0�_#*��{y?����x#��A�B�'�}x+��G[z(g�q%��|lŘ�g�����r	Hm�
��|���_�t��?N<�ؒ���"��U_g�����{��`n���Uy�F�kZ^����.�Az�R�Ƈ�ws!�<'��(z�v�dE�K�@�PB�wS�`߯A�Q�ڛP��`��H#���2yO$�L���#*�i��625XV��3��Ҿ�"�{��x"�:����녱X��ۗ�AU M�vLA�JT7�5YD��
��qcb!�?����R�8֕�TȦ͡�Q�{��W����@Vn/��t9�3Che��NJ)���!j����O6���62|HBS�P�r��كp�~r�*BR`�]��ޖ�?~��2�4�cM�-�j�?G��x漎Hl"O��_a��5���q���ة���\p?g����oP��Jc؟�:0+����_�\p0O���,h4���M1;�Azٓ��߁��ВF�#*�[��.��3��+&F"r����{͏�|;����gs{�z O�GS��L,�t�<`ۀ꽙�0,=����9�-៩:���`��Վ7��u^����:�xG`gG~���zh�J8��d!*�F���h������P97UUP�m��$�2UO�<M�1z�.P�I����2ၹ4�������4,\�Y���ȵ��Q�{���0}�߯��#+qd�ջy�@��������#*nÝv���5���g��U9Fe��-L/wH�`�F"
���#*UH&0�Š�	��p�&;(�y�!S 7ژl����gq��}���xrxG����V}[��H��PZ��U�
Ksf�#�7nO!��C���?���WN�ŪG}�GR~���O9�ߌ�c�<��{EZ�`��4`T#5���l�N���Rs�s���~#*l��Fdc@���NfHy��s���Á��~�&�C�H�S�itL�AT%~���5���X�F���#+�!I��g+�i_æ��Z��=�<�A����,\�>�d�#���t%��
�ԁBH�E���v�X��H�\V�3��j����4�%�LAyX�g���U����C�P��lۤ(���"dv��9�AT�!�����66L�O��bIufP���w�o´�@�#K4Q�>Ӡ�>dDz����=�Gz���٣]��$)�\#*�xjֺ�^w@�����=������%��b�ͩ��0U�ϣ�lI�.gOk������*����ծ�n�����K�B�YUA�o_���;{�:s�ƪ���SR�$tM�����x��H9�rێ��E��7^����s"�<h4Nx��͹1��9���cqxCOZ��9H�V[5m����K3���� a	V�s��ݶ��%�6}Kk6�N:)��� Z�Ig�G0�EI��`�a4�ap�0y�ܾ!�!��j5��>;��20�D�:a�D�<@m��is��:�J�XR�1$#�Gݶ]�65�ؒk��Ҳ�ur���xO��b��������@Ұ �	��{�@�����F�!�Y{y͂6&x��?��Ā�t��6U��c�׌.AE�h�^,q���:�!0BBu�l|��Og������<<҆O��s2,����c�$�jױ�y6����d��#*��Tl<q��Ƙ0c���.���+<1#��#����urL�&���(˔�!D�#+#+����83Kn|&ë�C@���$��jp8	�Dj�z	�7dޚ%��EFyE�N�����g�rs�hL�i�A��Ҟ1��3�F2���R秾�����Y�J2��<�X�W�:Ѫj��ܦR�[�O1�.�!�~>I^��|
��ѱ��&�����Mu��A���Ϻ����];�Lq�\�� w=7�0�	#+����L�D�PDE��j]aAI�G�h��y����G���[�g����c-ʱ�ˏ32e��̳.a�\�JT�džn4\�#+j�V	0������#jT��L0{0����L�ׂ�K���w�xS<dLp9�
l���C��|z��/�;P����& IC�.<K���:C2���W=-�[��m�V�;C�i�`�]fu��#Z���|T������lFv�{5��:��A��Þ�x�����>~����fc1-��AEafX!	�%��.�fޝ�Ye�d��i3��o�c�Va�N6՚�ؒ����Cz㻳;o����������h`*��1������`�Jr<����I�/#+��8�63��d��z��x*�T�����0D)�C���=�jmǾ�V��'^m��g�sְh�譀���@�MǙ����e��BL�&���q�3-�3�l��Y.��v
3�N�N#+����4@]F�zX�Ya���Ԉ�^�a���I�����lb"��;�E�Em�_	�Z3\c�����ك)3���=4�FPpƛ�p;� ��EL�A��Wq7���i:I�#v� LM{7
(A��a��3D'c3��=XTu/��0�vIa�^AhY�n�5���1��~F�Of$��E���r3u�&���O,
H��t�m�<rc���4���G���@���RfZۑ����~y�h�龽0�A��LȦ��&V�8|�*t���1:w�4$�(�%�LW�2v�I��鵧Tu,chl�ix��=jl��z�U�g��Jž�P�[�Ȃ`xd�	#*�3�;:T��3ɑ��9S����iMx���͆�5����1x�(,h�D�`8�pCgy]劋ޝ����|���w����T�ә����QѠ'���[���I��cǺ�1��!����U�=��[i��҆0�j�c�Lr��\D<84�
2=�=�f����t���p]A�#+3߈��O$�P����g
��T����썡�\��)���������8�̓#q����A\���9ӶSe���߆aX���iA��u,B�x�����u���� ������{�oW|�1�q�G�pg��ƣS���&nx��ժ4	��#*%7Np��k�\;f�##+��]���X1J���K�e�=�v��A ����?!��\�~�6� UB#*� MO.xvo-��P���l�p���g�O��V?��l�39��x���B���C���rHc0D��#+�P>����~I�JI���h:�⛑;������HM3,�4�M��#+�F�#+�L<v��|<�u���B��kQ���#*�P4}
a�ʪ*��z�5|�h�zx"��#+\�0�$��.5z��ʟ��'�HŻ
��"R��tPCh�x/6�]���X����sS"Bg5�H�&ߨ_�� h'�(C��?>�'a� �&C�>6��F*X
3"
�p�`�H(v�@�X�S_Wj�03���x	m��xq��f�4oXh"��8�I0�#k��ݸ�"�0���K��%�76��Q��n��r�1���8?�^���藦��&+��o��������B$GhA������O9‹C#*�u��A�t�3�[	��&͎ko-�Vp�>�� �e�8(�b�+��o���h"P�"���������hZDfD!�FF�9��`����*�=E���]DLu��أ��aY[ky#�J�0k#*aM,!h�*b���ŏ�����z�sqZ�55P�ոL�N88�a �ȣD_얅��Ri�s��톣E�U� �	OJ���`���� ;g�C�#+&"�ѡ��l��}�l����Z���TM�o��窿�G�v�E@K�e(M�TkW�a3��#*���1��P�	<�@,X�e���F��Q�p?i!ġh��\�����迳��jO�� �	ZQ�*������H�DH&Ti���5�:{��%��C��I��bx}C���a��[�:1#*�h������[9�K��D�۬�)7=;���?%�L����3ȣlî�y���K�/�^	n�Q�b����襏��.:ʕ��cq�-�_�5l~���l6�!ȫ夵X9�e�\Qx��X�;Z_B�r�D:8���.�ٶ��Gg���.,%@�,H�܄��$&�f	��(������^MA�β�#+d��K�Q)i>`GT�O�I�tF���S��� #''������uA�C���G�s��~[����\R�D]=Z��ZC�^��|#*��P�)�j��R%?�6G�(�#+iP��A�((�F��`��$�h�J���"`AIUO��J�+�_�2�Q�ރ�W�A��Z$�Z�U��R#����'���19_\��hZ�ɪӶ���C[��Ý�o"W.G����Eu���rb�u�4�2�6���j���7��x�p�&R5L�4��U
��Th�}��9��X�����#*����x�(>胼��3F2�����x�B,��zh�䏋#*%�s�n�6��j�C�=�`zH%4BL��#K)A�0L����)�wr���|Խ4���|D�2�H
 (dzDG0���<4y8�2�*i�|���`�o���:ka=�y״���I>X���+���������σ��o���
C����z��~�)ٻ�j��j2ܙj�c�n5JP��C'`�H�S�ąeS�嵪���)]\���GWFR�	�
���E�5��C�����>X��^֖�a�P��6�Ҝ���Ru_��@8����t#"r��|	H��vJ��N�|z� �8Ix����fe�u�	o�
,Vn�J��#lnXlM�~�M��i�R�hl�ʴv��,Ѷ�e��*q�#+kC	^.�w�ݬ#*�HC��;�#����by�k7�r�S�^vMu���
P#+�6[���#+�O��k�u)lе�(�ڬ��` 1�	����-�e����S?y@2)�	"�}����4aL���E��f(lh�V���s�y�����%�r񂐁S��FR���귞5���aI[��:�0z��\M��`�����#*!n:�ۼ�{>�!�B
^⚈���z(��C��9r
��:8m�Y}'���5��Zߝ�����pX[a��� Dƛ�����=�eI_3q���"�{<�f�W(�6�Y�p{-�˪^��7���5P��^o^�-�����.n6h�n2:1>aF9������ ��2V i�G#*&A��w�WƿU��\�iZ�"���Z��Vz��Ⱦ����V��~#+���aHt�Tz��څ�\� �`�#*��qK͑�_���B�'��=�Y��k.����7���F����<�#*/�'�5}9L�'ú�G��o�:��l�L�k.����(���wu�eT��&���>3�J�|ʕ��Cg+���ٝ6c�^�S��{��6y�� ��D�w���pu���:�ѫC���ݞ<�L��r:\H��=�]|x�K���fs5��{������	-�I1�̍Άub>��7� ٴ���OeP`���*����ǥ3A�q�t6����ex���:b�dc�°S1�z�8��Y�He�Q)ի�������%�$�|�A	ޟ�ٛ�D���էݯ 	1{�O��,������p�M�P��	$����t��mxM����r�r㑸n��7:�`�;����}>|�xp#*���o��Ǩ`.g�{��K_��=v�����קF�y^���;�8-R=���{�,�|�㿍zu�o��7Bks������c��8�7�U���.]�)ӗYZ�d��I*���aD��ÿ�7�n8��s����dI,�0�K���ׯ�H����ά$�l�a$*$��{��vc�9V��&�{F�D���f��MZ��ht��V��eP!��7����닏�/���U{]CR�gV��o4bj�F���5x�Jv�9�8�#�Ğ�d7E���[�����еP��$~�?�����f^��̣�;�I��ﭹ�3�/GM!�;���n�bZG-Z#
M!�EE11-!��`�If�&g�K'��d��	��X�����6p/	�,^<�L�.cew����K**YB"��G!Q"LR�^?O\�A�dg��:�Tu���Z�gR���̂�?=h�C5U_0�	����c_,�s3�4&,����kU���s�W�����4����R���"=��ea��N�(2S9�Vf�pq�q�b��Y+ x�+�1x��1�ZfY+��V$�ǖ�T|EJ)uS3!�9)�e\�-�yD��Q7�-���cِ���P9�Q�DȒD*0�B��q�pqG1+E�(̛-�"�,�M>ӵ��(���P��z������@�F�C�tB��ݤ-��A��Ǚ����wrc���;{�^*�.ϊ�ź��yo�+٥�T��#M�+�i��<�G��<ׁ���m�X/{�.��h!��P�ːW�B�#=��#*{4k���TA~�}^�Y!�Ի�RV�n���25(�3t�1�����ޓ\����c/�����}H(Pu��i�{��9X/|���jȲ�!��I�����p�wc��,�1�����q���q��P��hT2�Y�5|�;��N��-����q�s��݆%��	�k�	*vsޒ�����ae��2Ŝ���9�� L�-������L�6����3�$�D��n���7�ِ@�����Ţ��]�eG��T��&�`�f�����"^����A�a�1B����HZ�4�<Zm����R�/.w�jW�>4Y��N��2��+�r�BA�**5
�K��]P�C�HL:�1\D�O d
�ٌ�����Z�1f&m��ͨ��iMa���AvA��ЙB�?E%F��ܴ�i1�H"h�#+�����z�F*��5M?.�7=���jl���ߍ�I#+x�颣�T�&�N}PTa�$_S���R1wa�-8_bȼ(N���ͱ!x|��)#�ϙ�]���0�2k˥��O�l���;�t+�f��fzϹ�6�L�aQ�D�I�Q�c`��}�6�����S�\���N@�`��I���q�a�����
��ӑ����	<L0*��p{�ϑ��	@���(oR�<^���:�_V�ҥ������P�_g���>�>�.4��I>`e��-r616��}&���Cp�0��o\�&6:v~/��,��K	���4�ӃH�+(�jO(���EƃU1�0C06�=��p�8Q�=�=�F�a��q��wYq6���������4��#%�h29'��4z�Q��?_9�h �۽�'H��>��C�����%�M 6,�/Xš�p� �Pr�{�2
�Ǎ��!XܶM!��C:[����"���Ҕ����3~�n��V��L�m��\�����7�.##*Q�b��7)�G���[�,��$�0cW��_�=�{�:�\�h{��MMH���R0l�Ut!З��#+���i��:�1�2��d����u��Zk�t;g�;3�ꐎ	�w�j3�2b�D B2t�[ЫU��Y$#�`��F��)�`f���k9�y��}�*\���Ŋ6�բ��D��i#*�x8�:�!yȇ�U|�6�\���v�wb͖�j^���N�#*��0�#*I�qw�f8t�~���l����]�F�H��X�ĮS=�	$$l�T��$����8`��%������U;�0q���$ pi�̝�Xa�,�!�Xข�{���XVaHvwkǤ7����c�-9�(@�s�s1$��f��#Y�1�
rY3�LH�1�$�j)܉��<]evM*AfS�B�q�����	�&~n1	ֲ�6�#+�Z��R���Pb�V��xe';<�0�o�d���-Ӌ���-���qÖ�Zh���o�,#*͂���<��m8E.�χ��n֍
1=X��=�B�,�@�q�P�΁�%��!}+�6;�ۉ���Cb���*�H��tbޮ<p�ү-.�a#�ގ31#*����c;�qзmP��Z`�\�Y��f���)08�L<�+�G�mY)��I�"���e��ug��r�.�T_Q�\֢Q����������ls�Lο#*FS�rQ\,eF�K�lON�z�޽JuR�#*���_�#+�����\��!��1a�Q�5&�9�$s
MH`�RI��{9��
�!s�-�&EQ~���)&h�
MK܁�S��m�A�XYłi�q���zc���d�#*g$i�K��ĵˇ͇j�� �^OR;#*�[z_�96M^��"�a�#*���	�M�!	��7��JNc��ȋ���E����y0��O����� �V����p�F�G�TP�$�%(}8c�L�)"���#+
#+Q"@Z
��+�A�()��`b�����>�~�@寈�{H.ZǬ���X��ru�1U�y 
��w�v�C��HA�DLTTDU4IEL��3A�$L5LH%STВAQQI1Q�3I݆L,AK$̩D�LE3MUB�IT�k���!�"((�������JJ����)"bbf��(	R*&*���!���#+"f�*"�#+#+)��㋼����#��Nt&�Gu�t�6�^�wQ�=�w�C�@�G�)y�I���<f��#� ҞS
ӑ��+m���%$a2�4����$M�9�w ���Q?L���/����1s�b�<��P�[g~m������J,�A<D�;��fѤ��F����_pe�Y(6����†7H�ZKg�Q~<��IE24JLQR�#*�DST
2MET�R�'O7]of[#p!ƛ������c�L�jf�L�Ƅ����Xᤒ�5��ՊhO��^��2�+.#*�Z�@�����	���YO�ǧb}w/��J|u�Bx���TXj�n/�7�=ou#*�,;ޓiH	c��~Gվ�{t7���v�pI�0Đ��L{�����v��Q�������ӫ�����|�طw��i�:o��is�%��8�ϗ�æb���'p�$����25��y�����v/�ہ{h`��Ϯ���[T�R����' ���%A-ף��9�s�[sb$��5�2]I0�(_)�y���-a��Ի>y��{!�|�mڞ�]����|RMț}.������ҥTpn�9	:�[�ҙ1�"F�d�>��^��%�c���y̛fe��庙!rx�W),m�Ƚ�1GDž$E#*(�9�/��2�Wݗnj�hպ�:6����R|=$�*ެ�a;����5��><���NB�E�2W��V�(�Bi����	�%!�(v`���e-�|�+��ݳ%i�}�5|��`�����o��f\<#+����W�Tu*�#P�#+�����\.��7�FTymn�~Fl�2�����^#+H*:;a�2��]�a��7;���~G����k_�	&�LD�]92)�̜�s�~�WI5嵺%����`[Ϝ�;&.,��q���8^*��XM�m�8|q�ݻƩ7ņ�Cy2CRH�x�eɃ"��{e�m��!O�#*jZ������W���C�N0��-�˖]~�J��1��d��7����Tm�U���#*#+GG즓2��'&��P�ce�f3-1���<j��T(zX|๘�ޥ`K�f(eN�AT�\G	њ�?�!�%�eI�˿2ae1�7O*5F#*�͓��YL�1F�YJa��q��:�~��m����c��cs6��Q#� �[Ba�΢K�L썓���x��#*Y��]��}����J|_C Ka��%�A2�-��q�	�5�G]�;nq����8�,�������A��v�ْss�o�e�v̫sk��w䗤!c��q`�6/��|J��v�@�:Ugh�S�#*�8�;���cu+<d�6bK�{F!b<��8�o���;��P@9�ur-��#*��b�"�x�#b���r�e��M�P�Ah�������FY��u��Y�*�o.�gh�c��m6����n'��r�0�$�[�8�Ѻ�]�S�5#*��K�w�ܷ%1��2z���h2'����b���ю)��:f���}�y�����F1�4B�%�~�O���*L����E+V�XF���e!j�H���l�ц��h(�1���yji�^���Dv��	&8.�^)�9g*�53M�I��g��H^3��^4�F��9ܚ�-�"L��z�I��)xԩ�<8�*�9��O'�љ�鐩%��t���%���[�m��م+u�8N������>�;]dnM�Y�3�0�mG���Bc3�dHv&��U��[ʥ��#*�zַ�ZP��H��8�cu%^���$�ʋ�%kdF�[�*�T�&�
m8��O�A(�e$�<�s��l������!���d`�'
*�P ���.��t-RN�:i�y�.0�DdFs.���B�a��ͤ4$�Q$58�!|p���p�$a�?#+j'	��H�CǦk	 K᯿�ul��#*���~����61�p�_�S|����i��d���j��%B��7<A�O1��t�=3@啅5�Fi�6�W[W��Y�k���D�>�m㪲�+�R��Ǭ�s}p�<x�^��m��r���6zw�w��L���	�Tӹhy�>9�dk�ۨ^!��]��ٛ�QY1���Nd��K���9Ʈ�Ɂ0fV��_2G�O��8���Y����"#�IEK�8�C�Z�crGw��f�t�fL�1�˖�F� ��nf��YQZk&�@Q�Ց�����Rt�����q�:jy�,LJc�0p>ZR)�䀺Mi+���j=җ7�ʋz�bb�y��s�m$�M��d%e;�(y�p6�M����m1@M�L��b44�b]#+]�(����^��2#*(6s�^753���s�����B�3�(֒�Z�-��m�1��k!T�en�X���9��]2@7�AD#+#*���z��9�x�1t\�#+��$�$WN����8��u1
���ƹNB�Tx��F�6B��	Ĭ�0q�2q����t��lCm#����)��=gc7�%Rn�6�~hb�4�xх߳#Cim���T6�#*���3r��K
�jY��1��G�X�#+!���+�"Z�T�0�I�*�B���5���#I��k�d%%=ouŸO	�hԆ�e#*m&�8\#	�`�����PVY�$S�6�9��BC��9��c�Oqi����h���"`���C�Q��p2��BWL@)z{y�7#+��N�'0�A�"K�ě��W���x�� �_/�~���}�Gv��z7Fb�8�A =�"�4�u��7x�V����U���3-��Q��� �lln���3Γ'}�k��&d^�!S[R	��5R�3D�I���(y����'8�$(|��-��3��~��~��3�����udR�tD�@�^��:�]�Xs��6#*1���V��×+j̤J9��N� ��p|�G��
R�|#*��k<E�"��*<�P�T�"�`�+�2�I�h���m	�TS�;h�jd g	�m�A����&vR��yuw��b���fu[�$�2��N��	b�b�#*���_�a$\he���Un�k.#�r��60`�u8Gda`���Q�#I#�e�EI]J�c����#+x�:tM��,j�P߅0�86MR�L�3�oߔ�ߑU�����k�;�0�or[آ��mc�(ll�C�"X�`�9	�'�x�▁���_ԯz'q�q�JQH*%/{��U���r*�t�#+S�b��4�1T���F����#���ҩ��*����/�!�a	��KY�e7�iI,�d�T��-+^ߤ9�����ƙ��gJ��]`^Z'#+vt�{f�&��������}��F�!�8B/{����vbj���͹��8����s`7p�L+a���"�2$ V�o�8�N&zw�$9&�{�C>Wؙ��"�8�s��P�	
܇�9R �1�ƌL�dOq2D����@,��)C���Ŵz�Ӣo
��#*"gB,������#*�1�b�1���� b����#*��r��B *#�0d��H#�ĴM�2$����1�$��>�Y}�a �X��gQ]����3�:\��CH.�#*!���@S�#������8����_y�Sa���݋V.f(�Q�p�G����G��y^�N	�3,�m��_2&9�7ŒI0@D�ҹdgKZJ�#+L���쨼| �7����*k�!�cU �bP4c��x�(�ֆ�k���Pe��aD��l?h�� R��Y���*=�2���.[8�}'ۇ��B))LA*R1%
�H#*%D$̴R��%�۠!I����?�x}�Lr"�B��ߟo*������P�����)�F>ZP#+�

d	���CP�{Z�I�}�z�$G���>�j�E��k�������qa�0���ʈ*�`�,�/�h�-RCw��֌2Fc�P��*�4:���t��$N!MJ�������Rj�ٟ���h~[Ϭ�t܉��\Xfd�u�u��m����#w;q�a���� ��Uo>i�j]�x��6���n'�-��3����]��\SVíƌ�k)t��j#*�@�ҍ�#+��H]VFŷ�������L�`�&� �m�!��C[83�D�M(4��K�y4#*��+xY2P%�]����n��GD����DH�d�V>�(��e��״��"�[�_�Hx�
�DI5�(d��|�#+��q
p�|H�^�b��~,#e��?rF�C�3��8�"�X�gϤ41���W
��o��MLGnv��ڿf'd���b����H����p��Z472,UE�W��;��b�ѽ&g*�����N��w�.1��!�����zP��v����|��O�M �	����F�rC�>����&��L�.�Q�`m`#*,��dM���n�4K)��E,�4q1.��j6��~��c	�(0݃{b��ǒ��΀��O���C����E48
�#+li�'�z�S
����HD�AF:��OM���]��ʼ�?�B�O	��o�/������q��p�J��#*���3����TS��8h�?��	r�]�sfwh���߃BX>YN~ڌk��1 3^a�������e�>z���$�R���Z
�!h�V���Iq_�z��l��է՛u����US��&������z�T:u��W�3o2��|���Xv1]Z�Q�l�#*�Na�D�4�I �l��F��a�8-K����&�8:pl*��E���^23E""͍~�p�sE��q�p���,eyk��U(/~���4K�i3�g	��6r��96xc�‚��}�h2F�ui��/F��VN�,���B8smN`E'��x��6#+I�Qn��C\�XJ�Kh&UØ�K�����\�%��ΒT�&�kY!*[D[è�l�S�6�)�
�S)#���1(��m��q2jɝ�fdb�\1�C����
��BH�=�	�7cZ0�*�q�V�f@8IL:������5�K9�A�$��a�	�q�q��]h�J�LX*i�c�t`!��~�a����p��������r�2p"�C��L`�TfdX�-�&�,3�����`4�a
T!�5NA�c��R�0��ۆ�#�b�2G I(H��t�?��r�\
�:�9GbP��)�I �&(�E�`!��1�0�!�BH��e�H�����s҄�URRR"
J5$����}gw�����b�;�Hjpuj�@��<�H��1�U~0�����t���S�t�[7�BG�S�aC/;��@��>F�ٻ7��=��wp*�	5_���	������N|�>�6��m�6��������! 0��󝞙$7]ܦK:�5�M��{좖�% =�V"b���HY��5c�r�8�0�L�S�txa�ۦ(�w�&r��ër��>��vҴ1�N��fYdPu����Lb�ZJq2v/\"XL+Tb��]������v(��<��l��4\�T盯�7G�>�αm��N1t�q�M�p����-IPD�	h
�F_��S��l��83���ң� �ܬ�G'6ˀ�I?uX�#+S���\��Ii)���U���|(t�#+�'&�#��Q�!H)�z}Ht>'#*|*��M���Vw�ֳ
�!PR�=�u�Fs�vĘ��>�h5qc�R5E4	�@M��#+�h�J�UBT�1Ĕ��D�eb� �fN���f����	��D!�h���)#+#+
e�����a�p6	4�`c@AE$1�R4	@I@H��G�"(�"�Y��Q��VN`�!) H�#+�+Z�A#*I)İ-H��� �@�P�p�%�XF�$�fL��d�1F#*�Q"F��4 4Pο�ܪv�'�7IX���W��ie�.���k�^��k�*�Ӭ��4ݛޓ�$�&�\|�w#�?����NK��Vbd'����#*Ÿ#+h�x�U8P*�XLR�T4I�QM Q1"�u��D�n*(�Ԡ8KF889-)����#��䚂�)Q:���@ЀM�	�����D1(�D�d�4�@�IA!H�)p��Đ����@�I�ą
%IE4B��0D�AT$AĤ�L�J��4�R�J�+�PATAK4@��2�1L@�1#*4�+TUPă5K���ADLL�LPLIAH�	SUMJ�C�#�42A)ȨJ�H#J�$�JD����@���ia]2)J!B�#G|��� ��(���q��������b��&�H6�jk;��[�h���з{'�P:�,,�x�L�-��#+%/��G+�	"HC૝]XqQ�pA��n�БPz#*�|�ZW��=�P-����)tum�p8�NḒ�5�j�tv}K~of�B���@�Ź��nC�_�КZ@4����#+��*���2���c�
�I_�Z�=�u�.�S���۔:Z���>9���P}3�DN�ҦB�i#*=�z�E��X��K^���<�Z-Hn��CD4ٚ�$:���[N1�ӂۥ3���������C��F���Q,�t?���{w��RO�b�"�c�~3�D�}��#*�e�t!A���&�';dY2,h�`�	��pw�N�|JOs�H]|ښ���m��#uG#+��ΑC�>�p�w祎��j��*
�fr@e�epqCa@PUUV�ʪ���(
��^����eR��D5�e@�%v�(u�̖N{��y7�+vZ��1�	�8͘vn �� $ƙ������v��X�,0km{��C_���
��/f��%P��3�^��֛�|�y"|��<`F!s�ğ�4\1^�XxN�e�%�� t�\#+ͺ/"����(���(70E�ɤ�����r3xI�ه1�~�OF���2��Yɽ��̳2#+’���]h#+5��F�再D�F��ԎB4tȗ#1��	$#9����(N�P���wo2Ɖ�pj�V�b
�(��`f+��D���S��8����!0����:G�A�AP�B����{�?��79�?R/)�Jӝ���h�R��>�!��D�i��]�t�v���y���Mn��K�'Q��)�R@���M�eC�������ᘅI>��E�M©�b�o!��$�i_����~�݋	I!�S-�u�����n�!�qW	�kX]�������C���x���ic�ڸ*�٠�־�����"Yt�5�j΋#*H0(��A:ڊ���t�����=�L����Q%�:A���Ӊ9�����䑭x.o>�v�)�����i(�s��+�͑�����Xԑ�	a�kU���A������#(	�i�C�G��AFM6�QP�V������!50ve�mh�b��(9�AP�u����;]a!�&u�6u���(D����I%�+�XUE!(a��>:��h��nL�$Jw,}�8�(gIQ��x�z>D�i1&�L#*������[}u�kX��X�,��3�x���x����#y,��xT��o
��i�{�H0)4?a�+AD��<&���Ô��K�\�#+S0�yb�)��r�)4���¤*���x��㕣�'(�.n��P�΍{sՆ��(rN��	<�g��񩫿��~]�/c�)o���=_����i��%N�z���'��:N��JVB"@B��+=�#+{��QujU�PUK�A�-&l����Ϫ}
\d@�Gb&��i(6\���*���I��h�i���k�FGS3���f\�dSQ#*�fE!'a���%��\a��Ώ!�MDUT�a|�n���2J���dI݃�s<i3vDLM��ij"�)��e��.Ee�fϱ�1�3&*H���؉Fʓ�4�w���8k�5��	��%�^Ɖ��N��\�r�$�H�a
=[#�����TӾ���?T�ӟN�ׂ���Q,��!B	�*����w��ݭ�L%�v@H��+�o��\&�+�j�H�<r��#+��圣�z��7!��så	�xj߭t�R���f�6�E�*�Y%�;ϟ��U�R�dbk�n���q�\X	K!q�fa�����ZѣhN ��(m��C{4�i��� ƚ�#*V��)����k�[p�$Wв��g�'��|܎@*D/�����Q�X����xz�4���k���� ƌ����$���Ȏ:&���sk90#*A���K���<t��t�<G�Qx��SC$��-$�2I8e
DنA
J����!P�AB9���A(�2�W��RRJ�*���1�z�5��Ѩ�3�`�����ΐ�Ӯ�R�sri7	H�)
dw��<4/�
0A���z����2��#+�҅,��#*'uφ���q��v#*�3��a.×A�IU�N@�pk����r#*	zR}^��w|j�����'#+�$�"S/��D���{�Dp�w�c P�&a�P3R1!ESCb#+�(x���!�<`T��fx��K��b��x��;���R��C%�m���Y�L�uQ�s(�'�Ji"��o%�mP��y�^7��P."�c9�.�p�������{��`
�����o��ռ��6�״$!`ۜ��$IO�z:3#+���gAC#�V�澃�=g�V�����3�N�}.���%�k�` �Ue�m.sPG�wr�.�v�#+čW?ǖ[����4�N@�Nv���Y��\
�Bth�S+�6Pq.�����ݴ9�2BG��@6��(d�#+j�lA��'�yN��G����:�N=�Z*�O�*d ��Jc"L�&B���F�@�(D�4/D8����wm�m?U
� ���	rB�Q!E��ʘ�g�ޛί]�םL�N� ��'���&���Z2��r:�NVr4���W��P�"�*s��Gii~�s�`h��C�V�~����y�E�y���=쵱��|z�`�AK9�
k�rl�l��o��B��G������#ϒ_�!ڟ�}��X�.�K:C+ ���r��e�ѴJ���S�n�ƾ<�To�\�**�05ƴ������,�	\��:����^a���\�Bsdi���	�x���Y����$GY,#*X��m����;(+p���=�p��(x�0_���>�=46��f�H�r$��%�8G�d���V⑳�x����#+rH�n]��ݨ)x����+�Cs�Ę��6���A���Z��^�H��8C����cN#*Y�^6�d�Z0*1�Rnz˚k�/��4ѳX�f�m�Z"�r���F�ԑ#H����qMl�U��j��A�:H-3��;B�6��.�Ȼ����L���AĈ�PP�Tu������lXͰ�����ӄ�˾<�LvMM��DI�[p�?�4�y�f�=���1���);O��2x��̺[���hrqL�/ޜ*���Ԕ�%3�d�*f�F$���&щo��%#*�?D�z٨�׃���@hT�A;�n��O�CD��!�����K��U���h�JM�ʈ��Jj&���B��G'bZ$�C	5"&�Ȁ�$T���(�(�$ɿ&�Q�xl,9�� �L��N����_{��z��bjx�D"Tp��@ɐMHV8�/�uѰ#+2��#+���D�Q]���U�b��Jr����}gaN�?]��q.k���?q�)��#�h	JV���2I\��c�^$<�M$�`�D�KB��Q��#*
��!ש��8��Z��@�c ���&��P)��#��Q��KM vU1Z��#*J�O>�+PZg���˱8�i��IS�����d!,��KD�!N!h�'uC�W]zTY�icH��Q���·�9i2d6E�#*r�����$Γ�3ٗ�zÊĤ>#� 
�30�&6�Tm���a�K�@Q^����GD�L���!��@��#��Jyu��8��#+@��ɛ��� q�`7���F=@��=��	������?.�8�r����u��q�]B�T�(<�z��[�A5e���Q

�%��I*B� ���hf�$q������y�+��V��j(��E��,�'G�E`G.?.~�Jo�x^-��#cP�h�>l�Ɗ�{�k	�8�E5����Qb� e�y�M�2p;�Chd$4TDP(wkDD8�F�(i�tU����#+2
�G��/��n���
���I$�ET���fmX���}�9-��j9U��8<�Cڔ���TT4�c�U��k��"?��i��4�kr��&Ϟ˹�_�yՀ��?8���30I��>T="�q�#��!m�U*,�I��A��s�v�ɑ͉&��� �~�S.S����K���4rC,����~Vש�6�J �m�go������cyv84&=I���R�lK�L�'�S�;�Ι��%q�9�����k=;�}ER�U
P4P5TA3 B
H
LSL����D
#*��L�f!d����`���"�� H�� �P�BJ"D�jFD�%B(&FBYDiJ( *�������g�p=<<C��R$�!�/*������Zl�V�)��Q��G���`�B
�q߫"��℈SALI�B#*��"��X�8�?�a�x�i_��)��fd�Dk�q��E>���zɨ��|��cvŞ�
�N_���^����61����tW��6�<��,}� A�ھ�C#+��JG�2Q%��ɲD7�]�=�(l��@�A{9o�d��<��b~��j4g��zO}�+߬^蠡�e4F��B楦'��d/Դ�L�)�����S̉��o$`;N	DkY��*��t�j45�w2:�܈fL��y��U۴�x�ƾ�3�`���d^8�MPa(@wmp���Ž�Fڳ���}nk=P#+;������G�<3b��3ZX���)����h<t}�[Q��{���t��X�h�"H���1����$$�HL�[_՞۱���z%p�Tئ���I��m��u
���a8��jr���UV�hB^��Ң]�\��m�)�������8#+#+=Q��D�4'��;wmr�!��<4xHn0]��V�M#G�:*�4�E#*P�,h�+!9�ލẖi���cM�(�V|YLg���6�sXf���7�d���6�C��ĄFjiow	9�����sts	d.��t,�!B4~��%?��#+����x�>QԈ"�8�A� �u�"m�W��w���᳄C�[#䠒7�KձfcT�Z;;҂{X}a�y�L���NEp�=ع�#)�ayы�󻚔A���C�@�$��	0��40D"�#+�D	I��Y�J/��t�c���\�OU%�҈�#*({��U5ϵ0��<�I	C�%#��-uN�M��&N�L��&S PŸj`}>��:뚩Ց�K�
���BD%��dbZw#3�4t�{������H�U#*>%�"-,B�^�gv��a��Cv1�D$?L{,��P&j��cG�3AB��ʝf�;���m5�T��S�f�66�����i�9xX�]YiA��e�V���F��I$���!��=��a�m�#*:~�3��l%Υk�@�j-2�~a�bif���܊)��z�ez1W#+�P���YS��Q3(��+%'�����
�/�j�#�$�c�`l!'p�R(C�H��oD�q��m1���cwٹ[#+�q
t��vh-Ec�\��A�H�r{q:Nى�%k3�L5%�C,#*̮������a3�O&D����Oٝ:��,��[�}d����q|7��cn.h-;��?��'7$wc��_,�s��h�U�T��c�����>�����m�`�;P�h��,�G�R�D���R�1@�Mtld�-�,�w��PxkL�Ȉ؈:�#*�O�z`a���|N0N��#+�Ҷ.�#*���Ϲ����"�)� �#��HmS��g#*#��G�I\E��>,s����@��DŲ9���<�}�����ߚ#�Jӈ���i �7jEh�J�DI���@�#+0�h���2E��+��X�P��C?/��}��R�]�/�D<}�������G�<��ee��e#+�fIF�#*�Q�l��֐��-O��@�c\�C�p��Y=�M�R��i�GR
��ݰ�sc9
T��� �y�J�.�6��*H'\alp�ncb��q��i��i�ZBA�5��Vl��8�m��%d:<K�Q��6�A#l{#+Sm`���#�4�zz���!U�"Y�4lHe�)���y�����j$!��dɤ���w�.���d�c��Z5��|���x��# ���5.M#+?Zq"�ũ-��#*����%"m�^H	 �,0()a�hB (��H%S�A�	f&AN1JaA�4H�=��<��#��,�vpj�Ο٥@
u�Z�Y#+��jE;_<�=3ϐ+�RY񍍴:�� �/�	!W��B�@�#��	��q�Ļ���aםq�n�-HJ@�+���}�w��;�����jH&L��#91�L?��&
0��ݱ�W\�G9���"kn�D�	�0U�mUT����n�˄��i�4��܅����D�yTnˈL�Jb�@�#q�R���Ա/}������qm�3�p#*��yn�̓xvg=s��5�7_���ո�r}��>#y�42#*~U��<��Hܤ����1ӿ�ω௳�@�@*z�(����{|X�������#*���9��5��e�����j|��}��Ǹ�3i��6�Tߏ"@�}��pag|�r��X�B\r5��[5#*��/��J�!D����h�M�&#B��y�<W;��SFUš��	�β���HAm#*�dlCi�7d.��;�w�aQ�FB�
���x
������j���	o�:�O�;{>�����N��XY�bg��5����ֳC��Ej���fl T"U�,���8�i�#�����>'���_3�c�Q����#��u����J($��f�\Q��r����$_>{s��վZ��Y�\S���朔�a�Q��1�_6�sZ�B`�i��\^#c�@!���2���S"�����eFu��#*
"o�=�A��񏴂P�C#+:X4	��5�PR C�!�C4�bB�@�"�(I����#INj�*��C�	0R*H�P�n�g���>�#+��{��{K<dkG��U�cq��K�z�-4_�����FL~?ߘ�w�>؄a�b
�H�,~vw�0�|2��f	@��4�� �&6�Y�"��&#*i���^|�E�:�K!e(1�>��:���~gڃ����.v�M��27�9_�xճ�'��L�� Y�99��]������W��r]���ld�#*'Q��:�{���.nDyW�߶�{�O�}�����c6Ñ��Pq[�^����e��WF!3���8@#��{s]H�j\�d��T^������_�D�yA3A�Q�sh!���󼱈2 wE����#+]��]K��CQ�V��Ë����N�#+
�"�i�e��R��o`�P��&Q3�� {���Cxn�S�#*��ND�ʸ���gvwq�����c��&��?#*Tˆ�����j���+�k�Z��K�&�}�/�s\��6B�Z|vpжs���2��84����@` !�p�Đ;3�7}m�j�Զ������"u�ZE�7� �b���35E����4;��љ�$�N���e�\���3�3~����!��@H���@��x6����ߵ�l��#*����(򡃡V����[S�#g�C*����e#*�dlA���5�#*�v�͓�fx&)�m�k6����ؒ��<U:�q�m�V�N.F��L^��hH{N��"t��|���\E���:@ �!a�=o��QuǴ���8"(#+��Bay�J
��P�h���ZZD#*F@
H�Re8�q�Ǫ��s�.U
����,UP�MM�#ס�Õ��g" ܳ�nбa��|#*En��Z�q�N8��Tl��#*����@�Wr
|��)�=�i	�R��e���6��$���r��=A�;�1#*NR����aBHQ�<��p�<�C���Dl��xbBQR����{ο#+?��� t#*���vb�#b�}�3�����r�c�f<�yeEn)`���o3u��F4��ڷ���X/����޽Kd$����l�4C�c1a8u'���c�ss��lƏ��#+�VڔRz�$n�_&?����m��b���	
�i*h���^
����y��XD��zP�\#+P��ElVƵ�Ĺ���8siJ!�
:6�c=��lI��8��?/O�ۏ�s�y��Ȓ�#	"P�f7�J��b:C��1��[Z���ª�۟3_]���&Gە��3���2����П���˯�4��� �
#g��[F4%�����GQ��&Nh3?����#���@���%N�̔d�ĺ:�n�`�T�#+���'0gM(k0'2�`P���@�ʍ�3�-{4=��� �l$2�:�9c@��Td0ѡ`<KD#2ġ124�BDB@m%'���bF��s�{p�E#+�lL8a��[5�<#d`�m��=]f#*���"�#+��Q(�d�D0�MD�����<yow�M��kX����P�
��#+A���`���Y�a��L�&f1�Z:�rA4�V[�eߎs�&BAUd���u����&	����%	!h�biH���%��F�"���3+e��XC�-$�E%d4\a�5��uۃAP���px��*b *�X�eN��e�M�i�:��u�š�:L�c��
�H�tqK�9!8���#*�6��E#+0��A�Ea"�b�h{"��Bi�a�M�#E#*����H�y�j#x�V��q�������!�E�2)(��Zh1ˤ�eq�\6��:M#*Z�q�ek,�0����A��2�9����L9`��dL(�6ž#+9��adU�@��q�m.�T�i-+@6�;h��M0�0c3��3~�v#*o�w�)8�� =9aZwI�ZC�1dW�y�Hi��i�e�Wp0�q�ܚ0�d(xU:��koM:]Q2{qbX�g����V�rp��ˆ��x2�V���,M�5*Df�..@�\ŏ('�iuKfA5O�ka�-'O��4�(��@����������Ć�m�nUH+㫺w^�v y�P�ia�*�@��4r�$7Fm�j0��R�Ԝ����ԃ�X�Ҧk��v����q�ذ�	p�G2�x������{=~�3�|:%P�m�bP��"@bq�I����D�6��MA9S�ZHɁ	QiH��P�o�y�#\�*&�P`1�#*P#��%�6"kPq�4K�:M8tM�[C��l��Ӫ��@��X����֨��#*�w�(��52�w�kV#�Ň�S�5M���4F1��>ם�t�ο��,�fHu��L&!H���T)	�SD+?N5��s�I�:a-`������#�3R�P�)�J̡�]\��ħ�.���"7C��-Iꦚ��N����a���ѯ�[���s�n�B�Di�ۆ���sg�ln;(�#+�#��s�!-=ΐ�M �! ��;L����ӣd�L�es=4�h��Ͼ�{��:���(QҊ;�ٙ#���fИQ�����������}9.q_EՐ:=W<{�#+�����d���<.!�=�Ё��E����I0:vf�_�=0��1o]�ne	wF�Z:����s�u�č�5=M+���b0��#+�L�����ֲ�g�� ;@�����j$��#+�c	и�N�?q4�=� A(�x������h2�l��ņ֍ZVIHL��2h%�XP��"Cp��Ȧe�5A�I�A3P��&YPـ$@�	�L���.�BP��[a��FXoS���8���,jC--5̩����+
0R83* D#q�YpG���b6�B<gK=�9)*B!t�!�@�t���#+]����:ـdb,�<B� аL�E�����h��f	hP���#+R���Fd)��Y���	�""�f�""��RB�#+�V�Q�䰏���x<�(\�PĢTATD���ǿ��?-�~����y�I=w!�v/������
���6d�P�u���#+�*!R�S��)Mb`J�@ē $"��T0B%�1Ib�G�y�8��0��|��2q"�I�#+|LC��{�5�����7��9��i1A��V1�#+x��D��߾=�cz��s���@���Pf��^;z�Q�C΂�N����^�2�!��~qE�/��d:�?#*a(�\u�f,X��.u��@c+�1�	�7	�iV��A�L2���H$�U��p�w\�����Nw1�|�.�&�fK3��=���v��k�IZ0&[F5���VB6��8��S��p������8*ɭa��3��6�SaK?��!#���0NE�3#*�̄M�5��1��׷[���j�ֳ��wG%�	��SE|K��H�L�u_�b����Ig�HǦ�n�؇���8���H���NŴ��q�u�$�g��z���/�_�jd��8Ђ����T��r�!�4�m��<@���=�)H����*R�d#+#*x�{~d=��Ö{�E�@�A
�[_�������cA����&ʄ���~F�$�iW	ph�S�	�J ѣP��;JD~�h�i�l4�A�h#�U�-�+C��CY�#*!�D.`q��{c-J�I�I�dz����U^T�KXA�L����"#+ۈիXb舷���A�Ц$�#�!���$��QRF��:?�05�
R9�@#*�l🗘[;�BI2F'X��L�q��^�`!��B��>7=Id�"���{�kZLe�h��6��v���o�)ɷ�k v�С^PQ�h�&�$��v �T��<����*��}�Dt&��r�������>'�;|�������>Opt�/��Fa>~��.�*� !���!οCd�%�,�n}O}9B�www)���	��|�2��#*��`���x�n�;��w��p��%�h�H�������Zo8�V��H�}��$40e	Ihy��GdXDF1I��I�֖%t<�>��x���T�D@p�'Y�Gn�J�,B����T�ec�(ȍ2���рċ���/����}s�=I���Na� d�Bb9�ހZ�p�+�i)Z�PLS�3�(W�����!^�3(��A�$la��Ӡ#����)cv�u�-�iƀ���T�6��&�Y����5.C
 �PU#*%-Rh�%#+R��Ѣ��#��2\�p�0�A�CRd�F
�H̔aZA�F�4*ـ� �I
bb1%
CBj3)���g)��02\#+�0!�)��i2W!?���t��QD�n.����ݿψ�VL��s�)c%���ȇB���@A�7�:X ��P��t@K����G�PN�(�LvOX� 6WҐn��$��C_#*���T�\.HWqo&M>[_4*�(�B�P<y:g��h>��R}��iNc�t#+�*�)EP Q32��� ��k!B����d�A&D:߇��Hq$�HPL”(1)T2rI�)�AB��ij�I0�0 %�Jc0X����Q	1�/���>�]���(c�+k�2��h� �R��߅iCA\�:6�X���#+(5��!B�R(a����th�!C#+	�c��
���NIO�:�¿��o^_q� �(H&G1�60<����c��#**���U
yV�#+����4#+J��!n=���]4;H�	�M
u���($"bF�@����`B��#*�C����	a
��LB��"H���ٰ���=8�k�g��;!���%�	���������=�P��>��WϷ��7��o��ˇۀO����v��/�0�v藹��#�Y�8C gHb����X	Fh������ۃL�:?M%tA�%��;U�
�O�I=PkS��\�b�rF28��̩T1�A�H@F��r���Ӕ�`)i�Ԧ�0�F:ě��*;"=�j�-X���X`D�Z�j�J��2V�]���Mo@潧M!$N#c�z�R;�X7o��L�$0�H#*4���.��[���EV���H���c�l�(�\��D�
J	@nU�l�K0�T`\Վ(��ƴc,�9*�Ro߽4�h�h��cVw��گ��t�d���V(PpU�6��]:0�\�)��_��=Čc#+h�)��,��2y������&B�A�B##*�jP�R@�b"�PW�����o���p��v?Q!e���l!�cH4�'C����آ�T2d�@t�f��8i�u,�M+��ȋ!�)fB���fY�$�P c��֞�4f7$�"�?�˧�X�P����~�H5����8$V�ro6�9%%�*ڶ&%�j��jxp�t�ς����~
���7�eJqT��	��@��h��g�Q�R��$@�’#+����#0�H4�^��=����r��fW�s_�����e�6��Oo�ok���D���Rd8E�S�Œx:<��
��
C0������g����!̑��m_	$LRR�%D�K~h�b��7�[#H�P=.�Ė�9:O�N�Mi۠3���1	���I�0��G"#*s˾V*�f�f?T��K��#�65���΁X��-a�i�G��E��x(���.��_o�[��@�%���_&62j����/��$.���p҉�6y��+��_�#*�*��l��Oq���P�4���������FqִS:���]���V.��*�B\�ox�kF��7!�c@�*h��p�N��	��88laD�5�삒˄�<%��f��"�*[�gX�f�=_�F�sq���*�	`�oR������fH�<����P������L�@�)�w�����m;�N�OdBh��}~�~o�)
 c
�[AGa�`���D�09cc�AÚy#*_?RY���E)�&�lY����U(,�&R�K���B��T*��0���o��}�#*�knxP���Pˋ�>z;�^�`�	�!û��v{��>e��Ez��gĶ#+���Q�+;_ϼ�}���SH�n��q�����DG�4L����{R�N�:������|P<��/C}濫������?��p�^u؂0v(��%f2�#*�I
�T�F�6'iG �y_"
�Ьk�9���`����5�{m��_����䔒L�����k�a$lS�J�,
c##��n�ID���='*���^O"����tMM5C�E:�VY+����^4#*�hg�^�I��[�P�w�h!&�4kz�l8���v:�gi�A�:��a@T*��*�Y�.�?-޺���[�k�q���&�tuX#*��ܽ�;�e�������b: o~���BI0d89�!�	ra���]��=��U�!����o�"BI%��V
�
	�8�̘t΅�"۠�c�Lo�Ȣ���ƭ�[>�?ϔ+0=����H��l�I����C�ZG��7����R/� ��EB�)"T�@(t�-W@4#+yz�k��{�gɃ�|C�d5�b��ϴc�g2�>#ʜe��{�Mnrّ݁�ֈ�ɔ��,��>��9�2��SWXa^�#g�C�hL�Wq�aWm����������J�q���x��9H+��\$���9![4�0�� *Qơr	z��D�<���Y�Ea��5FYx�:��`�����=yE}*��"s��P �|�XC��Q5�����+�p���?mHʚ!��#+��hyD�2}0�/���Z��k��K����jZ	D<�*9ax8��ϧGXb���aJ�`W@���+f��.��=���䭍�!B��É$�Η�}ࠩ��T;�f�>v�,*N�)�E���S�{D�=��+	h���#*�u/o1|�Ѐhpgrea�T�/�8�r5�9hڟ�݌Th�Hpp�F�3	ಉ��%�h_��ޙ����޸�߄�~�?��˞y7�S~�i�u5ec�"̈�j���O��ß�6�N84��+l�'|�缿��O�U#c	����CyA��Ŗ��M�٠?��#*�غ�#vPC!#*�4!����lB�Z��P�G��A�?9���3��Iޘ��b���=�5(�R%*���#D��H�)�D�J�D(��,��ûHox���# 1ߟ��T��w@ I"�o��?��ӡ_����&X��#+*�) �*���B$jiff�`�"fj���%�*b������#+�Jz���HBL7ܛ���������)I&��d�ᯇggТ�(к�}"���J��Λ�'ؾ�@K=�VI+��SXy۲�/�e{�����3���N�l=�Eؚ����{I&g3U��7��a�۵�].�wy�:�!�)FYDչ5o���`�Ya8����ܴ�1��>�Ix%������;�?��r�#-ዜ�"�����FAH� ��M����EYdi����@L���T��IJE�z�:%��e�@�a�U��9��Vpi�"D���ˀ0ԏA#+��1c"�+I#+�B�H�I�odJ��9bO��i'_�7#+���(L��Ȉ2��3,L����>{��E�2R�=1�C�-��E��!1��I�W,��*���F2��r����q�+]]a�9R��5���ُ�J��⮐��bz#+W�p���y�(�CZ�EImv4DN&�
!)ԡ�-��UEfY�u��c��MG�U!��($6Rԁ���l��i-@DCtF�X�de����E��D��-QD+��8�ai�k*���U����2�¤7�¤FQ�"H���:���F6Cp#*�%+5!���%#�5B��9a����1��=�����S\<����I�p`�.�ѳۄ\�k�:�l*l���j�k(U�#�cn9�#E��!K�YX��q��oF��[�/��OS�%u ܬv�8�0����R0��H8Ҁ��fh��)�#+h�cM�u�17�u�5b`27nGF����iH�ɵ�$��`R3��"�I�Q��›�Mke�"J4ClZgt�3��(�80�;��sȶwah�l0�(j[E�R��7�!f&�.��HQ��1�)#*�<ږg u���#*f�%1�H��Da���&?�����<�|j:��m�#*G b%�����f�q�]w0�I�(m�wݬx8�G�`UT��a�"�2:��&�A4>E�Zfb�dF�s�di���Bi�s�Z9��xAFea�HdG;����EDf�6C�V4�
{�[���#�HwH�.�MNF���c�CtC�pmz�Lh)��^]\���Rʺj��%"ax7�Wk�1(8h8](�t�tkd,�� ޫ��4*`�ѝ=�ҽ{S�T�D?%TJ���UX�$c	��IPcµdkx���;�ܔ�U"��T!-�-�q�0'p�{ӿ{��?R�M�Tn&.ru����dwP�3"! \����.y^�����.5=�+o�����aY
�L.'d�!vh2?(�j	�� �d<	�_;ޒ��}��(�ax��*]�F�
OiKY"�/�V�	*����xr�`ԑ5Q
<ԅg�5�U�:E�-#]��d�F��J�F�����#���wZ�0D擹�(��%��������/���Ž�Rbط[�#��JI���'%m�h �����?������=�l�1$��'Ikdc.I�q��O(S��s#�֨����"H��>�8�o��9��$�4��8�#+:��-=�ޮl�>P8��;.��BָmS��Ms9T����G���us۷���/Lw����]����N'��L��㱃q(����6����GJteP���i�#+�\���Fȕ��'h�zI@�mQ;Xq�\/�/�V\�,���cv���n�A]L#*U�Iۈk4��l��I!��6���pg],B&�8I"�����s���Zc퓄��o�����.��Ө�H�z���u���P%9�����n8���5�w��TF�.�5j\I�#+�#^04�SC�0m#vV���B-�ICŒ:���4A����SR9#�Ѩ2]@Ma+U�H@d
JR���0M���XMRO�c1i`�#*��(�OH��1�\>o���l�����!
��
�$B@]o�?����	2i���U��dN�5<��`_Lh!
|2{���	�|��RU�:�@0M1�	��YO|����B��.a@�A��X��?"ڐ��PМ��8 i@�T#+Q0
�0j��;��&�#�p���>J�~AR(;�OJ"�ʪ�}'�����&�?G�	��B�S�^P;y t�)y� �
�Ř����T8���C��q7��wRn;tFtED�H>Ԓ1R�R�,RPP�)DD��	0DDL�"TH�H�H@��H%B��C��}r��̕�
ND6��X\1��i#*����P�+#+7($���-�Q�a��&B�X�4j�V������Z x�8$$#+#+�P�p��@dG=�!�L���g�:kj�����2Ĥ�1#+�`a��C!#g�[�WQM�%>|�s�'uO�����|s�i��eW���D2��M�y2�.u�o�Bp�A�Gm8��lp��w^��h��dͪyoQ�<�IvLG����c�� 4nlҝ-^6��m��=�}�
ORS4F�l-٣�I,�1q�k��(Q�hD\�p�*呐0B�ȇ��F�l\�s@�r0U�0q�m��+ch����߼;J �R2�[�ZQ�#+s*�MQg{}`U=!����H@�����y⯫��샵��������7��&�g�S/�	�(+.sq*��)׷���=v�F>:>�L�m�T�v����]���m�oEܜp�w��g)��yFE��4��}��y��#�L~�hz?�0��I�w�+[8��^:�~Nџ(��C�)v]�Tb7E q#+��8�te���5�Xk�Nz`ɖ؞1�:8�#����f�NRN�����Z|M>�s]_���Ћc�''Y��؃��A]�K&M�{��z���/9�����Ys�@�s>Om\,,`ou���q��ѵW���D$7��I�*}�K��}�����%3���9��{+�/k��O�#*��e;��#+�1E<���;D]�Q�
&8���31�w���Z���sz*���$��؜�Q�^�#+dw��j?��v�� �����|����<�����6}���Z2q��SvG���6x'n |��;M׿oH-6U����t":)��#+f��{)Əg�l��3�O��Ck��q;f�k|�9�8HL��.ӡ- @�<�rƉ;F�q����pi��ռ�.������<l�KF343��f�;WW�7��>;1�q29\-�8��L�!9���ާ�6���n;��K���ų�7^5Xa�#+���c#+��Ҧ���e�l�,��t�F#*��LX���46����ㇾ����[&{�N�7#��/2J�(��7�K8y�~5P�e�0���0!�-��7���m#+J2E��j=�kV�4�A�SX�k`��`��q�R�w����n��^$�lq�~W��BN��r��<{���U��uPw�6]��
�8�Ok،�M;?Tۍ��S������{��βsOZ��0tGxĨ}�+&��2��zur^�^S]g��31�60�3���w���#�w5A�-����]=����;'ñ��t���b7����r�I"pvH1�M�����h�ȧ��QС�y�%���k�p�A�@�nG��cj"!�k�D�&H�r�}#�X���NC&��ݙ�8؟�A�n��Tp‚�B��@�#+�f,�$㘺n8�y¹μPP��Ƕ�����SP�����ف�h�3Ωӥ�DsJ]G\;x�3I���T�!R����� 4�P�)BE�� �@0:�4"D���{N\�tˣ�8~Bg�v��u
��y���PI�m�A�	��}�K��h�W�|톄#+EX�ȉ#+���q�����N5�}�2�LS��S�HB�,��,�Nh���|c����*����i[����[�ߣYAZr�p�ia�#*��t6Ӯƥ��j��NҨL��@L������5������s�C������wT�u�)4�'%�:M�^r�g��8�l����^�#+�G�9��	}We"G]�=Q����#:F^;du�l�!냿�m5�:����n11���FI$�~LJn�'��^�������Lp}���3֘��bY|����Ͷ�|y4\##���T��Ӫz���D�#�0�\�T���Q�(�3V����J^�����ܧ��S]�{w��P&�n�/Y����u�>ۍ�p��&��fYB����9���2G�,���'{Ԯʹv[�7�o��;N�!����a�ut꼺m��Gd׶[�\8[��66�\�6K���: ��f����v�ۻ�Kt��O��b�&`�K��xb��7������X��+v�^0|+]h��/u�#�y���s�f�Bi�cy�ѽ<6�L�!Ǣ*j@��MA530�d��'���.x	�	E�Q�JK���pUN;��L�)��=#*6V�g�v��z��h���gl0�7��G^��4&D��̼u�c�����ȡ�՘y�Wִ�K�9�R�`�����چ�����̳3:;��%\(�B1ݣ N[���1f2��/���%!�t!en�qO+���h��/�AɌ$�:��w�9����lu@�rk� sÊ(��l�IԺj��G�?/�<���w�_إ��ʣƿtZ�z-��H����|O>�q}b���z#*���o
�8^�ؼ�?w�M���ޝ�ɍ:渁xtC��z����ϐXaF����Ӣl��W��=;����#* �#*.Y%
A�0�ɠA֍�f��F�d�#���#��sEi8YDd�f4��c���4��H���V���uk�A�ʍ }R��;�%hQ@�(��#*������@����#+,� v+���o��4Ǭ߳�e�F���d赫S���h��˫$��&�i�0��*�RP��#@.��.�5����ƭ#�~�}y�Æ���oQ�����^Tb���4܄���o�\�f������4*���h��!F�r`�g���jR��kɠ�(�"���F�\,��@�#�`MB^ɢ4m�H�zć�\e�#+�C�9MK��j��.0�kFeƜ;;�dh�H�aR��)NΒK%l��P�>zcv�*^�P��^�=C8�l�fK-"L�ǡݽ7�c2@�k4�.�]�ō�V��pu�F�HcQtf��ms�F�:�ě�77����W&�X�F�Zj��n˩n�s82�;��M֤�Q����^�� r���
=H�p61������}ݖT"��8 ʱ2
B*,���4�"���.hl�33R����[!oO��sB�'mJJ]�6�z4ƀ�h�RCC�,�V橢=�C�Ӄm�C4�thӳx�öf�8����jF�������5�h�d�_�ZL�:�����2�l�Z q�1��L�ֳ�kl鶜|�Q��o��G�͹5\�c�:7�u�>�:��:5������X0����h���g1�j5�R��б�b��\c�3���|�����Jn8u"�^���C���m�qA�kI�ߔ���;*���Ru�h$b�r-w�W�S������ɲ�Kq�NG�%����h|����IN����6х�}�V����I+#�����%�ƈ�fΑT�nV�\j�������]uj�xu�b ���g	��t#*�e�i�t!�N��ʧo����s�/�MD�ؔ�-�A�Fh��Cf�����!�aCT,F8�E�#��#�Lq2���]���Q��+"_�LG�y�����i�8�B4��O�;cm��#*�|��)��㫣<���7���صL_	���O��'�U]?��7��Hm-�K�5|�?`���O5���y6h�^GNЀ�0�4�I#���@y���s>�"+*j�<u�𑍡�9$l����v����ٺ��Y�2BH������{<x8����Ȟڪ�1�ڰ6x|"�Gq���5���vUp�T�H���u~#wG6L����u��5�:B9>�P��/+�Bx�%�FVF(��+����4�P$v�<�\��(� |�^�Fi�6F2-U �R��PRQM�AI�J��D!$��2DB�DS114���A,�
RI
PT�PAL�RKPRIA2R�$Q#*RE$�TԓDPL� �DA�C�ǜ��w��ٸp/�U�X>]S��u��i��N:��♌��WB#���}��C�<�`T��Ȃg�~#8�I4��&6��sH��t�rx�z��J��h;��z���Ě��u�#*e�C5���{���9TS�n��5�iL��%���/�cB�0+���Ee�@����UM�dD�B�(+�Q��������İeYX�&E/И�#+���8C����GD�<�%��ԫ��y&�EѩQ2"7���9��Ѣ�j&r��b�(��E�v9H�˫VE0S�;�)�L
��"n�Y��.Jr4#*\be?E���c	7�����N���R&���"Z�ŃF4=h��:�LUҝ�X��A#+8� ��(��-y�����D�BGL	#*>8#*D�w 5�����k����4:��b�&�2&�w�M,2��C��3oIq����m����-{0�;@<�M4A�����v
�S�3)�����rrr�$�&�Ka��a��H��������^�:�CM
R�B@zv�C�"b����>!�����C�ѿk���x�u sD�����#*���%���J���N�#+���‡F٬\������m��#*|"6�a��������+3y�p!����|�l;�(e:HHJ��_o�z?�b��:K8VӴ27F��`��
�#+i4��ʔ�w�6[^�@`z�>y�"��}�5���,)�:\�Ҽq�Ǭ��N:tٱ����J�
�p�A(�m��z��.;W��2vD�&%zS�3Z����8`ˇ���H���6)>�9)2�@�NM�as%H$`p<�N�K�3%�Vj3�~6��V��Rf�8v��F&0�D�%�yQ^���e#*5P�2щ���#d���'��xyNX�!Ej��-s�����##*E������3*Eh&R5a����N�ЍL��!S��F��iq��@��#*#*J6��;��Ԯ��ewl� �V��s�Ӣ���[��W���⏔���(�����U��t�����ɭ��x��|K�F�S�"n�ɺ�&��P��MiU��4�����Ƴ
Ѻm�
��)���C1�K�i�����k\�m`�0��Q	R�4#+u�p�\t:'��v��ޗL
��E%;��;Y�0��̊GZ�/��EĹ��)]#*n�;kۑ���J��As�e�ևnyo��GE��*�j��Q��3��'
�QO1�
������ð��ؑ��Z�c�!Ν�z|�nU���6��jY9�RF�� ���==:�li�bbn��^��3z�s�*XhbE�mD#*��V#*���l�Y�kS���?'�۝փ[���s��+#*$J�P�����豖��ey���o�q�7���`��[��7L;tx:v�o���v炘%�gk'H[��#�#*N:�7O��J��r�ç]iCa�6�4���M��L�H�-k��q�c�uT�%m>RM�|:�yK�ʸ�����]�-q��c�8g��}G��R�ZL����#*��#*"�{"yѱ��SIK3:��U.& �8Z:=#*$5kdtf�9��!�(�$�bg��Oh�;.��X���|�OE�g�z�So��!��v���X8}f�;@�Ž@��f�؜��{���ܩ63:��6 ��<,3��U1�Z鳚��(�$��;KS7d�u)�V:Uص�������s�D�0c1��X<���2�m��Li��i�	�tI+{�m�Ӵ�4��]��:�!�Y�x����Hc�(n����(�~TOH�+�p�P��>��}ܴQ�!�a�z3!3�y5vv6��%8��R�}� 7M������n|Iv���9��g��bN��y9�y21�m��c;�D�#SC����#*-V�j.P )=�K�<&�2�P`�z��u�1I��+It3y�s�#*��X���bH��F��B���M�g��x��l�,�5(�S&1��vD�$��}����Ӛ}�$�+��Ga3����4j����E���(�r�CQ3#*��f�z�udB ���s��A%"� YC��*E�NΉ]��@��?�Q�7�=�Q�E�j�ſ��4�dab�4�5$�/�5�/]8���ΗM��^���>��n%�u�m�&��Q��o8d�1i�e�Gu�����r�Q�
���N�ᘝ�����ck�jDi���
B�L���T���*����2�w�i*�ц�ɍ��f4��X@�D�I�����6uc|�J��A��/�`�`���3>G<�Z����4���,�Mg�A"av�d�j2�ИFڌvc�,�ʅhl��`o����?\�!ŏʪ�\���2���1�V��r4�x=���@p��TuC�I����]D��#*|�gA�(7���pݐ�V�����6O�1�vz&n�:� `���+i��!.uB�"�[��#+u	":���.�]$h9k���E2UD�Ж�%�z)� ���&�;0ME�K�BhS�^�޳F����b"4M5�6�nfd2�4����1�(�Иtw�Q��F2H�j�8c�)"$C`##S0;�H�08Ch�Ԅ0MC�Ш���"J���)��Q�,�t"�$)]��%;Ʃ��X,�0Y�n@���%�?
||WO������Ƕ48�#	 Fxg.벎�p���;�<|��#+��!"&qT*.�/����tE0}C�K���#�b±-��Ǚf�~:��A�k�S���)�������H��IF[b�-��7�li3�ӗt1M������scE�y/G�ǔr괩Q�)
�4s��*T��t��@{0Ƅ6%�b�g�Q�}��ȳ��|���G�v�dt���K"��N���3��÷�����'�J-#+3m�Y��=�Q�[sw�ߕ���F#�#+R�6�|�UXDm�z6IڗM}oZ'W�oY���l/|ox2ҋ�������wB�����a�z��&�I��l�#·�%�����0�xd�7��)2�d%P4{#A�I�(����B�ӺT2���0�cFe,�#+�%1�Vh�����5��4�#*�G�#!K(�G��a�cN�F2����e��f�؞�(m$����*1�e}�a�ًI10��,
9�16$�����t���=A<���6� ���T9�GfI�C�b%b�#=W�lؔ]lX�[��v���+c@�c���M	���ȳ\��#*P�p�H
�4�e+w���>f4V��_&�(�����_������!~��`4����ԙza�&NE��2�=���!��n'<�*0#֢�}Y����K陎`b:'*����:��$�R��j9G1�����M`\�NB,\�@P�LQ�6�clc��]��2�2�����>�P=�Q���A@���(EĦHP�D.�OÁ�Eu#�;��4s�\�4��؈\X D�:�U4����	�B�a3'��T_�(�&�y��C��#+�F�o�#*
DQB�TB�5���{�㏟g�?:$H��#+2( %D�x�î����0�)��I�o���p�ĚSMP�ptTP�?k������ĩ#*69H"�� #�4�aCf���L���,�(0��ƈdN(�J�]����@�p:nul�
H.bY�e���yxs�NGxoq���V��^�?��8�L^�;�HV�YLi�3��(�Y dxGw[d�;.dT &$����a�e�V�b?9>u����I=�ʭ�&J��1��ֺ°�^�<xt�`:^�r��
D؇��7X����nƲL�w���7 -~��.�B`�#*��va�F�~�h�y��`΢%m��Y�=a{c�iTp:D#+�z+��mՌ `Vz!��r�z!�����(!�v��-�(��N8@�U3�Mx��!v_�G�?�~'�z�������9���I%B��B`��j����E)������ ���P���C!��N9	�@�u�?��:���Ux#+ǯ���l������]]]�}����p�\{p�[!0I�F}H�2��Ӽ;�g.�@�#��+���"H@oJ�H�h�e�g=�
]������óù,<W}��#+1i�~c�,Q�#��#*���l1;��4F��x�����9bع�i^��pΩP�	@jD��J�S��p��a&YvgM�Ot�CXV�ƭss#M6�a9����D1Z�ո2L�	C#+�a�GSR�s��S���/��	#!;��k���NMC((���AKK	66�K
�����1J}�(�aT�@�����2J�D(@�����*0|{)i6�ݿ�m�q����=a��1�� f���>�"� �`D���=��"D�{Jk�a�x��QTI�\�A�7���8�}�~��\�E�E����u)��xM;ѶG����Y��!u*-�]��~�����]`s��#+("/��Q{�I@U{+��������o�op4h�F���
G0%!"F��X2Sx����E�=Ĵ=�ޔ=4P8�xP&�Nl9y3,;�Ma�EQMJR1QUSTfd���ը5����{ր�0�Ye��#*�8�T��iRd�&B`����0‡��!	��q�s~��|�������Ǽ=d���4�\/��	�����	JP,P°�mg�|�C�qJQ

�ģT2LH�|�AKG�O�JUM!R4�
C#+�,*(�ԟ�T�:��s��-�v�~�]x@��1}�OCha���D�0�4+!1@�TD[� %�����(���=}��?/��0�$��M�x?��OM��32KCr/��Z!=��DN�@"N�����0S<捈l>hF���'��b�m����X}�O�a�Th{��bi�u/��tח�f��	"꿷�&9!Z^瀦�`d���&"���a��GE^8�
Q�(P�,�XYA*��^�fͲ��|�"'�4*��R�����c�� Sv
�����ģ�v��yMz34���t-��ܴ�H2�VL���T�f�2���t�B艎so�ŭ�-He5Q��#+<�)�;>����j�j�*#+R�	i(#+#+��JbU�~R>�#*D��I�oxh�������.Ќ�T���4u�UL�:s؅�B�9�B�a�z�������%_��4�B�4TH��@4(H�vۇ>&�ǝI!CQn��X~����J��C�����E#+��#+9t�����L_�}��A�4F.��"��T�T���[3�`�Ҏ���D(�c�ݘjB��h���܆p���?�R��EhX����s�$�9�qG"5����R�MS�HM���ˏ�0?8���?\�h$u���3�]��C��́�lI�	h)���Z���BS�XA�4�pI��	��3,�V#+��be����`�M�Y*;�Į@�i�A��2R#+��!X%	$�Y��\s
� �(��5%Sժ�q�޳-l������Ih*a�C��{��m���4NΆ���w�Kym�������"�T5JQ�п�����q�g&�X�D7?����Q�,��|����Ty�&s�ԓ{z���^Ei$���F@S�V�m��d�WA�H�rD�䪲��A(�A���`��-`�r�����&�LDkB�2i���P�4A��Q̤��f�Ғ$�8����h�h_����N/k�����L�0zvh�5�0(���b��C�*W���{ӴMT\�E����	D�~�.ic�K����<�^�@E$o�����Ը�J#�!B��&��m���Lu��i���6d9����J��8�h?��Ęl���ˁ,�P��ԛ���G�Ҵ}G��`��PJ6蚴��f0z�l��왦|��q�#+ؿ���m�
m����o�(y8�x�vD1��4��Z�!D�(8�\���wꪉ���6�7��?C=7��D�eڬ�4kxHP5L��Y3ˢv)b����et���l�C`�?�=I�cY����ߚ'#x-(`�v�?.��x9�9����}�x�}���<�/����n��et(�,R���&�PX�Ѫa-U
BK;/	�-��~]�mk�PƆ
\�*��`�Z���@^�	?����?��������������l����~��������������������?��w��}���������G��������u��w�������������?���������o�3i�~����UP'��#��>���`.S�3�r�f�~��~��)����7?��jA	�.ꈤOE/���?�kVfT�UUDLJoІ�[XM!�z �r(�(�CMi���i��&0Kd͏=���ԑT9����w��L��� �����hI�:�RsD���K�)���vӰ�&���1h��b[j8/�?����Z������ɂ�o�r:��v*#+hK�e8����˾4��t�����Z�m�y�i��2>�3?���sep��6�t��5�M�4���{��1�6~X5�B�ƫ{����7����T�w|���\n9����F�mƃL�Rp��3�8�Iq�3!���ᗒ�o[L#*0P�Σ��8����،�ĈlCM{E	eh��钩�t1�X�_.�t!�G\�Q�]����v(W�D��D�i��.^w�m64��nWDmN�ǵ����-{�u�l�L@�X_&�bc����ݴ#*@_&�^�����x���w�A���re�/%�a)�#�#+A�NG��z�`Bʊ6(x���N��R�>��.�0fF/t&�R����˿h����'=�������z�*�hQ��$kקB�(b(��`�^O#+�R��rC;��w��t��_����m߂��̀f@��״0�q����%-$4�MDT%R�DĠġ�E��]L@�A<�o⟄=$?�!�(-��kU��9�$`D��!��Ͷ��C���C�O�����3T�J���މۑ�+/���/���CV=�%ϗh���N�l�������Nw%��53�(�_�J6�-9êB�Z�<X^��Z.�Cm`����3���%����a����鴸b��q�(�M��M�[�q��6K�O��	!����e>~;0�v���Ό���C�!7����+��]f
HR��u AR�P�B��E4JR�	G�#J��B=�4ixl�}�Q�C�~����<�QA�_�D^cM�����s#*4-DHʑ[�uo�I�à�!5�Y�d;�ө������/5�ʼi�$$d$5�b� %��x��dt�ݬMd.���֞��	���
��_m�&��P�b�*S0��}rT�D�:�H�#"�"���w`tz�����B;��y'��W��2ˑ�ۭi�c�۷��j���ħ�(:}�����s{�Q3�L�⊄������ۤ��X??�|��$�T���o\>�[��&��]�5��*��=����l���}~{�Isߴ�GE7��?Bx��>`/G��_���'͉��|�Oa���?�|�>_�O���?E
�%Aq��n�#��9�Z���!3�����������@ֿe���~:�o�����(��һx��T�>��8r�D;�qf�.�������:H^��]e�,���"�+m�	1k����`�ZdF��yJ';�y���h���fՙ�<npq�Q��yZ�㪌a'�3i͚�f=�x�c���?�rE8P��`|
+#BZh91AY&SY��_�����6t�����������
� "DЀ�H 
Ha����_{�jhQ�������k{u]5I��#(�M[v2�)T٨_b���N-RZk��U�;tc`5�hz{{����>�/K�w|3�kp]:��^����o|o=�s��mr�{Tm>���
�N
6>��<�T�c��3�ۣ��:���u����@�V�W���JJ�"�0(�@�
Z�Z#$Q��k��s���w�omw�=���P���^�A}ͽ���igK��������^�w{q��wm�}ϻ����_/�f���o����}{�����N���>�{�s���I
�li��T���֣�����Kc`�N����=X��*UPH�P5��/{���M����=�^����{������U!*�����uK}���;�V.Իmj:�lU���J������a�/�ʟ=�]ۺ5Z(���ە_N��vw�zv�^�s;�_l��;��Ku���Nݯu�A������[��=�>�
���yB{ﺽ�k|Z�Z���;�O��[ݹ9�syp����w���_c�on�w]1�:{=�i�£�v��^ö�q�=y�u｠��X�&�@R��#(J��̛�������:�8m�Ӳ���*Wd�޳�B�f��9әU�g�
����Sv��o7׼ހ����ۼk��8�r���n�orZ9�j�>�f����v�l_{{[Cϧy���x#(��m�ngut3��j��=+�����v
>�|�wˮ��W��wm�l9�w۹��._;wݝ��V����<�A��(��=��#(�4�x����=�l��=�oz(n����9ɻ�v7�۷����b=�6��k�Uwّ/[��=��﷧��c��@�NΧ�UU:��Ӛ�ÃN��m���#(P�2i�=��7v��}�=����3�P�Y��t&��vwGgZ��u��LJ#(��L�!�}�Hk����Ϯ��ە�������U�w��_|�}���o:��=��vfwY�;n6�qѦ�}��}�kW��6�q��Z�o;��\�`��o�� &� �4�F�#$&L���P�ML��0��	M �����e41(�=��#$�d�m#$
&�" ��M&����=LOR�ȞԞ��d����ѣLL�$�JIM��̄�e<�z� h�=C�z�d���
�i�H��hɔѦ#(z�O�?F�����M5)�U?ʧ��G�%��ѵMHC �"	�F���FMjaM��J��Q�)��=S����4
��F���� ��jS%�*夵\���y�Y��+jr	$��	f* 
�O�?/���?\���~DZ5N�TE�Qz��Sz�z�U���U�*^�T��L��̇�f-2u�.��#$#(��t�"	"�#(N8�—~bH�V�Bw����,M�@MY��Z�w��ջ吀��{����!��l�E�[R֣Z�UFQ�\J��@�T�,�EA:��R ����)hE,���H-B�Q"A�-�F���������l�H&bX�S"h�d,�f��*A,a2Sf)jR���P1�M�QY �FP$�#(�+������cA�%(64�E��cAI)R��I�K-&�`�)bFƪMP�c,R&�6���R$biM�AQY�Ե��VM���2�R�[I��e*mE$Ҷk6�6j�6#(R�c�di�(�4�X������f�d������0�`�&��d(@�f"��I� Ɇ�ԐX�&M(3!��)%�$1�)5BZ��5 �,1bB�)�(23"HQ1�I��i"�#I��Ȥ�D���fFԅM4*bLL$�M��hY��#$�RI)*,I��,$�X�L���fcF�)�	c!F�&�HI�`ę"�S�DSB���#$A�&Z�jE��JCF�Y�b�,��fTc6�f2H�
�,�ؓ�6#$,�#h�%�٢&�41�f1�3)2R$S%(��M)�Rj"�!2��($�l��$P&��FT3l��6�d�IKHY1�H�h�I4�Ɇ��5��Xʑ,-3(Ѵ�$�C!a�34����&��1%�$̋T� �"�`�&H�I��0h�,2
�d�d5�b�!Me���A&2�H��k6TlY#$�L�dJJ"��Ѥ�Yi1Fd�64�H	bX�h��cl�Zh�)0�ICH�5L�A�d6V�[ZB�jM�,�$љ)b�Z,�4�L�M��EP��M�5#(�2e#4�M_�[�HYZBBYd&�U%b�52��E%��cS["e#$�K�R&�5�(�PͨKQf�I�Fcl��Q����jZbjlXd�6�,ȚҲ*��b�)��FR�F��*J͕��Jf�6�2BR"ƨ�YQ&�2�FZ6MQQ�%��&ѵ��&���I��� �5�lXf�6�	Y"Q��)BR	������5$�d�%����j��, ��l��SR$��4�$�[6�*M�l�Y�T��B�4�&��RT��a��dȥ��#$Im-��5K#L��J0�Ba# �b�bdf�mI�%�2�IR�K3)4R�(�F���ZYR E1H�Ʋ��F�a([L��LTԖ4�L�$jCP�Q4���͈�-���#$f-JZhRke+l�Q�K2��YM�!fmllb06����F�V)JT �1�IH�6c3,��Tԣ&�4�d�B��d�FQe�����D���K	j&�*e ����,���)4�2�Q�6Ԍ̚,�(͐�Q2XM2�dk)*,���J�D�E��,TTh�U4�d��J#(M"�Pd�Ƃٲ	$Ԅ�e2JS!�-�	F��$L�ڄ�E��,�0�h�T�QF���Ѕ��J�T�Ih�#$�[l�-D�-%A$��L&J$�+ETAl�&��&�	��ERi4b���e&�mET4�*ddذ�!,X�̔I�-&*RX�������F�Q�kaa��
F�h���d��HFM�Q���T�EE�Q��LŤ�I
Z6�RQF���c4" ��L��[QQcZ4i-h�C6�c
�FąQ3Y�Z5���j��i#$,�6�5�E�jJVQ�h�&���Z5�i#�m��RQL̢ɴhR4T��h��*���&���EE��D�6Q6�H��֒���Ѫ�E�ѵC-lj�����Hi%��hYJ7��lҢ(&cc!AiD�&��T���H{pO����)\CQq���6�)����=+5x���Yyw/K����8����C�C�N��_/��w�Y����#(�K��)��$bո��3|�	uHG����]���uQ���|��t�,;b�T��B���0�DN%�O�<�מ�?/�cG���ˌ�֠��0i+%C߷q�r���ä�ƷL0�Z�AT0ȉb/iYʗm�Md�eA�I�8��UDLx���`v�>5�VN�'+9l�*6�#$�|����mw�˜p]`U?�CY2%J�!Z�O����V=6_[2?����?�a�MN!c��w}����t��n�*L�R����f��(�<jf ��J���,����9�鐯2��&1�GY�H���V{=e �����u��<t�#�HPD�h���d���F������!S1 �aE�R�Q8�(��c+I��ԒTX�>�}��I���fs&G�	U��I��1;���b{z�Е���ӛ��^�S���k����^���+#$�z{�8�^S}�,����ĽZ#$�h�h���[~�P������?�O����#((~	z�IDAѾ����d�钱_�j?�K�?>&����I�כ�#(�&!�@�P�_�a�_��:�Eʖ�iI2"�  7����33��?$��'�Ϟ�����R������gKh^i�ݧe^7�{p��Ly�At:?#(=�wUsM ��դ�2Q*�T�%~\��ҋ:m�q��C���0K���7��1Xz2c�>xQA`��s��;Hh�~�x��A���zn�w�u���B��1��v��l��U[F���,C��F���R1O��'|3��=y*���-_�jzڝbە)����V`�F_{gV�AH���2X�+��j�Y�5�k�P@�0������g���`���.J����T���_�~����E�ёO��&?k+��N���R!������X�X�g�+#����d�TH���`�
`�?#(T�fU��lQ#$I�W�{���=B�#��>=�0���1yzsсF�{����Pg��"�`�~���y�f'����C/l�#�$����h� (_����U&p����%V1���H����T�<2�hPb�KjȽ߆Nr�H���e�,>���铍L��)�+�)�Ӥ<�X��Z+>��Py��!k��y�˒2;��������S.��tv�܁M#(#$Y��hVq���E�fi.�?s#(v���ZzRϿ�q>���	�,�@�hQ��,���r^A�*~�Tq�Y��fP�ݮ�4�Q��?�ֺ�E�� g*
"��ُ�1�5�l)Ky3�A$��>L4LJ��ì�+���1⿓���L���Y�b�_�����_~>�'o�S�����6q��2��}�\�w�#}kF{*�[�7��A�M�p�r�f)2+�~��i!��*�D4��Oya���}�_����=Rx@�t�~����Jb#�O��C��hN���%aN�����ѷz��Y�����<k>f���")��2�#��.���D�}ES& Ls3cX�;QAW�q�-!ąTS��s�(����6�Ta
R�g�9�m�s���1��L�F�s���"���r"���u��=���1ƜI�Q��R�לiR	/�ď�uM��4C;���+�ږ9j�G���s�?z�D�D�YJE��ݥ�(��#��%�uV�ѳ� t���1O��=_��S�p����=nx��ۏ�����]=Һ2ԣ>nm���&d߸N��ԑ{l�uS��$u�Zw�H���;���@B��s#$+��;�;Qt1e�m��
�K�F�D�͡�S�.FH�Y��6�7/��/��y����}��/�Y��f�S�r�,�(��������M�v�r�B#�'"�"G-����A�#~\%��E~�>�>�UCH�T�����vݜ��CK%T��l����oݓd�J��>#��?�e~W˂���z��0�ʠ��4|4�3�C8i��$�t���K���v�Bw,��h�-o��8��|zgh,�+��]`b���7�O�{?��Ʉ̅gwp��@B|��F*
|��&�~^׶x�{)�<#(e���&����h�}mw)���9�����Od#(���m��l�����ł�ä�ݘQ'�~<���0p�k}�g��\�3��Bk7�|�yo��h�������� Hu�"�rq7%���*[E�Zb�}��v��3Z�S*C?1��oa����|��5C��� $>�{7N"��-:f?�ڇ�7���(�~\�P�p���g�����b	�y�t�jv28:۸QԵ�����ߗ!(�[�ř����NӶ/(�p��,�%.ǚ�"[�e��%���6*u�|���q����B��ta�eѺ���째gH8Ic�ټ�Of:��|!Z"�0E=�wy�&�j���v�k�O�4�뫶�f?�	7n�ۧ�����T��s�|'�����k_��=:˸MQd����'A�z-_d��+�rɬg�l�gz�D�\O#$���1#$�$R��r����\|�0CDbLm(�<0���d���d��2B����x�����/�%<�?C�s���%�>��s��i=:��X-�$}Ki�i"D��YMD�NuE�����f�j9R��yDKX��b�Y��OT!�Ň�GL�_�;Yl��r<k�6ߤ}�̶���,���H��DG�؟�8i��C�`��MPOIBB�"n�~�5��u5�i=�M��Pb�7��gwܢ��#(���)�;T"�IF�H�\)Љs#(��H�H��%W��m�@=�h�Kd�{!!��X�p�PM�(��o�^xq[]��ʴ���C�K�HXI�ŷ���y��K�	A����5�������z���Y��3l�3>��$>/I�U�J%�>O���WZ����/P��1L�4Ν��w+k&�'�ا�x2�F�;a��7�FG���ZSJJ����3���f�o��:;i��0J�_����qM����/�]m�H�����������?�ܴQ��p伤�fu�s(�7��V��g?�σ6,�{_	��YDb��t�?N{?���J/�E��"��Ww'�_�o�U��"�BpL�0�ة�YC��=t��}P�x�?��3S���|&C��7o�����N�^e�f����g�Yg�Z���`�G�꾬mA" C��/�RT/�=G�P��!�w�͊V�՚���������~.���>O����˽S���/��N�5�����18�*"������O�}w?~ٞ�ޛ�,��mq_�<��O��霦u�Y31%����Z�f�	
pt�f�tT��F&��{���#��o�nP��dpD8����+���7�]��;7C��^�k誏#'���c>ij�q#(��A^�)��$@�H(G�r�Wv���M��k����'c?�����Qe��Y���?ɸ*��ߓ�5�<5����#$DOjc���#$&�n`�C)���e���m~w���צږ�ߧ�=5�C�ctW)��d�E���?g߉������J�t.�]]�h�#��+�O�w���*pp#(4ĸ�yy�9���'t��ʖ7m�,�>{x����QKIEG6�U]z�T�%)W�.N�"+V�֖	�Bb���M3�~�]������	s�Ԥ0b1�=�+��X1O��u9C3����s�d(�~����#$@���;O�sn�1�zoX=�((�Y�O�}R��`��u(�ys(�^�y�3��I��q�>�:�L���"w@��\�v�=��I���'�L1�ά@�a�曥D�8�!�*j�ݓ�l����R�I��nw�G�t�܀�6�i�7U��#u���O�j�L�Np�&ׅ�{KF��R䣞��B�iҵ�[��1䂟����]������%[3#g�|�x{���;TW��&���]���?��]_ɫ<�-2��vYQ�󯒫oTA��l,�t��>9���W�Y�KB�|�d�O�qM�Q����9�N�\�':3����1��WŰS>�?/��U�>��m1}�{�⥴�I�L�uw3����|�=�,�yE|�gh{oV�nC՜���e	,:�dž�s.��.�_|m��l\��n@#$�.ҙ���.��1z�_n���䰤��J�ק�s䓊y���?��ݟ%�9��gٽ�H������n_�BMJ�	!��:HJa+��'̖�Md��6,HZm˸N.P�k��٨����=Έu����l��r���k<�>��5#$Aݜ�%͓�;�e�A���Ȣ�դAe{ӯ4���+������K;x����ҽ:��*-㳴&�'B9vf%37M8D�����W�QE44n�[�4c�^h��^�*g+��.~w�f�ZK�NŽ"j�5����)tl�L,Uln��'�ۖ�p~V�U�4���{:09��ֺq�����gMH��@O��P�����oK$��uub���x�]��Ӽ����ys�0�d[�YK_����䣿�Z��T�ʰ}CK������$F�([�����YQ*)�*"I,��R;�?���rm%͙2�a���`qh������*�<�	�L�#(�!�����+]nG���0���U����Kҝ�����Y#�s;���徺!�!ir�2�҂�;�\��d�&��lC�����6#(79��1:�;�W�w���V�����2q�y��9�>��8�YQex�׼^Mj�/H�k��C�G�I����~�{|��6��J��������,��l��Pӆ59,�C�9D��1Lr.����RJF92>���ת��c���J%:�գC���9�Zdf��ߍR�2��Y`C�{b�K�#$�����e��L�̲��]��P'�N����n������x��nv||�o�����-��Q��^�,�s{YyR(�DʏD6�/
��	�h�`��^|�g���(m�
C�6JG���vBD$BD�/���ȁ�#(1z���=U$9+, �~�Q`�C�;`a��wq�U!ۃp�e����O&��#��B�e_ǜ�G�w��-z�u��Tt�
�'P(^3�I#X���U�˿�S�u_,~�5�Hވ`�-�� ����X�[�i��)��H,.q���s��lg��T�r��䄪&2FIp���8yĭ!��B�*g�YK{�9�#z�̙#(D�c�n�޸E�z=��(�Ĩ ����ż{[���`�1�ÎГ����I���c�����s�Y|�U!-�����L��"t�����Y��ߤW��_�~}5��k4֫_��������3hhLGS��÷�>�"�faZ�l�)R,�t�8���?��`�����-G7U��#(%a��"�I��?�L�f����>Xg���O�"�/�4[�a�c~r�_�������|�G���o^��q���=	�5<&��]�W��0x�WY�Kl�R$#�׃R��ٞ	-�c���ݮxE2@� B;����-����S6s�F̌Z���uo��]㴼�U����z�stkX��� HE2a�lCN�S#B-.K������X<�[om���99�I*Զ�$��u�<˱�g��pV�.���)Ǝ�۟��=M\b���皣���_��Y�23p���w����o���o#$��t��w��HͶ��=��.����KU�%r�E-)�FcQ
B$�J#(������s*�1�+�]}�Z��ut�"��Es�‚�1��8� 	-�-���ŵ�.j��|���G����><�U$z[���ƚ��»3�������٭i�=i��"p�+E��Y҇=�H�n�-��.P��������+�!�

*M�B��x�v��59�>��f�S��=��˹�������oy��Z���=�vȏ�_Aqi��­I�t7�%G5m#$s�BykQ�k�����щ�n�5�v11�������;X���Ӡf	>�i���@�v��ӕq|v�ee�>�R՘WD�^
�N;���D�Me�Fx�o_���D0�����h-�3v�fǷ�uK<Q��fZ*��
�U�5�~t�9��~#(8z�Q
��Bg��ͬ�%�~O�`al��:-���Rf�m���(��ޭhEC�R�X�b�}gN˼j~�0��{n���CN�{��{-�A�T8\HR�޿033�v~v�9��a�ZL6�o{K7H<�o�m(��ʂ�up�L�|��o�M�����Y���d�|������I�����[�8�v�x��W�e�K�#(�oj h=E��3j�E���n���3�RR䆑B���#�z03%c��F|�pYY�����Mp��-l&�fp�E	�jL��x�N�E����j����%�D1�����U�����3���6�#��ym����f�WfcB΄��CB��0�fG�{��!����"n��oVo������/JQѰ�T�
��{����]+]O����0��:�|g[��'�^�R�]7e���Fw���*II*���ӝD_��.�63���wdd�^]ce5�^��"�s��oi�gd�lv�#(�^���*dZ���]�����;/5ۡr0�E��>��ʧ�ă�I�$�Ɏ�{�˥�3>E�n��%Ҋ_޽+�k1�4���z�c��%���}܀��…�9�)gXA���:D�tt�F�KN����u��r����朋ŦRP��͒YVJ���#$K�G�����hoPD�9=\�%\ε�m!#��GG���9�V�x#��s����6�����d����v�mh��%��K{>^ o-�`�>���L#(3,���g��$�09�F~Z�U���[���zg���̗�L}_��ig+P:�L3Dzb��KZ��.�`�=�	D/A�Eɮ���"H��,V���~���7���s�z��5����}P�PvYX�#(����4��#�s��t�8#�$>��I@����j�u�M;Bl�A�m#$r�`z�����K�RڛAG��şJ�=ɢ/�H�+b��.�J�mG�����cK��1���1�b.���:-�d��N�B�P�D]��#(Ċ�N�>�gL��y;Q��ts�i:Ik1Q�3�7$��E��0�&�m����u���O<�,��B��G�����267�N-�Wđ���o�����S��'�Ǻ&�c0D(���
��Hu��0�K�f|Fe=_z��N9smE3���s#(��Ct�"f�\'!�%((�.2�Օ��-ܖ��2`b-�r[[�~��faq���	�Y44�(�±�=EP;�$ЍB�tG�%QL��Sm�\�1���̸`��HN����GJR�*I"��k.�V���S��op_�����l�ΙxSK���Q��A�Y��`x�-h��\
[�3��%l�{j�^��EQh�έB�[ݛ�k�h�Ń�+g�t{u݇_�P"i�P������~�ş=�Wz��=Z'ץ��S�3���c��>���1��j�F.��ڳ�p>����y]�6Ģ�G�f�t��fbSK��9��%,;���ơ��rn��U!Z����P���u+���eȷB�$&�k1eH�~"�Q��C7a8�I�����b�=�I��Y�U���3�������(�k���=���=ų��"L�����;�;�*�@���I�3�e�Rua�ܡ�K���M.�!0�݊�ƞ)ط�/'� �O�^���v@��Φ�����l��"�Qo�>�d0��)Q���zCVAe�Ł���s���r�t7e�wf��ц��^,�7>����yЩ��RƆjT�"
�筸e�Y��)��<�&�S�:���k#$ṃb	aF�Xu��)@,�K���Z��6�f0�B�N�Y����&u
I�J	X,��`ba�����Sb�_�j�O@ͥ)%�f���,$�0�)
���w:�c�.ў���+b	s�X#�p���8��\���	�{"��n�D"��q��tlZ�[[e9��J�QUWN��d=�_7+{�ummf9N�E[��4��{�ENJ���s?.p���yh�4���:#�.B��厖���*�2��J+,6oT��.Z�����$ȴ��Q{3:�Ԯn�ϭ�1��Q�E�<�P\�e�szKF[����\�����u�i5��h����xe�ӊ��v�ݘ35#('セc�[��d�#$�� �	�ڜݑ��t��˃���]L�,�Щe~�ζ,�(�͸!18���S��p��X�#(E���X=4�?��D��^o�C�:R��HPª4vM���� YI	���ltC�ͧ1ɒqZ���$B9m��/��9��?=�^�`eS-'����Y�I���Q;X�x_	J���"�{{�*k���f��0�Y{����v^�'��ob���5���,��[�CMw��v���{��N����y�s���A�i�C#�.�E#`�0[���I��RT	Fcc�IM�DEQu4�C	�L����!���T�p}1jvه"ɬ�m�ha�^s̸���9�ŸY�=A2��(8z�=�y��a�{����0�;��+d���4oC�N�I#�"��]x�D�2��J�r�f[���P�%�7��&<����b<T֣��T���gi�§�|��$���?àhr�]���|�@�|�GH�xtϞ�`���"vF�i�S�T����_S�FQ�-B(��� w���p�Tm�o��2ɰpE.��=:uy8��{�(ډ{��� ����c�SV�#$���?cD�v�H.]�jhF�N����Ѱ8L@\�~H������eI#$��?Ͳ�K��#��~HL9��#(s�i�m�tV+�8;wS�D��V3�!�O��a�v���95p9������|�a�<���?^��s/�+N�����!��$yO4{:+�<�cEO���}ӻ�����L%#$e�*4V�H!	BB@PA{@�*%,���/��P}g�����UD��=��ıiYO�rO�)�OɎ��r�:Z��e�5:2��2ܶ���U�BG���P�M�AC��]<��g���� DL $@M���ۇ:�ߟ�m?'�ӏiGq��O��v\)�S��e��d�$�X���Z�Z�or��HԩbR}���65��-�YD��]��o��{�f�x�ѻ9ł���na��N,D��F#(J��Cچ��#(�g�ώN���X(��ID8��bȿ��.#�N�J�r���|���Ėq���Q#-�\�G1��{�`Qp�4��@�~��߰��ѵ�W�s����Lq��D�³�$?Bk#$`Q�������ć�����L��4��C��_�0����Q1�%����:Bb#(k-)�`ܻ_�P?;�fX�b��6[��$Ú����ė���]e�FZ�#��-Yx��?�4��v�w��!������Aq���?4Έ�#���׬�}���!�0��'�Q���1��n��m��Xt(�X]�ʪh�����d�J�S[&�y�ױ�>��	�Z#(!
h�n��u�#(��fƙ�Cw�\�|����q�6g�¹�p�n�J������y"}�5֨gUx�2��`�������,<��������eU�4{Q���>)�|����
���.���Ÿ����n���q��	�#��﯒�	��\v/v,�{�#�?o�yCZ#(_�����u���
d�*�6�>dA���\�p�c{�J���]���S��Ke}��?�˄�J8��u�%��]u��'��7\G��ӥ�w�vGlWMbq�ݑ��p�~Y������q*����]"6�${V�	
�$#L�}U�Ɏ���[;��ӭ��a0]�������)5���ڻ�*�ʺ���n�e��{��g�6Ko�,�����`��T1��j_\�ۺ�����?e�4��P���p��q	�H�P�a�98*�������!�O�Gb"ow�$%�;uEB�L����ڬ�g� ��\��#(�?��ъk�I���{Z�~���<���}P�P���#(}�M�������Q~Y��؈�A�AӦw��zR�����>�b tTc���P��N�C��?����k�/�N��ܦ������or-T#�e�	������o��x�j��5�"k����QA#(�P���	�Ÿ�p��'�–�R�K�^A��K�أ���V���,��„X��#(�X�C�ʏ�����F]w�mT�sr��i���۪-f!$��v&�����c�����ܬ�G�h���#$��� ��m�K�R����$�)�g�4&�*O����]�$B+�~�A�aX�on�6�ׇ����gK�*��oO���#��~<�I겭>�"^|��#$�G���,�Y�Z����#$Ye|�a�#$��gӿ�眵׏6�F������E}��f�h5/�k�ޡzss�-|�,�7�~�m=���{�o2�x�lg|۷��۫?���=�����������
��r�9#�>
wij��oN�{���n����ߙ+�`h@����r;�2z{�x���V
%0.���f�N�W��u��X�fL��/�[@��v�]=�7�6_~��sR������e��%�����g|z�Պ/��#(�(�����f��μ�4��
I-gR:��y���v�o��.}��K)`�ȫS��j��=�T�yEoT��s�m�pQ��5"?M�x��L��v��`��[��em�h"L�����L�>��Y�M���ƙ��Ʊɐ]e�~|��sٟſ�]ka�%�Cnޣ;���o����%MJ���2�!��	l*���������U���`s��!����n��^�b|_s���&aw�z�r��~�v��v�Kָ����-Y��^o��a�o�U}�YT]��>1��t�J���y9cz?1���l�����g�tz�m5�A��tz6;��ox���C���,Qg'�`�xR߳7�G�n���\�s�<K;���w�<�un�Ɇ�8Hz�����#$Q�5���I����:j��|��歶@��767&�Z�<��R�G������L�����K�[������j͕G#p��W�������dơ�]�F�l=�������ǟ��X�T���3#ᗧ|~y~8}�"����(1��O|��y�������S�e����+��Ư�K?��ۡ�����#$�(ߨhvNGO�3|��v�~Ǭr�e�OP����^�_>~������v�Q��I�r�ϔ9��a����N.����	�!9y�U���g�<�~��W������0�c�xy8��qO�=����#(�}f=_wV����wvڮ��[��F\k���,������{�ۗ-���w��5�O7ɲc��bL�rpT#���j��ρ&��;��|����!�CZ˞���P˜��n��kOrU,�8&�߽4����P�_6�`,�x�GgV�_T�W��]�#$}�*;�Oe&L��zgeRC�#��~��4�|��F��+�h�r�^#�w��4u�2��Y(�UPQ�%�Y���#~7��߱հ|�F�GGm�.|̃��jp�d1_ލ��$�[�=|n�g��p�hV�fͻ�u�q�nl6����Y�������ӽ83F����c7�J���o�~`3#$^̻�#����F�g��dx�Q��C���0k��zʴ}'ҭ��M���L����#(Ok�2�X�����9|��R9~��Ƿ���1wN"�l��Z�jx��/�N�����=!�}9�+=�������&�"���4������C�.}�e�^,�R��7�8#$7�sޢ�#(���G0Ϛ������k$K�UDg㯙������
7DC��5�]�ףI~���#$@stN��#N��GE}�����C�#$�)�0�{�/\~��HnE`2�?�%N��U�_�ޫ��J��6��i��W�Q\N�_O��L����ͻ���7%B���3���ژw�N��u1��W���.��m:*Q~�zGgN��M6���ރ^���%�aO�V��b��/��$�j�~��#(�H�Z?�أ�廍�;���˜�^�{��3\�m������3NO�V����oC2��1[J������~��bF;ɰ:��lxK3	�Be�0�E.���RRa0R'�5���a&�M�ٳVE#�he��ȸ™�AHb������Ӯ�x��XO��������C4UCzROn�F+F\M��뛴鳹(�o�<y}��.��o��1�����ٓ���Z{�<�O���6�È����#(������ς���l66G��&����Z8`�o!��M�T�!��`���9����(s`\���*���ת�&I��^�i�r�W�K�w�O`�F���Un1H���4�ٝHGD��<��8]�1?����xDŽ���'�e�VoǓ��M"�2�*_�)�u_7ET������,$ ��
DJpN�Tq�M >�����~Տ�5�ۈJЂҾ���r�h�_׽��|�#$X|������y�D�(�\��#(�9�����0a����OS����~$�����E÷�ݬ�/>���=T�ﾮ_77�on�Y�����?�!�#(��>AXu�8��b��C��݁��9��1?����B�Q�,=�6�L/�a#$RS)��&�Y˃-R�`1��S��@b��#$�]+�Xc#(�*A�Ae�C�@�`9���˒X��Z��V��9apaL�Yr,RB��e��\�8bf2_?=� ��\z���0�:4�ㄬ���Lc�"b�#$c�eCŽo���t��J�P�R���B�B�Hf�#&�H��#RE�(���l;�p�J4%�.���+7��])��/����t����Y�ݥ�Nj�1L"��sfS��!PR���Ԙ� S#�mL}�W.��#(M�ɉx�˔̂ن��M5�4]�jd!s�^�J��XBi��t(CP��ijA��E��/O>��e��g��J���):�G��0�];��+�?��������yo�H'�N�^�V����몕���g�Vhl՞&|$Ʉ/΍��{��x����}c@\���.�`���#]�x��� ,H/S&s���",����wD����-�ܔ��;��(�2�:�lb)o��xHR���.5n1��7i���,��T�i�����Dvc�c��4B�/͒D��|8�ZPp�Q�\� 5�M��X�{�^©6)�ѹ?f�ɽZJ����I$����•n�b@Q���~B-��a��-���n""�v�=O�p|6��Ö_�C�*���_�?���r���d��]��}|�fm,�g_-{�8
��D�d531���.H�	w�(�R�O��*���-�Y��C���m�G�p�\z/o����Mۡ�[�h!�Q��^U�J�@Z���o5FW{��<5���$42u���
�û�6Ml������_W}n��k�N��L�R�X���j�7O�xu�-R�Ʌ��CM��tk��)(L&�o4U�s�'f�e�P�ݩF~�?J��J���BtO�W�д8«l�i)���w������O��1�����[�#�KJ�r�ed����g���z�t&�b��8����G���:���z���X*��{����>�2Ȣ�DdO��nO������Bi�_˃0�1DI�������������z��0��#(0���F�Ϯ[z�d����!���a3!�`����<k/y�
�塝g�I���l�39BW3�i7׭?B��WC&`vg�����2#(�#$��H�P�&����E�%��9�����s���#$�sJY��L���9)�����&�8����ak���Y�d�nþ�S��ZK�4�bE)��f x}5u1�Z2a�s�~��-��1y�kM.�EU7��T~6����C{J:fG#$��`�&t{�v)w#�`�6
��*�@X.Yh��{?GP�N�n�zvTߚY��۽��H��T�D�ݚWN��}n�*`��#� ���@�N��������8��p���SK��I��y	�v��u���������HN0���lL�L���߸8���ݼ��L�3�N�`̂���h�е,��	�/�k������^����Fhtŋ2�p�l�K�xL��Fn�=�9��ӆZK�����28%�|9�l}<}	�Oh�)�"�m�DoMdKK�������vo��ޘ|S���B����Y���:e���A�ب7~X~�1I�wݼg�K0�z�b~e�8�^?��,P5�fAF���CL��Q��S_)�:����+��'�-�[����3��.=&�F���n�K;�ò��3������n��	�߯^����^�U@Q.��I!|�10�xJ�]��!��c���a��-�����J8͢-�2;'q(�lR1���#$ET	:hL�-I�VV����b�=#`(dž�YJ�oYmD�")�+�ﭤ[�=1���4r�`��^��	��y#4�F�S�5�G(Lj��;馦bз"��኏n8��f:�d��fK�e'�B���S��gq� �����i{x��3�q��<���:�=�B�ׄ⿔�|�K󀔷�_ͱf���&��ۘ%��!:��Θ�G)�8�FL��T5Ӕ�j�_JTTN�W��ڦ������5R���2eU"&£�[��/N%���}����U����X�&A{�h�{��FK�#(�TR*�j"���	����19��%�2�x62�t�0�	#O���XsBj@�	N�����e�b^�|B��	1;ϸ������l� T��u��uˆ/	�f��M�Wr��`1y�x<��o!�,��! :Q�(_-�U�ֽ�Z��&���T�IU��ݬ�_P��ٰ�%�t�LP�uۊ����Z5��-r�;�ٍ��BP����g[�wc#$�{9&�h�J����#$�Y����E`��J�;h�y�r��8�i�Q8���m���d���>ک�Y�-ЁbM��* n�0�̱7���ݓ��E�EY�/n�7�ZK���{�]@e��3H"�DD�K8~b-}��NH��}��Θ󎟲c��tL��"=�hb���*�iW��3P�#$c��#$�y���7h��=�j���e9r��.��z�¢��uŲ���������ҟ���*��DN��!�sC�/�"1�9~�<�]?aJ�Յ6y��/S���,�^0Uf��w����x��t"�Jn]�T����^GT^Q�qk?9���ƣ�	&.?|ؖ��K�^��+ܸ�	��ƈrQ�����̬���/�IE���e�9�Ȗ�d.�A2��U�O4�Uג�Rۘ����#��uy�2Nk|v��IJ�T�#$龖-w����EE+l$륾�;�P���
|>�U�YU������&Uu?��ܬ��D7���ݪx���ijo+1���x�|h�bD��.�k}=���g:���<����;�E�����R#(��H&�ˉL�f#(:1��G=��y��t�Ԓ\o�-˩�G�.&���6�d`�&�6#$�1tNhZ�2��T)[�40ev�c+*��t�]�F��$Id�#(�BB�^C��⤡G�^�ƦS	D��r*�����ݵ'�߈�ц!�ݎG���ifO�;���4��	�A��9���y~��*�*�,��$u�W-��/:���	��W�,q>��/T�o���~ߟ�hYѤu�Uc8~�:�/_��b�ü��x{�ӫ;������n?F��UKy~�@H?��y���G���|�V)U�E�J�����>�;!��:O�����߿bI9���eYce�ص%�"k�鲺�?�☥�(T��N���j#( �X	
��q �-NwN��|A��U,)P���ے<mJt�?�ιZ�Q�l��p�i;�bʊuJ��	L!�����CY�����w�oWs�4�~Hڊ"��d�g�ĒԔ���8��!���y��Cܯ
m�K��ˏ�ܩؐ�w��3� ��ٱ������]%p�Q̄� ���Aim#$�]���Ȃ�	���
xN�����f����6���;�	���#(]�6����t{�q�k{�՚<����Y�+d_E<��e�v8�6�h�2�\w� �:�C�����w��b�CY��74�QE�{���W)�����`�D��͉�ʤ2N�FȢ�����d�x�+&�ftZ�n1b��0�3	Rۤ����#$�jƺ׼������Aca���ݡ�'@�&`�vkW��v�v�-�������6�G2���~f�ީ��m����{��C�`��_�ģ#$D�O7)��i8#$d���:ݚ֋P��O��7�0���w^C��XhH�t���~�qby��2Ml�N����[�C��2�h�vtm�?#(m�vP	��`����/=�gφDE��b񇦜;$3�Y��܌��|h�3#%��NMV�m��oov7�6��!��D�C�"G��$8#A6���J�q�"����8j�+x=��ɤ�
ٲ��X�\�jD�{�ǿ��ϋzjo䈇#�p�HwN�jP�m��HO���k:ʛ9-��K��$��X���`�kYuh�����_�Q_4������#(�q�8��Lw���R����)�8�D}�=�D#(�9)�D�[���LvGLY@���sn;�/fkqo�&��zm��J��V��j�o'�I�[�AMw�a�&q6!��V#abtK,�b S�#I��A��]��������$F�;�a�|U�wbAz�}ßۿLZ�#$�
�^�k{+X}�yJ�4��ԨZ9��7{ab�;���&���緺�<�Č!U��c��l.d�'$�]��yx�l%{��v�:�,%g�������s3�mb�&�Б��#(k&��g�G�A�T�LGCP��M����iB��hŽnvT�խ� �d�UF��W��<c��O��M"lt�C���$�O�W�n,`ӧ>dY$7�F�(H��w\����٭Ԃ����;���Ƒ�k�D��c3V4�xn��e��]/�����1�����ܺ����ZB��5�T�4�C��M̗<���Ej*#(���N/�Su�gѐ��LAYd�D���xm?KyX-��b�I�l~Z�n@����cEP��UF�4�D���P��C�#(�y�Zo���i-fJ4]H¡�t���ξ�x�&Y��į�2�c��,�T��j����6�����\-a4S=.�4yvB.k�J��/!�*\�w*�>iFv$Ε�Z����K�,ڤo����������{��z�ž:U�r~*X�k��%���dٕ�W5�~�|\#(OH�I'e.\�q>!��3��#$�f��,����ѷ���Y75�����b�#(qDê{��T�������i����I�#�t��v�R�Ў�jH+i�N�'�3�V�YD�^�26��ӏ$���0��>�*	}yZZ���Aڪ/M#({E�#(������W�H�N��,����S�{>a@D��5��h�fk(���y�k��a.������x.�y����2���g�#$߷J��F��XG)�RjD�G�Կ��m��a
Af~e��6""[t0�ݓ�w,#$oh�,�*-�9���Z��Ց]^�4Y˝��N���[g��!�������feƊ����<�=̟��j���'I���Z&�u�#(3��o5Z�}��i.Z�a�tJ�W(���(��v7��Qό�k*��V#$~m��
��g/�=��9�[>���Wg�~4�Ρ#A�5�ZԒ]_fq���7ٌ+�ʶ����^�#$�/�����*�V�����+��Ҷ]-w��8wR�ٕ$e���z練�ж��Po�\׺�m���lj�.��o8�O���tY�M��o�,+_��8Z�����^fKxژ��J*�:���&1��]�y��#$w�^�)Z�4�[c�pSZѯ�6;hLZg|�&��e��6F��2�Dg�q[ի�ò}�Ŋ��/3U ܳi�a�(�WH�,��\�$e`�.xR���0�r�$�Mmj�S���c���Up��uaC��S�%��UX[]L&�&�"g�\�}��]|��8�_5�k�DF������[H#$��
�PkW���S��t���*�4�w::�G?�x��=��NU�մ�5G�*�� ���@\%;Tw����\h�>>�����gC�Z��"���9W}K��e�Wu׮BS�.sXE�Sz����T�L������#$��n����IH��Q+i�gĝ�6��2�T�m�*�����X-Ϝ�lY�F�h1��w�,�"����c#(�Qa5��%"�J����q�98sbq�����\.�:-m�����JwF�yH���<j�:��]�E�q��m0~3�ŜE���A�xSb�%���f���-U4gG�����b�a%Vil,�%PA��g]HL�2ˏ	��y��p���K#�?ϴT��I(�S��U�����EU�[��Tqv]���AU����>v�a��i��c�8�}52�IZ�ٖ�^�խea�;�J�q��������}K�6t��Z皗�2����]��.�'�\�><M�nj�m�v�#($�QZ�[UJ�(�hM�,l��ר�j�,�n{a]nxn����b�]֍&��	o��b3m�4Z-�&��T���"��ύ��x������4�׹�B@����P2��g�B����Ƥ�v8,s�u��F,����Vn�F��e�G�kt�&�����c%�չ0��Z�/���3�s[��?m�E�I�0S�����N�y���<Wɸ�)"#(�E��.t��a�k�z�Y�\��h\��
���6!`�7f��bѓ0������J�e�A�GJ\���2H��k���q@P���U]��W�{]ʢ�n#�Df�u.m�U�m����E�E�#(��ͥp�X�_�\�w�+>�v�f*�6\���X!L+��4>Y�#$�V%�X^*nH��_JM�8E�u�߶��+�=ZPU�]�-@�56O��#(&T���Z�Nn��љ1�����|sp��e����|�+jCa{5����޺�!������*�h�YOל}�8d�"	6<f�^q����I���&ds,�y�Ԣzl�%�IKy{$�:��*���Ǖ� j�����럵�2ٍ�՝�В�u���� a�ƺX��j��U3�n�عn�R�#(�v�4�m+!lf�Q}V�d~�T3oE����\Rp��E�16�����	ͭy/����.��9i�Z�A\)d���+9/���!�l����SY�3�8����T����:<�ۮ�$�1W+o��޺Y��*#7J�[�#(�Ǖ�#(��K���R��j[�oE��wrՆS�l�m١�v���jjK�	�x���v~fkP�75��]�������=�h�����ǂ�<;F�;Dn@|��j��(荫H���p��^��3��&]�T���^(�:'7JwF����|���AE(ꉍR�y��.��f�T���U�_rE��Mu�R�Ҙ�;?M��ɏ!#(E�[��#(�,V.N|p��rq�S.p��eK���̢P���/��D�xm�&<]IP���y�!�ͱਭJ9C��Y�Fy�T�=#("R,�sui��y�*#$}t��~�#(�+8�=<�uE����3m2E���<��>Bj˳�_�E^R�]�����̪�B��Q�m����#$�,~}�F��iJ�4�]���V+1E���b��b�.3��%G�ê�w%�#(�_�8����y�՛���`����M�����2��r�����#�4�����.
�<�r�VD���Gg�]���Rm#$p��XF��]�6k�,�u{��уO�G>0�t��>�"s2��!�i���9�(v΂8���l`��-��@�tV2�����Zo�l	�(��cg�yRUUj�G�`�%������Z#$��G�w��>�V��~���Sk�z����3s�(��Er,���~�j��O�r��P��6�bt=r{�#(�U:#s#�ߡ�E�m%���o�s�޺sz�s�.l���姉����V�Lq��^`�F=��>Y�?�f+=T,W���ꂿ����Aa(�g�ۜ�b��s�@�����`<7�
�T_em��P�AŕYY��@����"���e_�����(P�)�x�q��p�Ԙ:(�~�
*#��skQq�g�y��N����侷�%�c���������Wvn����#�.���d��{=��7bQaP�R�|�G���U-�4�!D��0ST�#(�O�K�BeE�Et�"N�����B��%���J@C���N]y��U�]AB�I��9����Z�U1��@X����W1�2�ܻ�*���5���"�%��$���B��%�2��uN5�g\^�R����x�U�i�s3<����۵ȁx��_���i�z���K=��W��t��)w�h�u��y7��/����}����G^��Ё��O���%��W[ZMгhY��Ʌ%��^x<X��:������8D��|P��1�YX��D=��$���櫙�w~ˌ8�޳Y�,��N�.���޾�B���jb�y�������Ζ�Ή��ҚI�\�3��V�זCH�6M��>����}�_N^�bӌ�Ie��q�/*�ǭ�Ho�L\B����m� �<nDbmK��j��5 S���g��8`r�:������%W(�p3W�*�yH���1�����:}�;ǯ-����&�ʧ�J��O����w�*{���Ĵ�%O�_������1�*����%?fbs��l�����쩃j�}p�dt�P����"0�s��T��th�G���iq'ÚQ���F��-����vFœ'��
	�}~�.u�̄�kzcX���4�8��ؙ^i&����`�.YZbO~�y�Ii�����c��b�q�v�l*�I�(w�!�!/��ٓli6	/�8�������^�f}��g��}��ET5�U�ቪIڝ�j)�"�*Vq�S"\bA��^]_�S#�[�����-[��/6L[��%��\�V�D���#(�h���oHՌY��ۣ�Ns�nI"@�=w�X�7r����n��nì���*$�� ��������?h�#$��*�С"S�p���z������j�8���9��(��ʃ��'�d�*c_�Tmy�v�5�'�5����V4o��X^m-`�P�n�vH<�j��`>F�$���N!xᤱ#6Y;ٝ!V�q���(&���,;Zv��z�����O�NC>��ˏ(jD\����I�,�ʷ�Hw�:��<">w���/�ꄥ(�CY�5��b%�/����n���-[�����)��Гj�a�:M�obE*���$��q`��_�^�*�ǽ^yJ<�/��uv#��?��ߛ@@��P�"?@��� ={��#$\�ip��L3l��bk�8�=���:p�Z[�����m������atA��?�)7�$*����W�;}�)I�5��]A����s���=��c�����[�G���<ٯ^N�Sz����o�5S�"�$�F$�B��Z��Q�������:�zʨr>A��jv��2�d���|�������D�H���@w�-���r&5#$��O�	y�P0sSA���0�RQ���
���4�� ��J����I#;a#$U@BHY���}Y���w�A����ū�E��_#(�*�A�����@�T�H���ɽk�Az���ce�q�p2�c&���KL8$��/+�rܙ��$m\9�nj�����d}�ai�P���-���"+U��UTo�^���M<d87���&�D�#$�h�C#�)��3����ó�����;=ɲ�[YI��?���2�K��R��(,�#(�>�oͳ�_�����g��U��|�#��e�u��(���rT$^@Z��z #(<N��g�R���Yh<�n�������"g?�'�#$i�cQo��8�4{	���g#$S	Q�uY�p����?���D�9�#$*\�4�}}T��R����}�x`X��"��E���(2�tk%�͠hA�h�hB��b#��;5B�Q�!A�G��l��>�!����Kt�[��fBs�b�ذL%OP�tI��I]ĝ+y٠iF_�x��uu�綦���H���a[��dB�ef�o�$#����L���8�`�n�AD-�v�d���W�(?���������\�~���Ij1��m���Rd%�&e�0v�Z�A%�bN��M�p�������F�/��tI�W������8���I��A��@��YbHw:���n���랮l��-a��Vi��_���5$%4x��^��az�v�O��h��@ӒNf��������Zz	�Hn:�� �'Ė;_���Y7O; yzA&#(�=�f�ߙ��?�o�ʮ���ǘ�S�5#$o<�;���#${4��+�Me�y�c��!�t�e���B���e��������m��Kt7���_k���Ůb=�"lm/3ͫ���0y���~�&�z�@#$q��dY�3��k	
N��nj���x�Ą��!��D=�Z����L$+b���FP�1������=�P����ɘE�'C'�q�O��t.��|��L�?ٲ�ӓ!x�|��5���
LAI����ԡ$�h�P.z���`<�g����"Ğź@vA[$!E⃖�M�Y�<Lv�_f��։���Q��$F��1� -�����ׅH#()��ĥN%�k�LV�0U�dE��wׇ��)��^�������Fk��sY�XS2l��o*��k/�-�7�bSt�4�#T�G�%X���.lɱ�2�c)'Eoc͍������/�#(��
����_\�m��Q<�5��w��
�{�L�̗�fN8p�M��Ik���:yՖ�,U�W=�$g".d�#(6�Ȅ$8]����Z����`R���A|��ȯ��+|�U��c뽜���z;9O���[���>j���{#����;� s����⫰T�Iu��}���XHK��v#��˧�M-\s���u=��t1_���G�ǥ[���/��Հ��qۍv���ȩ ��y�
P�o�w�cy;`��=)�����#$F_h?����~�M�.��r.(���\�Xe*^3�E�	��邊N�Q�E�9dכ�e�s�}|˘6�c���&�����
q�'ۏU�w�vX�Ā�"gU,�q���Dl0��3`�����tg���<����;tהr��x�o�$�i�|��j��M����߉�������;���N��C�����A�\c���s�D���#$k�#�gD1븲V5(�O2xq��-&E��ɌS��9��(Q�d���0 R��a��}�t�>�J�;R���l��
����۳\��^S��N{��+<�����g�V#(fK+~�2J�gC;3��.U��s���2�ȣϷ4��׃���٨4l^��S��z���}�M}����X�s뾙��zd��A�}�G<Xo�Ϊ�Ys�T���N�X�A(���ٮ���zg&}�.�_��	S�^,,�J6��z��>�%��3��^eFM��\�b{ճ�EH95h�%L����ϋ �&p)^���"#(oq���X���̾�Qu�Ls>M�ǻx��y\�9︐f$�H@��wHI�":�?7�_�c�tM�����j�#	��9���s)�~|��|V���5�z����P�$�߱^Vځ�hD��J�O%Kj+����!IL��#*� �����*8� P��w�Xҕv�v��,���I"����v]T���#$?��O_��M���A��_�$�HDJ�}�5�ɟ%��@?��'J��`m�sk؎)���p�H�Hߺ����*��2���v��`�p?��?��ol��������G�=yeۖh��T��P(�s8t�W��[���Q-`	K$q�d���[!�U�P[���	4���W_bl97�����ۙa��ai<�]�!���ȅL�y?0/�BۓVʅp� ��?8��)�!��~j�a���Eh�9r[Go>�s�?�{#$�5����Z�œ���J9��J,,ô�Y>�E8a�‡G�?�dHZQ�l��&�R��s9�QO�s~j�	I2�P���l���!x�)M��X��;���IKJ/�{xOUH;������?�
����� }�ܧ*<ߣ�Z�����@ħ`Dǽ\����@`�O�
d�]��(z�o�&��!%��hV\��ő&��,����D��	�[	��P���7���B�x�жq|⮹�v�w2)l4HЉ�:I�,�!�H��*�E)�fC�I����m�y�ݽ@�{�@^�T��,L%�R�o���i��ʄ��N��Cjvk�=��{��`��Hl��#(W�I��6�rԞZbU��eP�K�	V}h�����G�ʵb?�G�����,8���9Tã,b���k�#)O��<�4�6DJ�Il�|�D���=�\�)#�8o4ҍ���`gğoUm=*�6�#(�N�͢c�RA�;�#$�+��z(���%��,H�,<̲w�}�f����2���ڝ����3��t���!��[Eĺ�����a�~����ڡs+P[��_�!Ⱥ�������>�Azxh�~�UQ!�|s�jH�8��PL�K��2X���[d��A#>Nu/ٴ������ER[�˗?��t��)��e�8���R�\+q��߱�GU��q���0�i��yKj5e�!~��(�W��/�����|�@��2
)���Q���B��!��t��t!q�Ӊ�p�����)���;Z\$9ER�||~�$Ok(µ:@�b�tB}�����\�6O�����o�c���|eI	�g��=;u�wB`�ʷ�{�h�Bj�������'�+�D�1�N���քN,2�wG��3��c=f^�<��9�L'#(��l�x	"s�H�@ChT
�U$U�U�F�`M#����wa@" ���F�B�D�=����{���z�l#(�XI�#(۝�H��q���q�7�Lj��J��F��a�%p7D���q�c��6�|�����5&�{V��I��Ǧ�9�ud���H\�A0A������:nl��3�$�'���[|8��[�B���#('h+��XT����`w���[��P��Ra"�ަ�A$�#��J��R�"$�T��%�dA�B�-�%�i>������#$���F�鿍Z;�Ox�#$O��',(�6Y�{�[�,Nj跃z#$��;�I$!��@!�L�Ca��߄k�7]��7�?91�ۻ�7Ū�����$L�"�ޞ{��ߘ�8s����47F0|5����j�j_N�\}���������=#(*�s�ے�I�*
�Kr�;o���}�n#(�t7Pl3O�y#ҙ��s?*���V��
ϺjBF�;���H�H$!�?���Mr�.�y7:Mbd�"�F�a������}�O���d��BO#$ ��|v�A1�*���8W-)�b�R^�Ε��E,�זV0d�iN����#$WN�! �Оsi�[}���;��m��=5�ڀT�<���b�ƭlI�P�t`�����׉a��F
�������6�EJ�K&a��jh�:�o��F����eN�jc���t�.!9�T�0��ݍ|�V�tɕ�狡͝K���Y���XR���xGC��l�5�Љ"l(�T#(O,A�T.�h��<�T!��4|���O$�q��zh��,!�f�������� �w��M��qo�}�6�mv�e;#z"����T�{�"q�Oëħ�S��ᗲ��E��_���Ad���PX�r���J��dQZ���Pװ��gs#("�/�1�LǨą���l�*��n�\��v:��#$U,{����+�ע��XD���p�O
�	���N(�	ҫ)��|O�z��c�u�p�59˿G$���m��o���m��%HQ~��mU{��Óy�o�O.����U���+�E��`&�`��O�L<���%_�P<7�O����BL6�>G]��I�J��S�?�M���N��q�n�a�iX�$ ���=B�0X��%Őds*h}8ֵA�4M����l�=?Ix�E�"�#(�����n�a��U1'�i�#$����m�Y��֝QP�q<����HG��6���^*���`���G���_��S�8/m�r(2����a9[�'z�q���P�9a�(���>4�Ƭ|�W,��]�Ȱ�2j��gVl�Gǡ���3�?�T�E�Vz�u�����M���I�悐ݓO^�K���i�ڈ��_S�<�0�nŜcH���0J��������ӗ}�&�xv������6N�<y��s���8�:�:"=�C�q�7�P�"=�|(֡�alҞ�:2y$薗ѓ��E ���l�$�$׮��&�\)j��;pN��<��P�2B'TdCgA}i��ߋ�T�WS���ٽ�tL)E]z�{�`��f{�D�
t
�a�2>�Q��З�E�b|0o.����K�����v���~����q�U%4�t��bhcݽ�����e�ɮ��v�1�bt��"�	��(:|���f�xf.�^��0�Dֲ�1�qя�Xz�S���^a��F�,0B�|%�l/�ˇ�!�o����j1�j���}��L= ��Ӫ��)a뢯À(v���-t�v�[ɾ&�#(�v�l��]�5�=bzt�G�$�f*�
�o����2!=�G0��IS4��'�M�&�{���덞�WWڊ	�G<�s�ފ(�������?G��`�f�Iy�����	?��
SъJ��V*��wŚ���Ͳj9H�A��{�#(�%�©����@� RQT�QN�p�b�g� ��L�I��Cm(B�M�wh���J�ٙ�w���B{d�� D�S�?��_��?���~�2A��3��L�8���2�A��v��ׅ����A;oy�����?�"%����-Dkᙀ����e�
s_���z^���?��_�~�џԸZ�QF�� �|��yf�����^���m�ih#$���_@YP6ta	����U�)x��i(�خ|/����.�cZ���w��' �	�BS���Qv�[�A����`AG�S�U��ހF�Y9[U#u֤����'
�QT������$��8�e���|���G(
=ZŘ��1���w�B<�Ф�9��H��'ұӻ^��&�!�.�x�?:7ӗ�a���R��Ah�ޜ7��w%��7Npy����~�5$Q*��&dz8�|l#(�#W�/A�\`{%��*�$HB0���^���=��'t���OL^<�u~�?w�y�wJO��C��lj���>��Ğ��)?$0T ��8#ȩfWs�|�1ad�aR$���fd�hQ-�E��^�3g�9x����۔�y���y�*��3��t������=����O �o7��n�P�/ύȊ����3I����߼K��Mf����ಧޚ��"G�U�_��{��*���˼
�'M4S��!̘@>�xm�S��� ˤ�'[*�AG#(0�w�'� 0Dw�#(fDa��̼�<���~�x�rul׋;�wo)ej�֏�5B�j�2���&�����y���H?qA�7ۡ��s�y��^:uU�Hw�byV��|�(��{��" �Af���=�
1�=��0�w�0;�W��	:�'��9Z	�� WOO�N y|9�_�x���TQ㏻6Y��],���²�G|M��⨨��ѡC�O�:�
�o`u��ک�"���f�Ex1ϸ�ÑU��8�:8�Ǒ�ȈR翌'�	r���cZ������ɨ��흣l�f�Z�T�ǯ��͛m8�WV|���#@(P��D�ބ�;�=Yq8��ځE]<���! ����׭�Nm��&L%+���=�z�A�W�}1E��������v‡�$�=�Vz�����԰�vv�:��T�bK;�m���Tx�����;��f�ML��s��5`�����[�7~�?F�@z\%�����PZ��l����sӍ/�0�@<2�*�"#$�ғ/��MH>�#(���J9�⦵gP���Z5��c?C�&�v66�yc�Գ0�T}��|����Z�e��!
9|��]ټ�� �T�r�ת�WG�h��AO6��#(�
qNL=��
��x�n�;�i�E��l���|�ǜ���ub9�҉�P#(�v}d�P���ܿ��ֺ�HE��f�#(��}�E�d���zt7��P���SU�_�+��\�_E�i!�qM�i��xr�qeʽ���$��{�5UT*B������\^��Z���f2��~Z�
�!�Ř��L|L�R��l�$��溊�A4�5� h��|&��z����%:�*_�i\ uQɊN� ��3�O�戙�����rh�&^�bi6����!��G�N��S���w8z�K�V-l+��;�=#(h>�o<x�C�Ɗ��=荭ů�G"���Qr�X���,�������E��ID�-���@2<�GFZ�#�ϵrp{,s�Q��;��]P�R����ЌE�3-Rb��fVW�j�щ3��
h^�)c��C�����$H��Eo�y�빖x�)�	�}��&��<	y[6�"d#(�N\w�jLUL��WO���m��}�c��+��1b�i���m��-�Ϟ�����Geׄ��et�P(�R�.!ľ����u��V���3���%c6�2��ƭ�=�Ö�T���o�c�^o�2t�[�#V"x��E9�.&*����n� ��/�,8~������j7�g��ҫ���5F
�]���Y��|�q���l>0VJ�շ4���հC4�t���*�*��z_�?8}��+V�y��Ỵ��0�ׄQЦ�N�P�a��7�x�>��1S��SQ��+j�:�~�8�W�t���;ay�����}3�I��«��oDf?�e}&5�C�����~O�G+D��Q�T���fY�!�%
�0�>��o'�*{E�ѻ�>�WI�/|WI'���BE;�z�+̋]�I!=�4y�ͯl�dv�����mÔ�+ж�V�3}�-m#$E�����Ю����9Ǿy�~0����ԩ��^��ϙt������_#$4zjХ��8~#�0}�~T���BhWY��ufD���$~�������#()�݇���������ld)L?�X_U2�����|��y��G:���-m�[�ί����jn��������O��y>uK�t9����h��"�T'3T��x��mG�T��Q��J��JY�߀{�����{v���z��܉�W��E8�/�̞�yA��r�I#��!f�0mZǝ����b��駠.c�t'i^�|YY�f�G�y���Tȩ1���*g�=d���T���V��
�y�G2�]������X2�:���H�b���LP]i#$z0��Q�L�ey�>���M�#(�C����m�-����}�n3�9b���N�3m;�K�r'�:d�����|t�+�P�]ٗi�����ˎ��u����9m��g�Po�3){i��ۋ�fty,-W��gõ���~�Α�8�����fZ�Og�n_^�SV�gۦM@�Bl���&��""��FP���ǸO�:G)}N�{o��l�0�Lk���]c,P:O�|��'��1'���ņ��#$Z{�2�^�8��~:�S��||�\�$��Y�ۦ1"ժd��B#(�#��@7�K���q�_.��ݿ%���0��0[�ZeI��I�1��s|���{�e66+�3�tD%��x�?Y�@�� zӽ®7=��i�39��;�C�� ,��'I0�*V�\�& 2��W,��	�9���B��P^�qS0T���]��$-��w����}�<�T"#$����h��� ��� ����z��{\������uʲ"�;���-#$����v��M�6�3`�uV��8f�G��D�yv�E`(y7�D簒�Y]��Ř	p  W�=�Ư�>�И���*89d@�ꐌ�\~ۇ��������J>����O�],E[���X� wd.�P����E��c�8�N���g��{��Ԟ�����������E�+��~�����a�b͔������Q���H�י!���ׄ���h@b�˜�1�����{@p�P�VtL	ƴ����~�_'����Hώ?K�!��P(�ǫb6�F'V ���V�O̸�B��6G$�-�ߗ
�ٌ��<c�a����^��8�T��?x�y�b:Q2@ێ�y<��Q;�"���z�Z��H��;%�i������ܿ�X�A��X���f� ��]��ߚ�������� P�_�A������hP`��&�Gf6�1�s���>_��7I#*fѸ
�������>����Sׯ�D��$�9��>����V���h����Ph���ve���:�:T�pE���|#$��/=�/a���-֑X�#("��o6�3�N{�ށ������7?c��y�^�gR��z���ԣ�"^*x��|��O��h���o���9kb�D`����]�C9AIC���!	�.�B$��"B#(�e��ن�_z�G��c�2���/�4�� >�\�@=�x�؏u��;/#�U�/��,�΄�$��U�Kk�_�(�n���-
�6�1�0�H#(bɄ#(��C�]����",U�]]��7�hT��b�/��b,�r�����C����޾�8��tN���N��a�v��>�{����j�v�oJ���5��5�E	}�#$ż�n�z{��P"��96��8��=�?ˍ~n�����qp�#$�{����g�^�2�\rǓ9#�{�#W�"0�s�L|xL����o��� b#(���BT���S�k�Ö-\ror�s�`g���s��>{�?=��~=����*�ƧΡ��w��:�fA�_;��[0��Ə��Hf�&:�i��9�EYYX�Ѽ����ƒ�p�½�������F�H;f(�h���@����<��z�<�XGm���7"��~M�9u����m�����E�h�Z��<�_`�j�S�A�=���������AR	$��(qH����'yU4��>a(|��	F���U��f�.~]��2?�������r1��յ�<O�&G�p�
���W[sˆ
�׌|����k�Ν���w)/ݢ�Q���9�Aej!D�gA�W*_I�[�|:UXj:���M�[���Hf j�u�|݀�Vg�Yi�н�{�	 �GT91��+�2X���`c1���89�u�@OE�,/���okի�ςxe�%Bg�n7),9�׳+q��@:u:���K^iz�u�T#��a]��r�>���C���:���,��O�( O�ͽ�	��j��5�]dB�x]�Pmj��:�A^���2��2f���Q��Rw����"0�N�z0@�Q��w'W����D]CUX�v�h�;�k+g[�%���Δ��#(�+��e#˳��������*1��n��+n�~^5�m�hm�D.ϑl-�`ԛh�#(C�4NMl�Ea�t�`۔��z�)��‡=#$9���d���W"��������؆Z�I=!���N�YG=۰n��2D��ϯ����=~�q��@�DR�0B�����M�7�/�{�;^;���Voj%Q�Re�H�S���"캴9F�V�V�!�2�j����R5�pH�|9��擤�M���ٔ��6�8a0��>_l�FTt��r�e�0�6�I�Ny������$3!�{2x��l�9#$$������.�c�L�����#$�����O�u���0~���9oL��]X��[�����}���7��r`Gu��FR�`�@zZ�5���O�ڐ�)S\<eVb��AOW��
 (L�H@si��o���J-��\C�;3��#$���ě�]�*��^����n�?j-~���#[�����at��6�Vҹ�0�!đ���I�Lu���u��Z��@M"��G�A��
J���Fm��hU�4����#$lk(�^#$�^�w��o�)�ݻ���t�Mv7[�b��e��mϧ����~|�?e�����>U2�6z_o���d+��U���SwS�IHJ��Q
�$')��nӅ"�M�B鐶��fA_%0Sr=�{��F�	f��A�#c麹�>ڬJ�#$\�c�:d#$���}k��'���{ϊ<2�7h#��{�}\�l1�Յۭ����Q�/]�T���W3�w[+g��9t��A�]��[GM�����T�~ֺ��Z�%���ntn��9�iZ�'C�$b�u���!P2qK���B��8���N�7Z��5�wF��}5�Cэ��)��[q�����
���-X;l�ݩgxT����!�+�ٞ(�1v�f����5}7�G���p��w�D�x�w7��ݾ��N�����B^��I��,Z�=�[��E��s?�#(*������	�4��W��� >��y���A����$s�;'e��WaK���E���j�]��*U��0߮����|�Î`�>.#��K���;}6��y1'\K�Y �ߤ|D��dsN᫈��_�±@��,FV����N�ly����}c���wl_:���5����jǺ�@�����IJ6��t/Ǯ+?ͱ���Hl��'#$YÉy���a�0�t�$k�;��Gz��Kˣge5DU��h;�X�2��Wǖ��z�_v�7=r���Օ*��?<QJ�i����B�/�K#$ѩ��֒lyZ �HH\�o��Q����U��!�]�W
��{�&�y �&,S�nǻ��|�s���S��� �dG|��-�����ڿ)�Ó�����9cp�`D��V~经)[�E0�ȸu�!c��u�L���T��Ewn�-F�hS6%�h�y�N�0�#$%���K�c!ݾg|��5��"	�O₦���<�N��n�k(��6E��ũ���%J�������ձ;��g߄�3��35��	��(n�BX�Tκ)ҡj@#(�@�
tc���{��V�0Ŝ��mԷoA\M4ݞ�l�4W�a��d�HC[��kI�ҋ�>���l��^�|�7;�)�u�߳6����<�C�����r ����?�#$J���,1�l�J��تw��vs͒�T�t��T$�EJl�2"�.X���`^-�t���7�Pl�jx���Ui��8z7q`�l��.�b���G+��_�>��y�����}Q������zRC�.���V��2�'���6�i���TҵF�s����U��?�b?�ݏπyP���J
:P�L�����b~ �nq���c������?�
��`�����i��@��U���@�C�(�����,�r����s	#$�s<�,�Z8#$���
`������;�����A綏__1s�E���X?۶�@�'���A��.#�&SSO�aǷ�	�T2���EO.gp�{a]�&g_D!.c���$�E�$§Goʢs�����Ea/�����6N���������燹�?l���n/����|M���q���xZ��y@Ó��bfG2\�υ���N� ��A���*x�ozuHN�?�Q�`h��<�����A?jfvr��ó������3�j�*��s���dt�V�b���tC����L_��r��1�U1&�����c��@3��䤡��P)b�/1NP�'�a��D~�qo�
X��#���gt���lz�<��6.{z�0�Ē5d�)��O�I�������:��Oq[_�xꓠ�#(#(��i�,a�!|B�[�>�6��]�����'	[�:B��]�J^��*M�M^�������ZS���$;��#(�2j�|/"d����gn�>u%d	?(�: I�56��x�Џ�G@T�D=&��m�ۨE�1�qԚ���G�x��7�q$c$ Gp�h��b��0��>�����sR��i�{�����'Z���$p����#(.��,�w�᪘L��&�s��})P���^�R�8W̽�v��G�:e�|GE�on6�
�	�@��r5�����v`� &�G9�e%���-o�e雦Ɉ$�Z�΁K�\'Uo�s)�U�v��k��!��@�S/\��S=���Ǖ����qL�s�h��/��'GD�$�>�8�Ԕ�&G����U|��>QO��o�Q�>G�_�6��:�Kҫ߫!����%��[1����Ҟ�#(;�>���6�O���˾{�c!�����M%Q#&I���L`�ז�#(����<M��#Y����UHm��4&?�wS��!#(�B�`�}�_sS�#��/�K�ݨ�m��M����%%�d"3kU����;�U���b�v���ǥU2�Y��O~}H�,��d��K�ޏ(zR���w&W�/px<�����t����8�p0�ǎ]M�M`ж��@�{�>�+���/��-�����OF؊?�����) x�|*�ti1�y =�!��J��)Y���k�)�t���-�j7v���E[���H�8M����Չw��VݙtĹ`���/���Q�!��_���.\�`��B�&�����@�,0B0?�(�|�ql���BB,G�.k��x���}�	��J{�B�]Ʒ�X>�:��s;Me}]�&+��2�z}�o����7��D�HJd�J�#$��y��:�d@:N�l5"�<m�\��9ਚ;����~iOipز�E�J���MGOJ����D��D�8vtbȈ	&I3�E0'
%ddhF�`;�ξ����Ț�����0�	H�$3��|5ԓ����A�z�A!��^�s�f�Ǽ��b�x��)��dtbÀ�:��_����������A��8o)!?�?n4�������m{X-2XTZ����x��_���� �&Uq���/��f�y�8'5��}���o);��.88�wLRt�/�S�ę�S;��t�t�54�e��·t� �N��	�EQ#$#(�"%j�5�{Y,��o\�3���r��;b=�(ן����ʈ?���������#��>�_����h���nQ�8����μ�x�~�P�5�g�_#$}�����~f���}��LP�䠦�$����wn#$�	h}�=^��/D� �B*_�yD����5^��$/{D>��3![�UDE#�=վ#(��Fu|\�ެS�m�U��N�Hn���y�$�]ô)2�-����8�(�}G8�#$}}�oN�I�]y�V��S	��A�@jz�x^�;�tD�N��������LBɿ]Νn�PSf_ƿV��viW���dH�K���:�P>s����ߖO�Z���4舝�=4*�h}egE�N��cvD�qf#$,�>|��p���,I�a^���a�σ�5	Hn�M�k�s�7X4�#(�0v�lE�ve#(�B��C��r��8s&����q��pqO���2*Ԏ���<��f2> S��lLg�+`a���7q��7�Z3A��1>D��oƅ]D`EI�>|�?9W}���k����zwsj���#$qOmC�Xch:�{�,zhh�"_P�;�s�n��/ڇt����zo�� u�������
"�$`�?��?S�y�tO[���Ɯ�_o�~{�~j�(��ط��ׯ�?p0��c�!Ȁ��G�P����+"O7����;��҄�[}�~z������$�3�zy�����S�|B��S!"�! �I~ӤY�x)���:�_3�M}�:�N/gݙ��� �}+�q� H��;�����W�#(�G#�Y�S��>�ژF����L��ռOhv��w�WO�	��=?]�	��]�n�a����)��BCoFI$��p����(u��@�h��`h�
;��~� �I�� ����n�����ǟ/ؿ-5�y�S�M9h��춯�MG�9��M��~_��;2.U�=u%`}�Fg]�C��oz�|�QD�:װ-_����g:�)>&�ñ�:������!�q�lh��>vt����I����)�H�/��7YCYs���%Q=<=��UGPV~_��'"r���1��&�i�����]b�;0¬<h6�'�ˈl{�N}��A�?Q��5�e��ˬ(I��_3��†J"H?f�[	U�6��HՔ]nۀp:����;(�y
�h�/Xx#�#$�6�uC�����ó�M��$y��T�ǣ��w��C���Ϡ*f�A/t��F8�>�������FT�mQ[_�m�['cex�#$)d>�C<�#��u+0IVI,�"��U��@x3g�x�D�;��=�=B]NpŸ�&��}a.�Z�oUU[%�0���O3h�3=��y
C�G�"n!����_���6#(qz�# �B%��>Bs0.}���#$�G*D�@�;	��l�zw80�l�}�Nʵ��p�x�̙φN�糝�?"~�"*QI$$Vl�~ք#�aDR>7�C����i�i��i�=�FQI)a0T�U���)"�"�95���oF���n��Pju��b��عbF��>�1Q؋!��2#$��#$b�$W�s�G1B&��T5=�~�@�Aܛ���K�[���?&�z&�j{<sG�ycCT�(W����%Zh�pajwc�6O@�)���L�}y�������Z$�G�_A���~�w��}39l��T`s��٥m�;oz����4�BId�"$O�A�I�U�IPhCK-���<u��똥$do�n|x�/�K��^_P��0&H\��<�#$�h�˶�s~"K@��#(T<}N�!�jb�O�J]�]�Z�%�׈׻�*�Ť�mI���l礆�eHC�cp ��R���{�A t�g@kܹ���wq�rǂ������:�Q�#r-ۂw�?T�-�\���B��nw�Y�Q����9����������gI�a���`LA���w<�6�a����i�S>"g�-�䜚�����ed��$᥮S�p�;���N��>'���k��w�=������M��+'��7	���4���nb�����7����D͢m��z�#(��f��Bd�BHQA�"|��ն���#$�Q��I����{��uF@�:�8pB��mM0E���q˿��_�y�^LI���F�x<���:wqڒ@���$�:>��똜�����Me7#(S��ܞZ�%w����L�a#f��M+�QAg��q�a�G۟\�#(����h_?%OOߎ#(a�#(#$ˌ@�*G�z���QΧ�B
ȒI I�Mn]�i��w��I��KU�bɅ$�	�?$˕���S�W���E�B�~��t��u��G.���v�!29�h��ȯ0h;���s���!q�q@�;������8m�6��ڧX|\H#h�y��	
*��b>��P�|�n*p!���5p��B�#$��,�q	6�zC����^��8�:e�WNfu�{��-�	$�B���=iwi����n#(�,g{�7&��#Q���N����K}a�&yK��S}��G��Eq�v@��o���ݠ�#Wr�3�3�Z�?�P�;��Z�aZP��E�j�~#(�.��٧X��W�����wv�<���3��B��b���v��-Y�f�==����-)��_+MG��$E�M��w��Qi�Mr��yo$�:ܚ�$!_yA�<������@x
�q�/|-�~e	����I��hA6�Z�H�rA�r7F�_K������&���
7��^��cJ�I!���\!#(@���+�uOp>GA| 
]��a��U��-�Y���p�r���;���=�~Gzj1ՀbzD(�t'nw��D�I�%jc�Fy�(;�`��8J�HD�$-�C�,��8w2	5�������u�T���0���#%V!6X<�����a�_��c�؃6Y��ͬ���)�f��4��<�_e�@�[0���O�ᜣΩ��4�z��������������֞,��*�L�5[���1Þ/F�t��Aל���Q1/s���jCu<7;���d8��+C��\�Gk��1,�"R{��p�k�y0�h���
�qP#$�?��D:ÈD_�ke�s��_ˣ���(u�a�4�P(6z�GN845Oߣa���OX�qq��=�o�#$��I�����y��}�6�4V�؜��=�غ ��г!ْ���>S��a>�P,��?���_;�`�?N�bLd[ڄ�\�C����9�Jqa�]�#(u��b����va�f��4��w/q�8�pZ�Z�ls�$��{#�D>�QQ*I2N�׆wƐHI�}�{�h�(* �Qou��}���z]<�m~4�6^�~��L�J��>��_����\�|
`l�
{����=$������#$~�Fk_>�+��n0g�(��>�=~�AQ�����>��GTT������m���'�ܹ��T�K2�#(� �,fB�Q��0������U7(�-_��n<Iyz����!��������^���#(u�mDEZF1����I"�3#$����Û�^	$=@���XQ ������6U����u�r���&�R�I�6F�L�n�o����
_)ݟ�q0�؁����`OT��h��'m$h���$a�<�lu��N�-\�<���ﬦ�d3ȨeB�x���Wq�Fb"D�=}�_�T{�0�m)Y*#(N���l����o!xl���^>��`� KE��V[�J'j�������Z�vy�����c�}>�}�r�hF]d�V��L�
Y�t YR�Hp<8_�C��D �D:_8�$�ǃ�g$����L؏�9xG�O!ï���P9����� �"W�`=��,�����A�V�8e�!]`S�a�d0d�E!�,�1�Y�a1��a˩%��R�	��b!q�\@�\�\!ln� �"���E��&�1	P!r�0�l������b�R�����GLg�<hM����9�P���bŝͅBŦ*�p"$����"y5F�gb�H��%b�m�DL��/�K1h&��ѽM�P߹1`�#��v[e�fbRj���S?n�ȣ�}�6�U�p�C+�h��{����r~����nEe!H���R|�� 9��|��#(�P\|k ��Kۆ�w��B�����D��c#(x�E��*	�eS���
�`y�Y���J������jf{�`��_��-���'��.�y��,n*��nG�PT��ޔw�Q�y�&�z�Gb�ܠ���"�#(���O�S�	-a�>N�o��aᦋ��CT��B��̞���`�̢*5H���ń�<�������]�!ܰ�`A0ݩ��h�w�di��P��AL���&z3�;��\�9H��ge����?O�(z	|���I�y������D���qi�|�y&\2;�"%�/����2=�q}�v�X�{�Lbօ��?=U5�6it6�V*|�쐋q�,�q��R�&�%��¬�8Aov�&�F�?��Ls�_̡��c�NxA���āh(�$*��,�먱�O��)-��F&���I�
�c#Y�2�H=��I�Hp�h��D����||�������g�äB��h�xd������tߋ��[	?��M���������Bق�cK�A6�����YO���E���A�A'��bw�u��ƈN@��.�m�Ē 1�b\��oS~���Q�g��l��#$���=)���Yy�]�G�h�g�pA�}�:H��+��>��1�M�_�8���!`oʌ��D1�� ?��b5#$���[��5���j$os�^P
FDJv"��x����t�|�sw�z�Gt�0]x2�2y�@X�r��իk�e�~����|8����Eլ?_^:�j�~	��9���������<?�:��m��6��a�<�9�����5��3��lP.t3����1p]yU���+����Ȏ#Q���d65���G�Ep�P��B�V�*VF��R��.��P�t��J�d�I�&#�_������93�\����8#��İ����}n9����ma-��/Sr�2�ߡ�"����)|^й��i�'����iԸ��>Vv&�Z�K		y&k	ܧ��Χ�����n!ѭ�Ӧ6�)�R3�������'�U1v��{�q�&�1�QS4h5)*�B
"��o�mi�@�m�\�	d*��.=h�j��bf���Z|�G�=�G�����6J�I#������;z��S�H3eݝ\��]�Z�t44�M�E*�~Z�G�!�9�4��SP�#:ǂ,fC�\�����I�F�q?��JM�;�l����%��[)�;�̳������>���@�u�>{\��ֱ�"��H�o�B���RD)%�ɢ�yR1������Qت6[Xc���M���Ps,H�0>uK|���}n�����[���.SH^�E)$!( 4r�l�>�_�+P:����'T*����n#$@�Njl�kr�8׿e���O�{�����i��H3����!��rL����@�#(�"YJ����;1�����L3����]>X�5���`�I��u���g��#$eJAR
��63��v�6꽈��9w�Ys�u�n���C��I�f�0<��8���|�~�Èe(�
�D6�f`�;,+�.8S
J�?��;M�H{��3�����ς
�4:���D��1����P=Y3�,1��0�O�z#(�㼑O^��:p�0S��/Rf�&`�(�b���d��6!Bڳ{��g����ZW�S"���JaS��o���.� n�
Y�����\ȡ�c�hܡP������_y��G��@�����W��&\Fݜu����ߢW%Gb#${��K�����.4�ƚV���*�(<.������'(o"��(W�a0�}��M ȁ���m�?Wg��^O���7����6���y������UU{���O��H!g
�@��ٍ�G�zX��s��m�݋�I#A#$�7��c�8��␒�#
�����?�ؑ���ͥ�����y�O�'C��&�'<�.kp�Y�X=Z�\��D����Ci����N<#(�9���l?����G��6�ԏ���zP8��z�H2I%�-M#$Ř������hj�����=�mj\�|���x9!`����$3��k)7�����}�Ԇhd���Tr�~g�z���bB[�G$��ߣu��<�vH[ww�(��6����4W�:;�z�#$��VCS�N���/P8��a0��3�CN�-#$"!�'h-N����i˄��딣a�(#$\4Ģ�o+��׸���gix�^�#(˟b0@K�(�um*р����|�t&ݩ�5/qd:�_k�j��ti�ZHᏳ���O���)��6{��;��XǬSH���a:y�#$�>�k@u\����Sh����!�rb��b�d��,��D9�ʼnX����A���(�#$A��Ȯ��^m��d��~���S@P��h���܁a������Ҿ�7���Z��<@w���#$=�U,\�.�b�ʆ-`�6n/_��fά"B�64g�z��9�$GNkK���l���xj�.��UO���rrI���JH�VI�C�!7K�bǃ9f݄�ÅR`�,����dlޚ9��>��ē#(>�!�'9�r�RLq���i�����������<���!���U5˷Z�$~��<��7�^���3��u:��	u�� ��Rx8��QR�yfzn� =C�綶�dK��|!� q(��)w��탅^��Ԙ9�&Ҫ�S?/̲y�������Yn�[+EPO�4]��8fz�$���;z;���Э�����V���|w�v�6��n�we��g�8��U�Xٗ2�3:�θ�8vo���H����smd[�I�#M���Pn��)��� \3W%��un�&�-A|�g���d`�68��H���Q����y�ms���m	ާq��P���(N��5�zv����݇Ʉ�ɓl�}5o>4f�I,�c�=��%&)��'xO����#$��*{K�6�M{���/_�$3��14�R�Ӿjؘ�����<�wG����:UԨg���94O��'c�a��Ɔ�F��4~OG�̿�M���%:��W8�*^/�3�i$��I6jש��m�oI< ӓJ���/�����K�����H�<�C��q�t;tb�1��gt�2���E9(*WXl9\�����A�M��!�,{Oe�RM�c��M�#XP,>Iɞ�����C���͜<3ðz|ϴ�n;�l�m��O�����rf��M�<�_l�c	B�'�$κ|D��ǎp��^���s�,n$!C0�z�$N��v�.L��Ʉ���|��b�Wwd�{X�1�Ite�윖=2�sdjEwA������Qr���3hL�CDjz8ɔPXZ'�0��|~��J�n#BfY	��oS0J"&S�ĩ�������Jbd�bfR��31ݛ|���BM]���T9��fOa6AX, �"Z8�$凇b�$�������L�1��!����6em��䅫��q��K4!0�Jyq�\�6��q�0��Uq͚E��}m�Xs�gW&I��k��s2�
�� �� �r8���V:�w#$�4A��%��z�Mru�����<3��SE�%�#(-Z"1��a�����~i���L��#�"�iV|��B�v�7�lg���n��}Z������(�.�0S��7=��m#$a�s��PY��#(�G��XH���P��� �@�wp�@}9��ެz��oUة7���RP����hB��0������':Е;�\7��(�U̜|���7�`"hE�xZ5nفГ,ɚ7�M�R�e��o�"��pä��`U;��;��4�� �(DOr�e�r��}�'�;cM�AF�بM����8Y	�	0�����4���L�z4L)D������
�y&@��eW���pV �H74iI�'�����3�q!��� @`�cշ	B#(.	;�bhq�1�V�����E�q�#$���L�`�>? �7b���#(1�g��$E�vڞ�^��n6����]a�2SNX,؃����,�b��ȹ�� �#(u�Hvc��~ }��}�t��RN��tچ�&�x)�LHo���!����D��Qc�M�f+�0u��Ӧ�(gP�(I��#(n}� }2)ۍ&y:�Q���|�d�g�8ٓA2<�MH�C����U���D2�ˠ��8W9Mz��Lf�#$y����4}f�n^�	]���!��@�eE�N�]�IAi��pq8��~m�Y��4���F�ր�����i�:�F|�U!�Di�͡~�m�㻷���r�(/��HQw������o�����7�#$,57����K�n�Ę!��d8Yц2v����@��>�mHx�Ѹn��[�f��mf۱�#(�@韽8��fI�Ѱ���ݥA\o�8˶ay��\�c�.#�3�~��o�\��( ��R��?R\F�s#$~m�6������o��c�����y[������f��Um�3883��z�|v=�|�0�H��Y��R�eP%��kl=V���#(�q��А<eQF��0С���@@�����O��#$[�)�3��$?�C���l�?��z��8-��p�Hޭwz��Ws1"�"BB�?܊�ξ�Vc؝���~�����)����>�>'xD�21�#e%�:�i���i@�D��ԏ�6o
�AZ���>���k�6�V*_~�#��I#9��K�6Y����*�PS�$aI��]+G��x~��'����
���R���4*
���z�(�{G���Qڙy�{�"2&17Q
�#��$��O���� ��D��B�Š>�b��&Ȁs�;L��#(R��1!/�i%U
���'
�ө�nYN�Bx[��7)� ��aF6O#$u(�Q��!�d��D2Fi��[(��_.�ұ1��u��c��f�:u�dL9�Y6A�ئ�S�iBZ!�}�iB~;?ld���\2�ߖг`r6�`cBe�1���<�ߍ���pATπ`���R+}_l�r:�&�mf�RU��_5�UG|_�
�A�Y�A��U��i�x�$�e����6r&.��!b8ղ����bb����\�f��M)`pD�x��Ra��'�������$��F#(M��R1�ѭ�VC-����L��J2бeA���T4���V� ��b��!!��A���=PQ���@�=�0��e
����Wŏ�B3�}�;��7$�6|&Ҩ�	�=�	��{x��u��g"ٗĕ��P�Tx�K �F%�a߈㞔����B���Qs7Q�42�?�t�;��� ��ȣ�U$Lue�c1�	��Y�#$(>:o܁Ch�ULI��.{I�����#(��F�I#(�D���A;B�t�$��#�H�U��Z�cr=�#(J���b e�F���Pq:~G#(`:}t�%�]�Q�^�)Ѯ����Mw8��$h@�o�&ِs�!A�Fڪ�e_:KU���^�!%��7������k�D�(D�CN�A���PKX���<qeń�N�2p�:���c���@���!��Ӑt�YGr��y�n��(�,���7 �� �1#l�A�S�@f2���v��wk��Q��b}񩨵+�=��K.ᣰۭ��"���*���wq��6ƥP�)�rd{�	QO�W�oՉZ��6�b���R�6��*�`�d�V+&���M&j�R�UO3�I�|�U�HT�p���^qADF ��H����G!.�OϺ��t��)��#�@�|ٌs0�g�GC9���6�$�C��D�UH7�Cd �Ŕ��n�O���rοVV/p�RM`v���[1X"��-����2���E�S�����|��]��.͂����)��9���h.\��`,��@#$��~|��OD8#("��"s�M���>�xo�$����k}2汲d��Inj�lQF����Z�W+�+�+I[tɪ���,Y �����";
�cp�p�z��_Ji���?�ɀl���x�a=o;��v��h$���#$bn� ��-Ðsf��o������J��#y���$$��"�]~�����������E�P	RH	y�2R�,X��#��u=7�_���+������e*�������;��_��ʉ�a��;#"�D�㋹sXf����ҝ8V;)7ߣ�� p����T#"l���x��ײ�b�z����5e	/	�Od^�7X�LxÖ�	ej��p�����zމ���8|(�D5�)u�8sb��Nq�,Ѧ��O�4��)�%v9���9���%�����|��~���'��8�y�^r�7��@�����!P��ɂ��>����4�[�^X��bp����/F���P߈����@5S�	"#$���N
������@�q�&�t0�ſ��nΝ;�m�]J�d�<:�����X��0�C7���;��C�#(\\'�qȦ�-ũ���SI��qd*ZW4"�����A�����{�>�P�|��΃��͆+@������� 9̬�in��@�eʔK6�������|O���(#�%Ui�"0��/G�8(	��1b(o�Y������1A�)��BBJ��JYd���0p7�m8�OhG��x>�h��@q��!��OJ84���]�^u�[����E�p�.��:�ug�,,�����`j��q)U&�M/N�Az�+H/[U�Ƕ8◊����T,�C!��=� ����>&��Z6�����m|�m�m�������'�3nxLv'����Gw��m�:o�X�q�8v�m�vE,���-bUJk��n�,匫��
#(I��+mV�������JI��R�8���Y���D�A��~��۝Εӑ���d͐��6g�9�!2؎m3i�~���{��ݬ��&f�����w�Zl�1�̍��3b>�{M�4�n,���T
=���A���1�L�m�n��@���q��_������o���.�5���8���G�VقlY��6)B��m�#~P�D��ߊN����ݒb��fn=q�g��`�d��� :r|.נzGa��Ɂ$��hlY���x[�O�Ö{�ÎF�����e�p�{�r!3{��÷w��lb��,�Ϡdx�������J�ٓo�y+�]e��#$�f��-p�mDkHn��p�F
#(��:�;32�n��qm��s\&�;�MΜ���t]����Ʒ;��˲�9�p+f���IUE6F�M\�w��Q9��녎B�Q�1;mR�W�~�ϟwި�F����=��тE+��Awwg�:W��&��c��d�gǦ�c�w���,|3�~�o�n�v!����`�����x�O���ў�`� ��CR�gVHN��/5U#vf�ܿ$�;C�c��ߑ���/{��F�M`N�(j�����Q��V���n�}|�����N���ϸޔ��C�{(���Ĺ�!q^j�B2d���vN�P`���,�B�ŃYKJC�f��#$Je�:=~q�	9#(tb�:�v5r�������D�KP�����fa�	�H��f���4�c#8f��A�R�vY�գk�V�4N��7W[����B���U��f�~,_��e���d����(�P��A�V��!�#$�q�����b�qv���$X@�z���9��ߪ#(��'��>��4��I�G�K�C��'����楥v|�� ��å
_x�E.�db0�2�ki��/�#$҈�=A|�]�A=���'X:���DВD))D�`)%IeII`XK`��yqw3�Zٚ�kfyk�R���i��W���4 n�c5-�[��#$c��_��d3z٤,�p�T �~4_���p��QX����T߭��<\|����M:��EݽB{�sw�B�����2}qD�yCwwE�1�&��w��EV��9���Qn6-�p�I�������D�'�ʹ�O�m#t����\#�WdLC𯮧�h�g�i���=^��#(��z���|�cU��ӿ�܍@���QxBpqj�}��=��wf�QN�{#$w���&��o�A��n��/��l	���5�\�	�����[fH��a��^LW�S������=7V��,��q�`�^�2ӕ��1��2#$�}�2�$�D�N�x�����@���$V�S�´^!�i٪el�hR��МJ2Ov��S�$��� hhh�M|�K5�G6�b.�RHIƩ(G��3{a�ֳR����cJ�Re�i������{�J�-AF����+TT8!�D�t�J�iJ6�]E5*e���5��>F�؝3�7�T��0曑�tX˱�����-�ux�@>��#(�I�-k�J����F�S$@�6~;]:�nKP< z.DK|��HS��eM�����8����l���l���jA�]��萧d�j4<���D&�C�	y�-�\�*�Ĩɻ)��7>�����F�Uĺɶ���?�he�쐙C����&��圭�K1�i///��p�ǩ����a��I�ƻ��@��S.i,`>��M��"{��ܥQ-�����?�AA�#$�(qR�ޯ��m���ߑV�%K><�ҷ@P�'��n�=�ysʹ���G��#(��E�cj�/w�8�W�:��\���ɱrȘj8�|�"����- �
a>�<aS��2��;����+�w��&DX!��0�;��(�2���񳩄0��W�^G���@�XC>i���TL◫X3����}��� |$قo��G��`Rv�QL�����ٔ�N).���h8�1Y����nA�Pt�{L*2
�����!4N�h-j�Ԝ�%yh�Њ�y����~��ާ��!��cQ�~N��﹄�K�aU�%d:�U�(��e�%	ا��Ŀ=�#(I��JDǗ_���(��r_��zH��^[�8������䧒�����]�xr���jh�FSn����9��7�@m=��9U��d}��M����#(T�y���&3�*[@��oRRb؍��e�Y�X�e�Zj�g���k����g85$�n��ᇘ��At=��=�O��}9�!a@�	p�ճ�#�4�SP����Нۗ���w;܉mߩ)�ƾ����#$�J�#(<J�-t�����}{S;U��!�8~��tq����+�ʕ��*��:ݔQ�ԫv�ԯ�oS��)�Y�	(H� ���d�N��h�#$����Ϗ�;�zAb��4I<��(L��Bt:�-�`����n�j��5����ulJ0��Y�!�C�g�F,�.;�����p=Q�n�kv�'YÄ�-��8,*��g�Q�/$+&1��ғ�<�C7�
&a#$�Μ^F�����Ǎ��[��аpo#(G?U�2�v��3��׎<&Nm�0R�c(��d@�@B�B����.#$�μb���Y3 &���:M���$����P�.��R�x��M�N�r�7�N��d��}�o�[6hT��0H-�a�^�������Z�`��R�[�ɪ�H-�����ÆPA�Y@1;^����:�Zo��#$	3(����?#i��Q�luM�^�3�r��E,f���:��ǹ�P7�c�i��H�$��W�8��{�QuC�����ه*�#$��vlb�6�[���B�bn�9#$��}�ml2�eQF@o�|8x�.�,R�
H��0#�()�x�w�
�~R}!nw��"�`�t�x�*�q��8I{{�-r��x*a�E��vj/5t��MQ�ϱ�r�hf�^��|oci��!ɺ>6S3	E�+���}��EBI��SϹ`���#�`!!��=v
:4Ou�G�$$�4�hڿ]�mr��Eh��j*�mi-[jĂ�pDV�A�	(�‚�a��z�U��FD��_3�� ��=�lV���m!ȝ��Ut��#(��ˡ*�s�~;��Z��U$�Q	 ��#$-HfL�L�%�i2“&�ZiBSL�$�%fH���H�d�f��e���2FdR`bD�hi�v�,e,�"�%��jL�Ah��E��&L��+Jm�&YA�#%�*2�3��(��c{{>'T�˷'�Ջ@H|���m�p�e1�B�`�s��!�@ܜ��1EUUT�0-G�r�%`Wf#(g��x�	Y��f��(�"�]�?��ؐ	&5s��A��%�����7Όu�3�prl�a�C�d'^�q�o��U�rniO�/3	[�yq�ea4����ߏ�#$��ܷ
`*��CLIe*�t;7��"��D����E�HCf�,SM$`�T�4�f�^׿��|���(*8����~��	�Y����ȋ�MhE���$��ʹw��ُ��}\��|v��k@Nw�֤F0&�l:�e<����p_OҔ�lu�E�PvU5I;C��o�v�P㕇��9�PK�p#$��������#(#�`�i,�����`�#=�3z���1��嚿b��~{��p�|�3�h���'�����oz2���ʸ�c��!Yx��P�P�0-��p��D����H���PK�����#(���3[ٛX/����F�~�����6����˜[x�8�-��$���3�0Z��D	�/��<c~���Wzr3.ώ-ܳ���Y�j{f�[mۖ�ޒn�ev6�XM\�๩EU�<꜈��w��E8�9��!��V��%���{j�HB6��/���57ps��>>�*h����.6�Ľ�0��m$E#$��N��.�<&vU���ҽZ��N�qw�5�C���N�����O��7ӗUϿ/w'1a%��+��#(�HM��8��:	H~kE<�n>��ܿ��$M�����{��r:�w�v�{��K���~�����y-�2���M`�����Tzo�ǎK�ދ4�K5Qy) �����1�뻞���5������&Fѭ���$�A3AxT骞����{8�,>���b*$��3�q�H��+�Pv�L+4b<m��<��aZgy2��:�K�����:s�az�)��]�i�mG;�nm�,�nb}�1�Y�1�㓧g:���<^\�Y���\�+!L�˩��9���\59�����^dٯ3�Ӝ�]I���ҚLK�0PK�94�ن1W`��i�+�e�56�!C�����bѵJ���2=���(eN��T�Z#t��l�����Ra��̗XLG�ͩ�EFb蹵^��:�)��(�K)L3>mA�R�UkSʊ�G�F��m���G���5�,Ba�΂*��,��'�=�ٴt������.]������ŞJ{ۓ6v��ֆ�pݦ>���@bo3�du�c����̝1z�Ɯt��[��A����kL���ch��K�%Y���\ȓ��!#(��{d׶�%]���sh��������j��p�u�	��6R�C�LS]&$���/#(���~�{�9���e�c6��ym����zkW�DUN��\���x�pa��M��ѐ� ��b�6��l�a�aʇX�a�"�Sl:Q�Fb�ۡ����w��5��"a�Iv�7��t^��w~�a�ة|��6,�/y�o8t�/����̜z�f|Ӈ�l�<G#$�Y��Cs����5��D��E�\xA��p�a*+9���Ir��Q4)����C��d��)=Xi�xc�B��S�W�q�����x7F�ދKn�}���9\�G����L�e	6n��Ʉ����b��tg=��M�iԾ�T���w.Ĺ�.F7�����Ww�	���s��%��d���%���[#Z�Y6�u+e�7N����yxbZv�`n#$`�{�
y|�ctBք��'����M�-��Z�0�N�C	Aj����r�#$Qhq�_e%[.m\��J�P��E����k�3I�Y��Pe��%l$�熎.�}#E�Ae4��1�-���%U#(�L��Q���l��*IҎrۼ�vT"6��sN���B���͔4$�$58�!�>�X�a��˚gt����7��p�)O��斨wB�z�?�y��R�ן�#$���C:�N��j����ˬ|	��Z�P�C��_�=g���q�Kx�h���'
�qg���[3�L�pܽ���>�/@���\����[����K�{jJBBG7u^p�Z���GE*0i��%���oX{�{�ʁ��
��Wñ���g.wN��gI���\�#(-J��Ķ�:a�Qdݱ@o|�kn��7�����c���9�a���UN�+���w{���f<5m�u��]�3�Yv�S��­-�vuwM��Pː�3oN )�Υ�$Ԓb�2X��#(�NAYOr�bS�
��^Ο.��]03���:ad�^REh ����y���"�Ė�i�i5,Fv��E��<nɇb�â���3ubJF]��l8q�$�ai��j��\.��HĦ���w^�}��#:��~L(o�J�I𜧅ZYUz�ᦢ�/R
�잒M�l���:�o�v��ШZ�DI���������n�vw1*#(�*�̴1ƌ����K`��J��w2���1͊ @>�88XC�M�9͊9M�\�d��q�dFn��qa$�R:�.�:*�Z����HpIP�۬4ξ{X,�0/���5퇾R���]��&2h ���J��oK3�`�&��6�ά�����1�J��8x���S�!�s��+����fyC�cY�&$�����N�#(䝜�
=sa�p;?�0���K������>�a����1�xmN�bɘ|�[�.�؝#$^�o/B��nk.��d�����M�m�cF�S<F6f����j�2��2��,�:��6Q;��h=3��%�����G��Ef��9j��;�S3X��A@$�q����u��vty�{��'>~�wl�iL��ZE�y�VI�P>�s���w�����'�>&Da��(�Z9���?�5„���nT$@�-��_H��[L�:��Ξ�K�"�|�9��xn,˸Y+�K%��D��D�A:vj���A�4���Б-:�XQ�#(1ba��Es&��@�՞k ���T&deQNV̈́��@���f�@s֍�\Xԥc&����7pf��"��jnY�8(�!I���, �0H����1˓�E
�R;5&���nl;'�z@�A#$��6bG#9|8�5�$�,-��$iv(�q�rgq��l� �N',�8��*e�97��N�]ƸN;�+�A��pl�CjFv��\%����ŔP���#(��(�4�)RS[*��宵���k��lV�� n�.+�SyHf)�JQH*%?�9��gpaӽT5��$S�R��KÙf՚w_E���{��eN@�S
�*F��O؆�	 n�("�B1I#$0裕p�*��Kл.=�!��_φ�#B���#��p�&��(6�m5��.�_��)������[e�{�n�[kH�kY�LMY�.=,Y�,�[�L^�b�gs@l��1L�i��#��+��8��|�����0�	dק P˚���@H��g9�B_�iI'���G΁�`YF�.�fk_vC5jM�Rj�l������P�E�"X�����2��n��YiwmB`�=B1�b�1���� b���G�
��_�@Dw����x�ː�B31�����X���!y�~�L0�CtZ�����+֜�_H��?i���T8��P��Օ:!
�c��C�w�it]�_"�6��A?jo0���ҵb�_��
�
�.�#���m?����^�M���u܄�ܻ�ß#��dD� #E�V��̂������\�v=w��'�����3� gI%�C#���s���xi��#$�����Q?_|?P�� H��)3��TrS��)j\�3�������h�M�k&��ڍV4%E-36#dƒA�#$2$JJ��؛=fX��E#(�S�W?J���K��Ԩt"z��=��`
Bm�Pā��t�ȉ��A BCwQ��E��/����!��A�>�J/��* H�����������N�$�[lIuRc#$6�׾Sm88�!�N���C�<0�AʰIo04�>E�g�=��k��Lę�#(�X�⚩2O���ԛγ3֟/n�vj��Ăol՞|&��6{zo��6Z�Y<~�d�o�=:�������1���#(�ʲdV,1�,�D}��3�-Rtԙԡ8���Ϟ�tA-�V������j.���Xp����84���%
�2�K���/o��]����i*5����ڬ~��!�&�%�+PY/_;!�(J 0b i�2k0�У�@Z/s���LBL�P/�B��,�_��
!�4�����[f$��8"��lƃg��o!yv�:Q=y��c�ی\I��#(y�P��<'}�a��2Y����
�a����r�2'#$!ǧ"G|��Q�ġᰴ�ް�ꇶ]0�x����:~h)PL#$?w7/�l9�:C����#$`�NU2��"£h�ٸW)ˎ�Ky�N�2����r��̹�@ƍ�%�s6&�Qjw�qʖ.�2���&YMa�kF�6"���»�jnA8N��Ha(�46,�P�$�P�
�o���"#(P	�`���f��{�2�*�0ψH*s��Ð_���⟳��߈�3�EF�֎L*zϕ�%x�K=Fte�WE�`��<����7\&�XC�|}!�M*ڶ0�c=A���\HI�U�����@�VѵIZѭ�k[�k)l_k���]nzi�C}�\�%f���Iq�{�UNB��~�mZ�;Tf�ӯ�^��ћi��D;�ƞ�uwb�ѭ#(��c��l�q%�� �lr��[ѽgI۬�փ�k�Y�T����d�#$�_'�R�,,:��4��3`母)��٩��Z�ER��t���s$��&/�8�SF���
���}v�)3�05��0���8��ص䌳��M��,0��B7sY����Ojx��4�+�����!�6����ʴ9|T��:�Ô�d����J��hFs����<:�-(��ŚE/�r��y�Ic�UplK̷�`����c}����<�.`		#�x'P�e��(�+�S1�"�f��n|����ƨ�����F��$��X(4�)"#(�E�<��ɀP#(fB?���oSA�;�݂���3L�~u2�PE	%bR-��eF�5���EkK����3WJ����J��]Ŗ�#�-��;)�Bc"��ʮ�E������{�A��)f3%S�X)c�:iJL��[�,S5�j�ZY������VƗ���=�����&���@hԆ�� (�
 #��~�V�E�m	Bh#�@:6I R�TN�T.��U��Q2p�C]�t�N��y�1�������†^us�e3=���^N�J<��r�UE_�؄�R�9�7h2��>~|��sgHj�t�x|�vO-/�׍�y$��ݝ���[��d�~~�`�uB�aB�7�`���q�J��8XIP��%�TY>��O[�3Emġ5����6p@�p��D5��J�µ���Z�P��D=�̙#(Bf�\��d�^�D�2�Q�F������۶M��{�9�69��ƃ/.��$u�g�N�O��+7���˷8@ m�9���	�Q�	bԕN�����1��#(�#$I.�sA�(\�p\d���`rn�]�H�!����8�����L�„��Fܺ�uZc4<MJ�'N>�����"D���'��C��mӲ��������V@8�D*#(_/�߸�}.ؓ���-=���F���%��S=wU�x�k������V�M�֒Ͳ"S,�|[����a�S,&�,Ŗ$���E�mT�z��*����D�k:����R���Z�%h�+EM&*k~U��{���4��V6ecm�d�m�V���KF����h���R�M�(ɲ��m�^έ�+b*<[��f�ut�\��f�Wk5I�Ⱥ��ĭ�5��b!@a�����r_^�F�IY�x���+u��:r��}>mwm�o���LA��ީ�\�u����N�GYՔ�&4~<t�Qj���*	ê�ۍPG��,Q@�r�$�!
VcF#fб4�5L�F5Dɭ���~�m^��DZ���n�3SK�[�͍��WM���%a�(�x3�*]
��
5�`_	�@�&��Vر��f�E5&5_s�ۯ6�,��e*ښ͔���Қ)d�T����j%��L%)IJBT����H�%�٢��)6�6�iE(&��1LV$�,٦FV�dd���e����j�)RE�II2f#"�4Rʩ��V���%�ښ�ڥ)1f���R��mM��j��X�Yi�M�����Ut��R��#(��B�#(�IBA`Dd8@�+� H���c�`b��v�&��@,��#$Yѓ+�=3>��KB��
�К��8�bo"x8y�27�=��#$�+�	"HC�X<|s�E�����7g!�8J�\$3gx��KAz��c��(�P٨���)ttl��Ģ�*����m*����Ow#$���P��o�U�TI>F�dYD����V���-^��
uS�^v��+��OZ�n���j:��m���߮�mu��P@�PD��}�4Hg�6/<_t�Ik�����E��Ԇ��A�#$#$�S4��Xuj��������u�-���qW��F;ڢY���k;�����ٺ�o�,����6U�)`��A"��(.��ߜ�X#(�;�gB6tt�{z�T>��,���2Bz{����#(�xU�Zcg�y����cFN���K�h����n����%W��|�U��Ί��
��#(Ŷ5X�m�UԤ*��Yx�'�� ~�H@��#(w� ���e)63Xd(A�F���@�cXzD���L-����t���'E_t���Ϧ!����#w����P,��n�К��=鰑<���v��B�Q��a�f\1�����L��?��P~V����j,�%j�������,�W���h����eK�`���N0�~L"3��6��B�2�n��Z�PZ,"xq�`��ˀY�8m8r�J r�Ұ�OkF4�ҧ���QHr T��:>�NV�����fX(I_�T#$҆6!�C_]���ѣ�����Wq����n<�|�C5C��p�'ݠ����WY�>�:t�7�h�ep&��D͵e`,���$Otw�=�4�>��5�&A�WGj�N`�G3�%�!0�qe!�D@�!��nC��LJ�z�1#$�T�!��ؑgY�*�6`��k��:#m�K��|C��|r�/$��3U�-�}���d����8���$[x�!���j0�J�s�"�Rh����@&����IIb#G���}�|����d���������7,ˌ� ���se=����(��&bi7@F~Z4"2_��T�Kȥ�1ёZ�3��u\���T�71���RԃJ\���5�.� �[�(1�S���r��/�C �\��P>�4������}��]E5�PD�e�i#(7�F�x�|��[�ا�z��8��wsM4���Y]U���Y]E�{�uO�����n4$Jw,>�7� '/[uiO=����	�HȒDΊZ��:#���U-L����HD�����d��z�#�9ar�)�u]A�Qu�vƅC
ed��ip�D#(�K�a�#(r��{�3��w�^��v�{ia������H%N�m���i���q��TP�8Mz�< ms{��=va��#(�B'G�����H�5�RI�����8–�@��ˉ�'aY�T��*q��#$a=z\�n9�E)Y�
#(�j�����vQDIϡW��@:U,0�07MY�.�@�Yf�s�t�"z=H��ĤP��R
H�mWڳ[����yrƴPD�����ڲ)iW�#$E����X9�\��Ճͨ9�~\���r0I�s>�����{.h��^
PU��%��9���F#	��k�ӹ���ή�܀J�
JZYZdED۳P`#$�e��L��b�OZU
�"e��]�a�P^Y�y<��{�q��v!�%ѓ�� '�z;�:�_M��Yu��w��Zm][�uBWhH ��Bm1�y�.k����B���J������5�����#���=��T+�/K�</f��#$�.Y��C���Oy2F+!Δ�Q`i
E&Z��"�8=�=s�"�*��	s&�U4 �#,
KiA�b��\�0�#(2����I钯��J#�9���aRS�PO?m�6q"�W�YM�rә�1ߖ�c�QH�a���v��w��G�HY*q�(r���WCq�c��5�)Hi����w#$C�ӗ������d�Vq=�v�8�s!'0V)0�2V�li�Y���.TL�J��+}n[,IkV�#(B]�0Pd&2�'����,Q"�UbB2�����������Qg���@׿��s��	��P�`5=M뾹��!�bd(|��i<���r�'�4�e/�g9\��4~;�4A���XK�q��|��� &� 29�@,�h��ש^�oo�izk�����Qh<�h$����T�8"pˑ��C ��#(b����+0�MDj�ZR#(�(r���::�Aj�EC�݋�e˗}#$�v�Qb�L�+����y7�y�DBu�H��)��ll��������C8���@��#$FS�]���D'��o�
J2
�&S0瓇�ǐ�d�^�BB 5� L���"���G�¡�}m�DP��zm��}7O�����C�6�?}�z�xG��5E0p��eM���9*:6|�ɇhX��|�-��{��AM&Ø24�u���6�5�'^$�Ǥ�ߚ���%��xi/�z���p�@�BG�twCbo�5E6 �~�zN�G��/���O_�K����SĊ��TR��	�%AHj�e�@�!Au@YNt�v�H]�ޑ���mR�q!���bQJo��S���8�����)���s�#$�>'6&�ͣ3�Ngq��g;e������Ԓ�ȩ�W�����LG΂�2�����������C�?s�M�2�����?�Y@�
�LC ~��@��������o����J�3�-��y$z����<��!��(0�B�������?�68�aU5��eCW�/��M�Ҫ*���̆0*n���d�Y�1�������������!�S"�������n�)/��!\K�9�CQV-�δP]Hbv����N="��T'��H>l4x�B��e�G$0�Q'#$��D� Z�:x������X����#(Xa:u�{�� �sn��Md#$eH�51 �;C�HaU���g��
�|!�t"��F4f[���v��PT��a�5�.E�I�k5"�4�.R;������5�ƒ汪�1��yx<X�%�xLMl�ݢ���q;fa�L`��JK��Y���n�L��2wl;K�Jsr��6������V�9�<�L�A�&Ι7<ΪpFH�ԅ@	$,��_,��A���j�=��Ƞi���g��׃���bh��s������HB|�D�+��Em�Fd�w\�.��]R�I��ba����(pS�gm�~��^�|;2rWj���S@�	���?���iB5��~J@`5���O�x+z����I�Y��j+ήm#(�ɍ�������lM)1�H|@�@b�*���H9EE#(-	�q�a����P~�
�d�����Ꙙ��lq��D��&�n��!�����IM2R��u��@)���;�Q]���KL�%9�t�:�{��L"#(��� �.R�PXC�,� V;L
��Y����Z�Mi�.b"'�ogZ$�M�m5Qt�(�@�E x�u��,,dP([���˔RaLiJ�2�#n�����I�P�@�f9�aˈ����1#)���u4��c�T�[	D�����k
�<RY�Bț�pV�k$	R�V��P�Q�c�OũiQ�`����vS�dI�'8k�����rĤ<��@Xd
��hz:�ed/���-�H�~uj�x�k�/������ĨB��؍9#$��߳�n��~�k!^Z3K�P�d�וBĶ\���*�ӪX]���Ϛ6��ң ]ƺv�k��~�C�/���g�օ��DIS*S5h�SK4i����^J��P&�c	�1�傀����X��z���7�08�#�#$.|�#$��WÏß�%7�;��{8�dh�<!ϋ31��>ڲ�j���������q	��&.���6(���F���DE	�,�"$���! d��I
�"����A�b8�J����.�$A�I3��{�:mǴ����̅��h8շ�6�F�!��JTXI**�?���W�a�Y:	�|f6f1�#���i�H��4~�|2
��"O�<���*��K���h‘�W!j��TX�Y���t�Mt׋C`�d�hQ�_�ۿ�N����#$��r�a�P�
v���U����j�_�B�2��a�-?��fa&NZ�I�Љ����̣��2����x��{SLך���d�s�]��߮��j�X���II3"�-R��Q���~�݉4%EK?"�Ͷf[,�mb��2�	�1��֕l�kJi�&��&�[#$f�4֤S5��6���)Peg����
�σA�f��-�i��`����?ˮ-�[ڻ9��Q�#(SB�4Dhd���(�8���u�ے�E���H�0�؄���0ViI�QA6ﲾ���d춰�?T�Ɩ~_ӣ��YI�ܔ#$�z�<Br��B�׀�ݟ��ob4�#$E�[��P�����@�����(j�Q)�
QDJ�Q�%Ȉ^ԷH:�P�a}a;B�s�V%�c��ƓC����~�8�P��
�O�*(�vY=AIS��"B=��@��i���~�l���-!JC���c��)�D��7�p<�BQ�k7ʪr�fm5�6��@;�� �����r]���Z����K#$m�&Hw�@��j>�R��B��Q�d���q�ɺB^��'���U�P#(>�?�`_�7k��G#$	��㯥5����s��X��ӎ��~��`-�4a�$C7�����$$�HL���}m[D>���U�܎DZ۲I��Vϸ��l�	���T?-��Uƀ��1�6*\�=&6㙓�i�W[@�$	�"0)���~�9�#$�W��=�:�;>��]�b�:��r�-T��$��آ|��p�-lb9ah�S,���-X��aF@X��\p���a&A �Jz!
!��Yz�4��҇L�/�x���6#(���K��?"�"��*'*#$?��n#���	�P�P�*ތ���.�'r*[y?߹b틢ȑ����v<�LA��C��-#(J��L3#$�:��S�SI|t�群�c�ayŋ�Ö�(�8���DJ)�,�� �d�������%(�G�������&'~m%�؈��r1T�.�;�C۾T��d<�R9*��W\��OҚ��k�fd1nD��G���4�T���%��
�;�9��D#("���f�Da�ؠý�?����m}Mk�PX�<�kW66KV��#5��F�dQ�G! ������p����a�D�`Sr&G�9���Xζa�ӗ��΅F��]]╹�ט���������y�u�����U����1�M��fS�+J1��A?�~�M��.3�P���&~�^�#&���l����������I�l��1�U��tܯ�a�q�|��R}̷��7������QV߷���ւ�岅���G�/lb&�f`QVxH!w��(�A�!=6+���d����q����ĶL�텉�w�dpi�N10k^$�j�L�]-}g:gC#$4��T�;��E�Y+�v��4���t��[\�|<g��S��'��50�!�3*%��c�߱�����h�Q��(RY�Jd��� �#҉���q)@�a� C���h8|�#(f�����a�?t���7cm�y����:0�������y;6��a��;}���FF8!֧ok��P�UW(��U��x��c�?Vi��7�_�T�|md�9��ubB	�H(��A�5�%2�fdWx��؞uk��5j�k(�#(�J�DG	&b&TL#(�,����'Y��`��2��Zؾ[�麩*UT��T!U�ym_�<E0H1�G��1�G�I��%dD9K�w��96}�^���ˈ��nH�W2��)*#PH[PFN�`��pE��&�ơ�Bf���D5%��g� tĈo�9�9&#&^��r�ݢ�r��]�͕vʲ�%EQ�0,æi�:3�����&B6��B6�J\l�2�9!�5ড়��`x�ӈ�y�!"B ":�ƞbt�xy�U��D�T!�3N~!��U9��Թ4(�����!،���>��R'\C@I;�!A F�ũ**L�ZSm����էv�F썮�W+�2?^��_��C�C�6{0Z����K��po�"�;�-f��C�hE:o=�N����˘EÚK=���3��d$g��#(��L7���'˛F*��-&�W�p�r���C�3���ɶ�=s^* "I�am��YF�w#$�L/o�W�+W1�5f�#$�5��������z�V�����0C�S�(0Nۡ�d�iŜ��������[�WvLĦ*T#$15�h��3�BĽ�q����EŊe�@��A�<J���Q����w3�7O��h�s�#$>��`����]���du���9���I#��]/��S����b��p��y ��rQ�04o~�|���	�ֆ`E�"�%��~���g����C�b�����C��i�����=���Mˬm��W�k4%���ooe�tk��B~��"Q���O�8.3��`��%Fo��a�rط�Y�k���8ʉ��HTkq���ɀ����`j~��Ƃ��zW_�l\�SP۸�v�������qzݎ���_����auI�:e�Yp.�,�Hr��#$s.�B4E�K �)[IX*�"�ŀ��c�JF�AY0u2Z_ȓ�zN��>�:1b�#�}2�G�l/����ܹ�2QA%T�a|��8�|�y ��R/~�[���y�KZY�uV��ͧ)D�6�;Ө`��@G�~�*q���Ѕ�`�!xy�`O!��w����J����ܝ~>�a"/A�9�g��~�
B)S��B�a1�HKH��R�$5�ke6���kY�m��4n�K�H*�j��L�YH����x\�Ý�==>��J��e�]u+4p�ٌ�?m�&2x{p(?a�����J�����[���1;���������t|��gp�,��#i��,�zJ��[l&퐲�
�s5w��P鳛��)e�VXB�u��;����P񀃞N��N<J16f8߰v�ճ���6��+0,МǶn��#f��E�xWy��.߿�lb�I�x��"˵�H`�@�.^MR�APmQ��[�#$��F��i���i���ܙ�A<��b�`?R-a$��j��؆�L^���~?��/�+�PL�8�6l�9�k����!(��z�T�.�L�ή�٬H�B�f*D;�2��G3[	@�b�z޹�˸a���
դ�S���)�
��&�/|��ܑLm��(Dpp&vU�$��;���(?g��i��h�3���˫q�f`��#::����3���ȷ�!���#V��f�P/~���mEù���յ\���9�,g< �zFߤQ6Xl^��}#�"vbG���Q#(�h����:LG�qb�#('�Q3gI&a{�
��@[����h�A>�/x��`
n�&�%�^#$OG�xۭ�
�
��Y�3J��`�#8"<-S�#O��o�}
�5呢#$�9�nm�`,i1ֆgCcF[��"yQ���%zT����7�=V��=�&��LobwHHzNfD������ܸE���8�"�!`�8;F�+y�6���!
	�](���mU�UZ6�[���I�65��sUF��k_
Yr������:�;�
��L���3nrp@�o�w{:	�����U��e��+��V�A!�Y��[��݆�L��쬃R������#(�/�:���L��Y���$2���A�f��u,`�F���S�^?�BHQ�;��ۘw���e��]���B9R��ܩ�*��;(��m�:�ߢ��\w��^�Ʀ�Z�����L8x�]���E�?H`���T��2$=y���LB'^����3-G��j��D>	��;���[�{��k�=�B���jƫ�J�����Byxݾ���։��@f�J���+���\6H9�hC;,�";\��\#(P��Eo+y�j10h}}�eh���_*��30�0����!�����׾xt,����#$T#(�Z*B�xO#(�E��C��豣���f,�&�1Eo�9�s�량v��&���������C��lJ�4�S:yG�q�ˈ��X׍	l(��9��6�e�F�#$��??b??p^��=���	�{���.���87�7£�60�͆Hh2Ջ�?��s��܇[CM��ÏG�W��lPai�`�Q�`G)f	M8p��Ik3dڙ3X�-%�PY%���I�777CQ���d01E"�Ӄf)�`�PB�F ȩ[G���r�
�l�L�&�K-Kl�B�y`Xƕ��oEBA�u�F���:-jZC��3�Z ��z�`A��"�.���R�k���8x�dA�
AV��_[(���5�SJ6��y����Sd�c���4�$�1���l�R���$6�Z^�ǩ��:[�cM�\��=��^y��޷X�iT�gT�z�+��U�E2^�͇�ELN�f�Ȥ�p��e9
�A�l�4��6����7��:=Dn�L��󲸅���'Pz,�n�1Ҁ��8N�ÆT/V�g�yNS�u��*-j?B�)p����GHTX(���B�+��W���m�"�s��r�bQ��dDC`��2!8V�<!/F��`��N�0m���L�b)����3�FL8f0��#��y�c�� ���b!�}ntl:]&��e�#$0��P�9�Ɍ�.mٶg�����c�53�3�#$>��x��ҷi���~��O��%�6l�����7���	��d�1x3O�.���v�.X���Z��\�������= �#v/R	�~sk�d�>~0`�W�0y���qb'/a�&���׋�p��A^�����`��d!���aR�Q��6�T�01(�|VMa�BēLO:�w�W�u����y�ĥ��l�&�4�kw,�}�'\<�ӳ�C]4;<4�a�&�
i�Ra�n)@��!�8�OB�*�-�����sR�R�3*/�T\w���;)�L"����*A@� 2%4��,Q0dK3!���aE]����D�����-�����AS͛a�ܣ�獥�\���9�̧p��4�2�טtM�20�����η��+��}Q�;EX�aF"H#	�R�Y�Q;���φ����ZKʘ��5w�C����#�&�8�Sȕ�	N?s���z3�[��ɦ�YZt��ꦚ��N��㦇�~�k&j�h�[B�y�y��B��e�����c��>�;_a�F��T䰎'i�,BY{NP�M �! �iju����*z3��[�4�_|��;g���M�8�#(9��س3$w�>C�#(?�ޑ��	�q��Q�ς�z�.�����؈V��@}���X���6�#�:?껺`��#(� a'_��{y�g}^|�n%	v:O�1����1Li��� )��ۢ�0�B���#$p�����z�=_=+R�վ�~�_o�h��l&�6�}���fXˆش����dD�@�F�9@r��B£����K"G0�cX, O��V�n��b�m�Rj�[�]܌ͻ��u�,��LS0���s���i+IYYUr�|�[�ԗ�mY(���!&2F��C��i�1����i�.<L���L�0狑����HdD��R-1�B9��#`4�9F�;hH�D!��D�j�P��8�a��eP#(E��-�l�j����Q���M���b�j-b����Q��F�*e$��cjI*"�
	�����}�,G硠|�����ڽ^�d�Дj̉�Q݇ͭڶ��m���pp�@�#$H!�<��#�T 	��$dP��T���AW�!K���$R�(
�mX��f�K[+�m��M�$�)�zC�:Lٝ>E�	�2?V&b-Č��"��f��-���j�6��ji0��W^�#(m��!2/���s��	��#�>uT;�Wn�E�:�w�_Ͻ�l{����#(�D*�󄄡��8ԙ�>��+�5�MٳTm3Oݕ��1�56�����Ld���4�++)i#��L��R�s�����X��(��&^#�2N}>�b��I7�7h]����y���iVn�;�M�#�gE;���V&�w�p���k�k�k�ڢ�*c��6υ�:O�K��ebSG}��b��|-��a}��$�!/S��y�#$Ջ�{�y�X�7D�c�J5��!�����h��}v�#$���N��M�^ةuRH�׿��l�/�U}鱢\oz��-X�M[b�]J�jצ��Kz����	oeU��ck|I���ƶѶ�W5�`/�1�ā�g�N��с�>�@r@��n�t��y��L[$�Y
��GȰ��AREZ" YS�h�d(Ç)ߊ�9���$S�1n�;���dP�K$Ry8@�e"��`�"Ihs���d�DI�^e��L��@�I9��s����1[fNid��Id��	%������p�(�`�6~����#(�)Դ�a�)��Wq� �$d0�N��H
���c��^�`!с�P�{O;�i1c�{��x��BUk�����6�d�|���Y&L��~�����������k[[��"`M#$��n�I
VC诗��#(��_�Qg����SV g#$<��|��i�ݨ��({Gf�(�_brq7O��O�<�ž�Q3��<�)T_����Z�-[�oNs�1����9�31�,���@��a��$��oW?}9:��`a@���f���؆���u���f�'�t2#$��#(���1�CC���:����#��a������{t�'�W	�9CǤ��G��w��]���,�0#,���h��Ez�Z���v	l{��՞@�ΖNDdj��T@��A)�NBq@-pT�~]%+Pj	�xj�u~��ㅣ�����M�jܥ�����W� O�����AdMz��-��1��]w�o3P�-u�3X��*�m�*jƊ	,h�5��6�hwk���t�aZ���(�Q1H  �<�W9���jݭc��mM�ըՊiS�ړ&���]�.��ݛ��Fm;���P�Ա��-��e� C�4"<�AL(��=���yl��/�Ɍ|��L�Xʏ��rC�O��B� ��3�#(p �d�*8|�} "t���c�Q=x��_] �A�H
���#(�k�$+ķ�#$��;_HUVc�� w��>�
����S��zbr;[��RE!+TL��_�smV����}B���\��($b!����a^�1������mY6���=j{AB	�B�I$L��M�їu�K�y��!�:	�:j���[���(P3�Q#(y�^��"cQ������E�d���	�uY"0���(���JH#(H���)a
����(��!��:'��Ċ}H)�TI�����ĥ��@� �"0�F����hxV
�^
�;QP^��
"�R*HA����D���u���ft�UC���v��
�! D!DdE���`����[W�~Ov�Shҙ*J�6S%j�J*�M�mT�z���:��gһ&�އ�%:�K &��5?��,<�������O_ǿ��7�{���wF��#(�����~�o��ӄ�l7ozW�OP�	(Rv�
�v %Ί!;�q��/s�A��PWr_��ӥ[@��G��>hf2���ܰ&�V6�˻�d����BZAC�w%"ʲ�	%�2�D�@�E'GT�*�u�d��Y�t�����<�x�Eh�W6�6����&"\ ��x BH��俵�ٵ��ӝ����o"��Y�@8���G��h&-9��&Nf�ymA�2��E*I����)D
dmoJ�UNVӺK�^��!�T߼ڌ頇E]�N<x��@�N�,���Cu�)T#$KIB҃�%LJ�d�5;0�]'I�d/�b��BF1��2�IJT"��btQ�����k�ƕ��%׭����QH��HH"�0Wy�>�M$��U!�H���$!����~�єG���(���Np�f��7М�;|#$�$�[Q����v�*�M˭#([�(P�b,�)�7V�D�J�~�'�d�#$��z��3#(3���4�����t��\��ؘ��U�Fף�zzve�9�w(D�<�M����S���dO�-����@.ӟj�T$��IVyP�
�U�"����X�X�pW1�����K��0HKm�xi��O�·�~\�4XĆ�\�RD'�G�ql�NBl@6~��{><_2}<���#﬌�_Y.D�)I�\%���, �}&��8YDJ���v�������N܃:H���yq�1��C}��A�8w½T<�tJ����<��hGvQ��jZ@ZːݫG"ϥ���Qx��\���������>��D�a�W�������C��i��������4�g}<�Eq�޶� ��UQs�l	���%�EC�Ӑ~���� >��J�L�Y�����>ΌZ��I���|��1��c�`bD�����z[��yL$�d�)��پu ���-	y^�����Y^���.ń34���\����<�7U.�amR��K�@A����vb�#��.��~�}���gZ#(r���i���:��HK��OTBh��}>@~m�	
 b��:���2�M1D��!!C�]=)r��q����DL���ŏ���<�:>�c�6CJN��~Ɂm�0%��-,��Gڧy���-�#(W[�q{G�S���&#(К�0Mz3f�h��-�W���(��G!��ĭo�Gc�kN�3�t�M�wI
/��J�q.����o�&dr��9�{�٢�BtN���,|k��-�$/A#(��P�aq51��ah,*�$�47'��@��&�#(с�5���P�1�Y��}�J��������p������Ԍ�a�-�K�.3�
5�4aR�!W(I,N�w�%9�ϧ�ߢ���*贈t���T9S�Is#$1n8�_����
xfN	���e��ߐ�,�2�I���ڮY���{e�#$�=��C�|����I���+0�L��]�-���#�,�]�wL�t�-AEp�ׇ���4���r���ՋC
��㹎�t$�s���\�&��J�&a햧�VCO1��L		$�O������M���dæt-��7Q���V�oZ����cwGo?�{�0�d����`��H�$T�$���!��1�a�ƶ��Yn�vZ�Qj4�h�#(�U�#$b��ۛ�9>_a�`��P�2��y�7us�`��#���{�]Q�gӤ��-�z�9�"t�|N�@�Ã��~cP�F=a�N^��A|m~\�ځk����PԸp�K�d|�$I&�d$z�`z��'Ix�c��׻��f��ǔQ�]�g2#��+.����U���.êp9��*s���X[�$�Т(�Ϋ_Z�TDBA
��OdE�1#(F#�:��,˜��_#s��-7���KىEIN�A�8;�iv�|�C&�������>�})�L54�Z��Q\J�p�N	�ٯ�1@T���]�ld�9��>4O?4���pV���!B��É$����}������;Kb�쿳J�'o{�N��j�Յ<x�I5�i6�YK����]`u_��Aj ��YX}��$K����`BJs��8c
��S(t8fF�4*��!%����~9V�6+ѝ7��O8��Q�iَ8���g�Vj�FIRSS1:����]j�׮��Ϯ�L\�R�����#9�-��/�|���H��=��hl(*E�j���n�p�yeR?��d�`��Q���N#$�����>"����z0��{��kJM2�yu�K�$P$I$��;e�%��Rje�V�ҡ�V!(�b��;�/:@��h|5�y�>�=PRH
W�>??�{����e��l��DF��#(l3Rkl��e6IM��6T�4�@7����/�m^捯�#~��o�n6��?��<���lnj���mݝ��QFe�C�B�I+�Vs��|��
���ZIX�R��#��U�|�+�Em]l�kY�.gA�$�xb,2a��F������*rd2�.��p�Z���θ�G��Qk&2�,��Ƿ�d3v�1�fP���m��~��O�/�q4�����G�V�)R.CZM�4(m�q�����JA�� a���%4�33	�U+���hT041a�$2	)�}xB`ȲhV���R�U	cX������K���!%�#$
Z�)��I�f�����"58�B`�4)l�Q�*�^%�y�of��w��#(�5S5⊈�h���3|�?-�'��^R�q/!�!�gP!S� ��%��'��?DɅ�,�(���f)	y��	��e ���M%#$��y3���O4��$xc�iV('��W֜�X��5�C��S���� h�6�Yj����)w;��Y�Rc!��XrU�fH��Jas �r"�idJ�k,��we�U&�QD4ZUD�ٴ(���12PLi�0��&T�i�
:��٤C$*`��!�.!\�ՓR�P:��0NZk�K%\*%(���o].�fA��x�γ%�n��&�R�S�I�����e��_�<04�W�ۊ�R\���"�BQ��J�1�p�a�ݘ�(sa��e޸q91I���޲x9�_�́�!DFW�c*yd��ܢn��,�+m��
M�X��9�b�̧�I�&���O���o��VK^Xx:��$�:#(�/�hͰ�9�!��C�0�����)C�:I���S(���2�`#��⢜�.X���1��Jxddph!���@m�{d8�S9:�H����ʄ�JD���NY�B�Y#�w�eЇOX]����'��s��NS�0�$��)�n<ɝ��$��)��Y��b:5ꔯ{��%��!�j%q�͌<`�f@�7N$ΒÛ|h�b���������.w�C��m�������C!SL�����2���u���Z�m=�>�����K:�s8.v�O��i�_N�E��#$�lR�wjJ#$�"erbQ���L"�E�V�LL#(C0�FH��n/['�*`�ѩ>�i^�t�*T���U����đڈ]��-��:c)J������a
a��Ĵ�%��ܬ�|�������r��Q�������_�duЊr"� \��
���^X������4.v=�V����� ��aY
�#��E7[�#(��	Υ#$A5<k�"�"k��ͱI�	j|�$(i�͒B��”�,�,��SL�I����"��(QNJ� �lfB��KLO�2���8#��"�_0�5�˒p��C����ߩ�\�`B5i��� dj��T���!w�׵�æ�����%�[5)&��C�t���6B�P��Uȇ�p%Q�DŽL�$O"��Z�1�$���{ۉފ�7���'�vjB$5u<�B�'CI���dD�N��`��y��,ެ�뵬zn�0B�
��)Κ�:T�vo�G��#(뿿��=�u"�۽.lDlt�&�N�&Nߟ�Q����'#(��Y��w�JE�mfÌ[D��$�M0+��ꂉ#dJ��N�1#$wI@�}Q;�s�8`1�/��:hX=󫉍ښ�A� v�6֭��!���y�,/�`�M�P�A����ĺX�*�"�AAB~L�Z��xD�%>��uj��G)fЪ$5F@���b��&��1X):���Pn�C����<?#$���E�F��$�'��Kk>8�#-Ad:ˌ[u��=74[��o^�mo1"²CJ�T�b��t�5t�r�UD��VL�����B#`�I�f�T�4F�`z�/·���=�p�����ln��h�!
�D�"!�B���M8Z16r�ʫ�v�S�n�V�@9����P?B &��?H%X�����ZKS�|[�[��\[r�i�tV9]�ê���_Z�\�=�&���H���Q���ĵ\�#$M����D�т4�#$�Q�<bEE>A$E����+{�`����#(���z�vu��2'�EQLmz@���R�TA2�cܪ��T:��iXrC���~4<)8�&vD���sBk$�F�fl�(��mM�-&���L�5���ڋj��Q��MZ+�#(	>���nX�ݸ��6�X��晤A�ܛ�dr�yK!��nBI3!D��%f��P�i��dX�(�c�#(���Y�N'"	IX
AH�E���1�X!��%B�@�����	�Ɛ����R�_��6�b@�XB3H��
�#(!s�	B�A�φ���"r���m�uu�}�X�HT�$޾@�!(�����38Bm�T{�%�Z�5�t�bi�Q�j�鐋"F%]Su�I����Q!�08'5��] 4����')s&ppN�>�
O�1AD�1��ˆ��A+#Oe���j�5E��bֶ�DT����0��wy9,�v��̞P�}P��A�ޙ뛊,
#$�ᓬ�A�a@��B`�fS�qkJ5�B�EQ���O��؀�zC�m�����t��q�[���ꃭ�3_�m���`~SkN=p�^/��a�#�G5����-[��Θ��_+|���/Hv�V�����\���5�k�v&�!�2���F�*Q�~[?��\}��i��Ë��sy1
�,sƐ��kp�!����Nю��C�)u]ST^6E h�\~{�:0��8��ECC�I�70a�N��Ì�����X�'#$�'F.^}+�=�m)�K��С��]ѧ�N!�.H���ƍ�K&M�m���L�K���li��Xs�@�q>Of����7��g8{�dj���i-�H����Rp#(�k��9c�k������	L��<��g�����l��	�2o>�1(�“<�¡LQOJ��.��Ċ;�	W.�38w_o���LW��QV�zKi$�������0�G|A(�_�:[���|m��*�Yn)#ˏ�ZM�ZߪL����{ZW���:�É���{u�ɰ��<#�ʘ9q�]��î������2��Z��s&.���wn/5�3t��&tu�iȖI� VO<ZX�'XՍ�!g u�����V�乭F���<��Y���L#$�>\j�>����߫��#���`�ӎ�$���Z�&�7W6�Q!�hM�R�<)ps�!��8Sӎ�nH��;*.7��kb�\�	#(Ӻ|3�o�u".h�`������ٺ���F���������h�띈�<�̒�#(&5A�����|�2��0�ݙ0!�#$��7����E)���[/��w���K>��~ƽ��c�B4�����~�^��s/mK�C���tG���~�j��'m�8wz=�Tz*��:(;Q]W�
�8�O[h�*M:~��}N0?���E3�w�8�����9Gh��}OJV&��2��9:f�[./)��X��1�h���.0��v���#�v3A�k0�u\�>�6��'����d���c=t���Za+s-KcG-�j*^���.���[�������rѰ��H<�����Lj���k�_�d�$�B��7̀<���`�z36o�]���z���(,����D�qALU�ۘ�����sMu�uN��Q.��>�ݓ��r��rUG��΍#(�Xy���Q#(�K�4�4��B&Y��ů]JB�M�_V��@�:�H”$_�ܢe���D�@Ș�τ��ٲ�7]GY$�p�q���N�u��4�k0l���7��C���N�%����С���
b������/6�t�4G���y�OH-�Ґ(��4�Ru#�Q�y�8�"b��R��g[�׹��ݳ6��2��0U3��f̌�Y�s�pԧIT&0z &1�vGP(@�>Zjo&��%�c�'��|�o3����*Ri�NJ �t��&�J=^4ؿ�`�O��� U�<�Ͷ��uR$t��Q��"1�a�QP��n��;o�&���D��o}���LL�`�N��bSn�Q<;��~M�Ynx~.��	�ϩn#)�P���%�İ�[�Fmk��M�`s���Դ枹|C"b�I.#$�U����\#($�U��o�����[�h+wh�xb:8=>�ƞ�����B�֍�.���&��c�Z����N-\|F�a��z��l��ڎ�`��[b۠�\���>������6�U�ή(���uÆ�b��F�W��kO���~����}������.�2+1�̙��.w���X�;��g��cs��7i��8cZiG�!{��Gx�9�\ۑ�����Y������c��q����)r��ef��jfo.�D4�{K)��p�.�t���q{�xC�;h<�-�##(r��3-��8�zZ̬�ӷc'��u��o���t�
s��~���}h�C�;#�z��¾+L7c���ʔ�%�[7�(`Χ��Hq��##����.��c��P~>�P�p2�Q��{7���	&Rs!�p�aO�����#(���	T&���$�y��w�o:�gPj9� @:3�BL�%3����s���L��3I����(����n�Vf#"��>0xf�Z �e�îɯ���T>��P[�p���L�"��lE�d�w�-���D�N_��M0�xqC��+�[x��Œ���g�5(z�����\���80 ȵ*$�H,�!3#$�7�a��0��<���.C�eQ+�����C"m�[��4b����:�x��� yŨ�#("T�B�#$�ҹ��\S�Jl�()��6�B�Z;�4�Ow��v|N;�KZ�e5:Ciu%ܸ�@	_oݼsA�6<k���VYZkd8	"H-1Dd
h��M��ϼ٩��Ax~�~��-ӶK���,/�S�e���ĩ4|-#(1m(��q��9:-�|	��&OC3
�b����D���C)����v�.YZ[0�%�Se�,�Y(^R�f��Xt��wy�6w�-1�����Kw1Q`�)͑%�2S�޷I���N���}��[*������}/��|ҫ'��a�v�xs!���˘#$�"bk�Ξ/T�PD�:Y�e��צ�T��>#$��0S��t2��)��\Vx�Ü�M޶E�-�zӕ�޲͋a�f�-.\��뙻ٹ�Z�=.aoX�{�'���������J�����Q�Qg����C_n��.BNZ%<=Aðq9����A9�hi�7���fܑf�'E,��ř��-���-�:e�W��d�.�Q���D��'W�p�D���#$�EVv\���0ɦ��c�DW�̼�ny�98xC:�k+Xv%���1�.�N�͠��Cw7���0�&�<���'O�S��zU�������C�¸!�����ޛy���ep]7�a3x��1��8�[*+��!�%Q��hp�h�bw���Vzr�&&�a�7�L�m�م���Po3P�U��e@q垚h��*���x3�?޸f��_Y���L�Ǹ�cԕ���lɍ^2������oEй�����$�#$�N0|3���mô�"�3�+#$3A�C�hb��-2�W#F�>MZ��];EP]�*�g#(c�Y�Y��a��=9�:����A�,���dه�Z�#x��dr�;��U���T�}���H����)"�H�����;4ߴ;�?������̞h��HA*�M%@�$�}6���*|��;�觜ʰ�	Y��LL��g�f�UFJp����?g�����L����L�:��6��>�}�<g�*�gPl�=D��-�%�=����@����^��f}��tl#
YsH�b[������Q��0�2�f4u�]-E�-��TVٮo���W��uQtJ��"���IO�>^���8���{"zj���K��j�M6v7R�#(&0���X�T�g��u~G�YfN@y��i=���!������f��ֳl�R�D��m�Q���$	�ӿ�̞�=��_{������l���IkQT��Ɣi,�l�Ye�-M6*�,�%�&�3&Lie�Jl�T4ҥ"����-d��4S4l�H�#LP�LH�$!$  �H�?��0�TN���tk��~k��rg>��7#�.f'^������ob#�LH{�j�:w���. :���f<F��F�g3OzD���1H��2�rhGoT�3Bfd�E��w���1.(K��9�BS��MW�i���f��Z�����$I0#R5�J9�[�F�2��̽�Eg��)��ܮ�ۚ�+Eh�}�֮m"��E����:Ͷm�@�E'zR*K���μ`;�/�u#$����C�w���g[bXU��~�#$���8b�<&'�0L0����*�Lq����r�xBd@1������ѻ@5$��DP��¬�#$�e�(�m�G�a؆�$Q���Ȍ��N~�4a�p�a�L�&8a�(LHX�R�*�!D���;�����D�f`��=X�	X��@�, ?#$��x���r�"��1`��#(�p�ri���OlN�I���V+�ᔳ�Zx&��dQe��ԘM�!7*�G��CCD�Et-�#$B��$�H� ��)8��#(�iJ�	Y��8�0�L���<4���·�����;�wB�r�!�݅�����%���P��`p��*�#(��P�`�Haw<�D;���QF
�#(F������
���M���@#�8�����?j��ꡔ88�!!(xY��=}~u��q{�t�.�Ϭ2*<ߴ�7��#(�,\%Z�S��]��#_� ;��v���9�~O�A�3��Z�Qm�:9�zi<p�HA|�Q���$���]�է����Z���q;Я�|�k�h���FD%NY4���$$+"u��O|���@��w�v �d�����/G�.)��t��<Ǯ�� �3�"!��4�)4�;�Q_�p�fj��gF'�o�'��;>G��t�b�Y�@"B[c9�i�S�����?H��x��p��w#(̣�~��O�ߌ��<�~,4QodS_%��.�	��"������F��ζ5��?���Ey���
C�������X�*�nQV��ݾ��U�Q.������#(��4wB�E����Xw�`��Y���v;�QJ��2����-)���f��@F�#�uLF����$��)�$@j��zF���9 S��E��0%�Y�,���4z�޸= nI�)R��|[�yU6�]��+��”=-E$�57�h�Hq�!Vr�waӆ��nۿC�f�1��!���ˍ�8(���9YI��*�l�;��S‚�m(䄎���n(�x���A����1��D����¼|rt\��(��cYv��0�RȂp�6򣯬��!�+����p�z�o�&N	!�ze��٦��Lͨ�����g3z�^<��\l�ۥ�e� �Wh)"U�C�K!��a�MJ�$sw��Zk����ms	C@`
Kb�j��X/V{��=������'([6�"���N:A6���@ҁ����w/��a� _��x�X�!�.Ùbt�jNsǝ�t5�s�W��^p�U��s뷗^�����f��r�ƴDDsͺ.���ke���HE�!e3Wk1��6Z�4�CA��&���ʘԐ���#(�2��0�2�I����3����
�Y�b|[7�c6��sbM�.��t8@��|PO+�>��p�l�Y}!cZ��#(�r�&��8P��8B�w6��s�� �l�I��iq�B�VQ)S»<��R��U�:s5:�������O��'YnK�aɓ\1�"�b4����� u�����D�a�j��-Lnfz��X�e8��/^8[qz�W������NO���|�Zv%)fi���U�p+.J��Z&��-V���l��Ѝ,�3�r>��|���J�l�L7dK�=�h�����\ġ��ԭ>�&��N�5��y.�Xfhh�y�8�kD�/�q��`b��F��*Yd'����CM99���;:� ,>C���{�ҕpP<!κ�<�����,d�������^�B�`x�C#(����&��H�!:�1�N#$k���#$�h[Dأ��Mm�i�0�bHn����[�s/��ۚ�9E#����M�#$�ɜ�����e��gKK����!0�b�����B,ߍ�w�$�60��(r��;^i��ߜg�<X
��.�3��x<�7�g՘�:��èq��*gXq�4��Ϻ3���;��u7�qPݟQ*&ZP^��bЃk2w�E5,6�vA����6������pIΩ�J�AXcdp�blr��$�����833���] (T隢ͷ�L�a�/�p����	۬�s���GF�B�2hȰ(�	Q%a��Ng]^����_r`tS��17�@2Wa]F#���p����&_0�>㴳%5����ט�&Q�f��5��wf7���T+!#u!m�����0���Hhm�q-���"]�����k`z�#��!l���m�W�8Ӽ]�H�j�#a����}��� ����C������^i��N|I�.i3J�cL&%�xY��\�Z4AL�$ ̪x#�$� yC�6NO<",`��c���2p��{NN ����#(pH�iHa
Œ���B��������af�^Bȍ�Ml�M��#$&���w�
�e� ��R���;<�Bv��=a`�@ã��Җ�P;��CyEт�ش�&����6hp�I�7C��N�B��x��Jx�S�T��!��N�!4Wh|GǛ���ߚ��	�"J��a$�f���u)���'�����!�4
D����� �p_ç�~��P�;�ي��h�E{^[��2͆��)6E���	l�#(�=G��'f,?	(�h�K}�q��̵��sú��\���w�:,+8�y/_���9���Q�?"
�2�<䊜$L���q���]d��������i�2��ec�e���h�������%/��)���gٿ�%�7s*,���uX��=��ˢ��C���'9u���H�OΒ)���m���.yR�\3��/8_G�����"�7z�H�K��EO�b���آ!aGʱ�{��N�g��:λۄ|�E�'�P�L�{vX� �E"�p�	T�X-I6QFҥ�B~��L#$��{�����N��k$�.�DpdA�Q]k�𗛺+���6��ʗJ鄁)
#($��-�hSVQ��&��>,{5���e���Qi���rEbZ�������Ĩ2���ORr��Оɏ���^�h��#$��ъv��0���#$�&L�0�˙���C!��
�W>��Hw9�,:2_�
���	dcb��pވKG�vH��W�v��¤$�MԷ��
��LB��J�i��>����7x��Xr����/T���S+���
S9���솧ą8�_����#�tAT8%�es�p�d�*P����;�1����>���u)û�a~ʕ�V���~'s:��:�u}B!�=�P<b/�A��AQ B@���_��ɵIjOsk��BB+pS9DV�9#�D9�`IX��HlDI:��u�\v���	�B��2'��T_j(5f���+��q�T�Ngd@�IDE�B[^�=�g��{�U���w�G�(D� �"�H���L:`Z�#(#�iډ4Mِ9��`�qG=�]��P9C��
�����|�xf$�!��B�#(�G2j�H�-�m�Z�]'6���U��(F �	f�A�Bo�����A��͘.
�#$��f
�T��ϣ���<C��F�q��3��{\���ha�	#(�ueF��_8�J�ԁ�]��\�6N�R�EB���[u��@�B����Q�U6zI	�1fƛ�+�m����۴�z@�&�9(#R��@��f6M����P#�x�B�����I���)�(b��~����L��~n�:(���A!A|��l�A���x�;Fc���$�t��;?�s�Dm҈i���=�̏A���(!�����	�(2d��Kmw�M6�����/��ߗ�>G�
:�۴#
��<oH"EBE �##(f6A�ڲ3P͆��R�����n�J��(�F���rj�7���#$:�Wh�s<�<yq��
=�{�����5��]��������lD7A$D\��#`Ǧg�婝\����O �]^*�A�ҼՂI�l��� +����{�#(�ʢXx������#(/d���(�t�,�mS�ls�J³(��dA��On�z'����=.0�=$���N&�9���zw��t�	2ó:l�V��*Lg;�ct��6���G)|]�{>zL�6Ҷҁ�$	�6-��lC��}9*s=~���J�0�A�R�B�hd��2��lZ��#(W�WI���`�c��å5%���������s�IBA�ےJ�T(@���
.)��F~�ZN}8q�N{����׽2���rw�#$SS�sĈ�+*
 ���F��C�f��IB-t�7qih���h}�0��e�g���`�����?/��g�6��_�}�� Z~�[�1��:E��?x�h>���X�4�B����#^���T#(�U���N;�9kop5��F�j��@`�����`ʛ����#(Z5�/q�%�������E@���Nh���@��"����y�Bč�Y	T���학1�3�ˍ-���5]͛�z�n�yn�6�4Ze�S*�d��`�(�A����p��3��nj�yFi��c�=������.����:N�F�S["�l�/Z׫�_e�^�6�R��%�&�4ɬ�KW���b�=����5*�cIQe)-��t	D��@�	��IK]+3�.��2`���(|#�gf��K�4I�ʳXŶjdV@�z󼪥M������Rw
@��P�oq�è������LI'`>��j���=z��FD���_����Bwb�<	�;�l4t�@��̚	 ~�C��;K��\� T�*��k�P��/��g#$���KK��%�����mC\D+���,r�l�Sp02��&"��Z �
��#(f6����5RU�䪥�DH�%�*�������y���
?��Wh��`�#$�.J���H H�Ɔ��1�l:}�����#�y�.������̿D��U#�&���:*o���']�(C^4�h��:���T�f�4�~e��b�{OO������*�>F#(B��V)�����Xɶŷ�����JEh4��U��^]�[���B���mc#(�4(14cG���Bg�Ѫ�,#(���}'\��<Wf�^;}o�R��#(F֫ͨ�Ed�)X�֛(�j�kH!�im����I$�#$D0�����@K@G�a���Ǥ!:#���(��;OO�N$��~4��V'i77t���V�=��-��������I��'1,YzZcѳ2�~��W_'^�o������a�<��z������ox6�,�#$��1��EF*���c�Db����Jœ�eC�P5X�����]�����E��#$��"t�`ȡX�����,*	���2JA��0� ��iSl�k�v�ͣR�M#("�e�P����&m#$sF카��R[e6��e�-t۷unr�����9�u��Nl=��Z` G�W��u����-��Q�ܖ��IR�p��+P$,�;��ݴ%������~g��"�C�<��?<�O[;�O)�����|s�B)!!����i�=�!�?5�:p�#G$#������L�v�O�_!���M����ɚ]#$��:��J�R�Q�([C�P,VH��!�ۋ̗�:jyY�tz#$H�ߞ���U��JH��`IoTWR'dG�J�S)����6`�(��w@@����[�r���c"h#(�fB,#$4%�J ~W�1ޖ1�7�|¸��e��	�rC��K�Ģ0b�.��o??�W�1݇��[�k��c�ja*0�F�A�_�Iv·���	M;E�f��ρ�b&����3n%��Z�X�e�#$�����N��&_I�g��>N:!�,�"�eU����$>�E~��>-X��`�>;�	�6�F|h�p�����aZ�����>}u<�����\BB��fFœ];S��K'�_�s�F>o�0�5Θ��ПV3��GH� �|!�'y���t#�Ԛ��=�G���=x�?;#(O��������3�wP��@�Jm�N�g�j���($�(^��f��޺��q�����D]R*~��7˲g�`/(n�������_�������]������������;����������'w�������w��������?��������#$��������w����������������?��/��������@�N��~#�&p3�5@sM��)��4	��@�03���K��	�-䐄��;���:_?�>x��I�����NA�0�bn�^(�o�Q�2Q��w4أi��&�K�m<0�����T<��7qO�Mz��]{��HKhI�;iRu"1 ��9�p��2��|�@�$e���B���cq����z������RXg�0Q��4�?�6$�# �94�*gw���7�-�z���wҧ[�1R���a����t���Ɩ)}95Q���Z�Lˌ���&�ӣ���S,���^��l�c�?/��X����u��S�bԞ�49C��8����ڇ��S�����n	��!Y��x1�\� q	L�,��_��K]��1"��^�BXM�Yy<�U4��2�#(� S��ݢ�Hc1��q�f���eن����K4LFZ/7���k�ɯ�Ȟ�b�F������q��A%����nj�0ĺb���p+^&<��b��h�#$�M�8��4u+S�y�w��!���ïFe;]&�SAС��ν.��?�b��<R��<�]V"|�MQ�1��t�/$RF���]�9l�b��T��5lwˆ(Du�QT�� ��_e�!�""H0���&{�R�yP��t�#(k$5��@�}1r�����/+7m��h���P��چ�7��4lUicha*#$ثI�jɵ&Ԅ���&e R�����O8:�?�����.�����1�z�˲�C���;}4��c$�~BV%'��N�M!Zŀ����L߂1�x��΍��Ib�D�����u�xw�w����3�2Ug�7�%�9��\>-�i@�E�6���Y�?�9��H����P��?��z���f�ᄱ�E4�f[�q��e�%�ŧm��	!��c�c=���g4圗���ѱ#(q��r��.��m�uF�nj���R�b�JZ���דh�+AĠ�P�J�!={�$�k&�@�X6�o�,Lp�~6K9��HXw��@��ݡAl�4е#*EnQ�Ǡ���a�L�75Z�d<bӵ�����1���f�t�$$d$7�s %��gd=Y:����&�_���ڛ��t��@8<��6V��R��*�D�"��DCi�H�!-���HD��XP��<p;> ��
9!=�=���+���4�e�s�#��ߔL�6vb�ħ�Pz>y��r�B�j���*)�Ӡ"�p��h.�@>�?����JO ,@����E�}�l�i��XMK�!AP�{c�����7�}�ߛnd�-��sչ�uy9�G����9G��<]��}p�cv�njwn������*|�j�P!�P�*�#(?\Yg㉟���R�vL�P��6h�w�ט2�{1?�PA�����FT~�������k<^d�g,���c1�C�����D1�A��>?g2�7V�c~��j�]�/����I�~��8���J�4K�3��?�P{\���N����7��>��z�M�i|4>�����>�p!�"�(HN�_��
 #<==